fixed test CONFLICT-LOCKED, it acquired locks in the wrong thread