diff --git a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
index 83919a4..466d363 100644
--- a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -67,8 +67,8 @@
 import org.slf4j.Logger;
 
 import java.util.Dictionary;
-import java.util.Optional;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
diff --git a/impl/src/test/java/org/opencord/olt/impl/TestBase.java b/impl/src/test/java/org/opencord/olt/impl/TestBase.java
index 5153d10..47507fb 100644
--- a/impl/src/test/java/org/opencord/olt/impl/TestBase.java
+++ b/impl/src/test/java/org/opencord/olt/impl/TestBase.java
@@ -229,11 +229,21 @@
         }
 
         @Override
+        public boolean removeAll(Map<K, Collection<? extends V>> mapping) {
+            return false;
+        }
+
+        @Override
         public boolean putAll(K key, Collection<? extends V> values) {
             return false;
         }
 
         @Override
+        public boolean putAll(Map<K, Collection<? extends V>> mapping) {
+            return false;
+        }
+
+        @Override
         public Versioned<Collection<? extends V>> replaceValues(K key, Collection<V> values) {
             return null;
         }