Added more tests for the output format