diff --git a/rw_core/mocks/adapter_olt.go b/rw_core/mocks/adapter_olt.go
index 303bae3..f145ab6 100644
--- a/rw_core/mocks/adapter_olt.go
+++ b/rw_core/mocks/adapter_olt.go
@@ -190,7 +190,7 @@
 		cloned := proto.Clone(device).(*voltha.Device)
 		// Update the all ports state on that device to disable
 		if err := oltA.coreProxy.PortsStateUpdate(context.TODO(), cloned.Id, voltha.OperStatus_UNKNOWN); err != nil {
-			log.Fatalf("updating-ports-failed", log.Fields{"deviceId": device.Id, "error": err})
+			log.Warnw("updating-ports-failed", log.Fields{"deviceId": device.Id, "error": err})
 		}
 
 		//Update the device state
@@ -198,7 +198,9 @@
 		cloned.OperStatus = voltha.OperStatus_UNKNOWN
 
 		if err := oltA.coreProxy.DeviceStateUpdate(context.TODO(), cloned.Id, cloned.ConnectStatus, cloned.OperStatus); err != nil {
-			log.Fatalf("device-state-update-failed", log.Fields{"deviceId": device.Id, "error": err})
+			// Device may already have been deleted in the core
+			log.Warnw("device-state-update-failed", log.Fields{"deviceId": device.Id, "error": err})
+			return
 		}
 
 		if err := oltA.updateDevice(cloned); err != nil {
@@ -207,7 +209,8 @@
 
 		// Tell the Core that all child devices have been disabled (by default it's an action already taken by the Core
 		if err := oltA.coreProxy.ChildDevicesLost(context.TODO(), cloned.Id); err != nil {
-			log.Fatalf("lost-notif-of-child-devices-failed", log.Fields{"deviceId": device.Id, "error": err})
+			// Device may already have been deleted in the core
+			log.Warnw("lost-notif-of-child-devices-failed", log.Fields{"deviceId": device.Id, "error": err})
 		}
 	}()
 	return nil
@@ -262,7 +265,8 @@
 
 		if Port.Type == voltha.Port_PON_OLT {
 			if err := oltA.coreProxy.PortStateUpdate(context.TODO(), deviceId, voltha.Port_PON_OLT, Port.PortNo, voltha.OperStatus_DISCOVERED); err != nil {
-				log.Fatalf("updating-ports-failed", log.Fields{"device-id": deviceId, "error": err})
+				// Corresponding device may have been deleted
+				log.Warnw("updating-ports-failed", log.Fields{"device-id": deviceId, "error": err})
 			}
 		}
 	}()
diff --git a/rw_core/mocks/adapter_onu.go b/rw_core/mocks/adapter_onu.go
index 73ee749..c31cb93 100644
--- a/rw_core/mocks/adapter_onu.go
+++ b/rw_core/mocks/adapter_onu.go
@@ -62,20 +62,12 @@
 			log.Fatalf("deviceUpdate-failed-%s", res)
 		}
 
-		// Updating the device states twice, once with oper status to discovered and followed by active may cause
-		// a failure for unit tests when these requests reaches the Core within a millisecond of each other (with real
-		// hardware will not happen as the time between these requests is much higher than 1 millisecond).  For
-		// some reasons this issue is seen on Jenkins but not when running the tests locally. The issue
-		// in the core is triggered when these requests are processed out of order (an issue in the Core that is
-		// being handled by https://jira.opencord.org/browse/VOL-2164).
-		// TODO:  Once the above change is completed then this code can be uncommented.
+		d.ConnectStatus = voltha.ConnectStatus_REACHABLE
+		d.OperStatus = voltha.OperStatus_DISCOVERED
 
