Mock the file system
Tweak templating
Changes to first test
More tests