Added some standard where clause predicates and updated test to use them