add test-case for EDB-22655

Change-Id: I96c8ea50425ed82cbbd1f235bd778621956b59ba
add test-case for EDB-22310

Change-Id: I6a7b659b562218e4bdd1b1badf655f65266e8d85