Test case fixes.