Added more tests and output.