diff --git a/src/routing/olsr/olsr-header.cc b/src/routing/olsr/olsr-header.cc
index 205011e14..ad84ad2fa 100644
--- a/src/routing/olsr/olsr-header.cc
+++ b/src/routing/olsr/olsr-header.cc
@@ -499,259 +499,304 @@ MessageHeader::Hna::Deserialize (Buffer::Iterator start, uint32_t messageSize)
   return messageSize;
 }
 
-
-
 }} // namespace olsr, ns3
 
-
-#ifdef RUN_SELF_TESTS
-
-
 #include "ns3/test.h"
 #include "ns3/packet.h"
-#include <math.h>
-
 
 namespace ns3 {
 
-class OlsrHeaderTest : public ns3::Test {
-private:
+class OlsrEmfTestCase : public TestCase {
 public:
-  OlsrHeaderTest ();
-  virtual bool RunTests (void);
-
-
+  OlsrEmfTestCase ();
+  virtual bool DoRun (void);
 };
 
-OlsrHeaderTest::OlsrHeaderTest ()
-  : ns3::Test ("OlsrHeader")
+OlsrEmfTestCase::OlsrEmfTestCase ()
+  : TestCase ("Check Emf olsr time conversion")
 {}
-
-
 bool 
-OlsrHeaderTest::RunTests (void)
+OlsrEmfTestCase::DoRun (void)
 {
-  bool result = true;
-
-  // Testing packet header + message header + MID message
-  {
-    Packet packet;
-
-    {
-      olsr::PacketHeader hdr;
-      olsr::MessageHeader msg1;
-      olsr::MessageHeader::Mid &mid1 = msg1.GetMid ();
-      olsr::MessageHeader msg2;
-      olsr::MessageHeader::Mid &mid2 = msg2.GetMid ();
-    
-      // MID message #1
-      {
-        std::vector<Ipv4Address> &addresses = mid1.interfaceAddresses;
-        addresses.clear ();
-        addresses.push_back (Ipv4Address ("1.2.3.4"));
-        addresses.push_back (Ipv4Address ("1.2.3.5"));
-      }
-
-      msg1.SetTimeToLive (255);
-      msg1.SetOriginatorAddress (Ipv4Address ("11.22.33.44"));
-      msg1.SetVTime (Seconds (9));
-      msg1.SetMessageSequenceNumber (7);
-
-      // MID message #2
-      {
-        std::vector<Ipv4Address> &addresses = mid2.interfaceAddresses;
-        addresses.clear ();
-        addresses.push_back (Ipv4Address ("2.2.3.4"));
-        addresses.push_back (Ipv4Address ("2.2.3.5"));
-      }
-
-      msg2.SetTimeToLive (254);
-      msg2.SetOriginatorAddress (Ipv4Address ("12.22.33.44"));
-      msg2.SetVTime (Seconds (10));
-      msg2.SetMessageType (olsr::MessageHeader::MID_MESSAGE);
-      msg2.SetMessageSequenceNumber (7);
-
-      // Build an OLSR packet header
-      hdr.SetPacketLength (hdr.GetSerializedSize () + msg1.GetSerializedSize () + msg2.GetSerializedSize ());
-      hdr.SetPacketSequenceNumber (123);
-    
-
-      // Now add all the headers in the correct order
-      packet.AddHeader (msg2);
-      packet.AddHeader (msg1);
-      packet.AddHeader (hdr);
-    }    
-
-    {
-      olsr::PacketHeader hdr;
-      packet.RemoveHeader (hdr);
-      NS_TEST_ASSERT_EQUAL (hdr.GetPacketSequenceNumber (), 123);
-      uint32_t sizeLeft = hdr.GetPacketLength () - hdr.GetSerializedSize ();
-      {
-        olsr::MessageHeader msg1;
-
-        packet.RemoveHeader (msg1);
-
-        NS_TEST_ASSERT_EQUAL (msg1.GetTimeToLive (),  255);
-        NS_TEST_ASSERT_EQUAL (msg1.GetOriginatorAddress (), Ipv4Address ("11.22.33.44"));
-        NS_TEST_ASSERT_EQUAL (msg1.GetVTime (), Seconds (9));
-        NS_TEST_ASSERT_EQUAL (msg1.GetMessageType (), olsr::MessageHeader::MID_MESSAGE);
-        NS_TEST_ASSERT_EQUAL (msg1.GetMessageSequenceNumber (), 7);
-
-        olsr::MessageHeader::Mid &mid1 = msg1.GetMid ();
-        NS_TEST_ASSERT_EQUAL (mid1.interfaceAddresses.size (), 2);
-        NS_TEST_ASSERT_EQUAL (*mid1.interfaceAddresses.begin (), Ipv4Address ("1.2.3.4"));
-
-        sizeLeft -= msg1.GetSerializedSize ();
-        NS_TEST_ASSERT (sizeLeft > 0);
-      }
-      {
-        // now read the second message
-        olsr::MessageHeader msg2;
-
-        packet.RemoveHeader (msg2);
-
-        NS_TEST_ASSERT_EQUAL (msg2.GetTimeToLive (),  254);
-        NS_TEST_ASSERT_EQUAL (msg2.GetOriginatorAddress (), Ipv4Address ("12.22.33.44"));
-        NS_TEST_ASSERT_EQUAL (msg2.GetVTime (), Seconds (10));
-        NS_TEST_ASSERT_EQUAL (msg2.GetMessageType (), olsr::MessageHeader::MID_MESSAGE);
-        NS_TEST_ASSERT_EQUAL (msg2.GetMessageSequenceNumber (), 7);
-
-        olsr::MessageHeader::Mid mid2 = msg2.GetMid ();
-        NS_TEST_ASSERT_EQUAL (mid2.interfaceAddresses.size (), 2);
-        NS_TEST_ASSERT_EQUAL (*mid2.interfaceAddresses.begin (), Ipv4Address ("2.2.3.4"));
-
-        sizeLeft -= msg2.GetSerializedSize ();
-        NS_TEST_ASSERT_EQUAL (sizeLeft, 0);
-      }
-    }
-  }
-  
-  // Test the HELLO message
-  {
-    Packet packet;
-    olsr::MessageHeader msgIn;
-    olsr::MessageHeader::Hello &helloIn = msgIn.GetHello ();
-
-    helloIn.SetHTime (Seconds (7));
-    helloIn.willingness = 66;
-
-    {
-      olsr::MessageHeader::Hello::LinkMessage lm1;
-      lm1.linkCode = 2;
-      lm1.neighborInterfaceAddresses.push_back (Ipv4Address ("1.2.3.4"));
-      lm1.neighborInterfaceAddresses.push_back (Ipv4Address ("1.2.3.5"));
-      helloIn.linkMessages.push_back (lm1);
-
-      olsr::MessageHeader::Hello::LinkMessage lm2;
-      lm2.linkCode = 3;
-      lm2.neighborInterfaceAddresses.push_back (Ipv4Address ("2.2.3.4"));
-      lm2.neighborInterfaceAddresses.push_back (Ipv4Address ("2.2.3.5"));
-      helloIn.linkMessages.push_back (lm2);
-    }
-
-    packet.AddHeader (msgIn);
-
-    olsr::MessageHeader msgOut;
-    packet.RemoveHeader (msgOut);
-    olsr::MessageHeader::Hello &helloOut = msgOut.GetHello ();
-    
-    NS_TEST_ASSERT_EQUAL (helloOut.GetHTime (), Seconds (7));
-    NS_TEST_ASSERT_EQUAL (helloOut.willingness, 66);
-    NS_TEST_ASSERT_EQUAL (helloOut.linkMessages.size (), 2);
-
-    NS_TEST_ASSERT_EQUAL (helloOut.linkMessages[0].linkCode, 2);
-    NS_TEST_ASSERT_EQUAL (helloOut.linkMessages[0].neighborInterfaceAddresses[0],
-                          Ipv4Address ("1.2.3.4"));
-    NS_TEST_ASSERT_EQUAL (helloOut.linkMessages[0].neighborInterfaceAddresses[1],
-                          Ipv4Address ("1.2.3.5"));
-
-    NS_TEST_ASSERT_EQUAL (helloOut.linkMessages[1].linkCode, 3);
-    NS_TEST_ASSERT_EQUAL (helloOut.linkMessages[1].neighborInterfaceAddresses[0],
-                          Ipv4Address ("2.2.3.4"));
-    NS_TEST_ASSERT_EQUAL (helloOut.linkMessages[1].neighborInterfaceAddresses[1],
-                          Ipv4Address ("2.2.3.5"));
-
-    // check that all bytes of the message were read
-    NS_TEST_ASSERT_EQUAL (packet.GetSize (), 0);
-  }
-
-  // Test the TC message
-  {
-    Packet packet;
-    olsr::MessageHeader msgIn;
-    olsr::MessageHeader::Tc &tcIn = msgIn.GetTc ();
-
-    tcIn.ansn = 0x1234;
-    tcIn.neighborAddresses.push_back (Ipv4Address ("1.2.3.4"));
-    tcIn.neighborAddresses.push_back (Ipv4Address ("1.2.3.5"));
-    packet.AddHeader (msgIn);
-
-    olsr::MessageHeader msgOut;
-    packet.RemoveHeader (msgOut);
-    olsr::MessageHeader::Tc &tcOut = msgOut.GetTc ();
-    
-    NS_TEST_ASSERT_EQUAL (tcOut.ansn, 0x1234);
-    NS_TEST_ASSERT_EQUAL (tcOut.neighborAddresses.size (), 2);
-
-    NS_TEST_ASSERT_EQUAL (tcOut.neighborAddresses[0],
-                          Ipv4Address ("1.2.3.4"));
-    NS_TEST_ASSERT_EQUAL (tcOut.neighborAddresses[1],
-                          Ipv4Address ("1.2.3.5"));
-
-    // check that all bytes of the message were read
-    NS_TEST_ASSERT_EQUAL (packet.GetSize (), 0);
-  }
-
-  // Test the HNA message
-  {
-    Packet packet;
-    olsr::MessageHeader msgIn;
-    olsr::MessageHeader::Hna &hnaIn = msgIn.GetHna ();
-
-    hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association)
-                                  { Ipv4Address ("1.2.3.4"), Ipv4Mask ("255.255.255.0")});
-    hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association)
-                                  {Ipv4Address ("1.2.3.5"), Ipv4Mask ("255.255.0.0")});
-    packet.AddHeader (msgIn);
-
-    olsr::MessageHeader msgOut;
-    packet.RemoveHeader (msgOut);
-    olsr::MessageHeader::Hna &hnaOut = msgOut.GetHna ();
-    
-    NS_TEST_ASSERT_EQUAL (hnaOut.associations.size (), 2);
-
-    NS_TEST_ASSERT_EQUAL (hnaOut.associations[0].address,
-                          Ipv4Address ("1.2.3.4"));
-    NS_TEST_ASSERT_EQUAL (hnaOut.associations[0].mask,
-                          Ipv4Mask ("255.255.255.0"));
-
-    NS_TEST_ASSERT_EQUAL (hnaOut.associations[1].address,
-                          Ipv4Address ("1.2.3.5"));
-    NS_TEST_ASSERT_EQUAL (hnaOut.associations[1].mask,
-                          Ipv4Mask ("255.255.0.0"));
-
-    // check that all bytes of the message were read
-    NS_TEST_ASSERT_EQUAL (packet.GetSize (), 0);
-  }
-
   for (int time = 1; time <= 30; time++)
     {
       uint8_t emf = olsr::SecondsToEmf (time);
       double seconds = olsr::EmfToSeconds (emf);
-      if (seconds < 0 || fabs (seconds - time) > 0.1)
-        {
-          result = false;
-          Failure () << "In " << time << " out " << seconds << std::endl;
-        }
+      NS_TEST_ASSERT_MSG_EQ((seconds < 0 || fabs (seconds - time) > 0.1), true,
+                            "XXX");
     }
