Fixes bug 935621 replace a few terms in the tests
Merge pull request #1658 from selenamarie/bug935621-replace-terms-in-tests

Fixes bug 935621 replace a few terms in the tests