#5 - Does a little refactoring to allow BdTest to clean up the file system easily.