Menu tests: Whitespace and general cleanup