Minor Adjustments to code ant testing style
Refinement of predicate API