Merge "Use create_test_server wrapper for server creation"