[simeon] refactored several scenarios that did not pass in last report.