fixes in user mocks