Added back divert variable code to support huskc
Revised 3.10 section
Added back more passing test suites