Fix risky tests