Fix tests and correct predicate for labels