Various improvements.

Please let me know if you require any changes.

Thanks for the plugin.
It's used in the ServiceInfo tests. After this you can compare ServiceInfo objects directly instead of their properties.