Merge #11215: [tests] fixups from set_test_params()