Fixed some issues during completing unit tests. Refs #9643.