diff --git a/epregressions/runtests.py b/epregressions/runtests.py
index 0b653dc..93fd7eb 100755
--- a/epregressions/runtests.py
+++ b/epregressions/runtests.py
@@ -142,7 +142,7 @@ def run_test_suite(self):
         if self.id_like_to_stop_now:  # pragma: no cover
             self.my_cancelled()
             return
-        self.my_simulationscomplete()
+        self.my_simulations_complete()
 
         self.diff_logs_for_build()
 
@@ -167,7 +167,7 @@ def run_test_suite(self):
         self.my_print(" --build-2--> %s" % self.build_tree_b['build_dir'])
         self.my_print("Test suite complete")
 
-        self.my_alldone(self.completed_structure)
+        self.my_all_done(self.completed_structure)
         return self.completed_structure
 
     def prepare_dir_structure(self, b_a, b_b, d_test):
@@ -190,7 +190,7 @@ def read_file_content(file_path):
     @staticmethod
     def add_or_modify_output_sqlite(idf_text, force_output_sql: ForceOutputSQL,
                                     force_output_sql_unitconv: ForceOutputSQLUnitConversion,
-                                    isEpJSON: bool = False):
+                                    is_ep_json: bool = False):
         """Will add or modify the Output:SQLite object based on the provided enums that corresponds to the 'Option'"""
         # Ensure we deal with the enum
         if not isinstance(force_output_sql, ForceOutputSQL):
