*BLI20109 - adjust testcases
 according to the last changes
 
[[pair-programming: cohe]]
[[review: cohe]]