Updated the tests for issue #20259