Add more predicates, use expressive-assert