* Fix ESPHome service removal when the device name contains a dash
If the device name contains a dash the service name is mutated to
replace the dash with an underscore, but the remove function did
not do the same mutation so it would fail to remove the service
* add more coverage
* more cover
