Fixed Error condition in predicates. Tests that use predicates need to be rewritten.
Fixed Error condition in predicates. Tests that use predicates need to be rewritten.

yongwen/makahiki,jtakayama/makahiki-draft,csdl/makahiki,csdl/makahiki,jtakayama/makahiki-draft,csdl/makahiki,yongwen/makahiki,yongwen/makahiki,jtakayama/makahiki-draft,csdl/makahiki,jtakayama/makahiki-draft,yongwen/makahiki