Scenario setup is complete with new alternate method
Scenario 16 now has cherry picking without conflicts and is easier to comprehend