Restructure some test classes
Make descriptor implementations package private
Remove empty method
Add method to retrieve all services
Remove cmment
Add method to retrieve all services