Moved test classes to separate files