Updates to CppUTest tests to enable new build

These changes were required to get the unit tests to compile with the
new MRI makefiles that I am working on.
Merge remote-tracking branch 'origin/master'