More test fixing
Merge pull request #61 from bigamckay/wip/test-fixes2

Wip/test fixes2