Improving the usage of CUnit for testing.