Correct a unit test and location of 2 doc strings
Merge pull request #87 from jafingerhut/master

Correct a unit test and location of 2 doc strings