OOps, NOW i've actually replaced all new File with FileUtil.newFile
new File*Stream -> FileUtil.new*Stream in tests too
And same for new FileReader -> FileUtil.newReader
Forgot imports of FileUtil in all the tests...