issue #23108: tweak tests to pass