minor refactoring with more comprehnsive storage tests