CUnit testing clean up