test fixes round 2
Merge pull request #1190 from dajohnso/test_fixes_2

test fixes round 2