killbill-memoizeit

diff --git a/api/src/main/java/com/ning/billing/lifecycle/LyfecycleHandlerType.java b/api/src/main/java/com/ning/billing/lifecycle/LyfecycleHandlerType.java
index 2412916..af15dea 100644
--- a/api/src/main/java/com/ning/billing/lifecycle/LyfecycleHandlerType.java
+++ b/api/src/main/java/com/ning/billing/lifecycle/LyfecycleHandlerType.java
@@ -65,14 +65,14 @@ public @interface LyfecycleHandlerType {
          */
         STOP_SERVICE(Sequence.SHUTOWN_PRE_EVENT_UNREGISTRATION),
         /**
-         * Stop bus
-         */
-        STOP_BUS(Sequence.SHUTOWN_PRE_EVENT_UNREGISTRATION),
-        /**
          * Unregister interest in events
          */
         UNREGISTER_EVENTS(Sequence.SHUTOWN_PRE_EVENT_UNREGISTRATION),
         /**
+         * Stop bus
+         */
+        STOP_BUS(Sequence.SHUTOWN_POST_EVENT_UNREGISTRATION),
+        /**
          * Any service specific shutdown action before the end
          */
         SHUTDOWN(Sequence.SHUTOWN_POST_EVENT_UNREGISTRATION);

diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
index 9dfa89f..6916cf1 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
@@ -91,8 +91,6 @@ public class ServiceFinder {
 	        classPaths = System.getProperty("java.class.path", "").split(File.pathSeparator);
 	    }
 
-	    log.info("Start SERVICE_FINDER");
-
 	    for (int h = 0; h < classPaths.length; h++) {
 
 
@@ -102,14 +100,14 @@ public class ServiceFinder {
 	                ((URL)classPaths[h]).getFile() : classPaths[h].toString());
 	        if (classPath.isDirectory()) {
 
-                log.info("DIR : " + classPath);
+                log.debug("DIR : " + classPath);
 
 	            List<String> dirListing = new ArrayList<String>();
 	            recursivelyListDir(dirListing, classPath, new StringBuffer() );
 	            files = Collections.enumeration( dirListing );
 	        } else if (classPath.getName().endsWith(".jar")) {
 
-	            log.info("JAR : " + classPath);
+	            log.debug("JAR : " + classPath);
 
 	            String [] jarParts = classPath.getName().split("/");
 	            String jarName = jarParts[jarParts.length - 1];

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java b/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
index 99d7e16..791b2fe 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/lifecycle/TestLifecycle.java
@@ -130,7 +130,7 @@ public class TestLifecycle {
         lifecycle = g.getInstance(Lifecycle.class);
     }
 
-    @Test(enabled=false, groups={"fast"})
+    @Test(enabled=true, groups={"fast"})
     public void testLifecycle() {
         s1.reset();
         s2.reset();

diff --git a/pom.xml b/pom.xml
index bf8e215..f0b7227 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,6 +373,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
                     <systemPropertyVariables>
                         <log4j.configuration>file:${project.basedir}/src/test/resources/log4j.xml</log4j.configuration>
                     </systemPropertyVariables>