diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 255fd6e69..e79bbba63 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -172,13 +172,13 @@
                 <version>2.19.1</version>
                 <configuration>
                     <groups>org.libreccm.tests.categories.UnitTest</groups>
+                    <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
             
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.5.201505241946</version>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>
@@ -362,16 +362,9 @@
         <profile>
             <id>wildfly-remote-h2-mem</id>
             <dependencies>
-                <!--                <dependency>
-                    <groupId>org.libreccm</groupId>
-                    <artifactId>ccm-core</artifactId>
-                    <version>${project.parent.version}</version>
-                </dependency>-->
-                
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
-                    <!--<version>8.2.1.Final</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -382,7 +375,6 @@
                 <dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
-                    <!--<version>0.7.5.201505241946</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -446,6 +438,7 @@
                                 <module.path>${project.basedir}/target/wildfly-8.2.0.Final/modules</module.path>-->
                             </systemPropertyVariables>
                             <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                            <trimStackTrace>false</trimStackTrace>
                             <groups>
                                 org.libreccm.tests.categories.UnitTest,
                                 org.libreccm.tests.categories.IntegrationTest
@@ -532,6 +525,7 @@
                                 <module.path>${project.basedir}/target/wildfly-8.2.0.Final/modules</module.path>-->
                             </systemPropertyVariables>
                             <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                            <trimStackTrace>false</trimStackTrace>
                             <groups>
                                 org.libreccm.tests.categories.UnitTest,
                                 org.libreccm.tests.categories.IntegrationTest
diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.java
index 087bcada3..7fe945f75 100644
--- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.java
+++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.java
@@ -150,10 +150,12 @@ public class ShortcutManagerTest {
             .addPackage(org.libreccm.l10n.LocalizedString.class
                 .getPackage())
             .addPackage(org.libreccm.security.Permission.class.getPackage())
-            .addPackage(org.libreccm.shortcuts.Shortcuts.class.getPackage())
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
             .addClass(com.arsdigita.kernel.KernelConfig.class)
+            .addClass(org.libreccm.shortcuts.Shortcut.class)
+            .addClass(org.libreccm.shortcuts.ShortcutManager.class)
+            .addClass(org.libreccm.shortcuts.ShortcutRepository.class)
             .addAsLibraries(libs)
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",
diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java
index a38e7e2a6..241a7db95 100644
--- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java
+++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java
@@ -23,6 +23,7 @@ import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.arquillian.persistence.CreateSchema;
 import org.jboss.arquillian.persistence.PersistenceTest;
+import org.jboss.arquillian.persistence.UsingDataSet;
 import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
 import org.jboss.arquillian.transaction.api.annotation.Transactional;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -37,7 +38,6 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.libreccm.tests.categories.IntegrationTest;
 
@@ -50,7 +50,6 @@ import java.util.stream.IntStream;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import org.jboss.arquillian.persistence.UsingDataSet;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -59,7 +58,7 @@ import static org.junit.Assert.*;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@Category(IntegrationTest.class)
+@org.junit.experimental.categories.Category(IntegrationTest.class)
 @RunWith(Arquillian.class)
 @PersistenceTest
 @Transactional(TransactionMode.COMMIT)
@@ -126,7 +125,7 @@ public class ShortcutRepositoryTest {
         
         return ShrinkWrap.create(
             WebArchive.class,
-            "LibreCCM-org.libreccm.shortcuts.ShortcutTest-web.war")
+            "LibreCCM-org.libreccm.shortcuts.ShortcutRepositoryTest-web.war")
             .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
             .addPackage(org.libreccm.categorization.Categorization.class
                 .getPackage())
@@ -138,9 +137,10 @@ public class ShortcutRepositoryTest {
             .addPackage(org.libreccm.l10n.LocalizedString.class
                 .getPackage())
             .addPackage(org.libreccm.security.Permission.class.getPackage())
-            .addPackage(org.libreccm.shortcuts.Shortcuts.class.getPackage())
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
+            .addClass(org.libreccm.shortcuts.Shortcut.class)
+            .addClass(org.libreccm.shortcuts.ShortcutRepository.class)
             .addAsLibraries(libs)
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")
diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql
index 56d15da08..4bf3eb1cb 100644
--- a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql
+++ b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql
@@ -40,6 +40,7 @@ CREATE SCHEMA ccm_shortcuts;
         CATEGORY_ORDER bigint,
         CATEGORY_INDEX boolean,
         OBJECT_ORDER bigint,
+        TYPE varchar(255),
         OBJECT_ID bigint,
         CATEGORY_ID bigint,
         primary key (CATEGORIZATION_ID)
@@ -47,7 +48,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.CATEGORY_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -64,7 +65,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.CATEGORY_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -111,7 +112,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.DOMAIN_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -128,14 +129,14 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.DOMAIN_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS (
         COMPONENT_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (COMPONENT_ID, LOCALE)
     );
@@ -180,14 +181,14 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS (
         DATA_QUERY_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (DATA_QUERY_ID, LOCALE)
     );
 
     create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES (
         DATA_QUERY_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (DATA_QUERY_ID, LOCALE)
     );
@@ -224,7 +225,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.FORMBUILDER_OPTION_LABELS (
         OPTION_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (OPTION_ID, LOCALE)
     );
@@ -237,14 +238,14 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS (
         PROCESS_LISTENER_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (PROCESS_LISTENER_ID, LOCALE)
     );
 
     create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES (
         PROCESS_LISTENER_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (PROCESS_LISTENER_ID, LOCALE)
     );
@@ -441,21 +442,21 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.RESOURCE_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CORE.RESOURCE_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS (
         RESOURCE_TYPE_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (RESOURCE_TYPE_ID, LOCALE)
     );
@@ -490,11 +491,11 @@ CREATE SCHEMA ccm_shortcuts;
         SETTING_ID bigint not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
-        SETTING_VALUE_DOUBLE double,
         SETTING_VALUE_LONG bigint,
-        SETTING_VALUE_BOOLEAN boolean,
         SETTING_VALUE_STRING varchar(1024),
         SETTING_VALUE_BIG_DECIMAL decimal(19,2),
+        SETTING_VALUE_BOOLEAN boolean,
+        SETTING_VALUE_DOUBLE double,
         primary key (SETTING_ID)
     );
 
@@ -505,7 +506,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.SETTINGS_L10N_STR_VALUES (
         ENTRY_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (ENTRY_ID, LOCALE)
     );
@@ -550,14 +551,14 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.WORKFLOW_DESCRIPTIONS (
         WORKFLOW_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (WORKFLOW_ID, LOCALE)
     );
 
     create table CCM_CORE.WORKFLOW_NAMES (
         WORKFLOW_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (WORKFLOW_ID, LOCALE)
     );
@@ -574,7 +575,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.WORKFLOW_TASK_LABELS (
         TASK_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (TASK_ID, LOCALE)
     );
@@ -589,7 +590,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.WORKFLOW_TASKS_DESCRIPTIONS (
         TASK_ID bigint not null,
-        LOCALIZED_VALUE clob,
+        LOCALIZED_VALUE longvarchar,
         LOCALE varchar(255) not null,
         primary key (TASK_ID, LOCALE)
     );
@@ -612,6 +613,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.WORKFLOWS (
         WORKFLOW_ID bigint not null,
+        TEMPLATE_ID bigint,
         primary key (WORKFLOW_ID)
     );
 
@@ -1127,4 +1129,9 @@ create sequence hibernate_sequence start with 1 increment by 1;
     alter table CCM_CORE.WORKFLOW_USER_TASKS 
         add constraint FKefpdf9ojplu7loo31hfm0wl2h 
         foreign key (TASK_ID) 
-        references CCM_CORE.WORKFLOW_TASKS;
\ No newline at end of file
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOWS 
+        add constraint FKeixdxau4jebw682gd49tdbsjy 
+        foreign key (TEMPLATE_ID) 
+        references CCM_CORE.WORKFLOW_TEMPLATES;
\ No newline at end of file
diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql
index 86a67415a..2423d8499 100644
--- a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql
+++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql
@@ -40,6 +40,7 @@ CREATE SCHEMA ccm_shortcuts;
         CATEGORY_ORDER int8,
         CATEGORY_INDEX boolean,
         OBJECT_ORDER int8,
+        TYPE varchar(255),
         OBJECT_ID int8,
         CATEGORY_ID int8,
         primary key (CATEGORIZATION_ID)
@@ -490,11 +491,11 @@ CREATE SCHEMA ccm_shortcuts;
         SETTING_ID int8 not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
-        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
-        SETTING_VALUE_DOUBLE float8,
-        SETTING_VALUE_STRING varchar(1024),
         SETTING_VALUE_LONG int8,
+        SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
         SETTING_VALUE_BOOLEAN boolean,
+        SETTING_VALUE_DOUBLE float8,
         primary key (SETTING_ID)
     );
 
