Test case fixes