Refactor and fix issues after merging master

Author: AntoineGautier

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZCoilWaterHeatingCooling.txt

@@ -172,3 +172,9 @@ test-optimica:
 	(cd $(ROOT)/Buildings && \
 	  export PYTHONPATH=$(TRAVIS_BUILD_DIR)/Buildings/Resources/Python-Sources && \
 	  python3 ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool optimica --skip-verification -n $(NPROC))
+
+test-templates-dymola:
+	(cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh Dymola)
+
+test-templates-optimica:
+	(cd $(ROOT)/Buildings && ../Buildings/Resources/Scripts/travis/templates/checkandrun.sh Optimica)

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_AirHandlersFans_Validation_VAVMZDedicatedDampersAirflow.txt

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-# Requires Python >= 3.9
-
 # This script shall be run from the directory `modelica-buildings/Buildings`,
 # i.e., where the top-level `package.mo` file can be found.
 # The script takes as an optional positional argument the Modelica tool to use