Fixed style issues
Moved the tests into the correct file