ECMS-4514 fix test failure on StorageTest