Update more test cases