Moved test classes to their own folder