Fix for service_tests - getting the text value off Annotation and TextValue, display name for a service and checking for nil error messages.