No real changes, just simplify the code passing the message shown when a test fails to CppUnit a bit.