Refs #14901 - Update testing framework and tests