added option 'abort_on_deadlock' + testcase