Fixes for TestOptimisticConflictChecker