New version with new classes and tests.