these are the first changes to using CppUnitTests