Moved the tests to correct package.