killbill-memoizeit

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBundle.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBundle.java
index a020252..6a36f3c 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBundle.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBundle.java
@@ -74,7 +74,7 @@ public class TestBundle extends TestJaxrsBase {
             killBillClient.getBundle(UUID.randomUUID());
             Assert.fail();
         } catch (final KillBillClientException e) {
-            Assert.assertEquals(e.getBillingException().getClassName(), "java.lang.IllegalStateException");
+            Assert.assertEquals(e.getBillingException().getClassName(), "org.killbill.billing.util.callcontext.InternalCallContextFactory$ObjectDoesNotExist");
         }
         Assert.assertTrue(killBillClient.getAccountBundles(accountJson.getAccountId(), "98374982743892").isEmpty());
         Assert.assertTrue(killBillClient.getAccountBundles(accountJson.getAccountId()).isEmpty());

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCredit.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCredit.java
index bb1f0ad..5bc85f0 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCredit.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCredit.java
@@ -92,7 +92,7 @@ public class TestCredit extends TestJaxrsBase {
             killBillClient.getCredit(UUID.randomUUID());
             Assert.fail();
         } catch (final KillBillClientException e) {
-            Assert.assertEquals(e.getBillingException().getClassName(), "java.lang.IllegalStateException");
+            Assert.assertEquals(e.getBillingException().getClassName(), "org.killbill.billing.util.callcontext.InternalCallContextFactory$ObjectDoesNotExist");
         }
     }
 }

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestEntitlement.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestEntitlement.java
index 875e8aa..33252d8 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestEntitlement.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestEntitlement.java
@@ -149,21 +149,21 @@ public class TestEntitlement extends TestJaxrsBase {
             killBillClient.updateSubscription(subscription, CALL_COMPLETION_TIMEOUT_SEC, createdBy, reason, comment);
             Assert.fail();
         } catch (final KillBillClientException e) {
-            Assert.assertEquals(e.getBillingException().getClassName(), "java.lang.IllegalStateException");
+            Assert.assertEquals(e.getBillingException().getClassName(), "org.killbill.billing.util.callcontext.InternalCallContextFactory$ObjectDoesNotExist");
         }
 
         try {
             killBillClient.cancelSubscription(subscriptionId, createdBy, reason, comment);
             Assert.fail();
         } catch (final KillBillClientException e) {
-            Assert.assertEquals(e.getBillingException().getClassName(), "java.lang.IllegalStateException");
+            Assert.assertEquals(e.getBillingException().getClassName(), "org.killbill.billing.util.callcontext.InternalCallContextFactory$ObjectDoesNotExist");
         }
 
         try {
             killBillClient.getSubscription(subscriptionId);
             Assert.fail();
         } catch (final KillBillClientException e) {
-            Assert.assertEquals(e.getBillingException().getClassName(), "java.lang.IllegalStateException");
+            Assert.assertEquals(e.getBillingException().getClassName(), "org.killbill.billing.util.callcontext.InternalCallContextFactory$ObjectDoesNotExist");
         }
     }