(#2028) - one change per replicate batch

didn't actually need to modify any tests, also since #2008 landed, was reveted and landed again while this one was in being done I went ahead and fixed all the `.then(null, `'s