try and help scan-build out wrt cppunit asserts

Change-Id: Id86607802415ad069aa88be98012a5c99f594218