Refs #14916; Fixed tests