diff --git a/db/model/proxy_test.go b/db/model/proxy_test.go
index f504ed7..4f97d49 100644
--- a/db/model/proxy_test.go
+++ b/db/model/proxy_test.go
@@ -171,7 +171,9 @@
 	}
 
 	d := &voltha.Device{}
-	if have, err := TestProxyRootDevice.Get(context.Background(), TestProxyDeviceID, d); err != nil {
+
+	have, err := TestProxyRootDevice.Get(context.Background(), TestProxyDeviceID, d)
+	if err != nil {
 		BenchmarkProxyLogger.Errorf(ctx, "Failed get device info from test proxy due to error: %v", err)
 		assert.NotNil(t, err)
 	} else if !have {
@@ -385,15 +387,18 @@
 	}
 
 	device := &voltha.LogicalDevice{}
-	if have, err := TestProxyRootLogicalDevice.Get(context.Background(), "logical_devices", device); err != nil {
+	have, err := TestProxyRootLogicalDevice.Get(context.Background(), "logical_devices", device)
+	if err != nil {
 		BenchmarkProxyLogger.Errorf(ctx, "Failed to get logical device info from logical device proxy due to error: %v", err)
 		assert.NotNil(t, err)
-	} else if !have {
+		return
+	}
+	if !have {
 		t.Error("Failed to find added logical device")
-	} else {
-		if device.String() != TestProxyLogicalDevice.String() {
-			t.Errorf("Logical devices don't match - existing: %+v returned: %+v", TestProxyLogicalDevice, device)
-		}
+		return
+	}
+	if device.String() != TestProxyLogicalDevice.String() {
+		t.Errorf("Logical devices don't match - existing: %+v returned: %+v", TestProxyLogicalDevice, device)
 	}
 }