killbill-uncached

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyNotificationPlugin.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyNotificationPlugin.java
index cb5f808..0fc051d 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyNotificationPlugin.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyNotificationPlugin.java
@@ -52,7 +52,7 @@ public class TestJrubyNotificationPlugin extends TestOSGIBase {
 
         // Once we create the account we give the hand to the jruby notification plugin
         // which will handle the ExtBusEvent and start updating the account, create tag definition and finally create a tag.
-        // We wait for all that to occur and declare victory if we see the TagDefiniton/Tag creation.
+        // We wait for all that to occur and declare victory if we see the TagDefinition/Tag creation.
         busHandler.pushExpectedEvents(NextEvent.TAG_DEFINITION, NextEvent.TAG);
         final Account account = createAccountWithNonOsgiPaymentMethod(getAccountData(4));
         assertTrue(busHandler.isCompleted(2 * DELAY));

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
index 2c4dfab..07998cc 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
@@ -55,7 +55,6 @@ import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.PriceListSet;
 import com.ning.billing.catalog.api.ProductCategory;
-import com.ning.billing.dbi.DBTestingHelper;
 import com.ning.billing.entitlement.api.EntitlementService;
 import com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi;
 import com.ning.billing.entitlement.api.transfer.EntitlementTransferApi;

diff --git a/beatrix/src/test/resources/killbill-notification-test.tar.gz b/beatrix/src/test/resources/killbill-notification-test.tar.gz
index f1769db..87b0d30 100644
Binary files a/beatrix/src/test/resources/killbill-notification-test.tar.gz and b/beatrix/src/test/resources/killbill-notification-test.tar.gz differ

diff --git a/beatrix/src/test/resources/killbill-payment-test.tar.gz b/beatrix/src/test/resources/killbill-payment-test.tar.gz
index aa87d40..4b85724 100644
Binary files a/beatrix/src/test/resources/killbill-payment-test.tar.gz and b/beatrix/src/test/resources/killbill-payment-test.tar.gz differ

diff --git a/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java b/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java
index 247d541..e436bc1 100644
--- a/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java
+++ b/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java
@@ -46,7 +46,7 @@ public interface OSGIConfig extends KillbillConfig {
     @Default("com.ning.billing.account.api," +
              "com.ning.billing.analytics.api.sanity," +
              "com.ning.billing.analytics.api.user," +
-             "com.ning.billing.beatrix.bus.api," +
+             "com.ning.billing.beatrix.bus.api," + /* TODO PIERRE Remove it after plugins classes have been regenerated */
              "com.ning.billing.catalog.api," +
              "com.ning.billing.entitlement.api," +
              "com.ning.billing.entitlement.api.migration," +
@@ -56,6 +56,8 @@ public interface OSGIConfig extends KillbillConfig {
              "com.ning.billing.invoice.api," +
              "com.ning.billing.junction.api," +
              "com.ning.billing," +
+             "com.ning.billing.notification.api," +
+             "com.ning.billing.notification.plugin.api," +
              "com.ning.billing.osgi.api," +
              "com.ning.billing.osgi.api.config," +
              "com.ning.billing.overdue," +