Issue #21205: Fix unit tests
2 files changed