refs #7200 Fixed unit tests