Modify Predicates utility class
Add unit tests for Predicates class