Refs #10301 Fix broken unit tests