Add junit test on UPnp content directory service
Remove unnecessary code