Scenario fixes and updates to use Customer