Adding Storage, Unittesting, unittests. Fixed typo that caused a bug.
Thank you unit test for detecting this very early and save me lots of
trouble later on.