Fix unit tests for simulation changes
Fix unit tests for simulation changes

concord-consortium/building-models,concord-consortium/building-models,concord-consortium/building-models,concord-consortium/building-models,concord-consortium/building-models