Added storage test.
Test retrieval as well.
Fixed tests.
Removed some commented out dead code.