Fix minor test bugs
Merge pull request #46 from alancutter/minorTestFixes

Fix minor test bugs