diff --git a/src/devices/mesh/dot11s/airtime-metric.cc b/src/devices/mesh/dot11s/airtime-metric.cc
index 9df8a9c6d..72a570b80 100644
--- a/src/devices/mesh/dot11s/airtime-metric.cc
+++ b/src/devices/mesh/dot11s/airtime-metric.cc
@@ -94,11 +94,6 @@ AirtimeLinkMetricCalculator::CalculateMetric (Mac48Address peerAddress, Ptr<Mesh
       mac->GetPifs () + mac->GetSlot () + mac->GetEifsNoDifs () + //DIFS + SIFS + AckTxTime = PIFS + SLOT + EifsNoDifs
       mac->GetWifiPhy () ->CalculateTxDuration (m_testFrame->GetSize (), mode, WIFI_PREAMBLE_LONG)
       ).GetMicroSeconds () / (10.24 * (1.0 - failAvg)));
-  std::cout << "pure overhead is " << (uint32_t)((double)(/*Overhead + payload*/
-      mac->GetPifs () + mac->GetSlot () + mac->GetEifsNoDifs ()
-      ).GetMicroSeconds ()/10.24) << "\n";
-  std::cout << "mode is:" << mode.GetDataRate () << "\n";
-  std::cout << "Metric is :" << metric << "\n";
   return metric;
 }
 } //namespace dot11s
diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap
index cbe7163ed..e3e4ea19d 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap
index 96730b748..cdf57bed9 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap
index 6563289d6..cffba09b4 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap
index 87b257b5c..958b65106 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap
index dee205120..8c3a1d33f 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap
index 8e2ed37de..2a311654d 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
index de77ff16d..155e57b13 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap
index b5d6c17f1..643ccbf46 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
index d8bf4dc1c..5ff07c87c 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap
index 8598cdad9..7958ef642 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
index 76da658c2..f7d66c6ff 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap
index 2c72d0caa..5164b6e78 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap
index e4ccc9865..36422afdc 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
index 3f42ab226..1fe8195c6 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap
index f8e75cdee..2276ec5eb 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap
index fcd2dce3b..1b2ece2c7 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap
index 78232ddfe..0f067ec44 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap
index f8fbb750f..3f8136701 100644
Binary files a/src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap and b/src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap
index 4422a2736..66196523f 100644
Binary files a/src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap and b/src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap differ
diff --git a/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap b/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap
index 49c3afe29..75fc121e9 100644
Binary files a/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap and b/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/flame/test/flame-regression-test-1-1.pcap b/src/devices/mesh/flame/test/flame-regression-test-1-1.pcap
index 15bb0a0be..66ed88df6 100644
Binary files a/src/devices/mesh/flame/test/flame-regression-test-1-1.pcap and b/src/devices/mesh/flame/test/flame-regression-test-1-1.pcap differ
diff --git a/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap b/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap
index 40c2cd3d7..676d2994d 100644
Binary files a/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap and b/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap differ
diff --git a/src/devices/mesh/mesh-wifi-interface-mac.cc b/src/devices/mesh/mesh-wifi-interface-mac.cc
index 3511596a6..55807caf8 100644
--- a/src/devices/mesh/mesh-wifi-interface-mac.cc
+++ b/src/devices/mesh/mesh-wifi-interface-mac.cc
@@ -724,6 +724,16 @@ MeshWifiInterfaceMac::TxFailed (WifiMacHeader const &hdr)
 {
   m_txErrCallback (hdr);
 }
+void
+MeshWifiInterfaceMac::DoStart ()
+{
+  m_beaconDca->Start ();
+  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); i ++)
+  {
+    i->second->Start ();
+  }
+  WifiMac::DoStart ();
+}
 
 void 
 MeshWifiInterfaceMac::FinishConfigureStandard (enum WifiPhyStandard standard)
diff --git a/src/devices/mesh/mesh-wifi-interface-mac.h b/src/devices/mesh/mesh-wifi-interface-mac.h
index d6163b627..16627b072 100644
--- a/src/devices/mesh/mesh-wifi-interface-mac.h
+++ b/src/devices/mesh/mesh-wifi-interface-mac.h
@@ -180,6 +180,8 @@ private:
   bool GetBeaconGeneration () const;
   /// Real d-tor
   virtual void DoDispose ();
+  ///Initiator at t=0
+  void DoStart ();
 
 private:
   typedef std::map<AccessClass, Ptr<DcaTxop> > Queues;
