Merge pull request #3677 from eileenmcnaughton/test-fix