Issue #17177: Stop using imp in a bunch of tests
7 files changed