refs #7228 fixing unit tests