Added more predicate tests

Also renamed tests for easier identification