diff --git a/datasets/demo-shop/data/seed-data/users.yaml b/datasets/demo-shop/data/seed-data/users.yaml
index e410cad..d83eb04 100644
--- a/datasets/demo-shop/data/seed-data/users.yaml
+++ b/datasets/demo-shop/data/seed-data/users.yaml
@@ -1,331 +1,10 @@
 ---
-  id: restorecommerce-demo-root-superadmin-000
-  name: root.superadmin
-  firstName: Root
-  lastName: Superadmin
-  email: root.superadmin@restorecommerce.io
-  password: CNQJrH%KAayeDpf3h
-  defaultScope: restorecommerce-demo-root-organization
-  roleAssociations:
-    - role: superadministrator-r-id
-      attributes: []
-      id: ""
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: restorecommerce-demo-root-organization
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: restorecommerce-demo-root-superadmin
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "ORG_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens: []
----
-  id: 355f94aa15664d58baa4bf7a06a85681
-  name: manuel.musteradmin
-  firstName: Manuel
-  lastName: Musteradmin
-  email: manuel.musteradmin@restorecommerce.io
-  password: CNQJrH%KAayeDpf3h
-  defaultScope: r-ug
-  roleAssociations:
-    - role: user-r-id
-      id: ""
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: r-ug
-    - role: administrator-r-id
-      id: ""
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: r-ug
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: 355f94aa15664d58baa4bf7a06a85681
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "ORG_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens: [ ]
----
-  id: 455f94aa15664d58baa4bf7a06a85681
-  name: kurt.kunde
-  firstName: Kurt
-  lastName: Kunde
-  email: kurt.kunde@restorecommerce.io
-  password: CNQJrH%KAayeDpf3h
-  defaultScope: r-ug
-  roleAssociations:
-    - role: user-r-id
-      id: ""
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: r-ug
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: 455f94aa15664d58baa4bf7a06a85681
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "ORG_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens: [ ]
----
-  id: 555f94aa15664d58baa4bf7a06a85681
-  name: katrin.kundin
-  firstName: Katrin
-  lastName: Kundin
-  email: katrin.kundin@restorecommerce.io
-  password: CNQJrH%KAayeDpf3h
-  defaultScope: r-ug
-  roleAssociations:
-    - role: user-r-id
-      id: ""
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: r-ug
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: 555f94aa15664d58baa4bf7a06a85681
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "ORG_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens: [ ]
----
-  id: 655f94aa15664d58baa4bf7a06a85681
-  name: karl.kunde
-  firstName: Karl
-  lastName: Kunde
-  email: karl.kunde@restorecommerce.io
-  password: CNQJrH%KAayeDpf3h
-  defaultScope: r-ug
-  roleAssociations:
-    - role: user-r-id
-      id: ""
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: r-ug
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: 655f94aa15664d58baa4bf7a06a85681
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "ORG_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens: []
----
-  id: upsert_user_tokens
-  name: upsert_user_tokens
-  firstName: Upsert
-  lastName: Tokens
-  email: upsert_user_tokens@restorecommerce.io
-  password: CNQJrH%KAayeDpf3h
-  defaultScope: ""
-  roleAssociations:
-    - id: superadministrator-r-role-assoc-id
-      role: superadministrator-r-id
-      attributes: []
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: upsert_user_tokens
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "TECHNICAL_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens:
-    - name: upsert_token
-      token: 123099ffc93b44f6b4a81b1e5589b642
-      type: upsert_token
-      scopes:
-        - superadministrator-r-role-assoc-id
----
-  id: unauthenticated_user
+  id: restorecommerce-demo-unauthenticated-user
   name: unauthenticated_user
   firstName: Unauthenticated
   lastName: User
   email: unauthenticated_user@restorecommerce.io
-  defaultScope: "r-ug"
+  defaultScope: restorecommecre-demo-root-organization
   roleAssociations:
     - id: user-r-role-assoc-id  
       role: user-r-id
@@ -334,7 +13,7 @@
           value: urn:restorecommerce:acs:model:organization.Organization
           attributes:
             - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: r-ug
+              value: restorecommecre-demo-root-organization
   localeId: de-de
   timezoneId: europe-berlin
   meta:
@@ -344,12 +23,12 @@
         value: urn:restorecommerce:acs:model:organization.Organization
         attributes:
           - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
+            value: restorecommecre-demo-root-organization
       - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
         value: urn:restorecommerce:acs:model:user.User
         attributes:
           - id: urn:restorecommerce:acs:names:ownerInstance
-            value: unauthenticated_user
+            value: restorecommerce-demo-unauthenticated-user
   newEmail: ""
   active: true
   activationCode: ""
@@ -372,136 +51,21 @@
   invitedByUserLastName: ""
   tokens:
     - name: unauthenticated_token
-      token: 2ce88810e1a8463fa14c8bc6cfa12345
+      token: 2ce88810e1a8463fa14c8bc6cfa12346
       scopes:
         - user-r-role-assoc-id
 ---
