Added [cjohansen] set of additional asserts to gain more readability of the unit-test code.