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

Fix Unit Tests