Fix tests to correspond new changes on Trigger step