Correct unit tests
Merge pull request #9 from bobbyc/master

Correct unit tests