Make sync tests more consistent