-		//d.ConnectStatus = voltha.ConnectStatus_REACHABLE
-		//d.OperStatus = voltha.OperStatus_DISCOVERED
-
-		//if err := onuA.coreProxy.DeviceStateUpdate(context.TODO(), d.Id, d.ConnectStatus, d.OperStatus); err != nil {
-		//	log.Fatalf("device-state-update-failed-%s", err)
-		//}
+		if err := onuA.coreProxy.DeviceStateUpdate(context.TODO(), d.Id, d.ConnectStatus, d.OperStatus); err != nil {
+			log.Fatalf("device-state-update-failed-%s", err)
+		}
 
 		uniPortNo := uint32(2)
 		if device.ProxyAddress != nil {
@@ -163,14 +155,17 @@
 		cloned := proto.Clone(device).(*voltha.Device)
 		// Update the all ports state on that device to disable
 		if err := onuA.coreProxy.PortsStateUpdate(context.TODO(), cloned.Id, voltha.OperStatus_UNKNOWN); err != nil {
-			log.Fatalf("updating-ports-failed", log.Fields{"deviceId": device.Id, "error": err})
+			// Device may also have been deleted in the Core
+			log.Warnw("updating-ports-failed", log.Fields{"deviceId": device.Id, "error": err})
+			return
 		}
 		//Update the device state
 		cloned.ConnectStatus = voltha.ConnectStatus_UNREACHABLE
 		cloned.OperStatus = voltha.OperStatus_UNKNOWN
 
 		if err := onuA.coreProxy.DeviceStateUpdate(context.TODO(), cloned.Id, cloned.ConnectStatus, cloned.OperStatus); err != nil {
-			log.Fatalf("device-state-update-failed", log.Fields{"deviceId": device.Id, "error": err})
+			log.Warnw("device-state-update-failed", log.Fields{"deviceId": device.Id, "error": err})
+			return
 		}
 		if err := onuA.updateDevice(cloned); err != nil {
 			log.Fatalf("saving-device-failed-%s", err)
diff --git a/rw_core/mocks/device_manager.go b/rw_core/mocks/device_manager.go
index 45e5af5..b3d63cb 100644
--- a/rw_core/mocks/device_manager.go
+++ b/rw_core/mocks/device_manager.go
@@ -22,7 +22,9 @@
 	"github.com/opencord/voltha-protos/v3/go/voltha"
 )
 
-// DeviceManager -
+// DeviceManager represents a mock of a device manager that implements the coreif/DeviceManager interface.  It provides
+// default behaviors. For non-default behavior, another implementation of the coreif/DeviceManager interface must be
+// used.
 type DeviceManager struct {
 }
 
@@ -37,152 +39,51 @@
 }
 
 // NotifyInvalidTransition -
