--- a/src/wifi/examples/wifi-phy-test.cc	Fri Apr 19 17:17:35 2013 -0700
+++ b/src/wifi/examples/wifi-phy-test.cc	Sat Apr 20 14:57:59 2013 +0200
@@ -124,6 +124,7 @@
     }
   m_tx = tx;
   Simulator::Run ();
+  Simulator::Destroy();
   return m_output;
 }
 
@@ -266,6 +267,7 @@
   m_txA = txA;
   m_txB = txB;
   Simulator::Run ();
+  Simulator::Destroy();
   return m_output;
 }
 
@@ -428,7 +430,7 @@
                 << "PsrVsDistance "
                 << "PsrVsCollisionInterval "
                 << std::endl;
-      return -1;
+      return 0;
     }
   std::string type = argv[1];
   argc--;