Move the tests around too