Changed to use the public CppUTest API and a Terminator