Simplify a statement in storage
Improve tests for storage