Fix some error messages
Fix tests to reflect new hint on predicate mismatch