Redefined predicates, added DS test