Fixed two tests in previous commit; refs #16311.