4 files changed, 2 insertions, 18 deletions
diff --git a/tests/corelib/numerics/BasicAmount.cc b/tests/corelib/numerics/BasicAmount.cc
index 143b8c38..fbab8877 100644
--- a/tests/corelib/numerics/BasicAmount.cc
+++ b/tests/corelib/numerics/BasicAmount.cc
@@ -1,16 +1,12 @@
 #include "BasicAmount.h"
-#include "ledger.h"
-
-using namespace ledger;
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(BasicAmountTestCase, "numerics");
 
 void BasicAmountTestCase::setUp() {
-  amount_t::initialize();
+  ledger::initialize();
 }
 void BasicAmountTestCase::tearDown() {
-  amount_t::shutdown();
-  assert(live_count.size() == 0);
+  ledger::shutdown();
 }
 
 void BasicAmountTestCase::testConstructors()
diff --git a/tests/corelib/numerics/Commodity.cc b/tests/corelib/numerics/Commodity.cc
index f74f671c..e43ee7b7 100644
--- a/tests/corelib/numerics/Commodity.cc
+++ b/tests/corelib/numerics/Commodity.cc
@@ -1,7 +1,4 @@
 #include "Commodity.h"
-#include "ledger.h"
-
-using namespace ledger;
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(CommodityTestCase, "numerics");
 
diff --git a/tests/corelib/numerics/CommodityAmount.cc b/tests/corelib/numerics/CommodityAmount.cc
index 9e27dba3..afdbe89e 100644
--- a/tests/corelib/numerics/CommodityAmount.cc
+++ b/tests/corelib/numerics/CommodityAmount.cc
@@ -1,7 +1,4 @@
 #include "CommodityAmount.h"
-#include "ledger.h"
-
-using namespace ledger;
 
 #define internalAmount(x) amount_t::exact(x)
 
diff --git a/tests/corelib/numerics/DateTime.cc b/tests/corelib/numerics/DateTime.cc
index 33873b4a..ecdf32b7 100644
--- a/tests/corelib/numerics/DateTime.cc
+++ b/tests/corelib/numerics/DateTime.cc
@@ -1,10 +1,4 @@
 #include "DateTimeTest.h"
-#include "ledger.h"
-#include "acconf.h"
-
-#include <ctime>
-
-using namespace ledger;
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(DateTimeTestCase, "numerics");