fixed mocks
added where statement