Convert all Predicates to the new tests