diff --git a/rw_core/test/core_nbi_handler_multi_test.go b/rw_core/test/core_nbi_handler_multi_test.go
index 88b00eb..e6c4213 100755
--- a/rw_core/test/core_nbi_handler_multi_test.go
+++ b/rw_core/test/core_nbi_handler_multi_test.go
@@ -22,8 +22,14 @@
 	"fmt"
 	"io"
 	"math/rand"
+	"os"
+	"runtime"
+	"runtime/pprof"
+	"strconv"
 	"strings"
 	"sync"
+	"testing"
+	"time"
 
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/ptypes/empty"
@@ -36,13 +42,6 @@
 	"github.com/opencord/voltha-protos/v5/go/voltha"
 	"google.golang.org/grpc"
 
-	"os"
-	"runtime"
-	"runtime/pprof"
-	"strconv"
-	"testing"
-	"time"
-
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/opencord/voltha-go/rw_core/config"
 	c "github.com/opencord/voltha-go/rw_core/core"
@@ -683,7 +682,7 @@
 
 	//Now remove the device
 	_, err = nbi.DeleteDevice(getContext(), &voltha.ID{Id: oltDevice.Id})
-	assert.Nil(t, err)
+	assert.NotNil(t, err)
 
 	// Wait for the delete event
 	event := <-ch