StorageHierarchy improved, new method in HierarchyStorage, added some tests