Merge "Fix tests updating server by name rather than id"