Issue #2341719 follow-up: fixing the tests