Fix `before` block in storage specs.

Make storage to return self on additions.
Add more specs for option parser.