diff --git a/lib/measures/create_bar_from_building_type_ratios/measure.xml b/lib/measures/create_bar_from_building_type_ratios/measure.xml
index a3739a97..900a6862 100644
--- a/lib/measures/create_bar_from_building_type_ratios/measure.xml
+++ b/lib/measures/create_bar_from_building_type_ratios/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>create_bar_from_building_type_ratios</name>
   <uid>6e3a14f8-c3c7-4e03-bc51-bef8a52e1a05</uid>
-  <version_id>71b66d7d-6355-4f9b-a1af-5342928775c9</version_id>
-  <version_modified>20210716T215717Z</version_modified>
+  <version_id>48c0bf21-b4c0-4755-83ae-a192dd5201cf</version_id>
+  <version_modified>20211029T200900Z</version_modified>
   <xml_checksum>2AF3A68E</xml_checksum>
   <class_name>CreateBarFromBuildingTypeRatios</class_name>
   <display_name>Create Bar From Building Type Ratios</display_name>
@@ -1682,12 +1682,6 @@
       <usage_type>license</usage_type>
       <checksum>A21A3ED2</checksum>
     </file>
-    <file>
-      <filename>create_bar_from_building_type_ratios_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E910D662</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -1711,5 +1705,11 @@
       <usage_type>readme</usage_type>
       <checksum>831A2956</checksum>
     </file>
+    <file>
+      <filename>create_bar_from_building_type_ratios_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1E066661</checksum>
+    </file>
   </files>
 </measure>
diff --git a/lib/measures/create_bar_from_building_type_ratios/tests/create_bar_from_building_type_ratios_test.rb b/lib/measures/create_bar_from_building_type_ratios/tests/create_bar_from_building_type_ratios_test.rb
index 30d0a53d..bf0345a8 100644
--- a/lib/measures/create_bar_from_building_type_ratios/tests/create_bar_from_building_type_ratios_test.rb
+++ b/lib/measures/create_bar_from_building_type_ratios/tests/create_bar_from_building_type_ratios_test.rb
@@ -174,7 +174,7 @@ def test_non_zero_rotation_primary_school
     # Initial area of other surface 'Surface 365' 535.72 does not equal post intersection area 593.326
     # should still fail with check of ground exposed floor or outdoor exposed roof
 
-    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, 1)
+    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, nil)
   end
 
   def test_non_zero_rotation_primary_school_adiabatic # to test intersection of just walls but not floors
@@ -188,7 +188,7 @@ def test_non_zero_rotation_primary_school_adiabatic # to test intersection of ju
     args['make_mid_story_surfaces_adiabatic'] = true
     args['bar_division_method'] = 'Multiple Space Types - Individual Stories Sliced'
 
-    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, 1)
+    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, nil)
   end
 
   def test_large_hotel_restaurant
diff --git a/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml b/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml
index e8f48835..cb76606f 100644
--- a/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml
+++ b/lib/measures/create_bar_from_doe_building_type_ratios/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>create_bar_from_doe_building_type_ratios</name>
   <uid>0de3cff9-c805-42c4-964e-18cb43a22c63</uid>
-  <version_id>5e9da766-06e0-42e4-b006-8d9be5b6d6db</version_id>
-  <version_modified>20210716T215744Z</version_modified>
+  <version_id>b22052fe-59c2-43ce-b4eb-9685a9469847</version_id>
+  <version_modified>20211029T201024Z</version_modified>
   <xml_checksum>5F523097</xml_checksum>
   <class_name>CreateBarFromDOEBuildingTypeRatios</class_name>
   <display_name>Create Bar From DOE Building Type Ratios</display_name>
@@ -994,12 +994,6 @@
       <usage_type>license</usage_type>
       <checksum>A21A3ED2</checksum>
     </file>
-    <file>
-      <filename>create_bar_from_doe_building_type_ratios_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E28A50CE</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -1023,5 +1017,11 @@
       <usage_type>readme</usage_type>
       <checksum>7D3973D6</checksum>
     </file>
+    <file>
+      <filename>create_bar_from_doe_building_type_ratios_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>A5886CCE</checksum>
+    </file>
   </files>
 </measure>
diff --git a/lib/measures/create_bar_from_doe_building_type_ratios/tests/create_bar_from_doe_building_type_ratios_test.rb b/lib/measures/create_bar_from_doe_building_type_ratios/tests/create_bar_from_doe_building_type_ratios_test.rb
index 2a70e95d..36edef50 100644
--- a/lib/measures/create_bar_from_doe_building_type_ratios/tests/create_bar_from_doe_building_type_ratios_test.rb
+++ b/lib/measures/create_bar_from_doe_building_type_ratios/tests/create_bar_from_doe_building_type_ratios_test.rb
@@ -166,7 +166,7 @@ def test_non_zero_rotation_primary_school
     args['building_rotation'] = -90
     args['party_wall_stories_east'] = 2
 
-    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, 1)
+    apply_measure_to_model(__method__.to_s.gsub('test_', ''), args, nil, nil, nil)
   end
 
   def test_large_hotel_restaurant