Fix listener tests with UCP split out