modified all the tests to enable OptimisticConcurrency