test fixes
Merge pull request #4571 from eileenmcnaughton/4.4

test fixes