Fix broken unit tests
Merge pull request #222 from sharwell/FixUnitTests

Fix broken unit tests