update unit test mocks to match new structure