@@ -612,6 +613,7 @@ CREATE SCHEMA ccm_shortcuts;
 
     create table CCM_CORE.WORKFLOWS (
         WORKFLOW_ID int8 not null,
+        TEMPLATE_ID int8,
         primary key (WORKFLOW_ID)
     );
 
@@ -1127,4 +1129,9 @@ create sequence hibernate_sequence start 1 increment 1;
     alter table CCM_CORE.WORKFLOW_USER_TASKS 
         add constraint FKefpdf9ojplu7loo31hfm0wl2h 
         foreign key (TASK_ID) 
-        references CCM_CORE.WORKFLOW_TASKS;
\ No newline at end of file
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOWS 
+        add constraint FKeixdxau4jebw682gd49tdbsjy 
+        foreign key (TEMPLATE_ID) 
+        references CCM_CORE.WORKFLOW_TEMPLATES;
\ No newline at end of file
diff --git a/ccm-shortcuts/src/test/resources/application.xml b/ccm-shortcuts/src/test/resources/application.xml.off
similarity index 100%
rename from ccm-shortcuts/src/test/resources/application.xml
rename to ccm-shortcuts/src/test/resources/application.xml.off
diff --git a/ccm-shortcuts/src/test/resources/test-beans.xml.off b/ccm-shortcuts/src/test/resources/test-beans.xml.off
new file mode 100644
index 000000000..d45765d18
--- /dev/null
+++ b/ccm-shortcuts/src/test/resources/test-beans.xml.off
@@ -0,0 +1,11 @@
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+                           http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       bean-discovery-mode="annotated">
+       
+        <interceptors>
+            <class>org.libreccm.security.AuthorizationInterceptor</class>
+        </interceptors>
+    
+</beans>