Fix model_set tests
Fix model_set tests

tomalrussell/smif,tomalrussell/smif,nismod/smif,willu47/smif,willu47/smif,nismod/smif,willu47/smif,willu47/smif,nismod/smif,nismod/smif,tomalrussell/smif,tomalrussell/smif