Refactor UpdatesBufferTest to use subtests, still not so DRY but surely less dependent on state