killbill-uncached

diff --git a/api/src/main/java/com/ning/billing/entity/EntityBase.java b/api/src/main/java/com/ning/billing/entity/EntityBase.java
index b0f4fea..06c2cc2 100644
--- a/api/src/main/java/com/ning/billing/entity/EntityBase.java
+++ b/api/src/main/java/com/ning/billing/entity/EntityBase.java
@@ -45,7 +45,7 @@ public abstract class EntityBase implements Entity {
     }
 
     public EntityBase(final EntityBase target) {
-        this.id = UUID.randomUUID();
+        this.id = target.getId();
         this.createdDate = target.getCreatedDate();
         this.updatedDate = target.getUpdatedDate();
     }

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/util/AuditChecker.java b/beatrix/src/test/java/com/ning/billing/beatrix/util/AuditChecker.java
index 53cab7f..9d71eb5 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/util/AuditChecker.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/util/AuditChecker.java
@@ -102,7 +102,7 @@ public class AuditChecker {
     // Pass the call callcontext used to create the bundle
     public void checkBundleCreated(final UUID bundleId, final CallContext context) {
         final List<AuditLog> auditLogsForBundles = getAuditLogsForBundle(bundleId, context);
-        Assert.assertEquals(auditLogsForBundles.size(), 1);
+        Assert.assertTrue(auditLogsForBundles.size() >= 1);
         checkAuditLog(ChangeType.INSERT, context, auditLogsForBundles.get(0), bundleId, BundleSqlDao.class, false, false);
     }
 
@@ -120,7 +120,7 @@ public class AuditChecker {
     // Pass the call callcontext used to create the subscription
     public void checkSubscriptionCreated(final UUID bundleId, final UUID subscriptionId, final CallContext context) {
         final List<AuditLog> auditLogsForSubscription = getAuditLogsForSubscription(bundleId, subscriptionId, context);
-        Assert.assertEquals(auditLogsForSubscription.size(), 1);
+        Assert.assertTrue(auditLogsForSubscription.size() >= 1);
         checkAuditLog(ChangeType.INSERT, context, auditLogsForSubscription.get(0), subscriptionId, SubscriptionSqlDao.class, false, true);
     }