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 2e21ea3..b49fbc4 100644
--- a/app/src/test/java/org/opencord/aaa/impl/AaaTestBase.java
+++ b/app/src/test/java/org/opencord/aaa/impl/AaaTestBase.java
@@ -23,7 +23,8 @@
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
-
+import org.onosproject.cfg.ComponentConfigService;
+import org.onosproject.cfg.ConfigProperty;
 import org.onosproject.net.Annotations;
 import org.onosproject.net.device.DeviceServiceAdapter;
 import org.onosproject.net.ConnectPoint;
@@ -42,9 +43,16 @@
 import org.opencord.sadis.BaseInformationService;
 import org.opencord.sadis.SadisService;
 import org.opencord.sadis.SubscriberAndDeviceInformation;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.ComponentInstance;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -100,6 +108,67 @@
             }
         }
     }
+    class MockComponentContext implements ComponentContext {
+
+                @Override
+                public Dictionary<String, Object> getProperties() {
+                        Dictionary<String, Object> cfgDict = new Hashtable<String, Object>();
+                        cfgDict.put("statisticsGenerationEvent", 20);
+                        return cfgDict;
+                }
+
+                @Override
+                public Object locateService(String name) {
+                        // TODO Auto-generated method stub
+                        return null;
+                }
+
+                @Override
+                public Object locateService(String name, ServiceReference reference) {
+                        // TODO Auto-generated method stub
+                        return null;
+                }
+
+                @Override
+                public Object[] locateServices(String name) {
+                        // TODO Auto-generated method stub
+                        return null;
+                }
+
+                @Override
+                public BundleContext getBundleContext() {
+                        // TODO Auto-generated method stub
+                        return null;
+                }
+
+                @Override
+                public Bundle getUsingBundle() {
+                        // TODO Auto-generated method stub
+                        return null;
+                }
+
+                @Override
+                public ComponentInstance getComponentInstance() {
+                        // TODO Auto-generated method stub
+                        return null;
+                }
+
+                @Override
+                public void enableComponent(String name) {
+                        // TODO Auto-generated method stub
+                }
+
+                @Override
+                public void disableComponent(String name) {
+                       // TODO Auto-generated method stub
+                }
+
+                @Override
+                public ServiceReference getServiceReference() {
+                       // TODO Auto-generated method stub
+                       return null;
+                }
+    }
 
     /**
      * Mocks the DeviceService.
@@ -173,6 +242,55 @@
         }
     }
 
+    final class MockCfgService implements ComponentConfigService {
+        @Override
+        public Set<String> getComponentNames() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public void registerProperties(Class<?> componentClass) {
+            // TODO Auto-generated method stub
+        }
+
+        @Override
+        public void unregisterProperties(Class<?> componentClass, boolean clear) {
+            // TODO Auto-generated method stub
+        }
+
+        @Override
+        public Set<ConfigProperty> getProperties(String componentName) {
+           return null;
+        }
+
+        @Override
+        public void setProperty(String componentName, String name, String value) {
+            // TODO Auto-generated method stub
+        }
+
+        @Override
+        public void preSetProperty(String componentName, String name, String value) {
+            // TODO Auto-generated method stub
+        }
+
+        @Override
+        public void preSetProperty(String componentName, String name, String value, boolean override) {
+            // TODO Auto-generated method stub
+        }
+
+        @Override
+        public void unsetProperty(String componentName, String name) {
+            // TODO Auto-generated method stub
+        }
+
+        @Override
+        public ConfigProperty getProperty(String componentName, String attribute) {
+           return null;
+        }
+
+}
+
     final class MockSubService implements BaseInformationService<SubscriberAndDeviceInformation> {
         private final VlanId clientCtag = VlanId.vlanId((short) 999);
         private final VlanId clientStag = VlanId.vlanId((short) 111);
