Added comprehensive predicate tests

- split definitions across more focused test files
- replaced predciate tests with comprehensive tests