Added more unit tests. Refs #8994.