moved all of the tests