Fixed more risky tests.