Added predicate tracking in testing