Merge pull request #607 from nulltoken/fix/file-close-on-error test helpers: Fix file close on error