Fix test regressions with multiple 'Save and Continue' buttons in checkout