fixed some risky tests