New classes and tests.