Fixed issues with tests caused by prior commit
Merge pull request #4 from cdlib/bug-fix-tests

Fixed issues with tests caused by prior commit