Remove some extra spaces
Clean up map tests syntax