Added tests for disabling sync.
Fixes from Berdir review