Fixing tests, not enforcing file read since it plays against templating