Added new services and tests