add test cases for issues 10497 and 10793