issue #20154: Test tweaks.
issue #20154: Fix so incident and tax authority pass tests.
issue #20154: More fixes.
issue #20154: Bunch of broken stuff. Lots of work to fix.