Fixes bug 935621 replace a few terms in the tests