Added more tests to perform data cleanup tasks and made to read from config files