Fix some test failures
Merge pull request #9 from cunningt/fixfailures

Fixfailures