issue #20734: Fix broken tests. Other incremental progress.
Merge pull request #739 from jrogelstad/20734

issue #20734: Fix broken tests. Other incremental progress.