Some test fixes
Merge pull request #69 from JakeGinnivan/MoreTestFixes

Some test fixes