Minor changes
Added Predicate tests