diff --git a/nyc_taxis/test_procedures/default.json b/nyc_taxis/test_procedures/default.json
index 202cc63e..3cff69c9 100644
--- a/nyc_taxis/test_procedures/default.json
+++ b/nyc_taxis/test_procedures/default.json
@@ -55,73 +55,38 @@
         },
         {
           "operation": "default",
-          "warmup-iterations": 50,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 3
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%-if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "warmup-iterations": {{ default_warmup_iterations or warmup_iterations | default(50) | tojson }},
+          "iterations": {{ default_iterations or iterations | default(100) | tojson }},
+          "target-throughput": {{ default_target_throughput or target_throughput | default(3) | tojson }},
+          "clients": {{ default_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "range",
-          "warmup-iterations": 50,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 0.7
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%-if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "warmup-iterations": {{ range_warmup_iterations or warmup_iterations | default(50) | tojson }},
+          "iterations": {{ range_iterations or iterations | default(100) | tojson }},
+          "target-throughput": {{ range_target_throughput or target_throughput | default(0.7) | tojson }},
+          "clients": {{ range_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "distance_amount_agg",
-          "warmup-iterations": 50,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 2
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%-if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "warmup-iterations": {{ distance_amount_agg_warmup_iterations or warmup_iterations | default(50) | tojson }},
+          "iterations": {{ distance_amount_agg_iterations or iterations | default(100) | tojson }},
+          "target-throughput": {{ distance_amount_agg_target_throughput or target_throughput | default(2) | tojson }},
+          "clients": {{ distance_amount_agg_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "autohisto_agg",
-          "warmup-iterations": 50,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 1.5
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%-if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "warmup-iterations": {{ autohisto_agg_warmup_iterations or warmup_iterations | default(50) | tojson }},
+          "iterations": {{ autohisto_agg_iterations or iterations | default(100) | tojson }},
+          "target-throughput": {{ autohisto_agg_target_throughput or target_throughput | default(1.5) | tojson }},
+          "clients": {{ autohisto_agg_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "date_histogram_agg",
-          "warmup-iterations": 50,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 1.5
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%-if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "warmup-iterations": {{ date_histogram_agg_warmup_iterations or warmup_iterations | default(50) | tojson }},
+          "iterations": {{ date_histogram_agg_iterations or iterations | default(100) | tojson }},
+          "target-throughput": {{ date_histogram_agg_target_throughput or target_throughput | default(1.5) | tojson }},
+          "clients": {{ date_histogram_agg_search_clients or search_clients | default(1) }}
         }
       ]
     },