Refactor test to make sure it does not leave behind old tempfiles
Refactor test to make sure it does not leave behind old tempfiles

albertyw/albertyw.com,albertyw/albertyw.com,albertyw/albertyw.com,albertyw/albertyw.com,albertyw/albertyw.com