Add new classes and tests