Replace the use of private monkeypatch fixture API

Replace the use of private monkeypatch fixture API #2456