Fix sync test failures.