Updated tests: fixed output, code reformat