Added more test cases
Fixed predicate error