Sync fixes. First test passed