More cleanup of test cases