Fix the first few test cases