@@ -200,7 +200,13 @@ def add_or_modify_output_sqlite(idf_text, force_output_sql: ForceOutputSQL,
             raise ValueError("Expected an Enum ForceOutputSQLUnitConversion, not "
                              "{}".format(force_output_sql_unitconv))
 
-        if isEpJSON:
+        # special ugly case for handling unit testing -- note that the unit testing here is based around a "dummy"
+        # energyplus which reads in a small JSON configuration blob, even though it thinks it is an IDF.  This confuses
+        # this function, so I'll put in a small trick to just let the code pass through
+        if idf_text.startswith('{"config"'):
+            return idf_text
+
+        if is_ep_json:
             data = json.loads(idf_text)
             if "Output:SQLite" in data and len(data["Output:SQLite"]) >= 1:
                 sqlite_obj = data["Output:SQLite"][list(data["Output:SQLite"].keys())[0]]
@@ -223,10 +229,10 @@ def add_or_modify_output_sqlite(idf_text, force_output_sql: ForceOutputSQL,
                 break
         if has_sqlite_object:
             import re
-            RE_SQLITE = re.compile(r'Output:SQlite\s*,(?P<Option>[^,;]*?)\s*(?P<TabularUnitConv>,[^,;]*?\s*)?;',
+            re_sqlite = re.compile(r'Output:SQlite\s*,(?P<Option>[^,;]*?)\s*(?P<TabularUnitConv>,[^,;]*?\s*)?;',
                                    re.IGNORECASE)
             if force_output_sql_unitconv == ForceOutputSQLUnitConversion.NOFORCE:
-                idf_text = RE_SQLITE.sub(r'Output:SQLite,\n    {}\g<TabularUnitConv>;\n'.format(force_output_sql.value),
+                idf_text = re_sqlite.sub(r'Output:SQLite,\n    {}\g<TabularUnitConv>;\n'.format(force_output_sql.value),
                                          idf_text)
             else:
                 new_obj = '''Output:SQLite,
@@ -234,7 +240,7 @@ def add_or_modify_output_sqlite(idf_text, force_output_sql: ForceOutputSQL,
     {};        !- Unit Conversion
 '''.format(force_output_sql.value, force_output_sql_unitconv.value)
 
-                idf_text = RE_SQLITE.sub(new_obj,
+                idf_text = re_sqlite.sub(new_obj,
                                          idf_text)
         else:
             if force_output_sql_unitconv == ForceOutputSQLUnitConversion.NOFORCE:
@@ -271,11 +277,11 @@ def run_build(self, build_tree):
             parametric_file = False
             if not os.path.exists(full_input_file_path):
                 self.my_print(f"Input file does not exist: {full_input_file_path}")
-                self.my_casecompleted(TestCaseCompleted(this_test_dir, this_entry.basename, False, False))
+                self.my_case_completed(TestCaseCompleted(this_test_dir, this_entry.basename, False, False))
                 continue
 
             # copy macro files if it is an imf
-            isEpJSON: bool = False
+            is_ep_json: bool = False
             if full_input_file_path.endswith('.idf'):
                 ep_in_filename = "in.idf"
             elif full_input_file_path.endswith('.imf'):
@@ -290,10 +296,10 @@ def run_build(self, build_tree):
                         )
             elif full_input_file_path.endswith('.epJSON'):
                 ep_in_filename = "in.epJSON"
-                isEpJSON = True
+                is_ep_json = True
             else:
                 self.my_print(f"Invalid file extension, must be idf, imf, or epJSON: {full_input_file_path}")
-                self.my_casecompleted(TestCaseCompleted(this_test_dir, this_entry.basename, False, False))
+                self.my_case_completed(TestCaseCompleted(this_test_dir, this_entry.basename, False, False))
                 continue
 
             # copy the input file into the test directory, renaming to in.idf or in.imf
@@ -329,18 +335,6 @@ def run_build(self, build_tree):
                     os.path.join('datasets', 'TDV', 'TDV_2008_kBtu_CTZ06.csv')
                 )
 
-            if 'HybridZoneModel_TemperatureData.csv' in idf_text:
-                shutil.copy(
-                    os.path.join(build_tree['test_files_dir'], 'HybridZoneModel_TemperatureData.csv'),
-                    os.path.join(test_run_directory, 'HybridZoneModel_TemperatureData.csv')
-                )
-
-            if 'LookupTable.csv' in idf_text:
-                shutil.copy(
-                    os.path.join(build_tree['test_files_dir'], 'LookupTable.csv'),
-                    os.path.join(test_run_directory, 'LookupTable.csv')
-                )
-
             if 'HybridModel' in this_entry.basename:
                 shutil.copy(
                     os.path.join(build_tree['test_files_dir'], 'HybridModel_Measurements_with_HVAC.csv'),
@@ -351,17 +345,20 @@ def run_build(self, build_tree):
                     os.path.join(test_run_directory, 'HybridModel_Measurements_no_HVAC.csv')
                 )
 
-            if 'SolarShadingTest_Shading_Data.csv' in idf_text:
-                shutil.copy(
-                    os.path.join(build_tree['test_files_dir'], 'SolarShadingTest_Shading_Data.csv'),
-                    os.path.join(test_run_directory, 'SolarShadingTest_Shading_Data.csv')
-                )
-
-            if 'LocalEnvData.csv' in idf_text:
-                shutil.copy(
-                    os.path.join(build_tree['test_files_dir'], 'LocalEnvData.csv'),
-                    os.path.join(test_run_directory, 'LocalEnvData.csv')
-                )
+            # several checks that just bring a single file from the test files dir based on the filename as a keyword
+            single_file_checks = [
+                'HybridZoneModel_TemperatureData.csv',
+                'LookupTable.csv',
+                'SolarShadingTest_Shading_Data.csv',
+                'LocalEnvData.csv',
+                'SurfacePropGndSurfs.csv',
+            ]
+            for single_file_check in single_file_checks:
+                if single_file_check in idf_text:
+                    shutil.copy(
+                        os.path.join(build_tree['test_files_dir'], single_file_check),
+                        os.path.join(test_run_directory, single_file_check)
+                    )
 
             if 'report variable dictionary' in idf_text:
                 idf_text = idf_text.replace('report variable dictionary', '')
@@ -387,12 +384,25 @@ def run_build(self, build_tree):
                         )
                 idf_text = idf_text.replace('..\\datasets', 'datasets')
 
+            if ':ASHRAE205' in idf_text:
+                # need to copy in the cbor data files so that they can run
+                cbor_files = [
+                    'CoolSys1-Chiller.RS0001.a205.cbor',
+                    'A205ExampleChiller.RS0001.a205.cbor',
+                    'CoolSys1-Chiller-Detailed.RS0001.a205.cbor',
+                ]
+                for cbor_file in cbor_files:
+                    shutil.copy(
+                        os.path.join(build_tree['test_files_dir'], cbor_file),
+                        os.path.join(test_run_directory, cbor_file)
+                    )
+
             # Add Output:SQLite if requested
             if self.force_output_sql != ForceOutputSQL.NOFORCE:
                 idf_text = self.add_or_modify_output_sqlite(
                     idf_text=idf_text, force_output_sql=self.force_output_sql,
                     force_output_sql_unitconv=self.force_output_sql_unitconv,
-                    isEpJSON=isEpJSON
+                    is_ep_json=is_ep_json
                 )
 
             # rewrite the idf with the (potentially) modified idf text
@@ -474,7 +484,7 @@ def ep_wrapper(self, run_args):  # pragma: no cover -- this is being skipped by
         return execute_energyplus(run_args)
 
     def ep_done(self, results):
-        self.my_casecompleted(TestCaseCompleted(*results))
+        self.my_case_completed(TestCaseCompleted(*results))
 
     @staticmethod
     def both_files_exist(base_path_a, base_path_b, common_relative_path):
@@ -640,27 +650,27 @@ def diff_glhe_files(file_a, file_b, diff_file):
                             ))
                     response_factors_1 = glhe_in_file_1['Response Factors']
                     response_factors_2 = glhe_in_file_2['Response Factors']
