Also update mock server code.