Switched mocks back to using ::CLASS