The unhighlight option needs to respect the services pending status
Fixed failing existing tests from topology changes