D2UpdateMgr members were rescoped to be more appropriate
and unit tests adjusted accordingly. Other minor changes.