diff --git a/src/devices/wifi/adhoc-wifi-mac.cc b/src/devices/wifi/adhoc-wifi-mac.cc
index a245f84f1..ad2c5de48 100644
--- a/src/devices/wifi/adhoc-wifi-mac.cc
+++ b/src/devices/wifi/adhoc-wifi-mac.cc
@@ -293,4 +293,11 @@ AdhocWifiMac::TxFailed (const WifiMacHeader &hdr)
 {
   m_txErrCallback (hdr);
 }
+void
+AdhocWifiMac::DoStart ()
+{
+  m_dca->Start ();
+  WifiMac::DoStart ();
+}
+
 } // namespace ns3
diff --git a/src/devices/wifi/adhoc-wifi-mac.h b/src/devices/wifi/adhoc-wifi-mac.h
index 2da19ac70..66f4798d9 100644
--- a/src/devices/wifi/adhoc-wifi-mac.h
+++ b/src/devices/wifi/adhoc-wifi-mac.h
@@ -82,6 +82,7 @@ public:
 private:
   // inherited from Object base class.
   virtual void DoDispose (void);
+  void DoStart ();
   /* invoked by the MacLows. */
   void ForwardUp (Ptr<Packet> packet, const WifiMacHeader *hdr);
   AdhocWifiMac (const AdhocWifiMac & ctor_arg);
diff --git a/src/devices/wifi/dca-txop.cc b/src/devices/wifi/dca-txop.cc
index 2bf9ca34f..28ff33700 100644
--- a/src/devices/wifi/dca-txop.cc
+++ b/src/devices/wifi/dca-txop.cc
@@ -268,6 +268,13 @@ DcaTxop::NeedRts (Ptr<const Packet> packet, const WifiMacHeader *header)
                                     packet);
 }
 
+void
+DcaTxop::DoStart ()
+{
+  m_dcf->ResetCw ();
+  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
+  ns3::Dcf::DoStart ();
+}
 bool
 DcaTxop::NeedRtsRetransmission (void)
 {
diff --git a/src/devices/wifi/dca-txop.h b/src/devices/wifi/dca-txop.h
index 3c26aca34..bf7c78028 100644
--- a/src/devices/wifi/dca-txop.h
+++ b/src/devices/wifi/dca-txop.h
@@ -121,7 +121,7 @@ private:
 
   // Inherited from ns3::Object
   Ptr<MacLow> Low (void);
-
+  void DoStart ();
   /* dcf notifications forwarded here */
   bool NeedsAccess (void) const;
   void NotifyAccessGranted (void);
diff --git a/src/devices/wifi/edca-txop-n.cc b/src/devices/wifi/edca-txop-n.cc
index 901238932..67fce8e42 100644
--- a/src/devices/wifi/edca-txop-n.cc
+++ b/src/devices/wifi/edca-txop-n.cc
@@ -1080,5 +1080,11 @@ EdcaTxopN::SendDelbaFrame (Mac48Address addr, uint8_t tid, bool byOriginator)
 
   PushFront (packet, hdr);
 }
-
+void
+EdcaTxopN::DoStart ()
+{
+  m_dcf->ResetCw ();
+  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
+  ns3::Dcf::DoStart ();
+}
 } //namespace ns3
diff --git a/src/devices/wifi/edca-txop-n.h b/src/devices/wifi/edca-txop-n.h
index bb561880f..050dbf300 100644
--- a/src/devices/wifi/edca-txop-n.h
+++ b/src/devices/wifi/edca-txop-n.h
@@ -147,6 +147,7 @@ public:
   void SendDelbaFrame (Mac48Address addr, uint8_t tid, bool byOriginator);
 
 private:
