Update of testing cases due to changes in issue 23106