more classes and tests added