Renamed write to replace
Reordered ManageMessageDelivererTest's
Added additional device management methods