Predicate protection improvements, though slightly futile... Renamed test package