killbill-memoizeit

diff --git a/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java b/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java
index ae9b8ca..f3ff6e6 100644
--- a/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java
+++ b/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java
@@ -42,7 +42,7 @@ public class TestBroadcastDao extends UtilTestSuiteWithEmbeddedDB {
         final List<BroadcastModelDao> all = broadcastDao.getLatestEntriesFrom(0L);
         assertEquals(all.size(), 1);
 
-        final List<BroadcastModelDao> none = broadcastDao.getLatestEntriesFrom(1L);
-        assertEquals(none.size(), 0, none.isEmpty() ? null : "Invalid entry: " + none.get(0).toString());
+        final List<BroadcastModelDao> none = broadcastDao.getLatestEntriesFrom(res.getRecordId());
+        assertEquals(none.size(), 0, "Invalid entries: " + none.toString());
     }
 }

diff --git a/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java b/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java
index b83c1fa..77fd294 100644
--- a/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java
+++ b/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java
@@ -1,7 +1,9 @@
 /*
- * Copyright 2010-2013 Ning, Inc.
+ * Copyright 2010-2014 Ning, Inc.
+ * Copyright 2014-2017 Groupon, Inc
+ * Copyright 2014-2017 The Billing Project, LLC
  *
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License.  You may obtain a copy of the License at:
  *
@@ -36,8 +38,9 @@ public class TestDefaultSecurityApi extends UtilTestSuiteNoDB {
         // We don't want the Guice injected one (it has Shiro disabled)
         final SecurityApi securityApi = new DefaultSecurityApi(null);
 
+        logout();
         final Set<Permission> anonsPermissions = securityApi.getCurrentUserPermissions(callContext);
-        Assert.assertEquals(anonsPermissions.size(), 0);
+        Assert.assertEquals(anonsPermissions.size(), 0, "Invalid permissions: " + anonsPermissions);
 
         login("pierre");
         final Set<Permission> pierresPermissions = securityApi.getCurrentUserPermissions(callContext);