add tests
fix datastorage
Merge remote-tracking branch 'origin/master'