-
-  return result;
+  // XXX
+  return false;
 }
 
-static OlsrHeaderTest gOlsrHeaderTest;
 
-}; // namespace
+class OlsrMidTestCase : public TestCase {
+public:
+  OlsrMidTestCase ();
+  virtual bool DoRun (void);
+};
+
+OlsrMidTestCase::OlsrMidTestCase ()
+  : TestCase ("Check Mid olsr messages")
+{}
+bool 
+OlsrMidTestCase::DoRun (void)
+{
+  Packet packet;
+
+  {
+    olsr::PacketHeader hdr;
+    olsr::MessageHeader msg1;
+    olsr::MessageHeader::Mid &mid1 = msg1.GetMid ();
+    olsr::MessageHeader msg2;
+    olsr::MessageHeader::Mid &mid2 = msg2.GetMid ();
+    
+    // MID message #1
+    {
+      std::vector<Ipv4Address> &addresses = mid1.interfaceAddresses;
+      addresses.clear ();
+      addresses.push_back (Ipv4Address ("1.2.3.4"));
+      addresses.push_back (Ipv4Address ("1.2.3.5"));
+    }
+
+    msg1.SetTimeToLive (255);
+    msg1.SetOriginatorAddress (Ipv4Address ("11.22.33.44"));
+    msg1.SetVTime (Seconds (9));
+    msg1.SetMessageSequenceNumber (7);
+
+    // MID message #2
+    {
+      std::vector<Ipv4Address> &addresses = mid2.interfaceAddresses;
+      addresses.clear ();
+      addresses.push_back (Ipv4Address ("2.2.3.4"));
+      addresses.push_back (Ipv4Address ("2.2.3.5"));
+    }
+
+    msg2.SetTimeToLive (254);
+    msg2.SetOriginatorAddress (Ipv4Address ("12.22.33.44"));
+    msg2.SetVTime (Seconds (10));
+    msg2.SetMessageType (olsr::MessageHeader::MID_MESSAGE);
+    msg2.SetMessageSequenceNumber (7);
+
+    // Build an OLSR packet header
+    hdr.SetPacketLength (hdr.GetSerializedSize () + msg1.GetSerializedSize () + msg2.GetSerializedSize ());
+    hdr.SetPacketSequenceNumber (123);
+    
+
+    // Now add all the headers in the correct order
+    packet.AddHeader (msg2);
+    packet.AddHeader (msg1);
+    packet.AddHeader (hdr);
+  }    
+
+  {
+    olsr::PacketHeader hdr;
+    packet.RemoveHeader (hdr);
+    NS_TEST_ASSERT_MSG_EQ (hdr.GetPacketSequenceNumber (), 123, "XXX");
+    uint32_t sizeLeft = hdr.GetPacketLength () - hdr.GetSerializedSize ();
+    {
+      olsr::MessageHeader msg1;
+      
+      packet.RemoveHeader (msg1);
+        
+      NS_TEST_ASSERT_MSG_EQ (msg1.GetTimeToLive (),  255, "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg1.GetOriginatorAddress (), Ipv4Address ("11.22.33.44"), "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg1.GetVTime (), Seconds (9), "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageSequenceNumber (), 7, "XXX");
+
+      olsr::MessageHeader::Mid &mid1 = msg1.GetMid ();
+      NS_TEST_ASSERT_MSG_EQ (mid1.interfaceAddresses.size (), 2, "XXX");
+      NS_TEST_ASSERT_MSG_EQ (*mid1.interfaceAddresses.begin (), Ipv4Address ("1.2.3.4"), "XXX");
+
+      sizeLeft -= msg1.GetSerializedSize ();
+      NS_TEST_ASSERT_MSG_EQ((sizeLeft > 0), true, "XXX");
+    }
+    {
+      // now read the second message
+      olsr::MessageHeader msg2;
+
+      packet.RemoveHeader (msg2);
+        
+      NS_TEST_ASSERT_MSG_EQ (msg2.GetTimeToLive (),  254, "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg2.GetOriginatorAddress (), Ipv4Address ("12.22.33.44"), "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg2.GetVTime (), Seconds (10), "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "XXX");
+      NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageSequenceNumber (), 7, "XXX");
+
+      olsr::MessageHeader::Mid mid2 = msg2.GetMid ();
+      NS_TEST_ASSERT_MSG_EQ (mid2.interfaceAddresses.size (), 2, "XXX");
+      NS_TEST_ASSERT_MSG_EQ (*mid2.interfaceAddresses.begin (), Ipv4Address ("2.2.3.4"), "XXX");
+
+      sizeLeft -= msg2.GetSerializedSize ();
+      NS_TEST_ASSERT_MSG_EQ (sizeLeft, 0, "XXX");
+    }
+  }
+  // XXX
+  return false;
+}
 
 
-#endif /* RUN_SELF_TESTS */
+class OlsrHelloTestCase : public TestCase {
+public:
+  OlsrHelloTestCase ();
+  virtual bool DoRun (void);
+};
+
+OlsrHelloTestCase::OlsrHelloTestCase ()
+  : TestCase ("Check Hello olsr messages")
+{}
+bool 
+OlsrHelloTestCase::DoRun (void)
+{
+  Packet packet;
+  olsr::MessageHeader msgIn;
+  olsr::MessageHeader::Hello &helloIn = msgIn.GetHello ();
+
+  helloIn.SetHTime (Seconds (7));
+  helloIn.willingness = 66;
+
+  {
+    olsr::MessageHeader::Hello::LinkMessage lm1;
+    lm1.linkCode = 2;
+    lm1.neighborInterfaceAddresses.push_back (Ipv4Address ("1.2.3.4"));
+    lm1.neighborInterfaceAddresses.push_back (Ipv4Address ("1.2.3.5"));
+    helloIn.linkMessages.push_back (lm1);
+    
+    olsr::MessageHeader::Hello::LinkMessage lm2;
+    lm2.linkCode = 3;
+    lm2.neighborInterfaceAddresses.push_back (Ipv4Address ("2.2.3.4"));
+    lm2.neighborInterfaceAddresses.push_back (Ipv4Address ("2.2.3.5"));
+    helloIn.linkMessages.push_back (lm2);
+  }
+
+  packet.AddHeader (msgIn);
+
+  olsr::MessageHeader msgOut;
+  packet.RemoveHeader (msgOut);
+  olsr::MessageHeader::Hello &helloOut = msgOut.GetHello ();
+    
+  NS_TEST_ASSERT_MSG_EQ (helloOut.GetHTime (), Seconds (7), "XXX");
+  NS_TEST_ASSERT_MSG_EQ (helloOut.willingness, 66, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages.size (), 2, "XXX");
+  
+  NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].linkCode, 2, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].neighborInterfaceAddresses[0],
+                         Ipv4Address ("1.2.3.4"), "XXX");
+  NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].neighborInterfaceAddresses[1],
+                         Ipv4Address ("1.2.3.5"), "XXX");
+
+  NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].linkCode, 3, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].neighborInterfaceAddresses[0],
+                         Ipv4Address ("2.2.3.4"), "XXX");
+  NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].neighborInterfaceAddresses[1],
+                         Ipv4Address ("2.2.3.5"), "XXX");
+
+  NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "All bytes in packet were not read");
+
+  // XXX
+  return false;
+}
+
+class OlsrTcTestCase : public TestCase {
+public:
+  OlsrTcTestCase ();
+  virtual bool DoRun (void);
+};
+
+OlsrTcTestCase::OlsrTcTestCase ()
+  : TestCase ("Check Tc olsr messages")
+{}
+bool 
+OlsrTcTestCase::DoRun (void)
+{
+  Packet packet;
+  olsr::MessageHeader msgIn;
+  olsr::MessageHeader::Tc &tcIn = msgIn.GetTc ();
+  
+  tcIn.ansn = 0x1234;
+  tcIn.neighborAddresses.push_back (Ipv4Address ("1.2.3.4"));
+  tcIn.neighborAddresses.push_back (Ipv4Address ("1.2.3.5"));
+  packet.AddHeader (msgIn);
+  
+  olsr::MessageHeader msgOut;
+  packet.RemoveHeader (msgOut);
+  olsr::MessageHeader::Tc &tcOut = msgOut.GetTc ();
+  
+  NS_TEST_ASSERT_MSG_EQ (tcOut.ansn, 0x1234, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses.size (), 2, "XXX");
+  
+  NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses[0],
+                         Ipv4Address ("1.2.3.4"), "XXX");
+  NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses[1],
+                         Ipv4Address ("1.2.3.5"), "XXX");
+
+  NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "XXX");
+  // XXX
+  return false;
+}
+
+class OlsrHnaTestCase : public TestCase {
+public:
+  OlsrHnaTestCase ();
+  virtual bool DoRun (void);
+};
+
+OlsrHnaTestCase::OlsrHnaTestCase ()
+  : TestCase ("Check Hna olsr messages")
+{}
+
+bool
+OlsrHnaTestCase::DoRun (void)
+{
+  Packet packet;
+  olsr::MessageHeader msgIn;
+  olsr::MessageHeader::Hna &hnaIn = msgIn.GetHna ();
+  
+  hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association)
+                                { Ipv4Address ("1.2.3.4"), Ipv4Mask ("255.255.255.0")});
+  hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association)
+                                {Ipv4Address ("1.2.3.5"), Ipv4Mask ("255.255.0.0")});
+  packet.AddHeader (msgIn);
+  
+  olsr::MessageHeader msgOut;
+  packet.RemoveHeader (msgOut);
+  olsr::MessageHeader::Hna &hnaOut = msgOut.GetHna ();
+  
+  NS_TEST_ASSERT_MSG_EQ (hnaOut.associations.size (), 2, "XXX");
+  
+  NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[0].address,
+                        Ipv4Address ("1.2.3.4"), "XXX");
+  NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[0].mask,
+                        Ipv4Mask ("255.255.255.0"), "XXX");
+
+  NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[1].address,
+                        Ipv4Address ("1.2.3.5"), "XXX");
+  NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[1].mask,
+                        Ipv4Mask ("255.255.0.0"), "XXX");
+  
+  NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "All bytes in packet were not read");
+
+  // XXX: why are we returning a constant here ?
+  return false;
+}
+
+
+static class OlsrTestSuite : public TestSuite
+{
+public:
+  OlsrTestSuite ();
+} g_olsrTestSuite;
+
+OlsrTestSuite::OlsrTestSuite()
+  : TestSuite("olsr-routing", UNIT)
+{
+  AddTestCase(new OlsrHnaTestCase());
+  AddTestCase(new OlsrTcTestCase());
+  AddTestCase(new OlsrHelloTestCase());
+  AddTestCase(new OlsrMidTestCase());
+  AddTestCase(new OlsrEmfTestCase());
+}
+
+} // namespace ns3
+