Refs #10431 Update unit tests