Scenario 2 complete and running, need to go back to scenario 1 and other tests and update as needed.