-                    gfnc_1 = response_factors_1['GFNC']
-                    gfnc_2 = response_factors_2['GFNC']
-                    lntts_1 = response_factors_1['LNTTS']
-                    lntts_2 = response_factors_2['LNTTS']
+                    g_function_1 = response_factors_1['GFNC']
+                    g_function_2 = response_factors_2['GFNC']
+                    ln_t_ts_1 = response_factors_1['LNTTS']
+                    ln_t_ts_2 = response_factors_2['LNTTS']
                     time_1 = response_factors_1['time']
                     time_2 = response_factors_2['time']
                     counts_match = True
-                    if not len(gfnc_1) == len(gfnc_2):
+                    if not len(g_function_1) == len(g_function_2):
                         diffs.append("Mismatched GFNC count for GLHE \"%s\"" % glhe_name)
                         counts_match = False
-                    if not len(lntts_1) == len(lntts_2):
+                    if not len(ln_t_ts_1) == len(ln_t_ts_2):
                         diffs.append("Mismatched LNTTS count for GLHE \"%s\"" % glhe_name)
                         counts_match = False
                     if not len(time_1) == len(time_2):
                         diffs.append("Mismatched TIME count for GLHE \"%s\"" % glhe_name)
                         counts_match = False
                     if counts_match:
-                        for i in range(len(gfnc_1)):
-                            if not gfnc_1[i] == gfnc_2[i]:
+                        for i in range(len(g_function_1)):
+                            if not g_function_1[i] == g_function_2[i]:
                                 diffs.append("GFNC value diff for GLHE \"%s\"; index \"%s\"" % (glhe_name, i))
-                            if not lntts_1[i] == lntts_2[i]:
+                            if not ln_t_ts_1[i] == ln_t_ts_2[i]:
                                 diffs.append("LNTTS value diff for GLHE \"%s\"; index \"%s\"" % (glhe_name, i))
                             if not time_1[i] == time_2[i]:
                                 diffs.append("TIME value diff for GLHE \"%s\"; index \"%s\"" % (glhe_name, i))
