killbill-memoizeit

diff --git a/beatrix/src/test/resources/beatrix.properties b/beatrix/src/test/resources/beatrix.properties
index e336e19..ffcc302 100644
--- a/beatrix/src/test/resources/beatrix.properties
+++ b/beatrix/src/test/resources/beatrix.properties
@@ -1,4 +1,4 @@
-org.killbill.catalog.uri=file:src/test/resources/catalogSample.xml
+org.killbill.catalog.uri=file:src/test/resources/catalogTest.xml
 
 org.killbill.notificationq.main.sleep=100
 org.killbill.notificationq.main.nbThreads=1

diff --git a/entitlement/src/test/resources/entitlement.properties b/entitlement/src/test/resources/entitlement.properties
index 11f0313..b0bdca1 100644
--- a/entitlement/src/test/resources/entitlement.properties
+++ b/entitlement/src/test/resources/entitlement.properties
@@ -1,4 +1,4 @@
-org.killbill.catalog.uri=file:src/test/resources/catalog.xml
+org.killbill.catalog.uri=file:src/test/resources/catalogTest.xml
 org.killbill.persistent.bus.main.sleep=100
 org.killbill.persistent.bus.main.nbThreads=1
 org.killbill.persistent.bus.main.claimed=1

diff --git a/junction/src/test/resources/junction.properties b/junction/src/test/resources/junction.properties
index 11f0313..b0bdca1 100644
--- a/junction/src/test/resources/junction.properties
+++ b/junction/src/test/resources/junction.properties
@@ -1,4 +1,4 @@
-org.killbill.catalog.uri=file:src/test/resources/catalog.xml
+org.killbill.catalog.uri=file:src/test/resources/catalogTest.xml
 org.killbill.persistent.bus.main.sleep=100
 org.killbill.persistent.bus.main.nbThreads=1
 org.killbill.persistent.bus.main.claimed=1

diff --git a/server/src/test/resources/killbill.properties b/server/src/test/resources/killbill.properties
index ca00d26..52e5ca9 100644
--- a/server/src/test/resources/killbill.properties
+++ b/server/src/test/resources/killbill.properties
@@ -17,7 +17,7 @@
 # Use killbill util test properties (DbiProvider/MysqltestingHelper) on the test side configured with killbill
 org.killbill.billing.dbi.jdbc.url=jdbc:mysql://127.0.0.1:3306/killbill
 
-org.killbill.catalog.uri=catalog-weapons.xml
+org.killbill.catalog.uri=file:src/test/resources/catalogTest.xml
 killbill.overdue.uri=overdue.xml
 
 org.killbill.payment.engine.events.off=false

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
index 927afd9..0056f86 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
@@ -54,13 +54,14 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
 
     private final DefaultClock clock = new DefaultClock();
 
-    private DefaultCatalogService catalogService;
     private PlanAligner planAligner;
 
     @Override
     @BeforeClass(groups = "fast")
     public void beforeClass() throws Exception {
         super.beforeClass();
+
+        /*
         final VersionedCatalogLoader versionedCatalogLoader = new VersionedCatalogLoader(clock);
         final CatalogConfig config = new ConfigurationObjectFactory(new ConfigSource() {
             final Map<String, String> properties = ImmutableMap.<String, String>of("org.killbill.catalog.uri", "file:src/test/resources/testInput.xml");
@@ -72,9 +73,9 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
         }).build(CatalogConfig.class);
 
         catalogService = new DefaultCatalogService(config, versionedCatalogLoader);
+        */
         planAligner = new PlanAligner(catalogService);
 
-        catalogService.loadCatalog();
     }
 
     @Test(groups = "fast")

diff --git a/subscription/src/test/resources/subscription.properties b/subscription/src/test/resources/subscription.properties
index 9695ca4..b0bdca1 100644
--- a/subscription/src/test/resources/subscription.properties
+++ b/subscription/src/test/resources/subscription.properties
@@ -1,4 +1,4 @@
-org.killbill.catalog.uri=file:src/test/resources/testInput.xml
+org.killbill.catalog.uri=file:src/test/resources/catalogTest.xml
 org.killbill.persistent.bus.main.sleep=100
 org.killbill.persistent.bus.main.nbThreads=1
 org.killbill.persistent.bus.main.claimed=1