Fix mocks for testing