killbill-aplcache

diff --git a/pom.xml b/pom.xml
index 0737bf3..2755c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.141.62</version>
+        <version>0.141.63</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.19.14-SNAPSHOT</version>

diff --git a/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDefinitionDao.java b/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
index 20c84c5..1a11dae 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/dao/TestDefaultTagDefinitionDao.java
@@ -34,15 +34,6 @@ import com.google.common.eventbus.Subscribe;
 
 public class TestDefaultTagDefinitionDao extends UtilTestSuiteWithEmbeddedDB {
 
-    @Test(groups = "slow" )
-    public void testInvalidTagDefinition() throws TagDefinitionApiException {
-        try {
-            tagDefinitionDao.getByName("fooNexistePas", internalCallContext);
-            Assert.fail("Retrieving tag definition fooNexistePas should fail");
-        } catch (final TagDefinitionApiException e) {
-            Assert.assertEquals(e.getCode(), ErrorCode.TAG_DEFINITION_DOES_NOT_EXIST.getCode());
-        }
-    }
 
     @Test(groups = "slow")
     public void testCatchEventsOnCreateAndDelete() throws Exception {
@@ -77,7 +68,14 @@ public class TestDefaultTagDefinitionDao extends UtilTestSuiteWithEmbeddedDB {
         assertListenerStatus();
 
         // Make sure the tag definition is deleted
-        Assert.assertNull(tagDefinitionDao.getByName(definitionName, internalCallContext));
+        try {
+            tagDefinitionDao.getByName(definitionName, internalCallContext);
+            Assert.fail("Retrieving tag definition should fail");
+        } catch (final TagDefinitionApiException e) {
+            Assert.assertEquals(e.getCode(), ErrorCode.TAG_DEFINITION_DOES_NOT_EXIST.getCode());
+        }
+
+
 
         /*
         // Verify we caught an event on the bus

diff --git a/util/src/test/java/org/killbill/billing/util/tag/TestTagStore.java b/util/src/test/java/org/killbill/billing/util/tag/TestTagStore.java
index d9bd318..a21826f 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/TestTagStore.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/TestTagStore.java
@@ -19,6 +19,7 @@ package org.killbill.billing.util.tag;
 import java.util.List;
 import java.util.UUID;
 
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import org.killbill.billing.ObjectType;
@@ -93,8 +94,11 @@ public class TestTagStore extends UtilTestSuiteWithEmbeddedDB {
         tagDefinitionDao.deleteById(tagDefinition.getId(), internalCallContext);
         assertListenerStatus();
 
-        tagDefinition = tagDefinitionDao.getByName(definitionName, internalCallContext);
-        assertNull(tagDefinition);
+        try {
+            tagDefinitionDao.getByName(definitionName, internalCallContext);
+            Assert.fail("Call should fail");
+        } catch (TagDefinitionApiException expected) {
+        }
     }
 
     @Test(groups = "slow", expectedExceptions = TagDefinitionApiException.class)