Merge pull request #2284 from eileenmcnaughton/extra-test