tearDown and cleanUpFile added again