Refs #9568. Various style/test improvements