fix up tests and output