--- a/src/devices/spectrum/spectrum-interference-test.cc	Sun Jul 04 17:07:47 2010 +0200
+++ b/src/devices/spectrum/spectrum-interference-test.cc	Sun Jul 04 14:40:12 2010 -0700
@@ -119,6 +119,7 @@
   Simulator::Run ();
   // the above will return and after RetrieveTestResults have
   // been called and after all signals have expired
+  Simulator::Destroy ();
 
   return m_error;
 }
@@ -214,21 +215,6 @@
 
 }
 
-
-
-
-
+SpectrumInterferenceTestSuite spectrumInterferenceTestSuite;
 
 } // namespace ns3
-
-
-using namespace ns3;
-
-int
-main (int argc, char** argv)
-{
-
-  SpectrumInterferenceTestSuite SpectrumInterferenceTestSuite;
-
-  return SpectrumInterferenceTestSuite.Run ();
-}