diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 8ea7ad2acb295..423b1de1e62bc 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -78017,20 +78017,31 @@ vars.put("admin_user", adminUser);
     <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Order" enabled="true"/>
     <hashTree>
       <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-        <stringProp name="TestPlan.comments">tool/fragments/ee/admin_create_order/admin_create_order.jmx</stringProp>
+        <stringProp name="TestPlan.comments">tool/fragments/ce/admin_create_order/admin_create_order.jmx</stringProp>
         <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
 import java.util.Random;
 Random random = new Random();
+
 if (${seedForRandom} &gt; 0) {
   random.setSeed(${seedForRandom});
 }
+
+number = random.nextInt(props.get("configurable_products_list").size());
+configurableList = props.get("configurable_products_list").get(number);
+vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
+vars.put("configurable_product_1_name", configurableList.get("title"));
+vars.put("configurable_product_1_id", configurableList.get("id"));
+vars.put("configurable_product_1_sku", configurableList.get("sku"));
+vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
+vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
+
 number = random.nextInt(props.get("simple_products_list").size());
-number1 = random.nextInt(props.get("simple_products_list").size());
 simpleList = props.get("simple_products_list").get(number);
 vars.put("simple_product_1_url_key", simpleList.get("url_key"));
 vars.put("simple_product_1_name", simpleList.get("title"));
 vars.put("simple_product_1_id", simpleList.get("id"));
 
+number1 = random.nextInt(props.get("configurable_products_list").size());
 do {
     number1 = random.nextInt(props.get("simple_products_list").size());
 } while(number == number1);
@@ -78039,15 +78050,6 @@ vars.put("simple_product_2_url_key", simpleList.get("url_key"));
 vars.put("simple_product_2_name", simpleList.get("title"));
 vars.put("simple_product_2_id", simpleList.get("id"));
 
-number = random.nextInt(props.get("configurable_products_list").size());
-configurableList = props.get("configurable_products_list").get(number);
-vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
-vars.put("configurable_product_1_name", configurableList.get("title"));
-vars.put("configurable_product_1_id", configurableList.get("id"));
-vars.put("configurable_product_1_sku", configurableList.get("sku"));
-vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
-vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
-
 
 customers_index = 0;
 if (!props.containsKey("customer_ids_index")) {
@@ -78770,13 +78772,6 @@ catch (java.lang.Exception e) {
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
             </elementProp>
-            <elementProp name="giftwrapping[quote][863][design]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">giftwrapping[quote][863][design]</stringProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            </elementProp>
             <elementProp name="order[comment][customer_note]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
               <stringProp name="Argument.name">order[comment][customer_note]</stringProp>
@@ -102726,20 +102721,31 @@ vars.put("admin_user", adminUser);
     <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Admin Create Order" enabled="true"/>
     <hashTree>
       <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-        <stringProp name="TestPlan.comments">tool/fragments/ee/admin_create_order/admin_create_order.jmx</stringProp>
+        <stringProp name="TestPlan.comments">tool/fragments/ce/admin_create_order/admin_create_order.jmx</stringProp>
         <stringProp name="BeanShellSampler.query">import org.apache.jmeter.samplers.SampleResult;
 import java.util.Random;
 Random random = new Random();
+
 if (${seedForRandom} &gt; 0) {
   random.setSeed(${seedForRandom});
 }
+
+number = random.nextInt(props.get("configurable_products_list").size());
+configurableList = props.get("configurable_products_list").get(number);
+vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
+vars.put("configurable_product_1_name", configurableList.get("title"));
+vars.put("configurable_product_1_id", configurableList.get("id"));
+vars.put("configurable_product_1_sku", configurableList.get("sku"));
+vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
+vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
+
 number = random.nextInt(props.get("simple_products_list").size());
-number1 = random.nextInt(props.get("simple_products_list").size());
 simpleList = props.get("simple_products_list").get(number);
 vars.put("simple_product_1_url_key", simpleList.get("url_key"));
 vars.put("simple_product_1_name", simpleList.get("title"));
 vars.put("simple_product_1_id", simpleList.get("id"));
 
+number1 = random.nextInt(props.get("configurable_products_list").size());
 do {
     number1 = random.nextInt(props.get("simple_products_list").size());
 } while(number == number1);
@@ -102748,15 +102754,6 @@ vars.put("simple_product_2_url_key", simpleList.get("url_key"));
 vars.put("simple_product_2_name", simpleList.get("title"));
 vars.put("simple_product_2_id", simpleList.get("id"));
 
-number = random.nextInt(props.get("configurable_products_list").size());
-configurableList = props.get("configurable_products_list").get(number);
-vars.put("configurable_product_1_url_key", configurableList.get("url_key"));
-vars.put("configurable_product_1_name", configurableList.get("title"));
-vars.put("configurable_product_1_id", configurableList.get("id"));
-vars.put("configurable_product_1_sku", configurableList.get("sku"));
-vars.put("configurable_attribute_id", configurableList.get("attribute_id"));
-vars.put("configurable_option_id", configurableList.get("attribute_option_id"));
-
 
 customers_index = 0;
 if (!props.containsKey("customer_ids_index")) {
@@ -103479,13 +103476,6 @@ catch (java.lang.Exception e) {
               <stringProp name="Argument.metadata">=</stringProp>
               <boolProp name="HTTPArgument.use_equals">true</boolProp>
             </elementProp>
-            <elementProp name="giftwrapping[quote][863][design]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.name">giftwrapping[quote][863][design]</stringProp>
-              <stringProp name="Argument.value"/>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            </elementProp>
             <elementProp name="order[comment][customer_note]" elementType="HTTPArgument">
               <boolProp name="HTTPArgument.always_encode">true</boolProp>
               <stringProp name="Argument.name">order[comment][customer_note]</stringProp>