Revert scenario test back