Fixing bug related to https://github.com/NREL/OpenStudio/issues/816
Fixing unit tests

[#60055098]