refs #16771. Small tests updates. Thanks Adrian Vasiliu (IBM, CCLA).