better tests and output