[KTP-269] minor fix and two more test cases