killbill-aplcache

diff --git a/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java b/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java
index 25551a7..13e8891 100644
--- a/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java
+++ b/payment/src/test/java/org/killbill/billing/payment/dao/TestDefaultPaymentDao.java
@@ -90,13 +90,13 @@ public class TestDefaultPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
             verifyPayment(insertedPaymentModelDao, paymentModelDao);
 
             // Verify search APIs
-            Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(paymentModelDao.getPaymentMethodId().toString(), 0L, Long.MAX_VALUE, internalCallContext).iterator()).size(), 1);
-            Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(paymentModelDao.getExternalKey(), 0L, Long.MAX_VALUE, internalCallContext).iterator()).size(), 1);
+            Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(paymentModelDao.getPaymentMethodId().toString(), 0L, 100L, internalCallContext).iterator()).size(), 1);
+            Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(paymentModelDao.getExternalKey(), 0L, 100L, internalCallContext).iterator()).size(), 1);
         }
         Assert.assertEquals(paymentDao.getPaymentsForAccount(specifiedFirstPaymentModelDao.getAccountId(), accountCallContext).size(), 4);
 
         // Verify search APIs
-        Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(accountId.toString(), 0L, Long.MAX_VALUE, internalCallContext).iterator()).size(), 4);
+        Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(accountId.toString(), 0L, 100L, internalCallContext).iterator()).size(), 4);
     }
 
     private void verifyPaymentAndTransactions(final InternalCallContext accountCallContext, final PaymentModelDao specifiedFirstPaymentModelDao, final PaymentTransactionModelDao... specifiedFirstPaymentTransactionModelDaos) {
@@ -164,8 +164,8 @@ public class TestDefaultPaymentDao extends PaymentTestSuiteWithEmbeddedDB {
         Assert.assertEquals(loadedPaymentModelDao.getExternalKey(), specifiedPaymentModelDao.getExternalKey());
 
         // Verify search APIs
-        Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(specifiedPaymentModelDao.getPaymentMethodId().toString(), 0L, Long.MAX_VALUE, internalCallContext).iterator()).size(), 1);
-        Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(specifiedPaymentModelDao.getExternalKey(), 0L, Long.MAX_VALUE, internalCallContext).iterator()).size(), 1);
+        Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(specifiedPaymentModelDao.getPaymentMethodId().toString(), 0L, 100L, internalCallContext).iterator()).size(), 1);
+        Assert.assertEquals(ImmutableList.<PaymentModelDao>copyOf(paymentDao.searchPayments(specifiedPaymentModelDao.getExternalKey(), 0L, 100L, internalCallContext).iterator()).size(), 1);
     }
 
     private void verifyPaymentTransaction(final PaymentTransactionModelDao loadedPaymentTransactionModelDao, final PaymentTransactionModelDao specifiedPaymentTransactionModelDao) {

diff --git a/util/src/test/java/org/killbill/billing/util/cache/TestCache.java b/util/src/test/java/org/killbill/billing/util/cache/TestCache.java
index 9b7f436..a65cf7e 100644
--- a/util/src/test/java/org/killbill/billing/util/cache/TestCache.java
+++ b/util/src/test/java/org/killbill/billing/util/cache/TestCache.java
@@ -78,8 +78,11 @@ public class TestCache extends UtilTestSuiteWithEmbeddedDB {
         final Long recordIdFromCache = retrieveRecordIdFromCache(tag.getId());
         Assert.assertNotNull(recordIdFromCache);
 
-        Assert.assertEquals(recordIdFromCache, new Long(1));
-        Assert.assertEquals(tagRecordId, new Long(1));
+        Assert.assertEquals(recordIdFromCache, tagRecordId);
+        // We cannot assume the number to be 1 here as the auto_increment implementation
+        // depends on the database.
+        // See also http://h2database.com/html/grammar.html#create_sequence
+        Assert.assertTrue(recordIdFromCache > 0);
 
         Assert.assertEquals(getCacheSize(CacheType.RECORD_ID), 1);
     }