minor test fixes
Merge pull request #1299 from dajohnso/more_tests_fixes

minor test fixes