Improved and added tests for Storage