a few minor test fixes/cleanup
Merge pull request #494 from dajohnso/fix_tests

a few minor test fixes/cleanup