diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql
index 7bbb67746..de80fd41a 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 -- ATTACHMENT TABLE          (ID                                        , task_ID                                  , CREATED              , MODIFIED             , classif key, classif Id                                , refCompany, ref sys,   ref inst,ref type, ref val, channel,received, custAtts)
 
 INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000000','TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050'    , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1', 'val1', 'ch1',  null, null);
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql
index 7ba0de9cd..9831e4706 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 --                                ID,                                         KEY,               PARENT_ID,                                  PARENT_KEY, CATEGORY,     TYPE,       DOMAIN,     VALID_IN_DOMAIN,  CREATED,           MODIFIED,          NAME,                             DESCRIPTION,                                           PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1 - 8
 -- MASTER CLASSIFICATIONS
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000001', 'L10000',          '',                                         '',        'EXTERNAL',   'TASK',     '',         FALSE,            RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'OLD-Leistungsfall',               'OLD-Leistungsfall',                                   999,     'P1D',         '',                      'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '');
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql
index 5f2050985..39e7ed252 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 INSERT INTO DISTRIBUTION_TARGETS VALUES ('1','2');
 INSERT INTO DISTRIBUTION_TARGETS VALUES ('WBI:100000000000000000000000000000000001','WBI:100000000000000000000000000000000002');
 INSERT INTO DISTRIBUTION_TARGETS VALUES ('WBI:100000000000000000000000000000000001','WBI:100000000000000000000000000000000003');
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql
index eb6280601..be546be0f 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 INSERT INTO OBJECT_REFERENCE VALUES ('ID1', 'TKI:000000000000000000000000000000000000', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1');
 INSERT INTO OBJECT_REFERENCE VALUES ('ID2', 'TKI:000000000000000000000000000000000000', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2');
 INSERT INTO OBJECT_REFERENCE VALUES ('ID3', 'TKI:000000000000000000000000000000000001', 'Company3', 'System3', 'Instance3', 'Type3', 'Value2');
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql
index 00bebabc7..4a996f097 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 -- TASK_COMMENT TABLE            ID                                        , TASK_ID                                      ,TEXTFIELD              ,CREATOR              ,CREATED            ,MODIFIED
 
 -- TaskComments for GetTaskCommentAccTest + UpdateTaskCommentAccTest
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql
index 8585b6987..cab04676b 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 -- TASK_HISTORY_EVENT TABLE           (ID                                        , BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID                                   , EVENT_TYPE, CREATED          , USER_ID   , DOMAIN    , WORKBASKET_KEY                            , WORKBASKET_NAME, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE , TASK_PRIORITY, TASK_PLANNED         , TASK_DUE             , TASK_OWNER, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_NAME, TASK_CLASSIFICATION_CATEGORY, ATTACHMENT_CLASSIFICATION_KEY, ATTACHMENT_CLASSIFICATION_NAME, OLD_VALUE  , NEW_VALUE  , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , DETAILS       );
 INSERT INTO TASK_HISTORY_EVENT VALUES ('THI:000000000000000000000000000000000000', 'BPI:01'           , ''                        , 'TKI:000000000000000000000000000000000000', 'CREATED' , RELATIVE_DATE(0) , 'USER_2_2', 'DOMAIN_B', 'WBI:100000000000000000000000000000000001', 'GPK_KSC'      , '00'       , 'PASystem', '00'        , 'VNR'   , '11223344', 100          , '2021-07-27 13:55:00', '2021-07-28 15:55:00', 'user-1-1', 'L140101'              , 'Zustimmungserklärung'  , 'TASK'                      , ''                           , ''                            , 'old_val12', 'new_val12', 'custom1', 'custom2', 'custom3', 'custom4', 'some Details');
 INSERT INTO TASK_HISTORY_EVENT VALUES ('THI:000000000000000000000000000000000001', 'BPI:02'           , ''                        , 'TKI:000000000000000000000000000000000000', 'UPDATED' , RELATIVE_DATE(-2), 'USER_1_1', 'DOMAIN_A', 'WBI:100000000000000000000000000000000001', 'GPK_KSC'      , '00'       , 'PASystem', '00'        , 'VNR'   , '65464564', 100          , '2021-07-27 13:55:00', '2021-07-28 15:55:00', 'user-1-1', ''                     , ''                      , ''                          , ''                           , ''                            , '2old_val' , 'new_val2' , 'custom1', ''       , 'custom3', ''       , 'some Details');
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/task.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task.sql
index eec69b729..67f949a4e 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/task.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/task.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 -- TASK TABLE          (ID                                        , EXTERNAL_ID                               , CREATED             , CLAIMED              , COMPLETED            , modified             , received             , planned              , due                  , name                      , creator                      , description                                , note                                     , priority, manual_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, callback_info, callback_state, custom_attributes , custom1     , custom2     , custom3,   , custom4    , custom5    , custom6    , custom7    ,custom8     ,custom9     ,custom10    ,custom11,    ,custom12     ,custom13     ,custom14  ,custom15     ,custom16    , custom-int-1, custom-int-2, custom-int-3, custom-int-4, custom-int-5, custom-int-6, custom-int-7, custom-int-8
 INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', 'ETI:000000000000000000000000000000000000', RELATIVE_DATE(-1)   , RELATIVE_DATE(0)     , null                 , RELATIVE_DATE(0)     , RELATIVE_DATE(0)     , RELATIVE_DATE(-1)    , RELATIVE_DATE(0)     , 'Task99'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , -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         , 'NONE'        , null              , 'custom1'   , 'custom2'   , 'custom3'  , 'custom4'  , 'custom5'  , 'custom6'  , 'custom7'  , 'custom8'  , 'custom9'  , 'custom10' , 'custom11'  , 'custom12'  , 'custom13'  , 'abc'    , 'custom15'  , 'custom16' , 1           , 2           , 3           , 4           , 5           , 6           , 7           , 8   );
 INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', 'ETI:000000000000000000000000000000000001', RELATIVE_DATE(-2)   , RELATIVE_DATE(0)     , null                 , RELATIVE_DATE(0)     , null                 , RELATIVE_DATE(-2)    , RELATIVE_DATE(0)     , 'Task01'                  , 'creator_user_id'            , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , -1             , '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         , 'NONE'        , null              , 'pqr'       , null        , null       , null       , null       , null       , null       , null       , null       , null       , null        , null        , null        , 'abc'    , null        , null       , 1           , 2           , 3           , 4           , 5           , 6           , 7           , 8   );
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/user.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/user.sql
index abf530d3b..0af259a16 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/user.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/user.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 -- USER_INFO TABLE          (USER_ID          , FIRST_NAME , LASTNAME      , FULL_NAME         , LONG_NAME                          , E_MAIL                    , PHONE         , MOBILE_PHONE      , ORG_LEVEL_4   , ORG_LEVEL_3   , ORG_LEVEL_2        , ORG_LEVEL_1   , DATA
 INSERT INTO USER_INFO VALUES('teamlead-1'     , 'Titus'    , 'Toll'        , 'Toll, Titus'      , 'Toll, Titus - (teamlead-1)'         , 'titus.toll@web.de'       , '040-2951854' , '015637683197'    , 'Novatec'     , 'BPM'         , 'Human Workflow'   , 'TASKANA'     , 'xy'  );
 INSERT INTO USER_INFO VALUES('user-1-1'       , 'Max'      , 'Mustermann'  , 'Mustermann, Max'  , 'Mustermann, Max - (user-1-1)'       , 'max.mustermann@web.de'   , '040-2951854' , '015637683197'    , 'Novatec'     , 'BPM'         , 'Human Workflow'   , 'TASKANA'     , ''    );
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
index 250ca1208..d394fa9a4 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 -- KSC authorizations                     (ID                                        , WB_ID                                     , ACCESS_ID                                                                                    , ACCESS_NAME                 , READ , OPEN , APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
 -- PPKs
 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead-1'                                                                                 , 'Titus Toll'                , true , true , true  , true    , true      ,   true     , true , true , true , true , true , true , true , true , true , true , true);
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql
index 85e0cdab6..a38b8a572 100644
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql
+++ b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql
@@ -1,3 +1,5 @@
+-- sample-data is used for rest tests and for the example application
+
 -- KSC workbaskets
 -- WORKBASKET TABLE           (ID                                        , KEY                                                               , CREATED              , MODIFIED             , NAME                                                                                                       , DOMAIN       , TYPE      , DESCRIPTION                                               , OWNER                                                , CUSTOM_1 , CUSTOM_2  , CUSTOM_3 , CUSTOM_4  , ORG_LEVEL_1   , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION  );
 INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000000', 'ADMIN'                                                           , RELATIVE_DATE(0)     , RELATIVE_DATE(0)     , 'Postkorb Admin'                                                                                           , 'DOMAIN_A'   , 'PERSONAL', 'Postkorb Admin'                                          , ''                                                   , ''       , ''        , ''       , ''        , ''            , ''         , ''         , ''         , false                );
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql
index 87242f797..e0b8280f0 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 -- ATTACHMENT TABLE          (ID                                        , task_ID                                  , CREATED              , MODIFIED             , classif key, classif Id                                , refCompany, ref sys,   ref inst,ref type, ref val, channel,received, custAtts)
 
 INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000000','TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050'    , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1', 'val1', 'ch1',  null, null);
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql
index e235323d4..8cc213195 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 INSERT INTO CLASSIFICATION_HISTORY_EVENT (ID,EVENT_TYPE, CREATED, USER_ID, CLASSIFICATION_ID, APPLICATION_ENTRY_POINT, CATEGORY, DOMAIN, KEY, NAME, PARENT_ID, PARENT_KEY, PRIORITY, SERVICE_LEVEL, TYPE, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, DETAILS) VALUES
 -- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, 	EVENT_TYPE, CREATED, 							 USER_ID, 	DOMAIN, 	WORKBASKET_KEY, 							POR_COMPANY	, POR_SYSTEM, POR_INSTANCE	, POR_TYPE	, POR_VALUE	, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY	, ATTACHMENT_CLASSIFICATION_KEY	, OLD_VALUE	, NEW_VALUE	, CUSTOM_1	, CUSTOM_2	, CUSTOM_3	, CUSTOM_4,          details
 ('CHI:000000000000000000000000000000000000','CREATED'	,'2018-01-29 15:55:00'		,'peter', 'CLI:000000000000000000000000000000000001', '', 'MANUAL', 'DOMAIN_A', 'L10000', 'OLD-Leistungsfall', '', '', 1, 'P1D', 'TASK', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'custom5','custom6', 'custom7','custom8', '{"changes":[{"newValue":"CHI:000000000000000000000000000000000000","fieldName":"id","oldValue":""}]}'	),
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/classification.sql b/common/taskana-common-data/src/main/resources/sql/test-data/classification.sql
index a4c3ae8c0..574029200 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/classification.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/classification.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 --                                ID,                                         KEY,               PARENT_ID,                                  PARENT_KEY, CATEGORY,     TYPE,       DOMAIN,     VALID_IN_DOMAIN,  CREATED,           MODIFIED,          NAME,                             DESCRIPTION,                                           PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1 - 8
 -- MASTER CLASSIFICATIONS
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000001', 'L10000',          '',                                         '',        'EXTERNAL',   'TASK',     '',         FALSE,            RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'OLD-Leistungsfall',               'OLD-Leistungsfall',                                   999,     'P1D',         '',                      'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '');
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql b/common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql
index 5f2050985..436912801 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 INSERT INTO DISTRIBUTION_TARGETS VALUES ('1','2');
 INSERT INTO DISTRIBUTION_TARGETS VALUES ('WBI:100000000000000000000000000000000001','WBI:100000000000000000000000000000000002');
 INSERT INTO DISTRIBUTION_TARGETS VALUES ('WBI:100000000000000000000000000000000001','WBI:100000000000000000000000000000000003');
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql b/common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql
index eea7b1bea..ef9fc0cac 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 INSERT INTO OBJECT_REFERENCE VALUES ('1', 'TaskId1', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1');
 INSERT INTO OBJECT_REFERENCE VALUES ('2', 'TaskId2', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2');
 INSERT INTO OBJECT_REFERENCE VALUES ('3', 'TaskId3', 'Company3', 'System3', 'Instance3', 'Type3', 'Value3');
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql
index 656782ff1..15742fc63 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 -- TASK_COMMENT TABLE            ID                                        , TASK_ID                                      ,TEXTFIELD              ,CREATOR              ,CREATED            ,MODIFIED
 
 -- TaskComments for GetTaskCommentAccTest + UpdateTaskCommentAccTest
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql
index 3cf5cf81c..6d2bfd5ed 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 INSERT INTO TASK_HISTORY_EVENT (ID,BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, TASK_OWNER, TASK_CLASSIFICATION_KEY,
                                 TASK_CLASSIFICATION_CATEGORY, ATTACHMENT_CLASSIFICATION_KEY, OLD_VALUE, NEW_VALUE, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, DETAILS) VALUES
 -- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, 	EVENT_TYPE, CREATED, 							 USER_ID, 	DOMAIN, 	WORKBASKET_KEY, 							POR_COMPANY	, POR_SYSTEM, POR_INSTANCE	, POR_TYPE	, POR_VALUE	, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY	, ATTACHMENT_CLASSIFICATION_KEY	, OLD_VALUE	, NEW_VALUE	, CUSTOM_1	, CUSTOM_2	, CUSTOM_3	, CUSTOM_4,          details
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/task.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task.sql
index 92871b870..8b954a2b1 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/task.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/task.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 -- TASK TABLE                  (ID                                , EXTERNAL_ID                               ,  CREATED             , CLAIMED              , COMPLETED            , modified             ,  received            , planned              , due                  , name                      , creator                      , description                                , note                                     , priority, manual_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,callback_info , callback_state  , custom_attributes ,custom1      ,custom2,     ,custom3,    ,custom4    ,custom5      ,custom6     ,custom7     ,custom8     ,custom9     ,custom10    ,custom11,    ,custom12     ,custom13     ,custom14  ,custom15     ,custom16    , custom-int-1, custom-int-2, custom-int-3, custom-int-4, custom-int-5, custom-int-6, custom-int-7, custom-int-8
 INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', 'ETI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', null                 , '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       , -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         , 'NONE'          , null              , 'custom1'   , 'custom2'   , 'custom3'  , 'custom4' , 'custom5'   , 'custom6'  , 'custom7'  , 'custom8'  , 'custom9'  , 'custom10' , 'custom11'  , 'custom12'  , 'custom13'  , 'abc'    , 'custom15'  , 'custom16' , 1           , 2           , 3           , 4           , 5           , 6           , 7           , 8   );
 INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', 'ETI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', null                 , '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       , -1             , '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         , 'NONE'          , null              , 'pqr'       , ''          , ''         , ''         , ''         , ''         , ''         , ''         , ''         , ''         , ''          , ''          , ''          , 'abc'    , ''          , ''         , 1           , 2           , 3           , 4           , 5           , 6           , 7           , 8   );
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/user.sql b/common/taskana-common-data/src/main/resources/sql/test-data/user.sql
index abf530d3b..0cc74bbfe 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/user.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/user.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 -- USER_INFO TABLE          (USER_ID          , FIRST_NAME , LASTNAME      , FULL_NAME         , LONG_NAME                          , E_MAIL                    , PHONE         , MOBILE_PHONE      , ORG_LEVEL_4   , ORG_LEVEL_3   , ORG_LEVEL_2        , ORG_LEVEL_1   , DATA
 INSERT INTO USER_INFO VALUES('teamlead-1'     , 'Titus'    , 'Toll'        , 'Toll, Titus'      , 'Toll, Titus - (teamlead-1)'         , 'titus.toll@web.de'       , '040-2951854' , '015637683197'    , 'Novatec'     , 'BPM'         , 'Human Workflow'   , 'TASKANA'     , 'xy'  );
 INSERT INTO USER_INFO VALUES('user-1-1'       , 'Max'      , 'Mustermann'  , 'Mustermann, Max'  , 'Mustermann, Max - (user-1-1)'       , 'max.mustermann@web.de'   , '040-2951854' , '015637683197'    , 'Novatec'     , 'BPM'         , 'Human Workflow'   , 'TASKANA'     , ''    );
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql
index 47f12477f..20dc2581c 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 -- KSC authorizations                     (ID                                        , WB_ID                                     , ACCESS_ID                                                                                    , ACCESS_NAME         , READ , OPEN , APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
 -- PPKs
 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead-1'                                                                                 , 'Titus Toll'        , true , true , true  , true    , true      ,   true     , true , true , true , true , true , true , true , true , true , true , true);
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql
index a32e2c8b2..096d6e108 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 INSERT INTO WORKBASKET_HISTORY_EVENT (ID,EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_ID, KEY, TYPE, OWNER, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, ORGLEVEL_1, ORGLEVEL_2, ORGLEVEL_3, ORGLEVEL_4, DETAILS) VALUES
 -- BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, 	EVENT_TYPE, CREATED, 							 USER_ID, 	DOMAIN, 	WORKBASKET_KEY, 							POR_COMPANY	, POR_SYSTEM, POR_INSTANCE	, POR_TYPE	, POR_VALUE	, TASK_CLASSIFICATION_KEY, TASK_CLASSIFICATION_CATEGORY	, ATTACHMENT_CLASSIFICATION_KEY	, OLD_VALUE	, NEW_VALUE	, CUSTOM_1	, CUSTOM_2	, CUSTOM_3	, CUSTOM_4,          details
 ('WHI:000000000000000000000000000000000000','CREATED'	,'2018-01-29 15:55:00'		,'peter', 'DOMAIN_A', 	 'WBI:000000000000000000000000000000000903', 'soRt004',  	'TOPIC', 'admin', 'custom1'	,'custom2'	, 'custom3'	,'custom4', 'orgLevel1'	,'orgLevel2'	, 'orgLevel3'	,'orgLevel4',  '{"changes":[{"newValue":"WBI:100000000000000000000000000000001234","fieldName":"id","oldValue":""}]}'	),
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql
index a2c770860..1d2b17a4e 100644
--- a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql
+++ b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql
@@ -1,3 +1,5 @@
+-- test-data is used for all tests except for the rest tests
+
 -- KSC workbaskets
 -- WORKBASKET TABLE           (ID                                        , KEY          , CREATED              , MODIFIED             , NAME                       , DOMAIN    , TYPE      , DESCRIPTION                    , OWNER        , CUSTOM_1 , CUSTOM_2  , CUSTOM_3 , CUSTOM_4  , ORG_LEVEL_1   , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION  );
 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'        , 'teamlead-1' , 'ABCQVW' , ''        , 'xyz4'   , ''        , ''            , ''         , ''         , ''         , false                );