Fixed tests
Whitespace fixes