fix classes and tests