Merge pull request #3165 from eileenmcnaughton/tests