Removed trailing whitespace.
Fix broken indentation.
Remove unmodifiable map from test. Use explicit cast to pass Groovy's typechecker.