Bug 958782 - 3/3: fix test cases.