Merge "Fix broken test caused by misordered callback arguments." into cw-e-dev