updated classes and mocks