change test to adjust to changed merge params