Refactored storage.js
Simplified tests and serviceWrapper.js. Removed redundant test-checks covered by other tests.