Fix credit_order scenario
Update scenarios