Refs #18763, fix tests, recover some hidden tests.
Merge branch 'fix_tests'