Updated the TestHelper to handle the new class structure.
Updated the class models.