Fix a couple more errors in test cases