Merge branch 'ab/test-tap-fix-for-immediate'

Fix test framework a bit. * ab/test-tap-fix-for-immediate: test-lib: have --immediate emit valid TAP on failure