cppunits tests converted to gtest
Fix for new gtest tests