Moved all classes and objects into correspoding tests.