Moved the tests in the right package