Issue #11852: Add missing imports and update tests.
3 files changed