corrected tests and different style for storage
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #15 from CJentzsch/develop

corrected tests and different style for storage