Bug fixes
Seperated storage tests out