Fixed risky tests