     }
 
     private func checkIfLocationServicesEnabled() -> NSError? {
-        if CLLocationManager.locationServicesEnabled() {
+        if manager.coreLocationServicesEnabled {
             return nil
         } else {
             return NSError(ELLocationError.LocationServicesDisabled)

        }
    }

    override init() {
        manager = CLLocationManager()
        allLocationListeners = [LocationListener]()
        super.init()
        manager.delegate = self
    }

    
    // MARK: Properties, initializers and internal structures
    
    var manager: ELCLLocationManager
    private var allLocationListeners: [LocationListener]

    /// The current Core Location authorization status
    private var authorizationStatus: CLAuthorizationStatus {
        return manager.coreLocationAuthorizationStatus
    }

    /// The accuracy, based on the current set of listener requests.
