Bug 916607 - 4/4: fix test cases.