Fixed broken unit tests.
Merge pull request #54 from jrrideout/master

Fixed broken unit tests.