Make sure the tests are moved as well