Expand error handling specs
Fix predicate property key formatting