diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/core/CcmCore/pgsql/V1_0_0_0_create_tables.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/core/CcmCore/pgsql/V1_0_0_0_create_tables.sql
index c5209705b..ebc482ec2 100644
--- a/ccm-core/src/main/resources/db/migrations/org/libreccm/core/CcmCore/pgsql/V1_0_0_0_create_tables.sql
+++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/core/CcmCore/pgsql/V1_0_0_0_create_tables.sql
@@ -21,7 +21,7 @@
         description varchar(255),
         mime_type varchar(255),
         title varchar(255),
-        primary key (message_id)
+        primary key (attachment_id)
     );
 
     create table ccm_core.categories (
diff --git a/ccm-core/src/test/resources-wildfly8-remote-h2-mem/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly8-remote-h2-mem/scripts/create_ccm_core_schema.sql
index 5274c4fe1..d4f3a382b 100644
--- a/ccm-core/src/test/resources-wildfly8-remote-h2-mem/scripts/create_ccm_core_schema.sql
+++ b/ccm-core/src/test/resources-wildfly8-remote-h2-mem/scripts/create_ccm_core_schema.sql
@@ -24,7 +24,7 @@ CREATE SCHEMA ccm_core;
         description varchar(255),
         mime_type varchar(255),
         title varchar(255),
-        primary key (message_id)
+        primary key (attachment_id)
     );
 
     create table ccm_core.categories (
diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql
index fd0f86d37..0c743274a 100644
--- a/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql
+++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql
@@ -24,7 +24,7 @@ CREATE SCHEMA ccm_core;
         description varchar(255),
         mime_type varchar(255),
         title varchar(255),
-        primary key (message_id)
+        primary key (attachment_id)
     );
 
     create table ccm_core.categories (
diff --git a/ccm-test-bundle/src/test/java/org/libreccm/CcmModulesTest.java b/ccm-test-bundle/src/test/java/org/libreccm/CcmModulesTest.java
index 3851dbf6d..e790d4397 100644
--- a/ccm-test-bundle/src/test/java/org/libreccm/CcmModulesTest.java
+++ b/ccm-test-bundle/src/test/java/org/libreccm/CcmModulesTest.java
@@ -108,7 +108,7 @@ public class CcmModulesTest {
                 .create(WebArchive.class,
                         "LibreCCM-org.libreccm.CcmModulesTest.war")
                 .addAsLibraries(libs)
-                .addAsWebInfResource("web.xml")
+                .setWebXML(new File("src/main/webapp/WEB-INF/web.xml"))
                 .addAsWebInfResource("test-persistence.xml")
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
     }
diff --git a/ccm-test-bundle/src/main/resources-wildfly8-remote-h2-mem/arquillian.xml b/ccm-test-bundle/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml
similarity index 100%
rename from ccm-test-bundle/src/main/resources-wildfly8-remote-h2-mem/arquillian.xml
rename to ccm-test-bundle/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml
diff --git a/ccm-test-bundle/src/main/resources-wildfly8-remote-h2-mem/scripts/clean_schema.sql b/ccm-test-bundle/src/test/resources-wildfly8-remote-h2-mem/scripts/clean_schema.sql
similarity index 100%
rename from ccm-test-bundle/src/main/resources-wildfly8-remote-h2-mem/scripts/clean_schema.sql
rename to ccm-test-bundle/src/test/resources-wildfly8-remote-h2-mem/scripts/clean_schema.sql
diff --git a/ccm-test-bundle/src/main/resources-wildfly8-remote-h2-mem/test-persistence.xml b/ccm-test-bundle/src/test/resources-wildfly8-remote-h2-mem/test-persistence.xml
similarity index 100%
rename from ccm-test-bundle/src/main/resources-wildfly8-remote-h2-mem/test-persistence.xml
rename to ccm-test-bundle/src/test/resources-wildfly8-remote-h2-mem/test-persistence.xml
diff --git a/ccm-test-bundle/src/main/resources-wildfly8-remote-pgsql/arquillian.xml b/ccm-test-bundle/src/test/resources-wildfly8-remote-pgsql/arquillian.xml
similarity index 100%
rename from ccm-test-bundle/src/main/resources-wildfly8-remote-pgsql/arquillian.xml
rename to ccm-test-bundle/src/test/resources-wildfly8-remote-pgsql/arquillian.xml
diff --git a/ccm-test-bundle/src/main/resources-wildfly8-remote-pgsql/scripts/clean_schema.sql b/ccm-test-bundle/src/test/resources-wildfly8-remote-pgsql/scripts/clean_schema.sql
similarity index 100%
rename from ccm-test-bundle/src/main/resources-wildfly8-remote-pgsql/scripts/clean_schema.sql
rename to ccm-test-bundle/src/test/resources-wildfly8-remote-pgsql/scripts/clean_schema.sql
diff --git a/ccm-test-bundle/src/main/resources-wildfly8-remote-pgsql/test-persistence.xml b/ccm-test-bundle/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml
similarity index 100%
rename from ccm-test-bundle/src/main/resources-wildfly8-remote-pgsql/test-persistence.xml
rename to ccm-test-bundle/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml