Redefined predicates, added DS test
Merge pull request #22 from ajstanley/7.x

Redefined predicates, added DS test