Minor test fixes
Merge pull request #10 from bxjx/minor-test-fixes

Minor test fixes