Updated base classes and tests