Issue #21614: More tests