diff --git a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaUniEvcServiceManager.java b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaUniEvcServiceManager.java
index f965541..f4e23e6 100644
--- a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaUniEvcServiceManager.java
+++ b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaUniEvcServiceManager.java
@@ -119,14 +119,13 @@
 
         ArrayList anis = new ArrayList<AnnotatedNodeInfo>();
         for (BwpGroup bwpGrp:mseaUniEvcService.mefServices().profiles().bwpGroup()) {
-            String bwpGroupIndex = String.valueOf(bwpGrp.groupIndex());
 
             ResourceId.Builder ridBuilder = ResourceId.builder()
                     .addBranchPointSchema("/", null)
                     .addBranchPointSchema("mef-services", MSEA_UNI_EVC_SVC_NS)
                     .addBranchPointSchema("profiles", MSEA_UNI_EVC_SVC_NS)
                     .addBranchPointSchema("bwp-group", MSEA_UNI_EVC_SVC_NS)
-                    .addKeyLeaf("group-index", MSEA_UNI_EVC_SVC_NS, bwpGroupIndex);
+                    .addKeyLeaf("group-index", MSEA_UNI_EVC_SVC_NS, bwpGrp.groupIndex());
 
             AnnotatedNodeInfo ani = DefaultAnnotatedNodeInfo.builder()
                     .resourceId(ridBuilder.build())
diff --git a/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/EA1000MeterProviderTest.java b/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/EA1000MeterProviderTest.java
index 3142ac1..b00b321 100644
--- a/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/EA1000MeterProviderTest.java
+++ b/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/EA1000MeterProviderTest.java
@@ -19,7 +19,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.drivers.microsemi.yang.MockMseaUniEvcServiceManager;
@@ -93,7 +92,6 @@
     }
 
     @Test
-    @Ignore("fixme: failing with onos-yang-tools-2.2.0-b1")
     public void testPerformMeterOperationDeviceIdMeterRemove() {
         DeviceId mockDeviceId = DeviceId.deviceId("netconf:1.2.3.4:830");