Moved all classes and objects to the test classes.