Some code fixes
Do Predicates; rename one method in tests

All done now!