Added Additional Features to FileCleaner and Tester