Closure-ized the tests for files