Fix test with incorrect locale name
Clean up class names and whitespace
Whitespace fixes