Change test to leverage CUnit test framework