Modified tests to work with new DiskStorage class