Storage-based FileStorage implementation
some tests for FileStorage

...and some bugfixes