modified CUnit tests
modified CUnit tests
modified CUnit tests