Refs #18763, fix tests