minor test fixes
Merge pull request #1610 from eileenmcnaughton/master

minor test fixes