fix broken test cases