diff --git a/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowPusherTest.java b/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowPusherTest.java
index 612100b..4779b75 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowPusherTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowPusherTest.java
@@ -482,6 +482,7 @@
 		pusher.stop();
 	}
 	
+	@SuppressWarnings("unchecked")
 	private void beginInitMock() {
 		context = EasyMock.createMock(FloodlightContext.class);
 		modContext = EasyMock.createMock(FloodlightModuleContext.class);
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 51b5ef2..5b1bbdd 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizerTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizerTest.java
@@ -48,10 +48,10 @@
 		idRemoved = new ArrayList<Long>();
 		
 		pusher = EasyMock.createMock(FlowPusher.class);
-		EasyMock.expect(pusher.add(EasyMock.anyObject(IOFSwitch.class), EasyMock.anyObject(OFMessage.class)))
-			.andAnswer(new IAnswer<Boolean>() {
+		pusher.add(EasyMock.anyObject(IOFSwitch.class), EasyMock.anyObject(OFMessage.class));
+		EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
 				@Override
-				public Boolean answer() throws Throwable {
+				public Object answer() throws Throwable {
 					OFMessage msg = (OFMessage)EasyMock.getCurrentArguments()[1];
 					if (msg.getType().equals(OFType.FLOW_MOD)) {
 						OFFlowMod fm = (OFFlowMod)msg;
@@ -62,10 +62,10 @@
 					return null;
 				}
 			}).anyTimes();
-		EasyMock.expect(pusher.pushFlowEntry(EasyMock.anyObject(IOFSwitch.class), EasyMock.anyObject(FlowEntry.class)))
-		.andAnswer(new IAnswer<Boolean>() {
+		pusher.pushFlowEntry(EasyMock.anyObject(IOFSwitch.class), EasyMock.anyObject(FlowEntry.class));
+		EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
 			@Override
-			public Boolean answer() throws Throwable {
+			public Object answer() throws Throwable {
 				FlowEntry flow = (FlowEntry)EasyMock.getCurrentArguments()[1];
 				idAdded.add(flow.flowEntryId().value());
 				return null;