Made some sketchy unit tests not fail so easily
Merge pull request #73 from sfoley/master

Fixed some lingering buildbot unit test erros