Merge "Remove testscenarios usage from test_server_basic_ops"