We follow this pattern for other bindings as well (add/update/delete separately), but I do agree that this was fairly slow running. How much does the consistency between bindings matter in re tests?