Merge "Rename to create_test_server in API tests"