Adding even MOAR environment variables
Adding tests for the ServiceSorter and Services API and refactoring
Service spec
restructuring ServiceSorter for readability