Simplify a statement in storage
Improve tests for storage
Merge pull request #2 from runabove/tests

Improve unit tests