@@ -861,7 +871,7 @@ def process_diffs_for_one_case(
                 thresh_dict,
                 join(case_result_dir_1, 'eplusout.csv'),
                 join(case_result_dir_2, 'eplusout.csv'),
-                join(out_dir, 'eplusout.csv.absdiff.csv'),
+                join(out_dir, "eplusout.csv.absdiff.csv"),
                 join(out_dir, 'eplusout.csv.percdiff.csv'),
                 join(out_dir, 'eplusout.csv.diffsummary.csv'),
                 path_to_math_diff_log)), MathDifferences.ESO)
@@ -1048,7 +1058,7 @@ def process_end_file(end_path):
         # fatal:
         #     EnergyPlus Terminated--Fatal Error Detected. 0 Warning; 4 Severe Errors; Elapse
         #      d Time=00hr 00min  0.59sec
-        # A NEWLINE?? Gotta sanitize it.
+        # A NEWLINE?? Got to sanitize it.
         with io.open(end_path, encoding='utf-8') as f_end:
             end_contents = f_end.read().replace("\n", "")
 
@@ -1125,18 +1135,19 @@ def diff_wrapper(self, run_args):  # pragma: no cover -- this is being skipped b
     def diff_done(self, results):
         this_entry, message = results
         self.my_print(message)
-        self.my_diffcompleted(this_entry.basename)
+        self.my_diff_completed(this_entry.basename)
         self.completed_structure.add_test_entry(this_entry)
 
-    def add_callbacks(self, print_callback, simstarting_callback, casecompleted_callback, simulationscomplete_callback,
-                      diffcompleted_callback, alldone_callback, cancel_callback):
+    def add_callbacks(self, print_callback, sim_starting_callback, case_completed_callback,
+                      simulations_complete_callback,
+                      diff_completed_callback, all_done_callback, cancel_callback):
         self.mute = False
         self.print_callback = print_callback
-        self.starting_callback = simstarting_callback
-        self.case_completed_callback = casecompleted_callback
-        self.simulations_complete_callback = simulationscomplete_callback
-        self.diff_completed_callback = diffcompleted_callback
-        self.all_done_callback = alldone_callback
+        self.starting_callback = sim_starting_callback
+        self.case_completed_callback = case_completed_callback
+        self.simulations_complete_callback = simulations_complete_callback
+        self.diff_completed_callback = diff_completed_callback
+        self.all_done_callback = all_done_callback
         self.cancel_callback = cancel_callback
 
     def my_print(self, msg):
@@ -1160,7 +1171,7 @@ def my_starting(self, number_of_cases_per_build):
                 )
             )
 
-    def my_casecompleted(self, test_case_completed_instance):
+    def my_case_completed(self, test_case_completed_instance):
         if self.mute:
             return
         if self.case_completed_callback:
@@ -1173,7 +1184,7 @@ def my_casecompleted(self, test_case_completed_instance):
                 )
             )
 
-    def my_simulationscomplete(self):
+    def my_simulations_complete(self):
         if self.mute:
             return
         if self.simulations_complete_callback:
@@ -1181,7 +1192,7 @@ def my_simulationscomplete(self):
         else:  # pragma: no cover
             self.my_print("Completed all simulations")
 
-    def my_diffcompleted(self, case_name):
+    def my_diff_completed(self, case_name):
         if self.mute:
             return
         if self.diff_completed_callback:
@@ -1189,7 +1200,7 @@ def my_diffcompleted(self, case_name):
         else:  # pragma: no cover
             self.my_print("Completed diffing case: %s" % case_name)
 
-    def my_alldone(self, results: CompletedStructure):
+    def my_all_done(self, results: CompletedStructure):
         if self.mute:
             return
         results.extra.set_end_time()
@@ -1242,7 +1253,7 @@ def interrupt_please(self):  # pragma: no cover
     base.run = True
     base.set_build_directory(args.a_build)
 
-    # If using ReverseDD, builB can just be None
+    # For now all runs use build B as well (If using ReverseDD, build B can just be None)
     mod = CMakeCacheMakeFileBuildDirectory()
     mod.run = True
     mod.set_build_directory(args.b_build)
