diff --git a/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupTest.java b/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupTest.java
index 29c8b8f00..a375ccf80 100644
--- a/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupTest.java
+++ b/ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupTest.java
@@ -18,8 +18,6 @@
  */
 package org.libreccm.categorization;
 
-import org.libreccm.categorization.RegistrySetup;
-import com.example.TestConfiguration;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
@@ -39,24 +37,14 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.libreccm.categorization.Categorization;
-import org.libreccm.core.CcmObject;
-import org.libreccm.jpa.EntityManagerProducer;
-import org.libreccm.jpa.utils.MimeTypeConverter;
-import org.libreccm.l10n.LocalizedString;
 import org.libreccm.modules.InstallEvent;
-import org.libreccm.security.Permission;
 import org.libreccm.tests.categories.IntegrationTest;
-import org.libreccm.testutils.EqualsVerifier;
-import org.libreccm.web.CcmApplication;
-import org.libreccm.workflow.Workflow;
 
 import java.io.File;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 
-import org.libreccm.configuration.Configuration;
 
 
 /**
@@ -131,7 +119,7 @@ public class RegistrySetupTest {
     @Test
     @ShouldMatchDataSet(value = 
         "datasets/org/libreccm/categorization/RegistrySetupTest/after-setup.xml",
-        excludeColumns = {"object_id", "root_category_id"})
+        excludeColumns = {"object_id", "root_category_id", "uuid"})
     @InSequence(100)
     public void setupRegistry() {
         final InstallEvent installEvent = new InstallEvent();
diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java
index 2f67d1f39..58783c0c8 100644
--- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java
+++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java
@@ -43,7 +43,6 @@ import org.libreccm.modules.dependencytree.test.cycle.TestModuleB;
 import org.libreccm.modules.dependencytree.test.cycle.TestModuleC;
 import org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot;
 import org.libreccm.tests.categories.IntegrationTest;
-import org.libreccm.web.ApplicationType;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -101,27 +100,31 @@ public class DependencyTreeManagerCycleTest {
         return ShrinkWrap
             .create(WebArchive.class,
                     "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerCycleTest.war")
-            .addPackage(IntegrationTest.class.getPackage())
-            .addClass(DependencyTreeManager.class)
-            .addClass(DependencyException.class)
-            .addClass(IntegrationException.class)
+            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .getPackage())
+            .addClass(org.libreccm.modules.DependencyTreeManager.class)
+            .addClass(org.libreccm.modules.DependencyException.class)
+            .addClass(org.libreccm.modules.IntegrationException.class)
             .addClass(TreeNode.class)
-            .addClass(CcmModule.class)
-            .addClass(ModuleInfo.class)
-            .addClass(ModuleStatus.class)
-            .addClass(Module.class)
-            .addClass(RequiredModule.class)
-            .addClass(InitEvent.class)
-            .addClass(InstallEvent.class)
-            .addClass(ShutdownEvent.class)
-            .addClass(UnInstallEvent.class)
-            .addClass(TestModuleRoot.class)
-            .addClass(TestModuleA.class)
-            .addClass(TestModuleB.class)
-            .addClass(TestModuleC.class)
-            .addClass(ApplicationType.class)
+            .addClass(org.libreccm.modules.CcmModule.class)
+            .addClass(org.libreccm.modules.ModuleInfo.class)
+            .addClass(org.libreccm.modules.ModuleStatus.class)
+            .addClass(org.libreccm.modules.Module.class)
+            .addClass(org.libreccm.modules.RequiredModule.class)
+            .addClass(org.libreccm.modules.InitEvent.class)
+            .addClass(org.libreccm.modules.InstallEvent.class)
+            .addClass(org.libreccm.modules.ShutdownEvent.class)
+            .addClass(org.libreccm.modules.UnInstallEvent.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.cycle.TestModuleA.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.cycle.TestModuleB.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.cycle.TestModuleC.class)
+            .addClass(org.libreccm.web.ApplicationType.class)
             .addAsLibraries(libs)
-            .addAsWebInfResource("test-web.xml", "web.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
             .addAsResource(
                 "module-info/dependency-tree-manager-cycle-test/module-root.properties",
diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java
index 107e7ddae..ef24a55e3 100644
--- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java
+++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java
@@ -43,7 +43,6 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.libreccm.tests.categories.IntegrationTest;
-import org.libreccm.web.ApplicationType;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -102,27 +101,31 @@ public class DependencyTreeManagerTest {
         return ShrinkWrap
             .create(WebArchive.class,
                     "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerTest.war")
-            .addPackage(IntegrationTest.class.getPackage())
-            .addClass(DependencyTreeManager.class)
-            .addClass(DependencyException.class)
-            .addClass(IntegrationException.class)
-            .addClass(TreeNode.class)
-            .addClass(CcmModule.class)
-            .addClass(ModuleInfo.class)
-            .addClass(ModuleStatus.class)
-            .addClass(Module.class)
-            .addClass(RequiredModule.class)
-            .addClass(InitEvent.class)
-            .addClass(InstallEvent.class)
-            .addClass(ShutdownEvent.class)
-            .addClass(UnInstallEvent.class)
-            .addClass(TestModuleRoot.class)
-            .addClass(TestModuleA.class)
-            .addClass(TestModuleB.class)
-            .addClass(TestModuleC.class)
-            .addClass(ApplicationType.class)
+            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .getPackage())
+            .addClass(org.libreccm.modules.DependencyTreeManager.class)
+            .addClass(org.libreccm.modules.DependencyException.class)
+            .addClass(org.libreccm.modules.IntegrationException.class)
+            .addClass(org.libreccm.modules.TreeNode.class)
+            .addClass(org.libreccm.modules.CcmModule.class)
+            .addClass(org.libreccm.modules.ModuleInfo.class)
+            .addClass(org.libreccm.modules.ModuleStatus.class)
+            .addClass(org.libreccm.modules.Module.class)
+            .addClass(org.libreccm.modules.RequiredModule.class)
+            .addClass(org.libreccm.modules.InitEvent.class)
+            .addClass(org.libreccm.modules.InstallEvent.class)
+            .addClass(org.libreccm.modules.ShutdownEvent.class)
+            .addClass(org.libreccm.modules.UnInstallEvent.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.valid.TestModuleRoot.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.valid.TestModuleA.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.valid.TestModuleB.class)
+            .addClass(
+                org.libreccm.modules.dependencytree.test.valid.TestModuleC.class)
+            .addClass(org.libreccm.web.ApplicationType.class)
             .addAsLibraries(libs)
-            .addAsWebInfResource("test-web.xml", "web.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
             .addAsResource(
                 "module-info/dependency-tree-manager-test/module-root.properties",
diff --git a/ccm-theme-foundry/pom.xml b/ccm-theme-foundry/pom.xml
index 80239e518..4faeee8b3 100644
--- a/ccm-theme-foundry/pom.xml
+++ b/ccm-theme-foundry/pom.xml
@@ -21,6 +21,7 @@
     <groupId>org.libreccm</groupId>
     <artifactId>ccm-theme-foundry</artifactId>
     <version>7.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>LibreCCM Foundry Theming Engine</name>