Simlify test_output.h
Merge branch 'tap'