small file I/O fixes
Merge branch 'master' of https://github.com/nnordhof/TestGen