Add Junit tests
Refactor UPnp service management