cleanup risky tests and factoring