Same of this change in scenario test PR please revert or let me know if u really want it so i can confirm with RDFE folks that it's ok.