Update the scenario to verify multiple waypoints in one step and also to
be able run test web-only, service-only or both
Update the scenario to verify multiple waypoints in one step and also to
be able run test web-only, service-only or both