Got rid of all risky tests