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