refs #8804 Comments and formatting
refs #8804 fixed last minor things and enabled unit tests.