simplified the Predicate syntax, and fixed the Predicate tests