Improved stability of sync feature
fixed this fuckin tests