Fixed rest of failing SynchornizeService tests