Fix Unit Tests
Merge pull request #119 from wshafer/master

Fix Unit Tests
Merge remote-tracking branch 'upstream/master'