Remove remaining odd ducks from tests.