Update tests to reflect predicate syntax change
Renamed some rules for clarity