Move the class off in the tests