Add tests for optimistic locking contention on single vs multiple entities