- fix storages reset
- add some functional tests (refs #1)