Some more classes and tests