Merge "Use BaseComputeTest.create_test_server"