Improved StorageTest Functionality