Merge pull request #3172 from eileenmcnaughton/tests