Merge "Fix create_test_server for multiple create request"