StorageHierarchy added, some tests