-  id: fulfillment_tech_user
-  name: fulfillment_tech_user
-  firstName: Fulfillment
-  lastName: User
-  email: fulfillment_tech_user@restorecommerce.io
-  defaultScope: "r-ug"
-  roleAssociations:
-    - id: fulfillment-tech-r-assoc-id
-      role: fulfillment-tech-r-id
-      attributes: [ ]
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: fulfillment_tech_user
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "TECHNICAL_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens:
-    - name: fulfillment_tech_token
-      token: jrj29SS0Ui7GlQKPvkS8ReEa48R33OH9
-      scopes:
-        - fulfillment-tech-r-assoc-id
----
-  id: invoice_tech_user
-  name: invoice_tech_user
-  firstName: Invoice
-  lastName: User
-  email: invoice_tech_user@restorecommerce.io
-  defaultScope: "r-ug"
-  roleAssociations:
-    - id: invoice-tech-r-assoc-id
-      role: invoice-tech-r-id
-      attributes: [ ]
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: r-ug
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: invoice_tech_user
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "TECHNICAL_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens:
-    - name: invoice_tech_token
-      token: Bpn5g9V17KJ1O3tC6OcnLEqdG8N9mwjH
-      scopes:
-        - invoice-tech-r-assoc-id
----
-  id: test-org-1-admin
-  name: test.org1.admin
-  firstName: TestOrg1
-  lastName: Admin
-  email: root.admin@restorecommerce.io
+  id: restorecommerce-demo-root-superadmin-000
+  name: root.superadmin
+  firstName: Root
+  lastName: Superadmin
+  email: root.superadmin@restorecommerce.io
   password: CNQJrH%KAayeDpf3h
   defaultScope: restorecommerce-demo-root-organization
   roleAssociations:
-    - role: user-r-id
-      id: ""
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: restorecommerce-demo-root-organization
-    - role: administrator-r-id
+    - role: superadministrator-r-id
+      attributes: []
       id: ""
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: restorecommerce-demo-root-organization
   localeId: de-de
   timezoneId: europe-berlin
   meta:
@@ -516,7 +80,7 @@
         value: urn:restorecommerce:acs:model:user.User
         attributes:
           - id: urn:restorecommerce:acs:names:ownerInstance
-            value: restorecommerce-demo-root-admin
+            value: restorecommerce-demo-root-superadmin
   newEmail: ""
   active: true
   activationCode: ""
@@ -537,12 +101,12 @@
   invitedByUserName: ""
   invitedByUserFirstName: ""
   invitedByUserLastName: ""
-  tokens: [ ]
+  tokens: []
 ---
   id: restorecommerce-demo-shop-000-admin-000
-  name: shop000.admin
+  name: shop000.admin000
   firstName: Shop000
-  lastName: Admin
+  lastName: Admin000
   email: shop000.admin@restorecommerce.io
   password: CNQJrH%KAayeDpf3h
   defaultScope: restorecommerce-demo-shop-000-organization
diff --git a/datasets/demo-shop/data/test/orders.yaml b/datasets/demo-shop/data/test/orders.yaml
deleted file mode 100644
index ec34562..0000000
--- a/datasets/demo-shop/data/test/orders.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "input": {
-    "items": [
-      {
-        "billingAddress": {
-          "address": null,
-          "contact": {
-            "email": null,
-            "name": null,
-            "phone": null
-          }
-        },
-        "customerId": null,
-        "shopId": null,
-        "userId": null,
-        "shippingAddress": {
-          "address": null,
-          "contact": null
-        },
-        "notificationEmail": null,
-        "items": [
-          {
-            "quantity": null,
-            "productId": null,
-            "variantId": null,
-            "unitPrice": {
-              "currencyId": null,
-              "regularPrice": null,
-              "sale": null,
-              "salePrice": null
-            },
-            "id": null,
-            "amount": {
-              "currencyId": null,
-              "gross": null,
-              "net": null,
-              "vats": [
-                {
-                  "taxId": null,
-                  "vat": null
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/datasets/system/data/seed-data/users.yaml b/datasets/system/data/seed-data/users.yaml
index 68d80e7..e69de29 100644
--- a/datasets/system/data/seed-data/users.yaml
+++ b/datasets/system/data/seed-data/users.yaml
@@ -1,57 +0,0 @@
----
-  id: unauthenticated_user
-  name: unauthenticated_user
-  firstName: Unauthenticated
-  lastName: User
-  email: unauthenticated_user@restorecommerce.io
-  defaultScope: system
-  roleAssociations:
-    - id: user-r-role-assoc-id  
-      role: user-r-id
-      attributes:
-        - id: urn:restorecommerce:acs:names:roleScopingEntity
-          value: urn:restorecommerce:acs:model:organization.Organization
-          attributes:
-            - id: urn:restorecommerce:acs:names:roleScopingInstance
-              value: system
-  localeId: de-de
-  timezoneId: europe-berlin
-  meta:
-    modifiedBy: ""
-    owners:
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:organization.Organization
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: system
-      - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
-        value: urn:restorecommerce:acs:model:user.User
-        attributes:
-          - id: urn:restorecommerce:acs:names:ownerInstance
-            value: unauthenticated_user
-  newEmail: ""
-  active: true
-  activationCode: ""
-  passwordHash: ""
-  unauthenticated: false
-  guest: false
-  image:
-    id: ""
-    caption: ""
-    filename: ""
-    contentType: ""
-    url: ""
-    width: 0
-    height: 0
-    length: 0
-  userType: "TECHNICAL_USER"
-  invite: false
-  invitedByUserName: ""
-  invitedByUserFirstName: ""
-  invitedByUserLastName: ""
-  tokens:
-    - name: unauthenticated_token
-      token: 2ce88810e1a8463fa14c8bc6cfa12345
-      scopes:
-        - user-r-role-assoc-id
----
\ No newline at end of file