-func (dm *DeviceManager) NotifyInvalidTransition(ctx context.Context, pcDevice *voltha.Device) error {
-	return nil
-}
-
-// SetAdminStateToEnable -
-func (dm *DeviceManager) SetAdminStateToEnable(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) NotifyInvalidTransition(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // CreateLogicalDevice -
-func (dm *DeviceManager) CreateLogicalDevice(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) CreateLogicalDevice(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // SetupUNILogicalPorts -
-func (dm *DeviceManager) SetupUNILogicalPorts(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) SetupUNILogicalPorts(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // DisableAllChildDevices -
-func (dm *DeviceManager) DisableAllChildDevices(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) DisableAllChildDevices(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // DeleteLogicalDevice -
-func (dm *DeviceManager) DeleteLogicalDevice(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) DeleteLogicalDevice(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // DeleteLogicalPorts -
-func (dm *DeviceManager) DeleteLogicalPorts(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) DeleteLogicalPorts(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // DeleteAllChildDevices -
-func (dm *DeviceManager) DeleteAllChildDevices(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) DeleteAllChildDevices(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // DeleteAllUNILogicalPorts -
-func (dm *DeviceManager) DeleteAllUNILogicalPorts(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) DeleteAllUNILogicalPorts(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
 // RunPostDeviceDelete -
-func (dm *DeviceManager) RunPostDeviceDelete(ctx context.Context, cDevice *voltha.Device) error {
+func (dm *DeviceManager) RunPostDeviceDelete(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }
 
-// ListDevices -
-func (dm *DeviceManager) ListDevices() (*voltha.Devices, error) {
-	return nil, nil
-}
-
-// ListDeviceIds -
-func (dm *DeviceManager) ListDeviceIds() (*voltha.IDs, error) {
-	return nil, nil
-}
-
-// ReconcileDevices -
-func (dm *DeviceManager) ReconcileDevices(ctx context.Context, ids *voltha.IDs, ch chan interface{}) {
-}
-
-// CreateDevice -
-func (dm *DeviceManager) CreateDevice(ctx context.Context, device *voltha.Device, ch chan interface{}) {
-}
-
-// EnableDevice -
-func (dm *DeviceManager) EnableDevice(ctx context.Context, id *voltha.ID, ch chan interface{}) {
-}
-
-// DisableDevice -
-func (dm *DeviceManager) DisableDevice(ctx context.Context, id *voltha.ID, ch chan interface{}) {
-}
-
-// RebootDevice -
-func (dm *DeviceManager) RebootDevice(ctx context.Context, id *voltha.ID, ch chan interface{}) {
-}
-
-// DeleteDevice -
-func (dm *DeviceManager) DeleteDevice(ctx context.Context, id *voltha.ID, ch chan interface{}) {
-}
-
-// StopManagingDevice -
-func (dm *DeviceManager) StopManagingDevice(id string) {
-}
-
-// DownloadImage -
-func (dm *DeviceManager) DownloadImage(ctx context.Context, img *voltha.ImageDownload, ch chan interface{}) {
-}
-
-// CancelImageDownload -
-func (dm *DeviceManager) CancelImageDownload(ctx context.Context, img *voltha.ImageDownload, ch chan interface{}) {
-}
-
-// ActivateImage -
-func (dm *DeviceManager) ActivateImage(ctx context.Context, img *voltha.ImageDownload, ch chan interface{}) {
-}
-
-// RevertImage -
-func (dm *DeviceManager) RevertImage(ctx context.Context, img *voltha.ImageDownload, ch chan interface{}) {
-}
-
-// GetImageDownloadStatus -
-func (dm *DeviceManager) GetImageDownloadStatus(ctx context.Context, img *voltha.ImageDownload, ch chan interface{}) {
-}
-
-// UpdateImageDownload -
-func (dm *DeviceManager) UpdateImageDownload(deviceID string, img *voltha.ImageDownload) error {
-	return nil
-}
-
-// SimulateAlarm -
-func (dm *DeviceManager) SimulateAlarm(ctx context.Context, simulatereq *voltha.SimulateAlarmRequest, ch chan interface{}) {
-}
-
-// GetImageDownload -
-func (dm *DeviceManager) GetImageDownload(ctx context.Context, img *voltha.ImageDownload) (*voltha.ImageDownload, error) {
-	return nil, nil
-}
-
-// ListImageDownloads -
-func (dm *DeviceManager) ListImageDownloads(ctx context.Context, deviceID string) (*voltha.ImageDownloads, error) {
-	return nil, nil
-}
-
-// UpdatePmConfigs -
-func (dm *DeviceManager) UpdatePmConfigs(ctx context.Context, pmConfigs *voltha.PmConfigs, ch chan interface{}) {
-}
-
-// ListPmConfigs -
-func (dm *DeviceManager) ListPmConfigs(ctx context.Context, deviceID string) (*voltha.PmConfigs, error) {
-	return nil, nil
-}
-
-// DeletePeerPorts -
-func (dm *DeviceManager) DeletePeerPorts(fromDeviceID string, deviceID string) error {
-	return nil
-}
-
-// ProcessTransition -
-func (dm *DeviceManager) ProcessTransition(previous *voltha.Device, current *voltha.Device) error {
-	return nil
-}
-
-// ChildDeviceLost -
-func (dm *DeviceManager) ChildDeviceLost(ctx context.Context, cDevice *voltha.Device) error {
+// childDeviceLost -
+func (dm *DeviceManager) ChildDeviceLost(ctx context.Context, cDevice *voltha.Device, pDevice *voltha.Device) error {
 	return nil
 }