BUG: Refs #0283. Fixed AssetstoreModelTest failures created by these changes.
BUG: Refs #0283. Fixed AssetstoreModelTest failures created by these changes.

mgrauer/qibench,jcfr/Midas,jcfr/Midas,mgrauer/qibench,jcfr/Midas,jcfr/Midas,mgrauer/qibench,mgrauer/qibench,mgrauer/qibench,jcfr/Midas,jcfr/Midas,mgrauer/qibench,mgrauer/qibench