TDD implemented the file-system based storage - just requires the
adapter to a real file system.
Merge remote-tracking branch 'origin/master'