--- a/src/core/test/command-line-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/core/test/command-line-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -217,7 +217,7 @@
 };
 
 CommandLineTestSuite::CommandLineTestSuite ()
-  : TestSuite ("command-line", BVT)
+  : TestSuite ("command-line", UNIT)
 {
   AddTestCase (new CommandLineBooleanTestCase);
   AddTestCase (new CommandLineIntTestCase);

--- a/src/core/test/config-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/core/test/config-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -605,7 +605,7 @@
 };
 
 ConfigTestSuite::ConfigTestSuite ()
-  : TestSuite ("config", BVT)
+  : TestSuite ("config", UNIT)
 {
   AddTestCase (new RootNamespaceConfigTestCase);
   AddTestCase (new UnderRootNamespaceConfigTestCase);

--- a/src/core/test/global-value-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/core/test/global-value-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -83,7 +83,7 @@
 };
 
 GlobalValueTestSuite::GlobalValueTestSuite ()
-  : TestSuite ("global-value", BVT)
+  : TestSuite ("global-value", UNIT)
 {
   AddTestCase (new GlobalValueTestCase);
 }

--- a/src/core/test/object-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/core/test/object-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -417,7 +417,7 @@
 };
 
 ObjectTestSuite::ObjectTestSuite ()
-  : TestSuite ("object", BVT)
+  : TestSuite ("object", UNIT)
 {
   AddTestCase (new CreateObjectTestCase);
   AddTestCase (new AggregateObjectTestCase);

--- a/src/core/test/random-variable-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/core/test/random-variable-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -136,7 +136,7 @@
 };
 
 BasicRandomNumberTestSuite::BasicRandomNumberTestSuite ()
-  : TestSuite ("basic-random-number", BVT)
+  : TestSuite ("basic-random-number", UNIT)
 {
   AddTestCase (new BasicRandomNumberTestCase);
   AddTestCase (new RandomNumberSerializationTestCase);

--- a/src/test/csma-system-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/test/csma-system-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -1094,7 +1094,7 @@
 };
 
 CsmaSystemTestSuite::CsmaSystemTestSuite ()
-  : TestSuite ("csma-system", BVT)
+  : TestSuite ("csma-system", UNIT)
 {
   AddTestCase (new CsmaBridgeTestCase);
   AddTestCase (new CsmaBroadcastTestCase);

--- a/src/test/error-model-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/test/error-model-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -122,7 +122,7 @@
 };
 
 ErrorModelTestSuite::ErrorModelTestSuite ()
-  : TestSuite ("error-model", BVT)
+  : TestSuite ("error-model", UNIT)
 {
   AddTestCase (new ErrorModelSimple);
 }

--- a/src/test/global-routing-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/test/global-routing-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -398,7 +398,7 @@
 };
 
 GlobalRoutingTestSuite::GlobalRoutingTestSuite ()
-  : TestSuite ("global-routing", BVT)
+  : TestSuite ("global-routing", UNIT)
 {
   AddTestCase (new DynamicGlobalRoutingTestCase);
   AddTestCase (new GlobalRoutingSlash32TestCase);

--- a/src/test/mobility-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/test/mobility-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -361,7 +361,7 @@
 };
 
 MobilityTestSuite::MobilityTestSuite ()
-  : TestSuite ("mobility", BVT)
+  : TestSuite ("mobility", UNIT)
 {
   AddTestCase (new WaypointLazyNotifyFalse);
   AddTestCase (new WaypointLazyNotifyTrue);

--- a/src/test/sample-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/test/sample-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -54,7 +54,7 @@
 };
 
 SampleTestSuite::SampleTestSuite ()
-  : TestSuite ("sample", BVT)
+  : TestSuite ("sample", UNIT)
 {
   AddTestCase (new SampleTestCase1);
 }

--- a/src/test/static-routing-test-suite.cc	Thu Apr 07 10:07:46 2011 -0700
+++ b/src/test/static-routing-test-suite.cc	Thu Apr 07 10:33:33 2011 -0700
@@ -164,7 +164,7 @@
 };
 
 StaticRoutingTestSuite::StaticRoutingTestSuite ()
-  : TestSuite ("static-routing", BVT)
+  : TestSuite ("static-routing", UNIT)
 {
   AddTestCase (new StaticRoutingSlash32TestCase);
 }