CFY-1418 make storage dir mockable