diff --git a/src/main/java/net/floodlightcontroller/testmodule/TestModule.java b/src/main/java/net/floodlightcontroller/testmodule/TestModule.java
index 3d131556b95dbffb7e6daba2eca9c259c24ad04b..5344ee9a78ad1f4c8e9328023653cc814577bf2c 100644
--- a/src/main/java/net/floodlightcontroller/testmodule/TestModule.java
+++ b/src/main/java/net/floodlightcontroller/testmodule/TestModule.java
@@ -125,7 +125,7 @@ public class TestModule implements IFloodlightModule, IOFSwitchListener {
         //actions.add(factory.actions().setField(factory.oxms().icmpv4Type(ICMPv4Type.ALTERNATE_HOST_ADDRESS))); */
  
         
-        /* ARP TESTS */ mb.setExact(MatchField.ETH_TYPE, EthType.ARP);
+        /* ARP TESTS  mb.setExact(MatchField.ETH_TYPE, EthType.ARP);
         mb.setExact(MatchField.ARP_OP, ArpOpcode.REQUEST);
         mb.setExact(MatchField.ARP_SHA, MacAddress.BROADCAST);
         mb.setExact(MatchField.ARP_SPA, IPv4Address.of("130.127.39.241"));
@@ -138,9 +138,9 @@ public class TestModule implements IFloodlightModule, IOFSwitchListener {
         actions.add(factory.actions().setField(factory.oxms().arpTha(MacAddress.BROADCAST)));
         actions.add(factory.actions().setField(factory.oxms().arpSpa(IPv4Address.of("255.255.255.255"))));
         actions.add(factory.actions().setField(factory.oxms().arpTpa(IPv4Address.of("255.255.255.255")))); 
-        fmb.setTableId(TableId.of(16));
+        fmb.setTableId(TableId.of(16)); */
         
-        /* TP, IP OPT, VLAN TESTS  mb.setExact(MatchField.ETH_TYPE, EthType.IPv4);
+        /* TP, IP OPT, VLAN TESTS */  mb.setExact(MatchField.ETH_TYPE, EthType.IPv4);
         mb.setExact(MatchField.VLAN_PCP, VlanPcp.of((byte) 1)); // might as well test these now too
         //mb.setExact(MatchField.VLAN_VID, OFVlanVidMatch.ofVlan(512));
         mb.setExact(MatchField.MPLS_LABEL, U32.of(32));
@@ -158,6 +158,7 @@ public class TestModule implements IFloodlightModule, IOFSwitchListener {
         actions.add(factory.actions().setField(factory.oxms().ipv4Dst(IPv4Address.of("128.0.3.4")))); 
         actions.add(factory.actions().setField(factory.oxms().sctpSrc(TransportPort.of(22))));
         actions.add(factory.actions().setField(factory.oxms().sctpDst(TransportPort.of(80))));
+        fmb.setTableId(TableId.of(7));
         // these test non-set-field actions
         //actions.add(factory.actions().copyTtlOut());
         //actions.add(factory.actions().pushVlan(EthType.IPv4));
diff --git a/src/main/resources/floodlightdefault.properties b/src/main/resources/floodlightdefault.properties
index 8c52ea6e66abb8e0d19281be4e9d4f24c766b0c4..3dbacb7bae8f06c048021048013811e26471de85 100644
--- a/src/main/resources/floodlightdefault.properties
+++ b/src/main/resources/floodlightdefault.properties
@@ -10,7 +10,7 @@ net.floodlightcontroller.debugevent.DebugEventService,\
 net.floodlightcontroller.staticflowentry.StaticFlowEntryPusher,\
 net.floodlightcontroller.restserver.RestApiServer,\
 net.floodlightcontroller.topology.TopologyManager,\
-net.floodlightcontroller.testmodule.TestModule,\
+net.floodlightcontroller.forwarding.Forwarding,\
 net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager,\
 net.floodlightcontroller.devicemanager.internal.DeviceManagerImpl
 org.sdnplatform.sync.internal.SyncManager.authScheme=CHALLENGE_RESPONSE