Adjust mocks to work with changes made to work

against a real server.