TSK-329: changed data to match requirements from read permission on workbaskets.

2018-02-26 20:57:22 +01:00 · 2018-02-26 20:57:22 +01:00 · bc83b1c500
parent 02effb36f3
commit bc83b1c500
22 changed files with 300 additions and 390 deletions
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@ -709,7 +709,8 @@ public class TaskServiceImpl implements TaskService {
                .orElse(null);
            if (aClassification == null) {
                LOGGER.error("Could not find a Classification for task ");
-                throw new SystemException("Could not find a Classification for task ");
+                throw new SystemException(
+                    "Could not find a Classification for task (key=" + taskClassKey + ",domain=" + taskDomain + ")");
            }
        }
        return aClassification;
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
@ -343,24 +343,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {

    @Override
    public WorkbasketQuery callerHasPermission(WorkbasketAuthorization permission) throws InvalidArgumentException {
-        String[] accessIds;
-        // Check pre-conditions
-        if (permission == null) {
-            throw new InvalidArgumentException("Permission cannot be null.");
-        }
-        List<String> ucAccessIds = CurrentUserContext.getAccessIds();
-        if (ucAccessIds != null && !ucAccessIds.isEmpty()) {
-            accessIds = new String[ucAccessIds.size()];
-            accessIds = ucAccessIds.toArray(accessIds);
-        } else {
-            throw new InvalidArgumentException("CurrentUserContext need to have at least one accessId.");
-        }
-
-        // set up permissions and ids
        this.authorization = permission;
-        this.accessId = accessIds;
-        lowercaseAccessIds(this.accessId);
-
        return this;
    }

@ -370,6 +353,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
        List<WorkbasketSummary> workbaskets = null;
        try {
            taskanaEngineImpl.openConnection();
+            addAccessIdsOfCallerToQuery();
            workbaskets = taskanaEngineImpl.getSqlSession().selectList(LINK_TO_MAPPER, this);
            return workbaskets;
        } finally {
@ -389,6 +373,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
        try {
            taskanaEngineImpl.openConnection();
            RowBounds rowBounds = new RowBounds(offset, limit);
+            addAccessIdsOfCallerToQuery();
            workbaskets = taskanaEngineImpl.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
            return workbaskets;
        } catch (Exception e) {
@ -417,6 +402,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
        WorkbasketSummary workbasket = null;
        try {
            taskanaEngineImpl.openConnection();
+            addAccessIdsOfCallerToQuery();
            workbasket = taskanaEngineImpl.getSqlSession().selectOne(LINK_TO_MAPPER, this);
            return workbasket;
        } finally {
@ -559,6 +545,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
        Long rowCount = null;
        try {
            taskanaEngineImpl.openConnection();
+            addAccessIdsOfCallerToQuery();
            rowCount = taskanaEngineImpl.getSqlSession().selectOne(LINK_TO_COUNTER, this);
            return (rowCount == null) ? 0L : rowCount;
        } finally {
@ -638,6 +625,20 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
        return builder.toString();
    }

+    private void addAccessIdsOfCallerToQuery() {
+        // might already be set by accessIdsHavePermission
+        if (this.accessId == null) {
+            String[] accessIds = new String[0];
+            List<String> ucAccessIds = CurrentUserContext.getAccessIds();
+            if (ucAccessIds != null && !ucAccessIds.isEmpty()) {
+                accessIds = new String[ucAccessIds.size()];
+                accessIds = ucAccessIds.toArray(accessIds);
+            }
+            this.accessId = accessIds;
+            lowercaseAccessIds(this.accessId);
+        }
+    }
+
    static void lowercaseAccessIds(String[] accessIdArray) {
        if (TaskanaEngineConfiguration.shouldUseLowerCaseForAccessIds()) {
            for (int i = 0; i < accessIdArray.length; i++) {
--- a/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java
@ -198,9 +198,9 @@ public interface QueryMapper {
    List<ObjectReference> queryObjectReference(ObjectReferenceQueryImpl objectReference);

    @Select("<script>"
-        + "SELECT DISTINCT w.ID, w.KEY, w.NAME, w.DOMAIN, W.TYPE, w.DESCRIPTION, w.OWNER, w.ORG_LEVEL_1, w.ORG_LEVEL_2, w.ORG_LEVEL_3, w.ORG_LEVEL_4 from WORKBASKET w "
-        // + "<if test='accessId != null'>LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.ID = a.WORKBASKET_ID</if> "
-        + "LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.ID = a.WORKBASKET_ID "
+        + "SELECT DISTINCT "
+        + "w.ID, w.KEY, w.NAME, w.DOMAIN, W.TYPE, w.DESCRIPTION, w.OWNER, w.ORG_LEVEL_1, w.ORG_LEVEL_2, w.ORG_LEVEL_3, w.ORG_LEVEL_4 from WORKBASKET w "
+        + "LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on (w.ID = a.WORKBASKET_ID AND a.ACCESS_ID IN (<if test='accessId != null'><foreach item='item' collection='accessId' separator=',' >#{item}</foreach></if>))"
        + "<where>"
        + "<if test='ownerIn != null'>AND w.OWNER IN(<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
        + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR ' >UPPER(w.OWNER) LIKE #{item}</foreach>)</if> "
@ -215,7 +215,6 @@ public interface QueryMapper {
        + "<if test='createdIn !=null'> AND ( <foreach item='item' collection='createdIn' separator=' OR ' > ( <if test='item.begin!=null'> w.CREATED &gt;= #{item.begin} </if> <if test='item.begin!=null and item.end!=null'> AND </if><if test='item.end!=null'> w.CREATED &lt;=#{item.end} </if>)</foreach>)</if> "
        + "<if test='modifiedIn !=null'> AND ( <foreach item='item' collection='modifiedIn' separator=' OR ' > ( <if test='item.begin!=null'> w.MODIFIED &gt;= #{item.begin} </if> <if test='item.begin!=null and item.end!=null'> AND </if><if test='item.end!=null'> w.MODIFIED &lt;=#{item.end} </if>)</foreach>)</if> "
        + "<if test='descriptionLike != null'>AND (<foreach item='item' collection='descriptionLike' separator=' OR '>UPPER(w.DESCRIPTION) LIKE #{item}</foreach>)</if> "
-        + "<if test='accessId != null'>AND a.ACCESS_ID IN(<foreach item='item' collection='accessId' separator=',' >#{item}</foreach>) AND PERM_READ = 1 </if> "
        + "<if test='custom1In != null'>AND UPPER(w.CUSTOM_1) IN(<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>)</if> "
        + "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >UPPER(w.CUSTOM_1) LIKE #{item}</foreach>)</if> "
        + "<if test='custom2In != null'>AND UPPER(w.CUSTOM_2) IN(<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>)</if> "
@ -232,7 +231,9 @@ public interface QueryMapper {
        + "<if test='orgLevel3Like != null'>AND (<foreach item='item' collection='orgLevel3Like' separator=' OR ' >UPPER(w.ORG_LEVEL_3) LIKE #{item}</foreach>)</if> "
        + "<if test='orgLevel4In != null'>AND UPPER(w.ORG_LEVEL_4) IN(<foreach item='item' collection='orgLevel4In' separator=',' >#{item}</foreach>)</if> "
        + "<if test='orgLevel4Like != null'>AND (<foreach item='item' collection='orgLevel4Like' separator=' OR ' >UPPER(w.ORG_LEVEL_4) LIKE #{item}</foreach>)</if> "
-        + "<if test='authorization != null'>AND "
+        + "AND (PERM_READ = 1 "
+        + "<if test='authorization != null'>OR "
+        + "<if test=\"authorization.name().equals('READ')\">PERM_READ</if> "
        + "<if test=\"authorization.name().equals('OPEN')\">PERM_OPEN</if> "
        + "<if test=\"authorization.name().equals('APPEND')\">PERM_APPEND</if>"
        + "<if test=\"authorization.name().equals('TRANSFER')\">PERM_TRANSFER</if>"
@ -249,8 +250,7 @@ public interface QueryMapper {
        + "<if test=\"authorization.name().equals('CUSTOM_10')\">PERM_CUSTOM_10</if>"
        + "<if test=\"authorization.name().equals('CUSTOM_11')\">PERM_CUSTOM_11</if>"
        + "<if test=\"authorization.name().equals('CUSTOM_12')\">PERM_CUSTOM_12</if> = 1 "
-        + "</if>"
-        + "AND a.PERM_READ = 1"
+        + "</if>)"
        + "</where>"
        + "<if test='!orderBy.isEmpty()'>ORDER BY <foreach item='orderItem' collection='orderBy' separator=',' >${orderItem}</foreach></if> "
        + "</script>")
@ -419,9 +419,8 @@ public interface QueryMapper {
    Long countQueryObjectReferences(ObjectReferenceQueryImpl objectReference);

    @Select("<script>"
-        + "SELECT COUNT(ID) from WORKBASKET w "
-        // + "<if test='accessId != null'>LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.ID = a.WORKBASKET_ID</if> "
-        + "LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.ID = a.WORKBASKET_ID "
+        + "SELECT COUNT(w.ID) from WORKBASKET w "
+        + "LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on (w.ID = a.WORKBASKET_ID AND a.ACCESS_ID IN (<if test='accessId != null'><foreach item='item' collection='accessId' separator=',' >#{item}</foreach></if>))"
        + "<where>"
        + "<if test='ownerIn != null'>AND w.OWNER IN(<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
        + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR ' >UPPER(w.OWNER) LIKE #{item}</foreach>)</if> "
@ -436,7 +435,6 @@ public interface QueryMapper {
        + "<if test='createdIn !=null'> AND ( <foreach item='item' collection='createdIn' separator=' OR ' > ( <if test='item.begin!=null'> w.CREATED &gt;= #{item.begin} </if> <if test='item.begin!=null and item.end!=null'> AND </if><if test='item.end!=null'> w.CREATED &lt;=#{item.end} </if>)</foreach>)</if> "
        + "<if test='modifiedIn !=null'> AND ( <foreach item='item' collection='modifiedIn' separator=' OR ' > ( <if test='item.begin!=null'> w.MODIFIED &gt;= #{item.begin} </if> <if test='item.begin!=null and item.end!=null'> AND </if><if test='item.end!=null'> w.MODIFIED &lt;=#{item.end} </if>)</foreach>)</if> "
        + "<if test='descriptionLike != null'>AND (<foreach item='item' collection='descriptionLike' separator=' OR '>UPPER(w.DESCRIPTION) LIKE #{item}</foreach>)</if> "
-        + "<if test='accessId != null'>AND a.ACCESS_ID IN(<foreach item='item' collection='accessId' separator=',' >#{item}</foreach>) AND PERM_READ = 1 </if> "
        + "<if test='custom1In != null'>AND UPPER(w.CUSTOM_1) IN(<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>)</if> "
        + "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >UPPER(w.CUSTOM_1) LIKE #{item}</foreach>)</if> "
        + "<if test='custom2In != null'>AND UPPER(w.CUSTOM_2) IN(<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>)</if> "
@ -453,7 +451,9 @@ public interface QueryMapper {
        + "<if test='orgLevel3Like != null'>AND (<foreach item='item' collection='orgLevel3Like' separator=' OR ' >UPPER(w.ORG_LEVEL_3) LIKE #{item}</foreach>)</if> "
        + "<if test='orgLevel4In != null'>AND UPPER(w.ORG_LEVEL_4) IN(<foreach item='item' collection='orgLevel4In' separator=',' >#{item}</foreach>)</if> "
        + "<if test='orgLevel4Like != null'>AND (<foreach item='item' collection='orgLevel4Like' separator=' OR ' >UPPER(w.ORG_LEVEL_4) LIKE #{item}</foreach>)</if> "
-        + "<if test='authorization != null'>AND "
+        + "AND (PERM_READ = 1 "
+        + "<if test='authorization != null'>OR "
+        + "<if test=\"authorization.name().equals('READ')\">PERM_READ</if> "
        + "<if test=\"authorization.name().equals('OPEN')\">PERM_OPEN</if> "
        + "<if test=\"authorization.name().equals('APPEND')\">PERM_APPEND</if>"
        + "<if test=\"authorization.name().equals('TRANSFER')\">PERM_TRANSFER</if>"
@ -470,8 +470,7 @@ public interface QueryMapper {
        + "<if test=\"authorization.name().equals('CUSTOM_10')\">PERM_CUSTOM_10</if>"
        + "<if test=\"authorization.name().equals('CUSTOM_11')\">PERM_CUSTOM_11</if>"
        + "<if test=\"authorization.name().equals('CUSTOM_12')\">PERM_CUSTOM_12</if> = 1 "
-        + "</if>"
-        + "AND PERM_READ = 1"
+        + "</if>)"
        + "</where>"
        + "</script>")
    Long countQueryWorkbaskets(WorkbasketQueryImpl workbasketQuery);
--- a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java
@ -10,6 +10,7 @@ import java.sql.SQLException;
 import org.h2.store.fs.FileUtils;
 import org.junit.AfterClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;

 import acceptance.AbstractAccTest;
 import pro.taskana.Classification;
@ -17,10 +18,13 @@ import pro.taskana.ClassificationService;
 import pro.taskana.exceptions.ClassificationInUseException;
 import pro.taskana.exceptions.ClassificationNotFoundException;
 import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.security.JAASRunner;
+import pro.taskana.security.WithAccessId;

 /**
 * Acceptance test for all "delete classification" scenarios.
 */
+@RunWith(JAASRunner.class)
 public class DeleteClassificationAccTest extends AbstractAccTest {

    private ClassificationService classificationService;
@ -40,12 +44,18 @@ public class DeleteClassificationAccTest extends AbstractAccTest {
        assertEquals("", classification.getDomain());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test(expected = ClassificationInUseException.class)
    public void testThrowExeptionIfDeleteClassificationWithExistingTasks()
        throws SQLException, ClassificationNotFoundException, NotAuthorizedException, ClassificationInUseException {
        classificationService.deleteClassification("L1050", "DOMAIN_A");
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test(expected = ClassificationInUseException.class)
    public void testThrowExeptionIfDeleteMasterClassificationWithExistingTasks()
        throws SQLException, ClassificationNotFoundException, NotAuthorizedException, ClassificationInUseException {
@ -66,6 +76,10 @@ public class DeleteClassificationAccTest extends AbstractAccTest {
        assertTrue(classificationNotFound);
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
+
    @Test
    public void testThrowExceptionWhenChildClassificationIsInUseAndRollback()
        throws ClassificationInUseException, NotAuthorizedException, ClassificationNotFoundException {
--- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java
@ -63,7 +63,7 @@ public class QueryClassificationAccTest extends AbstractAccTest {
            .list();

        assertNotNull(classifications);
-        assertEquals(20, classifications.size());
+        assertEquals(23, classifications.size());

        List<ClassificationSummary> documentTypes = classifications.stream()
            .filter(c -> c.getType().equals("DOCUMENT"))
@ -75,7 +75,7 @@ public class QueryClassificationAccTest extends AbstractAccTest {
            .filter(c -> c.getType().equals("TASK"))
            .collect(
                Collectors.toList());
-        assertEquals(18, taskTypes.size());
+        assertEquals(21, taskTypes.size());
    }

    @Test
@ -136,7 +136,7 @@ public class QueryClassificationAccTest extends AbstractAccTest {
            .domainIn("DOMAIN_A")
            .list();
        assertNotNull(classifications);
-        assertEquals(12, classifications.size());
+        assertEquals(13, classifications.size());
    }

    @Test
@ -149,7 +149,7 @@ public class QueryClassificationAccTest extends AbstractAccTest {
            .typeIn("TASK")
            .list();
        assertNotNull(classifications);
-        assertEquals(10, classifications.size());
+        assertEquals(11, classifications.size());
    }

    @Test
@ -175,7 +175,7 @@ public class QueryClassificationAccTest extends AbstractAccTest {
            .list();

        assertNotNull(classificationSummaryList);
-        assertEquals(15, classificationSummaryList.size());
+        assertEquals(16, classificationSummaryList.size());
    }

    @Test
@ -186,7 +186,7 @@ public class QueryClassificationAccTest extends AbstractAccTest {
            .validInDomainEquals(Boolean.TRUE)
            .priorityIn(1, 2, 3)
            .list();
-        assertEquals(20, list.size());
+        assertEquals(23, list.size());

    }

--- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java
@ -87,7 +87,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
        results = classificationService.createClassificationQuery()
            .domainIn("DOMAIN_A")
            .listPage(pageNumber, pageSize);
-        assertThat(results.size(), equalTo(3));
+        assertThat(results.size(), equalTo(4));

        // Getting last results on 1 big page
        pageNumber = 0;
@ -95,7 +95,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
        results = classificationService.createClassificationQuery()
            .domainIn("DOMAIN_A")
            .listPage(pageNumber, pageSize);
-        assertThat(results.size(), equalTo(15));
+        assertThat(results.size(), equalTo(16));

        // Getting last results on multiple pages
        pageNumber = 1;
@ -103,7 +103,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
        results = classificationService.createClassificationQuery()
            .domainIn("DOMAIN_A")
            .listPage(pageNumber, pageSize);
-        assertThat(results.size(), equalTo(5));
+        assertThat(results.size(), equalTo(6));
    }

    @Test
@ -161,7 +161,7 @@ public class QueryClassificationWithPaginationAccTest extends AbstractAccTest {
        long count = classificationService.createClassificationQuery()
            .domainIn("DOMAIN_A")
            .count();
-        assertThat(count, equalTo(15L));
+        assertThat(count, equalTo(16L));
    }

    @AfterClass
--- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java
@ -11,6 +11,7 @@ import java.sql.SQLException;
 import org.h2.store.fs.FileUtils;
 import org.junit.AfterClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;

 import acceptance.AbstractAccTest;
 import pro.taskana.Classification;
@ -19,10 +20,13 @@ import pro.taskana.exceptions.ClassificationNotFoundException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskNotFoundException;
 import pro.taskana.impl.TaskImpl;
+import pro.taskana.security.JAASRunner;
+import pro.taskana.security.WithAccessId;

 /**
 * Acceptance test for all "update classification" scenarios.
 */
+@RunWith(JAASRunner.class)
 public class UpdateClassificationAccTest extends AbstractAccTest {

    public UpdateClassificationAccTest() {
@ -105,6 +109,9 @@ public class UpdateClassificationAccTest extends AbstractAccTest {
        assertThat(persistedClassification.getApplicationEntryPoint(), equalTo(newEntryPoint));
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testUpdateTaskOnClassificationKeyCategoryChange()
        throws TaskNotFoundException, ClassificationNotFoundException, NotAuthorizedException {
--- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java
@ -39,7 +39,7 @@ public class QueryTasksAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testQueryForOwnerLike()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -62,7 +62,7 @@ public class QueryTasksAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testQueryForParentBusinessProcessId()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -86,7 +86,7 @@ public class QueryTasksAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testQueryForName()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -110,7 +110,7 @@ public class QueryTasksAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testQueryForClassificationKey()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -119,7 +119,7 @@ public class QueryTasksAccTest extends AbstractAccTest {
        List<TaskSummary> results = taskService.createTaskQuery()
            .classificationKeyLike("L10%")
            .list();
-        assertThat(results.size(), equalTo(64));
+        assertThat(results.size(), equalTo(65));

        String[] ids = results.stream()
            .map(t -> t.getClassificationSummary().getKey())
@ -129,7 +129,7 @@ public class QueryTasksAccTest extends AbstractAccTest {
        List<TaskSummary> result2 = taskService.createTaskQuery()
            .classificationKeyIn(ids)
            .list();
-        assertThat(result2.size(), equalTo(64));
+        assertThat(result2.size(), equalTo(65));
    }

    @WithAccessId(
--- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java
@ -7,6 +7,7 @@ import org.h2.store.fs.FileUtils;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;

 import acceptance.AbstractAccTest;
 import pro.taskana.TaskService;
@ -14,16 +15,22 @@ import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.SystemException;
+import pro.taskana.security.JAASRunner;
+import pro.taskana.security.WithAccessId;

 /**
 * Acceptance test for all "query tasks by object reference" scenarios.
 */
+@RunWith(JAASRunner.class)
 public class QueryTasksByObjectReferenceAccTest extends AbstractAccTest {

    public QueryTasksByObjectReferenceAccTest() {
        super();
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testQueryTasksByExcactValueOfObjectReference()
        throws SQLException, NotAuthorizedException, InvalidArgumentException, SystemException {
@ -34,6 +41,9 @@ public class QueryTasksByObjectReferenceAccTest extends AbstractAccTest {
        Assert.assertEquals(32L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testQueryTasksByExcactValueAndTypeOfObjectReference()
        throws SQLException, NotAuthorizedException, InvalidArgumentException, SystemException {
@ -45,6 +55,9 @@ public class QueryTasksByObjectReferenceAccTest extends AbstractAccTest {
        Assert.assertEquals(10L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testQueryTasksByValueLikeOfObjectReference()
        throws SQLException, NotAuthorizedException, InvalidArgumentException, SystemException {
--- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java
@ -38,7 +38,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testCreatedWithin2Intervals()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -71,7 +71,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testCreatedBefore()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -101,7 +101,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testCreatedAfter()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -130,7 +130,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testClaimedWithin2Intervals()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -163,7 +163,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testCompletedWithin()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -192,7 +192,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testModifiedWithin()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -221,7 +221,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testPlannedWithin()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -250,7 +250,7 @@ public class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testDueWithin()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
--- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java
@ -38,13 +38,13 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testSortByModifiedAndDomain()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        TaskService taskService = taskanaEngine.getTaskService();
        List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
+            .workbasketKeyDomainIn(new KeyDomain("USER_3_2", "DOMAIN_B"))
            .orderByModified(desc)
            .orderByDomain(null)
            .list();
@ -61,13 +61,13 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testSortByDomainNameAndCreated()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        TaskService taskService = taskanaEngine.getTaskService();
        List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
+            .workbasketKeyDomainIn(new KeyDomain("USER_3_2", "DOMAIN_B"))
            .orderByDomain(asc)
            .orderByName(asc)
            .orderByCreated(null)
@ -92,14 +92,14 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
    }

    @WithAccessId(
-        userName = "user_1_2",
-        groupNames = {"group_1"})
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testSortByPorSystemNoteDueAndOwner()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        TaskService taskService = taskanaEngine.getTaskService();
        List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
+            .workbasketKeyDomainIn(new KeyDomain("USER_3_2", "DOMAIN_B"))
            .orderByPrimaryObjectReferenceSystem(SortDirection.DESCENDING)
            .orderByNote(null)
            .orderByDue(null)
@ -118,14 +118,14 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
    }

    @WithAccessId(
-        userName = "user_1_2",
-        groupNames = {"group_1"})
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testSortByPorSystemInstanceParentProcPlannedAndState()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        TaskService taskService = taskanaEngine.getTaskService();
        List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
+            .workbasketKeyDomainIn(new KeyDomain("USER_3_2", "DOMAIN_B"))
            .orderByPrimaryObjectReferenceSystemInstance(desc)
            .orderByParentBusinessProcessId(asc)
            .orderByPlanned(asc)
@ -144,14 +144,14 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
    }

    @WithAccessId(
-        userName = "user_1_2",
-        groupNames = {"group_1"})
+        userName = "teamlead_1",
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testSortByPorCompanyAndClaimed()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        TaskService taskService = taskanaEngine.getTaskService();
        List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
+            .workbasketKeyDomainIn(new KeyDomain("USER_3_2", "DOMAIN_B"))
            .orderByPrimaryObjectReferenceCompany(desc)
            .orderByClaimed(asc)
            .list();
@ -171,7 +171,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1", "group2"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testSortByWbKeyPrioPorValueAndCompleted()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -179,7 +179,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
        List<TaskSummary> results = taskService.createTaskQuery()
            .stateIn(TaskState.READY)
            .orderByWorkbasketKey(null)
-            .workbasketIdIn("5")
+            .workbasketIdIn("WBI:100000000000000000000000000000000015")
            .orderByPriority(desc)
            .orderByPrimaryObjectReferenceValue(asc)
            .orderByCompleted(desc)
@ -198,14 +198,14 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {

    @WithAccessId(
        userName = "teamlead_1",
-        groupNames = {"group_1", "group2"})
+        groupNames = {"group_1", "group_2"})
    @Test
    public void testSortBpIdClassificationIdDescriptionAndPorType()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        TaskService taskService = taskanaEngine.getTaskService();
        List<TaskSummary> results = taskService.createTaskQuery()
            .stateIn(TaskState.READY)
-            .workbasketIdIn("5")
+            .workbasketIdIn("WBI:100000000000000000000000000000000015")
            .orderByBusinessProcessId(asc)
            .orderByClassificationKey(null)
            .orderByPrimaryObjectReferenceType(SortDirection.DESCENDING)
--- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java
@ -184,7 +184,7 @@ public class TransferTaskAccTest extends AbstractAccTest {
        Instant before = Instant.now();
        ArrayList<String> taskIdList = new ArrayList<>();
        taskIdList.add("TKI:000000000000000000000000000000000006"); // working
-        taskIdList.add("TKI:000000000000000000000000000000000002"); // NotAuthorized
+        taskIdList.add("TKI:000000000000000000000000000000000041"); // NotAuthorized
        taskIdList.add("");     // InvalidArgument
        taskIdList.add(null);   // InvalidArgument (added with ""), duplicate
        taskIdList.add("TKI:000000000000000000000000000000000099"); // TaskNotFound
@ -219,7 +219,7 @@ public class TransferTaskAccTest extends AbstractAccTest {
        transferredTask = taskService.getTask("TKI:000000000000000000000000000000000002");
        assertNotNull(transferredTask);
        assertFalse(transferredTask.isTransferred());
-        assertEquals("GPK_B_KSC", transferredTask.getWorkbasketKey());
+        assertEquals("USER_1_1", transferredTask.getWorkbasketKey());
    }

    @AfterClass
--- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java
@ -18,6 +18,7 @@ import pro.taskana.exceptions.InvalidRequestException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.impl.WorkbasketType;
 import pro.taskana.security.JAASRunner;
+import pro.taskana.security.WithAccessId;

 /**
 * Acceptance test for all "query workbasket by permission" scenarios.
@ -32,6 +33,9 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        super();
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByDomain()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -39,9 +43,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .domainIn("DOMAIN_B")
            .list();
-        Assert.assertEquals(4L, results.size());
+        Assert.assertEquals(1L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByDomainAndType()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -53,6 +60,9 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        Assert.assertEquals(6L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByName()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -64,6 +74,9 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        Assert.assertEquals("GPK_KSC", results.get(0).getKey());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByNameStartsWith()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -71,9 +84,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .nameLike("%Gruppenpostkorb KSC%")
            .list();
-        Assert.assertEquals(6L, results.size());
+        Assert.assertEquals(3L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByNameContains()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -81,9 +97,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .nameLike("%Teamlead%", "%Gruppenpostkorb KSC%")
            .list();
-        Assert.assertEquals(8L, results.size());
+        Assert.assertEquals(5L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByNameContainsCaseInsensitive()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -94,18 +113,24 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        Assert.assertEquals(2L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByDescription()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
-            .descriptionLike("%consectetur%", "%gruppen%")
+            .descriptionLike("%ppk%", "%gruppen%")
            .orderByType(desc)
            .orderByDescription(asc)
            .list();
-        Assert.assertEquals(11L, results.size());
+        Assert.assertEquals(9L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByOwnerLike()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -114,9 +139,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
            .ownerLike("%an%", "%te%")
            .orderByOwner(asc)
            .list();
-        Assert.assertEquals(3L, results.size());
+        Assert.assertEquals(1L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByKey()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -127,26 +155,35 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        Assert.assertEquals(1L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByMultipleKeys()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
-            .keyIn("GPK_KSC_1", "GPK_KSC_2")
+            .keyIn("GPK_KSC_1", "GPK_KSC")
            .list();
        Assert.assertEquals(2L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByMultipleKeysWithUnknownKey()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
-            .keyIn("GPK_KSC_1", "GPK_Ksc_2", "GPK_KSC_3")
+            .keyIn("GPK_KSC_1", "GPK_Ksc", "GPK_KSC_3")
            .list();
        Assert.assertEquals(2L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByKeyContains()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -154,9 +191,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .keyLike("%KSC%")
            .list();
-        Assert.assertEquals(6L, results.size());
+        Assert.assertEquals(3L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByKeyContainsIgnoreCase()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -164,9 +204,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .keyLike("%kSc%")
            .list();
-        Assert.assertEquals(6L, results.size());
+        Assert.assertEquals(3L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByKeyOrNameContainsIgnoreCase()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -174,14 +217,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .keyOrNameLike("%kSc%")
            .list();
-        Assert.assertEquals(12L, results.size());
-    }
-
-    @AfterClass
-    public static void cleanUpClass() {
-        FileUtils.deleteRecursive("~/data", true);
+        Assert.assertEquals(9L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByNameStartsWithSortedByNameAscending()
        throws SQLException, NotAuthorizedException, InvalidRequestException, InvalidArgumentException {
@ -190,7 +231,7 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
            .nameLike("%Gruppenpostkorb KSC%")
            .orderByName(asc)
            .list();
-        Assert.assertEquals(6L, results.size());
+        Assert.assertEquals(3L, results.size());
        Assert.assertEquals("GPK_KSC", results.get(0).getKey());

        // check sort order is correct
@ -205,6 +246,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {

    }

+    @WithAccessId(
+        userName = "max")
    @Test
    public void testQueryWorkbasketByNameStartsWithSortedByNameDescending()
        throws SQLException, NotAuthorizedException, InvalidRequestException, InvalidArgumentException {
@ -225,6 +268,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        }
    }

+    @WithAccessId(
+        userName = "max")
    @Test
    public void testQueryWorkbasketByNameStartsWithSortedByKeyAscending()
        throws SQLException, NotAuthorizedException, InvalidArgumentException, InvalidRequestException {
@ -245,6 +290,8 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        }
    }

+    @WithAccessId(
+        userName = "max")
    @Test
    public void testQueryWorkbasketByNameStartsWithSortedByKeyDescending()
        throws SQLException, NotAuthorizedException, InvalidArgumentException, InvalidRequestException {
@ -265,6 +312,9 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        }
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByCreated()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -272,9 +322,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .createdWithin(todaysInterval())
            .list();
-        Assert.assertEquals(26L, results.size());
+        Assert.assertEquals(8L, results.size());
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testQueryWorkbasketByModified()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -282,7 +335,12 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .modifiedWithin(todaysInterval())
            .list();
-        Assert.assertEquals(26L, results.size());
+        Assert.assertEquals(8L, results.size());
+    }
+
+    @AfterClass
+    public static void cleanUpClass() {
+        FileUtils.deleteRecursive("~/data", true);
    }

 }
--- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java
@ -38,7 +38,7 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
        List<WorkbasketAccessItem> results = workbasketService.createWorkbasketAccessItemQuery()
            .accessIdIn("user_1_1", "group_1")
            .list();
-        Assert.assertEquals(10L, results.size());
+        Assert.assertEquals(8L, results.size());
    }

    @Test
@ -51,7 +51,7 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
            .orderByWorkbasketId(desc);
        List<WorkbasketAccessItem> results = query.list();
        long count = query.count();
-        Assert.assertEquals(10L, results.size());
+        Assert.assertEquals(8L, results.size());
        Assert.assertEquals(results.size(), count);
        Assert.assertEquals("WAI:100000000000000000000000000000000003", results.get(0).getId());
    }
--- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java
@ -41,8 +41,8 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .accessIdsHavePermission(WorkbasketAuthorization.APPEND, "user_1_1")
            .list();
-        Assert.assertEquals(2, results.size());
-        Assert.assertEquals("USER_1_1", results.get(1).getKey());
+        Assert.assertEquals(1, results.size());
+        Assert.assertEquals("USER_1_1", results.get(0).getKey());
    }

    @Test
@ -52,7 +52,7 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .accessIdsHavePermission(WorkbasketAuthorization.APPEND, "user_1_1", "group_1")
            .list();
-        Assert.assertEquals(9, results.size());
+        Assert.assertEquals(7, results.size());
    }

    @Test
@ -64,8 +64,8 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
            .accessIdsHavePermission(WorkbasketAuthorization.APPEND, "user_1_1", "group_1")
            .orderByName(asc)
            .list();
-        Assert.assertEquals(9, results.size());
-        Assert.assertEquals("key4", results.get(0).getKey());
+        Assert.assertEquals(7, results.size());
+        Assert.assertEquals("GPK_KSC_1", results.get(0).getKey());
    }

    @Test
@ -78,7 +78,7 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
            .orderByName(desc)
            .orderByKey(asc)
            .list();
-        Assert.assertEquals(9, results.size());
+        Assert.assertEquals(7, results.size());
        Assert.assertEquals("USER_2_2", results.get(0).getKey());
    }

@ -92,7 +92,7 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .callerHasPermission(WorkbasketAuthorization.APPEND)
            .list();
-        Assert.assertEquals(9, results.size());
+        Assert.assertEquals(7, results.size());
    }

    @WithAccessId(userName = "user_1_1")
@ -103,7 +103,7 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .callerHasPermission(WorkbasketAuthorization.READ)
            .list();
-        Assert.assertEquals(2, results.size());
+        Assert.assertEquals(1, results.size());
    }

    @AfterClass
--- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java
@ -19,6 +19,7 @@ import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.TaskanaRuntimeException;
 import pro.taskana.security.JAASRunner;
+import pro.taskana.security.WithAccessId;

 /**
 * Acceptance test for all "query classifications with pagination" scenarios.
@ -30,6 +31,9 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        super();
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testGetFirstPageOfWorkbasketQueryWithOffset()
        throws NotAuthorizedException {
@ -40,6 +44,9 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        assertThat(results.size(), equalTo(5));
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testGetSecondPageOfWorkbasketQueryWithOffset()
        throws NotAuthorizedException {
@ -47,9 +54,12 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
            .domainIn("DOMAIN_A")
            .list(5, 5);
-        assertThat(results.size(), equalTo(5));
+        assertThat(results.size(), equalTo(3));
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testListOffsetAndLimitOutOfBounds() throws NotAuthorizedException {
        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
@ -73,6 +83,9 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        assertThat(results.size(), equalTo(3));
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testPaginationWithPages() throws NotAuthorizedException {
        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
@ -99,10 +112,10 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        results = workbasketService.createWorkbasketQuery()
            .domainIn("DOMAIN_A")
            .listPage(pageNumber, pageSize);
-        assertThat(results.size(), equalTo(13));
+        assertThat(results.size(), equalTo(8));

        // Getting last results on multiple pages
-        pageNumber = 2;
+        pageNumber = 1;
        pageSize = 5;
        results = workbasketService.createWorkbasketQuery()
            .domainIn("DOMAIN_A")
@ -110,6 +123,9 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        assertThat(results.size(), equalTo(3));
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testPaginationNullAndNegativeLimitsIgnoring()
        throws NotAuthorizedException {
@ -137,7 +153,7 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        results = workbasketService.createWorkbasketQuery()
            .domainIn("DOMAIN_A")
            .listPage(pageNumber, pageSize);
-        assertThat(results.size(), equalTo(10));
+        assertThat(results.size(), equalTo(8));
    }

    /**
@ -160,6 +176,9 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
            .listPage(pageNumber, pageSize);
    }

+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
    @Test
    public void testCountOfWorkbasketQuery()
        throws SQLException, NotAuthorizedException, InvalidArgumentException {
@ -167,7 +186,7 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
        long count = workbasketService.createWorkbasketQuery()
            .domainIn("DOMAIN_A")
            .count();
-        assertThat(count, equalTo(13L));
+        assertThat(count, equalTo(9L));
    }

    @AfterClass
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java
@ -1,7 +1,5 @@
 package pro.taskana.impl.integration;

-import static org.junit.Assert.assertTrue;
-
 import java.io.FileNotFoundException;
 import java.sql.SQLException;
 import java.time.Duration;
@ -26,13 +24,11 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;

-import pro.taskana.BaseQuery.SortDirection;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.TaskanaEngine.ConnectionManagementMode;
 import pro.taskana.TimeInterval;
 import pro.taskana.Workbasket;
 import pro.taskana.WorkbasketAccessItem;
-import pro.taskana.WorkbasketQuery;
 import pro.taskana.WorkbasketService;
 import pro.taskana.WorkbasketSummary;
 import pro.taskana.configuration.TaskanaEngineConfiguration;
@ -42,7 +38,6 @@ import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.WorkbasketNotFoundException;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.TaskanaEngineProxyForTest;
-import pro.taskana.impl.WorkbasketAuthorization;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.WorkbasketType;
 import pro.taskana.impl.configuration.DBCleaner;
@ -91,31 +86,6 @@ public class WorkbasketServiceImplIntAutocommitTest {
        now = Instant.now();
    }

-    @Test
-    public void testSelectAllWorkbaskets()
-        throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketNotFoundException {
-        int before = workBasketService.createWorkbasketQuery().list().size();
-        WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0", "novatec");
-        String id0 = IdGenerator.generateWithPrefix("TWB");
-        workbasket0.setId(id0);
-        workbasket0.setName("Superbasket");
-        workbasket0.setType(WorkbasketType.PERSONAL);
-        workBasketService.createWorkbasket(workbasket0);
-        WorkbasketImpl workbasket1 = (WorkbasketImpl) workBasketService.newWorkbasket("key1", "novatec");
-        String id1 = IdGenerator.generateWithPrefix("TWB");
-        workbasket1.setId(id1);
-        workbasket1.setName("Megabasket");
-        workbasket1.setType(WorkbasketType.GROUP);
-        workBasketService.createWorkbasket(workbasket1);
-        WorkbasketImpl workbasket2 = (WorkbasketImpl) workBasketService.newWorkbasket("key2", "novatec");
-        String id2 = IdGenerator.generateWithPrefix("TWB");
-        workbasket2.setId(id2);
-        workbasket2.setName("Hyperbasket");
-        workbasket2.setType(WorkbasketType.GROUP);
-        workBasketService.createWorkbasket(workbasket2);
-        Assert.assertEquals(before + THREE, workBasketService.createWorkbasketQuery().list().size());
-    }
-
    @WithAccessId(userName = "Elena")
    @Test
    public void testSelectWorkbasket()
@ -241,140 +211,6 @@ public class WorkbasketServiceImplIntAutocommitTest {
        }
    }

-    @WithAccessId(userName = "Bernd", groupNames = {"group1", "group2", "group3", "group4"})
-    @Test
-    public void testWorkbasketQuery()
-        throws NotAuthorizedException, InvalidArgumentException, InvalidWorkbasketException,
-        WorkbasketNotFoundException, InterruptedException {
-
-        generateSampleDataForQuery();
-
-        WorkbasketQuery query1 = workBasketService.createWorkbasketQuery()
-            .accessIdsHavePermission(WorkbasketAuthorization.OPEN, "Bernd")
-            .nameIn("Basket4");
-        List<WorkbasketSummary> result1 = query1.list();
-
-        Assert.assertEquals(1, result1.size());
-        String workbasketId = result1.get(0).getId();
-        Workbasket workBasket = workBasketService.getWorkbasket(workbasketId);
-        Assert.assertEquals(THREE, workBasketService.getDistributionTargets(workBasket.getId()).size());
-
-        WorkbasketQuery query2 = workBasketService.createWorkbasketQuery().accessIdsHavePermission(
-            WorkbasketAuthorization.OPEN, "Bernd",
-            "Konstantin");
-        List<WorkbasketSummary> result2 = query2.list();
-        Assert.assertEquals(2, result2.size());
-
-        WorkbasketQuery query3 = workBasketService.createWorkbasketQuery().accessIdsHavePermission(
-            WorkbasketAuthorization.CUSTOM_5,
-            "Bernd", "Konstantin");
-        List<WorkbasketSummary> result3 = query3.list();
-        Assert.assertEquals(0, result3.size());
-
-        WorkbasketQuery query4 = workBasketService.createWorkbasketQuery().accessIdsHavePermission(
-            WorkbasketAuthorization.CUSTOM_1,
-            "Bernd");
-        List<WorkbasketSummary> result4 = query4.list();
-        Assert.assertEquals(1, result4.size());
-
-        WorkbasketQuery query0 = workBasketService.createWorkbasketQuery()
-            .createdWithin(today())
-            .nameIn("Basket1", "Basket2", "Basket3");
-        List<WorkbasketSummary> result0 = query0.list();
-        assertTrue(result0.size() == THREE);
-        for (WorkbasketSummary workbasket : result0) {
-            String name = workbasket.getName();
-            assertTrue("Basket1".equals(name) || "Basket2".equals(name) || "Basket3".equals(name));
-        }
-
-        Thread.sleep(SLEEP_TIME);
-        WorkbasketQuery query5 = workBasketService.createWorkbasketQuery()
-            .modifiedWithin(
-                new TimeInterval(Instant.now().minus(Duration.ofDays(31)), Instant.now().minus(Duration.ofDays(14))));
-        List<WorkbasketSummary> result5 = query5.list();
-        assertTrue(result5.size() == 3);
-        for (WorkbasketSummary workbasket : result5) {
-            String name = workbasket.getName();
-            assertTrue(
-                "Basket1".equals(name) || "Basket2".equals(name) || "Basket3".equals(name) || "Basket4".equals(name));
-        }
-
-        WorkbasketQuery query6 = workBasketService.createWorkbasketQuery()
-            .modifiedWithin(new TimeInterval(now.minus(Duration.ofDays(21L)), null))
-            .domainIn("novatec", "consulting")
-            .orderByName(SortDirection.ASCENDING);
-        List<WorkbasketSummary> result6 = query6.list();
-        assertTrue(result6.size() == 2);
-        assertTrue("Basket1".equals(result6.get(0).getName()));
-
-        WorkbasketQuery query7 = workBasketService.createWorkbasketQuery()
-            .typeIn(WorkbasketType.GROUP, WorkbasketType.CLEARANCE);
-        List<WorkbasketSummary> result7 = query7.list();
-        assertTrue(result7.size() == 2);
-        for (WorkbasketSummary workbasket : result7) {
-            String name = workbasket.getName();
-            assertTrue("Basket1".equals(name) || "Basket2".equals(name));
-        }
-    }
-
-    private void generateSampleDataForQuery()
-        throws InvalidWorkbasketException, WorkbasketNotFoundException, NotAuthorizedException,
-        InvalidArgumentException {
-        WorkbasketImpl basket1 = (WorkbasketImpl) workBasketService.newWorkbasket("k1", "novatec");
-        basket1.setId("1000000000000000000000000000000000000000");
-        basket1.setName("Basket1");
-        basket1.setOwner("Eberhardt");
-        basket1.setType(WorkbasketType.GROUP);
-        basket1 = (WorkbasketImpl) workBasketService.createWorkbasket(basket1);
-        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem(basket1.getId(), "Bernd");
-        accessItem.setPermTransfer(true);
-        accessItem.setPermCustom1(true);
-        accessItem.setPermOpen(true);
-        accessItem.setPermRead(true);
-        workBasketService.createWorkbasketAuthorization(accessItem);
-
-        WorkbasketImpl basket2 = (WorkbasketImpl) workBasketService.newWorkbasket("k2", "consulting");
-        basket2.setId("2000000000000000000000000000000000000000");
-        basket2.setName("Basket2");
-        basket2.setOwner("Konstantin");
-        basket2.setType(WorkbasketType.CLEARANCE);
-        basket2 = (WorkbasketImpl) workBasketService.createWorkbasket(basket2);
-        WorkbasketAccessItem accessItem2 = workBasketService.newWorkbasketAccessItem(basket2.getId(), "group2");
-        accessItem2.setPermTransfer(true);
-        accessItem2.setPermRead(true);
-        accessItem2.setPermCustom4(true);
-        accessItem2.setPermCustom1(true);
-        accessItem2.setPermOpen(true);
-        workBasketService.createWorkbasketAuthorization(accessItem2);
-
-        WorkbasketImpl basket3 = (WorkbasketImpl) workBasketService.newWorkbasket("k3", "develop");
-        basket3.setId("3000000000000000000000000000000000000000");
-        basket3.setName("Basket3");
-        basket3.setOwner("Holger");
-        basket3.setType(WorkbasketType.TOPIC);
-        basket3 = (WorkbasketImpl) workBasketService.createWorkbasket(basket3);
-        WorkbasketAccessItem accessItem3 = workBasketService.newWorkbasketAccessItem(basket3.getId(), "group3");
-        accessItem3.setPermOpen(true);
-        accessItem3.setPermRead(true);
-        accessItem3.setPermAppend(true);
-        workBasketService.createWorkbasketAuthorization(accessItem3);
-
-        WorkbasketImpl basket4 = (WorkbasketImpl) workBasketService.newWorkbasket("k4", "");
-        basket4.setId("4000000000000000000000000000000000000000");
-        basket4.setName("Basket4");
-        basket4.setOwner("Holger");
-        basket4.setType(WorkbasketType.PERSONAL);
-        List<String> distTargets = new ArrayList<>(Arrays.asList(basket1.getId(), basket2.getId(), basket3.getId()));
-        basket4 = (WorkbasketImpl) workBasketService.createWorkbasket(basket4);
-        WorkbasketAccessItem accessItem4 = workBasketService.newWorkbasketAccessItem(basket4.getId(), "Bernd");
-        accessItem4.setPermOpen(true);
-        accessItem4.setPermRead(true);
-        workBasketService.createWorkbasketAuthorization(accessItem4);
-        workBasketService.setDistributionTargets(basket4.getId(), distTargets);
-
-        updateModifiedTimestamps(basket1, basket2, basket3, basket4);
-    }
-
    private void updateModifiedTimestamps(Workbasket basket2, Workbasket basket3, Workbasket basket4,
        Workbasket basket1) {
        // created and modified timestamps are set by WorkbasketServiceImpl to 'now' when the workbasket is created
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java
@ -48,7 +48,6 @@ import pro.taskana.security.WithAccessId;
 public class WorkbasketServiceImplIntExplicitTest {

    private static final int SLEEP_TIME = 100;
-    private static final int THREE = 3;
    static int counter = 0;
    private DataSource dataSource;
    private TaskanaEngineConfiguration taskanaEngineConfiguration;
@ -74,36 +73,6 @@ public class WorkbasketServiceImplIntExplicitTest {
        cleaner.clearDb(dataSource, false);
    }

-    @Test
-    public void testSelectAllWorkbaskets()
-        throws NotAuthorizedException, SQLException, InvalidWorkbasketException, WorkbasketNotFoundException {
-        Connection connection = dataSource.getConnection();
-        taskanaEngineImpl.setConnection(connection);
-        workBasketService = taskanaEngine.getWorkbasketService();
-        int before = workBasketService.createWorkbasketQuery().list().size();
-        WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0", "novatec");
-        String id0 = IdGenerator.generateWithPrefix("TWB");
-        workbasket0.setId(id0);
-        workbasket0.setName("Superbasket");
-        workbasket0.setType(WorkbasketType.GROUP);
-        workBasketService.createWorkbasket(workbasket0);
-        WorkbasketImpl workbasket1 = (WorkbasketImpl) workBasketService.newWorkbasket("key1", "novatec");
-        String id1 = IdGenerator.generateWithPrefix("TWB");
-        workbasket1.setId(id1);
-        workbasket1.setName("Megabasket");
-        workbasket1.setType(WorkbasketType.GROUP);
-        workbasket1 = (WorkbasketImpl) workBasketService.createWorkbasket(workbasket1);
-        WorkbasketImpl workbasket2 = (WorkbasketImpl) workBasketService.newWorkbasket("key2", "novatec");
-        String id2 = IdGenerator.generateWithPrefix("TWB");
-        workbasket2.setId(id2);
-        workbasket2.setName("Hyperbasket");
-        workbasket2.setType(WorkbasketType.GROUP);
-        workBasketService.createWorkbasket(workbasket2);
-        Assert.assertEquals(before + THREE, workBasketService.createWorkbasketQuery().list().size());
-        connection.commit();
-        taskanaEngineImpl.closeConnection();
-    }
-
    @WithAccessId(userName = "Elena")
    @Test
    public void testSelectWorkbasket()
--- a/lib/taskana-core/src/test/resources/sql/classification.sql
+++ b/lib/taskana-core/src/test/resources/sql/classification.sql
@ -12,6 +12,7 @@ INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000009', 'L
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000010', 'T2100',           '',                                         'MANUAL',     'TASK',     '',         TRUE,            CURRENT_TIMESTAMP, 'T-Vertragstermin VERA',           'T-Vertragstermin VERA',                               2,        'P2D',         '',                      'VNR', '', '', '', '', '', '', '');
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000011', 'T6310',           '',                                         'AUTOMATIC',  'TASK',     '',         TRUE,            CURRENT_TIMESTAMP, 'T-GUK Honorarrechnung erstellen', 'Generali Unterstützungskasse Honorar wird fällig',    2,        'P2D',         '',                      'VNR', '', '', '', '', '', '', '');
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000013', 'DOCTYPE_DEFAULT', '',                                         'EXTERN',     'DOCUMENT', '',         TRUE,            CURRENT_TIMESTAMP, 'EP allgemein',                    'EP allgemein',                                        99,       'P2000D',      '',                      'VNR', '', '', '', '', '', '', '');
+INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000017', 'L1060',           '',                                         'EXTERN',     'TASK',     '',         TRUE,            CURRENT_TIMESTAMP, 'Widerruf neu',                    'Widerruf neu',                                            1,        'P1D',         '',                      'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '');

 -- DOMAIN_A CLASSIFICATIONS
 INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000002', 'L10303',          '',                                         'EXTERN',     'TASK',     'DOMAIN_A', TRUE,            CURRENT_TIMESTAMP, 'Beratungsprotokoll',              'Beratungsprotokoll',                                  1,        'P1D',         '',                      'VNR,RVNR,KOLVNR, ANR', '', '', '', '', '', '', '');
@ -27,9 +28,11 @@ INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000011', 'T
 INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000013', 'DOCTYPE_DEFAULT', '',                                         'EXTERN',     'DOCUMENT', 'DOMAIN_A', TRUE,            CURRENT_TIMESTAMP, 'EP allgemein',                    'EP allgemein',                                        99,       'P2000D',      '',                      'VNR', '', '', '', '', '', '', '');
 INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000014', 'L10000',          '',                                         'EXTERN',     'TASK',     'DOMAIN_A', TRUE,            CURRENT_TIMESTAMP, 'BUZ-Leistungsfall',               'BUZ-Leistungsfall',                                   1,        'P1D',         '',                      'VNR,RVNR,KOLVNR', 'VNR', 'VNR', 'VNR', '', '', '', '');
 INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000016', 'T2000',           '',                                         'MANUAL',     'TASK',     'DOMAIN_A', TRUE,            CURRENT_TIMESTAMP, 'T-Vertragstermin',                'T-Vertragstermin',                                    1,        'P1D',         '',                      'VNR,KOLVNR,RVNR', 'CUSTOM_2', 'Custom_3', 'custom_4', '', '', '', '');
+INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000017', 'L1060',           '',                                         'EXTERN',     'TASK',     'DOMAIN_A', TRUE,            CURRENT_TIMESTAMP, 'Widerruf neu',                    'Widerruf neu',                                            1,        'P1D',         '',                      'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '');

 -- DOMAIN_B CLASSIFICATIONS
-INSERT INTO CLASSIFICATION VALUES('CLI:100000000000000000000000000000000015', 'T2100',           '',                                         'MANUAL',     'TASK',     'DOMAIN_B', TRUE,            CURRENT_TIMESTAMP, 'T-Vertragstermin VERA',           'T-Vertragstermin VERA',                               22,       'P2D',         '',                      'VNR', '', '', '', '', '', '', '');
+INSERT INTO CLASSIFICATION VALUES('CLI:200000000000000000000000000000000015', 'T2100',           '',                                         'MANUAL',     'TASK',     'DOMAIN_B', TRUE,            CURRENT_TIMESTAMP, 'T-Vertragstermin VERA',           'T-Vertragstermin VERA',                               22,       'P2D',         '',                      'VNR', '', '', '', '', '', '', '');
+INSERT INTO CLASSIFICATION VALUES('CLI:200000000000000000000000000000000017', 'L1060',           '',                                         'EXTERN',     'TASK',     'DOMAIN_B', TRUE,            CURRENT_TIMESTAMP, 'Widerruf neu',                    'Widerruf neu',                                            1,        'P1D',         '',                      'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '');

 -- WITH PARENT CLASSIFICATIONS (MIXED DOMAIN) ---
 -- DOMAIN_A
--- a/lib/taskana-core/src/test/resources/sql/task.sql
+++ b/lib/taskana-core/src/test/resources/sql/task.sql
@ -1,74 +1,74 @@
-- TASK TABLE          (ID                                        , CREATED              , CLAIMED              , COMPLETED            , modified             , planned              , due                  , name         	, creator             , description                                , note                                     , priority, state       , classification_category  , classification_key, classification_id                         , workbasket_id                              , workbasket_key, domain    , business_process_id, parent_business_process_id, owner         , por_company , por_system , por_system_instance, por_type , por_value      , is_read, is_transferred, custom_attributes, custom1, custom2, custom3, custom4, custom5, custom6, custom7, custom8, custom9, custom10
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99',		'teamlead_1',         'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'AUTOMATIC'              , 'T6310'           , 'CLI:000000000000000000000000000000000011', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01',		'teamlead_1',         'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L110102'         , 'CLI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02',		'teamlead_1',         'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'A12'             , 'CLI:200000000000000000000000000000000001', 'WBI:100000000000000000000000000000000011' , 'GPK_B_KSC'   , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , 'abc'  , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000003', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000004', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , 'ade'  , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000005', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000005' , 'DOC_0000000000000000005' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000006', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000006' , 'DOC_0000000000000000006' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000007', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000007' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , 'ffg'  , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000008', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000008' , 'DOC_0000000000000000008' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000009', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000010', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000011', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000012', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000013', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000013' , 'DOC_0000000000000000013' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000014', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000015', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000016', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000016' , 'DOC_0000000000000000016' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000017', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , 'vvg'  , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000018', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000019', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000019' , 'DOC_0000000000000000019' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000020', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , 'ijk'  , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000021', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000021' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000022', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000023', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000023' , 'DOC_0000000000000000023' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , 'lnp'  , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000024', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2', 		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , 'bbq'  , null     );
+-- TASK TABLE          (ID                                        , CREATED              , CLAIMED              , COMPLETED            , modified             , planned              , due                  , name                      , creator                      , description                                , note                                     , priority, state       , classification_category  , classification_key, classification_id                         , workbasket_id                              , workbasket_key, domain    , business_process_id, parent_business_process_id, owner         , por_company , por_system , por_system_instance, por_type , por_value      , is_read, is_transferred, custom_attributes, custom1, custom2, custom3, custom4, custom5, custom6, custom7, custom8, custom9, custom10
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'MANUAL'                 , 'T2000'           , 'CLI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L110102'         , 'CLI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , 'pqr'  , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'MANUAL'                 , 'T2000'           , 'CLI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000003', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , 'efg'  , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000004', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , 'ade'  , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000005', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000005' , 'DOC_0000000000000000005' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000006', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000006' , 'DOC_0000000000000000006' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000007', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000007' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , 'ffg'  , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000008', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000008' , 'DOC_0000000000000000008' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000009', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000010', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000011', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000012', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000013', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000013' , 'DOC_0000000000000000013' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000014', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000015', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000016', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000016' , 'DOC_0000000000000000016' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000017', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , 'vvg'  , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000018', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000019', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000019' , 'DOC_0000000000000000019' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000020', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , 'ijk'  , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000021', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000021' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000022', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000023', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000023' , 'DOC_0000000000000000023' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , 'lnp'  , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000024', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , 'bbq'  , null     );
 -- Tasks for WorkOnTaskAccTest
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000025', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000025' , 'DOC_0000000000000000025' , null        , 'abcd00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , 'ert'    );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000026', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000026' , 'DOC_0000000000000000026' , 'user_1_1'  , 'bcde00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000027', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000027' , 'DOC_0000000000000000027' , 'user_1_2'  , 'cdef00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000028', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000028' , 'DOC_0000000000000000028' , 'user_1_1'  , 'efgh00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000029', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000029' , 'DOC_0000000000000000029' , 'user_1_2'  , 'fghj00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , 'rew'  , null   , null   , null   , 'dde'    );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000030', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000030' , 'DOC_0000000000000000030' , 'user_1_1'  , 'ABCD00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000031', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000031' , 'DOC_0000000000000000031' , 'user_1_1'  , 'BDCE00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000032', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000032' , 'DOC_0000000000000000032' , 'user_1_2'  , 'CDEF00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000033', '2018-01-29 15:55:24', null                 , null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000033' , 'DOC_0000000000000000033' , 'user_1_2'  , 'DEFG00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000034', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000034' , 'DOC_0000000000000000034' , 'user_1_1'  , 'GHIJ00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000035', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000035' , 'DOC_0000000000000000035' , 'user_1_1'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000100', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000100' , 'DOC_0000000000000000100' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000101', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000101' , 'DOC_0000000000000000101' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , 'el'   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000102', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000102' , 'DOC_0000000000000000102' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000103', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000103' , 'DOC_0000000000000000103' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000025', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000025' , 'DOC_0000000000000000025' , null        , 'abcd00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , 'ert'    );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000026', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000026' , 'DOC_0000000000000000026' , 'user_1_1'  , 'bcde00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000027', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000027' , 'DOC_0000000000000000027' , 'user_1_2'  , 'cdef00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000028', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000028' , 'DOC_0000000000000000028' , 'user_1_1'  , 'efgh00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000029', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000029' , 'DOC_0000000000000000029' , 'user_1_2'  , 'fghj00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , 'rew'  , null   , null   , null   , 'dde'    );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000030', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000030' , 'DOC_0000000000000000030' , 'user_1_1'  , 'ABCD00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000031', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000031' , 'DOC_0000000000000000031' , 'user_1_1'  , 'BDCE00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000032', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000032' , 'DOC_0000000000000000032' , 'user_1_2'  , 'CDEF00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000033', '2018-01-29 15:55:24', null                 , null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000033' , 'DOC_0000000000000000033' , 'user_1_2'  , 'DEFG00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000034', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000034' , 'DOC_0000000000000000034' , 'user_1_1'  , 'GHIJ00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000035', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000035' , 'DOC_0000000000000000035' , 'user_1_1'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000100', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000100' , 'DOC_0000000000000000100' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000101', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000101' , 'DOC_0000000000000000101' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , 'el'   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000102', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000102' , 'DOC_0000000000000000102' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000103', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000103' , 'DOC_0000000000000000103' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
 -- Tasks for DeleteTaskAccTest
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000036', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000036' , 'DOC_0000000000000000036' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , 'ew'   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000037', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000037' , 'DOC_0000000000000000037' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000038', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000038' , 'DOC_0000000000000000038' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , '11'   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000039', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000039' , 'DOC_0000000000000000039' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000040', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000040' , 'DOC_0000000000000000040' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000036', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000036' , 'DOC_0000000000000000036' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , 'ew'   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000037', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000037' , 'DOC_0000000000000000037' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000038', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000038' , 'DOC_0000000000000000038' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , '11'   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000039', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000039' , 'DOC_0000000000000000039' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000040', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000040' , 'DOC_0000000000000000040' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
 -- Tasks for QueryTasksWithSortingTest
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000041', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99',	    'teamlead_1',		  'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'AUTOMATIC'              , 'T6310'           , 'CLI:000000000000000000000000000000000011', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000042', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01',		'teamlead_1',		  'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L110102'         , 'CLI:100000000000000000000000000000000005', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000043', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02',		'teamlead_1',		  'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'A12'             , 'CLI:200000000000000000000000000000000001', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000044', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , 'ew'   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000045', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000046', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '06'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000047', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000048', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '05'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000049', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000008' , 'DOC_0000000000000000003' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000050', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASyste1' , '05'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000051', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000052', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '04'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000053', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_1',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000054', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000055', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASyste1' , '04'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000056', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000057', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000058', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '03'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000059', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '02'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000060', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000061', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000062', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000063', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000064', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000065', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf',	'teamlead_2',		  'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000041', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'AUTOMATIC'              , 'T6310'           , 'CLI:000000000000000000000000000000000011', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_3_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000042', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L10303'          , 'CLI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_3_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000043', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'A12'             , 'CLI:200000000000000000000000000000000001', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_3_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000044', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000045', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000046', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '06'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000047', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000048', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '05'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000049', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000008' , 'DOC_0000000000000000003' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000050', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASyste1' , '05'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000051', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000052', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '04'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000053', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000054', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000055', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASyste1' , '04'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000056', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000057', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000058', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '03'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000059', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '02'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000060', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000061', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000062', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000063', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000064', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000065', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'creator_user_id'            , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1060'           , 'CLI:200000000000000000000000000000000017', 'WBI:100000000000000000000000000000000015' , 'USER_3_2'    , 'DOMAIN_B', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
--- a/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql
+++ b/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql
@ -1,8 +1,3 @@
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('1', '1', 'Elena',        true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('2', '2', 'Max',          true, true, true, true, true, true,  true,  true,  true,  false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('3', '3', 'Simone',       true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('4', '4', 'user_1_1', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-
 -- KSC authorizations (                    ID,                                                                             WB_ID,    ACCESS_ID, READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
 -- PPKs
 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
@ -36,8 +31,8 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000
 -- Access to other domains
 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012',    'group_1', true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013',    'group_2', true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', '5',        'group_1',   true, true,  true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014',    'group_2', true, true, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015',    'group_2', true, true, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);

 -- Access to workbaskets for sorting test
 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('900', '900', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
--- a/lib/taskana-core/src/test/resources/sql/workbasket.sql
+++ b/lib/taskana-core/src/test/resources/sql/workbasket.sql
@ -1,9 +1,3 @@
-INSERT INTO WORKBASKET VALUES ('1', 'key1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket1', 'DOMAIN_A', 'GROUP',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Peter', '', '', '', '', '', '', '', '' );
-INSERT INTO WORKBASKET VALUES ('2', 'key2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket2', 'DOMAIN_A', 'CLEARANCE', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Susanne', '', '', '', '', '', '', '', '');
-INSERT INTO WORKBASKET VALUES ('3', 'key3', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket3', 'DOMAIN_A', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO WORKBASKET VALUES ('4', 'key4', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket4', 'DOMAIN_A', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO WORKBASKET VALUES ('5', 'key5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket5', 'DOMAIN_B', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
-
 -- KSC workbaskets
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC', '2018-02-01 12:00:00', '2018-02-01 12:00:00', 'Gruppenpostkorb KSC', 'DOMAIN_A', 'GROUP', 'Gruppenpostkorb KSC', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000002', 'GPK_KSC_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Gruppenpostkorb KSC 1', 'DOMAIN_A', 'GROUP', 'Gruppenpostkorb KSC 1', '', '', '', '', '', '', '', '', '');
@ -19,9 +13,10 @@ INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000009', 'USER
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000011', 'GPK_B_KSC', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Gruppenpostkorb KSC B', 'DOMAIN_B', 'GROUP', 'Gruppenpostkorb KSC', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000012', 'GPK_B_KSC_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Gruppenpostkorb KSC B1', 'DOMAIN_B', 'GROUP', 'Gruppenpostkorb KSC 1', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000013', 'GPK_B_KSC_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Gruppenpostkorb KSC B2', 'DOMAIN_B', 'GROUP', 'Gruppenpostkorb KSC 2', '', '', '', '', '', '', '', '', '');
+INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000014', 'USER_3_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 1 KSC 1 Domain B', 'DOMAIN_B', 'PERSONAL', 'PPK User 1 KSC 1 Domain B', '', '', '', '', '', '', '', '', '');
+INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000015', 'USER_3_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 2 KSC 1 Domain B', 'DOMAIN_B', 'PERSONAL', 'PPK User 1 KSC 1 Domain B', '', '', '', '', '', '', '', '', '');

 -- Workbaskets for sorting test
-
 INSERT INTO WORKBASKET VALUES ('900', 'sort001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'basxet0', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('901', 'Sort002', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basxet1', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('902', 'sOrt003', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'bAsxet2', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');