Cleanup tests, and make them output nice things