Working on the tests
Merge branch 'develop' of git://github.com/burzum/FileStorage into develop