Re #8635. Fixing mixed up tests.