Minor test case fixes