Fixing integration tests
latest changes - still trying to ix hibernate optimistic locking error