more classes and tests