Moved test classes to their own package