Fixed tests for new mocks