add test stubs
move caching from load to from_storage
cleanup
Merge pull request #17 from jmcarp/master

Misc Fixes