fix whitespace, simplify tests, make each case its own test