+  void DoStart ();
   /**
    * This functions are used only to correctly set addresses in a-msdu subframe.
    * If aggregating sta is a STA (in an infrastructured network):
diff --git a/src/devices/wifi/minstrel-wifi-manager.cc b/src/devices/wifi/minstrel-wifi-manager.cc
index 7032cf3d3..2337f0f44 100644
--- a/src/devices/wifi/minstrel-wifi-manager.cc
+++ b/src/devices/wifi/minstrel-wifi-manager.cc
@@ -249,8 +249,7 @@ void
 MinstrelWifiManager::DoReportRxOk (WifiRemoteStation *st,
                                    double rxSnr, WifiMode txMode)
 {
-  MinstrelWifiRemoteStation *station = (MinstrelWifiRemoteStation *)st;
-  NS_LOG_DEBUG("DoReportRxOk m_txrate=" << station->m_txrate);
+  NS_LOG_DEBUG("DoReportRxOk m_txrate=" << ((MinstrelWifiRemoteStation *)st)->m_txrate);
 }
 
 void
diff --git a/src/devices/wifi/nqap-wifi-mac.cc b/src/devices/wifi/nqap-wifi-mac.cc
index e1b73ab92..8563cddc6 100644
--- a/src/devices/wifi/nqap-wifi-mac.cc
+++ b/src/devices/wifi/nqap-wifi-mac.cc
@@ -603,6 +603,8 @@ NqapWifiMac::DoStart (void)
     {
       m_beaconEvent = Simulator::ScheduleNow (&NqapWifiMac::SendOneBeacon, this);
     }
+  m_dca->Start ();
+  m_beaconDca->Start ();
   WifiMac::DoStart ();
 }
 
diff --git a/src/devices/wifi/nqsta-wifi-mac.cc b/src/devices/wifi/nqsta-wifi-mac.cc
index 9bd328c34..8f626e630 100644
--- a/src/devices/wifi/nqsta-wifi-mac.cc
+++ b/src/devices/wifi/nqsta-wifi-mac.cc
@@ -686,5 +686,10 @@ NqstaWifiMac::FinishConfigureStandard (enum WifiPhyStandard standard)
       break;
     }
 }
-
+void
+NqstaWifiMac::DoStart ()
+{
+  m_dca->Start ();
+  WifiMac::DoStart ();
+}
 } // namespace ns3
diff --git a/src/devices/wifi/nqsta-wifi-mac.h b/src/devices/wifi/nqsta-wifi-mac.h
index c20046a59..4c148c8dc 100644
--- a/src/devices/wifi/nqsta-wifi-mac.h
+++ b/src/devices/wifi/nqsta-wifi-mac.h
@@ -119,6 +119,7 @@ private:
     BEACON_MISSED,
     REFUSED
   };
+  void DoStart ();
   void SetBssid (Mac48Address bssid);
   void SetActiveProbing (bool enable);
   bool GetActiveProbing (void) const;
diff --git a/src/devices/wifi/qadhoc-wifi-mac.cc b/src/devices/wifi/qadhoc-wifi-mac.cc
index 5a934f920..612d19c7d 100644
--- a/src/devices/wifi/qadhoc-wifi-mac.cc
+++ b/src/devices/wifi/qadhoc-wifi-mac.cc
@@ -108,10 +108,6 @@ QadhocWifiMac::DoDispose (void)
   m_dcfManager = 0;
   m_low = 0;
   m_phy = 0;
-  m_voEdca = 0;
-  m_viEdca = 0;
-  m_beEdca = 0;
-  m_bkEdca = 0;
   m_stationManager = 0;
   for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
     {
@@ -445,6 +441,15 @@ QadhocWifiMac::GetBEQueue (void) const
 {
   return m_queues.find (AC_BE)->second;
 }
+void
+QadhocWifiMac::DoStart ()
+{
+  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
+    {
+      i->second->Start ();
+    }
+  WifiMac::DoStart ();
+}
 
 Ptr<EdcaTxopN>
 QadhocWifiMac::GetBKQueue (void) const
diff --git a/src/devices/wifi/qadhoc-wifi-mac.h b/src/devices/wifi/qadhoc-wifi-mac.h
index 0ebad8a5b..834cef164 100644
--- a/src/devices/wifi/qadhoc-wifi-mac.h
+++ b/src/devices/wifi/qadhoc-wifi-mac.h
@@ -83,6 +83,7 @@ public:
 private:
   Callback<void, Ptr<Packet>, Mac48Address, Mac48Address> m_forwardUp;
   virtual void DoDispose (void);
+  void DoStart ();
   void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
   QadhocWifiMac &operator = (const QadhocWifiMac &);
@@ -107,10 +108,6 @@ private:
   Ptr<EdcaTxopN> GetBKQueue (void) const;
 
   Queues m_queues;
-  Ptr<EdcaTxopN> m_voEdca;
-  Ptr<EdcaTxopN> m_viEdca;
-  Ptr<EdcaTxopN> m_beEdca;
-  Ptr<EdcaTxopN> m_bkEdca;
   Ptr<MacLow> m_low;
   Ptr<WifiPhy> m_phy;
   Ptr<WifiRemoteStationManager> m_stationManager;
diff --git a/src/devices/wifi/qap-wifi-mac.cc b/src/devices/wifi/qap-wifi-mac.cc
index 343c1ffcb..4e64dd625 100644
--- a/src/devices/wifi/qap-wifi-mac.cc
+++ b/src/devices/wifi/qap-wifi-mac.cc
@@ -851,6 +851,11 @@ QapWifiMac::FinishConfigureStandard (enum WifiPhyStandard standard)
 void
 QapWifiMac::DoStart (void)
 {
+  m_beaconDca->Start ();
+  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
+    {
+      i->second->Start ();
+    }
   m_beaconEvent.Cancel ();
   if (m_enableBeaconGeneration)
     {
diff --git a/src/devices/wifi/qsta-wifi-mac.cc b/src/devices/wifi/qsta-wifi-mac.cc
index 85ec9fff3..d9af0f195 100644
--- a/src/devices/wifi/qsta-wifi-mac.cc
+++ b/src/devices/wifi/qsta-wifi-mac.cc
@@ -796,6 +796,15 @@ QstaWifiMac::SetQueue (enum AccessClass ac)
   edca->CompleteConfig ();
   m_queues.insert (std::make_pair(ac, edca));
 }
+void
+QstaWifiMac::DoStart ()
+{
+  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
+    {
+      i->second->Start ();
+    }
+  WifiMac::DoStart ();
+}
 
 void 
 QstaWifiMac::FinishConfigureStandard (enum WifiPhyStandard standard)
diff --git a/src/devices/wifi/qsta-wifi-mac.h b/src/devices/wifi/qsta-wifi-mac.h
index 4e30b4deb..e447f3635 100644
--- a/src/devices/wifi/qsta-wifi-mac.h
+++ b/src/devices/wifi/qsta-wifi-mac.h
@@ -92,6 +92,7 @@ public:
   void StartActiveAssociation (void);
 
 private:
+  void DoStart ();
   void SetBssid (Mac48Address bssid);
   Mac48Address GetBroadcastBssid (void);
   void Receive (Ptr<Packet> p, const WifiMacHeader *hdr);
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap
index fd958dd44..08055edb7 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap
index 0f2254e28..7ecf8d9dd 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap
index 30f1d7b93..487afe87e 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap
index 587f50a6d..0fe7ecd7b 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap
index 7f1d812a2..36f531b92 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap differ
diff --git a/src/routing/aodv/test/bug-606-test-0-0.pcap b/src/routing/aodv/test/bug-606-test-0-0.pcap
index 57f6bb62f..7d0916ae4 100644
Binary files a/src/routing/aodv/test/bug-606-test-0-0.pcap and b/src/routing/aodv/test/bug-606-test-0-0.pcap differ
diff --git a/src/routing/aodv/test/bug-606-test-1-0.pcap b/src/routing/aodv/test/bug-606-test-1-0.pcap
index 75919c1f5..cc84ba05f 100644
Binary files a/src/routing/aodv/test/bug-606-test-1-0.pcap and b/src/routing/aodv/test/bug-606-test-1-0.pcap differ
diff --git a/src/routing/aodv/test/bug-606-test-2-0.pcap b/src/routing/aodv/test/bug-606-test-2-0.pcap
index 032b56f25..c414ed666 100644
Binary files a/src/routing/aodv/test/bug-606-test-2-0.pcap and b/src/routing/aodv/test/bug-606-test-2-0.pcap differ
diff --git a/src/routing/olsr/test/bug780-0-0.pcap b/src/routing/olsr/test/bug780-0-0.pcap
index 9f7b9925c..f6ae31d3b 100644
Binary files a/src/routing/olsr/test/bug780-0-0.pcap and b/src/routing/olsr/test/bug780-0-0.pcap differ
diff --git a/src/routing/olsr/test/bug780-1-0.pcap b/src/routing/olsr/test/bug780-1-0.pcap
index daa2752f3..085151586 100644
Binary files a/src/routing/olsr/test/bug780-1-0.pcap and b/src/routing/olsr/test/bug780-1-0.pcap differ
diff --git a/src/routing/olsr/test/bug780-2-0.pcap b/src/routing/olsr/test/bug780-2-0.pcap
index f0f32f066..2543e0179 100644
Binary files a/src/routing/olsr/test/bug780-2-0.pcap and b/src/routing/olsr/test/bug780-2-0.pcap differ
diff --git a/src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap b/src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap
index da5ad3711..e9bbf4e43 100644
Binary files a/src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap and b/src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap differ
diff --git a/src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap b/src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap
index 2f75ccb89..8e6a80f27 100644
Binary files a/src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap and b/src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap differ
diff --git a/src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap b/src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap
index 12f2a945a..f48dcdade 100644
Binary files a/src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap and b/src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap differ