The addDemand/removeDemand notifications should be reviewed and fixed.
A few examples:

• a sequence of setMode(Mode.ACTIVE), setMode(Mode.NEVER), setMode(Mode.ACTIVE), could generate a removeDemand() notification to dependencies followed by a double sequence of addDemand(). The correct would be addDemand(), removeDemand() and addDemand(), in that order
• if going from ON_DEMAND or PASSIVE mode with demandedByCount > 0 to ACTIVE mode, the service will send an addDemand notification, although the service has already notified its dependencies before when demandedByCount went from 0 to 1. Thus, we have a double addDemand notification being sent to dependencies