test fixes
Merge pull request #4580 from eileenmcnaughton/4.4

test fixes