--- a/src/core/model/random-variable.cc	Wed Apr 06 15:26:57 2011 -0400
+++ b/src/core/model/random-variable.cc	Wed Apr 06 15:32:12 2011 -0700
@@ -32,7 +32,6 @@
 #include <sstream>
 #include <vector>
 
-#include "test.h"
 #include "assert.h"
 #include "config.h"
 #include "integer.h"
@@ -2046,118 +2045,4 @@
   return is;
 }
 
-class BasicRandomNumberTestCase : public TestCase
-{
-public:
-  BasicRandomNumberTestCase ();
-  virtual ~BasicRandomNumberTestCase ()
-  {
-  }
-
-private:
-  virtual void DoRun (void);
-};
-
-BasicRandomNumberTestCase::BasicRandomNumberTestCase ()
-  : TestCase ("Check basic random number operation")
-{
-}
-
-void
-BasicRandomNumberTestCase::DoRun (void)
-{
-  const double desiredMean = 1.0;
-  const double desiredStdDev = 1.0;
-
-  double tmp = log (1 + (desiredStdDev / desiredMean) * (desiredStdDev / desiredMean));
-  double sigma = sqrt (tmp);
-  double mu = log (desiredMean) - 0.5 * tmp;
-
-  //
-  // Test a custom lognormal instance to see if its moments have any relation
-  // expected reality.
-  //
-  LogNormalVariable lognormal (mu, sigma);
-  vector<double> samples;
-  const int NSAMPLES = 10000;
-  double sum = 0;
-
-  //
-  // Get and store a bunch of samples.  As we go along sum them and then find
-  // the mean value of the samples.
-  //
-  for (int n = NSAMPLES; n; --n)
-    {
-      double value = lognormal.GetValue ();
-      sum += value;
-      samples.push_back (value);
-    }
-  double obtainedMean = sum / NSAMPLES;
-  NS_TEST_EXPECT_MSG_EQ_TOL (obtainedMean, desiredMean, 0.1, "Got unexpected mean value from LogNormalVariable");
-
-  //
-  // Wander back through the saved stamples and find their standard deviation
-  //
-  sum = 0;
-  for (vector<double>::iterator iter = samples.begin (); iter != samples.end (); iter++)
-    {
-      double tmp = (*iter - obtainedMean);
-      sum += tmp * tmp;
-    }
-  double obtainedStdDev = sqrt (sum / (NSAMPLES - 1));
-  NS_TEST_EXPECT_MSG_EQ_TOL (obtainedStdDev, desiredStdDev, 0.1, "Got unexpected standard deviation from LogNormalVariable");
-}
-
-class RandomNumberSerializationTestCase : public TestCase
-{
-public:
-  RandomNumberSerializationTestCase ();
-  virtual ~RandomNumberSerializationTestCase ()
-  {
-  }
-
-private:
-  virtual void DoRun (void);
-};
-
-RandomNumberSerializationTestCase::RandomNumberSerializationTestCase ()
-  : TestCase ("Check basic random number operation")
-{
-}
-
-void
-RandomNumberSerializationTestCase::DoRun (void)
-{
-  RandomVariableValue val;
-  val.DeserializeFromString ("Uniform:0.1:0.2", MakeRandomVariableChecker ());
-  RandomVariable rng = val.Get ();
-  NS_TEST_ASSERT_MSG_EQ (val.SerializeToString (MakeRandomVariableChecker ()), "Uniform:0.1:0.2",
-                         "Deserialize and Serialize \"Uniform:0.1:0.2\" mismatch");
-
-  val.DeserializeFromString ("Normal:0.1:0.2", MakeRandomVariableChecker ());
-  rng = val.Get ();
-  NS_TEST_ASSERT_MSG_EQ (val.SerializeToString (MakeRandomVariableChecker ()), "Normal:0.1:0.2",
-                         "Deserialize and Serialize \"Normal:0.1:0.2\" mismatch");
-
-  val.DeserializeFromString ("Normal:0.1:0.2:0.15", MakeRandomVariableChecker ());
-  rng = val.Get ();
-  NS_TEST_ASSERT_MSG_EQ (val.SerializeToString (MakeRandomVariableChecker ()), "Normal:0.1:0.2:0.15",
-                         "Deserialize and Serialize \"Normal:0.1:0.2:0.15\" mismatch");
-}
-
-class BasicRandomNumberTestSuite : public TestSuite
-{
-public:
-  BasicRandomNumberTestSuite ();
-};
-
-BasicRandomNumberTestSuite::BasicRandomNumberTestSuite ()
-  : TestSuite ("basic-random-number", BVT)
-{
-  AddTestCase (new BasicRandomNumberTestCase);
-  AddTestCase (new RandomNumberSerializationTestCase);
-}
-
-static BasicRandomNumberTestSuite BasicRandomNumberTestSuite;
-
 } // namespace ns3