Add improvements to testcase
Merge branch 'regtest-michael-0921-' into add-handler-regtest
Working re-org protection