Fix test cases

Fix broken test cases