diff --git a/app/pom.xml b/app/pom.xml
index 18d1a20..ea99b82 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -38,7 +38,7 @@
         <onos.app.requires>
             org.opencord.sadis
         </onos.app.requires>
-        <sadis.api.version>4.0.1</sadis.api.version>
+        <sadis.api.version>5.0.0-SNAPSHOT</sadis.api.version>
     </properties>
 
     <dependencies>
diff --git a/app/src/test/java/org/opencord/aaa/impl/AaaTestBase.java b/app/src/test/java/org/opencord/aaa/impl/AaaTestBase.java
index 3d7a28b..d2bbeb1 100644
--- a/app/src/test/java/org/opencord/aaa/impl/AaaTestBase.java
+++ b/app/src/test/java/org/opencord/aaa/impl/AaaTestBase.java
@@ -221,11 +221,9 @@
                                            VlanId stag, String nasPortId,
                                            String circuitId, MacAddress hardId,
                                            Ip4Address ipAddress) {
-            this.setCTag(ctag);
             this.setHardwareIdentifier(hardId);
             this.setId(id);
             this.setIPAddress(ipAddress);
-            this.setSTag(stag);
             this.setNasPortId(nasPortId);
             this.setCircuitId(circuitId);
         }