Fix issue test cases