Fix issue with mocks not responding to update or create correctly