Fix CppUTest support