killbill-memoizeit

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 1ffffe4..1c2d9b6 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
@@ -198,10 +198,14 @@ public class ServiceFinder {
         int prevLen;
         if (dir.isDirectory()) {
             final File[] files = dir.listFiles();
-            for (int i = 0; i < files.length; i++) {
+            if (files == null) {
+                return;
+            }
+
+            for (final File file : files) {
                 prevLen = relativePath.length();
-                recursivelyListDir(dirListing, files[i],
-                                   relativePath.append(prevLen == 0 ? "" : "/").append(files[i].getName()));
+                recursivelyListDir(dirListing, file,
+                                   relativePath.append(prevLen == 0 ? "" : "/").append(file.getName()));
                 relativePath.delete(prevLen, relativePath.length());
             }
         } else {

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
index c13685d..faf33af 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
@@ -122,16 +122,14 @@ public class EntitlementTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB  {
     protected AccountData accountData;
     protected SubscriptionBundle bundle;
 
-
-    @BeforeClass(groups = "slow")
+    @BeforeClass(groups = "fast")
     public void setup() throws Exception {
         DefaultEntitlementTestInitializer.loadSystemPropertiesFromClasspath("/entitlement.properties");
         final Injector g = Guice.createInjector(Stage.PRODUCTION, new MockEngineModuleMemory());
         g.injectMembers(this);
     }
 
-
-    @BeforeMethod(groups = "slow")
+    @BeforeMethod(groups = "fast")
     public void setupTest() throws Exception {
 
         // CLEANUP ALL DB TABLES OR IN MEMORY STRUCTURES
@@ -144,8 +142,7 @@ public class EntitlementTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB  {
         this.bundle = entitlementTestInitializer.initBundle(entitlementApi, callContext);
     }
 
-
-    @AfterMethod(groups = "slow")
+    @AfterMethod(groups = "fast")
     public void cleanupTest() throws Exception {
         entitlementTestInitializer.stopTestFramework(testListener, busService, entitlementService);
     }