Fix mistakes with message printing in tester and tidy up output
a little bit.