Removed TestStorageUtil and removed some methods from StorageManager.