Code restructure to allow disposing of mock and real watchable services.
Fixed double dispose of mock services.
Updates in preperation for adding a proxy service object that
IWatchableDevices will create rather than giving an IWatchableService to
client code.