Bugfixes Refs #20047
Fix and adjust unit tests Refs #18140