Integration test for sync & concurrent edit detection

[matthiasn]

Currently, there is not enough test coverage in this area.

[matthiasn]

Moving to a discussion since improved test coverage is a goal for improved maintainability going forward. Let's discuss how to best tackle this in a pragmatic way.