Reinstate and fix FileDataStore tests

- Fixed up FileDataStore tests, which weren't run (no test annotation)
- Added logging to support VS Express (i.e. no test debugger)
- Added ToString to a couple of places to facilitate logging