Fixed some whitespace
Moved tests one folder up