mock.pushScenario setup, with some test changes