create test classes and fix names