diff --git a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
index cbb4b17..5ab79ed 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
@@ -60,8 +60,6 @@
 import net.floodlightcontroller.test.FloodlightTestCase;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
 import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
-import net.onrc.onos.ofcontroller.flowmanager.FlowManager;
-import net.onrc.onos.ofcontroller.flowmanager.IFlowService;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.onrc.onos.ofcontroller.linkdiscovery.internal.LinkDiscoveryManager;
 import net.onrc.onos.ofcontroller.topology.ITopologyNetService;
@@ -121,7 +119,6 @@
         
         // Following added by ONOS
         // TODO replace with mock if further testing is needed.
-        fmc.addService(IFlowService.class, new FlowManager() );
         fmc.addService(ITopologyNetService.class, new TopologyManager() );
         StandaloneRegistry sr = new StandaloneRegistry();
         fmc.addService(IControllerRegistryService.class, sr );
diff --git a/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizerTest.java b/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizerTest.java
index 28f221d..a1398ee 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizerTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizerTest.java
@@ -12,7 +12,6 @@
 import net.onrc.onos.graph.DBOperation;
 import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IFlowEntry;
 import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
-import net.onrc.onos.ofcontroller.flowmanager.FlowDatabaseOperation;
 import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService.MsgPriority;
 import net.onrc.onos.ofcontroller.flowprogrammer.IFlowSyncService.SyncResult;
 import net.onrc.onos.ofcontroller.util.FlowEntry;
@@ -39,7 +38,7 @@
 // Test should be fixed to fit RAMCloud basis
 @Ignore
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({FlowSynchronizer.class, DBOperation.class, FlowDatabaseOperation.class})
+@PrepareForTest({FlowSynchronizer.class, DBOperation.class})
 public class FlowSynchronizerTest {
 	private FlowPusher pusher;
 	private FlowSynchronizer sync;
@@ -257,6 +256,11 @@
 	 * @param idList List of FlowEntry IDs stored in DB.
 	 */
 	private void initMockGraph(long[] idList) {
+	    /*
+	     * TODO: The old FlowDatabaseOperation class is gone, so the method
+	     * below needs to be rewritten.
+	     */
+	    /*
 		List<IFlowEntry> flowEntryList = new ArrayList<IFlowEntry>();
 		
 		for (long id : idList) {
@@ -301,6 +305,7 @@
 			fail("Failed to create DBOperation");
 		}
 		PowerMock.replay(DBOperation.class);
+	    */
 	}
 	
 	/**