Merge "Multiple fixes to test_server_basic_ops"