bug 980468: Improvements to the unit test.