===> Cleaning for CUnit-2.1