Moved the tests into the correct file