Sync improvements. Espresso tests.