Predicate - addl capabilities and more tests