Clean up predicates; restore tests