diff --git a/epregressions/tests/test_runtests.py b/epregressions/tests/test_runtests.py
index 74827bd..1b31be0 100644
--- a/epregressions/tests/test_runtests.py
+++ b/epregressions/tests/test_runtests.py
@@ -37,9 +37,9 @@ def establish_build_folder(
         read_vars_dir = os.path.join(target_source_dir, 'bin', 'EPMacro', 'Linux')
         os.makedirs(read_vars_dir)
         if system() == 'Windows':  # pragma: no cover  -- not running coverage results on Travis on Windows
-            # if we are on windows, we need to prepackage up the python scripts as exe files for them to run
+            # if we are on Windows, we need to prepackage up the python scripts as exe files for them to run
             # properly across interpreters.  Its easy enough to do with pyinstaller, just need to set up a couple
-            # variables and run them all.  Also we don't want to run them for every single test, just once if the dist/
+            # variables and run them all.  Also, we don't want to run them for every single test, just once if the dist/
             # folder hasn't been created yet.
             dist_folder = os.path.join(self.resources, 'dist')
             if not os.path.exists(dist_folder):
@@ -124,6 +124,14 @@ def establish_build_folder(
             f_macro_extra.write('##MACROTEXT')
         with open(os.path.join(testfiles_dir, 'EMSTestMathAndKill.idf'), 'w') as f_kill:
             f_kill.write(json_text)
+        cbor_files_to_prepare = [
+            'CoolSys1-Chiller.RS0001.a205.cbor',
+            'A205ExampleChiller.RS0001.a205.cbor',
+            'CoolSys1-Chiller-Detailed.RS0001.a205.cbor',
+        ]
+        for cbor_file_to_prepare in cbor_files_to_prepare:
+            with open(os.path.join(testfiles_dir, cbor_file_to_prepare), 'w') as f_cbor:
+                f_cbor.write('CBOR')
         if py_file:
             with open(os.path.join(idf_dir, "my_file.py"), 'w') as f:
                 f.write("hello")
@@ -201,11 +209,11 @@ def test_both_success_no_diffs_no_force(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -772,11 +780,11 @@ def test_small_diffs(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -853,11 +861,11 @@ def test_big_diffs(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -995,17 +1003,17 @@ def test_base_case_but_multi_process(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
         # there should be 1 file result
         self.assertEqual(2, len(diff_results.entries_by_file))
-        # these next blocks are pragma'd from coverage because we dont know which one will get hit
+        # these next blocks are pragma -ed from coverage because we don't know which one will get hit
         if diff_results.entries_by_file[0].basename == 'my_file':  # pragma: no cover
             results_for_file = diff_results.entries_by_file[0]
         else:  # if diff_results.entries_by_file[1].basename == 'my_file':  # pragma: no cover
@@ -1075,11 +1083,11 @@ def test_window5_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1146,11 +1154,11 @@ def test_tdv_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1217,11 +1225,11 @@ def test_hybrid_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1288,11 +1296,11 @@ def test_solar_shading_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1359,11 +1367,11 @@ def test_local_env_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1430,11 +1438,11 @@ def test_macro_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1501,11 +1509,11 @@ def test_lookup_table_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1574,11 +1582,11 @@ def test_hybrid_model_file_gets_dependencies(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1646,11 +1654,11 @@ def test_missing_weather_still_gets_epw(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1717,11 +1725,11 @@ def test_report_variable_dictionary_gets_scrubbed(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1791,11 +1799,11 @@ def test_parametric_is_signalled(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1863,11 +1871,11 @@ def test_external_interface_is_executed(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1880,6 +1888,81 @@ def test_external_interface_is_executed(self):
         self.assertEqual(EndErrSummary.STATUS_SUCCESS, results_for_file.summary_result.simulation_status_case1)
         self.assertEqual(EndErrSummary.STATUS_SUCCESS, results_for_file.summary_result.simulation_status_case2)
 
+    def test_ashrae_205_files_execute(self):
+        base = CMakeCacheMakeFileBuildDirectory()
+        self.establish_build_folder(
+            self.temp_base_build_dir,
+            self.temp_base_source_dir,
+            {
+                "config": {
+                    "run_time_string": "01hr 20min  0.17sec",
+                    "num_warnings": 1,
+                    "num_severe": 0,
+                    "end_state": "success",
+                    "eso_results": "base",
+                    "extra_data": ':ASHRAE205'
+                }
+            }
+        )
+        base.set_build_directory(self.temp_base_build_dir)
+
+        mod = CMakeCacheMakeFileBuildDirectory()
+        self.establish_build_folder(
+            self.temp_mod_build_dir,
+            self.temp_mod_source_dir,
+            {
+                "config": {
+                    "run_time_string": "00hr 10min  0.17sec",
+                    "num_warnings": 2,
+                    "num_severe": 1,
+                    "end_state": "success",
+                    "eso_results": "base",
+                    "extra_data": ':ASHRAE205'
+                }
+            }
+        )
+        mod.set_build_directory(self.temp_mod_build_dir)
+
+        entries = [TestEntry('my_file.idf', 'my_weather')]
+        config = TestRunConfiguration(
+            force_run_type=ForceRunType.NONE,
+            single_test_run=False,
+            num_threads=1,
+            report_freq=ReportingFreq.HOURLY,
+            build_a=base,
+            build_b=mod,
+            force_output_sql=ForceOutputSQL.SIMPLE,
+            force_output_sql_unitconv=ForceOutputSQLUnitConversion.NONE
+        )
+        r = SuiteRunner(config, entries)
+        r.add_callbacks(
+            print_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
+            cancel_callback=TestTestSuiteRunner.dummy_callback
+        )
+        diff_results = r.run_test_suite()
+        # there should be 1 file result
+        self.assertEqual(1, len(diff_results.entries_by_file))
+        results_for_file = diff_results.entries_by_file[0]
+        # it should be named according to what we listed above
+        self.assertEqual('my_file', results_for_file.basename)
+        # it should have been skipped in both cases, so missing
+        self.assertEqual(EndErrSummary.STATUS_SUCCESS, results_for_file.summary_result.simulation_status_case1)
+        self.assertEqual(EndErrSummary.STATUS_SUCCESS, results_for_file.summary_result.simulation_status_case2)
+        results_dir = diff_results.results_dir_a
+        file_results_dir = os.path.join(results_dir, 'my_file')
+        cbor_files_to_check = [
+            'CoolSys1-Chiller.RS0001.a205.cbor',
+            'A205ExampleChiller.RS0001.a205.cbor',
+            'CoolSys1-Chiller-Detailed.RS0001.a205.cbor',
+        ]
+        for cbor_file_to_check in cbor_files_to_check:
+            self.assertTrue(os.path.exists(os.path.join(file_results_dir, cbor_file_to_check)))
+
     def test_both_success_no_diffs_dd_only(self):
         base = CMakeCacheMakeFileBuildDirectory()
         self.establish_build_folder(
@@ -1925,11 +2008,11 @@ def test_both_success_no_diffs_dd_only(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -1992,11 +2075,11 @@ def test_epjson_file(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -2057,11 +2140,11 @@ def test_both_success_no_diffs_annual(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -2122,11 +2205,11 @@ def test_file_does_not_exist(self):
         r = SuiteRunner(config, entries)
         r.add_callbacks(
             print_callback=TestTestSuiteRunner.dummy_callback,
-            simstarting_callback=TestTestSuiteRunner.dummy_callback,
-            casecompleted_callback=TestTestSuiteRunner.dummy_callback,
-            simulationscomplete_callback=TestTestSuiteRunner.dummy_callback,
-            diffcompleted_callback=TestTestSuiteRunner.dummy_callback,
-            alldone_callback=TestTestSuiteRunner.dummy_callback,
+            sim_starting_callback=TestTestSuiteRunner.dummy_callback,
+            case_completed_callback=TestTestSuiteRunner.dummy_callback,
+            simulations_complete_callback=TestTestSuiteRunner.dummy_callback,
+            diff_completed_callback=TestTestSuiteRunner.dummy_callback,
+            all_done_callback=TestTestSuiteRunner.dummy_callback,
             cancel_callback=TestTestSuiteRunner.dummy_callback
         )
         diff_results = r.run_test_suite()
@@ -2281,7 +2364,6 @@ def test_not_present(self):
 """, mod_text)
 
     def test_already_there_no_unit_conv(self):
-
         idf_text = """
 
   Zone,
@@ -2321,7 +2403,6 @@ def test_already_there_no_unit_conv(self):
 """, mod_text)
 
     def test_already_there_with_unit_conv(self):
-
         idf_text = """
 
   Zone,
@@ -2366,7 +2447,7 @@ def test_not_present_epjson(self):
             idf_text=idf_text,
             force_output_sql=ForceOutputSQL.SIMPLEANDTABULAR,
             force_output_sql_unitconv=ForceOutputSQLUnitConversion.NOFORCE,
-            isEpJSON=True
+            is_ep_json=True
         )
 
         expected_data = {'Output:SQLite': {'Output:SQLite 1': {'option_type': 'SimpleAndTabular'}}}
@@ -2380,7 +2461,7 @@ def test_present_epjson(self):
             idf_text=idf_text,
             force_output_sql=ForceOutputSQL.SIMPLEANDTABULAR,
             force_output_sql_unitconv=ForceOutputSQLUnitConversion.NOFORCE,
-            isEpJSON=True
+            is_ep_json=True
         )
 
         expected_data = {
@@ -2391,9 +2472,17 @@ def test_present_epjson(self):
             idf_text=idf_text,
             force_output_sql=ForceOutputSQL.SIMPLEANDTABULAR,
             force_output_sql_unitconv=ForceOutputSQLUnitConversion.InchPound,
-            isEpJSON=True
+            is_ep_json=True
         )
 
         expected_data = {
             'Output:SQLite': {'Output:SQLite 4': {'option_type': 'SimpleAndTabular', 'unit_conversion': 'InchPound'}}}
         self.assertEqual(json.dumps(expected_data, indent=4), mod_text)
+
+    def test_modify_sqlite_with_bad_inputs(self):
+        with self.assertRaises(ValueError):
+            # noinspection PyTypeChecker
+            SuiteRunner.add_or_modify_output_sqlite("", "BLAH", ForceOutputSQLUnitConversion.NOFORCE)
+        with self.assertRaises(ValueError):
+            # noinspection PyTypeChecker
+            SuiteRunner.add_or_modify_output_sqlite("", ForceOutputSQL.NOFORCE, "BLAH")
diff --git a/epregressions/tk_window.py b/epregressions/tk_window.py
index 68ccba6..d199c2d 100644
--- a/epregressions/tk_window.py
+++ b/epregressions/tk_window.py
@@ -962,11 +962,11 @@ def client_run(self):
             return
         self.background_operator = SuiteRunner(run_configuration, idfs_to_run)
         self.background_operator.add_callbacks(print_callback=MyApp.print_listener,
-                                               simstarting_callback=MyApp.starting_listener,
-                                               casecompleted_callback=MyApp.case_completed_listener,
-                                               simulationscomplete_callback=MyApp.runs_complete_listener,
-                                               diffcompleted_callback=MyApp.diff_complete_listener,
-                                               alldone_callback=MyApp.done_listener,
+                                               sim_starting_callback=MyApp.starting_listener,
+                                               case_completed_callback=MyApp.case_completed_listener,
+                                               simulations_complete_callback=MyApp.runs_complete_listener,
+                                               diff_completed_callback=MyApp.diff_complete_listener,
+                                               all_done_callback=MyApp.done_listener,
                                                cancel_callback=MyApp.cancelled_listener)
         self.set_gui_status_for_run(True)
         self.long_thread = Thread(target=self.background_operator.run_test_suite)