Merge "Remove unusued create_test_server"