simplify discrete tests