Implement Storage Unit Test & Corresponding Bugfix