restructuring, base class tests