diff --git a/CHANGELOG-draft.md b/CHANGELOG-draft.md
index 88690e1fd8c..6d46698b169 100644
--- a/CHANGELOG-draft.md
+++ b/CHANGELOG-draft.md
@@ -1,12 +1,7 @@
 THIS FILE ACCUMULATES THE RELEASE NOTES FOR THE UPCOMING RELEASE.
 
-<!--
-
 # [2021-xx-xx]
 
-[please put all changes that only affect federation into this section to unclutter the rest of the release notes.]
-[if something is both an API change and a feature, please mention it twice (you can abbreviate the second mention and add "see above").]
-
 ## Release Notes
 
 ## API Changes
@@ -19,4 +14,4 @@ THIS FILE ACCUMULATES THE RELEASE NOTES FOR THE UPCOMING RELEASE.
 
 ## Internal changes
 
--->
+## Federation changes
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7de7eb92c6e..49a26da34a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,49 @@
 
 <!-- if you're not the release manager, do your edits to changelog in CHANGELOG-draft.md -->
 
+# [2021-09-08]
+
+## Release Notes
+
+## API Changes
+
+* Add `POST /conversations/list/v2` (#1703)
+* Deprecate `POST /list-conversations` (#1703)
+
+## Features
+
+* Bump SFTD to 2.0.127 (#1745)
+
+## Bug fixes and other updates
+
+* Remove support for managed conversations in member removal (#1718)
+* Update the webapp to correct labeling on CBR calling (#1743)
+
+## Documentation
+
+* Document backend internals for user connections (#1717)
+* Open Update spar braindump and explain idp deletion (#1728)
+
+## Internal changes
+
+* Integration test script now displays output interactively (#1700)
+* Fixed a few issues with error response documentation in Swagger (#1707)
+* Make mapping between (team) permissions and roles more lenient (#1711)
+* The `DELETE /conversations/:cnv/members/:usr` endpoint rewritten to Servant (#1697)
+* Remove leftover auto-connect internal endpoint and code (#1716)
+* Clean up JSON golden tests (#1729, #1732, #1733)
+* Make regenerated golden tests' JSON output deterministic (#1734)
+* Import fix for snappy linker issue (#1736)
+
+## Federation changes
+
+* Added client certificate support for server to server authentication (#1682)
+* Implemented full server-to-server authentication (#1687)
+* Add an endpoint for removing a qualified user from a local conversation (#1697)
+* Refactored remote error handling in federator (#1681)
+* The update conversation membership federation endpoint takes OriginDomainHeader (#1719)
+* Added new endpoint to allow fetching conversation metadata by qualified ids (#1703)
+
 # [2021-08-27]
 
 ## Release Notes
diff --git a/charts/federator/values.yaml b/charts/federator/values.yaml
index 5a29356f21d..3184c8983c9 100644
--- a/charts/federator/values.yaml
+++ b/charts/federator/values.yaml
@@ -14,7 +14,8 @@ tls:
   useSharedFederatorSecret: false
 
 resources:
-  # FUTUREWORK: come up with numbers which didn't appear out of thin air
+  # FUTUREWORK: come up with numbers which didn't appear out of thin air (See
+  # https://wearezeta.atlassian.net/browse/BE-518)
   requests:
     memory: "256Mi"
     cpu: "100m"
diff --git a/charts/sftd/Chart.yaml b/charts/sftd/Chart.yaml
index 7dd0e89ab84..bd8b66f8026 100644
--- a/charts/sftd/Chart.yaml
+++ b/charts/sftd/Chart.yaml
@@ -11,4 +11,4 @@ version: 0.0.42
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.0.88
+appVersion: 2.0.127
diff --git a/charts/webapp/values.yaml b/charts/webapp/values.yaml
index 2eb37351576..fe21eb3aac3 100644
--- a/charts/webapp/values.yaml
+++ b/charts/webapp/values.yaml
@@ -9,7 +9,7 @@ resources:
     cpu: "1"
 image:
   repository: quay.io/wire/webapp
-  tag: 2021-08-25-v0.28.24-master
+  tag: 2021-09-06-staging.3-v0.28.24-e6e306b
 service:
   https:
     externalPort: 443
diff --git a/docs/reference/spar-braindump.md b/docs/reference/spar-braindump.md
index 0313ee4971b..d6fe65a4149 100644
--- a/docs/reference/spar-braindump.md
+++ b/docs/reference/spar-braindump.md
@@ -113,7 +113,12 @@ export IDP_ID=...
 
 Copy the new metadata file to one of your spar instances.
 
-Ssh into it.
+Ssh into it.  If you can't, [the scim
+docs](provisioning/scim-via-curl.md) explain how you can create a
+bearer token if you have the admin's login credentials.  If you follow
+that approach, you need to replace all mentions of `-H'Z-User ...'`
+with `-H'Authorization: Bearer ...'` in the following, and you won't need
+`$ADMIN_ID`, but something like `$BEARER`.
 
 There are two ways to update an IDP, described below, each with their own tradeoffs that affect users.
 
@@ -132,7 +137,7 @@ Effects:
   created for them, or they are blocked (both not what you want).
 
 ```shell
-curl -v
+curl -v \
      -XPUT http://localhost:8080/identity-providers/${IDP_ID} \
      -H"Z-User: ${ADMIN_ID}" \
      -H'Content-type: application/xml' \
@@ -165,13 +170,41 @@ Effects:
   https://github.com/wireapp/wire-team-settings/issues/3465).
 
 ```shell
-curl -v
+curl -v \
      -XPOST http://localhost:8080/identity-providers'?replaces='${IDP_ID} \
      -H"Z-User: ${ADMIN_ID}" \
      -H'Content-type: application/xml' \
      -d@"${METADATA_FILE}"
 ```
 
+
+### deleting an idp via curl
+
+Read the beginning of the last section up to "Option 1".  You need
+`ADMIN_ID` (or `BEARER`) and `IDP_ID`, but not `METADATA_FILE`.
+
+```shell
+curl -v
+     -XDELETE http://localhost:8080/identity-providers/${IDP_ID} \
+     -H"Z-User: ${ADMIN_ID}" \
+     -H'Content-type: application/json
+```
+
+If there are still users in your team with SAML credentials associated
+with this IdP, you will get an error.  You can either move these users
+elsewhere, delete them manually, or purge them implicitly during
+deletion of the IdP:
+
+```shell
+curl -v
+     -XDELETE http://localhost:8080/identity-providers/${IDP_ID}?purge=true \
+     -H"Z-User: ${ADMIN_ID}" \
+     -H'Content-type: application/json
+```
+
+Haskell code: https://github.com/wireapp/wire-server/blob/d231550f67c117b7d100c7c8c6c01b5ad13b5a7e/services/spar/src/Spar/API.hs#L217-L271
+
+
 ### setting a default SSO code
 
 To avoid having to give users the login code, a backend can also provide a default code on the endpoint `/sso/settings`.
@@ -277,13 +310,7 @@ clients; and does currently not affect deletability of users.
 
 #### delete via deleting idp
 
-[Currently](https://github.com/wireapp/wire-server/blob/010ca7e460d13160b465de24dd3982a397f94c16/services/spar/src/Spar/API.hs#L172-L187),
-deleting an IdP does not delete any user data.  In particular:
-
-- cookies of users that have authenticated via an IdP will remain valid if the IdP gets deleted.
-- if a user authenticates via an IdP that has been deleted to obtain a new cookie, the login code will not work, and the user will never be able to login again.
-- the user will still show in the team settings, and can be manually deleted from there.
-- if a new idp is registered, and a user authenticates via that idp, the old user is unreachable.  (spar will look up the wire `UserId` under the saml user id that consists partly of the id of the new IdP, come up empty, and [create a fresh user on brig](https://github.com/wireapp/wire-server/blob/010ca7e460d13160b465de24dd3982a397f94c16/services/spar/src/Spar/App.hs#L306).)
+[Currently](https://github.com/wireapp/wire-server/blob/d231550f67c117b7d100c7c8c6c01b5ad13b5a7e/services/spar/src/Spar/API.hs#L217-L271), we only have the rest API for this.  Team settings will follow with a button.
 
 
 #### user deletes herself
diff --git a/docs/reference/user/connection.md b/docs/reference/user/connection.md
index 97b934c4ca0..910c7452881 100644
--- a/docs/reference/user/connection.md
+++ b/docs/reference/user/connection.md
@@ -59,3 +59,49 @@ For two users to be considered "connected", both A->B and B->A connections have
 Users belonging to the same team are always implicitly treated as connected, to make it easier for team members to see each other's profiles, create conversations, etc.
 
 Since there is no explicit connection state between two team members, changing the connection status (e.g. blocking a fellow team member) is impossible.
+
+# Connection backend internals
+
+In the regular case of a single backend (no federation involved), and in the easiest case of two users Alice and Adham which want to start talking, the simplified internals involving the services brig and galley and cassandra can be seen as follows: (as of 2021-08)
+
+![Connection backend internal flow](connections-flow-1-backend.png)
+
+<details>
+<summary>(To edit this diagram, copy the code in this details block to https://swimlanes.io )</summary>
+
+```
+title: Connections: (no federation)
+
+note: this is a simplified view of what happens internall inside the backend in the simple case for connection requests. For the full details refer to the code.
+
+note: Alice sends a connection request to Adham (all on backend A)
+
+order: Alice, Adham, brig, galley, cassandra
+
+Alice -> brig: POST /connections
+
+brig -> cassandra:  write in 'connections': Alice-Adham-sent
+brig -> cassandra:  write in 'connections': Adham-Alice-pending
+note brig, galley: when a connection request is sent, that also creates a conversation of type 'connection' containing only the sender:
+brig -> galley: /i/conversations/connect
+galley -> cassandra: write in conversations: ID-A-A: connection/[Alice]
+brig -> Adham: Event: new connection request from Alice
+
+...: {fas-spinner}
+
+note Alice, cassandra: Adham reacts and sends a request to accept the connection request
+
+Adham -> brig: *PUT /connections/<id>*
+brig -> cassandra: read 'connections' for Alice-Adham
+brig -> cassandra: read 'connections' for Adham-Alice
+brig -> cassandra:  write in 'connections': Alice-Adham-accept
+brig -> cassandra:  write in 'connections': Adham-Alice-accept
+
+note brig, galley: Accepting a connection also leads to the upgrade of the 'connect' conversation to a 'one2one' conversation and adds Adham to the member list
+brig -> galley: /i/conversations/:convId/accept/v2
+galley -> cassandra: write in conversations: ID-A-A: one2one/[Alice,Adham]
+brig -> Alice: Event: connection request accepted
+```
+</details>
+
+The connection / one2one conversation ID is deterministically determined using a combination of the two involved user's UUIDs, using the [addv4](https://github.com/wireapp/wire-server/blob/3b1d0c5acee58bb65d8d72e71baf68dd4c0096ae/libs/types-common/src/Data/UUID/Tagged.hs#L67-L83) function.
diff --git a/docs/reference/user/connections-flow-1-backend.png b/docs/reference/user/connections-flow-1-backend.png
new file mode 100644
index 00000000000..7231652c45f
Binary files /dev/null and b/docs/reference/user/connections-flow-1-backend.png differ
diff --git a/hack/bin/integration-test.sh b/hack/bin/integration-test.sh
index 03470d2115c..94feccde1a6 100755
--- a/hack/bin/integration-test.sh
+++ b/hack/bin/integration-test.sh
@@ -5,7 +5,5 @@ NAMESPACE=${NAMESPACE:-test-integration}
 
 echo "Running integration tests on wire-server"
 
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CHART=wire-server
-helm test -n "${NAMESPACE}" "${NAMESPACE}-${CHART}" --timeout 600s |
-  "$DIR/integration-test-logs.sh"
+helm test --logs -n "${NAMESPACE}" "${NAMESPACE}-${CHART}" --timeout 600s
diff --git a/libs/wire-api-federation/src/Wire/API/Federation/API/Galley.hs b/libs/wire-api-federation/src/Wire/API/Federation/API/Galley.hs
index 23871322981..d30922421ec 100644
--- a/libs/wire-api-federation/src/Wire/API/Federation/API/Galley.hs
+++ b/libs/wire-api-federation/src/Wire/API/Federation/API/Galley.hs
@@ -66,6 +66,7 @@ data Api routes = Api
       routes
         :- "federation"
         :> "update-conversation-memberships"
+        :> OriginDomainHeader
         :> ReqBody '[JSON] ConversationMemberUpdate
         :> Post '[JSON] (),
     leaveConversation ::
@@ -121,6 +122,7 @@ data RegisterConversation = MkRegisterConversation
     -- | The user that created the conversation
     rcOrigUserId :: Qualified UserId,
     -- | The qualified conversation ID
+    -- FUTUREWORK: Make this unqualified, assume the conversation is being hosted by OriginDomain
     rcCnvId :: Qualified ConvId,
     -- | The conversation type
     rcCnvType :: ConvType,
@@ -148,7 +150,10 @@ data ConversationMembersAction
 data ConversationMemberUpdate = ConversationMemberUpdate
   { cmuTime :: UTCTime,
     cmuOrigUserId :: Qualified UserId,
-    cmuConvId :: Qualified ConvId,
+    -- | The unqualified ID of the conversation where the update is happening.
+    -- The ID is local to prevent putting arbitrary domain that is different
+    -- than that of the backend making a conversation membership update request.
+    cmuConvId :: ConvId,
     -- | A list of users from a remote backend that need to be sent
     -- notifications about this change. This is required as we do not expect a
     -- non-conversation owning backend to have an indexed mapping of
diff --git a/libs/wire-api-federation/src/Wire/API/Federation/Client.hs b/libs/wire-api-federation/src/Wire/API/Federation/Client.hs
index 50b7172637f..ee39c5ed596 100644
--- a/libs/wire-api-federation/src/Wire/API/Federation/Client.hs
+++ b/libs/wire-api-federation/src/Wire/API/Federation/Client.hs
@@ -123,6 +123,7 @@ data FederationError
   | FederationNotImplemented
   | FederationNotConfigured
   | FederationCallFailure FederationClientFailure
+  deriving (Show, Eq)
 
 data FederationClientFailure = FederationClientFailure
   { fedFailDomain :: Domain,
diff --git a/libs/wire-api-federation/src/Wire/API/Federation/GRPC/Types.hs b/libs/wire-api-federation/src/Wire/API/Federation/GRPC/Types.hs
index 034349f8d46..8beff443acc 100644
--- a/libs/wire-api-federation/src/Wire/API/Federation/GRPC/Types.hs
+++ b/libs/wire-api-federation/src/Wire/API/Federation/GRPC/Types.hs
@@ -56,7 +56,6 @@ data InwardResponse
   deriving (Typeable, Show, Eq, Generic)
   deriving (Arbitrary) via (GenericUniform InwardResponse)
 
--- FUTUREWORK: add roundtrip tests for these to/from schema definitions.
 instance ToSchema Router "InwardResponse" InwardResponse where
   toSchema r =
     let protoChoice = case r of
diff --git a/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/ConversationMemberUpdate.hs b/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/ConversationMemberUpdate.hs
index 99636099eba..513bb00fa95 100644
--- a/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/ConversationMemberUpdate.hs
+++ b/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/ConversationMemberUpdate.hs
@@ -15,7 +15,11 @@
 -- You should have received a copy of the GNU Affero General Public License along
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 
-module Test.Wire.API.Federation.Golden.ConversationMemberUpdate where
+module Test.Wire.API.Federation.Golden.ConversationMemberUpdate
+  ( testObject_ConversationMemberUpdate1,
+    testObject_ConversationMemberUpdate2,
+  )
+where
 
 import Data.Domain (Domain (Domain))
 import Data.Id (Id (Id), UserId)
@@ -49,9 +53,7 @@ testObject_ConversationMemberUpdate1 =
           (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000007")))
           (Domain "golden.example.com"),
       cmuConvId =
-        Qualified
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000006")))
-          (Domain "golden2.example.com"),
+        Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000006")),
       cmuAlreadyPresentUsers = [],
       cmuAction = ConversationMembersActionAdd ((qAlice, roleNameWireMember) :| [(qBob, roleNameWireAdmin)])
     }
@@ -65,9 +67,7 @@ testObject_ConversationMemberUpdate2 =
           (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000007")))
           (Domain "golden.example.com"),
       cmuConvId =
-        Qualified
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000006")))
-          (Domain "golden2.example.com"),
+        Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000006")),
       cmuAlreadyPresentUsers = [chad, dee],
       cmuAction = ConversationMembersActionRemove (qAlice :| [qBob])
     }
diff --git a/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/GoldenSpec.hs b/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/GoldenSpec.hs
index 05d05f1c13f..29f607f319e 100644
--- a/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/GoldenSpec.hs
+++ b/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/GoldenSpec.hs
@@ -48,6 +48,5 @@ spec =
         (LeaveConversationResponse.testObject_LeaveConversationResponse5, "testObject_LeaveConversationResponse5.json"),
         (LeaveConversationResponse.testObject_LeaveConversationResponse6, "testObject_LeaveConversationResponse6.json"),
         (LeaveConversationResponse.testObject_LeaveConversationResponse7, "testObject_LeaveConversationResponse7.json"),
-        (LeaveConversationResponse.testObject_LeaveConversationResponse8, "testObject_LeaveConversationResponse8.json"),
-        (LeaveConversationResponse.testObject_LeaveConversationResponse9, "testObject_LeaveConversationResponse9.json")
+        (LeaveConversationResponse.testObject_LeaveConversationResponse8, "testObject_LeaveConversationResponse8.json")
       ]
diff --git a/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/LeaveConversationResponse.hs b/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/LeaveConversationResponse.hs
index 23b76814e67..5010d274794 100644
--- a/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/LeaveConversationResponse.hs
+++ b/libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/LeaveConversationResponse.hs
@@ -11,22 +11,19 @@ testObject_LeaveConversationResponse2 :: LeaveConversationResponse
 testObject_LeaveConversationResponse2 = LeaveConversationResponse $ Left RemoveFromConversationErrorRemovalNotAllowed
 
 testObject_LeaveConversationResponse3 :: LeaveConversationResponse
-testObject_LeaveConversationResponse3 = LeaveConversationResponse $ Left RemoveFromConversationErrorManagedConvNotAllowed
+testObject_LeaveConversationResponse3 = LeaveConversationResponse $ Left RemoveFromConversationErrorNotFound
 
 testObject_LeaveConversationResponse4 :: LeaveConversationResponse
-testObject_LeaveConversationResponse4 = LeaveConversationResponse $ Left RemoveFromConversationErrorNotFound
+testObject_LeaveConversationResponse4 = LeaveConversationResponse $ Left RemoveFromConversationErrorCustomRolesNotSupported
 
 testObject_LeaveConversationResponse5 :: LeaveConversationResponse
-testObject_LeaveConversationResponse5 = LeaveConversationResponse $ Left RemoveFromConversationErrorCustomRolesNotSupported
+testObject_LeaveConversationResponse5 = LeaveConversationResponse $ Left RemoveFromConversationErrorSelfConv
 
 testObject_LeaveConversationResponse6 :: LeaveConversationResponse
-testObject_LeaveConversationResponse6 = LeaveConversationResponse $ Left RemoveFromConversationErrorSelfConv
+testObject_LeaveConversationResponse6 = LeaveConversationResponse $ Left RemoveFromConversationErrorOne2OneConv
 
 testObject_LeaveConversationResponse7 :: LeaveConversationResponse
-testObject_LeaveConversationResponse7 = LeaveConversationResponse $ Left RemoveFromConversationErrorOne2OneConv
+testObject_LeaveConversationResponse7 = LeaveConversationResponse $ Left RemoveFromConversationErrorConnectConv
 
 testObject_LeaveConversationResponse8 :: LeaveConversationResponse
-testObject_LeaveConversationResponse8 = LeaveConversationResponse $ Left RemoveFromConversationErrorConnectConv
-
-testObject_LeaveConversationResponse9 :: LeaveConversationResponse
-testObject_LeaveConversationResponse9 = LeaveConversationResponse $ Left RemoveFromConversationErrorUnchanged
+testObject_LeaveConversationResponse8 = LeaveConversationResponse $ Left RemoveFromConversationErrorUnchanged
diff --git a/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate1.json b/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate1.json
index a564d6cb98c..1a3c4aa08c1 100644
--- a/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate1.json
+++ b/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate1.json
@@ -24,8 +24,5 @@
             ]
         ]
     },
-    "conv_id": {
-        "domain": "golden2.example.com",
-        "id": "00000000-0000-0000-0000-000100000006"
-    }
-}
\ No newline at end of file
+    "conv_id": "00000000-0000-0000-0000-000100000006"
+}
diff --git a/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate2.json b/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate2.json
index bf0595e5cc2..a417c27f630 100644
--- a/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate2.json
+++ b/libs/wire-api-federation/test/golden/testObject_ConversationMemberUpdate2.json
@@ -21,8 +21,5 @@
             }
         ]
     },
-    "conv_id": {
-        "domain": "golden2.example.com",
-        "id": "00000000-0000-0000-0000-000100000006"
-    }
-}
\ No newline at end of file
+    "conv_id": "00000000-0000-0000-0000-000100000006"
+}
diff --git a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse3.json b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse3.json
index ccbfe9de985..19ee7fe09cc 100644
--- a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse3.json
+++ b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse3.json
@@ -1,3 +1,3 @@
 {
-    "Left": "RemoveFromConversationErrorManagedConvNotAllowed"
+    "Left": "RemoveFromConversationErrorNotFound"
 }
\ No newline at end of file
diff --git a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse4.json b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse4.json
index 19ee7fe09cc..fcfcc05ae7c 100644
--- a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse4.json
+++ b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse4.json
@@ -1,3 +1,3 @@
 {
-    "Left": "RemoveFromConversationErrorNotFound"
+    "Left": "RemoveFromConversationErrorCustomRolesNotSupported"
 }
\ No newline at end of file
diff --git a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse5.json b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse5.json
index fcfcc05ae7c..13ebfa75124 100644
--- a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse5.json
+++ b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse5.json
@@ -1,3 +1,3 @@
 {
-    "Left": "RemoveFromConversationErrorCustomRolesNotSupported"
+    "Left": "RemoveFromConversationErrorSelfConv"
 }
\ No newline at end of file
diff --git a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse6.json b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse6.json
index 13ebfa75124..a67023bc523 100644
--- a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse6.json
+++ b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse6.json
@@ -1,3 +1,3 @@
 {
-    "Left": "RemoveFromConversationErrorSelfConv"
+    "Left": "RemoveFromConversationErrorOne2OneConv"
 }
\ No newline at end of file
diff --git a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse7.json b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse7.json
index a67023bc523..fd7bd4385c8 100644
--- a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse7.json
+++ b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse7.json
@@ -1,3 +1,3 @@
 {
-    "Left": "RemoveFromConversationErrorOne2OneConv"
+    "Left": "RemoveFromConversationErrorConnectConv"
 }
\ No newline at end of file
diff --git a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse8.json b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse8.json
index fd7bd4385c8..44100f6df71 100644
--- a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse8.json
+++ b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse8.json
@@ -1,3 +1,3 @@
 {
-    "Left": "RemoveFromConversationErrorConnectConv"
+    "Left": "RemoveFromConversationErrorUnchanged"
 }
\ No newline at end of file
diff --git a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse9.json b/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse9.json
deleted file mode 100644
index 44100f6df71..00000000000
--- a/libs/wire-api-federation/test/golden/testObject_LeaveConversationResponse9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Left": "RemoveFromConversationErrorUnchanged"
-}
\ No newline at end of file
diff --git a/libs/wire-api/package.yaml b/libs/wire-api/package.yaml
index 82cc58a66f4..d32a04a4e64 100644
--- a/libs/wire-api/package.yaml
+++ b/libs/wire-api/package.yaml
@@ -66,6 +66,7 @@ library:
   - servant-server
   - servant-swagger
   - schema-profunctor
+  - singletons
   - sop-core
   - string-conversions
   - swagger >=0.1
diff --git a/libs/wire-api/src/Wire/API/Conversation.hs b/libs/wire-api/src/Wire/API/Conversation.hs
index 55e9c50fa72..9cc597a4794 100644
--- a/libs/wire-api/src/Wire/API/Conversation.hs
+++ b/libs/wire-api/src/Wire/API/Conversation.hs
@@ -27,10 +27,12 @@ module Wire.API.Conversation
     ConversationCoverView (..),
     ConversationList (..),
     ListConversations (..),
+    ListConversationsV2 (..),
     GetPaginatedConversationIds (..),
     ConversationPagingState (..),
     ConversationPagingTable (..),
     ConvIdsPage (..),
+    ConversationsResponse (..),
 
     -- * Conversation properties
     Access (..),
@@ -87,9 +89,10 @@ import Data.List1
 import Data.Misc
 import Data.Proxy (Proxy (Proxy))
 import Data.Qualified (Qualified (qUnqualified), deprecatedSchema)
-import Data.Range (Range, toRange)
+import Data.Range (Range, fromRange, rangedSchema, toRange)
 import Data.Schema
 import qualified Data.Set as Set
+import Data.Singletons (sing)
 import Data.String.Conversions (cs)
 import qualified Data.Swagger as S
 import qualified Data.Swagger.Build.Api as Doc
@@ -342,8 +345,6 @@ instance ToSchema GetPaginatedConversationIds where
             <$> gpciPagingState .= optFieldWithDocModifier "paging_state" Nothing addPagingStateDoc schema
             <*> gpciSize .= (fieldWithDocModifier "size" addSizeDoc schema <|> pure (toRange (Proxy @1000)))
 
--- | Used on the POST /list-conversations endpoint
--- FUTUREWORK: add to golden tests (how to generate them?)
 data ListConversations = ListConversations
   { lQualifiedIds :: Maybe (NonEmpty (Qualified ConvId)),
     lStartId :: Maybe (Qualified ConvId),
@@ -362,6 +363,41 @@ instance ToSchema ListConversations where
         <*> lStartId .= optField "start_id" Nothing schema
         <*> lSize .= optField "size" Nothing schema
 
+-- | Used on the POST /conversations/list/v2 endpoint
+newtype ListConversationsV2 = ListConversationsV2
+  { lcQualifiedIds :: Range 1 1000 [Qualified ConvId]
+  }
+  deriving stock (Eq, Show, Generic)
+  deriving (FromJSON, ToJSON, S.ToSchema) via Schema ListConversationsV2
+
+instance ToSchema ListConversationsV2 where
+  schema =
+    objectWithDocModifier
+      "ListConversations"
+      (description ?~ "A request to list some of a user's conversations, including remote ones. Maximum 1000 qualified conversation IDs")
+      $ ListConversationsV2
+        <$> (fromRange . lcQualifiedIds) .= field "qualified_ids" (rangedSchema sing sing (array schema))
+
+data ConversationsResponse = ConversationsResponse
+  { crFound :: [Conversation],
+    crNotFound :: [Qualified ConvId],
+    crFailed :: [Qualified ConvId]
+  }
+  deriving stock (Eq, Show)
+  deriving (FromJSON, ToJSON, S.ToSchema) via Schema ConversationsResponse
+
+instance ToSchema ConversationsResponse where
+  schema =
+    let notFoundDoc = description ?~ "These conversations either don't exist or are deleted."
+        failedDoc = description ?~ "The server failed to fetch these conversations, most likely due to network issues while contacting a remote server"
+     in objectWithDocModifier
+          "ConversationsResponse"
+          (description ?~ "Response object for getting metadata of a list of conversations")
+          $ ConversationsResponse
+            <$> crFound .= field "found" (array schema)
+            <*> crNotFound .= fieldWithDocModifier "not_found" notFoundDoc (array schema)
+            <*> crFailed .= fieldWithDocModifier "failed" failedDoc (array schema)
+
 --------------------------------------------------------------------------------
 -- Conversation properties
 
diff --git a/libs/wire-api/src/Wire/API/ErrorDescription.hs b/libs/wire-api/src/Wire/API/ErrorDescription.hs
index 1c079f5137c..f484f73a59c 100644
--- a/libs/wire-api/src/Wire/API/ErrorDescription.hs
+++ b/libs/wire-api/src/Wire/API/ErrorDescription.hs
@@ -294,15 +294,6 @@ type MissingLegalholdConsent =
 missingLegalholdConsent :: MissingLegalholdConsent
 missingLegalholdConsent = mkErrorDescription
 
-type ManagedRemovalNotAllowed =
-  ErrorDescription
-    403
-    "invalid-op"
-    "Users can not be removed from managed conversations."
-
-managedRemovalNotAllowed :: ManagedRemovalNotAllowed
-managedRemovalNotAllowed = mkErrorDescription
-
 type CustomRolesNotSupported =
   ErrorDescription
     400
diff --git a/libs/wire-api/src/Wire/API/Routes/Public/Galley.hs b/libs/wire-api/src/Wire/API/Routes/Public/Galley.hs
index 53780ca0b8c..3e8fa9921b1 100644
--- a/libs/wire-api/src/Wire/API/Routes/Public/Galley.hs
+++ b/libs/wire-api/src/Wire/API/Routes/Public/Galley.hs
@@ -188,12 +188,25 @@ data Api routes = Api
         :> Get '[Servant.JSON] (Public.ConversationList Public.Conversation),
     listConversations ::
       routes
-        :- Summary "Get all conversations (also returns remote conversations)"
-        :> Description "Like GET /conversations, but allows specifying a list of remote conversations in its request body. Will return all or the requested qualified conversations, including remote ones. WIP: Size parameter is not yet honoured for remote conversations."
+        :- Summary "[deprecated] Get all conversations (also returns remote conversations)"
+        :> Description
+             "Like GET /conversations, but allows specifying a list of remote conversations in its request body. \
+             \Will return all or the requested qualified conversations, including remote ones. \
+             \Size parameter is not yet honoured for remote conversations.\n\
+             \**NOTE** This endpoint will soon be removed."
         :> ZUser
         :> "list-conversations"
         :> ReqBody '[Servant.JSON] Public.ListConversations
         :> Post '[Servant.JSON] (Public.ConversationList Public.Conversation),
+    listConversationsV2 ::
+      routes
+        :- Summary "Get conversation metadata for a list of conversation ids"
+        :> ZUser
+        :> "conversations"
+        :> "list"
+        :> "v2"
+        :> ReqBody '[Servant.JSON] Public.ListConversationsV2
+        :> Post '[Servant.JSON] Public.ConversationsResponse,
     -- This endpoint can lead to the following events being sent:
     -- - ConvCreate event to members
     getConversationByReusableCode ::
diff --git a/libs/wire-api/src/Wire/API/Routes/Public/Galley/Responses.hs b/libs/wire-api/src/Wire/API/Routes/Public/Galley/Responses.hs
index b54a649501b..697cea76164 100644
--- a/libs/wire-api/src/Wire/API/Routes/Public/Galley/Responses.hs
+++ b/libs/wire-api/src/Wire/API/Routes/Public/Galley/Responses.hs
@@ -31,7 +31,6 @@ import Wire.API.ErrorDescription
     InvalidOpConnectConv,
     InvalidOpOne2OneConv,
     InvalidOpSelfConv,
-    ManagedRemovalNotAllowed,
   )
 import qualified Wire.API.Event.Conversation as Public
 import Wire.API.Routes.MultiVerb (AsUnion (..), GenericAsUnion (..), Respond, RespondEmpty, ResponseType, eitherFromUnion, eitherToUnion)
@@ -42,7 +41,6 @@ import Wire.API.Util.Aeson (CustomEncoded (CustomEncoded))
 -- outcome reflecting a change.
 data RemoveFromConversationError
   = RemoveFromConversationErrorRemovalNotAllowed
-  | RemoveFromConversationErrorManagedConvNotAllowed
   | RemoveFromConversationErrorNotFound
   | RemoveFromConversationErrorCustomRolesNotSupported
   | RemoveFromConversationErrorSelfConv
@@ -61,7 +59,6 @@ instance GSOP.Generic RemoveFromConversationError
 
 type RemovalNotPerformedHTTPResponses =
   '[ ConvMemberRemovalDenied,
-     ManagedRemovalNotAllowed,
      ConvNotFound,
      CustomRolesNotSupported,
      InvalidOpSelfConv,
diff --git a/libs/wire-api/test/golden/fromJSON/testObject_Invite_user_2.json b/libs/wire-api/test/golden/fromJSON/testObject_Invite_user_2.json
new file mode 100644
index 00000000000..96ba312798c
--- /dev/null
+++ b/libs/wire-api/test/golden/fromJSON/testObject_Invite_user_2.json
@@ -0,0 +1,5 @@
+{
+    "users": [
+        "00000002-0000-0058-0000-003c00000079"
+    ]
+}
diff --git a/libs/wire-api/test/golden/fromJSON/testObject_ListConversations_1.json b/libs/wire-api/test/golden/fromJSON/testObject_ListConversations_1.json
deleted file mode 100644
index 0967ef424bc..00000000000
--- a/libs/wire-api/test/golden/fromJSON/testObject_ListConversations_1.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_13.json b/libs/wire-api/test/golden/fromJSON/testObject_MemberUpdate_user_3.json
similarity index 100%
rename from libs/wire-api/test/golden/testObject_OtrRecipients_user_13.json
rename to libs/wire-api/test/golden/fromJSON/testObject_MemberUpdate_user_3.json
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_2.json b/libs/wire-api/test/golden/fromJSON/testObject_NewConvManaged_user_2.json
similarity index 94%
rename from libs/wire-api/test/golden/testObject_NewConvManaged_user_2.json
rename to libs/wire-api/test/golden/fromJSON/testObject_NewConvManaged_user_2.json
index 3944598bbc6..f3820d40cc6 100644
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_2.json
+++ b/libs/wire-api/test/golden/fromJSON/testObject_NewConvManaged_user_2.json
@@ -5,20 +5,20 @@
         "link"
     ],
     "access_role": "non_activated",
-    "users": [
-        "00000002-0000-0001-0000-000400000000"
-    ],
     "conversation_role": "bewzponl1a3c_l6ou",
-    "name": "󳂣\u001a5",
-    "team": {
-        "managed": true,
-        "teamid": "00000002-0000-0002-0000-000200000002"
-    },
     "message_timer": 5509522199847054,
+    "name": "󳂣\u001a5",
     "qualified_users": [
         {
             "domain": "test.example.com",
             "id": "00000000-0000-0000-0000-000100000001"
         }
+    ],
+    "team": {
+        "managed": false,
+        "teamid": "00000002-0000-0002-0000-000200000002"
+    },
+    "users": [
+        "00000002-0000-0001-0000-000400000000"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_1.json b/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_1.json
index 8139eab3cc6..edf0282f535 100644
--- a/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_1.json
+++ b/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_1.json
@@ -14,5 +14,6 @@
         "teamid": "00000000-0000-0001-0000-000000000000"
     },
     "receipt_mode": 1,
-    "message_timer": 3320987366258987
-}
+    "message_timer": 3320987366258987,
+    "qualified_users": []
+}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_2.json b/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_2.json
similarity index 85%
rename from libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_2.json
rename to libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_2.json
index eefa9c41791..aae8702ff67 100644
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_2.json
+++ b/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_2.json
@@ -1,19 +1,18 @@
 {
     "access": [],
-    "access_role": "private",
-    "users": [],
     "conversation_role": "vmao7psxph3fenvbpsu1u57fns5pfo53d67k98om378rnxr0crcpak_mpspn8q_3m1b02n2n133s1d7q5w3qgmt_5e_dgtvzon8an7dtauiecd32",
-    "name": "😏􃉷",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0001-0000-000000000001"
-    },
-    "receipt_mode": -1,
     "message_timer": 2406292360203739,
+    "name": "😏􃉷",
     "qualified_users": [
         {
             "domain": "testdomain.example.com",
             "id": "00000000-0000-0000-0000-000100000001"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "receipt_mode": -1,
+    "team": {
+        "managed": true,
+        "teamid": "00000000-0000-0001-0000-000000000001"
+    },
+    "users": []
+}
diff --git a/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_21.json b/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_21.json
deleted file mode 100644
index b8cb1fef032..00000000000
--- a/libs/wire-api/test/golden/fromJSON/testObject_NewConvUnmanaged_user_21.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "qualified_users": [
-        {
-            "id": "00000000-0000-0000-0000-000000000001",
-            "domain": "testdomain.example.com"
-        }
-    ],
-    "conversation_role": "udhi2sbf7tzyshrh"
-}
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_7.json b/libs/wire-api/test/golden/fromJSON/testObject_OtherMemberUpdate_user_2.json
similarity index 100%
rename from libs/wire-api/test/golden/testObject_OtrRecipients_user_7.json
rename to libs/wire-api/test/golden/fromJSON/testObject_OtherMemberUpdate_user_2.json
diff --git a/libs/wire-api/test/golden/fromJSON/testObject_SimpleMember_user_2-2.json b/libs/wire-api/test/golden/fromJSON/testObject_SimpleMember_user_2-2.json
new file mode 100644
index 00000000000..5caa1b47dfa
--- /dev/null
+++ b/libs/wire-api/test/golden/fromJSON/testObject_SimpleMember_user_2-2.json
@@ -0,0 +1,7 @@
+{
+  "qualified_id": {
+    "id": "0000003a-0000-0042-0000-007500000037",
+    "domain": "faraway.example.com"
+  },
+  "id": "0000003a-0000-0042-0000-007500000036"
+}
diff --git a/libs/wire-api/test/golden/fromJSON/testObject_SimpleMember_user_1.json b/libs/wire-api/test/golden/fromJSON/testObject_SimpleMember_user_2.json
similarity index 100%
rename from libs/wire-api/test/golden/fromJSON/testObject_SimpleMember_user_1.json
rename to libs/wire-api/test/golden/fromJSON/testObject_SimpleMember_user_2.json
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_1.json b/libs/wire-api/test/golden/testObject_AccessRole_user_1.json
index 70ae9c175d8..8f83afaaa47 100644
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AccessRole_user_1.json
@@ -1 +1 @@
-"private"
\ No newline at end of file
+"private"
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_10.json b/libs/wire-api/test/golden/testObject_AccessRole_user_10.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_11.json b/libs/wire-api/test/golden/testObject_AccessRole_user_11.json
deleted file mode 100644
index b3f76df0a05..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"non_activated"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_12.json b/libs/wire-api/test/golden/testObject_AccessRole_user_12.json
deleted file mode 100644
index f035f0f2454..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"activated"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_13.json b/libs/wire-api/test/golden/testObject_AccessRole_user_13.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_14.json b/libs/wire-api/test/golden/testObject_AccessRole_user_14.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_15.json b/libs/wire-api/test/golden/testObject_AccessRole_user_15.json
deleted file mode 100644
index ff11ef9d83c..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"team"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_16.json b/libs/wire-api/test/golden/testObject_AccessRole_user_16.json
deleted file mode 100644
index f035f0f2454..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"activated"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_17.json b/libs/wire-api/test/golden/testObject_AccessRole_user_17.json
deleted file mode 100644
index ff11ef9d83c..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"team"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_18.json b/libs/wire-api/test/golden/testObject_AccessRole_user_18.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_19.json b/libs/wire-api/test/golden/testObject_AccessRole_user_19.json
deleted file mode 100644
index b3f76df0a05..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"non_activated"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_2.json b/libs/wire-api/test/golden/testObject_AccessRole_user_2.json
index b3f76df0a05..db583ca7583 100644
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AccessRole_user_2.json
@@ -1 +1 @@
-"non_activated"
\ No newline at end of file
+"non_activated"
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_20.json b/libs/wire-api/test/golden/testObject_AccessRole_user_20.json
deleted file mode 100644
index ff11ef9d83c..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"team"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_3.json b/libs/wire-api/test/golden/testObject_AccessRole_user_3.json
index f035f0f2454..a623f933821 100644
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_3.json
+++ b/libs/wire-api/test/golden/testObject_AccessRole_user_3.json
@@ -1 +1 @@
-"activated"
\ No newline at end of file
+"activated"
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_4.json b/libs/wire-api/test/golden/testObject_AccessRole_user_4.json
index ff11ef9d83c..e31a5eeba46 100644
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_4.json
+++ b/libs/wire-api/test/golden/testObject_AccessRole_user_4.json
@@ -1 +1 @@
-"team"
\ No newline at end of file
+"team"
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_5.json b/libs/wire-api/test/golden/testObject_AccessRole_user_5.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_6.json b/libs/wire-api/test/golden/testObject_AccessRole_user_6.json
deleted file mode 100644
index b3f76df0a05..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"non_activated"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_7.json b/libs/wire-api/test/golden/testObject_AccessRole_user_7.json
deleted file mode 100644
index b3f76df0a05..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"non_activated"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_8.json b/libs/wire-api/test/golden/testObject_AccessRole_user_8.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessRole_user_9.json b/libs/wire-api/test/golden/testObject_AccessRole_user_9.json
deleted file mode 100644
index b3f76df0a05..00000000000
--- a/libs/wire-api/test/golden/testObject_AccessRole_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"non_activated"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_1.json b/libs/wire-api/test/golden/testObject_AccessToken_user_1.json
index 7c8913df94c..8acd3f8723a 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_1.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 1,
     "access_token": "{\u0018󼝍\u000eq𫧸w",
-    "user": "00002525-0000-2bc3-0000-3a8200006f94",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 1,
+    "token_type": "Bearer",
+    "user": "00002525-0000-2bc3-0000-3a8200006f94"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_10.json b/libs/wire-api/test/golden/testObject_AccessToken_user_10.json
index 7af36878d05..3e82434287a 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_10.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_10.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -20,
     "access_token": " 󴛩+􏀾G_𡀎Xj\u0000ef蟺.&U]J𦶻=<hrt3",
-    "user": "0000376e-0000-4673-0000-1e1800004b06",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -20,
+    "token_type": "Bearer",
+    "user": "0000376e-0000-4673-0000-1e1800004b06"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_11.json b/libs/wire-api/test/golden/testObject_AccessToken_user_11.json
index 838e7d3d16b..32fe142925e 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_11.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_11.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -19,
     "access_token": "pT𤆒\u0011@􌩤\u00143",
-    "user": "000018c7-0000-4f75-0000-29b0000065fc",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -19,
+    "token_type": "Bearer",
+    "user": "000018c7-0000-4f75-0000-29b0000065fc"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_12.json b/libs/wire-api/test/golden/testObject_AccessToken_user_12.json
index 634d7c51129..e136cb35133 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_12.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_12.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 25,
     "access_token": "\u0006\n􈷦FY\u0003uu\u0001",
-    "user": "00000f4f-0000-0499-0000-78b4000029de",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 25,
+    "token_type": "Bearer",
+    "user": "00000f4f-0000-0499-0000-78b4000029de"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_13.json b/libs/wire-api/test/golden/testObject_AccessToken_user_13.json
index 255b2a354e7..23a74cdd903 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_13.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_13.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 27,
     "access_token": "􀓪Qక󺆢oV|#Hp-󸽆js􋫽󰦶.E􋑔󸰽",
-    "user": "00001225-0000-145a-0000-277600007725",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 27,
+    "token_type": "Bearer",
+    "user": "00001225-0000-145a-0000-277600007725"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_14.json b/libs/wire-api/test/golden/testObject_AccessToken_user_14.json
index 9ec824e7f3e..03c5afbae0e 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_14.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_14.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -12,
     "access_token": "󱠓",
-    "user": "00007469-0000-0eae-0000-1a8400004582",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -12,
+    "token_type": "Bearer",
+    "user": "00007469-0000-0eae-0000-1a8400004582"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_15.json b/libs/wire-api/test/golden/testObject_AccessToken_user_15.json
index 06d96780a10..637abf1ecd5 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_15.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_15.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 26,
     "access_token": "󱟾r",
-    "user": "000011e5-0000-29e4-0000-550400003888",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 26,
+    "token_type": "Bearer",
+    "user": "000011e5-0000-29e4-0000-550400003888"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_16.json b/libs/wire-api/test/golden/testObject_AccessToken_user_16.json
index 7a0deef86c1..2b76ee7439e 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_16.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_16.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 18,
     "access_token": "p\"􂣑\u000b-\u0003\u0008<𓍀+\u000e􃬐",
-    "user": "0000633c-0000-6653-0000-772e00005669",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 18,
+    "token_type": "Bearer",
+    "user": "0000633c-0000-6653-0000-772e00005669"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_17.json b/libs/wire-api/test/golden/testObject_AccessToken_user_17.json
index 75c7acced69..f4ec89f7e19 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_17.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_17.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -13,
     "access_token": "𧕲z}\u0008RH\u0005@o\u0019m,💜䛩􌵝]\u0004\u001c\rZm,Z",
-    "user": "00006032-0000-470b-0000-544b00001c88",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -13,
+    "token_type": "Bearer",
+    "user": "00006032-0000-470b-0000-544b00001c88"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_18.json b/libs/wire-api/test/golden/testObject_AccessToken_user_18.json
index 2eb030fdac6..7e456bd4343 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_18.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_18.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -8,
     "access_token": "􁸘\\􈝊\u000b2!󼬷𮩖ZE|3(\u0018=Q\u0005b\u0013[󰐕󼶅MW",
-    "user": "00006b0d-0000-792a-0000-3fb800003867",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -8,
+    "token_type": "Bearer",
+    "user": "00006b0d-0000-792a-0000-3fb800003867"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_19.json b/libs/wire-api/test/golden/testObject_AccessToken_user_19.json
index 33187d3717b..1e903ec9e47 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_19.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_19.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -16,
     "access_token": "h\u0007",
-    "user": "00004fc5-0000-08b5-0000-0ad800002c12",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -16,
+    "token_type": "Bearer",
+    "user": "00004fc5-0000-08b5-0000-0ad800002c12"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_2.json b/libs/wire-api/test/golden/testObject_AccessToken_user_2.json
index 5a79f0d3bd1..fa21a02c5c3 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_2.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -24,
     "access_token": "o6Q󸻤\u0017󵜝",
-    "user": "00007ace-0000-630b-0000-718c00000945",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -24,
+    "token_type": "Bearer",
+    "user": "00007ace-0000-630b-0000-718c00000945"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_20.json b/libs/wire-api/test/golden/testObject_AccessToken_user_20.json
index e7cbbf75853..999327d64c5 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_20.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_20.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 17,
     "access_token": "󾏂~𤍏#\t\u001c􅍊 ~_W􋹟z_󳩧A",
-    "user": "00005c43-0000-6c4c-0000-461200000976",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 17,
+    "token_type": "Bearer",
+    "user": "00005c43-0000-6c4c-0000-461200000976"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_3.json b/libs/wire-api/test/golden/testObject_AccessToken_user_3.json
index 435cca512a1..dcf24f1e9b7 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_3.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_3.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 6,
     "access_token": "\u0013u𫨷N<E#􊜰>dWTm\u000fi􋦩",
-    "user": "00004286-0000-22c5-0000-5dba00001818",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 6,
+    "token_type": "Bearer",
+    "user": "00004286-0000-22c5-0000-5dba00001818"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_4.json b/libs/wire-api/test/golden/testObject_AccessToken_user_4.json
index e77e43d41e5..cea8a70bedb 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_4.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_4.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -9,
     "access_token": "阹0)&9\\\u000f\u0000O",
-    "user": "00005c1d-0000-2e06-0000-278a00002d91",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -9,
+    "token_type": "Bearer",
+    "user": "00005c1d-0000-2e06-0000-278a00002d91"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_5.json b/libs/wire-api/test/golden/testObject_AccessToken_user_5.json
index 573bcf09ac6..607402d718e 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_5.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_5.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 27,
     "access_token": "n㚹 {'\u001c📖\u0011C*꺎\u001b",
-    "user": "00002891-0000-27e1-0000-686000002ba0",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 27,
+    "token_type": "Bearer",
+    "user": "00002891-0000-27e1-0000-686000002ba0"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_6.json b/libs/wire-api/test/golden/testObject_AccessToken_user_6.json
index bc0fe05f641..52ccf634807 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_6.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_6.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 2,
     "access_token": "+瑧8J󰷉\u0001w",
-    "user": "0000195e-0000-7174-0000-1a5c000030dc",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 2,
+    "token_type": "Bearer",
+    "user": "0000195e-0000-7174-0000-1a5c000030dc"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_7.json b/libs/wire-api/test/golden/testObject_AccessToken_user_7.json
index 6b12bb4d357..a1736a08935 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_7.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_7.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": -12,
     "access_token": "`gS\u0010\u0003e󻩆o󿂃􁘉󲠖+Htv􂬾\u0019dh\u0002𩩹",
-    "user": "000038d1-0000-3dd4-0000-499a000014ca",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": -12,
+    "token_type": "Bearer",
+    "user": "000038d1-0000-3dd4-0000-499a000014ca"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_8.json b/libs/wire-api/test/golden/testObject_AccessToken_user_8.json
index 8ec68f08471..89f9f0a928a 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_8.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_8.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 27,
     "access_token": "\u0000YnC&X9󽿩_",
-    "user": "000065e0-0000-3b8c-0000-492700007916",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 27,
+    "token_type": "Bearer",
+    "user": "000065e0-0000-3b8c-0000-492700007916"
+}
diff --git a/libs/wire-api/test/golden/testObject_AccessToken_user_9.json b/libs/wire-api/test/golden/testObject_AccessToken_user_9.json
index f7a9ac27c80..d4dfbd4ce22 100644
--- a/libs/wire-api/test/golden/testObject_AccessToken_user_9.json
+++ b/libs/wire-api/test/golden/testObject_AccessToken_user_9.json
@@ -1,6 +1,6 @@
 {
-    "expires_in": 23,
     "access_token": "􄓳\u0018\u0008󻈱􍠁\u0018f󳬀DDNNR𠷚`H",
-    "user": "000023d8-0000-406e-0000-3277000079f9",
-    "token_type": "Bearer"
-}
\ No newline at end of file
+    "expires_in": 23,
+    "token_type": "Bearer",
+    "user": "000023d8-0000-406e-0000-3277000079f9"
+}
diff --git a/libs/wire-api/test/golden/testObject_Access_user_1.json b/libs/wire-api/test/golden/testObject_Access_user_1.json
index 069b3063076..4f5c58a4d7f 100644
--- a/libs/wire-api/test/golden/testObject_Access_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Access_user_1.json
@@ -1 +1 @@
-"code"
\ No newline at end of file
+"code"
diff --git a/libs/wire-api/test/golden/testObject_Access_user_10.json b/libs/wire-api/test/golden/testObject_Access_user_10.json
deleted file mode 100644
index 416ea43eea1..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"link"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_11.json b/libs/wire-api/test/golden/testObject_Access_user_11.json
deleted file mode 100644
index 069b3063076..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"code"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_12.json b/libs/wire-api/test/golden/testObject_Access_user_12.json
deleted file mode 100644
index 416ea43eea1..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"link"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_13.json b/libs/wire-api/test/golden/testObject_Access_user_13.json
deleted file mode 100644
index 416ea43eea1..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"link"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_14.json b/libs/wire-api/test/golden/testObject_Access_user_14.json
deleted file mode 100644
index 069b3063076..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"code"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_15.json b/libs/wire-api/test/golden/testObject_Access_user_15.json
deleted file mode 100644
index 069b3063076..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"code"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_16.json b/libs/wire-api/test/golden/testObject_Access_user_16.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_17.json b/libs/wire-api/test/golden/testObject_Access_user_17.json
deleted file mode 100644
index 38b090467e9..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"invite"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_18.json b/libs/wire-api/test/golden/testObject_Access_user_18.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_19.json b/libs/wire-api/test/golden/testObject_Access_user_19.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_2.json b/libs/wire-api/test/golden/testObject_Access_user_2.json
index 416ea43eea1..a046dea0e3f 100644
--- a/libs/wire-api/test/golden/testObject_Access_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Access_user_2.json
@@ -1 +1 @@
-"link"
\ No newline at end of file
+"link"
diff --git a/libs/wire-api/test/golden/testObject_Access_user_20.json b/libs/wire-api/test/golden/testObject_Access_user_20.json
deleted file mode 100644
index 416ea43eea1..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"link"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_3.json b/libs/wire-api/test/golden/testObject_Access_user_3.json
index 70ae9c175d8..8f83afaaa47 100644
--- a/libs/wire-api/test/golden/testObject_Access_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Access_user_3.json
@@ -1 +1 @@
-"private"
\ No newline at end of file
+"private"
diff --git a/libs/wire-api/test/golden/testObject_Access_user_4.json b/libs/wire-api/test/golden/testObject_Access_user_4.json
index 069b3063076..b0fba1637e2 100644
--- a/libs/wire-api/test/golden/testObject_Access_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Access_user_4.json
@@ -1 +1 @@
-"code"
\ No newline at end of file
+"invite"
diff --git a/libs/wire-api/test/golden/testObject_Access_user_5.json b/libs/wire-api/test/golden/testObject_Access_user_5.json
deleted file mode 100644
index 38b090467e9..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"invite"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_6.json b/libs/wire-api/test/golden/testObject_Access_user_6.json
deleted file mode 100644
index 70ae9c175d8..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"private"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_7.json b/libs/wire-api/test/golden/testObject_Access_user_7.json
deleted file mode 100644
index 38b090467e9..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"invite"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_8.json b/libs/wire-api/test/golden/testObject_Access_user_8.json
deleted file mode 100644
index 069b3063076..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"code"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Access_user_9.json b/libs/wire-api/test/golden/testObject_Access_user_9.json
deleted file mode 100644
index 38b090467e9..00000000000
--- a/libs/wire-api/test/golden/testObject_Access_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"invite"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_1.json b/libs/wire-api/test/golden/testObject_Action_user_1.json
index df2848b09b1..7ba84831bfa 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_1.json
@@ -1 +1 @@
-"add_conversation_member"
\ No newline at end of file
+"add_conversation_member"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_10.json b/libs/wire-api/test/golden/testObject_Action_user_10.json
deleted file mode 100644
index 512e6cbe48b..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"modify_conversation_message_timer"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_11.json b/libs/wire-api/test/golden/testObject_Action_user_11.json
deleted file mode 100644
index 9c7a960f78f..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"delete_conversation"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_12.json b/libs/wire-api/test/golden/testObject_Action_user_12.json
deleted file mode 100644
index 512e6cbe48b..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"modify_conversation_message_timer"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_13.json b/libs/wire-api/test/golden/testObject_Action_user_13.json
deleted file mode 100644
index e3955955c9f..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"leave_conversation"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_14.json b/libs/wire-api/test/golden/testObject_Action_user_14.json
deleted file mode 100644
index 524cd07178c..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"remove_conversation_member"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_15.json b/libs/wire-api/test/golden/testObject_Action_user_15.json
deleted file mode 100644
index 64a1631e3c3..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"modify_conversation_receipt_mode"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_16.json b/libs/wire-api/test/golden/testObject_Action_user_16.json
deleted file mode 100644
index e3955955c9f..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"leave_conversation"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_17.json b/libs/wire-api/test/golden/testObject_Action_user_17.json
deleted file mode 100644
index 512e6cbe48b..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"modify_conversation_message_timer"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_18.json b/libs/wire-api/test/golden/testObject_Action_user_18.json
deleted file mode 100644
index e3955955c9f..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"leave_conversation"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_19.json b/libs/wire-api/test/golden/testObject_Action_user_19.json
deleted file mode 100644
index 9c7a960f78f..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"delete_conversation"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_2.json b/libs/wire-api/test/golden/testObject_Action_user_2.json
index 64a1631e3c3..a28f14041c8 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_2.json
@@ -1 +1 @@
-"modify_conversation_receipt_mode"
\ No newline at end of file
+"remove_conversation_member"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_20.json b/libs/wire-api/test/golden/testObject_Action_user_20.json
deleted file mode 100644
index 1ccfb97e57c..00000000000
--- a/libs/wire-api/test/golden/testObject_Action_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"modify_other_conversation_member"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Action_user_3.json b/libs/wire-api/test/golden/testObject_Action_user_3.json
index df2848b09b1..7940966e743 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_3.json
@@ -1 +1 @@
-"add_conversation_member"
\ No newline at end of file
+"modify_conversation_name"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_4.json b/libs/wire-api/test/golden/testObject_Action_user_4.json
index df6a9ceb281..f7c2a623040 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_4.json
@@ -1 +1 @@
-"modify_conversation_name"
\ No newline at end of file
+"modify_conversation_message_timer"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_5.json b/libs/wire-api/test/golden/testObject_Action_user_5.json
index 748548f2ab5..0655064e8a1 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_5.json
@@ -1 +1 @@
-"modify_conversation_access"
\ No newline at end of file
+"modify_conversation_receipt_mode"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_6.json b/libs/wire-api/test/golden/testObject_Action_user_6.json
index e3955955c9f..448d2643c49 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_6.json
@@ -1 +1 @@
-"leave_conversation"
\ No newline at end of file
+"modify_conversation_access"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_7.json b/libs/wire-api/test/golden/testObject_Action_user_7.json
index 748548f2ab5..00609f7e7d5 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_7.json
@@ -1 +1 @@
-"modify_conversation_access"
\ No newline at end of file
+"modify_other_conversation_member"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_8.json b/libs/wire-api/test/golden/testObject_Action_user_8.json
index 748548f2ab5..c8bb733f0a0 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_8.json
@@ -1 +1 @@
-"modify_conversation_access"
\ No newline at end of file
+"leave_conversation"
diff --git a/libs/wire-api/test/golden/testObject_Action_user_9.json b/libs/wire-api/test/golden/testObject_Action_user_9.json
index e3955955c9f..9795edd51b7 100644
--- a/libs/wire-api/test/golden/testObject_Action_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Action_user_9.json
@@ -1 +1 @@
-"leave_conversation"
\ No newline at end of file
+"delete_conversation"
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_1.json b/libs/wire-api/test/golden/testObject_Activate_user_1.json
index 1d52b497070..1578b22ac2f 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_1.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+45520903",
     "code": "HUUpJQ==",
-    "dryrun": true
-}
\ No newline at end of file
+    "dryrun": true,
+    "phone": "+45520903"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_10.json b/libs/wire-api/test/golden/testObject_Activate_user_10.json
index 2ac9fd5c4bc..93b403e17a8 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_10.json
@@ -1,5 +1,5 @@
 {
-    "key": "1szizA==",
     "code": "kcvCq2A=",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "key": "1szizA=="
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_11.json b/libs/wire-api/test/golden/testObject_Activate_user_11.json
index 4f925e22e4f..87251a5b113 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_11.json
@@ -1,5 +1,5 @@
 {
-    "email": "\u00034\u001a@",
     "code": "MZpmmg==",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "email": "\u00034\u001a@"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_12.json b/libs/wire-api/test/golden/testObject_Activate_user_12.json
index 6047fb73698..601ac6c7255 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_12.json
@@ -1,5 +1,5 @@
 {
-    "key": "V3mr5D4=",
     "code": "sScBopoNTb0=",
-    "dryrun": true
-}
\ No newline at end of file
+    "dryrun": true,
+    "key": "V3mr5D4="
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_13.json b/libs/wire-api/test/golden/testObject_Activate_user_13.json
index 4ae49810352..638148bec02 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_13.json
@@ -1,5 +1,5 @@
 {
-    "key": "haH9_sUNFw==",
     "code": "ysvb",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "key": "haH9_sUNFw=="
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_14.json b/libs/wire-api/test/golden/testObject_Activate_user_14.json
index 9a5a31a22d4..fd2763b59c3 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_14.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+13340815619",
     "code": "hQ==",
-    "dryrun": true
-}
\ No newline at end of file
+    "dryrun": true,
+    "phone": "+13340815619"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_15.json b/libs/wire-api/test/golden/testObject_Activate_user_15.json
index f2333af6ea6..ce73a7296db 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_15.json
@@ -1,5 +1,5 @@
 {
-    "email": "圤W[󾒿G󳍬]{\n@ V8󲏽\u0015*",
     "code": "biTZ",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "email": "圤W[󾒿G󳍬]{\n@ V8󲏽\u0015*"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_16.json b/libs/wire-api/test/golden/testObject_Activate_user_16.json
index d3f9f05a4bf..fcbcd59dbf7 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_16.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+77635104433",
     "code": "5W4=",
-    "dryrun": true
-}
\ No newline at end of file
+    "dryrun": true,
+    "phone": "+77635104433"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_17.json b/libs/wire-api/test/golden/testObject_Activate_user_17.json
index 2a053b10492..029ba0efa82 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_17.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+556856857856",
     "code": "ShjEcgx6P0Hs",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "phone": "+556856857856"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_18.json b/libs/wire-api/test/golden/testObject_Activate_user_18.json
index a9a4551eb13..f1fdb6c2dae 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_18.json
@@ -1,5 +1,5 @@
 {
-    "email": "2􎖰B􌕾\u00032\u001f􇰋@v\u0001\u000e󶃯/e",
     "code": "xRvktQ==",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "email": "2􎖰B􌕾\u00032\u001f􇰋@v\u0001\u000e󶃯/e"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_19.json b/libs/wire-api/test/golden/testObject_Activate_user_19.json
index 0343a855c2c..78325351be1 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_19.json
@@ -1,5 +1,5 @@
 {
-    "key": "1fCrdg==",
     "code": "",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "key": "1fCrdg=="
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_2.json b/libs/wire-api/test/golden/testObject_Activate_user_2.json
index b4660f2eea0..d4cc0474516 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_2.json
@@ -1,5 +1,5 @@
 {
-    "key": "e3sm9EjNmzA=",
     "code": "fg==",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "key": "e3sm9EjNmzA="
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_20.json b/libs/wire-api/test/golden/testObject_Activate_user_20.json
index e7639dcd1ea..6e3a3bb7641 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_20.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+893051142276",
     "code": "7PtclAevMzA=",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "phone": "+893051142276"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_3.json b/libs/wire-api/test/golden/testObject_Activate_user_3.json
index c8c280e8964..bc9eb55c56f 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_3.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+44508058",
     "code": "OAbwDkw=",
-    "dryrun": true
-}
\ No newline at end of file
+    "dryrun": true,
+    "phone": "+44508058"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_4.json b/libs/wire-api/test/golden/testObject_Activate_user_4.json
index 9508596a4d8..fd7147e34c9 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_4.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+97751884",
     "code": "811p-743Gvpi",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "phone": "+97751884"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_5.json b/libs/wire-api/test/golden/testObject_Activate_user_5.json
index 7947056467e..8975d735dc0 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_5.json
@@ -1,5 +1,5 @@
 {
-    "email": "󴴺\u0000􆞵@k\\\u0001a\u0016*𫅳",
     "code": "",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "email": "󴴺\u0000􆞵@k\\\u0001a\u0016*𫅳"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_6.json b/libs/wire-api/test/golden/testObject_Activate_user_6.json
index 8195fb7f32e..844c5c091d7 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_6.json
@@ -1,5 +1,5 @@
 {
-    "email": "􍧃i>󶃾Ha!@",
     "code": "FXrNll0Kqg==",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "email": "􍧃i>󶃾Ha!@"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_7.json b/libs/wire-api/test/golden/testObject_Activate_user_7.json
index 4a20269730b..8622155b543 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_7.json
@@ -1,5 +1,5 @@
 {
-    "key": "jQ==",
     "code": "8yl3qERc",
-    "dryrun": false
-}
\ No newline at end of file
+    "dryrun": false,
+    "key": "jQ=="
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_8.json b/libs/wire-api/test/golden/testObject_Activate_user_8.json
index 3bf7bf823f7..681812203b2 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_8.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+3276478697350",
     "code": "NF20Avw=",
-    "dryrun": true
-}
\ No newline at end of file
+    "dryrun": true,
+    "phone": "+3276478697350"
+}
diff --git a/libs/wire-api/test/golden/testObject_Activate_user_9.json b/libs/wire-api/test/golden/testObject_Activate_user_9.json
index 27b03bb23de..a54047d9a78 100644
--- a/libs/wire-api/test/golden/testObject_Activate_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Activate_user_9.json
@@ -1,5 +1,5 @@
 {
-    "key": "DkV9xQ==",
     "code": "61wG",
-    "dryrun": true
-}
\ No newline at end of file
+    "dryrun": true,
+    "key": "DkV9xQ=="
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_1.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_1.json
index 8cde965959f..e75baf9853b 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_1.json
@@ -1 +1 @@
-"FJwIy9tvYg=="
\ No newline at end of file
+"FJwIy9tvYg=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_10.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_10.json
index baebc1e7cb8..6509607e5c3 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_10.json
@@ -1 +1 @@
-"ElTR5oKEkVX7_iMtw0UWePQv4LTkra90Hape"
\ No newline at end of file
+"ElTR5oKEkVX7_iMtw0UWePQv4LTkra90Hape"
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_11.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_11.json
index ff33fe7f1d1..da5f1362350 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_11.json
@@ -1 +1 @@
-"MwcmBl8I-ytX-ssz1u3cy7tFHJQ="
\ No newline at end of file
+"MwcmBl8I-ytX-ssz1u3cy7tFHJQ="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_12.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_12.json
index b3ae76da98c..f18a0bbec9c 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_12.json
@@ -1 +1 @@
-"JXwE8B8yGcmngjxN0g=="
\ No newline at end of file
+"JXwE8B8yGcmngjxN0g=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_13.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_13.json
index 76d61e88c3c..448d0341a40 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_13.json
@@ -1 +1 @@
-"xp-TMSz6BbROrYGCOep_S9U="
\ No newline at end of file
+"xp-TMSz6BbROrYGCOep_S9U="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_14.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_14.json
index 9f15d5bc5d7..03391bef604 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_14.json
@@ -1 +1 @@
-"aXpaX2RHq2j_OujDGlQt"
\ No newline at end of file
+"aXpaX2RHq2j_OujDGlQt"
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_15.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_15.json
index 5a0d8a79783..ba9dd3c23a1 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_15.json
@@ -1 +1 @@
-"QL_kpur1eCmcmZKf87Or"
\ No newline at end of file
+"QL_kpur1eCmcmZKf87Or"
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_16.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_16.json
index 7cc90cd3070..eedc32306e6 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_16.json
@@ -1 +1 @@
-"BtfTK0X0TkdU5710gME="
\ No newline at end of file
+"BtfTK0X0TkdU5710gME="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_17.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_17.json
index f8ae7595e63..9efe8b1669d 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_17.json
@@ -1 +1 @@
-"2c3OtWcjyg=="
\ No newline at end of file
+"2c3OtWcjyg=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_18.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_18.json
index 30fc3b74ed9..bbbcacb395d 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_18.json
@@ -1 +1 @@
-"1pI="
\ No newline at end of file
+"1pI="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_19.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_19.json
index 5089f33cfb5..2bec4bcc819 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_19.json
@@ -1 +1 @@
-"0QO1c30yeQ=="
\ No newline at end of file
+"0QO1c30yeQ=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_2.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_2.json
index f22b306ac66..1588f342a10 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_2.json
@@ -1 +1 @@
-"yvuBLOmFLzk1FHpUap8x"
\ No newline at end of file
+"yvuBLOmFLzk1FHpUap8x"
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_20.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_20.json
index 8b7230d1bc7..7da9bdeda5a 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_20.json
@@ -1 +1 @@
-"MrTs72sNAmcOF4JLBtcsQQ=="
\ No newline at end of file
+"MrTs72sNAmcOF4JLBtcsQQ=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_3.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_3.json
index 10fd1a55e15..11b8e9e790c 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_3.json
@@ -1 +1 @@
-"EvM5Jn5M"
\ No newline at end of file
+"EvM5Jn5M"
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_4.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_4.json
index 28bc1ebc405..498605f3a00 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_4.json
@@ -1 +1 @@
-"OxGrorjqOUKHYSBbTILDuXp3GH0bLYd2"
\ No newline at end of file
+"OxGrorjqOUKHYSBbTILDuXp3GH0bLYd2"
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_5.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_5.json
index 59a30c4ae8a..4ab13d50208 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_5.json
@@ -1 +1 @@
-"JhhDE2fz95cZ-cRPtgNHPcBRyqS8CA=="
\ No newline at end of file
+"JhhDE2fz95cZ-cRPtgNHPcBRyqS8CA=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_6.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_6.json
index fd63728e415..6232d941e7a 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_6.json
@@ -1 +1 @@
-"Z9k5agzylBHv0J19Z0uenoE="
\ No newline at end of file
+"Z9k5agzylBHv0J19Z0uenoE="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_7.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_7.json
index 90ee70fc7fd..947524b9dfb 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_7.json
@@ -1 +1 @@
-"e99bkpy0I-QVIA8A7yRJgYWvB81Cxx3v"
\ No newline at end of file
+"e99bkpy0I-QVIA8A7yRJgYWvB81Cxx3v"
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_8.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_8.json
index e142807f623..644a8435357 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_8.json
@@ -1 +1 @@
-"9YI6jlTVs_2iAHUadQ7RPBo3bI7Sr9i0f9VXiw=="
\ No newline at end of file
+"9YI6jlTVs_2iAHUadQ7RPBo3bI7Sr9i0f9VXiw=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationCode_user_9.json b/libs/wire-api/test/golden/testObject_ActivationCode_user_9.json
index 87306f5b48b..f4945e74e20 100644
--- a/libs/wire-api/test/golden/testObject_ActivationCode_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ActivationCode_user_9.json
@@ -1 +1 @@
-"rYg="
\ No newline at end of file
+"rYg="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_1.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_1.json
index a3e6747e457..a7b5dc83f38 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_1.json
@@ -1 +1 @@
-"15uY_g6pACNmzgXy"
\ No newline at end of file
+"15uY_g6pACNmzgXy"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_10.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_10.json
index dba1acd6de5..fdc227a13f5 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_10.json
@@ -1 +1 @@
-"Q-Tg4Wl5sOubb_TT2628Y_7_7qVb"
\ No newline at end of file
+"Q-Tg4Wl5sOubb_TT2628Y_7_7qVb"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_11.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_11.json
index d6723e00c7b..3acc792a091 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_11.json
@@ -1 +1 @@
-"9kHgasEE6ljb2Z8XmXCFWiwUiw=="
\ No newline at end of file
+"9kHgasEE6ljb2Z8XmXCFWiwUiw=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_12.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_12.json
index 6c2aac5babe..61168829489 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_12.json
@@ -1 +1 @@
-"YYAuRUqFvZCEB6g="
\ No newline at end of file
+"YYAuRUqFvZCEB6g="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_13.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_13.json
index f59db1e066c..bbb40ddc6da 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_13.json
@@ -1 +1 @@
-"aAFrcaOtda8RrtQ="
\ No newline at end of file
+"aAFrcaOtda8RrtQ="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_14.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_14.json
index b32f5cd8f17..d8c3a5475e6 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_14.json
@@ -1 +1 @@
-"XSt3htt1fnRfLIZvlUkgoCdJfA=="
\ No newline at end of file
+"XSt3htt1fnRfLIZvlUkgoCdJfA=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_15.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_15.json
index c539381b88c..509bd47acdd 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_15.json
@@ -1 +1 @@
-"ANJZ"
\ No newline at end of file
+"ANJZ"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_16.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_16.json
index ed565f7ce0f..58d06c2b72b 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_16.json
@@ -1 +1 @@
-"CUg="
\ No newline at end of file
+"CUg="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_17.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_17.json
index 5042c7ee678..8240da5e2fc 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_17.json
@@ -1 +1 @@
-"c8c-Beze1OzP"
\ No newline at end of file
+"c8c-Beze1OzP"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_18.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_18.json
index 58173a437dc..c5306169bcb 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_18.json
@@ -1 +1 @@
-"3A=="
\ No newline at end of file
+"3A=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_19.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_19.json
index f83e10f6bd1..de27a6f24a9 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_19.json
@@ -1 +1 @@
-"YFGSNZuGPhdPKg_7T2DI2CszNurdqC7sxjjuOQ=="
\ No newline at end of file
+"YFGSNZuGPhdPKg_7T2DI2CszNurdqC7sxjjuOQ=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_2.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_2.json
index e57ab45be4e..331898164a2 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_2.json
@@ -1 +1 @@
-"0MrwcsDxLHCymg=="
\ No newline at end of file
+"0MrwcsDxLHCymg=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_20.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_20.json
index 5a965e6b4f3..c4108fa0678 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_20.json
@@ -1 +1 @@
-"z64wDSw3pOs7hTHHdhld"
\ No newline at end of file
+"z64wDSw3pOs7hTHHdhld"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_3.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_3.json
index a6ba705abac..5929a9ccc88 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_3.json
@@ -1 +1 @@
-"rR2dx4uT3AT0SeU8C_XQxrwW"
\ No newline at end of file
+"rR2dx4uT3AT0SeU8C_XQxrwW"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_4.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_4.json
index 082a8b495f7..5718da38118 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_4.json
@@ -1 +1 @@
-"FzQ949ghFJI7ZBVbd4zIASZ5"
\ No newline at end of file
+"FzQ949ghFJI7ZBVbd4zIASZ5"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_5.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_5.json
index f38997c489e..f4d65757440 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_5.json
@@ -1 +1 @@
-"vhW086ve4RewjSd8o_m3CC3tFBea"
\ No newline at end of file
+"vhW086ve4RewjSd8o_m3CC3tFBea"
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_6.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_6.json
index fbf21daea36..fff5acc67b3 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_6.json
@@ -1 +1 @@
-"31xP7w=="
\ No newline at end of file
+"31xP7w=="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_7.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_7.json
index 3cc762b5501..e16c76dff88 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_7.json
@@ -1 +1 @@
-""
\ No newline at end of file
+""
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_8.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_8.json
index fa718d48976..ec98ff4230e 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_8.json
@@ -1 +1 @@
-"Ggj1BK4="
\ No newline at end of file
+"Ggj1BK4="
diff --git a/libs/wire-api/test/golden/testObject_ActivationKey_user_9.json b/libs/wire-api/test/golden/testObject_ActivationKey_user_9.json
index 86f0971e3cf..7d8c0a67e36 100644
--- a/libs/wire-api/test/golden/testObject_ActivationKey_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ActivationKey_user_9.json
@@ -1 +1 @@
-"2a8zyNgB"
\ No newline at end of file
+"2a8zyNgB"
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_1.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_1.json
index 84eebb02818..e251aaad090 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_1.json
@@ -5,4 +5,4 @@
         "subject": "\u001e",
         "tenant": ""
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_10.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_10.json
index 2d4dec7ea0b..b98164f3fec 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_10.json
@@ -1,4 +1,4 @@
 {
     "email": "\u00063@\u000c󾇏􅞻\u0004󴼐P",
     "first": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_11.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_11.json
index aa5de97d85f..0bf669c594a 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_11.json
@@ -1,4 +1,4 @@
 {
     "email": "z𞴆m𣩙<󿜔\u0007\u00131+*@S\u000e𞢺",
     "first": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_12.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_12.json
index 174cb632252..47f6b8ac444 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_12.json
@@ -1,4 +1,4 @@
 {
     "email": "d4p\r:\u0002I5𨼕𦰗\u001d\u000b@잱𘩁",
     "first": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_13.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_13.json
index e9e6298733b..770e9392b4f 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_13.json
@@ -1,7 +1,7 @@
 {
-    "phone": "+6124426658",
     "first": false,
+    "phone": "+6124426658",
     "sso_id": {
         "scim_external_id": "#"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_14.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_14.json
index b3bbfbdb6ad..1b077755215 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_14.json
@@ -4,4 +4,4 @@
     "sso_id": {
         "scim_external_id": "\u0000\u001f\u0017Y"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_15.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_15.json
index 21fe5ae30e3..8e397920327 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_15.json
@@ -1,4 +1,4 @@
 {
-    "phone": "+594453349310",
-    "first": false
-}
\ No newline at end of file
+    "first": false,
+    "phone": "+594453349310"
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_16.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_16.json
index 5bfde1d63a9..ec6bbd590bd 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_16.json
@@ -1,5 +1,5 @@
 {
     "email": "r\u001c,\"@%R\n𨍅^",
-    "phone": "+144713467",
-    "first": false
-}
\ No newline at end of file
+    "first": false,
+    "phone": "+144713467"
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_17.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_17.json
index b9586e4493e..6456e1d548e 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_17.json
@@ -1,8 +1,8 @@
 {
     "email": "𥸇@+)",
-    "phone": "+703448141",
     "first": true,
+    "phone": "+703448141",
     "sso_id": {
         "scim_external_id": ""
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_18.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_18.json
index 2020f573012..e48c50a18c1 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_18.json
@@ -1,4 +1,4 @@
 {
-    "phone": "+974462685543005",
-    "first": true
-}
\ No newline at end of file
+    "first": true,
+    "phone": "+974462685543005"
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_19.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_19.json
index 7b4148ad757..f4ad262a308 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_19.json
@@ -5,4 +5,4 @@
         "subject": "",
         "tenant": ""
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_2.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_2.json
index 2d636f7788b..03b9bf0eda7 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_2.json
@@ -1,4 +1,4 @@
 {
-    "phone": "+7397347696479",
-    "first": false
-}
\ No newline at end of file
+    "first": false,
+    "phone": "+7397347696479"
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_20.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_20.json
index 97f74f78bb2..8632977b231 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_20.json
@@ -1,5 +1,5 @@
 {
     "email": "@E",
-    "phone": "+73148778831190",
-    "first": false
-}
\ No newline at end of file
+    "first": false,
+    "phone": "+73148778831190"
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_3.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_3.json
index 348dd6a4ad8..06c370721d9 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_3.json
@@ -1,4 +1,4 @@
 {
     "email": "✯*;'R\u0019\u000f󼇭󾌏@Gw:[T8蚅",
     "first": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_4.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_4.json
index 4a5ea6ba93c..93dce573572 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_4.json
@@ -1,5 +1,5 @@
 {
     "email": "h\nPr3@",
-    "phone": "+82309287",
-    "first": true
-}
\ No newline at end of file
+    "first": true,
+    "phone": "+82309287"
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_5.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_5.json
index 49e44c0520f..f49cd246eb0 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_5.json
@@ -1,4 +1,4 @@
 {
     "email": "7󾚲m𗑀\u0008􌐍@AJX*s&𪐽󱛆p",
     "first": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_6.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_6.json
index d4e6d8681b4..3a3ade7e9ef 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_6.json
@@ -3,4 +3,4 @@
     "sso_id": {
         "scim_external_id": "\u0007n|"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_7.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_7.json
index 943433a54a6..1ffefc7f84b 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_7.json
@@ -1,4 +1,4 @@
 {
     "email": "𘅮@",
     "first": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_8.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_8.json
index 84857fc2301..513dc4fb48e 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_8.json
@@ -1,4 +1,4 @@
 {
-    "phone": "+0023160115015",
-    "first": true
-}
\ No newline at end of file
+    "first": true,
+    "phone": "+0023160115015"
+}
diff --git a/libs/wire-api/test/golden/testObject_ActivationResponse_user_9.json b/libs/wire-api/test/golden/testObject_ActivationResponse_user_9.json
index 845b9ad5ea6..0d2dac853ad 100644
--- a/libs/wire-api/test/golden/testObject_ActivationResponse_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ActivationResponse_user_9.json
@@ -1,5 +1,5 @@
 {
     "email": "\u0005?@",
-    "phone": "+208573659013",
-    "first": false
-}
\ No newline at end of file
+    "first": false,
+    "phone": "+208573659013"
+}
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_1.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_1.json
index ca039b97f36..b3d6a462f5f 100644
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AddBotResponse_user_1.json
@@ -1,34 +1,34 @@
 {
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000001-0000-0000-0000-000200000003"
+    "accent_id": -3,
+    "assets": [
+        {
+            "key": "7",
+            "type": "image"
         },
+        {
+            "key": "",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "client": "e",
+    "event": {
         "conversation": "00000001-0000-0000-0000-000200000003",
-        "time": "1864-05-12T19:20:22.286Z",
         "data": {
             "name": "6"
         },
         "from": "00000004-0000-0004-0000-000400000004",
+        "qualified_conversation": {
+            "domain": "faraway.example.com",
+            "id": "00000001-0000-0000-0000-000200000003"
+        },
         "qualified_from": {
             "domain": "faraway.example.com",
             "id": "00000004-0000-0004-0000-000400000004"
         },
+        "time": "1864-05-12T19:20:22.286Z",
         "type": "conversation.rename"
     },
-    "accent_id": -3,
-    "name": "𓀔🦼A􃃠皝𢬐鿖\u001fc\u0013~0g\u0005r\u000b環\u000c𥫁􆾌u𪽄.󸨻v\u000b-/\u0008i\u0008J\u0003E3\u001b8텭􅾌0@㢂쨕;槩\u0016𥛉\u0008&\u0007e]󾠧H󺈫k7\u0019J􈣾[;𢕼;J^`0,B\u0002𗑹N.@Z\u000b\u0005\r䶒|'w-\u0008𦛸V\u0002 \u001dW|N􅻒3=堖K245\u0011𢷓𩌎ᰀ𣾥\u0003",
     "id": "00000003-0000-0004-0000-000300000001",
-    "assets": [
-        {
-            "key": "7",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "e"
-}
\ No newline at end of file
+    "name": "𓀔🦼A􃃠皝𢬐鿖\u001fc\u0013~0g\u0005r\u000b環\u000c𥫁􆾌u𪽄.󸨻v\u000b-/\u0008i\u0008J\u0003E3\u001b8텭􅾌0@㢂쨕;槩\u0016𥛉\u0008&\u0007e]󾠧H󺈫k7\u0019J􈣾[;𢕼;J^`0,B\u0002𗑹N.@Z\u000b\u0005\r䶒|'w-\u0008𦛸V\u0002 \u001dW|N􅻒3=堖K245\u0011𢷓𩌎ᰀ𣾥\u0003"
+}
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_10.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_10.json
deleted file mode 100644
index 474127089a5..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_10.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000002-0000-0004-0000-000400000001"
-        },
-        "conversation": "00000002-0000-0004-0000-000400000001",
-        "time": "1864-05-04T10:22:33.842Z",
-        "data": {
-            "user_ids": [],
-            "qualified_user_ids": []
-        },
-        "from": "00000002-0000-0001-0000-000200000000",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000002-0000-0001-0000-000200000000"
-        },
-        "type": "conversation.member-leave"
-    },
-    "accent_id": 3,
-    "name": "e1\u0010𥥩3𧶂2􍜵h!1Tr𗫡\u000c;\u0014\u0017v\u000b󻏄\u0008i𦃣<j󰂯\u0013󷵣\u001a{󹦚\u0001𪔪𣆦h紴@8|:#\u00100🛹P.zl\u0008@𤙫(Z\u000bᱝ癖𦋴\u000eI/LLn|巰6X\u0008fjL\u0013\u0000𗶝󾬤G\u0018𗂄\u0010\u001a󻷞󺷡\u0014.󹆖\u001eUZ􉸤􆊁Nh\u0017󼋺y)􆌒 !\u0007x􅖛\u0013x󹔦cF#\u0019\u0017\u000c粊",
-    "id": "00000000-0000-0003-0000-000400000000",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "^⥋",
-            "type": "image"
-        }
-    ],
-    "client": "10"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_11.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_11.json
deleted file mode 100644
index 379f4faf645..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_11.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0003-0000-000300000004"
-        },
-        "conversation": "00000000-0000-0003-0000-000300000004",
-        "time": "1864-05-04T14:10:34.032Z",
-        "data": {
-            "access": [
-                "code"
-            ],
-            "access_role": "activated"
-        },
-        "from": "00000003-0000-0003-0000-000100000000",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0003-0000-000100000000"
-        },
-        "type": "conversation.access-update"
-    },
-    "accent_id": 0,
-    "name": "+H$M\u0014'K03\\w𗵱󻰍􈳺볦(e󿢲\n􇴓\u000e\u0015-9fu~\u0011\u001c𧄕􏥌\th^\u0004v쒂#9b\u001d\"u􅏦\u0010󼄿y𝍧Qn8𩜗󽳄5Q󹇤𩌮征\\󽂇3l𝈒`\u0011@+\u001ed!󼵭axx𦁅󸫯ᒘ\u001do􄝿f\u001d\u0003jrC\u0012Pk",
-    "id": "00000003-0000-0000-0000-000200000001",
-    "assets": [],
-    "client": "c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_12.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_12.json
deleted file mode 100644
index 4c66fd54cdf..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_12.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0000-0000-000200000000"
-        },
-        "conversation": "00000003-0000-0000-0000-000200000000",
-        "time": "1864-05-05T01:06:47.245Z",
-        "data": {
-            "email": "\u0003",
-            "name": null,
-            "message": "",
-            "recipient": "00000000-0000-0000-0000-000000000000"
-        },
-        "from": "00000001-0000-0001-0000-000100000002",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000001-0000-0001-0000-000100000002"
-        },
-        "type": "conversation.connect-request"
-    },
-    "accent_id": -4,
-    "name": "羈Q2\r.+𣏌\u0000'Wm)U|X.𬶒\u0019m\u0002u\u0015𩁀4G3>k",
-    "id": "00000000-0000-0004-0000-000200000003",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "\u0011",
-            "type": "image"
-        }
-    ],
-    "client": "5"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_13.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_13.json
deleted file mode 100644
index ee3437a0ad4..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_13.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0003-0000-000100000001"
-        },
-        "conversation": "00000000-0000-0003-0000-000100000001",
-        "time": "1864-05-13T05:09:37.371Z",
-        "data": {
-            "receipt_mode": 3
-        },
-        "from": "00000004-0000-0001-0000-000400000002",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000004-0000-0001-0000-000400000002"
-        },
-        "type": "conversation.receipt-mode-update"
-    },
-    "accent_id": -1,
-    "name": "k퍴㤁u<svb\u001d\u001c􏉋aA>􉚗.\u001bOR&@i>ᚓ2䈈F=\u0014N􉁇!8\u0012毀\u0019\u001d\u0001􃥓𨮊JuD\u0006\u000fg]\u0016Z\u001c\u0013󼇍4&𭘯F7f􎌻n\n~X\u0000^A\u0010\\󾼃=\u0018.<\u0019zR\n\u001dK􉃦\u001d𭕤󳿃\u000c\u0002!𗁴^\u0008h􊩪?ኒ𢟹\u001dF󷋯􉃆{\u001b>$書\u0001R􏈣-#U𠋍􄵹9",
-    "id": "00000004-0000-0002-0000-000100000003",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "9"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_14.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_14.json
deleted file mode 100644
index fc44e3ac0f9..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_14.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000001-0000-0004-0000-000000000004"
-        },
-        "conversation": "00000001-0000-0004-0000-000000000004",
-        "time": "1864-05-13T06:48:06.601Z",
-        "data": {
-            "hidden_ref": "",
-            "conversation_role": "xlbj5ajmu4ece6fb70ff1wioos7qm8rgg5aenk8eer",
-            "hidden": true,
-            "otr_archived": true,
-            "otr_muted_status": -1,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "from": "00000000-0000-0000-0000-000200000001",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0000-0000-000200000001"
-        },
-        "type": "conversation.member-update"
-    },
-    "accent_id": 4,
-    "name": "\u0010f诎6bڃ􂯀i\u0003\"\r􅣖 􀱓\r􊇐R珷v𢚈fh^'􍽱\u001e\u0005􉨦[e\nG󴰐􇡵󽠷{\u0006^􃰡Gt𤳞DUFa󵾠\u000cn6xm7T\u0017`{ 2\rN0F󾛌y󳕬!+\u0010\u0002\u0019!f~\tu\u0016􊏝i􆟡\u0012k🨮\u0000P\n1k퀎0HS s}\u0011pG\u001e\u0012<􎆓n,\u001b_㷭ta𫧩",
-    "id": "00000004-0000-0004-0000-000000000004",
-    "assets": [],
-    "client": "8"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_15.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_15.json
deleted file mode 100644
index d78f7d2ab6c..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_15.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000002-0000-0001-0000-000100000000"
-        },
-        "conversation": "00000002-0000-0001-0000-000100000000",
-        "time": "1864-05-11T04:21:51.377Z",
-        "data": {
-            "users": [
-                {
-                    "conversation_role": "uk7gwif0crc3wgiak6qae948ny57lwbwbtgbhran16vnewvp10eqialhaq9m38bqbczm_17nl46lhxs3h2cf448_7zcazh1f4ao8gnrzutbhd29j_lvsz",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000002-0000-0002-0000-000200000001"
-                    },
-                    "id": "00000002-0000-0002-0000-000200000001"
-                },
-                {
-                    "conversation_role": "il2dfqczvqqvs3vcob7t6t7zi61y4hxgxmmpp19ueznkasq5q1cssn72l5df92b64yuqsizc6up2p1270hu18t97oifzl",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000000-0000-0000-0000-000000000001"
-                    },
-                    "id": "00000000-0000-0000-0000-000000000001"
-                },
-                {
-                    "conversation_role": "jf7f75hkum6_zxqiabxu8zix2_1kutsjijedcjckapwmymcxx11",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000001-0000-0000-0000-000000000002"
-                    },
-                    "id": "00000001-0000-0000-0000-000000000002"
-                },
-                {
-                    "conversation_role": "i700417q9qqygs5k5a0zvvnpkvg2jimgi_stuyzfxgokyvy05n3_vgikqr0t5ldsb5fvltb8pylb",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000001-0000-0001-0000-000000000002"
-                    },
-                    "id": "00000001-0000-0001-0000-000000000002"
-                }
-            ],
-            "user_ids": [
-                "00000002-0000-0002-0000-000200000001",
-                "00000000-0000-0000-0000-000000000001",
-                "00000001-0000-0000-0000-000000000002",
-                "00000001-0000-0001-0000-000000000002"
-            ]
-        },
-        "from": "00000003-0000-0001-0000-000200000003",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0001-0000-000200000003"
-        },
-        "type": "conversation.member-join"
-    },
-    "accent_id": -4,
-    "name": "Y􃋤(\u0010<|O𫬸ZM0$t~\u0014󰹨󵁑Z*A/iOYx󼼅MhVOS𮓈1>%!\u0018nE4𩧡@o/𘀧󾴺🞗a󷕣.7􉏛翤󿾢< '!􁻄Z \u0000Y\u000cUp𠐈0󴡈r𦞻󹖩<?E0@▢U-〇\u0015\u0019🌝C#-q>I􃤥",
-    "id": "00000002-0000-0004-0000-000100000003",
-    "assets": [
-        {
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_16.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_16.json
deleted file mode 100644
index 65f6171e9b4..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_16.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000004-0000-0003-0000-000200000000"
-        },
-        "conversation": "00000004-0000-0003-0000-000200000000",
-        "time": "1864-05-07T11:54:38.133Z",
-        "data": {
-            "name": "𑩣)@䉉"
-        },
-        "from": "00000000-0000-0000-0000-000200000001",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0000-0000-000200000001"
-        },
-        "type": "conversation.rename"
-    },
-    "accent_id": 1,
-    "name": "x[rw<J&rN?ཉ萺:𠹮􊅋P𬬥\u001cu\"v󻉗􉂺yh𖭾1􉷪pt>𑠷\u001a󾲡󱧍9InR <!\u001f\u0005\u000enlp\u0001󳕺􅆾ၞ''󳾛wN\u0007\u001d󼝃\\𭂎쩘0\u001d",
-    "id": "00000000-0000-0002-0000-000300000000",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "10"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_17.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_17.json
deleted file mode 100644
index 50744a3e747..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_17.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0002-0000-000100000002"
-        },
-        "conversation": "00000003-0000-0002-0000-000100000002",
-        "time": "1864-05-09T16:18:32.395Z",
-        "data": {
-            "access": [
-                "private",
-                "link",
-                "code",
-                "link"
-            ],
-            "access_role": "non_activated"
-        },
-        "from": "00000003-0000-0000-0000-000400000001",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0000-0000-000400000001"
-        },
-        "type": "conversation.access-update"
-    },
-    "accent_id": -2,
-    "name": "5􉩞􈐄\u000b\u0006h숮TMp𢤃Q\u0010\r7\u0016\u001c􆀢󶷽.",
-    "id": "00000002-0000-0002-0000-000200000000",
-    "assets": [],
-    "client": "5"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_18.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_18.json
deleted file mode 100644
index d369613588e..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_18.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        "conversation": "00000000-0000-0001-0000-000100000001",
-        "time": "1864-05-13T04:14:10.186Z",
-        "data": {
-            "name": "+S󲱱x1"
-        },
-        "from": "00000001-0000-0002-0000-000000000003",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000001-0000-0002-0000-000000000003"
-        },
-        "type": "conversation.rename"
-    },
-    "accent_id": 1,
-    "name": "w\u0006􍊫l\u0001yL1\u0006/\u0000J&\rdp􁵷ᩞD[2\"\\,{\u001b􉩪\u000e󹺺\u000b0躉\u0000L􁺤u\u0015Y\u0003㮒\u000f46𤼿#\u001dl𘝩\u0013'vĽ𗑚\u0007P`",
-    "id": "00000004-0000-0003-0000-000300000003",
-    "assets": [
-        {
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "5"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_19.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_19.json
deleted file mode 100644
index da627fc162a..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_19.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0003-0000-000000000000"
-        },
-        "conversation": "00000003-0000-0003-0000-000000000000",
-        "time": "1864-05-14T03:03:50.569Z",
-        "data": null,
-        "from": "00000004-0000-0003-0000-000400000002",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000004-0000-0003-0000-000400000002"
-        },
-        "type": "conversation.code-delete"
-    },
-    "accent_id": 3,
-    "name": "4\u0007\u001ctZ7UW57욓5\u0008汞\u0017J\u001dE~>~\u001c%^𠞲顃u\u0019\u001f",
-    "id": "00000004-0000-0001-0000-000400000002",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "􈏖",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_2.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_2.json
index 558e4aee975..d126534fb8a 100644
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AddBotResponse_user_2.json
@@ -1,24 +1,24 @@
 {
+    "accent_id": 3,
+    "assets": [],
+    "client": "e",
     "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0002-0000-000300000001"
-        },
         "conversation": "00000000-0000-0002-0000-000300000001",
-        "time": "1864-05-08T19:02:58.600Z",
         "data": {
             "status": "started"
         },
         "from": "00000004-0000-0000-0000-000300000001",
+        "qualified_conversation": {
+            "domain": "faraway.example.com",
+            "id": "00000000-0000-0002-0000-000300000001"
+        },
         "qualified_from": {
             "domain": "faraway.example.com",
             "id": "00000004-0000-0000-0000-000300000001"
         },
+        "time": "1864-05-08T19:02:58.600Z",
         "type": "conversation.typing"
     },
-    "accent_id": 3,
-    "name": "𧲅t\\\u0012쳄Jn􄿪󳦝t!\u001b\u0002󶚐~jP]}|8􎎃⭨\u0016R󰡩8H􁷞\u0017L𮖾V𘑩Q󷢱𠣇\u0004M\u0014kc\u0007 V",
     "id": "00000001-0000-0003-0000-000200000004",
-    "assets": [],
-    "client": "e"
-}
\ No newline at end of file
+    "name": "𧲅t\\\u0012쳄Jn􄿪󳦝t!\u001b\u0002󶚐~jP]}|8􎎃⭨\u0016R󰡩8H􁷞\u0017L𮖾V𘑩Q󷢱𠣇\u0004M\u0014kc\u0007 V"
+}
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_20.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_20.json
deleted file mode 100644
index 7f87a8c75e7..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_20.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0002-0000-000200000004"
-        },
-        "conversation": "00000003-0000-0002-0000-000200000004",
-        "time": "1864-05-08T05:48:34.348Z",
-        "data": {
-            "message_timer": 3346692440762670
-        },
-        "from": "00000002-0000-0003-0000-000200000004",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000002-0000-0003-0000-000200000004"
-        },
-        "type": "conversation.message-timer-update"
-    },
-    "accent_id": -1,
-    "name": "hn<t\u001bF􀑬1⇀󷡯\rHo꒦2il+𥳍%E󹹭痘q𑊩6\u0014-x\u001b\u000c\rf縷钊e6=󺮙x亸䝭󷤃􏊢\"쩩\u0010뷐琎Uty+?[#R󶧯<<娆9󰀯\u0002P\u001ah\u0013\t\u0007\u000f\u000f[@\\\".\u001b𥗮;􌍦𦔻􃢿^D3!dVo:\"wM\u0017",
-    "id": "00000004-0000-0004-0000-000000000001",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "』",
-            "type": "image"
-        }
-    ],
-    "client": "b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_3.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_3.json
deleted file mode 100644
index 75f9ca44dfd..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_3.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0001-0000-000000000003"
-        },
-        "conversation": "00000000-0000-0001-0000-000000000003",
-        "time": "1864-05-10T11:22:13.523Z",
-        "data": {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "fcwhpxsjc",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000",
-            "type": 0,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 2172415561652216,
-            "last_event": "0.0"
-        },
-        "from": "00000000-0000-0004-0000-000400000004",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0004-0000-000400000004"
-        },
-        "type": "conversation.create"
-    },
-    "accent_id": 0,
-    "name": "%}\u000f𭽘U?;4a󰺢𨢵u\u0017y@\u0008?\".\u0001\"[𣍾𥧍1o)q\u001a<S\u0011󸟌\u0003\u0014𣘕VV/D9ec\u0001*𩒳oTf&(Q",
-    "id": "00000003-0000-0001-0000-000400000002",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "d"
-}
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_4.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_4.json
deleted file mode 100644
index 865ba77d74b..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_4.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0002-0000-000300000003"
-        },
-        "conversation": "00000003-0000-0002-0000-000300000003",
-        "time": "1864-05-06T03:03:10.788Z",
-        "data": null,
-        "from": "00000001-0000-0002-0000-000300000001",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000001-0000-0002-0000-000300000001"
-        },
-        "type": "conversation.delete"
-    },
-    "accent_id": -4,
-    "name": "M𭎟􏴏K2(\u0012\u00047>𢽓𩥗\r5w󾋚\u001ecH􅠽𢫌D\u001b\u0004􊊇􌓿PE!󽌔c𥟛~",
-    "id": "00000002-0000-0000-0000-000000000003",
-    "assets": [],
-    "client": "9"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_5.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_5.json
deleted file mode 100644
index f6bf1158bc8..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_5.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0001-0000-000000000001"
-        },
-        "conversation": "00000000-0000-0001-0000-000000000001",
-        "time": "1864-05-13T21:19:26.488Z",
-        "data": {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000000000000",
-                        "provider": "00000001-0000-0001-0000-000000000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "hnsnsqy4arvtd_u4_4_ewxmjtsbbrjsrhg1h2hy2uzwj8552_ql7ds_vo67fqw3wxue4_8ixydv3ao5w91_6_",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000",
-            "type": 0,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7052633912967928,
-            "last_event": "0.0"
-        },
-        "from": "00000001-0000-0004-0000-000000000002",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000001-0000-0004-0000-000000000002"
-        },
-        "type": "conversation.create"
-    },
-    "accent_id": -4,
-    "name": "􄰸􌓫x􂣳𛇆󸚞\\MpIc􈦈􅻵y􉲋w𬗁󺞲󠄬\u0010ES5\u0005􎸵\u0006P\tAx\u0016*k󼞯󷈪M𫻳f\u0017MF𠿺q\u001a𭜠Zf𓉐耖\u0018錨DB􈽀𩽙\u0013[뒹!􇌄V(\u001cp􄸩F4Xwp#􈽡TJ2\u0013を􅼫󺄞U&\rG􏜃h$R\rsL󳫿\nz󶒔\u0003B",
-    "id": "00000003-0000-0003-0000-000100000000",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "e"
-}
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_6.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_6.json
deleted file mode 100644
index 2e3cb265b6d..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_6.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0001-0000-000000000003"
-        },
-        "conversation": "00000003-0000-0001-0000-000000000003",
-        "time": "1864-05-14T23:40:44.551Z",
-        "data": {
-            "uri": "https://example.com",
-            "key": "ljLPNBdwXBNph6csPBYc",
-            "code": "3A16c3OyeYqqLqhHKwZ"
-        },
-        "from": "00000002-0000-0004-0000-000300000001",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000002-0000-0004-0000-000300000001"
-        },
-        "type": "conversation.code-update"
-    },
-    "accent_id": -1,
-    "name": "󴅟.\u0000\u001c{\u0005􅯏f鷢.u\u001a\u0014-0BK\u000f\u00171k𤶳􆛻檽l13As詼NY􄶕\u000eD𡲲A6qS\u00176𭢎\u0017𢗚P\u0001=qz:報|H\u000e+B􌹀􉪽􎓔󵴠󻹘󵥀\u0007𧨯QA𢭽&􂝦)\u001f7\u0013>'Sl.=􇰲\u0006󹖉\u000cO󲢡oI󴤁\tb􊁧Zg\u001e𫺜􃏁YX􁄑.􃻰Q𬐌󴗰-𮢕",
-    "id": "00000001-0000-0000-0000-000300000004",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "i",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_7.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_7.json
deleted file mode 100644
index 6968428bbfd..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_7.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000000-0000-0004-0000-000300000004"
-        },
-        "conversation": "00000000-0000-0004-0000-000300000004",
-        "time": "1864-05-07T22:30:05.775Z",
-        "data": {
-            "receipt_mode": -4
-        },
-        "from": "00000003-0000-0001-0000-000400000001",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000003-0000-0001-0000-000400000001"
-        },
-        "type": "conversation.receipt-mode-update"
-    },
-    "accent_id": -4,
-    "name": "q\u0000+󹱪{-􀡧h󲹍3􊓶𥂘&@jZqjW每\u0010\u000f󳠕鞖\rZ􉾼\n\u0018􍣟\u0011l󻫟𥢎􃠿<`N nX?󱂧+h.\u0001󻡤OhO9qy􍸆@𪧳㥮􍂜\u000ctrG􆙶?]􃹚\u001e\u0000u.AA =9H5H2YJ𡐍a",
-    "id": "00000000-0000-0003-0000-000300000000",
-    "assets": [],
-    "client": "c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_8.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_8.json
deleted file mode 100644
index 290302c008f..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_8.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000001-0000-0000-0000-000200000003"
-        },
-        "conversation": "00000001-0000-0000-0000-000200000003",
-        "time": "1864-05-05T09:04:05.078Z",
-        "data": {
-            "access": [
-                "link",
-                "private"
-            ],
-            "access_role": "activated"
-        },
-        "from": "00000004-0000-0000-0000-000400000000",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000004-0000-0000-0000-000400000000"
-        },
-        "type": "conversation.access-update"
-    },
-    "accent_id": 0,
-    "name": "as𗤍F\t\u0003\u000frPx7\u0007m\u000f;󰜬\"𢳁5\u000f \u0012=\u000e􋨱𫭗𖡂C\u001b\u00074I\u0002𨤯Kw\u0001*𥛒𦮦𨽘\u001d󸸔5X󻃄`",
-    "id": "00000000-0000-0002-0000-000400000003",
-    "assets": [],
-    "client": "f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBotResponse_user_9.json b/libs/wire-api/test/golden/testObject_AddBotResponse_user_9.json
deleted file mode 100644
index 62435ec6e26..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBotResponse_user_9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000002-0000-0004-0000-000000000004"
-        },
-        "conversation": "00000002-0000-0004-0000-000000000004",
-        "time": "1864-05-07T17:13:06.966Z",
-        "data": {
-            "hidden_ref": "",
-            "otr_muted_ref": "",
-            "conversation_role": "eivv0nnmraefi0496_5lyptwgu4jl",
-            "hidden": true,
-            "otr_archived": false,
-            "otr_muted_status": -1,
-            "otr_muted": false,
-            "otr_archived_ref": "",
-            "target": "00000001-0000-0000-0000-000000000001"
-        },
-        "from": "00000002-0000-0002-0000-000100000002",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00000002-0000-0002-0000-000100000002"
-        },
-        "type": "conversation.member-update"
-    },
-    "accent_id": 2,
-    "name": "1\u00155੶\"9Vz󸅣^𮅆^󿨟Q.lx𘠢󹎇O\u0007+d=-}j3􇀠罥w[𡨓𫤅p􍵢~5\u0003󶧄)黻T$N𥵉v\u000b{?\u0015􃐋𘤰菤mm􊹊Z쿈󶵱:󱈍78S\u0014'\u0016\u0002g\r}\u0007ﯓq%",
-    "id": "00000000-0000-0003-0000-000200000000",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "client": "8"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_1.json b/libs/wire-api/test/golden/testObject_AddBot_user_1.json
index efc76bd5ba3..e2b1abe8530 100644
--- a/libs/wire-api/test/golden/testObject_AddBot_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AddBot_user_1.json
@@ -1,4 +1,4 @@
 {
-    "service": "00000010-0000-000c-0000-001800000010",
-    "provider": "00000015-0000-0010-0000-00110000000d"
-}
\ No newline at end of file
+    "provider": "00000015-0000-0010-0000-00110000000d",
+    "service": "00000010-0000-000c-0000-001800000010"
+}
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_10.json b/libs/wire-api/test/golden/testObject_AddBot_user_10.json
deleted file mode 100644
index b196a8f78b1..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_10.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000000-0000-000e-0000-00000000001d",
-    "locale": "pt-MR",
-    "provider": "0000000f-0000-0016-0000-002000000010"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_11.json b/libs/wire-api/test/golden/testObject_AddBot_user_11.json
deleted file mode 100644
index 64e56a953b2..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_11.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000001e-0000-0004-0000-00080000000e",
-    "locale": "so-DK",
-    "provider": "0000000a-0000-0015-0000-00030000000c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_12.json b/libs/wire-api/test/golden/testObject_AddBot_user_12.json
deleted file mode 100644
index feed9c965d6..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_12.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000011-0000-000a-0000-000d0000001d",
-    "locale": "sd-BV",
-    "provider": "00000001-0000-0011-0000-001500000015"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_13.json b/libs/wire-api/test/golden/testObject_AddBot_user_13.json
deleted file mode 100644
index f849c627d8c..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_13.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000016-0000-001e-0000-001d00000019",
-    "locale": "eu",
-    "provider": "00000019-0000-001a-0000-001800000009"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_14.json b/libs/wire-api/test/golden/testObject_AddBot_user_14.json
deleted file mode 100644
index f016b98321f..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_14.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000016-0000-000d-0000-000800000003",
-    "locale": "aa-IQ",
-    "provider": "0000001e-0000-0008-0000-001b00000014"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_15.json b/libs/wire-api/test/golden/testObject_AddBot_user_15.json
deleted file mode 100644
index 5ec5829cc7f..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_15.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000017-0000-001e-0000-00020000001d",
-    "locale": "nb-TR",
-    "provider": "00000006-0000-000c-0000-00180000000a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_16.json b/libs/wire-api/test/golden/testObject_AddBot_user_16.json
deleted file mode 100644
index af889c2e623..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_16.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000000d-0000-001e-0000-001000000007",
-    "locale": "bs-MU",
-    "provider": "0000001f-0000-001b-0000-000c00000008"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_17.json b/libs/wire-api/test/golden/testObject_AddBot_user_17.json
deleted file mode 100644
index c162504459a..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_17.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000001a-0000-0013-0000-001600000014",
-    "locale": "mn-EC",
-    "provider": "00000020-0000-001a-0000-001600000004"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_18.json b/libs/wire-api/test/golden/testObject_AddBot_user_18.json
deleted file mode 100644
index 1e2ff19e087..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_18.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000001a-0000-0003-0000-00020000001e",
-    "locale": "ki-TD",
-    "provider": "0000001e-0000-0005-0000-00010000001e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_19.json b/libs/wire-api/test/golden/testObject_AddBot_user_19.json
deleted file mode 100644
index af59f453e11..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_19.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000000f-0000-0005-0000-001d00000007",
-    "locale": "az-DJ",
-    "provider": "00000019-0000-0014-0000-000c0000000f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_2.json b/libs/wire-api/test/golden/testObject_AddBot_user_2.json
index de11800aecb..1e9a4399a91 100644
--- a/libs/wire-api/test/golden/testObject_AddBot_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AddBot_user_2.json
@@ -1,5 +1,5 @@
 {
-    "service": "00000005-0000-0018-0000-000600000005",
     "locale": "uz-GR",
-    "provider": "00000000-0000-0014-0000-00060000001e"
-}
\ No newline at end of file
+    "provider": "00000000-0000-0014-0000-00060000001e",
+    "service": "00000005-0000-0018-0000-000600000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_20.json b/libs/wire-api/test/golden/testObject_AddBot_user_20.json
deleted file mode 100644
index 020421149ee..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_20.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000010-0000-0014-0000-000600000016",
-    "locale": "kv-BN",
-    "provider": "0000000f-0000-0003-0000-001400000006"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_3.json b/libs/wire-api/test/golden/testObject_AddBot_user_3.json
deleted file mode 100644
index a6269c6a716..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_3.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000000-0000-000b-0000-000000000017",
-    "locale": "az-LI",
-    "provider": "0000001d-0000-0009-0000-001f0000000f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_4.json b/libs/wire-api/test/golden/testObject_AddBot_user_4.json
deleted file mode 100644
index 49b960bd1a7..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_4.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "service": "0000001d-0000-0005-0000-001500000019",
-    "provider": "00000012-0000-001a-0000-000d0000001c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_5.json b/libs/wire-api/test/golden/testObject_AddBot_user_5.json
deleted file mode 100644
index 5e0dbc3ede9..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_5.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000000b-0000-0005-0000-00060000001a",
-    "locale": "kv",
-    "provider": "00000001-0000-0013-0000-001500000020"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_6.json b/libs/wire-api/test/golden/testObject_AddBot_user_6.json
deleted file mode 100644
index e44e4a997ed..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_6.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000001d-0000-0002-0000-000e00000001",
-    "locale": "ba-PW",
-    "provider": "0000000d-0000-001e-0000-000b00000003"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_7.json b/libs/wire-api/test/golden/testObject_AddBot_user_7.json
deleted file mode 100644
index c5414859ef8..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_7.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "00000001-0000-0004-0000-000a00000011",
-    "locale": "tk-GU",
-    "provider": "0000001c-0000-000e-0000-001700000018"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_8.json b/libs/wire-api/test/golden/testObject_AddBot_user_8.json
deleted file mode 100644
index 107e1e2fb03..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_8.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000001a-0000-0009-0000-001200000019",
-    "locale": "sm-MK",
-    "provider": "00000020-0000-0018-0000-00180000000c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AddBot_user_9.json b/libs/wire-api/test/golden/testObject_AddBot_user_9.json
deleted file mode 100644
index ae5a184d0f5..00000000000
--- a/libs/wire-api/test/golden/testObject_AddBot_user_9.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service": "0000001b-0000-000b-0000-000500000007",
-    "locale": "ug-LR",
-    "provider": "00000000-0000-0019-0000-000f00000012"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_1.json b/libs/wire-api/test/golden/testObject_AppName_user_1.json
index 349bc26e5f8..29552b29e97 100644
--- a/libs/wire-api/test/golden/testObject_AppName_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AppName_user_1.json
@@ -1 +1 @@
-"媠t𭔇p+`\n􉙐KZ^Mn͓󳟊Cb\u0005\u0018𤟞m"
\ No newline at end of file
+"媠t𭔇p+`\n􉙐KZ^Mn͓󳟊Cb\u0005\u0018𤟞m"
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_10.json b/libs/wire-api/test/golden/testObject_AppName_user_10.json
deleted file mode 100644
index 98292e07bad..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"R\u0004\\N收t⁔u􃘒"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_11.json b/libs/wire-api/test/golden/testObject_AppName_user_11.json
deleted file mode 100644
index ad1f52a1619..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"!i3dW𡪤%󹝁𡳱.\u0013;\u0013푖I\u0019cP\u000cD"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_12.json b/libs/wire-api/test/golden/testObject_AppName_user_12.json
deleted file mode 100644
index bbad4ea3033..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"6>"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_13.json b/libs/wire-api/test/golden/testObject_AppName_user_13.json
deleted file mode 100644
index 4757a1ecd64..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"dLꒅBbAr6H_\t"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_14.json b/libs/wire-api/test/golden/testObject_AppName_user_14.json
deleted file mode 100644
index e2852a59acb..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"R%𠊐𮀀(J􎸖\"M󱔄Ls\u0017K\\\u0006"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_15.json b/libs/wire-api/test/golden/testObject_AppName_user_15.json
deleted file mode 100644
index 55f334c6c8a..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"Ih\u000fDA'J'q􂔋"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_16.json b/libs/wire-api/test/golden/testObject_AppName_user_16.json
deleted file mode 100644
index 3cc762b5501..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-""
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_17.json b/libs/wire-api/test/golden/testObject_AppName_user_17.json
deleted file mode 100644
index f5fc6f23cb8..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"~s\u0015穎=YN𤝔?P󿗅􇊠󶟧𦜦󽤧S"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_18.json b/libs/wire-api/test/golden/testObject_AppName_user_18.json
deleted file mode 100644
index 088a59c5bb8..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"j\u0008\u0007@,􆌟\"b𩠀g\nL𪃧Y\u0010\u000cp建Z]"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_19.json b/libs/wire-api/test/golden/testObject_AppName_user_19.json
deleted file mode 100644
index 0409e9fc2d9..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"vv𧯤qO\u0010,l𬤰a襕BF)>"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_2.json b/libs/wire-api/test/golden/testObject_AppName_user_2.json
deleted file mode 100644
index 3cc762b5501..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-""
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_20.json b/libs/wire-api/test/golden/testObject_AppName_user_20.json
deleted file mode 100644
index 787bc6118ee..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"nD8"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_3.json b/libs/wire-api/test/golden/testObject_AppName_user_3.json
deleted file mode 100644
index 848fad70201..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"{욚B$1)<"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_4.json b/libs/wire-api/test/golden/testObject_AppName_user_4.json
deleted file mode 100644
index 65de25d2323..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"𮇇2H\\妣LOV/\u000f"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_5.json b/libs/wire-api/test/golden/testObject_AppName_user_5.json
deleted file mode 100644
index 1339ecbd063..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"(=}𪼻\u0011\u0003fl*𮅼T졡𢔢>N;󽺮{m+}C%۞\u0002\u0019\u000cAX\u0006"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_6.json b/libs/wire-api/test/golden/testObject_AppName_user_6.json
deleted file mode 100644
index 522aee3313b..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"O𮋜 4󵀰L8w𗱡\u00020g."
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_7.json b/libs/wire-api/test/golden/testObject_AppName_user_7.json
deleted file mode 100644
index ae36e8f95ea..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"ms\u0010"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_8.json b/libs/wire-api/test/golden/testObject_AppName_user_8.json
deleted file mode 100644
index 05253c1feef..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"\"􆚁h􈀾􍵖e󸈎Y<3;w󱧄􊠲/u9𣴅᱑\u0001>𦗊\u0013𢔐󼋌w"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AppName_user_9.json b/libs/wire-api/test/golden/testObject_AppName_user_9.json
deleted file mode 100644
index 3cc762b5501..00000000000
--- a/libs/wire-api/test/golden/testObject_AppName_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-""
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_1.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_1.json
index e3d39bddd20..6cf04a5bfb5 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_1.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_1.json
@@ -1,3 +1,3 @@
 {
     "password": "\u001d\u0016䅑\u0013􅵫0<!+𧟶𮑕𢙨\u0018􉿉7\u0011nZO|𛈊𢮚􄬵>􃻁\u001f5gln\u0004kXzCU\u0008i4_7\u0002\u0002Sq󱁣Yu𨚜𢝆.yA\"\u0004I!􊿺h𬖡􁥔𔒎7􏧢󳄗im},F+\u0014D!J~󸔾\\T\u0000T\u0014\u000e(\u001c@\r^ﾦ\u0018:.ou\u001cC􁦴<5\\g.E9\u0006􅭫9𒇄Ꝅ𒔕gOB'5*9}\u0002I󾮉@r\u0005\u001aZ󸒧𞋌.'2w$𦰲1\u00026𘣲\u0012\u0001\u001bQ]􂓀n\u000c\u0015XK􂠉+\u0014v$d\u0015XQS\u0001𐅘\u001c\u000eb󼽒TOG.{:k뭆e<gu*$=S􏱬􄁣wI􍡎0iWm&􇃑cNAzLw󳍎yp𣉃􆷓u\u001c?6􆗀O;\u0018y󵲖e&n]cA𐊌\u0002l\u0001WNx\u0001D|}-m?"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_10.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_10.json
index 456da67def3..c4845e43b00 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_10.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_10.json
@@ -1,3 +1,3 @@
 {
     "password": "𬃳⪻􋧴􋏾\u0002ndlif􌌟\u0003􅗫Vh4병0d%􇄢\u0001󴣺,wY+\\7\u0003Dඩ畯BnxJ\u001a3S\u0004/\tᇺ􋪪􊋭L𘁲𦕪\\tM𥿢𧰢L􄛸老x𭃸bG𗈆\u0011\u000b󶄤p\u001c\u000587帻}T\u0007󲦬Z2𨥠1=8y󿭧P􌝾\u001b𝌡cJ:\u0006}\u0018w𦓄\u0017\u0010s𧩯6󽖥?Iᵵ)\n⸉ຘ\u000f\u0005L깎\u001f!뎣\u00068\u0004#e2⫆-\u001e紕$hI\u0014􉈘\u0012J4[𤁐S\u000eqJ\u001ff\u000ej𥸏\u001b]JK+􇧃#!s𨅀眒D愳U\u0000?\u0007􁏬\u0001󳽎[T\u0018ㄤ􂵪𢨕D\u0012h2薠&w*涒p=\r\u0011<)!M𗖕𝘒xg󲋪􍔫󺢛📌\u0004.\r󿕫妥\u001fnqaZal􊎔G6JN=}6\u0007w𡆤𦿉󴻙n\u001e謙O\"_\u0019x\u0001􏨉\"+ \u0008Hu[#c\u00042󺇔\\𗝼=𝂕󿱲9󻾒6$𭵍B\tL|\u0013\u0000溻%FYpNbk{#󻦬󱖃\t.\u0002G𡎨𣆚Z꣢\u0016􎅱𠐻󴨐H\u0013􎳙\u0003rT1xF}Y\u0000 \u0004l\u0012􁐻됏6􃫶Y:\u0006V0\u0004!V I󵱄U$?􍲚2\\F)IP\u0019e懟嘈SRN𗑧𧐘e\"(𢮪\u000b􍛋\u0001헦|3[\u0016􌌒\u001eR\u001a볺\u001a𫕢#鉳󲮦Dp{WVỂ\u0005P3쌈f'\u0017p뫀PaXi\u0019u\u001d\u001b𞀧`fHI&\u001b뽂jU)-WDl𐤗T0'jL\\)7S\\>\\\tw󱸍(\u0014t𝠘7쓞𨝡~'a𧦊[i_lZ\u001c3𫭨xU_\u0013\u0015jI\u0019𔔯O\u0007J/&\u0014x\u001d𢪰"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_11.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_11.json
index a6ccf96c9bf..929f3cca2b1 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_11.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_11.json
@@ -1,3 +1,3 @@
 {
     "password": "#OlsoB +V<𡻓𭺵{)\u0003\u0019\u0011󵩊𞡭\u0006yc𩕅󿢻6\u0002󻒑L\u0008𥜅\u0002􄻇;􈝪𧷶􍑌:\t^\u0015hV:7y(\u0001\u0003<2\u0017[􁐁𘌽겐d􎣩@󳏉􌘬ᄫ\u00041js^[\u0001o\u001e𐚺𩦛1𖡨x2n|w􁓍󽂂\u0002\u0015p1󹷭𘥙}敭#]f%6\u0014􈼨k8𧬋o \u001f#5\u0013󰫏?肐y\t\\O􉮈fvl~霎<\u000f\u0018@𪉫󶜽ꢊG+𬗋\u0017\u0013X施\u0012~𠬍\u00038ls_d2q륄WMQ\u0011h󸙏\"7}*󷑽!𐙉􉶝􄅮Q@kSh\u0019>o􎯯\u0012M􁚌HJ}𓆻|H]l\u0017\u0002$󺜮𑊴L\r\u0010[*,𦡼\u001aH󸁪\u0019􉿎Z3n#1'󹤍Yf𡯖G1􌛛't􌷴􄔍6\u000c􅭳?'뜏-gee[U􉌥\u0004F<\u001b6-<r\u000b-Ew+@H>(󷬅\u0017𣙵c\u0000~畖\u0005􂜔LA\u0019𑃱v\u000cO5\u001c?v'󰽁\u000f󳙕m\u0002M\u0000􅦚\u001eW󷊅k\u00045SHy\u0013􊦱PNc\u000fwg5o9&󸿞慆F󱠳󸃫_LX􇮐_%U\t`o䴾󽌍\u0019nQ􋿸^􏗚𘓌Ej3𫾝󴎖󴳏+)󷂁=zi\u001c7􏐗`g􁀙Ke􌂸R|\u0004􁒧db\u0014n\u000c)𤣂^\u000e\u0004󷬊k󴴤󾡗\u0017\u000c\u0004+뫲r㸏w\n⬧6𗸋Z􍆞?7x3uz\r0\u0001\u0001ꔁH䝜V􏚿􋐛/\u0006wDK黵ut}y<n\u00105춀fy\u0016wG􅋇􍶙;\u0011/󸺪jS\u000ei\u0012h\u0008\u001e\u001b;H쒘\u0011\u0001{-\u001bg2d\rQ𢟃撈0𤳭W\u0001u}?\u0016{󾹋7]^5QI8U󰼟󽱓㓶,o7$FS󰨪\u0014v\u001d\\\u0002\u0005(📔􁣊c_v\u0018􇭏a􂴉L$/w\u00176R\u0002obc\u00165\u0018T9B\u0016􂒻𭻟Xn\u0007\u001ccj+1b󶐡8s]Yy􁆝\u0010𭭸VꕤP\u001d|t\u0018K/𬵍𓉩\u0008孨𑗒ch[Hw϶\u0015\u0006<ꍹ\u0007FQ!􍗦𡳯\u0018(󳿌\u0006\u001c=\u0008\u001enxoo~\u0007𩐧\u0011􂃲\u001b-Rw3󽋃I\u00053𘤽FDT󱉔_󰖝𮭑w􁜣𧙸\u001b7@H>\u0000󴄥\u0018t>O\u0004g_\u0019𩨋_M/\"𤯳䝝􋺔L)\u0007?%𮤪$\u0010\u001f0[\u000e+\u000f􈂫􏍨s퇭)/uS55􊒂%5\u0008\u000e9\u00085\u001fi𡈬瑃b\u0016\u0012NWH6\r􇿔􋠯\u0016\u0013Jzf7\u001b\u0006~g&zwm\u0005I-󲓢t?􆵐\u000bㄚ􋭃􍓅􇿬𧑉)R\u000e_-OTc\u0019󱱟\u0010\u000e􎪟ώS\u000cF&\u001eex5D􍞃\u0015Zt(_(1\u0013䗇𝪥Rpb􆕬𝗭É𩲜+f\u0003󸍶\u000cr7&`蛆𫌡\u0011􏧱:7\u0001􄮡𑐄!\u0004[󳙰tk󰾙\u00051l􇌷󼗎'PbE\u0007r,􉈘b\u0001\u0016 l󽹌h㔐𣋉&UU!9\u000c󼖱K\u0011Y\u0004\u0000\u0005gXt)]R\u001cRD?&@Z)\u0005\u0012\u001aH󴩮𥗹[\u000bc3G\u0007\u001a-.􄿲\u0019𭒘󿅽\u0000:𠒩l46~C\u0016:Zㄬ\u0006GB\u0014@R𭔗7刃Y蕚\u000c𘈀.𤏒\u0001}o\u001bU\u0013w\u0018ኩ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_12.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_12.json
index fed9905dc5d..fd1462be6f3 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_12.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_12.json
@@ -1,3 +1,3 @@
 {
     "password": "s𑢽C?n%!7.&𥑮􍗹_:󼲦`/\tCp􁦉\u00042W\u000bᕜ󶺢rt\u0000[vGj}􋻘\u0017XT9n#\u000e,`!&Q쐥󷧨𗥢n𭐫~q_󴢵Y\u000b𪵀;N󿟡\u001ff*\u00017\u001ew\\󻽫Wꊥ\\\t𧒁:y^순y0🈣m/h8𬇤􃶊b\u0016bA4􄘆􉖻j󽫑w\u000bTf2/\u001f\u0002\u000fD\u0010T𐌖V𣊪L뚟2Pb\u0001\u0001YW􉩴U\u0007\"󶦩𦙚󰛃G\u000c\u001e\u0000VC󶿱\u00033na櫖xWY\u0010L󼃖\r\u0018\u0017fv󼉧\u0019MKno\u001f󰵻]\u0008􀯲\"𦴁ee\u00089\u001b􊽖v𭟍i砅RZ\u0011T-u𢅐𡎓󼧜l\u001c􉈶j𑴒􏔤\u000fE𒊙􂟾♃Y(n󻛫'󴄁F<H\u001ex\u0019􄻟𩒗F\u000br󲢵M6􉄪􋈋n,r54a;Q\u0007tb3_\u000b\u0012\u001b󽕅𘊒{ddoVu\u0013\u0011*4􄐔C\u0015kTC􋧻?p|r峡𗤃󳳥\u000b5:?󷙼?鑛𤺝{\u000b^vr\r{:qZ󼒞xC\u0012_\u0001Z\u0006j>T|A浵Ny󷎱P󺳜HGJ;\u001a1g𧦦N=뇕/1􀘓`󾗤~h-ydx.𨜣NEuo\u001b\u00027l\u000c%🕨s>\u0003%󾚟\u001dfi\u000f𘡓\u0011󳽫T\u0016쓔K󹺓\u001ds\u0006k祱tc뗂􆞞󾾞B(9sK=􇋓讅\u0014\u0000N\u0015`𮕺Uh󲧘\u0016:\u000e M\u000cSR􂩝DLc\u0019\u0017/\u0018fI\u000b􎓴Qz있'FP7>\u001d􅢡+󹷦]}\u001b\u000e𧊝󼧕{󰥫{p\u0010\u0008Dp\u00126W􊪩-y\u000eUQDJ惚$&9&#nc!yI󽌚\u000fK3&%\\\u0003􏑩\u0017𦛟y􋸤/\u0013󺫄\u0012=}[󵔯􃻣O󾖈R􀢃𩲯\t\u000bS\u001e'\t]󰝢V𠟗q}lEK𪃌q\"\u0001)q\u0005🉠𩣷c𫩵􈇐.c􀪟𡄻4󸚣\u0012G<(𪣋1R1\u0010\u001a􁧠J\u0003\u0004e0;\u000ev\u0010L|%qfi\u001a𗂳􎧻仙\u0001󱰡\u001c\u000cwWs𥮦\u000eJa󳵖𡷻\u0008\u001a5E)d&\u0018|\u001b眬\u0018a~Q􌡙Gꉏv5(|X\u0016k\u001c7􎥸u\t&嚈t𣯲􆣎󸰝趾/􀨲\tc󵐵R퀨:𢸙\u0016Y󱐨+􋹤&v\u0017 Eg-𨐌kX\u0012:f\u0015𑣫\u0019pwe􎗓\u001f\u0004l+ \u0006*􊍑w+r.𘚓\u001fk\ri@d􁁖RY'r}􏷳Gh;o=c𣰷􎮖𣴹fV\u0016fV\tv\u000b󱼪&=^숐\u0011\u0016+Fm$\u001e\u001b󺘋~<lK󺏲mz*N𮠉OM\u001cr\u000c?e륕B𪳅+Ka\u000c)4_桬c􌢈R1 𤠇8wEa􋵗N\u0008O\u0014h|o𫌘Qj\u000e󷴀𢋟eK=5oBF:{􆞁uo𭚦~yO^V\u0018G𫻘\u0007+\r􂀞𫋰\u001cC\u001c\u001ali}/db\u0012󺖡m𘋜󶙗~D\u0012]0\u000e@FN|\u001f?s\u001a`yu!롢鼣􅪺󽀼^E\u000f|\u001ad\u0016\\$e􌚿;~u홭g\u001c\n􁯊\n\u0016.>2\u000fBZ\u00080\u0001GO<\t\u000eoy\u0019􁷤uv\u001a󻷿SKC\u001b>_󹃉𤨖󾀄雽󽍡%vt󼑫D\u0014\u0004n𡭲𪲻>𪿋dn𨿰\u0015𤣏5|$􂅵p*􀀟*\u0003@󱳽\u001dm~\u0013h𥄩KQ\u0013𣤊kgQ󳂝󰘹nH\u0016@\u000e\u0011y\u0000𠼱1m\u0004\u0017\u00163𗾺𥍧v\\\u0014􃵾x􋵒$\u0013\u001c𪎣󼏺\u001fmk\rin􏁐\u0005w>]𤏿K%l%\u0007󲋱;0𡪼an*Nhh𫓦Ⱀ8\u0018W\u0007􇡹By􎶜u⨃󽸫%!}𐘃\u001e𣊜4T\u001a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_13.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_13.json
index 6b14a4a5ae1..8804357f313 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_13.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_13.json
@@ -1,3 +1,3 @@
 {
     "password": ")-188䁫jj\u0016?I_󶲤yR澰ⴤ𗧉S󲤾􀿩􃦤쫔\u0017_-znO4\u000c\u001b\u0005\u0004닺\u001eFU1oi=󰮾㶸\u001dk,*\r𘞖\u0000󳓪((\u0005I󼴴}a8\u001f\u001aWS\u000b~*`)\u0002jH'.7g!𘄍R=\\\\F𨌧(J\u0017p\u000bQq_􉈲`\u000c𥭘\u0004쌅N+\u0002UZ{;]9{R\u001cHQD$tK\u00152R𮨮zJyl嫹\u0010W菣𦓡༟\u000e󹨞\u0005\u0014󸨗\u001cZDz~쵉籐6S\u00031tl󻶞􅝓4𭑀\u001fx6\u001d𩷫\u0006r\u001f煅[\u0011[􋖷\u00076XW\u0017\u000c􉒐𝚳[󾹏𡖸⮙F=凖󽎬;\nધ3𧆅🩠\u001f:\u0013𣶐mMX\u000c\u001e\u0019\u0016z2𪑹}\u0018󱿴7\u000bP\u0015ᓯ󷄱9f􈥵|y\u0006.\t稀Cx\u0006󵳴X4󱰞􉜁3\u0008$\u0018󴇘󲵠\rv4賈꺏\nuKn\u0001v󸿚𭰲𗎣眳􁯀1/n𣆱󻲾+\u0003\\C\u0011󲫰8rj\u0014􉠒󴲦FZ/􍠢$遯𢭇𣠣S\u000bd𧴵^\u000b\u0010\u0007}3=⁩n\u0011[P첚𞡄#G5􋏍\u001b{JW꣫hn𩾅K\u0006&A\u0004u瀾棔X􍣢yRf;2\u0000]\\Fy𢂘kO\"&+M𬮈󳙨\u0010y\r X󻍇\u0004􃩞\u000e,􍫋\n)𥗦􃺐\u0002;\u0015y}0󿁳C\u0005\u00032*\u0004\u001d:𐮁Kl𦼬\u0012냛^\u0005oLkᢎ\u0015\rX\u001bM$#􃩰E\u0008ojQ%῎\u0000􁰐zk@⏊􁉻󳗰<𝩦yHV󸎡\u0008⪭T"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_14.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_14.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_14.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_14.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_15.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_15.json
index 07a74376631..51d9ec6dd07 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_15.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_15.json
@@ -1,3 +1,3 @@
 {
     "password": "D\u00112X.\u0018c􃍶\u001dQAGG侳_\u0017\u0005󺲭D>&􉉂cg2𢿟D𘠮ꫪz<𢫯\u0011젨􎞠\"𨩿\u0005\u0003&􋰤\u001f𦙁.\u001e􏰈𧙝5d[.൜>#󵝾􍴸47Ew󷋳z\rr𭓅<𩦳Qj󺍧D\u001ar7\u001aps1DN\u0005𬡦l"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_16.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_16.json
index c384bcbaa0a..16d785db02b 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_16.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_16.json
@@ -1,3 +1,3 @@
 {
     "password": "􃥿;(yq\u0019;}o󴍆k􁾐B\u0000UJn𣪦h`\n􏼅Hm,􌰑r\r4\u0012WybQUJ𓏐n8𧞒{{󲂆tQ\u001f𡏧\u0019P'5􍥆q,\u00109ar􆼶F{\u0014@𬉙!+􈒅$\u0000=T!𗖧T,梤\u0011\r*𩹩\n!v\u0016\u00074Y#󲎀E0\u001e!\u0007p\u001a5;^<󻫍+๛NS鉘:24h\u0004N4𔗟X\u0018\u0010b󴩈wE󱻞Q􀾬f$𩝃󷸞.{\u0015󽯯\u0011≙󸖳pX𭥼\\c~)i:A\u001c>Tl\u0012🐡=T𡂽=G&\u0002i7󹋩gG􄁔##%|i?WI\u000btx𧩖h𡠪q􄶌G𥨯\u001d󹶙D短\u001c􁒜/#\u0012R9󻇕㿇\u0006󾍀=l𘜢|&\u0018QN󱈊|켐w\u0004󳢔\u0001#鞦􁔦cLG?󴍲g;\"\u0014𘈞X\u0000K𣓩\u0001\u001f𑆾_\u0005=rW\u0018\u001d𛂭㳳\u00046+'MQྍ󲊠Ib\u001fj<e2󾠤􁈔F\u001f𢛒a􆹝TxW𩔇俌T𮊢L\u0019,6;h􉍽b𘉅𠅩svxObs𧁒\t\u001cb\u0013􏖾)i􌩞=}<#\u000ffSi@\u0006t늽\u0018h𘨖3dOtzrp&W􆩽􄅤\"*j{N,IL?8!\u0005\t%􉶎𥠸1!or𘃹e|L;𫆉\u0017W󼛁\u001eh뗤湞L\u0017𐊲󴞟\u001c\u000f􊫘Gm%\u0001>𑘭\u00195(\u0006\u0019\u001ayY\u0006󵟍􅚅\u0006󽢷𠴓8@\u0008\u0013\u0014􆸭\u0010𩰥)\u0015𮦙(Xcḉ)L.\u000eT\u0017𘈊f\u0003!R􄉶𤄮GS{󽶖f𦉞y\u001f󰧠􋧉_𧤘y篤\u0007R[⩝hQRe󰂝'F\u0007ᨍᒁZ\u0014xh4\u000fNDE𡚑𬅤dMf屢\u001d2𡉀[􋝥\u0006\u0012\t\u0001\\󵬈떙$l𩎳󴋬\u0008'.\u0004􃁺w\u001d𗘟󶫝0䮴󹾛􀤈\u0015\u0001V󹑽K\u0013એ􍕓𪅙𝢒#u\u001c}qX􌴾\u0010H⯑BdJ𬽢􃌧;NSM(%𡛙__#􁾫\u0003􊢿_{&\u0008,𗻑~Ai\u0001\u0004\u0004J윅􂰫􁲄[gm\u0001\u001e5H\u0001.𮅦𐲎$rs\u000e𞡟\u0011ꢈ\t\t\rm􅀅\rC联35Zr飺𩗮オ%4*~>=2v\u000c\u000bW5m\u0011i<\u0000a\u0017\u0010\u001d𗎻봊$\u000f􅤧쀗\u001bl軥󾺉􌌓|HV"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_17.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_17.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_17.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_17.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_18.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_18.json
index 82f61f0a614..56e264a5cab 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_18.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_18.json
@@ -1,3 +1,3 @@
 {
     "password": "󱠬󼗆t\u0014\u0002\n􎊭Hghﭜ7䢃zp&G-R]0󲤎Z'󲸋_u󿜩=𭵈\t𠾭KS<󲕊𧇛-􅴦\u000bJ󷞪\u001e즱Y@􏳐\n\u0006𗀷k#\tcyVB\u0011E𬦅􎳄\u0000r\riX&􄻺2󾧛=\n\u0012,􈩡\u001bE翩V\\솯.Hr7\u000f􀍙\u0017<𘟋ac1;d𥧌\u000b\u0014P6&Q㠍k.\u001c1&\u0014󿅙<<\u001c0ﱡ(]鮴0f_5*c\u0015r2.􉃹󴭃󿉹W9󿡇,􁘛{j󴖁*Lyv\u0011f\u0014R\u001a𗖱-%𤮺\u000b\u0005}h$R􇿥󸺴]⭪K.fX;󿹶2Hᯍￛ\te\u0010w\u0010 Nᱹ󽄬𩧡\u001d/􅓹⛗\u0008\"F𡾗\u0011Hvr󴀋힃k渜􎼵ꃲ-L𥋔󴥳V\u0003A\u0016􍹿7.j\u000fqF􀄋+3=顽럫c𘥾,\u0002>f=𬶮\r􆋨(\"\u0019􂌆p!_\u0018\u001a;v0뮵Pv)Ay큁DA\u001d\u0013\r뫪cc\u0014󾩰𐜥Mod\u001b)>8\u0004𢷜ms\u0013\u0019껭H\u001aT /t\u000e\u0007:󼜒U\u0016M\n$]}\u00058\u0000J􆙰󴏢N{5M@\u001dx\tbeF8?טּㆋw2UfV_~BRSY⁋w𥗗􀌲~ALK\u0010P󸙾k􌋤􂰰\u0012)*󳇑嶰\u0003+vW\u000c𫺀󿲠p U\u0005lPa(􈹤􃴖.ts\u0010󿇄𪞽󻦣󱳧\u00155e{\u0004;|\u001c 𩠄\"/𡻵\u000f9\u0014\u000c󴅉\u0004~􃬫\u0016!\u0002𩍋\u0017$|姻fmSW)4䄖𫭡W\u001f$侭󽌟B󵧜&<𐘪獮\u0018􇅉꧒Hu󶩶RJ\\P+9[\u000f􄘊c\"긵󲳺\u000b􊨁'0N\u00151􆳵Eo􅥻鋝\u001a􊴬\n\u001a8k?X􌇻\u0014|5d%狜0t&\u0006k\u0015􉗐1􄈋;;[🕁k6G}\u001e\u0007􍳋b|Q𣡣&L𬨪\u001f柾!(+\u0014*2M;𧏌B𬄥\u0006cI\u000e+􊮋𦐍󹼺N𐅃/y𪭔\u0013>\u0000T􁪶\u0001\u0008A󺵶𩒃)eJ\"X;Kv5\u0013\n:󵕜$\u000f>􊟞\u0005\u0019ff\u0012ha9`𭲫卲#yq~9z$myW+K/\"󷏠p\u000biG\u0003s\u000e󰶉𤇪49􅾳󰓓|􉢑􋿧\r$\u001d𦫕Z叩v𮌹\u000c`i2N􈵉uQ?󽼲/!B7'L{魘sA􍟊O'k\u001a𣥹s誵\u0016\u000b󰯖󰱀󶥮J7Y(Xvl楉"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_19.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_19.json
index 542c0fea4b7..4e326b9c521 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_19.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_19.json
@@ -1,3 +1,3 @@
 {
     "password": "\u000cz.􊠉\u0008r􂓧E梓\u0012g􈶍􎇣\u0006\u001a\"\u0012[W:\u0000\u0003𐴟4@o𑰿#M𝤟(󿀩X\u0000󼜳D늶t<\u00119\u0014\u000b+\u0013:Gv󼼴\u0014+\u0013󶲼𖢅蚶s􇙍\u0016\u0011~h`􉤱𪢑\u00051𪔩>冀\u001b<\u00029\u001e,d𭪱\u000fR󱄰\u0005\u0019\u00171u\u000e\u000e~􂆚>&>3\u0010:􇂤i𦷄R􎰐󸢺$􃠇r,W}Q\u0014𤏖0{\u001e𐍙_\u0015a𡧺Y󼷦C􉓨\u0000m\u0001\u0017M\u001e)\u0018Dซ恆y\u00163𔓞\n􆽃\u0008V+ᓒ\u001dꈴF󠄻\u000c\u0002\u0014N}iAbg\tN𗦊f\u000bQ㶜3\"𝧼7,y\\\u001b􂪬Rt󲨖󴥶 婐B/죗􎊕!󴛎4 3\u001b?!G𫵾>7󺅋R Ry\u0002𢪚5D8\u0004𐏊\nC1\u001c\"𤞏\u001e/󽴼,|\u0016\u0018=g𣈶rm\u0011 Dz4~-􌇰/󻏾:./\n?\u0001+🢐TP𩗄r/=S]2\"@P𭾖\\15K󻫧桔㨾{@QE\\􁭼\u0008@𩧖/@y<IyRQt󰌐𣟰H]􈏭𥏾s󷪵.JfTq𭌠􃍊:C6U󵑿)𠁲B\u0008\u0015𐛌c\u001b+󹗉\u001f虜~\u0000@d\u0015{>􊩀ᕳ0KwA_󸧪t8\u0006\u00051􃾕E\u0016'\u001bRH0𠁯\u0005\u001a􌀔\u0013B\u001d\u00160TM/u𬱀]Ucc>j􁷷)󼽻ဥ^𠟑L\u001aAY􉑀}􆠾\u0002\u00044OtuQIK]t@\u000bpx>{:􂷽\u0011󱆾63+󵣸49Y\u000340𬀂{(󻀁h]\u00023XPPq𓉺osR?B⽦獎딬H3\u001d󳧳䌠m\u000e􈥚~\u000b \u00049맋􌐲b\u0001􇳋!󷙝\u0006𤝎\\U!ퟅ_g>@C􌝹􉶠5W\"\u0010{Z[浪𨱋𩱐K\u0005􊉵\u0002Z􃛨􆚺𬹍t-􈈑B\u0015\u0005\nཞHpv├.Z􏦢6%'Ku銏\u0005󶤡𫢑}D3yW􃙪0\u0014\u000f􌔺m𧯺􃇱v\u001a󷬃6z}\u001d\r\u0014S~󷈖1\u0018\u0014$o\u0007𒈙H\ta{𥯂h9\u000c􌂓󴦅􅢢\u0006$jⶈ0;\n厦􈻱pZ\u0010𡾉鼣(\u001f\u0011􄣎p.󷓎𦝛\u000et\u000b\u0015𠉬􀣲J󷙮@jQ6aZ𖣯𫔻𗣵=>󷄑𩥮􅍟ᾏ\u0007L𡯫Q\u001dI𢁩k\u001fET\u0015𨵪􊀷\u0001󿇆􇑝\u001bס)8hcjIN{􀙂=gD\n呇\u0018󠁈Qm\u0004O􎸃\u0006􌰩ᠸ𮅙r|\u0013;}􁉯NZ`#J0􋔀\u0013\u000eG\u0004RT\u00046s:𮩞mﰴ(\u001c풱􍰮+l,\u0013t󰊐Ui\u000cp4🐝RMNm\u0014𬅐&\u000e+p𛉡􎇡󴮋\u0006􏞥`\u001f𬷒\u000bchk󱮓󻖵9z󽘾􋵶pN\u0012&&C\u0010Ȯ+󲭤)D$\u0005ii@\u0004Q$^Z𩎥]Y􎢰\u0013􈶺[w$7DZ檣_\u0010󹁬)\u000fJ<_Rw𪋙yaI􊙓\u0008\u000eM\n\u001f􃝜\u0008`𧟙Xlgww󺯻󼓥尔 t$\u000e\u001f\u001d𪒟JN\tX􈭨2`􉵌󴬕󻑼X\u0005󵲮jij셳n/_$􎀎;ﴱsN6:\\󸜈L􋐳𧲦𐧞\n\u0004I-\u001fVO\u0011C#}\u0008Qi\u0015BUd\u001c(\u0003∃Dp^\u0007d^\u000f\u0016󻼠A\\$$B^\u001d󹧜󺿝Z\u0010L󰺦(Q2\u0004EdIU𢌋GH𝦥\u001fA𨲁\u0004𦨟󽸽z77r𨓜𤖏듐j􋕯\u0016eS\u0008\u0015+\n,\"ᑑ-,'hi􆦝\u0005:t#QFk;檑bq2𐅅\rmM􁖖:𣤦仞Ft\u0001󷡡L'@|rUk"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_2.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_2.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_2.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_2.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_20.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_20.json
index c12aed221a6..faa6a484b99 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_20.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_20.json
@@ -1,3 +1,3 @@
 {
     "password": "b\u001d: B􎏦E𧀉􅁘H/G􇊤z_\u000f&6\u000f𑩴\rĠ\u0019&Uc\u0012\u0017?BU0 |𤄙􉶪p𦕞􊸁F1S䡍p󺗪7kMx\u000c=\u000e􄏠󺤫ᦺ𘢪g$\u0006뱗\u0001\u000f/9Y􋴜#AgT\u000f~n􊊰`=.輇𨲝𦌫>}\u0011j\u001ex>󹕖🌶$KH\u0005\"o3\u000b(𥉭󲽹󳭆𓍄\u001e􋀭v뽉{\u0001$𝢂\u0019踷,􋓤􇭛Pbd𡆃x𤂤𨉥\u001e🎁Mp䔉H(p\u0002𫂫*\u000c\u000f㸅💥󸸥q;p􎎫\u00076j󷋶BQ㔿𥷄E\u0018Ed󿲡C􍎫\u0015蹞􏼯\u00167ᔑ𠆬\u001b􍳿\"gr\u0008\u0012􀶡🧼\u0013\u0000\u0011?k𣸌bLb🕋v𐭒\u0018@JE\u0010󰮧𗀐\u0013]󶷂XB8y%\u0018󿼒􅗋iw\u001a\u001f⪔k%/g>𡰝󹜀,𑧐,\u0005\u0001􏦑XXF󳯔\u000b[v0T:\\\u0007󴂗𦤘󱹛\u001f_p~:+𪗅;ఇ\u0012\n􍮤X \u000bN\rn𮟶J9\u0019󸌗Ḗ\u0004&沝S\u001f&󻏎0𭠺`V$|g\r𭊡\u00069슾𭖷L/U󼎀ByS)@琢\u0003\u000f$\u0003fT㢃􊾹p𤿔\u0008M\u0017\u0004[Z9;󽞺=YG𝨤(\u0011\u001a\u0000\u0011Oc䒶pc\u000fOJ\u0015(󵼵.ge8펕$𮩟􁇆\u001d\u00181􅡋m􍐍Ol\u0010#\r[\t\u00135+\u0005%\u0019\u0017D󷡚\u000e\u00191\u0007󿃎`  #B9W󽾋.\u0007l𠴤\u0005S􀉕\u0004*󽢷𠫝𠃛'\u0007.灓*g(𬮜,\u000e􀋁􈗉#\u001eU􀇾􄙚,4tB𢨀\u0008{e𦁢{\u0004/\u001c𮈺oPT!\r𦺱𩍽8\u001e*L^F]-珅\u0013z󲿤7\u001d\r8,{p󰇠H𗌽􋬧7𪌓J5<+w\u0013O󹢮\u0014ۢuﷴ𪎚󵕘^\u001c9s\nS;􎦘u󺀏\u0010[Co󺙬pz􆙿\u000ftne@C~\u0005\u0011\u000e.墢p]bD4d:츾c泏8y󵖣\u0007\u0001\u0008It꽪kUL\u001bT\"\u001a\u001a\u0002묕\u001f𥍲\u0002\u0018q𥹍\\X祥\t-\u0008󰔣2\u0014X~\u0019\u001dp}𐜨wS􄼰5\u0001~􃁵𦪔嵳v𘋚AX󴀃,PW={O􈮝녀󿡝𨇼s6\u0010\u000fy𠘝\u0010jz\u0016\u0001\"\t/􂬡JD\u0007󸥞𗥯𮤒H䰭Ku\u001beG􄀯O󸽿d􈔁D8y9𠍁\u0013,G\u0010.xq󺩤5\u001e󷮄?䩤_`􈭢༶𡦯轝\u0018\u0000\u0002𮋨𝐗As~b(&Hi\u0017\u0018𭚫𩯌􍬋󸉪?PGhXTL\r\u0001􃏊\u000bA_"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_3.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_3.json
index f5d37f0c591..aa2a9c059cb 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_3.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_3.json
@@ -1,3 +1,3 @@
 {
     "password": "A󾾷~8t8?G\u0018𨮀KYSs\u0010\u0013\u0019>󸘏􄮾V𦷯O*{\u0013\u001b􌞳Sm𪿚􎃖\\A􅩬𪥽N5󴬏 \u000fyK\u0019\u0004􄣎nc휅󿤩/\u0005\u0010G혎^cy\u001e\u0004Tu?S=𨲏𤢵k𣶘:$O\u0004\u0008k\u001ax\u001a𧵫&b87ꂪN\u0004\u0000𨪃\tB*jHQ\"\\𮊹ou{\u001a􌘲h\u0012􎎂H"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_4.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_4.json
index 5df26b4100a..759ae6cf1d3 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_4.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_4.json
@@ -1,3 +1,3 @@
 {
     "password": "l\u001a󲖑\n3󾓔\u001f\u000f𩯘\u0015=W 􀀆%T(%\u00195*M휀𭒦gD􎁳W\u0012f\\p8\u0018󸷒E#船MEn\u0015H7O書 wg|`客J\u000f\u0011H|\u0006=\\𨼇[i\u0006q\u000f􊭞\u001eiW3A'꫞󷻔;\u00019MN󵵡ub3\u0004Ca<󷥃z2𥪟S:󲖷P󵅒qըoc$𫻯AgO𩚪>\nn\u0016i\u0017PP\u001fJ󺢐B𧾘󴵸{d\u0016|c󰂐V𩀠൲󸣆Nny(E<Z%r^Ⓑ􆼜 d=𫲵G\u0016月uOV'{7Dj\u0017𗎖I𦅦Y9K%o𠵤hc\u0015󴼹\\\rR􁹝逄w}󱖘D𐐟􅼑\u001e9\u0010f )e>􄌺_𘜑Q􃦹筥𨚗JR󶩡\u0001󼀮@\u0015X𣺿󲳨󼚦v\u001d􌞶質􎎢K\u0000땺K%MB,\u000b+l/u2c\u0002K󹕇󵈢9*4X]B\u0013i\n\u0018ꑍ𠇏4\u000c󵀅\u0006\u001eC52G?\u000c\u000c\u001b'b\u0007\u000e𤤻\u001aoeA􊞰쨅𐊥\u000e;\n|`r󾶋H?󶥵󿺈I\u000f448𣋔D[ꢼRF\u00148I󠅁W\u0000U󼶅\u0012𐪖\u0005ⒿUF\u0014C\\?\u001b-􅰈*k_󸁤$K\u0015)BY{􆻄\u0018𮦝\u0005\u0015r\u0010:\u0007+7}󳾽_d?􀵁<\u0005𗗰>=􅤎u󺌥\u001c\"󸲒􇤀\u0010􍿴xg;3mnC,qn)ga6\u000f󽒔􅧥𤀼\nW\u001f󺏢\u0004\u0018𣱥\u001eH󻄷h\u0019\u0019h𑓗X𭙅Kh𬒾\u001dN􂅣8􀵰K\u0017r𦙋xm\u0015:5[8庉V􅅎6rON*po1􂋗ZsD&r.𡺑aGj􆸛#\"s6筆C\rH禜>󵰓9􇄡1𣳃r!󴯏`𡦈󳰏n𩡩\u0016\u001a\u000e𗼫?~K]3u𗡮󰧩\\\u0006􈱥|X􇵜t􃌧uB\u001a\u001a\u001dJ𤥡瑑\u0014jpr󴷘~&7\u0018󼘥v䋈\u001e=R\n\u0017s󳽳􍺘iW~𠹦}zR\rr1EzK𠙇=d[𠩑8L􀻑\u0011+{%\u0012!\u0001.B𥂋􀐾\u0017\u001f\u0019𠃥j_\tz𥬛㉝\u0008a󶍖;~X`\u0007))7󹸉DB)#(\u0011\u00017\tm􃎄󺒈L&󽿝u6Q\u000c䡔Dz㞫t윫\u0012OtzQX;\u0005\u0008󽗑\nj\u000eh\u0003\u0003\"􄅛킃yQj𥡔Y𨂽\u0000[뼝+Wf]mH𦎺\u001e𬨁gD~\u001eJ:Ca\u0004#?_ ,\u0014\r􃊎,䚻q:"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_5.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_5.json
index 77217ba1411..2ba7f862892 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_5.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_5.json
@@ -1,3 +1,3 @@
 {
     "password": "U\u001b󾭒Z2𩧠\u0011󹾚黎V󽶓\u0015/jl\u0007*󵫠G쐭\u0000􋗹􂂲Q\u0006𧓔}l| s𪄐\u0004D*wg_\u0000V𗿋\u0006󹪒!\u0018!j󲍫*@鋖B\u001f𣳁!sz.h\u001db􊌯󴞖\u0002gEkkG\u000e\u0008K\u001a䌋u@l𢝡\u0015Z(騙􃁦󴀮\u0018s󼹹$􁖚𢒍)ER\u0018&𬙫\u000b\u0018𒍎\u0002)}o𨿄\u0018`a3\u0004+c𞸘tN2\u001d\u000b\u0007\u0019􌜾t􃔠󶈢⽝𭸝U;􌳾?\u0017u,\n\u0008󰲛쒒(D*\u0002T\u0013\u0004a`h_󰴕5\"l^e󾇛O쌑􀋩K\u0016𠄹󺡞𗬮w虭A\u0013@1$𣕓Wv㬫ႆ󴂧?\u0014z;ࢢ :\u0017󺻨n􍳒_𣀒p>4\u0001y􆋲:𫋝𪗪𗕫\u0002\u0019{􂋠\u0011􏗏Ka<}𪄩BK􌈾O🕷󻙞j)𓆑q*𣤡U\u001aZ󹑯􉫺𬌐\u0004d%`Ko𛃫\n\rQ􁆃\u000fk&\u000e􌜠\u0005\u001ce.oe5fz5\u000f\u001eG#pd𦫜@\u0003\u0011>"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_6.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_6.json
index e99b784f3b4..badb2178966 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_6.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_6.json
@@ -1,3 +1,3 @@
 {
     "password": "~􇡏{|󼓛Z63p\r(n\u0006.䷗X죭X󲭹𧼉9*^kx􉠶M4𨐪󻊰^lE󵘸\u001e\u0010`c 撍I\u000e\u001e\u0008a󼐧\u0017\\ₕ𪠽$O􇨄\u0003i𓊍 iP👯u􅧤󻟕M=|𝂉0oo\u001b𥩄􍜛\u000eWb잒p(𗠆<\u0011yᥘ󱼗C𖧩􁦹:䤎n🥢 \u000b(𮒊,%𡱟\u0008-P#Uj(Fo\rEpႮ􎃦𧏧􆧼cKv\u0005\u000e\u0015y<(&-D㥂C𧱓rD\ruj!𗻞󶴎A=ま=𓆊\n@\t#5\u0018\u001f)\u0007^\u000b\u000e쨰I!3𗟠􃶒D'O\u0013\t𠽻\ty󼺌>󴛆h𬬐井=Y\u001dNv\u0008\u0013\u000b􎟩\u0018積\"}nT\u001fⲛS#/\u00109􀚷S\u000c8Kn^mTJ󲗠kV􀜖𨓀 K(\\a\u000f㴎\u0006~􆇹\u000c􅻂*A\u0004(\u0006􊸄\u0018𭉘E\u0004Yp\u0017~𪢃A-%Ya<\u00041􁣉94􅾒즩4\u000be\u001b|cN󶭟*z󺍘3>$𑃙L.鈿𫕔-{󲃧j\u001e󿓹𣕅􊂣󱍤G䶅\"𭇷󸗋󲻝\u0000𪹑_w禖8&#𓃶-𬧈􁨄\u001bfE𠆬0VC6\u001b\u0014v􏒬^\u0005􇷎o[\u000fwDx󰞋5k2*􁜡\u0002󿑎Q'\u001eMM*辙O?􊭥􂂃h0󻒞m6\t1_2􀜻P󵁾􆀘\rau\u0004[VhQ􎭐󰔵./o\u0005􆆩3x\u0001\n$_\u0000ZT#ag;􌞆\u001d𑇧\u0000𝍰2𤄐a\u0013K􆑤S쉂*ᠻ\u0004\u000fz"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_7.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_7.json
index 0148672efbb..97ccffd6cb0 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_7.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_7.json
@@ -1,3 +1,3 @@
 {
     "password": "^4bA󰅁􆚦􋛦\u0016c󴥡&|UH􋶥\u000cx\u000cKk9wj\u0006\u0015,\u00013oA𠆗n􂡝dV`󶠫󱢨fL<9H\u0000􍸪R󲚁𨀡󼯷4ᄷ\r}mK󷄒 -􊠪臭\"𪐰\u001d\u0015SUT􌚸𮅀\u0018󺊃ttJZ.𢬡T=|􈃵N4O\u0010.5&鐦[韊􎿮༄|M􈡗\u0019󱞔\u0019\u0019%􂵧eA,#f%󼬩!o􍅭⸐n^𦊫卌|PV^rJM,塎\u0007l\\􉫩e󲽢1}3E󺓢󸡇􋻙TFn󴁀\u0019-\u00045B*󺬆􂟷;UR𡲯\u000e\u001a\u0000󲂦bdvRAg𥯩𣈥R􆊘󷫨𝕒E\u001c\u000cjh8鳄\u0008jI%\u0005􍴓*+􊀱$\u001f󱢼󱮕y>𝆰ⶼM\u0013W:\u000f𭏟+쀓􂁇\u0000匠󵀬xua[vR𭥯(\u0000\n q{8C󸘧yᚶxfB𫘔=\u0017\u0014呈Kƻ\u0016NO⣉Q󳪮\u000f$|OS\u0019lh\n󹡽\u0015Bx󾧜_1\u0010T馌𨖁@\u00073\u0016c􃜨qL!󹱧]𪈜𣹊E􍞯\u001c䒍뤫􌏸JEjይ🚯􋷰j𠞐es\u000er\re{􉈜䚖;=𪠥dA#􁼶=;􂕳􍖎*􁷔\u0011'9󲨷'0\u000f(Y\u000emtJo\u0004o 􌗀뺒n󲸩Xz󴱦w\u0015\u0017\u001f\u0016⋦󺎾h7󰦦\u000f\u0002'FLR𭱖\u0014釼(*3𦧫^ရ\nt\u001d􀞓lJ5!`;\u0015YX\u0006𗹦\u001d2m\u0005\u0006#煱W$ksH𧖶𗳲z\u0005󱢁n袟S睐D\u001c\u0008\u0004\"C𑛈\u0002ｃj錑I\u001e}\u000f\u001e`K\u0007\u0018n'#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_8.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_8.json
index c2a2b299181..c41bf6c1989 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_8.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_8.json
@@ -1,3 +1,3 @@
 {
     "password": "f$􌰊𪹷o􅎉𦻞\u000fE\"y𦍴G꽬9v#\u0006𬑬m$ tPH'\u0018Z&󵛨{@𤂤fI󶽊\u001bS0\u0004Z}F\u0014 !􆑚󿒴\u0014\nm\u0017󿒦k\\\u0003uyA\u0016b\u000c\u001fS󶖆Wc\u000f⊺󷙰[⦠􋥃𪸄𒄤D\u0017_\u0015ﴎ􌋖\u001d;S𡯵𐡷\u0006\u0013C󴭌yi𐚄᳐'_4\u001fvM󴬼\u0005\\𪅞􏁭𣈍Svk&(𧪵/?\u001f#b\u0010􊐇4$?a9%Y([𗫙S \u001a\u0018e\u0002tS󻀣\u0006ᇳ&\u0000<P󹌁i\u0016u\u001193'>WB󻃱In\u0007<@!M𮘮;𪚒 D\u001a􂁬6\u0011B >pF\"7uiI&𢻀\"\u00020􏖥󿯖V]R􋘝\u0018n𤟜󾡨\u0006;\u001d뻰\u000cKS*o\u0015lC\u0001\u0002􂒿\u001a3L-MG\u0008𖭩\u001fo\u0004\u0017𠮍M)B䇮xዐ󿴳A𧶿\u001a>𠋲\u0015GnW죽;^\u001d𥨌Fr\\𥙮\u0010\u0004􎨩\u001b5p\nZ\u000f#!󺚿[𦇜SMH\u0010󸸔B_cqH5^8𨵜􀜿홠MD~l𗣷.𮙫"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_9.json b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_9.json
index 171f9f41a06..2419d07034e 100644
--- a/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_9.json
+++ b/libs/wire-api/test/golden/testObject_ApproveLegalHoldForUserRequest_team_9.json
@@ -1,3 +1,3 @@
 {
     "password": "l\u001b9\u0016em냻⣿~\u0012qM\u0015\u0011~󵥹o\u0015|\u001dJ𢂠\"󰹬V$mZOGV𥆽J}\u001b𗕘!\u001a0䢢*󴟵𢈇󶎙m🛌\u0006tO\u000c󹹮𦙀u曤🗂9\u001f]ﱐๆ\u0005􏹋营􊵺1,ﲮ)Q\u0003\"𢑂q􂨍􄹫/U\\\u0019\u0007Q\"s􅗀\u0015覆>$H󶜼8cxi:\u0013𤦳쀗\u00136)rq\u0001􃟾U􏯥􃇍Z䔪(𝨵O鴦3x\u0006Bg\u00013𖹔LwS𛉅\u001br簆J\"𗊠\u0002A\u0013󽉤u􀱽zX*9\u0015󰆪`0M\u0004`􍚿𧑬5󹶊X𘗧$=𥏣\u000c\u000c􄛳󺸸B\\oFZeS*SNቶ􎂺0\nCIIrk󽇳w{{\u0015\u0006𨾼\t􏐈u𐰖`J;\u000c\t줦JM𤯜\u0002lDa\u0019\u0019LOD銂GlOE𣅜𦱰ᓨG󻣱𥃾𗓱\u000e\u00048닲\u0007\u000b\u000e𮍵\u001c\u001b.6樚L:\u001aFX1􀑹\u0019X\u0011WO\u0005n𤿦􌀴1b󼎨\u000b􋇰󸣊Am􆙲yP<O=]t\u0019X\u0000𫅌\u000b􃀆dO49F\u0019J𦱙c\u0017ew𨒐𖢶\u0007`.P𠥕L󰲉2p|F\u001br?󱳳𥕌\u0006PW~TZ7􌭙h:A 6꧔󶤪{a(,􎓹3o􉦩󶬍w?0\u001b{E󲮀\u0008\u0017𦅣o'S\u001cw0\u001b21󹤹)O𣘒$\u001f\u0007\u0016ཞC􈭧kb𫭸<󺿑\r􄸶n\u0015캣{𨼃𪄸$U􁺲\u001b\u001fs􅆮̻-0\u0010\u00002􇁿䒉\u0008#G\u001d0\u0003O&*\u001e\u0007)P=0􉗔Q9𢧀1ql,k𭻇X}nN:g󴞨\u000e\u0003%\u000eiH猊贁a\">󲳚\u0001_EXX莬\u0018bioZekl\u001c\u001cs􌼱R࡞\u0010\u0017𗥵\u0008rNq2V􇜅 :綪󽫍~S𝦶𥄿\u0010D􅒏\u001f😿M􂖂Z6􍗽짩\u0006%9\u0006S\u00075cXr*D<\u0002V\u0013䮽+\u0019y0𣆯\u0002𪪕𝥳6\t𫥶8\u000b\u0006lG\u0005e}9Y\u001a|󷋦`臨\u0012浸\u0018Dv\u0008c\"\u0004ls􉰣9𠱧!􂬝ᢞL􇢽o#\u001c]>k\u0003\u001cRb\u0011󴭻了\u0008C𤽵𩞆𪢘\u001e􏁂|l\u001b\u0004Jl%𡳄<𬻠'p \r\u0004Qte>B\u0011<柫𢹟e\u0002_\u0012\u001a)픺Zg󽶅􌞀rz􁰘)􄬔[,0x\u0002\u000etx\u0007\u0019%41p\u0002OJnJ$\u0005󼾸\\n𨜝溦E&\u0000]D {=Zo㼢\u0014􅰎d𩄮\u0001[\tC\u0008ﻅ+lcP\u0013+\u0018𬍑\u0006󼧩𥩇\u000eo\u0014✏*𑦿𤽤\\\u000bV]\u000f\u0002d\u0016\u0012𧂹\u001d\u0017ba􃕾𭖝𝛞\u000fWIN𮍁TF\u0000\u0014]?<𮕍1i}\rj𭦌D𐘒'A\u0002Y{\u0013]𨘸𨨖𭅀o+􌃖q瓀M@𧨭q𠈓gD'No\u000f!k-Zm;QKu2,\u0017q0l𫊍Vr􏬚#\u0019􅒣\u0011\u0010T3:5 AMSh/;!?\n\u0007\\\u0016\u0011曆􊳂2F󸈨𗇾1\u0016k1k?\u000b;L,􄫦%𧕑컺G/5󽅗\u000c􎰂輘%<Wu𥬶\\A􍹐zfPf]I\u0012oFL⚃{9E\u001e?妐~f-!G 􉀃8侎󲺈mW*𮑏\u0018𬤣\u0016Gx𢳱:va\u0018\u000c􆬣\u0006熥V(sn?h솏5!\\s^d릘\u001dZ󼆷]􏖲}\u0012)H󶍣H\nT-\"@𐼙`s勗1t\t7s\u0007n\"j􎨃g\u000b\u0000H鯨+{)\u0015󷀼A<u2teὐ\u0012\rq\u000e\u0012\u0018Fw^􁟋𦍋뗽I"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_1.json b/libs/wire-api/test/golden/testObject_AssetKey_user_1.json
index c72eee90f47..4faf57e4e80 100644
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AssetKey_user_1.json
@@ -1 +1 @@
-"3-4-00000006-0000-0079-0000-003b00000074"
\ No newline at end of file
+"3-4-00000006-0000-0079-0000-003b00000074"
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_10.json b/libs/wire-api/test/golden/testObject_AssetKey_user_10.json
deleted file mode 100644
index 0f8004b531e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-4-00000011-0000-0001-0000-00210000000a"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_11.json b/libs/wire-api/test/golden/testObject_AssetKey_user_11.json
deleted file mode 100644
index db58614f62e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-2-00000076-0000-0017-0000-00740000004c"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_12.json b/libs/wire-api/test/golden/testObject_AssetKey_user_12.json
deleted file mode 100644
index 2c528b8eba5..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-4-00000069-0000-0025-0000-000300000003"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_13.json b/libs/wire-api/test/golden/testObject_AssetKey_user_13.json
deleted file mode 100644
index e3e7693b122..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-2-0000004e-0000-005a-0000-007e00000054"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_14.json b/libs/wire-api/test/golden/testObject_AssetKey_user_14.json
deleted file mode 100644
index 00c3516818e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-5-0000001e-0000-001e-0000-000200000012"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_15.json b/libs/wire-api/test/golden/testObject_AssetKey_user_15.json
deleted file mode 100644
index e5163051482..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-3-0000007e-0000-005a-0000-00270000005b"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_16.json b/libs/wire-api/test/golden/testObject_AssetKey_user_16.json
deleted file mode 100644
index 531d46f37b1..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-1-0000003a-0000-0063-0000-00640000004b"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_17.json b/libs/wire-api/test/golden/testObject_AssetKey_user_17.json
deleted file mode 100644
index 498bd0188cc..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-1-00000056-0000-0020-0000-001b0000002e"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_18.json b/libs/wire-api/test/golden/testObject_AssetKey_user_18.json
deleted file mode 100644
index 586ac5cf2d3..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-1-00000060-0000-001b-0000-000800000022"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_19.json b/libs/wire-api/test/golden/testObject_AssetKey_user_19.json
deleted file mode 100644
index dd7d84ff072..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-4-0000000c-0000-0040-0000-004000000058"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_2.json b/libs/wire-api/test/golden/testObject_AssetKey_user_2.json
index be52e5ecce7..c5cc1203ba8 100644
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AssetKey_user_2.json
@@ -1 +1 @@
-"3-3-00000003-0000-0022-0000-00450000003a"
\ No newline at end of file
+"3-3-00000003-0000-0022-0000-00450000003a"
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_20.json b/libs/wire-api/test/golden/testObject_AssetKey_user_20.json
deleted file mode 100644
index 3e7d91ae64e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-5-00000036-0000-0045-0000-00610000002a"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_3.json b/libs/wire-api/test/golden/testObject_AssetKey_user_3.json
index 9673ba4a07e..dcce42aa81d 100644
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_3.json
+++ b/libs/wire-api/test/golden/testObject_AssetKey_user_3.json
@@ -1 +1 @@
-"3-5-00000024-0000-004b-0000-004b00000058"
\ No newline at end of file
+"3-5-00000024-0000-004b-0000-004b00000058"
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_4.json b/libs/wire-api/test/golden/testObject_AssetKey_user_4.json
index 3739a5c181c..07f1f0408f6 100644
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_4.json
+++ b/libs/wire-api/test/golden/testObject_AssetKey_user_4.json
@@ -1 +1 @@
-"3-1-00000068-0000-0026-0000-006e00000047"
\ No newline at end of file
+"3-1-00000068-0000-0026-0000-006e00000047"
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_5.json b/libs/wire-api/test/golden/testObject_AssetKey_user_5.json
index 5aba79b7df9..fbe79185f2b 100644
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_5.json
+++ b/libs/wire-api/test/golden/testObject_AssetKey_user_5.json
@@ -1 +1 @@
-"3-2-00000066-0000-0009-0000-00410000003a"
\ No newline at end of file
+"3-2-00000066-0000-0009-0000-00410000003a"
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_6.json b/libs/wire-api/test/golden/testObject_AssetKey_user_6.json
deleted file mode 100644
index 9fcf2274de0..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-3-00000006-0000-0057-0000-005b00000042"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_7.json b/libs/wire-api/test/golden/testObject_AssetKey_user_7.json
deleted file mode 100644
index a0964c011cb..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-3-0000002e-0000-0075-0000-00500000003e"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_8.json b/libs/wire-api/test/golden/testObject_AssetKey_user_8.json
deleted file mode 100644
index 94a830eb734..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-5-00000048-0000-006d-0000-00420000002c"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetKey_user_9.json b/libs/wire-api/test/golden/testObject_AssetKey_user_9.json
deleted file mode 100644
index c2ff998ec7d..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetKey_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"3-4-0000006d-0000-006f-0000-000d0000003f"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_1.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_1.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AssetRetention_user_1.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_10.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_10.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_11.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_11.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_12.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_12.json
deleted file mode 100644
index a9313eaeed8..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"volatile"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_13.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_13.json
index 44da23c616d..f72a7e2714d 100644
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_13.json
+++ b/libs/wire-api/test/golden/testObject_AssetRetention_user_13.json
@@ -1 +1 @@
-"expiring"
\ No newline at end of file
+"expiring"
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_14.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_14.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_15.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_15.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_16.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_16.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_17.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_17.json
deleted file mode 100644
index d30c4c46f35..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"persistent"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_18.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_18.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_19.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_19.json
deleted file mode 100644
index d30c4c46f35..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"persistent"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_2.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_2.json
index 6277abe1b03..2f0e29516cd 100644
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AssetRetention_user_2.json
@@ -1 +1 @@
-"eternal"
\ No newline at end of file
+"eternal"
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_20.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_20.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_3.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_3.json
index 12a4d2fe74e..25479d42b2d 100644
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_3.json
+++ b/libs/wire-api/test/golden/testObject_AssetRetention_user_3.json
@@ -1 +1 @@
-"eternal-infrequent_access"
\ No newline at end of file
+"eternal-infrequent_access"
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_4.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_4.json
deleted file mode 100644
index d30c4c46f35..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"persistent"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_5.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_5.json
deleted file mode 100644
index 6277abe1b03..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_6.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_6.json
deleted file mode 100644
index d30c4c46f35..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"persistent"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_7.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_7.json
deleted file mode 100644
index 12a4d2fe74e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal-infrequent_access"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_8.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_8.json
index a9313eaeed8..54d9b7b96ea 100644
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_8.json
+++ b/libs/wire-api/test/golden/testObject_AssetRetention_user_8.json
@@ -1 +1 @@
-"volatile"
\ No newline at end of file
+"volatile"
diff --git a/libs/wire-api/test/golden/testObject_AssetRetention_user_9.json b/libs/wire-api/test/golden/testObject_AssetRetention_user_9.json
deleted file mode 100644
index 12a4d2fe74e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetRetention_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"eternal-infrequent_access"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_1.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_1.json
index e0b02265747..a11acf5d73f 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_1.json
@@ -1,4 +1,4 @@
 {
-    "retention": "expiring",
-    "public": true
-}
\ No newline at end of file
+    "public": true,
+    "retention": "expiring"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_10.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_10.json
index 2053a7741e2..9f0ab9713ed 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_10.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_10.json
@@ -1,4 +1,4 @@
 {
-    "retention": "persistent",
-    "public": false
-}
\ No newline at end of file
+    "public": false,
+    "retention": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_11.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_11.json
deleted file mode 100644
index 448eb788393..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_11.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "retention": "eternal-infrequent_access",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_12.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_12.json
deleted file mode 100644
index 2053a7741e2..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_12.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "retention": "persistent",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_13.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_13.json
deleted file mode 100644
index 95e22b65ab4..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "public": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_14.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_14.json
index 9b082f1f3db..09dee19bc35 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_14.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_14.json
@@ -1,4 +1,4 @@
 {
-    "retention": "eternal",
-    "public": false
-}
\ No newline at end of file
+    "public": false,
+    "retention": "eternal"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_15.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_15.json
index 18920906a99..52ab0b0c503 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_15.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_15.json
@@ -1,4 +1,4 @@
 {
-    "retention": "volatile",
-    "public": false
-}
\ No newline at end of file
+    "public": false,
+    "retention": "volatile"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_16.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_16.json
index 38a246dc4db..5e3994f4007 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_16.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_16.json
@@ -1,4 +1,4 @@
 {
-    "retention": "persistent",
-    "public": true
-}
\ No newline at end of file
+    "public": true,
+    "retention": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_17.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_17.json
deleted file mode 100644
index e0b02265747..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_17.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "retention": "expiring",
-    "public": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_18.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_18.json
deleted file mode 100644
index 448eb788393..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_18.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "retention": "eternal-infrequent_access",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_19.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_19.json
index 800fc013da7..ab0eec7259e 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_19.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_19.json
@@ -1,4 +1,4 @@
 {
-    "retention": "eternal-infrequent_access",
-    "public": true
-}
\ No newline at end of file
+    "public": true,
+    "retention": "eternal-infrequent_access"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_2.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_2.json
index 7f499300dd2..c43f6fd2516 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_2.json
@@ -1,4 +1,4 @@
 {
-    "retention": "expiring",
-    "public": false
-}
\ No newline at end of file
+    "public": false,
+    "retention": "expiring"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_20.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_20.json
index 5c67340621f..90c4e3e145b 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_20.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_20.json
@@ -1,4 +1,4 @@
 {
-    "retention": "eternal",
-    "public": true
-}
\ No newline at end of file
+    "public": true,
+    "retention": "eternal"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_3.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_3.json
index d461488d7a0..a7d1bde27e9 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_3.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_3.json
@@ -1,3 +1,3 @@
 {
     "public": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_4.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_4.json
deleted file mode 100644
index d461488d7a0..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_5.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_5.json
index 95e22b65ab4..734aced677a 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_5.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_5.json
@@ -1,3 +1,3 @@
 {
     "public": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_6.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_6.json
index 448eb788393..8eb71287a64 100644
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_6.json
+++ b/libs/wire-api/test/golden/testObject_AssetSettings_user_6.json
@@ -1,4 +1,4 @@
 {
-    "retention": "eternal-infrequent_access",
-    "public": false
-}
\ No newline at end of file
+    "public": false,
+    "retention": "eternal-infrequent_access"
+}
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_7.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_7.json
deleted file mode 100644
index 2053a7741e2..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_7.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "retention": "persistent",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_8.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_8.json
deleted file mode 100644
index 2053a7741e2..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_8.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "retention": "persistent",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSettings_user_9.json b/libs/wire-api/test/golden/testObject_AssetSettings_user_9.json
deleted file mode 100644
index d461488d7a0..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetSettings_user_9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_1.json b/libs/wire-api/test/golden/testObject_AssetSize_user_1.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_1.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_10.json b/libs/wire-api/test/golden/testObject_AssetSize_user_10.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_10.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_10.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_11.json b/libs/wire-api/test/golden/testObject_AssetSize_user_11.json
index 08206fc06d3..cb6a2724145 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_11.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_11.json
@@ -1 +1 @@
-"complete"
\ No newline at end of file
+"complete"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_12.json b/libs/wire-api/test/golden/testObject_AssetSize_user_12.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_12.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_12.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_13.json b/libs/wire-api/test/golden/testObject_AssetSize_user_13.json
index 08206fc06d3..cb6a2724145 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_13.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_13.json
@@ -1 +1 @@
-"complete"
\ No newline at end of file
+"complete"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_14.json b/libs/wire-api/test/golden/testObject_AssetSize_user_14.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_14.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_14.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_15.json b/libs/wire-api/test/golden/testObject_AssetSize_user_15.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_15.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_15.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_16.json b/libs/wire-api/test/golden/testObject_AssetSize_user_16.json
index 08206fc06d3..cb6a2724145 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_16.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_16.json
@@ -1 +1 @@
-"complete"
\ No newline at end of file
+"complete"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_17.json b/libs/wire-api/test/golden/testObject_AssetSize_user_17.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_17.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_17.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_18.json b/libs/wire-api/test/golden/testObject_AssetSize_user_18.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_18.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_18.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_19.json b/libs/wire-api/test/golden/testObject_AssetSize_user_19.json
index 08206fc06d3..cb6a2724145 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_19.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_19.json
@@ -1 +1 @@
-"complete"
\ No newline at end of file
+"complete"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_2.json b/libs/wire-api/test/golden/testObject_AssetSize_user_2.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_2.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_2.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_20.json b/libs/wire-api/test/golden/testObject_AssetSize_user_20.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_20.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_20.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_3.json b/libs/wire-api/test/golden/testObject_AssetSize_user_3.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_3.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_3.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_4.json b/libs/wire-api/test/golden/testObject_AssetSize_user_4.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_4.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_4.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_5.json b/libs/wire-api/test/golden/testObject_AssetSize_user_5.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_5.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_5.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_6.json b/libs/wire-api/test/golden/testObject_AssetSize_user_6.json
index 08206fc06d3..cb6a2724145 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_6.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_6.json
@@ -1 +1 @@
-"complete"
\ No newline at end of file
+"complete"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_7.json b/libs/wire-api/test/golden/testObject_AssetSize_user_7.json
index 08206fc06d3..cb6a2724145 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_7.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_7.json
@@ -1 +1 @@
-"complete"
\ No newline at end of file
+"complete"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_8.json b/libs/wire-api/test/golden/testObject_AssetSize_user_8.json
index 5afc7282a77..a19e88467bd 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_8.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_8.json
@@ -1 +1 @@
-"preview"
\ No newline at end of file
+"preview"
diff --git a/libs/wire-api/test/golden/testObject_AssetSize_user_9.json b/libs/wire-api/test/golden/testObject_AssetSize_user_9.json
index 08206fc06d3..cb6a2724145 100644
--- a/libs/wire-api/test/golden/testObject_AssetSize_user_9.json
+++ b/libs/wire-api/test/golden/testObject_AssetSize_user_9.json
@@ -1 +1 @@
-"complete"
\ No newline at end of file
+"complete"
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_1.json b/libs/wire-api/test/golden/testObject_AssetToken_user_1.json
index e46dba8f147..4f9f62180cf 100644
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_1.json
+++ b/libs/wire-api/test/golden/testObject_AssetToken_user_1.json
@@ -1 +1 @@
-"19gg"
\ No newline at end of file
+"19gg"
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_10.json b/libs/wire-api/test/golden/testObject_AssetToken_user_10.json
deleted file mode 100644
index fd2c39bc347..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"9hOt6KC9zw=="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_11.json b/libs/wire-api/test/golden/testObject_AssetToken_user_11.json
deleted file mode 100644
index 1d46b9727ea..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"ig=="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_12.json b/libs/wire-api/test/golden/testObject_AssetToken_user_12.json
index 1322240976f..07bd6fa6159 100644
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_12.json
+++ b/libs/wire-api/test/golden/testObject_AssetToken_user_12.json
@@ -1 +1 @@
-"CD3Zk7PTkfn816hCz42NE41KpPd4"
\ No newline at end of file
+"CD3Zk7PTkfn816hCz42NE41KpPd4"
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_13.json b/libs/wire-api/test/golden/testObject_AssetToken_user_13.json
deleted file mode 100644
index 31e7cec3a9f..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"KA=="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_14.json b/libs/wire-api/test/golden/testObject_AssetToken_user_14.json
deleted file mode 100644
index 4c3d1033ac9..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"AjiBLIWgKwB59OX1S7LHoq46NIn8"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_15.json b/libs/wire-api/test/golden/testObject_AssetToken_user_15.json
index d219e18e1e6..7b544508499 100644
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_15.json
+++ b/libs/wire-api/test/golden/testObject_AssetToken_user_15.json
@@ -1 +1 @@
-"G7HpRJ4qnEkkbbswnSW9SAEZtXI9vI9MgQ=="
\ No newline at end of file
+"G7HpRJ4qnEkkbbswnSW9SAEZtXI9vI9MgQ=="
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_16.json b/libs/wire-api/test/golden/testObject_AssetToken_user_16.json
deleted file mode 100644
index fa466b4235e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"uiNx"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_17.json b/libs/wire-api/test/golden/testObject_AssetToken_user_17.json
deleted file mode 100644
index 08b40347662..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"gt6pOuuPgK_aR8yhdeT0"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_18.json b/libs/wire-api/test/golden/testObject_AssetToken_user_18.json
deleted file mode 100644
index 0671a0178b8..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"Utst"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_19.json b/libs/wire-api/test/golden/testObject_AssetToken_user_19.json
deleted file mode 100644
index 8d45e96a2f1..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"EGqzOUnKZMcstcko_IWm4NSQdxHkO5n-LY0="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_2.json b/libs/wire-api/test/golden/testObject_AssetToken_user_2.json
deleted file mode 100644
index 07272669da5..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-"b_ZA1Q=="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_20.json b/libs/wire-api/test/golden/testObject_AssetToken_user_20.json
index 0c16effa3d5..e3320e1b7b5 100644
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_20.json
+++ b/libs/wire-api/test/golden/testObject_AssetToken_user_20.json
@@ -1 +1 @@
-"W2jwr0ImzE7IaMvETUb5Bt1rn3E="
\ No newline at end of file
+"W2jwr0ImzE7IaMvETUb5Bt1rn3E="
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_3.json b/libs/wire-api/test/golden/testObject_AssetToken_user_3.json
deleted file mode 100644
index 7cac5e42917..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"mRsBYG9VkQ=="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_4.json b/libs/wire-api/test/golden/testObject_AssetToken_user_4.json
index 9360a68d622..7f5cab34c63 100644
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_4.json
+++ b/libs/wire-api/test/golden/testObject_AssetToken_user_4.json
@@ -1 +1 @@
-"NMWuAr4DWSWYN1yQACS39YW-"
\ No newline at end of file
+"NMWuAr4DWSWYN1yQACS39YW-"
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_5.json b/libs/wire-api/test/golden/testObject_AssetToken_user_5.json
index dcf74c92e66..2c0ace52440 100644
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_5.json
+++ b/libs/wire-api/test/golden/testObject_AssetToken_user_5.json
@@ -1 +1 @@
-"1M4G-RUbZgqvkfQ="
\ No newline at end of file
+"1M4G-RUbZgqvkfQ="
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_6.json b/libs/wire-api/test/golden/testObject_AssetToken_user_6.json
deleted file mode 100644
index b6171856e73..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"RHHXsYEBcMg8s7Vf7z7qqE4="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_7.json b/libs/wire-api/test/golden/testObject_AssetToken_user_7.json
index 4dbe6f2f158..ea98535efd5 100644
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_7.json
+++ b/libs/wire-api/test/golden/testObject_AssetToken_user_7.json
@@ -1 +1 @@
-"3Z8JnP8YkWspJHvxbfa3fd2VyR9S_PMcVtN-HA=="
\ No newline at end of file
+"3Z8JnP8YkWspJHvxbfa3fd2VyR9S_PMcVtN-HA=="
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_8.json b/libs/wire-api/test/golden/testObject_AssetToken_user_8.json
deleted file mode 100644
index 367d5613616..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"Fw=="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_AssetToken_user_9.json b/libs/wire-api/test/golden/testObject_AssetToken_user_9.json
deleted file mode 100644
index b13ca4e877e..00000000000
--- a/libs/wire-api/test/golden/testObject_AssetToken_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"bKnnzlrUIHS3jjo="
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_1.json b/libs/wire-api/test/golden/testObject_Asset_asset_1.json
index d2148696d51..9bef9870da2 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_1.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_1.json
@@ -1,5 +1,5 @@
 {
     "expires": "1864-04-30T15:58:55.452Z",
-    "token": "Kun4JaxR6QuASXywDhzx",
-    "key": "3-5-0000004b-0000-0017-0000-003e00000033"
-}
\ No newline at end of file
+    "key": "3-5-0000004b-0000-0017-0000-003e00000033",
+    "token": "Kun4JaxR6QuASXywDhzx"
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_10.json b/libs/wire-api/test/golden/testObject_Asset_asset_10.json
index b4fcc9d0502..1d25e3b58cd 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_10.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_10.json
@@ -1,3 +1,3 @@
 {
     "key": "3-1-00000065-0000-0080-0000-003400000061"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_11.json b/libs/wire-api/test/golden/testObject_Asset_asset_11.json
index 6034578f1ad..d6e74f8e6ee 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_11.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_11.json
@@ -1,5 +1,5 @@
 {
     "expires": "1864-05-11T16:58:59.746Z",
-    "token": "DnlRW9Q=",
-    "key": "3-4-00000014-0000-0077-0000-001e00000076"
-}
\ No newline at end of file
+    "key": "3-4-00000014-0000-0077-0000-001e00000076",
+    "token": "DnlRW9Q="
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_12.json b/libs/wire-api/test/golden/testObject_Asset_asset_12.json
index 0b3ee8ce673..eda1a4fdd6d 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_12.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_12.json
@@ -1,3 +1,3 @@
 {
     "key": "3-2-0000001d-0000-0076-0000-003800000021"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_13.json b/libs/wire-api/test/golden/testObject_Asset_asset_13.json
index d052a119297..8e07a56197e 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_13.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_13.json
@@ -1,5 +1,5 @@
 {
     "expires": "1864-04-30T19:37:57.302Z",
-    "token": "n7CJBcdOSKznRmOypWXsGfEE0g==",
-    "key": "3-4-00000030-0000-0036-0000-003c0000000a"
-}
\ No newline at end of file
+    "key": "3-4-00000030-0000-0036-0000-003c0000000a",
+    "token": "n7CJBcdOSKznRmOypWXsGfEE0g=="
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_14.json b/libs/wire-api/test/golden/testObject_Asset_asset_14.json
index 00193477740..442e5562469 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_14.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_14.json
@@ -1,5 +1,5 @@
 {
     "expires": "1864-05-06T09:09:55.146Z",
-    "token": "LYfUg4qlMjw=",
-    "key": "3-4-00000047-0000-0012-0000-005500000062"
-}
\ No newline at end of file
+    "key": "3-4-00000047-0000-0012-0000-005500000062",
+    "token": "LYfUg4qlMjw="
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_15.json b/libs/wire-api/test/golden/testObject_Asset_asset_15.json
index 23b48a9ea9f..f49cd13e46a 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_15.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_15.json
@@ -1,3 +1,3 @@
 {
     "key": "3-2-00000030-0000-0074-0000-00660000004c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_16.json b/libs/wire-api/test/golden/testObject_Asset_asset_16.json
index b204f76fe23..69e6e5f1816 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_16.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_16.json
@@ -1,4 +1,4 @@
 {
     "expires": "1864-05-04T02:19:12.520Z",
     "key": "3-3-00000048-0000-0051-0000-005d00000070"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_17.json b/libs/wire-api/test/golden/testObject_Asset_asset_17.json
index 7be29469f58..ccb77a2d1c5 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_17.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_17.json
@@ -1,4 +1,4 @@
 {
     "expires": "1864-04-09T17:00:39.763Z",
     "key": "3-2-00000017-0000-000d-0000-00680000003e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_18.json b/libs/wire-api/test/golden/testObject_Asset_asset_18.json
index 74715c55448..516f95363ff 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_18.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_18.json
@@ -1,4 +1,4 @@
 {
     "expires": "1864-04-12T20:53:21.250Z",
     "key": "3-1-0000003e-0000-0032-0000-004d00000070"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_19.json b/libs/wire-api/test/golden/testObject_Asset_asset_19.json
index 86a1563fdcc..4b62e85e30c 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_19.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_19.json
@@ -1,4 +1,4 @@
 {
-    "token": "4wm3D03aqvZ_0oKFtwXCYnSTC7m_z1E=",
-    "key": "3-3-00000021-0000-0062-0000-002a0000006b"
-}
\ No newline at end of file
+    "key": "3-3-00000021-0000-0062-0000-002a0000006b",
+    "token": "4wm3D03aqvZ_0oKFtwXCYnSTC7m_z1E="
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_2.json b/libs/wire-api/test/golden/testObject_Asset_asset_2.json
index 337a5dd2bb6..3a8d556bd57 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_2.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_2.json
@@ -1,5 +1,5 @@
 {
     "expires": "1864-06-04T17:39:43.924Z",
-    "token": "mPuul678vuJVZ_u9lQ==",
-    "key": "3-4-00000008-0000-006c-0000-001900000036"
-}
\ No newline at end of file
+    "key": "3-4-00000008-0000-006c-0000-001900000036",
+    "token": "mPuul678vuJVZ_u9lQ=="
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_20.json b/libs/wire-api/test/golden/testObject_Asset_asset_20.json
index 4a8934956ca..ee08bfe6d13 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_20.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_20.json
@@ -1,4 +1,4 @@
 {
     "expires": "1864-04-25T16:48:39.986Z",
     "key": "3-3-00000053-0000-0072-0000-001700000047"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_3.json b/libs/wire-api/test/golden/testObject_Asset_asset_3.json
index a617f7427a9..eb3537825f3 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_3.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_3.json
@@ -1,4 +1,4 @@
 {
     "expires": "1864-05-18T20:18:13.438Z",
     "key": "3-1-00000055-0000-0071-0000-002e00000020"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_4.json b/libs/wire-api/test/golden/testObject_Asset_asset_4.json
index d060efcf6d2..d43de9f1101 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_4.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_4.json
@@ -1,4 +1,4 @@
 {
-    "token": "IRKruiPSiANiX1fL",
-    "key": "3-4-00000063-0000-0044-0000-003000000059"
-}
\ No newline at end of file
+    "key": "3-4-00000063-0000-0044-0000-003000000059",
+    "token": "IRKruiPSiANiX1fL"
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_5.json b/libs/wire-api/test/golden/testObject_Asset_asset_5.json
index 19a555ce733..0bd2857635e 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_5.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_5.json
@@ -1,5 +1,5 @@
 {
     "expires": "1864-05-11T14:38:25.874Z",
-    "token": "BrbiaM1RxJlqjlqq7quuPSc=",
-    "key": "3-3-00000019-0000-005b-0000-001d00000056"
-}
\ No newline at end of file
+    "key": "3-3-00000019-0000-005b-0000-001d00000056",
+    "token": "BrbiaM1RxJlqjlqq7quuPSc="
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_6.json b/libs/wire-api/test/golden/testObject_Asset_asset_6.json
index 642e1c07b85..8d9571f2dc1 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_6.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_6.json
@@ -1,4 +1,4 @@
 {
     "expires": "1864-05-25T01:19:16.676Z",
     "key": "3-2-0000000e-0000-0046-0000-00560000005e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_7.json b/libs/wire-api/test/golden/testObject_Asset_asset_7.json
index ba0e6f98651..b97f270a807 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_7.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_7.json
@@ -1,5 +1,5 @@
 {
     "expires": "1864-04-14T08:45:43.050Z",
-    "token": "_N9ERJGmbZtd6XlW_6O12bxuNe4=",
-    "key": "3-1-00000013-0000-002e-0000-003000000042"
-}
\ No newline at end of file
+    "key": "3-1-00000013-0000-002e-0000-003000000042",
+    "token": "_N9ERJGmbZtd6XlW_6O12bxuNe4="
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_8.json b/libs/wire-api/test/golden/testObject_Asset_asset_8.json
index 8f7748986cf..434d93f714c 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_8.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_8.json
@@ -1,3 +1,3 @@
 {
     "key": "3-1-00000073-0000-003e-0000-00120000000c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Asset_asset_9.json b/libs/wire-api/test/golden/testObject_Asset_asset_9.json
index afee06874d8..5e7097dcd98 100644
--- a/libs/wire-api/test/golden/testObject_Asset_asset_9.json
+++ b/libs/wire-api/test/golden/testObject_Asset_asset_9.json
@@ -1,4 +1,4 @@
 {
     "expires": "1864-05-21T01:34:09.726Z",
     "key": "3-2-00000006-0000-004b-0000-004f00000025"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_1.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_1.json
index 5bb9b4e73ad..e1710c7144c 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_1.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_1.json
@@ -1,6 +1,6 @@
 {
-    "icon": "Coq쳋\u000b𬟀7\u0016\\N𠯲⃣h3 癆;X\u0002\u0007\u0007$|D\u0000\u0001h'3-m7􇙴\u000ep囆`􋂴6QF\u0018\u00019􃠮\u0017㶃FP;lm􆥍𪐷𠺽堪n:\rf󿈅\\:裡\u001d\u001d梂\u0019壬i󲀃\u0003jj}󶪤~󱢤{; 𝄭󵯎\u001aL&%2𩮀;@\\2`gA󰒃0𧨥2𧳲h\u001cuF\u0014䏠\u001b\u001d\u000e\u000bYnKy?v🨊H\u000ccLdBy𩫪4I􎰃i󸔥\u0017c6f\u000b\u0001\u0013󸭔ce􈣍\u000es3L&",
-    "name": "\u000ce\u0005󷀰zm𨦻6+)g;5󱬄Z 41\u0011\n\u0002\u0003%|\u0000M󳎰S=`IUK1󴿊]X\r\u001aa\u0019!𒊧+\u0003epRw\u0006\u0005#🍛􃎋󼾎󸰲UX𐔅]>i&r𡩍􁲩Z􅕍6\u0014\u0014󺁲􂠯󿅂\u001b\u0016a4\u0000􂬒󸂌𞋬\tLZ\u0006w$=\u0016u\u0003E1C'\u0005𥃔랛𠶎$𘢤􏤆9;#󿄛󷺏&\u001b󺭤k/\tu\\pk\u0000\u0002􈡶)\u001c/Lni]Q\u0000\u000fZ|=\u0011V]]\u001c5𦌻U6>(䍑'\u0018𫷞%'I1-D\"􌈿\n𓍫\npkHY#\u0000󷱔u]􇖒𣿖\u0002\u001fj'󲪯'\u0018󾛠&詄E鎪=𠾒Da\u0002\u000b􌨿=􈢭V#󲞟\u001e\u001cN#`uny󴺪􋓲53#/|,+ópW꺱i4j",
     "currency": "XUA",
-    "icon_key": "\u0006c𥁱L ,\u0002\u0015[\u001a\u0011\u001dxe󴑯c\u001f\u0014<`|熹𣸻Q󻃻󱌙<{\u0000^\u001cT𢛰J􅭛U\u0004\u0016︉\u0013G󴺾+\u0019𬏝xr\u000b绁\u001byTD@>Ou𑍠jꨶE\u00026e󰊟\u000e\u001b𡂟34􃤪ꀨ󸤧8􂒦𧹈uxWꏟ􇹽Y\u0006𢥁(\u0018\u001c$D􁪲𤋤跃\u000f3􈒰#\u0016?\u0003\u00060*W3\u0006􉄿i覟h\u0015-꘡󼪝\u0006H?\\Tv􌐘퐺Q띕\u0010-@k%{=4\u001a!w&󾠃D\u0012cuT^\u0014\u001dH\u0008𡫡^]󰭄jXA󶦥𠧁@fV,OA𭋵霕F𥦖Az^g7𫘰),C󹏯}.𑰠󳏡~V􆽕󺂺(9^z󷯅𐜚3}Gj􇑫\u000cd>􉪙Y𫑵p#^􁜧L`S~􌺀\u00123\u0004𣞧怏𖩋㑪as:F\u0003"
-}
\ No newline at end of file
+    "icon": "Coq쳋\u000b𬟀7\u0016\\N𠯲⃣h3 癆;X\u0002\u0007\u0007$|D\u0000\u0001h'3-m7􇙴\u000ep囆`􋂴6QF\u0018\u00019􃠮\u0017㶃FP;lm􆥍𪐷𠺽堪n:\rf󿈅\\:裡\u001d\u001d梂\u0019壬i󲀃\u0003jj}󶪤~󱢤{; 𝄭󵯎\u001aL&%2𩮀;@\\2`gA󰒃0𧨥2𧳲h\u001cuF\u0014䏠\u001b\u001d\u000e\u000bYnKy?v🨊H\u000ccLdBy𩫪4I􎰃i󸔥\u0017c6f\u000b\u0001\u0013󸭔ce􈣍\u000es3L&",
+    "icon_key": "\u0006c𥁱L ,\u0002\u0015[\u001a\u0011\u001dxe󴑯c\u001f\u0014<`|熹𣸻Q󻃻󱌙<{\u0000^\u001cT𢛰J􅭛U\u0004\u0016︉\u0013G󴺾+\u0019𬏝xr\u000b绁\u001byTD@>Ou𑍠jꨶE\u00026e󰊟\u000e\u001b𡂟34􃤪ꀨ󸤧8􂒦𧹈uxWꏟ􇹽Y\u0006𢥁(\u0018\u001c$D􁪲𤋤跃\u000f3􈒰#\u0016?\u0003\u00060*W3\u0006􉄿i覟h\u0015-꘡󼪝\u0006H?\\Tv􌐘퐺Q띕\u0010-@k%{=4\u001a!w&󾠃D\u0012cuT^\u0014\u001dH\u0008𡫡^]󰭄jXA󶦥𠧁@fV,OA𭋵霕F𥦖Az^g7𫘰),C󹏯}.𑰠󳏡~V􆽕󺂺(9^z󷯅𐜚3}Gj􇑫\u000cd>􉪙Y𫑵p#^􁜧L`S~􌺀\u00123\u0004𣞧怏𖩋㑪as:F\u0003",
+    "name": "\u000ce\u0005󷀰zm𨦻6+)g;5󱬄Z 41\u0011\n\u0002\u0003%|\u0000M󳎰S=`IUK1󴿊]X\r\u001aa\u0019!𒊧+\u0003epRw\u0006\u0005#🍛􃎋󼾎󸰲UX𐔅]>i&r𡩍􁲩Z􅕍6\u0014\u0014󺁲􂠯󿅂\u001b\u0016a4\u0000􂬒󸂌𞋬\tLZ\u0006w$=\u0016u\u0003E1C'\u0005𥃔랛𠶎$𘢤􏤆9;#󿄛󷺏&\u001b󺭤k/\tu\\pk\u0000\u0002􈡶)\u001c/Lni]Q\u0000\u000fZ|=\u0011V]]\u001c5𦌻U6>(䍑'\u0018𫷞%'I1-D\"􌈿\n𓍫\npkHY#\u0000󷱔u]􇖒𣿖\u0002\u001fj'󲪯'\u0018󾛠&詄E鎪=𠾒Da\u0002\u000b􌨿=􈢭V#󲞟\u001e\u001cN#`uny󴺪􋓲53#/|,+ópW꺱i4j"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_10.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_10.json
index 8b68b7976ea..75e65570892 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_10.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_10.json
@@ -1,6 +1,6 @@
 {
-    "icon": "+Y\u0001\n𩺢_{摇婮hFn􌿱-里o\u0003K6􀝇b4#~f\u0019🨻㰰\u001c\u0004\u000b𢬢9-[n󵲱󶔏z*􏂱\u000b\u0017X\u0006󾗣\u0017z\u001a􊅵𓃔s1 [󵍋\u0014|𘅣MoY6\u0014d𢨂E\u0005\u0001𑚶Oh#􈳎u!𩁓[𪒦(뽗$}Y𨪜<\u001b*P1A𮂌*𧩉G4dx𣾵󶘿@;x􁫒d\u0012\u000cp\u0001氶4WY\u0005\u0000􏺺D^栀-I􅊚kC_新S\u0017>􆤧8\u0014Wb}$+􍦏y\u0000m\nR􀪮!(󶄘􃞎\t𬏆KF1[\\(N𥞋(U\u0002Nݨ3󷐒z{$幼Nv3NY\u0014f\u0011nDfh贾S\u0000󰣄\u0010%e󺷎o󽧞\u0018qq[w􊰠\u000c9:ऽZ|+3o\n/󱒻SM|J[,􂣯2󴊈z\u0014\u001f79}\u0004𩮭%V󺩉l_󲙮)󲜥I",
-    "name": "􀇱𩉯󱃗\u00158u;\u0017􃯹\u0015\rA$#,𦻗\u0019\u001c󱳊Y\u0003𑑊\u0000(7󴃚1􈏉\t𠚩\u0001:?$s]1U𝍶\\:3𣖵n?K~",
     "currency": "QAR",
-    "icon_key": "\u001dnlrE􅁦H\u001d\u0015~\u001f\u001b|-𦰡Zo\\$\u0017󹺝\u001dC󷨪\u0016\u0003Fj{<7􅱝m'\u001b\u0018Bn_N{䉊4\\g\u000b𧫇\u000bsg󻼾\\𦑶8\u0012F@t\u0001\u0015Xy+\u001c\u000f󶡌$󿱑𥇲󸩫)\u000cC󻤖_r\u001a󿲑\u001b&4Pm\u0007-wS󶝋n竹]\u0016󶮺:\r\nO󻆌\u000f+9q\u0004]RyY\u001e𩏱#6'mk𠪦북/\u0017ZZ󿜣|L𠾤o􍗧m_`;,􍞁D構4󽆍\u0000톚\u001d8뢭d𗗿𤊓󰂗3#􏗫𗨼O𨴮0(F\u0004"
-}
\ No newline at end of file
+    "icon": "+Y\u0001\n𩺢_{摇婮hFn􌿱-里o\u0003K6􀝇b4#~f\u0019🨻㰰\u001c\u0004\u000b𢬢9-[n󵲱󶔏z*􏂱\u000b\u0017X\u0006󾗣\u0017z\u001a􊅵𓃔s1 [󵍋\u0014|𘅣MoY6\u0014d𢨂E\u0005\u0001𑚶Oh#􈳎u!𩁓[𪒦(뽗$}Y𨪜<\u001b*P1A𮂌*𧩉G4dx𣾵󶘿@;x􁫒d\u0012\u000cp\u0001氶4WY\u0005\u0000􏺺D^栀-I􅊚kC_新S\u0017>􆤧8\u0014Wb}$+􍦏y\u0000m\nR􀪮!(󶄘􃞎\t𬏆KF1[\\(N𥞋(U\u0002Nݨ3󷐒z{$幼Nv3NY\u0014f\u0011nDfh贾S\u0000󰣄\u0010%e󺷎o󽧞\u0018qq[w􊰠\u000c9:ऽZ|+3o\n/󱒻SM|J[,􂣯2󴊈z\u0014\u001f79}\u0004𩮭%V󺩉l_󲙮)󲜥I",
+    "icon_key": "\u001dnlrE􅁦H\u001d\u0015~\u001f\u001b|-𦰡Zo\\$\u0017󹺝\u001dC󷨪\u0016\u0003Fj{<7􅱝m'\u001b\u0018Bn_N{䉊4\\g\u000b𧫇\u000bsg󻼾\\𦑶8\u0012F@t\u0001\u0015Xy+\u001c\u000f󶡌$󿱑𥇲󸩫)\u000cC󻤖_r\u001a󿲑\u001b&4Pm\u0007-wS󶝋n竹]\u0016󶮺:\r\nO󻆌\u000f+9q\u0004]RyY\u001e𩏱#6'mk𠪦북/\u0017ZZ󿜣|L𠾤o􍗧m_`;,􍞁D構4󽆍\u0000톚\u001d8뢭d𗗿𤊓󰂗3#􏗫𗨼O𨴮0(F\u0004",
+    "name": "􀇱𩉯󱃗\u00158u;\u0017􃯹\u0015\rA$#,𦻗\u0019\u001c󱳊Y\u0003𑑊\u0000(7󴃚1􈏉\t𠚩\u0001:?$s]1U𝍶\\:3𣖵n?K~"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_11.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_11.json
index fad6a1910f5..3b0db770beb 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_11.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_11.json
@@ -1,6 +1,6 @@
 {
-    "icon": "!5Ȁ􀝭䓜I􍺝q__i𝍅V𫆁󼩬\u000c%T'Μᾔ'%5y\u000fj󷖞qK\u0003VJ􋷦Q􈫧x8\u0014\t苞r\u0000\r⊬⣲􋍠􊖕,;\u000c󷯒^󸌰m\u001c~L:󰵔\u0003󸧇i𤔻\u0015&\u0005BFR\u0015􄢄󶊼v󿽗j䬷b'd2D🝒9o𓃤\u0019㌕!`{󿯨/]\u001c)\u001aq潢F\u001dS󳉵𝅆\u0011<\u0001\u001d01`夐\"Qzt􋨭\u001b|𤸒w\u001c􍚤󱳇+ =Xhl P􋣒󻽒𤓒oPb8$􁻘\u0012􀒓5\u0013j􎌠sU\"#@u{Yﱠw\r\u0019\u0010AUae𐘆;\"uP{\u000b\nm󹽈}\u0005L\u000f7𦜡𨟖:\u001e= Yt5Nj㫕cYf\u001b󶟐,\u0008ZCPn󸽪\u0015U𬊜|\u00072뜬z杺\u0000畊RaO[\u0011WW󺟸\u001a錩2\u0007豹Fjs\u0014(󼦬𩊎𝀩󰾺Hỹl𡔷󱃛ꎾg8\u0011\u0004𦑳rC\u0001x",
-    "name": "\u000f𗓢\u000c5h𥃉1G𪖚\u0017a􌅀V\u001de+SH|\u000ce􄂞𩘸%8𬫻jWZ:􀼂O)󵳙\u0008\u0019􎮶U􇟰j0V3U䌓󸉗i\u0007󲑘󼗶󲗉<n\u0008唄]Mo󷓁y\u0005BS7Qh#\u001bI`=󽹆󳵴5\"*i⁌􌭡𗿛􍆆v󳢑&𨈚)<d\u0002\u0008\u001d􀶤=R\u0008𧣥\"㳦p󺫪\u0014􈏐\"8*CP𬋛+\u0003\u001f𣊑[/\u00067G/󱝿\\\u000exwx\u0013<R㤹e\u001f𧔇󺹪>~\u001c󲀅,\n僝𫆻󴽃􀱡\u0015\u001c􁙅~VWB(jD&i󽓜􋐆{\u001c|\u000e8󷺃ﾔ󴒰󶈻L󺁔2,|E筫􉥤g󻅤\u0006(8?\u0019\u0007L@",
     "currency": "NPR",
-    "icon_key": "5;\u0018'BNﱔ:j\u0004r\u0011泻磒鱕\u0000\t🢠𫍐~Tq&k\u000eX6cP\u0000𮅪󵞳7􈻌\u0016\u001ez䇂䷍󲅒)%}$O'.ᜯ#g"
-}
\ No newline at end of file
+    "icon": "!5Ȁ􀝭䓜I􍺝q__i𝍅V𫆁󼩬\u000c%T'Μᾔ'%5y\u000fj󷖞qK\u0003VJ􋷦Q􈫧x8\u0014\t苞r\u0000\r⊬⣲􋍠􊖕,;\u000c󷯒^󸌰m\u001c~L:󰵔\u0003󸧇i𤔻\u0015&\u0005BFR\u0015􄢄󶊼v󿽗j䬷b'd2D🝒9o𓃤\u0019㌕!`{󿯨/]\u001c)\u001aq潢F\u001dS󳉵𝅆\u0011<\u0001\u001d01`夐\"Qzt􋨭\u001b|𤸒w\u001c􍚤󱳇+ =Xhl P􋣒󻽒𤓒oPb8$􁻘\u0012􀒓5\u0013j􎌠sU\"#@u{Yﱠw\r\u0019\u0010AUae𐘆;\"uP{\u000b\nm󹽈}\u0005L\u000f7𦜡𨟖:\u001e= Yt5Nj㫕cYf\u001b󶟐,\u0008ZCPn󸽪\u0015U𬊜|\u00072뜬z杺\u0000畊RaO[\u0011WW󺟸\u001a錩2\u0007豹Fjs\u0014(󼦬𩊎𝀩󰾺Hỹl𡔷󱃛ꎾg8\u0011\u0004𦑳rC\u0001x",
+    "icon_key": "5;\u0018'BNﱔ:j\u0004r\u0011泻磒鱕\u0000\t🢠𫍐~Tq&k\u000eX6cP\u0000𮅪󵞳7􈻌\u0016\u001ez䇂䷍󲅒)%}$O'.ᜯ#g",
+    "name": "\u000f𗓢\u000c5h𥃉1G𪖚\u0017a􌅀V\u001de+SH|\u000ce􄂞𩘸%8𬫻jWZ:􀼂O)󵳙\u0008\u0019􎮶U􇟰j0V3U䌓󸉗i\u0007󲑘󼗶󲗉<n\u0008唄]Mo󷓁y\u0005BS7Qh#\u001bI`=󽹆󳵴5\"*i⁌􌭡𗿛􍆆v󳢑&𨈚)<d\u0002\u0008\u001d􀶤=R\u0008𧣥\"㳦p󺫪\u0014􈏐\"8*CP𬋛+\u0003\u001f𣊑[/\u00067G/󱝿\\\u000exwx\u0013<R㤹e\u001f𧔇󺹪>~\u001c󲀅,\n僝𫆻󴽃􀱡\u0015\u001c􁙅~VWB(jD&i󽓜􋐆{\u001c|\u000e8󷺃ﾔ󴒰󶈻L󺁔2,|E筫􉥤g󻅤\u0006(8?\u0019\u0007L@"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_12.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_12.json
index d39bfef88ab..9cb9b055e9b 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_12.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_12.json
@@ -1,5 +1,5 @@
 {
+    "currency": "GNF",
     "icon": "l\u0014]\u0007`N\u0012􉇝飯􏫸󺙟䔝\u0002\u0015Xw󹓸)\u00054𗦨󿙗\u0018uV𣳒𦰅T𣯵痴P9\u0008P?J󺝯m|=pk\u001d\u0007-9@J\tP􄻇󻡢􆬮󾉥𥺍,\u0018🠯\u001e􏀣g#󵍰E9󻔜ky8\u0017𖡛e(v\u0018챌0󱚷ॢc!\u0004QGtp",
-    "name": "Y<i\u0000􈲘'yJ󵈊d\u0016h󳏁;e\u0013󺰔 伮\u0007\u0002𦈕F\t\u000f\u000b%󵁭F揃)?󽾯eW𥤱\u0011\u0000𬷾m\u00126󶘔\u001b𤷈6W\r􈂽t𫒼\n}醽\nnZ圡􄒩Q@n\u0008󳯪혽>\u0007Uh=:􀨐?󶆉V~\u000cX?)\u0013R􉶦\n1󾐹^#􈊱WepJ\u001c\u000f\u0017[ =-\u0017pu􈉄`\u0016o!폒󰢣\u0018k󳼭󵖳\u000c󶢓8NY\u001a_G&􄸖\u0000Y\u0004쵨\u00042􌼨\\\u001da5\u0011g\u0007􀝔󹁮No㍍८\u0011(𝤪\u0018\u0006􎫭_𬪷\u000c{! X \u0015\u0001䰋\u001d𗭫 H𮘹4*\u000c/𤙿X󹝏\n|.㝹rd䐘`.j:\u0018&􄸻宲󺠝\\F>*\u001d􆗺.Y\u0011\u0007\"\u0002𥻵/󲠨7𥁉a󿣲ᑞ#?LQwzpeF\t􇕈󼰚\u001bOj\\P袊踫vP2mh$(󴆛eaUw\u001a\u0008] 60\u0017􊅗S𦻏`󾜀2",
-    "currency": "GNF"
-}
\ No newline at end of file
+    "name": "Y<i\u0000􈲘'yJ󵈊d\u0016h󳏁;e\u0013󺰔 伮\u0007\u0002𦈕F\t\u000f\u000b%󵁭F揃)?󽾯eW𥤱\u0011\u0000𬷾m\u00126󶘔\u001b𤷈6W\r􈂽t𫒼\n}醽\nnZ圡􄒩Q@n\u0008󳯪혽>\u0007Uh=:􀨐?󶆉V~\u000cX?)\u0013R􉶦\n1󾐹^#􈊱WepJ\u001c\u000f\u0017[ =-\u0017pu􈉄`\u0016o!폒󰢣\u0018k󳼭󵖳\u000c󶢓8NY\u001a_G&􄸖\u0000Y\u0004쵨\u00042􌼨\\\u001da5\u0011g\u0007􀝔󹁮No㍍८\u0011(𝤪\u0018\u0006􎫭_𬪷\u000c{! X \u0015\u0001䰋\u001d𗭫 H𮘹4*\u000c/𤙿X󹝏\n|.㝹rd䐘`.j:\u0018&􄸻宲󺠝\\F>*\u001d􆗺.Y\u0011\u0007\"\u0002𥻵/󲠨7𥁉a󿣲ᑞ#?LQwzpeF\t􇕈󼰚\u001bOj\\P袊踫vP2mh$(󴆛eaUw\u001a\u0008] 60\u0017􊅗S𦻏`󾜀2"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_13.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_13.json
index 0903f5dd3c7..e0c356a660f 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_13.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_13.json
@@ -1,6 +1,6 @@
 {
-    "icon": "\u00112>ꏞG)+\"L𧝁dZQ󱓓XGMY\r~c7U􌾠i𩛒\u001f?M# \u0016\u000cEweI`ᷠ𦉖\u0012󰳌\nCO\u001c􁦬I\u0015󹅢w8􁹵\\󺝖t2🃑u\u0019\r[\\fk\u001f:Yp*?Pຟul\u0016􉺙󸮫󳌻\u0002+􂻈\u0015=닡󻘺󻝢2b,<y+wF􊛙(\t\t󴽑[󵽫F\u001f㆗\u001d2R\u0008a}󻎻𤥟N􀵮>N\r􅍢\u000f`\u0017ZD𞹲:騀𥒣𖬫󵿋!呓6\u0017=DA􃓝\u0004コ6\u0016𫚎􇍖􈴑%\u001aZ\u0000KNmJqr𫄎\u001fF𪥸0i5𣺮X\u001dKD>b􆮥E3T",
-    "name": "V\u00018(4\"zꢊAM󶺱/\"\u001b\u0001\u0001󺄠V𮒧􅚢𧔛P𢪋^\u001fH⊃I*\u0013,⻭:\ns`%}H3%\u001ee𓈸ꐯ𘉝A\rY)':!B\u0006󻽱\t\u0003rc\u00012h=I6A7g󰾴YT󱒟𪙵􀢨l󷼤D\u0005V`\u000fE\u001cE{cnx􀁔ej'{v#u8𨬷𤦚\r\u0000ﺻ^T\u0000*𤙛󽥼U渾q==\u001f𩃪6叫2F\n",
     "currency": "AUD",
-    "icon_key": "\u0011IS\u001e=xd%\u0004}T_7 􀍃qdLtTL\ruiu\u001ad􂶠𘥛\u000b\u0010Mn@+R]􀄓G\u0018瓂/H\u001b􆬄􌥁up$b2q􎬬!륋\t󲮻D川.#៤m𦵂􆪔\u0005=m󾔟\u001c\u0014𪢦6hD\u001c\u0001\u0010AsL\u000b(􁋵?u𭽲󸦇3%ปY1p󵕉\u0014Lhj%􆕨]b\u0003psL\u0007􋏠G𝂱\u0018w_"
-}
\ No newline at end of file
+    "icon": "\u00112>ꏞG)+\"L𧝁dZQ󱓓XGMY\r~c7U􌾠i𩛒\u001f?M# \u0016\u000cEweI`ᷠ𦉖\u0012󰳌\nCO\u001c􁦬I\u0015󹅢w8􁹵\\󺝖t2🃑u\u0019\r[\\fk\u001f:Yp*?Pຟul\u0016􉺙󸮫󳌻\u0002+􂻈\u0015=닡󻘺󻝢2b,<y+wF􊛙(\t\t󴽑[󵽫F\u001f㆗\u001d2R\u0008a}󻎻𤥟N􀵮>N\r􅍢\u000f`\u0017ZD𞹲:騀𥒣𖬫󵿋!呓6\u0017=DA􃓝\u0004コ6\u0016𫚎􇍖􈴑%\u001aZ\u0000KNmJqr𫄎\u001fF𪥸0i5𣺮X\u001dKD>b􆮥E3T",
+    "icon_key": "\u0011IS\u001e=xd%\u0004}T_7 􀍃qdLtTL\ruiu\u001ad􂶠𘥛\u000b\u0010Mn@+R]􀄓G\u0018瓂/H\u001b􆬄􌥁up$b2q􎬬!륋\t󲮻D川.#៤m𦵂􆪔\u0005=m󾔟\u001c\u0014𪢦6hD\u001c\u0001\u0010AsL\u000b(􁋵?u𭽲󸦇3%ปY1p󵕉\u0014Lhj%􆕨]b\u0003psL\u0007􋏠G𝂱\u0018w_",
+    "name": "V\u00018(4\"zꢊAM󶺱/\"\u001b\u0001\u0001󺄠V𮒧􅚢𧔛P𢪋^\u001fH⊃I*\u0013,⻭:\ns`%}H3%\u001ee𓈸ꐯ𘉝A\rY)':!B\u0006󻽱\t\u0003rc\u00012h=I6A7g󰾴YT󱒟𪙵􀢨l󷼤D\u0005V`\u000fE\u001cE{cnx􀁔ej'{v#u8𨬷𤦚\r\u0000ﺻ^T\u0000*𤙛󽥼U渾q==\u001f𩃪6叫2F\n"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_14.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_14.json
index ac2ffab0677..88bbfd42606 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_14.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_14.json
@@ -1,5 +1,5 @@
 {
     "icon": "󲻁v=xḁ\u0010B?{󿎸𥺑𢋝y𬤭Z\u000cP􌘡eC𧇭\u0019\r!(x\u0007\u001c|azC$𝑁8აMv\rV^4Z01\u0007k𖨶\u0015 \u0007|\u0004Ocxwa𡄧x \u0010[󲺒􆤮K\u0000󻕃=50tg\u0011􊧓\u0004O􀏽`𓁤\u000bﲛ\u0018oPQ􂭅v𩓯\u0001t;\u001e7󻰬􎷃v%\u0000]U@\\:\u00043𡯝%]P􏏖\u000f}𠁺\u001aW𪻠\u0016i\u0006\u0011\n=xtyY\u0005!\t4~t\u0001\u0011~\u0018󹶗􁗖􅰔\u001d2ュ󠁈+X\u0006E7.\r)`f L)\u0000󶊑󲏏q\u0019󷒴⼩𠁯79\u000bh𖣛𘗛(\u0019𪙂e󻍣^\"\u0017􏽚e􏯔fHZj󹒂2O􍂹`<┛󼎣]\u0001l􂽲qx",
-    "name": "HUZo!3i𦻇\u00110XJ𥜘_m\u0005cc?Y>\u0001\u0008bd\u00030p&f􍨌Ct䣙􃃟Z𠪗R⦮\u0007\u0002\u0015a\tC*eet󻎓\\OHkGN\"CD7Ch\u0015𝟏󺟡tcS\u0017\"\u0003\u0019󳾏\u0010=_㌳~􅮃Lve^\t􎍺H5s􎢉<󵼏鋄i<s󸣕*Lm=$q󴬰J",
-    "icon_key": "r󻤭1M>=,:􀾚Of#䡷%?p𔒸c􃱬~\t􁴺E\u000c󼔣\u00040H%ಣ󼤹\u000f熴)\u001cs󴂘\u0007cBw􀨵\u0019d\u0001󺸎4\u0013G𨡷8𨆹\u0000i󹜙P~\u0005\u000b\u0000Vr@vR𗪃󹐄􇒋B2+\u0015BDMo(󸞻;몰t󶬆U<-\u0000\u0014Mo􉚣U𫽳'\u0010>)\u0017𮋍@qO\u0010\u000e\u0017𘌜놵+)M\rD󹺛緂\u0002-$􅑚T\u00184M𨅒3V\u0007[y9\\' {E𨇧􉲗z+⽻\u001f\t;*zUvU!\u00017钩􎅏xF=sqy"
-}
\ No newline at end of file
+    "icon_key": "r󻤭1M>=,:􀾚Of#䡷%?p𔒸c􃱬~\t􁴺E\u000c󼔣\u00040H%ಣ󼤹\u000f熴)\u001cs󴂘\u0007cBw􀨵\u0019d\u0001󺸎4\u0013G𨡷8𨆹\u0000i󹜙P~\u0005\u000b\u0000Vr@vR𗪃󹐄􇒋B2+\u0015BDMo(󸞻;몰t󶬆U<-\u0000\u0014Mo􉚣U𫽳'\u0010>)\u0017𮋍@qO\u0010\u000e\u0017𘌜놵+)M\rD󹺛緂\u0002-$􅑚T\u00184M𨅒3V\u0007[y9\\' {E𨇧􉲗z+⽻\u001f\t;*zUvU!\u00017钩􎅏xF=sqy",
+    "name": "HUZo!3i𦻇\u00110XJ𥜘_m\u0005cc?Y>\u0001\u0008bd\u00030p&f􍨌Ct䣙􃃟Z𠪗R⦮\u0007\u0002\u0015a\tC*eet󻎓\\OHkGN\"CD7Ch\u0015𝟏󺟡tcS\u0017\"\u0003\u0019󳾏\u0010=_㌳~􅮃Lve^\t􎍺H5s􎢉<󵼏鋄i<s󸣕*Lm=$q󴬰J"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_15.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_15.json
index 89f39683b71..7c8c699244b 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_15.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_15.json
@@ -1,6 +1,6 @@
 {
-    "icon": ",3\u0012BJD^A*eH\u0013i3\u00192J@\u0007􆌻\u0013W🩐Ecd')}𧮤+S~㛻=𭦭ANFU􇭡5kg&\\󽡆󹬇\t\u0003Jኡ\u0007o􎳈\u0018*$󱗧hM𤊚\u0010l\u0005!&=BN\u00173󲃢)8\u0004㰂;-kᨸ\u0017F*🎑V#7𘉱);\u000b𧑩\u0016_\u0011c.X\u0006yL\u000fQH\u0016|3\u001d:JX蠁fD|,\u0016|MC𫅥&J𣇰g~\u001b)K􏹌􎉁W􄿬\u001d\u0007)𘂂J\u0017.!D\u0002𦓔[%\u001c&H\u001b62X𢜷7r𬀦HoMs󺢝\\𑪍\nqmR󰏂D\u001e.{ S\u001a\u0001^𩰠RC\u001e}\u0010rzN\u000bN󸸉\u0018I\u0010\u0016𐇚䨖`!Q􏓿Wm9cbFWz\u001e𓄴惰eD됷D🀂UI^eOM􄇹\u0019𫛆跩싼Q'7鼅K",
-    "name": ")\u000eI\u000f\n3\u00182􋂫𦌿翘􈏾\u000b𤂚1,|.=􋆢􊤫\u000cH0d󺷔\u0008\u001b\u0010\u0007b󼧋\u0018\u001d𗘖󿄳9|􆚄𗖞𨹎􋘯C\u000f\u000cT`\u0001󹉒w􏤾Fn[9󵂥\u0014􄼱N試\u000b儌-rC4\"{^@\u0007𛃏RG\r!]#]'Z􃅴n󽤰-􁒇𥳩𬍤nv#FwizՀW\u0011i뭙.\u000b贈𡯁􈅖\t=\u001e\u0018,j/E踌󻎩\u0017yt󴂐.9Mk\\\"i5M{T􏃐󱤭RyrD%3_󸓄*o󰏽d\u001b𝧑h\u000ce󵅱󷙧𧙱,=r㈬𧙕哏o讻𔐟Yt􈫖\n*if\u0013􌱵T󿅃I\u0003o)𬀤\u001d\u0003\u001c)\u000cw\u0014\u0006Ek𨶵[\u0001;􂖺p\u0019􄕻T\u001d\u0013Hx",
     "currency": "KRW",
-    "icon_key": "+#s:𔘱🜣󺪫o󶯙\u0019\u0005ꂷ𥟸8E󶗾16-gJ-\u0006AG󰅽Vv,>>Yd$\u001b11𦰸Ea軭!O\u0000Q\u0006\"mlc\u0013𩧴𗥪y\u0018\"(Wu4伨rY_\r􄣈]-\u0014r𤯱}7t#*)𨴸m\u000b󾨀[𡇈\u001f룉+\u0016􈙉󼧫a険\td\u001aQ\u0014_󵫽mI􄊝S\u0004RK\u0000p5uf \u000cz󹹉c󽪁\u0015U\u0002Yu𗔂$蜱\u0015\u0012%jB\u001bNHxd`J9z\nyg𪂉ZⅪ5A\u0002𬌪󺢯􊿄\u000bn\u001f𪙾'SNtE[\u001b\r_De􏎅'G𨖞\u0005[I.󱂨3󴺓\u0008v=R􏆘𣸑\u0015G\u0017R祓)􇷒\u0019𬣒\u0017T\u0002dGW\u0012YBV0_%𮅒ꦢw\u00159\rL%􂌛k<\u0007,?𭇶U2C𪍼"
-}
\ No newline at end of file
+    "icon": ",3\u0012BJD^A*eH\u0013i3\u00192J@\u0007􆌻\u0013W🩐Ecd')}𧮤+S~㛻=𭦭ANFU􇭡5kg&\\󽡆󹬇\t\u0003Jኡ\u0007o􎳈\u0018*$󱗧hM𤊚\u0010l\u0005!&=BN\u00173󲃢)8\u0004㰂;-kᨸ\u0017F*🎑V#7𘉱);\u000b𧑩\u0016_\u0011c.X\u0006yL\u000fQH\u0016|3\u001d:JX蠁fD|,\u0016|MC𫅥&J𣇰g~\u001b)K􏹌􎉁W􄿬\u001d\u0007)𘂂J\u0017.!D\u0002𦓔[%\u001c&H\u001b62X𢜷7r𬀦HoMs󺢝\\𑪍\nqmR󰏂D\u001e.{ S\u001a\u0001^𩰠RC\u001e}\u0010rzN\u000bN󸸉\u0018I\u0010\u0016𐇚䨖`!Q􏓿Wm9cbFWz\u001e𓄴惰eD됷D🀂UI^eOM􄇹\u0019𫛆跩싼Q'7鼅K",
+    "icon_key": "+#s:𔘱🜣󺪫o󶯙\u0019\u0005ꂷ𥟸8E󶗾16-gJ-\u0006AG󰅽Vv,>>Yd$\u001b11𦰸Ea軭!O\u0000Q\u0006\"mlc\u0013𩧴𗥪y\u0018\"(Wu4伨rY_\r􄣈]-\u0014r𤯱}7t#*)𨴸m\u000b󾨀[𡇈\u001f룉+\u0016􈙉󼧫a険\td\u001aQ\u0014_󵫽mI􄊝S\u0004RK\u0000p5uf \u000cz󹹉c󽪁\u0015U\u0002Yu𗔂$蜱\u0015\u0012%jB\u001bNHxd`J9z\nyg𪂉ZⅪ5A\u0002𬌪󺢯􊿄\u000bn\u001f𪙾'SNtE[\u001b\r_De􏎅'G𨖞\u0005[I.󱂨3󴺓\u0008v=R􏆘𣸑\u0015G\u0017R祓)􇷒\u0019𬣒\u0017T\u0002dGW\u0012YBV0_%𮅒ꦢw\u00159\rL%􂌛k<\u0007,?𭇶U2C𪍼",
+    "name": ")\u000eI\u000f\n3\u00182􋂫𦌿翘􈏾\u000b𤂚1,|.=􋆢􊤫\u000cH0d󺷔\u0008\u001b\u0010\u0007b󼧋\u0018\u001d𗘖󿄳9|􆚄𗖞𨹎􋘯C\u000f\u000cT`\u0001󹉒w􏤾Fn[9󵂥\u0014􄼱N試\u000b儌-rC4\"{^@\u0007𛃏RG\r!]#]'Z􃅴n󽤰-􁒇𥳩𬍤nv#FwizՀW\u0011i뭙.\u000b贈𡯁􈅖\t=\u001e\u0018,j/E踌󻎩\u0017yt󴂐.9Mk\\\"i5M{T􏃐󱤭RyrD%3_󸓄*o󰏽d\u001b𝧑h\u000ce󵅱󷙧𧙱,=r㈬𧙕哏o讻𔐟Yt􈫖\n*if\u0013􌱵T󿅃I\u0003o)𬀤\u001d\u0003\u001c)\u000cw\u0014\u0006Ek𨶵[\u0001;􂖺p\u0019􄕻T\u001d\u0013Hx"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_16.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_16.json
index 427a1122b87..0312ed8a488 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_16.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_16.json
@@ -1,6 +1,6 @@
 {
-    "icon": "i[􈀢9\u001ezKKVf,KD\"󲻕7헑??诪\tt}E!􏪑𘔒􉦸𠴒A\u0017􇝯C\u000e􄆰u\u0003e\u0015ꈴ;u󻾈60T󾫱􌗖\u000f\u001bⲥ\u001cY\u0016􂀰x䀐h\u0004\u00089󿗤]\\\u001a𡢕e􍆆温Y>\u0007T\u0011\t/k鬝s\u000b)h\u0018󼤲UH\u0005𩉒~\u000f𤡽\u0010.q𨚦챡^6&2sUN\u000b􂵱󱫽\"=\u000ebh\"\u0013檻{1<T󾑫𐝉󿔻ZX돸[𘀠)t㲺𘨷6𪋚𓉄QA\r\u0013󻝛󲷊R\u0011𬎉<\u001b𓎋@t𞤠NP9K󳼃\u0014\u0011\u0019\u0016fT2x󺮝\u0012Zm\u001cM\u0003}Xk\u000e􂆺",
-    "name": "\u0011󽪃` \u0018\"𞀖􃫑\u0019a*@*U𪝧=p|=:y𘪹\u0010D.9\nt~駑𧕖@,B\u001b]$疱1􂌱\u000cdcU[JM4\u00039_킺􋽽w~\u001bkI𑧆Am󲑣<vg\u001b\u0015􅭷\u0011\u0017\u0010;+\u0010:NE",
     "currency": "XUA",
-    "icon_key": "\u0004H󼤂\u000bW\u0018j𒁝@󵳪:+j觪g𦳿L\na5\u0005E\n𠗽8󽤰x𦴨(2OA󻳯H\u0017h \u001d5zP댨A󱒂\u001f𨧓VMvw\u0000咺,+󱜇Upj3s𢈩\u0019n🇸9~6𠮰[尨𩅒L󹫶𩅧1=[XP-\u0012㏵𑇃o\\Q𔖗𥂃t +\u0013𧣦7󽫟A^󱲲Y􎜎F\u0015$-󿚁\u0003^\r6OdQLB>𠱳\u0018K]⛎a􊥹m薪z\u0002󺯓I\u0003􋄒􁬚􏫞𗜃􀣸x?􅤅󻝟<v;V󱼺H𬂁䨨\u0013/􋿽\u0003Fk\t\rⱦg!6󸭶w󲾺opᝦ"
-}
\ No newline at end of file
+    "icon": "i[􈀢9\u001ezKKVf,KD\"󲻕7헑??诪\tt}E!􏪑𘔒􉦸𠴒A\u0017􇝯C\u000e􄆰u\u0003e\u0015ꈴ;u󻾈60T󾫱􌗖\u000f\u001bⲥ\u001cY\u0016􂀰x䀐h\u0004\u00089󿗤]\\\u001a𡢕e􍆆温Y>\u0007T\u0011\t/k鬝s\u000b)h\u0018󼤲UH\u0005𩉒~\u000f𤡽\u0010.q𨚦챡^6&2sUN\u000b􂵱󱫽\"=\u000ebh\"\u0013檻{1<T󾑫𐝉󿔻ZX돸[𘀠)t㲺𘨷6𪋚𓉄QA\r\u0013󻝛󲷊R\u0011𬎉<\u001b𓎋@t𞤠NP9K󳼃\u0014\u0011\u0019\u0016fT2x󺮝\u0012Zm\u001cM\u0003}Xk\u000e􂆺",
+    "icon_key": "\u0004H󼤂\u000bW\u0018j𒁝@󵳪:+j觪g𦳿L\na5\u0005E\n𠗽8󽤰x𦴨(2OA󻳯H\u0017h \u001d5zP댨A󱒂\u001f𨧓VMvw\u0000咺,+󱜇Upj3s𢈩\u0019n🇸9~6𠮰[尨𩅒L󹫶𩅧1=[XP-\u0012㏵𑇃o\\Q𔖗𥂃t +\u0013𧣦7󽫟A^󱲲Y􎜎F\u0015$-󿚁\u0003^\r6OdQLB>𠱳\u0018K]⛎a􊥹m薪z\u0002󺯓I\u0003􋄒􁬚􏫞𗜃􀣸x?􅤅󻝟<v;V󱼺H𬂁䨨\u0013/􋿽\u0003Fk\t\rⱦg!6󸭶w󲾺opᝦ",
+    "name": "\u0011󽪃` \u0018\"𞀖􃫑\u0019a*@*U𪝧=p|=:y𘪹\u0010D.9\nt~駑𧕖@,B\u001b]$疱1􂌱\u000cdcU[JM4\u00039_킺􋽽w~\u001bkI𑧆Am󲑣<vg\u001b\u0015􅭷\u0011\u0017\u0010;+\u0010:NE"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_17.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_17.json
index 9a300f8202b..7582231b5fd 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_17.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_17.json
@@ -1,6 +1,6 @@
 {
-    "icon": "-𬌜&7󺈽𩵽\u000e{𨜚Gw\u0010\u000c􅭮𠧠,𤌫\u0008{k𗛌ꑏ\u001a8\nu똅t5󲵬󳍋\u001f\u001a,\u000e\u001a􊓎\u0016󻉇캺󻅺\u0004HQ\u0001󸛷0\t-*U\u0013lOh\u0012%9y\u0003}d\\l󴎪呂_︂9N𒊴Vl􌱃\u0017\u0008uElfzP^o\\ꙉ𬓉󱫦􌀘\u0016Q⌽s祐q~\u0007耶㷛󱇒눪Cꤸ\u0019\u0006״J)a0o'\u0003􅒾T\u0005g𧅹x􀱜d\u0002D{\u0008A􏺯韕d[^#\u0001d_&d_H\u0001\u0019⾐+𪓪􌺅\u001dMᄈ\\􈆐n𨟢hꈈ\u0010a\u001eO<􏑷o\u0001XzYAF8)􇘠+\u001f𪅇\u0001􊿜88fs𪷹hZ陬\u001bs􅾝\u0005|\u0017>􌂮캟1\u000c􎸥h􇃄\u0007\u0006/mX5$C?!",
-    "name": "8^\u0010􋗿A\u001b(󶗭P|C{\u0003𑶡s󻛃󶐲F(\u0007e2\u0000)\u0005N\u001e",
     "currency": "AOA",
-    "icon_key": "\u000c􃌗`HS&􄲸8Il\u0019􏲫\tQJ\u001a\u00019\u001a\u0007􄚧𝓋Lㇷꆚ𠮫&\u0002􁝅w􉤧4󾍸\u001f𡸍\u0003\u0012~􏂾\u0004B[Ya\u0006\u0002닉n𓄾󱓈k󿴣V(􋙯𗵿􂟓@ǚN=/.󱀕`m\u0017d6𑴤'od2J7[􅹓Z:셞\u0004𤉈l\t􇂞𧘍\u0005M􉡯y􍽸櫓Y铖鏠5\u0000\u0003Rl\u0014 \u0014|:\u0013􀃘&𑚞\u0016X8󰂚`nmFZw𥛹[Dg\u001b\u001a\u0008 7kN󾚁N筛PlꢞX\u0014𗥏?B1\\jM\"b\\x_\u0003􂜢:\u0014쑶6󺑊𫈏G𮘷􀝐{\u0016\u000eo\u0018%EB𣴁\r@􁂵뻖Em󿗓􌩌𫓧𧇜v."
-}
\ No newline at end of file
+    "icon": "-𬌜&7󺈽𩵽\u000e{𨜚Gw\u0010\u000c􅭮𠧠,𤌫\u0008{k𗛌ꑏ\u001a8\nu똅t5󲵬󳍋\u001f\u001a,\u000e\u001a􊓎\u0016󻉇캺󻅺\u0004HQ\u0001󸛷0\t-*U\u0013lOh\u0012%9y\u0003}d\\l󴎪呂_︂9N𒊴Vl􌱃\u0017\u0008uElfzP^o\\ꙉ𬓉󱫦􌀘\u0016Q⌽s祐q~\u0007耶㷛󱇒눪Cꤸ\u0019\u0006״J)a0o'\u0003􅒾T\u0005g𧅹x􀱜d\u0002D{\u0008A􏺯韕d[^#\u0001d_&d_H\u0001\u0019⾐+𪓪􌺅\u001dMᄈ\\􈆐n𨟢hꈈ\u0010a\u001eO<􏑷o\u0001XzYAF8)􇘠+\u001f𪅇\u0001􊿜88fs𪷹hZ陬\u001bs􅾝\u0005|\u0017>􌂮캟1\u000c􎸥h􇃄\u0007\u0006/mX5$C?!",
+    "icon_key": "\u000c􃌗`HS&􄲸8Il\u0019􏲫\tQJ\u001a\u00019\u001a\u0007􄚧𝓋Lㇷꆚ𠮫&\u0002􁝅w􉤧4󾍸\u001f𡸍\u0003\u0012~􏂾\u0004B[Ya\u0006\u0002닉n𓄾󱓈k󿴣V(􋙯𗵿􂟓@ǚN=/.󱀕`m\u0017d6𑴤'od2J7[􅹓Z:셞\u0004𤉈l\t􇂞𧘍\u0005M􉡯y􍽸櫓Y铖鏠5\u0000\u0003Rl\u0014 \u0014|:\u0013􀃘&𑚞\u0016X8󰂚`nmFZw𥛹[Dg\u001b\u001a\u0008 7kN󾚁N筛PlꢞX\u0014𗥏?B1\\jM\"b\\x_\u0003􂜢:\u0014쑶6󺑊𫈏G𮘷􀝐{\u0016\u000eo\u0018%EB𣴁\r@􁂵뻖Em󿗓􌩌𫓧𧇜v.",
+    "name": "8^\u0010􋗿A\u001b(󶗭P|C{\u0003𑶡s󻛃󶐲F(\u0007e2\u0000)\u0005N\u001e"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_18.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_18.json
index a832caa9dd9..e9f60c11bad 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_18.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_18.json
@@ -1,4 +1,4 @@
 {
     "icon": "Y𝞐􎞭?iT𗿖􍦆`3𗄯\u0002\r􁟈t󽧫{@`@f𭝮(~󸪵\u001fE0\u0002D-\"􂊮A=_a\u0019𡙛Nn/x",
     "name": "r!ef\u0012~[2v&j\u000b𩙸-m㢠\u0006󺨨X\u001alDSOHrN􏔣J.𢹱𪴽j􂹞喑>𮥼^𨎐yz\u0006𑇣6G\\􋝍m\u0016Ei\u0011co!^/\u001a?\u000e\u0013\u0006a󻦏\u001e󴘝\u001a􎷟躹C\rt\u000c&zN任+\u0001\u000fF􅡾\u000e𝅹\u0011󷪻tJ_,\u001cq󵵆G\u0017𧊵𦪎a(P㤒<@F􎜫󿇟, 󷩍xt\u0003𫐭𓌔6e𐬃NS+1#\u0005𗆀\"j샺􈐬0G\u0012\u0014\u000c󹐐󻭄𗀓F𩩢o/j:I󻠄VD뮳?Kz\"]f#㍲M􋬌󳏀Ed\t􍮛s󰰯\n{MKM砟0\rᝲDi)ﳮ`\u0000:i겙𞤋r-𪓚\u0000(x\u001d\u0001㉦\u0017xB?\rK\u000e\u000cfm𨳆𡜪􅎎5V\u001a𐛛𩶦\\󷁥b\tj􍷈𡠇􎦽9t1撐b+[N\u0018ꮛx"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_19.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_19.json
index 6c5e2cefc5a..37848f52fca 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_19.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_19.json
@@ -1,6 +1,6 @@
 {
-    "icon": "󺃼\u0010y󸗚{􄍺\\嚶:)*Mb\u0000w.󾔥o󻰙􉷋yd%䉌􊷪\nu􈙸\u000cj\"v`2-\u0008䌉P6\u0007뙡w\u00079a+󹥳Q\u0000Am㛼(8K%>CU\u001dQ󼖞䖓􂁺𮕚跟>",
-    "name": "􏎧C桽4\u0012f-󸞴;+b2rMM!ck\u0011􆄛M\u000ei$K􉮍𤀆\u0018䤡ur󻠧D𤅵v>\u0010Iz\u0008\u00043=+io𝃤j􇤅\n&<\u0019𗎌b\n]]7\u0004w𐿯q􎛮e)A\u0013-O,㇇󼴣1'\r󽞶\u0013􂛏䖗1\u001a6\u0006RuY𦏸<!I',􈁈\u0013\n\\󰊥7^D#􈎫\u0002\u00111􇊕^Wm\u0013K𥆽SꇯM嚎@D􉃘\"\u0004{\u0006|hD~",
     "currency": "UAH",
-    "icon_key": "~6u|𝥐\u0005}𬲸a\u0010\u0006󷢯?v$󻅽F󿐭#w@P󴙢p\u0019\u0006􅓟Ok󴎟\u0007󱵾󸴟𝛛\u001a󿐑7`𬸼꼾BL\u001f󱺋䀢\u000b\u0003瀠\u0011{\u0006sv4\u0011I8'<d\u0005\u0005S\r蠊T낷\u0004G􏁅𐡋󱔦%~:_\u0013X𭩝\"!k𦨴\t^𭵉7P\u00084%C𧙿󷝩\u0015􄺗{(9\u0016g𭙏\u0011!𣎩\u0016<0V􍸽抎\u0003\u001dnⲻU$HMF𡖔\u000cb𤷞M\u0010⑬~L/\u0015JY'\u0012OVo󶔸7H\u001b𦠑1𪻓p,􅱶aQ\u001fC\u001ckl\u0000)􄯤h󺖷G.𩄀B\\FH\\eW\u0015󿱋좧\\0\u0007^}󾾆􁚼􎤋\u001f^𧕽\u0002󾁺*R󻬲󷃌;姺7]󽹨9󻴦=酪𗌻t􃩓xh'⢼0pf*\n\rkE󼀙b\nt\\SLcTT\u0016\u00155\r󳬆BP\u001d*j'e􅴒􍗢o\u0004􅤗nv8AN􍎉󸼋Q~"
-}
\ No newline at end of file
+    "icon": "󺃼\u0010y󸗚{􄍺\\嚶:)*Mb\u0000w.󾔥o󻰙􉷋yd%䉌􊷪\nu􈙸\u000cj\"v`2-\u0008䌉P6\u0007뙡w\u00079a+󹥳Q\u0000Am㛼(8K%>CU\u001dQ󼖞䖓􂁺𮕚跟>",
+    "icon_key": "~6u|𝥐\u0005}𬲸a\u0010\u0006󷢯?v$󻅽F󿐭#w@P󴙢p\u0019\u0006􅓟Ok󴎟\u0007󱵾󸴟𝛛\u001a󿐑7`𬸼꼾BL\u001f󱺋䀢\u000b\u0003瀠\u0011{\u0006sv4\u0011I8'<d\u0005\u0005S\r蠊T낷\u0004G􏁅𐡋󱔦%~:_\u0013X𭩝\"!k𦨴\t^𭵉7P\u00084%C𧙿󷝩\u0015􄺗{(9\u0016g𭙏\u0011!𣎩\u0016<0V􍸽抎\u0003\u001dnⲻU$HMF𡖔\u000cb𤷞M\u0010⑬~L/\u0015JY'\u0012OVo󶔸7H\u001b𦠑1𪻓p,􅱶aQ\u001fC\u001ckl\u0000)􄯤h󺖷G.𩄀B\\FH\\eW\u0015󿱋좧\\0\u0007^}󾾆􁚼􎤋\u001f^𧕽\u0002󾁺*R󻬲󷃌;姺7]󽹨9󻴦=酪𗌻t􃩓xh'⢼0pf*\n\rkE󼀙b\nt\\SLcTT\u0016\u00155\r󳬆BP\u001d*j'e􅴒􍗢o\u0004􅤗nv8AN􍎉󸼋Q~",
+    "name": "􏎧C桽4\u0012f-󸞴;+b2rMM!ck\u0011􆄛M\u000ei$K􉮍𤀆\u0018䤡ur󻠧D𤅵v>\u0010Iz\u0008\u00043=+io𝃤j􇤅\n&<\u0019𗎌b\n]]7\u0004w𐿯q􎛮e)A\u0013-O,㇇󼴣1'\r󽞶\u0013􂛏䖗1\u001a6\u0006RuY𦏸<!I',􈁈\u0013\n\\󰊥7^D#􈎫\u0002\u00111􇊕^Wm\u0013K𥆽SꇯM嚎@D􉃘\"\u0004{\u0006|hD~"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_2.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_2.json
index 57e8d68620a..b744f820aeb 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_2.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_2.json
@@ -1,5 +1,5 @@
 {
     "icon": "\u001a4\u0015F",
-    "name": "G\u0004\u00147󻞽bCy𔔚&5\"𗢵B$\u0002\u0012QJb_㵯􍬓Y 𦆗󾾭Y󵗂g\u000b󱿒xkJUi󻁈.=-􁡷2􏸞U\u001b]\u001a􊥙\u0010}R𦙪\u0011􏚼􋭲+R/􈥾𩮎p(M\u00055Fw<𣌅E󵢃R\u001044􂸟\u000e%@FPG󰰗JJ\u000bE\u001dz\u001e_\tb]0t_Ax}\rt􂊲h\u0013O\u0006󱽊`󽛆vm-?$!)~𥒒bh\u001e󶿅󵾖0x 􊦡􇐷+)A&mRfL􎷉\u0005􀋧>K@\u001f󵮯\u0007b\u000bPDWG,􃟨/J~)%7?aRr󱩅4*^󼭮K*󳖣\u0019\"\u000e󱍚𭠏l\n\tE𡔚󽎬\u0015\u0007\n𓆫c?\\\u0005j\"\u001bpe𘂒\u0000=\u0019>J",
-    "icon_key": "-\u0006v^\u0001_>p㙳\u0003\u0016\u0004\u0005୪􇯆]덀󠁰\u000f;v}q릎𮧸\u0007\u000f􏴖&~쬌<\u001d󺉸`,󼕲snਜ਼H𧆂􌯊𫉶:qNi]􀴜'󴊤#\u0007#T𩳫}󱸗\u0012󶊣M_\u001c\u0014󱘬􊤎\u0019,\u000e\u0018^]𓀫9􏧾-\u0007\u0001ID. FAp\u0004󼓃󵔴(S􀵪𐭀🡠\u0010sI\u0003e|Mv-\"q뿏zM㠌$H\u0001𡽺󵍯D]\u001a􁻕\u001b𤺴qW2\u0005􍦐\u001ey󸧓gg󸯗 /􇣧𘊟䧰~&y\u0008\u0006􈮮󿯅赦\u000e\u001c\u0016\u001et\\a.V\u000eHy8k\u001f$OʻXu/="
-}
\ No newline at end of file
+    "icon_key": "-\u0006v^\u0001_>p㙳\u0003\u0016\u0004\u0005୪􇯆]덀󠁰\u000f;v}q릎𮧸\u0007\u000f􏴖&~쬌<\u001d󺉸`,󼕲snਜ਼H𧆂􌯊𫉶:qNi]􀴜'󴊤#\u0007#T𩳫}󱸗\u0012󶊣M_\u001c\u0014󱘬􊤎\u0019,\u000e\u0018^]𓀫9􏧾-\u0007\u0001ID. FAp\u0004󼓃󵔴(S􀵪𐭀🡠\u0010sI\u0003e|Mv-\"q뿏zM㠌$H\u0001𡽺󵍯D]\u001a􁻕\u001b𤺴qW2\u0005􍦐\u001ey󸧓gg󸯗 /􇣧𘊟䧰~&y\u0008\u0006􈮮󿯅赦\u000e\u001c\u0016\u001et\\a.V\u000eHy8k\u001f$OʻXu/=",
+    "name": "G\u0004\u00147󻞽bCy𔔚&5\"𗢵B$\u0002\u0012QJb_㵯􍬓Y 𦆗󾾭Y󵗂g\u000b󱿒xkJUi󻁈.=-􁡷2􏸞U\u001b]\u001a􊥙\u0010}R𦙪\u0011􏚼􋭲+R/􈥾𩮎p(M\u00055Fw<𣌅E󵢃R\u001044􂸟\u000e%@FPG󰰗JJ\u000bE\u001dz\u001e_\tb]0t_Ax}\rt􂊲h\u0013O\u0006󱽊`󽛆vm-?$!)~𥒒bh\u001e󶿅󵾖0x 􊦡􇐷+)A&mRfL􎷉\u0005􀋧>K@\u001f󵮯\u0007b\u000bPDWG,􃟨/J~)%7?aRr󱩅4*^󼭮K*󳖣\u0019\"\u000e󱍚𭠏l\n\tE𡔚󽎬\u0015\u0007\n𓆫c?\\\u0005j\"\u001bpe𘂒\u0000=\u0019>J"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_20.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_20.json
index b167ddee53f..bc13923fb6d 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_20.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_20.json
@@ -1,5 +1,5 @@
 {
     "icon": "C𣭳𫥉9=$Z4􊂗`J#^e:􂫁󻍯|󷁩$6\u0013te[EP3)󰸃𩜩&𗦺ГHk`􁲡\u000bo-\u0006𢑚1\u000e䪡AtIꚦ𗇠&\u0015\u001d􇬖𝘃I%GLA􊿥I -􊇿ǔ􇜚pt6)<.\"􈹫",
-    "name": "\u001al|>41*𮣧\u0015TLx~}󾫆\u001dNI𠦾o閤T󴏥DrQ\u0004q\u001cD\u0011\u001d=|<𐧜]Y'{u8%𒉓\u0003𝢥\u000bc\u001ej)咶%𗜋DE󿨫&+!l󻩾D_\"\u000er󾝥󽃪󻛍􀦛󱄤\n_5*F/𬌔$,󽎼\u0006􂥉Pd~󿊈!􇂲\u000ea󷪂_󺁷g\u0001l^jz\u001e􄀻󿰐𧣞𩶆내󱔲Fꊴ2a8'\"n0bH\u00140v\u0013E~\u000c\u001as)5b􁥺𘝰?GzN=𡸄3c<,\u000c&+𐛎𣺽&af𡡀FqV󲑊󱒂\u0012k9\u0001\u001cOZ󶜛躘􁠝H<Iei=󺅯􃀨\u000eg\u0018\u0012\u00190UO\u001b 'I\u0012)𩪻'𠹷\u0008\u0004\u001d\u0013\u0004y]c\n𭘛\u0012l4\u0012)\u00176󰘓?~\t\u000f",
-    "icon_key": "y𥩤X/y𡁀E\u00025}THt\u0008\u000f6h􇴔􅞓F󱓅8t㈂󳃹󺲪󵭊(t􈔁􉫨DRn󲥓~ifa\n瘿\u0014L！w\\g\u0010RQwPRiyB>}3\u001d`j\u000cq\u001e􇡓)y\u001awq\u000cR0\u0002(JJ\u0011|\n\u001e󹢗66d\u0015z\u000ew\"[~􎒁u󲇜\u0004󹶺\u0016󹹉\u0001󱄻㠩\u0006D\u0011g0\u001b']q𢷧󱦴ᣡZ\u0013lp\u0001\u0014\u001fi\u0019L)[?\rfহN-4󿻥(\u0002\u0017<,!􂸕\u0014f𘢄P󼶶s𗸟r3\u0008{jzp(\u001dN&\\1𡩸c󳶱\u001e{hh$=i󹾮-0~􂚲𪗣𠐵󷗻lq5󳻦\rclO\u0013)px􆊒9\u000bI􎑼\u0010\u000b}𞋲+,l󳰨o(󶴳󠇡⨲c]\u0010𪭲[]󴈻\u0000"
-}
\ No newline at end of file
+    "icon_key": "y𥩤X/y𡁀E\u00025}THt\u0008\u000f6h􇴔􅞓F󱓅8t㈂󳃹󺲪󵭊(t􈔁􉫨DRn󲥓~ifa\n瘿\u0014L！w\\g\u0010RQwPRiyB>}3\u001d`j\u000cq\u001e􇡓)y\u001awq\u000cR0\u0002(JJ\u0011|\n\u001e󹢗66d\u0015z\u000ew\"[~􎒁u󲇜\u0004󹶺\u0016󹹉\u0001󱄻㠩\u0006D\u0011g0\u001b']q𢷧󱦴ᣡZ\u0013lp\u0001\u0014\u001fi\u0019L)[?\rfহN-4󿻥(\u0002\u0017<,!􂸕\u0014f𘢄P󼶶s𗸟r3\u0008{jzp(\u001dN&\\1𡩸c󳶱\u001e{hh$=i󹾮-0~􂚲𪗣𠐵󷗻lq5󳻦\rclO\u0013)px􆊒9\u000bI􎑼\u0010\u000b}𞋲+,l󳰨o(󶴳󠇡⨲c]\u0010𪭲[]󴈻\u0000",
+    "name": "\u001al|>41*𮣧\u0015TLx~}󾫆\u001dNI𠦾o閤T󴏥DrQ\u0004q\u001cD\u0011\u001d=|<𐧜]Y'{u8%𒉓\u0003𝢥\u000bc\u001ej)咶%𗜋DE󿨫&+!l󻩾D_\"\u000er󾝥󽃪󻛍􀦛󱄤\n_5*F/𬌔$,󽎼\u0006􂥉Pd~󿊈!􇂲\u000ea󷪂_󺁷g\u0001l^jz\u001e􄀻󿰐𧣞𩶆내󱔲Fꊴ2a8'\"n0bH\u00140v\u0013E~\u000c\u001as)5b􁥺𘝰?GzN=𡸄3c<,\u000c&+𐛎𣺽&af𡡀FqV󲑊󱒂\u0012k9\u0001\u001cOZ󶜛躘􁠝H<Iei=󺅯􃀨\u000eg\u0018\u0012\u00190UO\u001b 'I\u0012)𩪻'𠹷\u0008\u0004\u001d\u0013\u0004y]c\n𭘛\u0012l4\u0012)\u00176󰘓?~\t\u000f"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_3.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_3.json
index a170e4793ad..c971d7aff65 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_3.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_3.json
@@ -1,6 +1,6 @@
 {
-    "icon": "\u0017$𨄺뵫;𩢞E𐫌𠀧鬇\u0001c\u0017od^.\u0002$V7Q?\u0006\u0014L\\\n㇋(?𬬱\u001dc󿽝aZH󻖖03􂐃LA@\u0006\nX\u0005Jz􏺺1󶑿\u0016\u0002l\u0013\u0006h􍖦!]#𢏲\u001f󸙚V뒏𬣢\u0002\u0000\u0000꽢]D6mR[󹥡kV\n\n𐨀,\\󱢢,aY\u000e󰸟[<[􊱈K\u000f!o䰉#wC\u001d2^\u0010$􃄉𓌙^|4\u0002陴f(,Q쳵\")󽘱\"𢛦\u0000]𠿶9(r􎊲f/𣸫􁘡%0ihW󿖬&]󷶞mi2g􎅳I\u001f",
-    "name": "Y\\73󴉔R`h\u0002p舰\u0008:'󺺓Uq$N􈓧󴛭G*<?s𐦠𮧢\u001d\u0006BZ`󺊲䅞Yf~\u0002<ᬏ\u0000^􋲮럏Q\u000bUV_\u0000𧫜n<䵿C#󺥨𠡁\u0011􁼢6,􃳳\t\u0013GU\u001c]! \u0003📣\u0004dQoQ#𘔓☱J\u00070\u0017G\u000b[@ᔨ󵋜+\u001a𡟤󸼋',n)c!󹯿t\u0015Tw\u0002\u001fLf?4f@󼍩\u001f,c\u0007mx\t]󲔛잊Qhv􂉠P\u0000s\u0014w@+􍁒``/|\u001dj)旂\"󳝬􀣹tWb00M",
     "currency": "UZS",
-    "icon_key": "Bw󵢟G𣳻\n>\u000ef𭦿,FU-𖧺\u0006+𩵧\u000cz}􏋌\u0011}\u0006t\u000c#􏬤\u000cЏ\u000f\u0000\u001bꇻi$\u001d色1A󴆭(\r"
-}
\ No newline at end of file
+    "icon": "\u0017$𨄺뵫;𩢞E𐫌𠀧鬇\u0001c\u0017od^.\u0002$V7Q?\u0006\u0014L\\\n㇋(?𬬱\u001dc󿽝aZH󻖖03􂐃LA@\u0006\nX\u0005Jz􏺺1󶑿\u0016\u0002l\u0013\u0006h􍖦!]#𢏲\u001f󸙚V뒏𬣢\u0002\u0000\u0000꽢]D6mR[󹥡kV\n\n𐨀,\\󱢢,aY\u000e󰸟[<[􊱈K\u000f!o䰉#wC\u001d2^\u0010$􃄉𓌙^|4\u0002陴f(,Q쳵\")󽘱\"𢛦\u0000]𠿶9(r􎊲f/𣸫􁘡%0ihW󿖬&]󷶞mi2g􎅳I\u001f",
+    "icon_key": "Bw󵢟G𣳻\n>\u000ef𭦿,FU-𖧺\u0006+𩵧\u000cz}􏋌\u0011}\u0006t\u000c#􏬤\u000cЏ\u000f\u0000\u001bꇻi$\u001d色1A󴆭(\r",
+    "name": "Y\\73󴉔R`h\u0002p舰\u0008:'󺺓Uq$N􈓧󴛭G*<?s𐦠𮧢\u001d\u0006BZ`󺊲䅞Yf~\u0002<ᬏ\u0000^􋲮럏Q\u000bUV_\u0000𧫜n<䵿C#󺥨𠡁\u0011􁼢6,􃳳\t\u0013GU\u001c]! \u0003📣\u0004dQoQ#𘔓☱J\u00070\u0017G\u000b[@ᔨ󵋜+\u001a𡟤󸼋',n)c!󹯿t\u0015Tw\u0002\u001fLf?4f@󼍩\u001f,c\u0007mx\t]󲔛잊Qhv􂉠P\u0000s\u0014w@+􍁒``/|\u001dj)旂\"󳝬􀣹tWb00M"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_4.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_4.json
index 15755d2744e..f89a6e8c19c 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_4.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_4.json
@@ -1,5 +1,5 @@
 {
     "icon": "H󸭺\u0000^p&3/ 􈙠!v\u0006\u001fD􈜗\t\u0006g8:\u0004镜\u00089\u0008A0D6f􎀇\u0002\u0006\u0018,\u0013w/\u0016h|\u000e>@Ss\u0001\u001d꠹\u000fโc𑱕厑\t>a\u0001󴶪L􌍣R^缙:K{>鏄Y1\u00004h娡Q@\"𨄒DR𠛎몢v\u0019𡅚x\u0014\u0017\u0013\u0006A\u0015v𝨡𡐅\t[aVgL\u0018@kL-uP\u00013$~4醽K.c\u0008\u000b0B󲕓+\r20}\u001a^g⌽N\u001a􆃱󾐥2󴽙\u001bHP\u001f\u0012p􏍥(􌰖{\t%Gry\u001c'^Y1􍁭bM&(A􇓂􊪺\u0017\u000c몦3󿇮􎑬o􏵺5𖬛oly騮SE]嚽􈙬𮢹\u00082\u0018>h'G󸗺(0󼣔ᩃ8⾠\u0006𝇢􏽕C8\u000b~#\u000bev𩟔D60𨉙$\u0013x➁𑿪𥺆\u0003A\tD`w\"Qp",
-    "name": "𬣵M}袛vE󾁯Q\u0005{t\\􄡱I􁰭\u0006󷳸\\𗔴]􇭠%A\u000c꽹u.`^#󿽘⚪瑕􅬆􎁍\u0016\u0008􀖒?K\u000b\\􉴮\u001f􄞼􋞅^}󹺃󵀼\u0015􋧆-_89z:.9z\u000e*W@𐜓𪿌wb􀅀𨪲\u001fW󷀭d𡷁:WGs-%(ᒷ􎦔C\u0003$0RPh𤊳%C9\u000c4O􃸀Hv3\u0015𧐘h$\u001c/󳖬\u001c𪯻󻢗󿷫𡺹P&\u0000􍪋du0@􀜻\u001aG\u000flSw<yJUq[돪\u0007-𫍗[􄞏~D棻o",
-    "icon_key": "\u00130'J󹳂9鳗ᘣk􌔧JW.\u0004u^0ro1y-𣗼𨩺\u0002%!Q뵼"
-}
\ No newline at end of file
+    "icon_key": "\u00130'J󹳂9鳗ᘣk􌔧JW.\u0004u^0ro1y-𣗼𨩺\u0002%!Q뵼",
+    "name": "𬣵M}袛vE󾁯Q\u0005{t\\􄡱I􁰭\u0006󷳸\\𗔴]􇭠%A\u000c꽹u.`^#󿽘⚪瑕􅬆􎁍\u0016\u0008􀖒?K\u000b\\􉴮\u001f􄞼􋞅^}󹺃󵀼\u0015􋧆-_89z:.9z\u000e*W@𐜓𪿌wb􀅀𨪲\u001fW󷀭d𡷁:WGs-%(ᒷ􎦔C\u0003$0RPh𤊳%C9\u000c4O􃸀Hv3\u0015𧐘h$\u001c/󳖬\u001c𪯻󻢗󿷫𡺹P&\u0000􍪋du0@􀜻\u001aG\u000flSw<yJUq[돪\u0007-𫍗[􄞏~D棻o"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_5.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_5.json
index 8ec087cab15..c11e3bb900c 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_5.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_5.json
@@ -1,6 +1,6 @@
 {
-    "icon": "\u0012\u001ed꽘𔐂󷷩Kg𩆦\u0008J.BoJ%\u00138z~!#|@䗰uQj}\u001e𠞳􎨡􈙩𪼪\n􃸶F◚oN{_:67󽋐\rO7d􊺂𫧎-`␥aRB\u0006𤽽sxﵮP@􃹨:\u0001b𮠙\u0000NuL\u001e\u0015𡤣!\u000cb\u0001-􅣀a8BM?kX\u0004c;WIeG\u0015􌁖\u0019r􊁴\u0018tNv󳐲󳙥\u0019YU\u0008sT-綏󰯨󼟟\u0007XG$5\u0002Hi󴳋뛵=󹃥",
-    "name": "U;\u0007􎡷I􉿎8tx.J^o]7P6#Lr0`\u0004\u0014􁉃\u0017􀀯\u00080􂽅d |UYᇂ漅7J􈳖𗉛\rQX𠢂𭔷vW֡'鄓 \u001d\u000f\u001aoVj=\nVDq'4塯B\\;6^\u0006-\u0015󾙋𘖱`.r'5n~g X󲃈\u0016#󸛟S0'󷤊1-pY󿽉㼴\\1P𝩪𑇯ꓟ󲠌!6Jw𬪨\u0003/_\u001ay􈼺2Rv󸞎v\u0000󳖹{󲶷.l\u001eq/𦹺󶁟.𖠸~ri5\u0019㍎>c\u0001󸓆\u0004f􇐖𣷐TR\u001d[r𨴳,2\u001eM,􍱬󹩊𫲧JivP𓎁In?ec#s󿞲\u001cg\u0014+eeAa\rA^X.𗺐J\u0003\u0011",
     "currency": "GYD",
-    "icon_key": "v􁅻3\u000e􆬄N󾅫ၥh_\u0017[AS𘂯\u0000{\u0013\u000c􂙖\"V\u000cS􎾧\u0012\r* \u0000i\u0000􃄴}靺ck𦙰n\u0019컙iRGA!\\\u0018WKI1􀠏\u000eg델`6Q𐩑\u0004sY􉱖T౦犹􁑻𐦠VF8xA鎀,\u001bt𗼢\u0003#􆊺㲊󶹯A􈐒蕽𨲞\u000eHl]d󻠇\u0012􊝬󻲬(\u0000<D;gb\u0008\u0003'􆎪\u001f􇄖|􀜙󷷡>\u001c얤􂏉\u0003.N Pp\u0004"
-}
\ No newline at end of file
+    "icon": "\u0012\u001ed꽘𔐂󷷩Kg𩆦\u0008J.BoJ%\u00138z~!#|@䗰uQj}\u001e𠞳􎨡􈙩𪼪\n􃸶F◚oN{_:67󽋐\rO7d􊺂𫧎-`␥aRB\u0006𤽽sxﵮP@􃹨:\u0001b𮠙\u0000NuL\u001e\u0015𡤣!\u000cb\u0001-􅣀a8BM?kX\u0004c;WIeG\u0015􌁖\u0019r􊁴\u0018tNv󳐲󳙥\u0019YU\u0008sT-綏󰯨󼟟\u0007XG$5\u0002Hi󴳋뛵=󹃥",
+    "icon_key": "v􁅻3\u000e􆬄N󾅫ၥh_\u0017[AS𘂯\u0000{\u0013\u000c􂙖\"V\u000cS􎾧\u0012\r* \u0000i\u0000􃄴}靺ck𦙰n\u0019컙iRGA!\\\u0018WKI1􀠏\u000eg델`6Q𐩑\u0004sY􉱖T౦犹􁑻𐦠VF8xA鎀,\u001bt𗼢\u0003#􆊺㲊󶹯A􈐒蕽𨲞\u000eHl]d󻠇\u0012􊝬󻲬(\u0000<D;gb\u0008\u0003'􆎪\u001f􇄖|􀜙󷷡>\u001c얤􂏉\u0003.N Pp\u0004",
+    "name": "U;\u0007􎡷I􉿎8tx.J^o]7P6#Lr0`\u0004\u0014􁉃\u0017􀀯\u00080􂽅d |UYᇂ漅7J􈳖𗉛\rQX𠢂𭔷vW֡'鄓 \u001d\u000f\u001aoVj=\nVDq'4塯B\\;6^\u0006-\u0015󾙋𘖱`.r'5n~g X󲃈\u0016#󸛟S0'󷤊1-pY󿽉㼴\\1P𝩪𑇯ꓟ󲠌!6Jw𬪨\u0003/_\u001ay􈼺2Rv󸞎v\u0000󳖹{󲶷.l\u001eq/𦹺󶁟.𖠸~ri5\u0019㍎>c\u0001󸓆\u0004f􇐖𣷐TR\u001d[r𨴳,2\u001eM,􍱬󹩊𫲧JivP𓎁In?ec#s󿞲\u001cg\u0014+eeAa\rA^X.𗺐J\u0003\u0011"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_6.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_6.json
index 0ac8461c356..433bda498b9 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_6.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_6.json
@@ -1,4 +1,4 @@
 {
     "icon": "$^𤙾𧏞*\u001cT1t\u0006t𢔵w\u0017'󾛵5z𭞢􉎟mmEaf\u001c䷽g+⭼<\u0013𭄢𠻕-󸒆\u0015􍤌\u0016py󶿛2a냲zPS|_􊕵a\u0002\u001fmo䩻T&-$&󳶉쥯xX$\u0005o.A󽝭;kz\u0015^$cGD<\u0004_\u0014릟󽀠􎾕󺝦􈻰0{\u001e𩜪1􃁛O萧WY.𗠗ⱯM8u5\u0012\u001d'4D\u0008󶅂󷒳ZQݯZ\n촣/􁭮^51􈕏\u000e􅲅\u001e6ㇺT𘉅X[􈰢Ng#|2VjG\u0016U<儁3􀈐Ⴃ􉴹N󿄺M\r3\\gp󿔵Vx\r$7N4W\u0010\u0017𧁵ヾ\n󹌩qZ\u00181F\u0005M;u\u0000󼇱V\u000cj遪<]/U\u001b􍄘~)j𭐬<U0u\u0014z/n\u0007\r\u000e𡄘1j7aeA,,w|",
     "name": "M\u001c𤈳𗥞\u001c􌮞Bzq\u0018b\u0017\u001c쥒􍋘 𦰮0\u001e𑱓\\F\u000f\u0015\u0003Ps\u0011Pg$)r󶔧𩺡\u0000@n(撽yf\u0014\\I-\nOok󵮮@wb^uM\u0000\u001e5􎧰m~K󴕴lQ\u0016𪾱󵐗\u0014f𢪩\u000e\u0002\u0018aJ?\\yg%AH6R􄵉Ax󰽢1[6]mV(󽓈U;􂤓\u001d,Y^䚓DXP𨒘b􅖁󴢯=b\\ꁤ􀾀k\\oM.v^L􂘂/cF\u0003/Dk\u0010󷙈󳌪b)􋡗󰢯L\u0003􈱙}b$s\u0007h-.㬭Nh箠Je󺝀젖;󹯉𪦹\u0011#\u0002/U\u001dᗞT|\t㱧𘋥󲊸"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_7.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_7.json
index d45dd9d657b..f1f23e44b6f 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_7.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_7.json
@@ -1,5 +1,5 @@
 {
+    "currency": "BZD",
     "icon": "󳽽𮌠𧑬鶦\t󻭪x𠿴鏨\u0008#󰄿iJM$!\"􈖕A2\u00047=L翁#\u0018>\u0000\"掊\"Nsd\u0002m!j/:I\u0019􄼑Z\u0007jac\u0005:e<e*ｕ\u0019󸦷oEO\u000c@𐊊c3󳘱\u001c%z\u0010X]$[􂅨An󸚾-\u001f󻇤:\u000c󲚡𣟴_\u0010𫃒8^\u0010A󲇺<.R6\u000e\u0005M𛊻Y\u0006\u0015sD𥰵]8c\u001boO;~9\u0002ԚB#鞈=\u0015X􏅟?s#;󳅧k\u0006\u0007󼫛qt\u0004w뎫^Q焌.\u0010U\u0007󾪵㿖\u0014𥄵\n\r\rn\u0003\u0008\u0002\u0001\u0019FN𠅂㟖\rMXXy󽡻𨋞\nPeX`𦊜\\􁉚哦!\u0001\u001az5=BG𦀐\"\u0017.sD\u0011T\u000eCjBQg\u0004D&~𣂗\u001f\u001ck\u0000󷉍)􏁩A*QFK\u000ev𭬓g󲙩𗈕BC𝞀Gx\tz𪀠j\u0018\u0012\u0012𣟬cn",
-    "name": "\u0004]C)\u0002q6Vkf)2\u001ag$w}S\u0012\nL1UN集􌿠仯r%PK\u0012䔟AIn\u000fRsFx팒D-w䪩b󿒢'\u0011\u001f\u001dYlH\u0008斌󲊁0腴X𪯽\u0006P@􊅏𮌾a󳘻F𨩂6A𒅣rH\u0010\u0015_%ya󹢂v\u0015𡟡𩱯{",
-    "currency": "BZD"
-}
\ No newline at end of file
+    "name": "\u0004]C)\u0002q6Vkf)2\u001ag$w}S\u0012\nL1UN集􌿠仯r%PK\u0012䔟AIn\u000fRsFx팒D-w䪩b󿒢'\u0011\u001f\u001dYlH\u0008斌󲊁0腴X𪯽\u0006P@􊅏𮌾a󳘻F𨩂6A𒅣rH\u0010\u0015_%ya󹢂v\u0015𡟡𩱯{"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_8.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_8.json
index 7bc13b8162f..27e1a97dec3 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_8.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_8.json
@@ -1,6 +1,6 @@
 {
-    "icon": "{ᤇ󿏸𧬡 }<J𦻠2Yji6#,_}P\u0008_N\\𥎂􊧲tv\u001b𨣵\u0004)8H\u0017\u0008+\u001b]cdSa󿀑K\u0008\u0005:걀O@hcC\u0004>\u0005\u000e<\"\n􂁲d{􀤇\u0012𠳺s\u0013O󶵄g\u001e\n2-\u00152,\u0006뱘\n\u0005<pB\u0015\u0007\u0004\u0006𥣄c`r𩲸4󲭣𤸥󰲞\u0011?\\\u0011#o\u0016\u0014&𤔾6󷶄󸼷rD\u001f-&P6 +w􀺏\u0019!𦹞\u001b9\u0017ub\rA",
-    "name": "x\u001c󽪘h󸗞u\u001e\u0007o􉲾|W{M%\u0017\u0015p)􌾾􀮁6\"멽\tV@Uc󿤿K6Nf\\𦎂󶈘e6fZ81\u001f!<\u0000\\V勩􎊋Z𑋜H\u0018\u0019H𣣸#~5\u0001󸲃/^󾬰\rDo&K𠫸v#a𠱐Ao&\u0004]:-󷝡]󺐍F\u0011\u001f*\u000bHv'd󴂵vrb󲨻4􄩔YIL[(\u001b+C\u0016\\\u001d󽟍7,$𦂤8j󻕶𦺷X􂊊K􋚆𮈆5𣔍>xU8Dlu爮ꨮ컗\u000b󲹰1&9器􍘎󾇋\u00176\u0011󷜜!C1W=j\u001c;󼥣<#w5Sl\u001a􀅟\u0011\u0018O韔7\u000f𧨽]dX\r𩳠\u0006D\u00058s\u0013𮐢@\"*h~ꛞQ𦁒q􃮖\u001a \u001eE\u000e^􍌢Fa@\u0008\r%+W\u0002󻊻󹍺{HR\u0014 \u0013\u0014dg\u0016\u0000𣊶\n􉿘~𝖪j􃝱K3uK󶻯8",
     "currency": "MXV",
-    "icon_key": "J/\t􀺌6FjdZ\u001b\\4髹w\u00104VB'\tL\u000b􀾈PEg𬮶\u000cp𦄏󱂀􎇾U􂋫󳩶qSw󸑇Q0\\󿵐)J􅺠zo\u001au🁤3𗔅#\u0006\"\u0012\u0018🨃#l5bBw\u0017:yPn𨸮𠢑𠵉Y\tk󻖁\u0017𮁵WwR+􂤾%鸦,-\u0017:q5\u0008k􅦲𧟕𠛶\u0007O𒈋H\"+뀗R/C_/\"\u0000'\r!\u0018E󱀄#[\u0004𔒑𮖫{#*ul[\t4#<n\u0002𮗚ṑN\u0012咗5C𡆡I\u0010P,\u000e\u000ew\u00005:𣍞󽨐.𡪩c?軾qM\u001d,K󿓿𦦝y}-F\u0019x𒇉\u0010}-𪺘|2􎿴3􍀛\u00188\u001c󿏂"
-}
\ No newline at end of file
+    "icon": "{ᤇ󿏸𧬡 }<J𦻠2Yji6#,_}P\u0008_N\\𥎂􊧲tv\u001b𨣵\u0004)8H\u0017\u0008+\u001b]cdSa󿀑K\u0008\u0005:걀O@hcC\u0004>\u0005\u000e<\"\n􂁲d{􀤇\u0012𠳺s\u0013O󶵄g\u001e\n2-\u00152,\u0006뱘\n\u0005<pB\u0015\u0007\u0004\u0006𥣄c`r𩲸4󲭣𤸥󰲞\u0011?\\\u0011#o\u0016\u0014&𤔾6󷶄󸼷rD\u001f-&P6 +w􀺏\u0019!𦹞\u001b9\u0017ub\rA",
+    "icon_key": "J/\t􀺌6FjdZ\u001b\\4髹w\u00104VB'\tL\u000b􀾈PEg𬮶\u000cp𦄏󱂀􎇾U􂋫󳩶qSw󸑇Q0\\󿵐)J􅺠zo\u001au🁤3𗔅#\u0006\"\u0012\u0018🨃#l5bBw\u0017:yPn𨸮𠢑𠵉Y\tk󻖁\u0017𮁵WwR+􂤾%鸦,-\u0017:q5\u0008k􅦲𧟕𠛶\u0007O𒈋H\"+뀗R/C_/\"\u0000'\r!\u0018E󱀄#[\u0004𔒑𮖫{#*ul[\t4#<n\u0002𮗚ṑN\u0012咗5C𡆡I\u0010P,\u000e\u000ew\u00005:𣍞󽨐.𡪩c?軾qM\u001d,K󿓿𦦝y}-F\u0019x𒇉\u0010}-𪺘|2􎿴3􍀛\u00188\u001c󿏂",
+    "name": "x\u001c󽪘h󸗞u\u001e\u0007o􉲾|W{M%\u0017\u0015p)􌾾􀮁6\"멽\tV@Uc󿤿K6Nf\\𦎂󶈘e6fZ81\u001f!<\u0000\\V勩􎊋Z𑋜H\u0018\u0019H𣣸#~5\u0001󸲃/^󾬰\rDo&K𠫸v#a𠱐Ao&\u0004]:-󷝡]󺐍F\u0011\u001f*\u000bHv'd󴂵vrb󲨻4􄩔YIL[(\u001b+C\u0016\\\u001d󽟍7,$𦂤8j󻕶𦺷X􂊊K􋚆𮈆5𣔍>xU8Dlu爮ꨮ컗\u000b󲹰1&9器􍘎󾇋\u00176\u0011󷜜!C1W=j\u001c;󼥣<#w5Sl\u001a􀅟\u0011\u0018O韔7\u000f𧨽]dX\r𩳠\u0006D\u00058s\u0013𮐢@\"*h~ꛞQ𦁒q􃮖\u001a \u001eE\u000e^􍌢Fa@\u0008\r%+W\u0002󻊻󹍺{HR\u0014 \u0013\u0014dg\u0016\u0000𣊶\n􉿘~𝖪j􃝱K3uK󶻯8"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_9.json b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_9.json
index 36c7f9beb76..1a50f80a50f 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_9.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeamUser_user_9.json
@@ -1,6 +1,6 @@
 {
-    "icon": ">a&7󹚪0\u0005􁜅hﮖ\u000e𓃐n\u0013 k^\u000b󿰞2OOz𢄴X2󵆔􀰹bu􅤯C􊶛\u001dｷ2;)𬆦퀖\u0007BY󻴷\u001en4\u0015\u0003v",
-    "name": "\u001b\u000f諼b+\u0006GR𫘥5*\u0008=x\u0008\r]pP릍􃑇⢞F=Tm襓\u0018󽢠\u000f7\u0000𭕔;􆆄l )m𠢔􁈊俲䶴\u0004첒ak%JP􊈽P𝖨M\u00133sT󾬢煪ml􇓩ᅫun|Obt 󹭶􅌥/:5􏙮j",
     "currency": "MZN",
-    "icon_key": "􀃙f稓􎈢"
-}
\ No newline at end of file
+    "icon": ">a&7󹚪0\u0005􁜅hﮖ\u000e𓃐n\u0013 k^\u000b󿰞2OOz𢄴X2󵆔􀰹bu􅤯C􊶛\u001dｷ2;)𬆦퀖\u0007BY󻴷\u001en4\u0015\u0003v",
+    "icon_key": "􀃙f稓􎈢",
+    "name": "\u001b\u000f諼b+\u0006GR𫘥5*\u0008=x\u0008\r]pP릍􃑇⢞F=Tm襓\u0018󽢠\u000f7\u0000𭕔;􆆄l )m𠢔􁈊俲䶴\u0004첒ak%JP􊈽P𝖨M\u00133sT󾬢煪ml􇓩ᅫun|Obt 󹭶􅌥/:5􏙮j"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_1.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_1.json
index c72e8caccac..612828bf06d 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_1.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_1.json
@@ -1,5 +1,5 @@
 {
     "icon": "~c\u0004~汸Y🁉\rO奿KH􌷲:𢁄𡹌\u0000WfA\u001aj<5_𠶦mx3^Em潜\u001af􍟲\u0014Wx $゛􃡶I-􃮄NhzWDC\"􄖩\u0001􈌑I&i\u000c!;-?X舒\ro󴯋G6\u001d􆼅i􍨏#yH%f@6qb?;􅦁󴃱&wQ\u0016\u0019z𗠣c𬎿\u000cJ𬦦$U\u0016\u0004𑐹0]\u000c\u000f7󻛤𪜚\ru)\u0016\u0014\u001byL𡙤n𣋪mm`\u0011/\u0013􄨵,𤙲𘉂DX纇\u0004}\u0004\u0002􈗐𘝘vE",
-    "name": "UivH&횊𗾉p\u001fzⷌ\r$\u0014j9P\r\"􅜃ಶ󰸀aF>E􇘗𡼡B\u0019&􉯋\u0014𪭋+'􍠒R;!\u001d󸔢\u000fvv|\rmbGHz󵚲𗍑3h𝡈\\U|'\u0003;^&G\u0018\u000cꁴ42\teq􀏗\u000eV1}\u001eaT󷧄aO7<;o𫶖\u000c􏝘m)$PC\u001b7;f{\u0002t┽>\u0004X@4|/\tH\u0005/D𣋒\u0019𝩜C𘕰Q\u0005T􋮡?d\u0006􆊎#H🈣𡽷*𨡴jo<s󿳤\u00113/q\tY􇘝􌃑uꝁs\u0008^l𣍅\u000b󿻧!𠹬Q𡖖\u001f󰻧5\u0005\"15}?|󲵵^&𪕾\u001a8eAuੂqU\u0002f𡝵\u0017\u0010\u001c\u000e(颥櫔&,\u0016axe𫦣\u0015ᐡ[Ay#x@􉗥~\u0011\u0003Wu\u000f~\u0012|.",
-    "icon_key": "󻚍W.\u001e틕E\u000bS_6ZzJ{'\u000c&M󻉧󳲿𤴄唂󸯡t;C󺱊'a𩟏[(X\u000f:󷫰\u000f\u001f`􆤢zK[䈙􆔗a\u000b"
-}
\ No newline at end of file
+    "icon_key": "󻚍W.\u001e틕E\u000bS_6ZzJ{'\u000c&M󻉧󳲿𤴄唂󸯡t;C󺱊'a𩟏[(X\u000f:󷫰\u000f\u001f`􆤢zK[䈙􆔗a\u000b",
+    "name": "UivH&횊𗾉p\u001fzⷌ\r$\u0014j9P\r\"􅜃ಶ󰸀aF>E􇘗𡼡B\u0019&􉯋\u0014𪭋+'􍠒R;!\u001d󸔢\u000fvv|\rmbGHz󵚲𗍑3h𝡈\\U|'\u0003;^&G\u0018\u000cꁴ42\teq􀏗\u000eV1}\u001eaT󷧄aO7<;o𫶖\u000c􏝘m)$PC\u001b7;f{\u0002t┽>\u0004X@4|/\tH\u0005/D𣋒\u0019𝩜C𘕰Q\u0005T􋮡?d\u0006􆊎#H🈣𡽷*𨡴jo<s󿳤\u00113/q\tY􇘝􌃑uꝁs\u0008^l𣍅\u000b󿻧!𠹬Q𡖖\u001f󰻧5\u0005\"15}?|󲵵^&𪕾\u001a8eAuੂqU\u0002f𡝵\u0017\u0010\u001c\u000e(颥櫔&,\u0016axe𫦣\u0015ᐡ[Ay#x@􉗥~\u0011\u0003Wu\u000f~\u0012|."
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_10.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_10.json
index 7ec9fc76707..1aaa36cffd8 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_10.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_10.json
@@ -1,5 +1,5 @@
 {
     "icon": "L􊾚j^Xe\u0011󷑺z1{\u0005󾃬,󹕨B;&\u000854f>8+𩆂\n\u00005L[r7_.\u0010l1𫁝\u001f6[EhD\u001fh\u0007􋘏\u0015C𢇵,𫎢,@?y+;\u001f`/^d𡩦󲆪HeCd顴\u0013􀙬𣆗\u00052O-Hijo󶂘󿐡󷔶X}x􏡾\u00177𣫺쿢C甽\u0010`k*Gl󿙎\t𓀮󵃮\rb}\u0008\u0000芆h\u0016ynr6d(",
-    "name": "\u0008 \u0001+􁴶;\t095ꖖ\n\u00022J󴬋\u0011UzD_􏋚\u001c",
-    "icon_key": "\u0004𠇱\u0017:󰚡HL\u0001^bs\u000bG𦜤{I􋥵]-J\u001c􎟗\u000bs9\u0010󴔽vI`N밟MZz"
-}
\ No newline at end of file
+    "icon_key": "\u0004𠇱\u0017:󰚡HL\u0001^bs\u000bG𦜤{I􋥵]-J\u001c􎟗\u000bs9\u0010󴔽vI`N밟MZz",
+    "name": "\u0008 \u0001+􁴶;\t095ꖖ\n\u00022J󴬋\u0011UzD_􏋚\u001c"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_11.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_11.json
index 280d78ca60b..b9317a5f4b3 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_11.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_11.json
@@ -1,5 +1,5 @@
 {
     "icon": "r켭嚔𑪕u*33{8G􈵆aO\u001d%\u0000[󵂞U\u0005󰤫iKL\u001dNF𨀔􌈒`\u0004T$`i5𖣱\u001bŤ98>",
-    "name": "뮅H􈒨𠓐𦡃5\u001e󰳡-\u0015\u001bR\nL戮&bD𢂤\u001aH\u001f󾈖\u000c\t;e􃴠럽\tc􉣼e􌚗\u0010\u0003I𐃒\u0017𠫼\u001a \u000fꬓ~FE\u00186𧰔돮u\"𡈄󾓋\u001cFYI\t/{\u0005\u001e]j􆸮\u001f22㸌lꕾ$\u0017\u001f𫼷kL{\u0002*𠄶RMj\u001b􊜄W3H󹇯\u001c\u0015^\"5珕缛*􌕧",
-    "icon_key": "􎸃I\u0006.𦱂@y0\u0010􈛝n\\#skj󸸍Y_󽔌&x󵹳\u001d\u000fy􍩉B\u00160\u0013VP1􉓪q󺌶􈆙渳R􌨓*+\u001e,MP槄*;\n\u0015롫\t𧋏\nGj.ꅊ􍪛lㅎ\u001c~􆭊\u0000.􈧂&\u0001}\u000f􇺚\u0011+f^ZC\u0007'T\u0001\n󹏻􋹧U􎠓`W\r\\fX\n􋛆TF􎬔`h𗲐[듫ERdP5<<󺁭;\r􋣛\u0000Dy漆5N/^𡏆(\u0013󿉋􃋤6e\u000c:\u000fB\u0010F-􏂸䏱􃿵Rfb긦\u0007DrB󱌬㖬桲\u0000+2.\u0007\u0007}\u0015psFw\u0017\u0013 𭚗𥂍k~"
-}
\ No newline at end of file
+    "icon_key": "􎸃I\u0006.𦱂@y0\u0010􈛝n\\#skj󸸍Y_󽔌&x󵹳\u001d\u000fy􍩉B\u00160\u0013VP1􉓪q󺌶􈆙渳R􌨓*+\u001e,MP槄*;\n\u0015롫\t𧋏\nGj.ꅊ􍪛lㅎ\u001c~􆭊\u0000.􈧂&\u0001}\u000f􇺚\u0011+f^ZC\u0007'T\u0001\n󹏻􋹧U􎠓`W\r\\fX\n􋛆TF􎬔`h𗲐[듫ERdP5<<󺁭;\r􋣛\u0000Dy漆5N/^𡏆(\u0013󿉋􃋤6e\u000c:\u000fB\u0010F-􏂸䏱􃿵Rfb긦\u0007DrB󱌬㖬桲\u0000+2.\u0007\u0007}\u0015psFw\u0017\u0013 𭚗𥂍k~",
+    "name": "뮅H􈒨𠓐𦡃5\u001e󰳡-\u0015\u001bR\nL戮&bD𢂤\u001aH\u001f󾈖\u000c\t;e􃴠럽\tc􉣼e􌚗\u0010\u0003I𐃒\u0017𠫼\u001a \u000fꬓ~FE\u00186𧰔돮u\"𡈄󾓋\u001cFYI\t/{\u0005\u001e]j􆸮\u001f22㸌lꕾ$\u0017\u001f𫼷kL{\u0002*𠄶RMj\u001b􊜄W3H󹇯\u001c\u0015^\"5珕缛*􌕧"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_12.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_12.json
index 9bf9fafa671..2764ebff6c9 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_12.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_12.json
@@ -1,5 +1,5 @@
 {
     "icon": "􂾥b\u0004ch1a iuB󷁓\u001b\u0011𭱠\u0002V󿧅@1𣛸  iY\"m󽅖\u000e\\O*(\u0013𫣇w7w􍻦\u001f2ECk𘏌4\u0003ୌ%\u0004@\"k󷔜󲢼*󻶙\u0011\u001bYC?𫑘2>촘\u0016o8[\u0007V@9E􉄈⒅󸣂!k0b\t\n+6\\Ki{\u0011󰕎\u0001\u0016󽏅{0H󸕍\u0014\u0005󲕅|\u0018󹵤F鈫󷊥d󿐟\n𝈟􁣼X􁿧􁀇*\u0008C\u0012𘒓Wz􅚿鋡QWt\u0017Aj>eO}Ae\u0014<e\u0018Q􌖟?n\u000b2􉁖𢖺w\u0014",
-    "name": ";𛄘M\u0004𨅁P]'󾋁􋍲ဖ􁟺iFnRQV꣦@󲚞l􌔻\u0007KZ{잴S𮦪\u000cg*\n,`!V\u0002󲇏e'󽹟\u000e0邛p4d\u0002s󹈷uK(c'컁hjB𣘹\u000et'h^\u0016\u00160󶝏_⼠𨮕thH\u000f􆅇:󹀞l; n4c􌿕D[󷩴8Y+􊬷\u0004E􂛊\\0𩅑KKTc)P1K󾠫󱸡W\u0003<n4􏉔(󲝗Hs\\󲨞*\u0013,#P󹡓E􏸄`e󷝹^S o;FuV𢡌0+\u001c\u0013g-󺔴󲧕|𗰘℆DX.\u0019y﮳\u001fw󳚾𐫄𩆅i\u0013v󸸹w𧗏i\u0005><|愸0|5{Y󰺓M\u0014\u000bK\u0010􉹾\u0001\u0014󷞕.\u0017g󲇥\u0010\"W\u00009&0yYZ􋍼\u000bⵖ",
-    "icon_key": "\"C\u001b\u000f0\u0017𐿨pㅈ|/O]퉜\u000e 힄C\u0016N\u001a8\u0000BxtH\u000e*􇈻3.􃏛(􌰊w\u001d𥏍R{q󱹩4𫽅𤮹:𭫔𠲐>\u0017\nl􃄦g\"󳗩,6K滠􁙀[󸱽󸆑N庝eB!𮇶C\u0004\u0002X#El\u0017`e 􋯾\u0006\u0003PBC􏑎fa𫬟"
-}
\ No newline at end of file
+    "icon_key": "\"C\u001b\u000f0\u0017𐿨pㅈ|/O]퉜\u000e 힄C\u0016N\u001a8\u0000BxtH\u000e*􇈻3.􃏛(􌰊w\u001d𥏍R{q󱹩4𫽅𤮹:𭫔𠲐>\u0017\nl􃄦g\"󳗩,6K滠􁙀[󸱽󸆑N庝eB!𮇶C\u0004\u0002X#El\u0017`e 􋯾\u0006\u0003PBC􏑎fa𫬟",
+    "name": ";𛄘M\u0004𨅁P]'󾋁􋍲ဖ􁟺iFnRQV꣦@󲚞l􌔻\u0007KZ{잴S𮦪\u000cg*\n,`!V\u0002󲇏e'󽹟\u000e0邛p4d\u0002s󹈷uK(c'컁hjB𣘹\u000et'h^\u0016\u00160󶝏_⼠𨮕thH\u000f􆅇:󹀞l; n4c􌿕D[󷩴8Y+􊬷\u0004E􂛊\\0𩅑KKTc)P1K󾠫󱸡W\u0003<n4􏉔(󲝗Hs\\󲨞*\u0013,#P󹡓E􏸄`e󷝹^S o;FuV𢡌0+\u001c\u0013g-󺔴󲧕|𗰘℆DX.\u0019y﮳\u001fw󳚾𐫄𩆅i\u0013v󸸹w𧗏i\u0005><|愸0|5{Y󰺓M\u0014\u000bK\u0010􉹾\u0001\u0014󷞕.\u0017g󲇥\u0010\"W\u00009&0yYZ􋍼\u000bⵖ"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_13.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_13.json
index e429c77a0ce..ec9417ccfb1 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_13.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_13.json
@@ -1,5 +1,5 @@
 {
     "icon": "0^􋚞7>𗅥 \u0002馏\u000fF\tAH𧑩:𨹫8䅗Q󿒛\u0010-A\u0004𦎬\u001bHOc\u000b󵺂\u00139\u0016󠅕{ \u0000]󶒐I􁗫,𧯞f\u0012􉮨q\u0001🨣GA\u001dT\u0004S\u0010MmnLy􏴕=𠀦2k󶫴\r~􂩧1! \u001bJy♜J|zgf1}ILN5󺈩Xi᪽Be.􉁉\u001e\u0016𗎂􊒧\u001e+Y;Z$\u000e5",
-    "name": "G쩷𑐙rLb<􁴯!\u001e|RD𧠁\u0006𔐎𨏿눢Ag墘 \u000by`\u000b󿌣K㗃e䠣,𣘥DQEO\u001e|\u000f􆭓􃨋gr􏲼\u0000\n*1럩R\u000e𐔍-Y󽙱n􉃤]])􉉻C\u0013𣰗\"M@(K㮂\u001e1諷\u001c\u001a󺜆T?}\u000e=*𭇂\n𑄉\u000b_\"7􃹱?Lk𤪸x\u0014bu:𣸰㣱󼻩<󷼔6\u000e`􅣒U죑yp𬰚7%",
-    "icon_key": "oﲕ􁂈\u000f[aoM\u001d􏉓}q躷4^\u0017-*%𤎉8􄨋`􅝘#pH}\u0013?w`A/𖼹􎩙󲼀 􍦹\nXꀛ󳡲\u0013u\u001e\u0001(󾒲󵮑6\u0002]t{\u0014\";*\rヌq􄐓⾵+w&笭(3#𬈙PY]\u001ef\\?F4\u001a\u001fT􎩣Rnfq%𐔹p𥨈𬠶j🏭0P\u0008n\u000e\u001c\t䯈\nN.aGx"
-}
\ No newline at end of file
+    "icon_key": "oﲕ􁂈\u000f[aoM\u001d􏉓}q躷4^\u0017-*%𤎉8􄨋`􅝘#pH}\u0013?w`A/𖼹􎩙󲼀 􍦹\nXꀛ󳡲\u0013u\u001e\u0001(󾒲󵮑6\u0002]t{\u0014\";*\rヌq􄐓⾵+w&笭(3#𬈙PY]\u001ef\\?F4\u001a\u001fT􎩣Rnfq%𐔹p𥨈𬠶j🏭0P\u0008n\u000e\u001c\t䯈\nN.aGx",
+    "name": "G쩷𑐙rLb<􁴯!\u001e|RD𧠁\u0006𔐎𨏿눢Ag墘 \u000by`\u000b󿌣K㗃e䠣,𣘥DQEO\u001e|\u000f􆭓􃨋gr􏲼\u0000\n*1럩R\u000e𐔍-Y󽙱n􉃤]])􉉻C\u0013𣰗\"M@(K㮂\u001e1諷\u001c\u001a󺜆T?}\u000e=*𭇂\n𑄉\u000b_\"7􃹱?Lk𤪸x\u0014bu:𣸰㣱󼻩<󷼔6\u000e`􅣒U죑yp𬰚7%"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_14.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_14.json
index 84aa4154871..690eaabb6fa 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_14.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_14.json
@@ -1,4 +1,4 @@
 {
     "icon": "(r'`􅲹Gd\u0003)u\u000cq*4􆹛󻯿i\u0019M.Ru􇜭\t𤋁􉲱m;\u000c󴞗􏿰𡃾m\u0007\t􄛑wRhv\u0007r6ﳼ\";&4\u0016X\u001d\u0016w5{%P&極98\u0003\u0002yL\t󹫣XMu(𭷐6)\u001aꓯWc闛#\u0002夺l􃳷Vy1_\u001a\\\u0018􍒠꽙Ek>󵛷\u0006]$\u0004𬘽􆰩w\r𨅛@&V8\u0007\u0010\u0011\\󶯔􁔬\u0015)X\nE)􅪟y*%1\u0015\u0012^4hKf󳅲|EY`^\u0013𪗫颕\"pX\u0008g샴>YR(W\\eS\u001d氵(bn\u0016u󴙶𦒟hꆂ\u001cG􊉫\u0010蜙a𑅱n2)󰛬\"<󻿼YUq􀉀󼱣𭦇\r7ྤ\u000b􀊑惱\r󺽸|]\u0017\u000eh9f<o=O",
     "name": "2#\u0012N\u00089&A󻫦ZL{f󶽖M􌵴寝\u0007v𨑡绖\u0006T7\u0013\u0014󶞕O􍘡C𥊊\t\u0014l\u001e\u0001]\u001b\u0006𗗦X;𤢜* &𗱹}􏓄T\u001bCLkx,\u0010碌\nbT􀊵fWJ󲘠𡜍a\u001f`\u0013𢇐焔8r2']\u0015\u0012𠟦\nl\u0012NXB\u0005ia􄰎]B󱧀\u0010\u0005df#ﲥ\t6g\u001c\u0001󻚀Fp(\u001dQTZ󷹤↶𥣉dUJt\u000f\u0019𢌱`\\#g0Qed@a${=Q.󿽄Ld`裓 𪒠sV\u001a\u000e5𤭘ꐍ􎝥i\u0019\u0013󱜜􀎎\u0001󻣓>󾻓\u0013w󴧻Y}呣1q\u0015Y:搚q \u0017=*#𒓟\u0019\\啿y9Tfc\u0011삯k􋯆\\Oxxn&6NtaZ?k:5G@딎\u0013H􋶽hu4𫩷󳈫\u001fR𧠉󺈅v服嵡𑧡㉑\u0006D󰡀[bb<􏝁"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_15.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_15.json
index c16f6accee9..f5bbb69dba3 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_15.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_15.json
@@ -1,5 +1,5 @@
 {
     "icon": "UZ0󱶈t+𨼻ㄭk|\u0011\u0016\u0019_ch\t􊃨㌵\n\u0017\u0012,x􎅷,RE(,G\u001d\"gA\u0015ncdJ𧰏+\t􌥁FP{v=낫'e\u00029B#1􆤏\t.􉄮𢏾Ⲙ\u001cUK\u0001\u0007;\u0002􇙌𣅐7B\u001b\u0000D+󽉔􋆄`\u000e>\u001b\u0011,𩳟d\u0001(5\u0004P9iR]\u001eNws󻘌󴿔{[H🚝,5J!𡔆󼾅<!a&*\u000cY𫈒츖^]y𤱋󾏆",
-    "name": ":괯R_.ၝ\u000b;\t󽯀-ᕬPN\r[肦\u001aY􍌵<􈣒\u0007W􌘅@𬷛𧥟𪈣\u0008iU󵛔b\u0010=\t8+󲠅􊉟󸬮􎛤>\u00061\u0008ZQ7fmQOQ󰹗l!\u0013꯲歔*ꪩ*1\u000c􋹍8nk|\u0015󵦮~\u000cO𧲭𘧿!:3\u0003n{%ᨇ𬦬if/!瓝] <􁶰Y􇖘\u0008\u0014~\t\u0019\u0001<*\u0015𣀥bx4 {𗟋\u0018Vs;g𘉱𣐄\u0002qkI!QJ􅲮J𮑈\u0014ﰡ?_\u0002\t􈍎iB3YdKA7@>Q󳅳󰾩]􋏴𠣍>D󺬃wD\u001b|\u000f'^𡙕𝠪Q#q,\"",
-    "icon_key": "\u0001]r<G\u0011Y-\u000f\u001d𣚐*𭧨}t?𥥷\u0018hx&|a𢨩󳒍r0≧􎴡L\u0003𦩩𗠪yi\u0000 '0w4f\u001b􏲲&󵿝rS雐W􄬝\u0011k "
-}
\ No newline at end of file
+    "icon_key": "\u0001]r<G\u0011Y-\u000f\u001d𣚐*𭧨}t?𥥷\u0018hx&|a𢨩󳒍r0≧􎴡L\u0003𦩩𗠪yi\u0000 '0w4f\u001b􏲲&󵿝rS雐W􄬝\u0011k ",
+    "name": ":괯R_.ၝ\u000b;\t󽯀-ᕬPN\r[肦\u001aY􍌵<􈣒\u0007W􌘅@𬷛𧥟𪈣\u0008iU󵛔b\u0010=\t8+󲠅􊉟󸬮􎛤>\u00061\u0008ZQ7fmQOQ󰹗l!\u0013꯲歔*ꪩ*1\u000c􋹍8nk|\u0015󵦮~\u000cO𧲭𘧿!:3\u0003n{%ᨇ𬦬if/!瓝] <􁶰Y􇖘\u0008\u0014~\t\u0019\u0001<*\u0015𣀥bx4 {𗟋\u0018Vs;g𘉱𣐄\u0002qkI!QJ􅲮J𮑈\u0014ﰡ?_\u0002\t􈍎iB3YdKA7@>Q󳅳󰾩]􋏴𠣍>D󺬃wD\u001b|\u000f'^𡙕𝠪Q#q,\""
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_16.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_16.json
index 9a6808c6595..f248cde64c7 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_16.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_16.json
@@ -1,4 +1,4 @@
 {
     "icon": "_'C󵌷\u00049\nC𖡚f\u0007𝁅Pe🎻𭏞𠮠𘃽5􀬏m<\r}𢈳@􁅠#.􂖇\u00026%􏝅H%󻝱n\u0004Uk\u001f/\u001cpS𦓈􌄑[1np\u0006mD󷁠U\u001dI􈡦]I삽𩸦AT\u0003\u001fOl{\u0011\tYt7U +Q􆂍\u0018\u001f[\u0002JV\u0004`\u0018rF\tN𐤏𗚁𩠇\u0016𨪒*A\u0010A]4ku󴻠W􏔺홊I\u0014\u000e𗇟",
     "name": "r\u001e\u0017뚌𢯠7X \u0019𤸰J\u0018尹􇥏/`󳬿mg𠵮2\u000b/7cI)&\u0000\r\u0019=m$\u0013rv\u0012W:उ\u0000!:\u0005x󿅤𘆆iy𒌊\u000f\u0005>j􁋝eA󿝖\tbj\u0019k\u0011l\n󱕁H~]uꞛ󻏫!kjVS{42\u0000E?\u0019h褨B!:\u0010X\u0011T3W\u0007vimhK􇒫\u0011to*P*\u0011}󰳺􇾡H\r󼜡B"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_17.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_17.json
index a874e6e3e1b..3c5f696fac3 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_17.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_17.json
@@ -1,5 +1,5 @@
 {
     "icon": "~󻂃C]\u0018S7a𐙣'󶎸u\u001ee\u00148쨞圈9=𠸕\u001b\u0007'󲅋jqUiA𬏟i!\u0002Pl\u0012􃵣\\\u000b;Pq|\rUA߀D4􊤫;arv\u0007h8/\u001e\u0010𩮉PZ􍽒𮈨|O󹖾\u000c􍩄E/6\t᾿f?,x\":{q::Z橳\u0000\u0018DBd\u0001𢓾a\u0003Z􉄣0~r@F",
-    "name": "|跤P\u001f󾃍𧁄Y\u0001j\u001eYrr쉏0m\u0005󺽲*'𑦢􍷘P6\u0016㮄\u000c\u0012𞢵e󻸊\u001e󺭋󴹋𑄺\rA'\u001dA\u0015툒􄨮J󸊪'T󽔣R2? \u001c\u001f󼄆$\u0015Gr(󶐡{\u00050m<T쩡\rs􎗚r$􆄭hR\u0015B𣭹\u000b\u0003 鉽􏣪\t􅈝~􉉬2𦬶5J<􃼢nU\tKNtd",
-    "icon_key": "1\r4]N!\"􅦩R&\u000f1i\u000ee𪙓ygO\u00064\u000bO\u0006~𘝚\u0000𓅀b1a𗭜Q\u000c\"󿣣􀳈)􃛢*x猤C_\u0001a[*9۵𡹿N[Y􎗮r\u0019\n3􆩙.(|as 6H\u001b󿭵󹡖􏎇\u00016\u0015Bmh/\t􎧕䬴~󻴋󷼗qbRp𢳼<􋅻讷N/󽭥;\u0014l𠜂\u001d𥗂ac\u0015C\u0016\u0004U\u0000\u0013pW[#u𝨩\u001e􌑫𨁋\u0012\u001d\u001ar\u0012D#􀱀󴸥𒔭(@i󾻹𩿙𝕗DY\u0019L1\u0013|q{&􎤪󺒬1{'􄅑y𬛅E)\u0012󴔸!0kdCOX:E󱄥\\󺜙C\u001eISa65N\u0016[i\u000e\u001e\u0000#:q"
-}
\ No newline at end of file
+    "icon_key": "1\r4]N!\"􅦩R&\u000f1i\u000ee𪙓ygO\u00064\u000bO\u0006~𘝚\u0000𓅀b1a𗭜Q\u000c\"󿣣􀳈)􃛢*x猤C_\u0001a[*9۵𡹿N[Y􎗮r\u0019\n3􆩙.(|as 6H\u001b󿭵󹡖􏎇\u00016\u0015Bmh/\t􎧕䬴~󻴋󷼗qbRp𢳼<􋅻讷N/󽭥;\u0014l𠜂\u001d𥗂ac\u0015C\u0016\u0004U\u0000\u0013pW[#u𝨩\u001e􌑫𨁋\u0012\u001d\u001ar\u0012D#􀱀󴸥𒔭(@i󾻹𩿙𝕗DY\u0019L1\u0013|q{&􎤪󺒬1{'􄅑y𬛅E)\u0012󴔸!0kdCOX:E󱄥\\󺜙C\u001eISa65N\u0016[i\u000e\u001e\u0000#:q",
+    "name": "|跤P\u001f󾃍𧁄Y\u0001j\u001eYrr쉏0m\u0005󺽲*'𑦢􍷘P6\u0016㮄\u000c\u0012𞢵e󻸊\u001e󺭋󴹋𑄺\rA'\u001dA\u0015툒􄨮J󸊪'T󽔣R2? \u001c\u001f󼄆$\u0015Gr(󶐡{\u00050m<T쩡\rs􎗚r$􆄭hR\u0015B𣭹\u000b\u0003 鉽􏣪\t􅈝~􉉬2𦬶5J<􃼢nU\tKNtd"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_18.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_18.json
index 879bae02407..fe78e84fd8d 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_18.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_18.json
@@ -1,5 +1,5 @@
 {
     "icon": ",\u0003𘤥\u0013svઉ4\u00067w𫊅\u0002􂱢\tgT6􏼷D\u0000𬛯\u001dE#w8?𦠋K𠦭[\u0012􃿰aOR\u001aJ7s\u001a1{Mp𭽋RgC🤆𗋤h\u0017?\u001d\u001f\u000f8𧬴𫂦'(r J􍬳9[}\u0015\u001a\u0019\u00185kT\u0008/d\u0011󹈡󵫋u􌏛z􈂓qcdcLi顼o4HK\u0006K𤲩𫉴&􇠕1󷗄􎝮<􍏪c\u0003lxy􇥦,􅌍\u0015🨎􋄥q􌉅z􅶸󺧤D`V4y2\u0002\u001fo+VeM_\n𦆆DaZ􃬧\u0011\u001c􁐷6X6홥揬Z\u0019\u001fw\u001f毩􃝲\tۓ󿺔cA~𘡰f𝑛Y?\u0010~\"𦴭\r􏬂(",
-    "name": "nb0\u0011󶛏𗽵}M:i2\u0013􊰅mHt𩩅D\u0001b\u000f봠!or𮑬\u0013\u0013Be􍱸\u001dh􆇐𦐐󻵂llA<'b󴪶\u001bKzgk#V蘫󱠓^uI[/𑅱M앰u堐ws*\u0007I𬇱}uK󼓡+\n\u0018\u0002z\u00028􄞠/\u0015/#\u000f>J\u000fD\u0002-\u0018_I𠔎\u000c𤃑\u001cR􇮍hp𣉒B6W2\u0008\u000c6􍯣\u0012𬌆\u00081'7-T-#ཱD􆱹􈌑T]v$Gl󾛤󼉲5yg󺔀\nQc.`i㧣忚}\u001c&k4𘔫\u0006>#納󽊚\u0019𠎓[vBOPu􎯣@\u0006\u0000􉦊𤆁\u000e\u0015𘇃篖\u0004\u0003&󼂜?z󱢾i\u000cz\n󻏿\u00173\u0007􎯛W􏷕E^󾮑<E]$􍈓mmo\t\u0017􇂝𩫸}\u001audf\u0011[􇉡R󸳗㌵N^z\u001aq􍷨K􅀁Uti\u0015a\u000cn7첬🂁X𓀳\u0010P_󱞟𗆹\ns\u0004\u0000j\u001d",
-    "icon_key": "\u0011-\u000b#I5􀪽叓\u0019a\u0003$H𤐀2펦K\u0010􆩨𠗧4􌑘L\u0005\u0015AC.\u0011%1𠚦<'GE\u0010釘C󴻘Mn逌龥-\u001b\"\u0015\u0012𪹈𣂬󻮭c\u0014y󻴛RB椀6\u0014fLN􌰲jDktCF\u0015󹨟\\\u0015n&뺳旈\u0007𦱳􆶉𩖠}ou󳷯\u0007\u000e\u001c\u0011𬭺\u001b0b~󴗖R\u0008Q$󷃁(s觝\u0008Z\u000e]5\u000c(37㼔폡"
-}
\ No newline at end of file
+    "icon_key": "\u0011-\u000b#I5􀪽叓\u0019a\u0003$H𤐀2펦K\u0010􆩨𠗧4􌑘L\u0005\u0015AC.\u0011%1𠚦<'GE\u0010釘C󴻘Mn逌龥-\u001b\"\u0015\u0012𪹈𣂬󻮭c\u0014y󻴛RB椀6\u0014fLN􌰲jDktCF\u0015󹨟\\\u0015n&뺳旈\u0007𦱳􆶉𩖠}ou󳷯\u0007\u000e\u001c\u0011𬭺\u001b0b~󴗖R\u0008Q$󷃁(s觝\u0008Z\u000e]5\u000c(37㼔폡",
+    "name": "nb0\u0011󶛏𗽵}M:i2\u0013􊰅mHt𩩅D\u0001b\u000f봠!or𮑬\u0013\u0013Be􍱸\u001dh􆇐𦐐󻵂llA<'b󴪶\u001bKzgk#V蘫󱠓^uI[/𑅱M앰u堐ws*\u0007I𬇱}uK󼓡+\n\u0018\u0002z\u00028􄞠/\u0015/#\u000f>J\u000fD\u0002-\u0018_I𠔎\u000c𤃑\u001cR􇮍hp𣉒B6W2\u0008\u000c6􍯣\u0012𬌆\u00081'7-T-#ཱD􆱹􈌑T]v$Gl󾛤󼉲5yg󺔀\nQc.`i㧣忚}\u001c&k4𘔫\u0006>#納󽊚\u0019𠎓[vBOPu􎯣@\u0006\u0000􉦊𤆁\u000e\u0015𘇃篖\u0004\u0003&󼂜?z󱢾i\u000cz\n󻏿\u00173\u0007􎯛W􏷕E^󾮑<E]$􍈓mmo\t\u0017􇂝𩫸}\u001audf\u0011[􇉡R󸳗㌵N^z\u001aq􍷨K􅀁Uti\u0015a\u000cn7첬🂁X𓀳\u0010P_󱞟𗆹\ns\u0004\u0000j\u001d"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_19.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_19.json
index 06797a68557..6749cd0555a 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_19.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_19.json
@@ -1,5 +1,5 @@
 {
     "icon": "\u0014g􄚣\u0002\u0015l𒀲M􌷔凌q𝠺\u000e\u0003􄥡0f:􂁷\r핐\u0019t\u001c1􏠰=\u0016ᑤW\rh􉦗󷡢M\u001b\n\u0008󷰣|􉚠\u0012:𣄇撖$𡹸󷙺勤c𣄞5\u0008QVCC􎍼Y\r󷨜]H\u0013\u0007IY\\[󼒘NnPq\r𨛱}絷𠄄J V2Y\u0013􃃐6땲􀐻{1g\u0019[쟨z4~󲘂9\u0008mCi,F󾳩$+\u000cyf`𢓫hVO\t􍎕O\u001c\u0019\u000cl:\u001f",
-    "name": "𪐝|Z凅?l\u00084D乛K0#OV>󰰅S3'4\u0006𒆠*m-\u001b4\u001fj\u0003__6󿝣ᦴM믅\u001b]\u0004Dq\u0010uo浾$\u000bUWp1=/o\u0017Y𪙶9\u0012\nQ𫒥􀦝)􍉷<h\u001fg􅄖",
-    "icon_key": "蕸𒄐\t\u0003/𠹚ꡊ𫾓(~\r/󰀈;{􁐤Uo\u001cBE\nj𫦆𐄉􎩌rv\nD.zK\u001dDYk\u0008$4󲗅~𑶖95l {\"n^􀱚e󽠿\u00168{F+zy%+*𥲕_󺯠Z\u0016🧴𛈳퐵𒔎\u00123=󳌬c磎뽏7\r𬴈}\u0018𦷟m\u001e󽂣\u0005𤓊$#\u0018\u0011\u0004􄭢<\u0015A5[tx~􃵄C\u0005𠟙E%=kKQs@o􈆕JT\u00172;𧢚\u000c\u000f]\u0015\u0018\u0002>󶱉\u0015aR𣛯;쮷\u0001\u0019\na\nvt𠠗\u0003a𢕖 J𠸂uX􆽹?Wz&<\u0014C\u000cx`󽝑#\u000f懶邵ꩤ\u001e\u0002#\u0016\u0014-Oj\u0004d󽗌'FoHqexoh\u001ax􎋻𭉐\u0008i󳰵yr\u000f􃼯w􍥢\n8T󶋓2'󺁼􏋦􍒽\u001enxW[棁󲜚𗧓𥝏i㔕4󶌓YHZ뺃VZ\u0010^0\u0002C􂌻󽍘"
-}
\ No newline at end of file
+    "icon_key": "蕸𒄐\t\u0003/𠹚ꡊ𫾓(~\r/󰀈;{􁐤Uo\u001cBE\nj𫦆𐄉􎩌rv\nD.zK\u001dDYk\u0008$4󲗅~𑶖95l {\"n^􀱚e󽠿\u00168{F+zy%+*𥲕_󺯠Z\u0016🧴𛈳퐵𒔎\u00123=󳌬c磎뽏7\r𬴈}\u0018𦷟m\u001e󽂣\u0005𤓊$#\u0018\u0011\u0004􄭢<\u0015A5[tx~􃵄C\u0005𠟙E%=kKQs@o􈆕JT\u00172;𧢚\u000c\u000f]\u0015\u0018\u0002>󶱉\u0015aR𣛯;쮷\u0001\u0019\na\nvt𠠗\u0003a𢕖 J𠸂uX􆽹?Wz&<\u0014C\u000cx`󽝑#\u000f懶邵ꩤ\u001e\u0002#\u0016\u0014-Oj\u0004d󽗌'FoHqexoh\u001ax􎋻𭉐\u0008i󳰵yr\u000f􃼯w􍥢\n8T󶋓2'󺁼􏋦􍒽\u001enxW[棁󲜚𗧓𥝏i㔕4󶌓YHZ뺃VZ\u0010^0\u0002C􂌻󽍘",
+    "name": "𪐝|Z凅?l\u00084D乛K0#OV>󰰅S3'4\u0006𒆠*m-\u001b4\u001fj\u0003__6󿝣ᦴM믅\u001b]\u0004Dq\u0010uo浾$\u000bUWp1=/o\u0017Y𪙶9\u0012\nQ𫒥􀦝)􍉷<h\u001fg􅄖"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_2.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_2.json
index e4afe68bf36..51a3779ba2e 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_2.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_2.json
@@ -1,5 +1,5 @@
 {
     "icon": "𫕫\u0019鲺+s\u0006?5z[殘􊊧^􆘚㬹6o􆹷𝂤1+􄓓𘑠\u0007\u0013oT\u0016\u001dU􅥕\t𗨇䛱L𩼅U󳫢k𗀼􊇡B𫰵",
-    "name": ";𭏚@m\u0008Z󹔛1}\r9\u001e)<Qi",
-    "icon_key": "3~X\u0011\u0012`\u000f\u0002` 􀌞{Jj𨳹d!\u0000􇺌&􈯵-%\u0014(^ZL𥰟v\u00188d푀~1n󵑬O􃇿O􆣬 􈍇\u000e)h:%󰟆Z}󷖛[c#󹍔~K󴶕Gࡕ\u0012\u0017󰧚\u001e\u001c\u000fb{_fBZ🙆m􎎋;n]\u001bJ|vd)\u000f\u0016Y拣5P\u0014􎤮|r(󳥷r\u001a?#􀌬缥𧱁\u0014󲂸𞢓9󳗋J |o\u0010>4wa𗐋leQ*󴑞󼡨>@,󿖻𮦮RF4QcNY96𩉓􀮈G􅆔&J\\TzHUiG.C\u001a&\u001cx춈𨿱3􍳊A􁔸B)燖穲r󵌈\u0005&VCPa{\u0001\u0019Wꧬ𗰙\u0010/􇔳\u000fc:b\u0001𠒪)襈􌫒鉲@5󰊈I02g%%1bJl} :󹙳\u0016署𦲖𢻉"
-}
\ No newline at end of file
+    "icon_key": "3~X\u0011\u0012`\u000f\u0002` 􀌞{Jj𨳹d!\u0000􇺌&􈯵-%\u0014(^ZL𥰟v\u00188d푀~1n󵑬O􃇿O􆣬 􈍇\u000e)h:%󰟆Z}󷖛[c#󹍔~K󴶕Gࡕ\u0012\u0017󰧚\u001e\u001c\u000fb{_fBZ🙆m􎎋;n]\u001bJ|vd)\u000f\u0016Y拣5P\u0014􎤮|r(󳥷r\u001a?#􀌬缥𧱁\u0014󲂸𞢓9󳗋J |o\u0010>4wa𗐋leQ*󴑞󼡨>@,󿖻𮦮RF4QcNY96𩉓􀮈G􅆔&J\\TzHUiG.C\u001a&\u001cx춈𨿱3􍳊A􁔸B)燖穲r󵌈\u0005&VCPa{\u0001\u0019Wꧬ𗰙\u0010/􇔳\u000fc:b\u0001𠒪)襈􌫒鉲@5󰊈I02g%%1bJl} :󹙳\u0016署𦲖𢻉",
+    "name": ";𭏚@m\u0008Z󹔛1}\r9\u001e)<Qi"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_20.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_20.json
index 8a340ceb850..c4ecb2db863 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_20.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_20.json
@@ -1,4 +1,4 @@
 {
     "icon": "Zz]|\u0008>\u0000𧷛􃫣𗖻\u0001,q\u0001`􀣞P󱉭􅁌\n\u0004Im􄠱\u0014󷜳􆢃HB\u001d`󹫇𢴱U𧩣G\u0013m+Lw\u0010󹾧\"0𝍉?-T\u001b\u0003j\u0013|Lq\u0003.𘋘hgq\u001by𘒇5\u0007y\u0006􏚅w^(\u0017+𪻾3\u000c𛰿x󶅕i*E\u0013𫹺rTM\u0018􊶥$𧐐𮣞\u0004\\p􁇚1\u0007𠀗􀠺zv󼞙\u0019rj\u0007󾭒u\u0015n\u000e𨆖6\u001bs\u001dm9Y\u001c%\u0010?6󽯧\u0002\u000c􃩾)RST\r\u0010􎑠\u0011􇓹h\nTS\u0012\u001f􋻇\u0002n\u001b𤦦r2𒂷󰕫hrr-$*j􏇺觹]@󵅝㪱J\u0008\"8N𐬼e,<O\u0012󲇰*H󺊿?{\u0019\u0012C󹭕꾶",
     "name": "\u0001W+\u0007#𤺄iN6\u001d/#mrj4'\rTV]\u0003g>\"br\u0001\u0000𦱘+멦c^󴾍<`􏛇𤙄\u0002󰷙\u0003𧥛D\u0005皔nqp􋝳󱓐c\u001et􇿧G"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_3.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_3.json
index 68bdb9d910f..8fa459aa876 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_3.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_3.json
@@ -1,5 +1,5 @@
 {
     "icon": ":b6𘍗L􁠹K<􎦯𗋵C^\u000eY8LuXS𦏱F\u0001\u0017썁󹲗\u001f󾥞J]\u0017A2R$P6\\\u0005𩆊-J\u0000t\u000f󿫯*󻣠r􇍈M\u0015PL)𗈟\u001aJ𑱚S􍜑~'kRYj𑘞{P{V\u0001!󰱿Y~\u000bV\t𤰂{5%i[$7X:ZV\u0000y\u0007삉\u0016\u0005\u000c;!k?O󻚧􈒉K:}􋴳𪤷#>\\|(n\u0002𨟼\u0003D𤨬쮝{|𥃇󱄮+᭮J",
-    "name": "\u001a_F\n﹃𢖀\u0012>􇜁𒎌t\n)1/% hL\u0012Ad\u0001Xq6\u0011)\u0000\u000c6\u000cV\u0014r􋶨\u0011n􎖟,@𩳑𝃔\n\u001a%N𫊸\u0006葀Xv)\u0016z?\u0014\u0019Y𧤂2𗘰um8}죜\u0012yW\u0000HQ\u0005D[Fe\nk󳻂\u0019懷Yk@##u}j𩝺𥛾\u0002q\u001bir7) 汬%󸄨~󲪳8􉈠je􌟌0*Gi3𝟽je\u0018Qr>󼕣k1爛c󻶢L󷴬𖺉t\u0004W󳿃\u001ao\u000cgh\u0006𪀙C2霩c\u001a)uW\r\u000cB󾧾Sf\u001a\u0001*5l隺\u000f文\u0019B(\u0005𠩾/)!{󵬬9\u0002A㻍fx&𫽹T&𭪕\u0014쯾[\r\u000b\n􅢉j2𨤤/􉑰\u0005Qo\u000cj𠵠🤐\nb6\u00183\u001e9\u0019󴊖ub\u00173CY\u001dsIz",
-    "icon_key": "\u001c\u001eP󱖗Gt\u0016-렬nJ󶲘g^\n\r𫙿\u001dR󶦍<q\u0010cN{#􇦞[ZK\u0014𣋇󼲼b\u0015󺍾G\u0000􆎁_1\u0002WvY"
-}
\ No newline at end of file
+    "icon_key": "\u001c\u001eP󱖗Gt\u0016-렬nJ󶲘g^\n\r𫙿\u001dR󶦍<q\u0010cN{#􇦞[ZK\u0014𣋇󼲼b\u0015󺍾G\u0000􆎁_1\u0002WvY",
+    "name": "\u001a_F\n﹃𢖀\u0012>􇜁𒎌t\n)1/% hL\u0012Ad\u0001Xq6\u0011)\u0000\u000c6\u000cV\u0014r􋶨\u0011n􎖟,@𩳑𝃔\n\u001a%N𫊸\u0006葀Xv)\u0016z?\u0014\u0019Y𧤂2𗘰um8}죜\u0012yW\u0000HQ\u0005D[Fe\nk󳻂\u0019懷Yk@##u}j𩝺𥛾\u0002q\u001bir7) 汬%󸄨~󲪳8􉈠je􌟌0*Gi3𝟽je\u0018Qr>󼕣k1爛c󻶢L󷴬𖺉t\u0004W󳿃\u001ao\u000cgh\u0006𪀙C2霩c\u001a)uW\r\u000cB󾧾Sf\u001a\u0001*5l隺\u000f文\u0019B(\u0005𠩾/)!{󵬬9\u0002A㻍fx&𫽹T&𭪕\u0014쯾[\r\u000b\n􅢉j2𨤤/􉑰\u0005Qo\u000cj𠵠🤐\nb6\u00183\u001e9\u0019󴊖ub\u00173CY\u001dsIz"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_4.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_4.json
index a4bcaf1f96c..4ed974f0ca4 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_4.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_4.json
@@ -1,4 +1,4 @@
 {
     "icon": "tmIV󳻵3􌹙󿽑HKE{􆭢R9\u0004\u0017E2𐭐L󶢉|a\u0008|Cꊁ􁢣}\u001d󻱜\u0018O9$)\u0000\u0002𥙒肷\u0000쑰K󿉉􂇠d懛\u001d\u000bq󺖧B\u0003\u0007T\u000ePtY\u0015󿫵潌z#k`P􂀖\u0002_7LXC]`#-`\u0006ࢺ\u0012pw59\n\u001a\u0010jꍃ𭈉F\u0017􅪽\t;\u0012r*圮\u0019S𬤻E8e\u001cx􊞎A\u001a|j\u0007d\u00100RDI\rQ\u0015`􅰜\u0019)j{􃚂𢸬􌥩f@\t\u0011\u000c\"\u000c󾵭􌛋􍼕ᢞJ`.𛁓*\u0008F%4󶟬\u0019-3g𘟴􍙴􍀉\u0002\n\u0010\u0013]s𫫟_\u0007󾒾𧯔\u0012\u000bȃ\u0010㳼v|\u0008􀻧%𨙤g~0\u0004Wp\t 𪒺C\u001c𤥂x\u0005\u0006\u0012-DIYa󵌭:𮔿'{􈚁𣃢󾕜6Ḋ󴋄=xfo\u0006U'\u0014􍊅t\n\u0012􋝛6𝋯/􍚳tR\u0016#􎽉",
     "name": "\u0003󵳮k;"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_5.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_5.json
index 9f1c206f0a1..ed2cc6465cc 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_5.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_5.json
@@ -1,5 +1,5 @@
 {
     "icon": "![\u000181潅󰋙䘎𤗈𧗎\u001b􀷘\u0007\u0018\u0004}r􍅵\u001bt𫞣𪐝􎟩繤𥞓M󲷤1\u0018$;\r\u0002\u000e\u0003P\u00193)R=E?9\u0010$>*\\`鞀\u0013\u0007]𣔼󹓭{FKA\u0008􍄸𫨟\u0013\u001f=UC𫷵KQb􁡺󷼩\u001cX7@󳌔C~-[Db $cx\u0003Czvq ,g\rD󻿪",
-    "name": "\u000fB𑋐3𦩜\\#􃅻I\u001fK󹶘h\u0010\u0013\u001e𠻊*󳵆L\u0002w1p\"4\u0004𮉃#u𣖞\u0016\u001c鄂ꊙ$Ÿwu𪞴넣󶏴\u001a\u0007)\u0012?T 솆8馿.\t\u00151\u000c\u0004Y🙉%މﭸ㮲 &Z4􈼌\u0000@\u0001\u0019𥯩􇐟􌑣xtj𬦽`\u0001r\r𖾒\u00040\u0019\u0000Lyc D\u001c􈺓􁣾)\u001a-\u000e􈼌\u000bl󰔐􏿡\u0018𭨼f\u000frb/[F\u0000􌣆<1󺼰P\u001dxl\"!11E\u001b0\u001b\u000c$u􊼽N\u001dV^󸗡q𩪫\n`󿮐𧶴:iLXn\u0018󱜞朻O}8!Y\u0015,^X咽<w􃐺]㳆L󸭻ⴖ(e洞U2󽸌9\u0006`'iOp\u0018􆙾O6]󰚍\u0003`뚱yv<􎄇AQ󠀦Z\u0017\u001dR󲡳􅏧x%\u0015􂝍Vy󵳟*iR󶃀Sd𪞉wp8hn:Y\u001f",
-    "icon_key": "s𡜶:\u001fdm㒛\u0015I⸈Y􅌌𬜈􋪠>q󱙒\nQ\u001e􁔾\u001d#w𤇠𩻗􃿿𡖭B\u0014\u001aLv\"S>𝤅!]sB+6\u0011oc\u00177蛑lR𗙺\u0019r%E􇋯B𘆔A􄡥N\u0017?{􄈤/|cU𢟋]𖫠􍇌\u0010𣾄􆣶+󲃎\t$F𗧊he4𨰴|k/!5Z~𔔮\u0017󸛵\u0001\u0005􂃝3E!{^茖4fh󻗈N􏚙v\u000c\u001d󳪍mde!5󺻟y&􃔋xo,\u0002rk􅨸\u0005\u0001JoS󰹇X䧱󲸿a󱽇\u001e󿘄\u0019\u00013j༽Z4\u0014􄸣l컬n\u001b@ve#\u0016\u001d𬴣P4􇀲\u001b𩣣:𦠊z1*\u001fs\u000bd`􂬥/餄𨜲"
-}
\ No newline at end of file
+    "icon_key": "s𡜶:\u001fdm㒛\u0015I⸈Y􅌌𬜈􋪠>q󱙒\nQ\u001e􁔾\u001d#w𤇠𩻗􃿿𡖭B\u0014\u001aLv\"S>𝤅!]sB+6\u0011oc\u00177蛑lR𗙺\u0019r%E􇋯B𘆔A􄡥N\u0017?{􄈤/|cU𢟋]𖫠􍇌\u0010𣾄􆣶+󲃎\t$F𗧊he4𨰴|k/!5Z~𔔮\u0017󸛵\u0001\u0005􂃝3E!{^茖4fh󻗈N􏚙v\u000c\u001d󳪍mde!5󺻟y&􃔋xo,\u0002rk􅨸\u0005\u0001JoS󰹇X䧱󲸿a󱽇\u001e󿘄\u0019\u00013j༽Z4\u0014􄸣l컬n\u001b@ve#\u0016\u001d𬴣P4􇀲\u001b𩣣:𦠊z1*\u001fs\u000bd`􂬥/餄𨜲",
+    "name": "\u000fB𑋐3𦩜\\#􃅻I\u001fK󹶘h\u0010\u0013\u001e𠻊*󳵆L\u0002w1p\"4\u0004𮉃#u𣖞\u0016\u001c鄂ꊙ$Ÿwu𪞴넣󶏴\u001a\u0007)\u0012?T 솆8馿.\t\u00151\u000c\u0004Y🙉%މﭸ㮲 &Z4􈼌\u0000@\u0001\u0019𥯩􇐟􌑣xtj𬦽`\u0001r\r𖾒\u00040\u0019\u0000Lyc D\u001c􈺓􁣾)\u001a-\u000e􈼌\u000bl󰔐􏿡\u0018𭨼f\u000frb/[F\u0000􌣆<1󺼰P\u001dxl\"!11E\u001b0\u001b\u000c$u􊼽N\u001dV^󸗡q𩪫\n`󿮐𧶴:iLXn\u0018󱜞朻O}8!Y\u0015,^X咽<w􃐺]㳆L󸭻ⴖ(e洞U2󽸌9\u0006`'iOp\u0018􆙾O6]󰚍\u0003`뚱yv<􎄇AQ󠀦Z\u0017\u001dR󲡳􅏧x%\u0015􂝍Vy󵳟*iR󶃀Sd𪞉wp8hn:Y\u001f"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_6.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_6.json
index c26a54cf352..0c2b1a34385 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_6.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_6.json
@@ -1,5 +1,5 @@
 {
     "icon": "l𣞕砅\u001f@/D\t𣨊󹀆^f\u0015\u0014[🁺󴳧)􌁱W󼲙2𛋢\n#𡶪|/I\rI\u0000\u001f;\n\u000b\u0008\u001b\u000e\u0008}􂼺Q𩆰45^mI⨾𡷲􏃞k\u000e􅫭d0iA7\u0013\rW󰠂󾍟Z𨧣T딸u\u0004\u000eX\"󳔦",
-    "name": "v𭺬hEWefuu󵳔jPx𦦹k#\u0001󰹥\u0002\u0003^\u001b\n\u0018₅p1D|S1􄀟􍄚熗\u0016`\t0g󼣥,t\u001cw\u000cDT\u001e#H\u0001𣜘\u001f{􊞫󺙲󰔬lW\u0007,uil\u000fN`5e:\u0016 Y!\u0016󺑛tb􈼝",
-    "icon_key": "+&heN􊥥K\u000c_k\u0010(蒲\u0013♩M\u000c󻛝􌇂\u000f^s􍀟Ga,$钾\u000fb\u0013\u000c\"s{\u00065󺔍ᘑ\u001f\u0010\u001a􉃉𑇫\u0018,󽃥𦤷\u0014 􎳟P𗐍|f.>hEa\u0010^\u0005\u0008]`􏭴<\u001dZG󵉂\u0001𮞘廑*8p\u001cF@OLpnXTmW𗤩f𐨎􆮍敢Ze1 \u0016Em汵f\u0006󱀇"
-}
\ No newline at end of file
+    "icon_key": "+&heN􊥥K\u000c_k\u0010(蒲\u0013♩M\u000c󻛝􌇂\u000f^s􍀟Ga,$钾\u000fb\u0013\u000c\"s{\u00065󺔍ᘑ\u001f\u0010\u001a􉃉𑇫\u0018,󽃥𦤷\u0014 􎳟P𗐍|f.>hEa\u0010^\u0005\u0008]`􏭴<\u001dZG󵉂\u0001𮞘廑*8p\u001cF@OLpnXTmW𗤩f𐨎􆮍敢Ze1 \u0016Em汵f\u0006󱀇",
+    "name": "v𭺬hEWefuu󵳔jPx𦦹k#\u0001󰹥\u0002\u0003^\u001b\n\u0018₅p1D|S1􄀟􍄚熗\u0016`\t0g󼣥,t\u001cw\u000cDT\u001e#H\u0001𣜘\u001f{􊞫󺙲󰔬lW\u0007,uil\u000fN`5e:\u0016 Y!\u0016󺑛tb􈼝"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_7.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_7.json
index 3127a9f67e7..a03c29a6247 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_7.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_7.json
@@ -1,5 +1,5 @@
 {
     "icon": "_5勞\u0007Q􎲫W⃛9ꮦ*󴽳",
-    "name": "𣢐󾧌iz􂒳FT㩴;􎦑}𮇵􏵿9\u000e󲆑7>hAC\u0000H2O𫑫m𭴿2R(?W,=,󱸅M󲓈\u0007M椔\u001a맰q\u000elj\u0004j^.s~\rY%5lM,杼=\u0006󸑃𮆫>{\u0018\u0010㸆f=X9\u00169쟉𦺻TI4䒿\u000b\u00156󷲘/\u0010\u0015\u0006尌H<\u0005󻙇e\u0005z󸚸:៹\"rS\u0007𨻬\u001c\u0003􂧙󻹪뽴\u0014\u0014Q\"􄃰1:􋽔\u001fT.;󾣧䟌}",
-    "icon_key": "D\u001e<?┍64=𤸈^◝􄺫*Y\u0016Z8F\n5\u0000%G4G\u0006􃩗𨛤ke\"#k8\u000b\nasEo\u0014\u000c:%\u0014춋-\u0011𣶬e\u0018𥽛𠽀\\e䳬\u0008d\\󸓻Z\u000c'󼑷+c𥖓1䇠𠄉\n\r󿏁𮝽+\u0000WcB8t\u0016P\u0012\u001b-;󾕈/ODl[\u0019𢱠wJ'8q@[9􋵎􄾜􁶠m\u0014*\u0001\r\u0002+󴂿p\u0018b\u001avrF\u001aRb󷎦􌣃\u0012}\u0007/\u000e=qd9v󻯀\u001df 󸁭晑8\\\u0000𐰤Js\u0012󽋉2𭠟\r>𩉨\u0001󼓤🚱Ll\u001d\tW􂂹o\u0018멤b\u0003|\u001f*=󶶐􄖘󱓧6󴆄"
-}
\ No newline at end of file
+    "icon_key": "D\u001e<?┍64=𤸈^◝􄺫*Y\u0016Z8F\n5\u0000%G4G\u0006􃩗𨛤ke\"#k8\u000b\nasEo\u0014\u000c:%\u0014춋-\u0011𣶬e\u0018𥽛𠽀\\e䳬\u0008d\\󸓻Z\u000c'󼑷+c𥖓1䇠𠄉\n\r󿏁𮝽+\u0000WcB8t\u0016P\u0012\u001b-;󾕈/ODl[\u0019𢱠wJ'8q@[9􋵎􄾜􁶠m\u0014*\u0001\r\u0002+󴂿p\u0018b\u001avrF\u001aRb󷎦􌣃\u0012}\u0007/\u000e=qd9v󻯀\u001df 󸁭晑8\\\u0000𐰤Js\u0012󽋉2𭠟\r>𩉨\u0001󼓤🚱Ll\u001d\tW􂂹o\u0018멤b\u0003|\u001f*=󶶐􄖘󱓧6󴆄",
+    "name": "𣢐󾧌iz􂒳FT㩴;􎦑}𮇵􏵿9\u000e󲆑7>hAC\u0000H2O𫑫m𭴿2R(?W,=,󱸅M󲓈\u0007M椔\u001a맰q\u000elj\u0004j^.s~\rY%5lM,杼=\u0006󸑃𮆫>{\u0018\u0010㸆f=X9\u00169쟉𦺻TI4䒿\u000b\u00156󷲘/\u0010\u0015\u0006尌H<\u0005󻙇e\u0005z󸚸:៹\"rS\u0007𨻬\u001c\u0003􂧙󻹪뽴\u0014\u0014Q\"􄃰1:􋽔\u001fT.;󾣧䟌}"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_8.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_8.json
index 34a3a83fec7..79c17c026bb 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_8.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_8.json
@@ -1,5 +1,5 @@
 {
     "icon": "✅IT\u001e􍑦뾖%mE󰤊􀩈M\u0007:[fgw\u001b?ye𑇐􋱯K\u0017l􁜛󷔒󽎻Qg?𤼃{\u000c!uXA}H)v$𧋓􊷪mGkC9􈸥\u001d􊲊󼫰1DH𨩌sꕂ7[.𭹆v+􊥆O^SGjv􅇮Y󴺥n𥬜Z𓈋\u000e{􂺫Q\u0003\u001e1I\u001c5\u0006󼻌􈥆󻳺_􍽩?gDႽ\u000cg㪠:g\u001c.J<\u0012\u0017󸋤}/𗹵OBLa􀳘\u0007{󶷱-􃾛\u000b\u000f\u0010𣥐V \\Ns0t􈃙frR!Qe!$𢌢󶀅\u0016$􇋮!SZ􁀀𭃻a\u0010B3",
-    "name": "YwD󹸝r\u0015}􈨫\u0006󿴏琮\u0004􅞶iI5g󷈟\t\"r𤩇O\u0014?켍􌨂􎯠\u0000􂷐qgg\u0011X)\u0000L􁝀\u0018{\u000b4\u0000𖼯\u0008vD#󼸣$aYFk\u0008􍃘􉿓󾤭렝:1𫹢S7𐒹V)􅯗\u000b𗫝3#\u0008􍰃c槯Q/jPy󷽄P@Df󳨚쨬H􏴑Xr\u000e\u00173%􎬘aF@3A\u000f\u0017\u0002 mj9T=\u0013'XI\u0012?0􊹯𦒺VHp?􄒳YUꑬ脻𑱪,)􏵐\u000396𥛺zꗍ/4T𡏢\u001b􉍱&\u0017S􌏼㣲z[핮Z\u0012\"e\u001a𪝫&rQ\u000cJG𘛢𫽅𥼫s$\u001a$앰S𧫺E\u0003*\t+WU*𣔎󾛐8\u0015󳼐a\t\u0019􌂳_OD󵬱/嶾􌥬SmfX",
-    "icon_key": "v𑈬땻h\u0001_󲋫\u0013\u0006i󴋤\u0011\u0003W𑱑譟\u0012嫢󺥖\u0004\u000c%_􃹩\u001d\u0016\u0017 N\u0000F󵞛\u0005LUua3􉻐M↝\"𗊟\u0001\u001e\n-='\u0011B#\u001c𡚱>\u0013𠓴\u000f\u001d􉩪G7v6w Zቆ􀦮𬥤𩬵\u001bP>𠀧􀫷􆷹\u000b}?ᓄJg\u0001\u001a^pl􌽧2.\u000eV\u0013坣ﯽ\u0005B󿏻􆷽𢃤<\u000c2䬴Tz@6\u0013𑢫x?𤪑週\u0008\u0010\u0018p􈃰\u0016\u0003N􌠀C\u000f\u001a\u0011l]R\u0000vL󺵶Nz\u000c-bf}f>\u0002H\u0019𡔤+Zo<ju\u0014}\u00009\n𥿬mUHuar(Z􍪝󻫌󷋥𧄋\u000c0X𘫱ᓽo􈥄/S𥙃}-E^\u0000/\u00066󸏙臿w\u000bi^47\u001ed&n𭰶oD􄢊\u001cye/s"
-}
\ No newline at end of file
+    "icon_key": "v𑈬땻h\u0001_󲋫\u0013\u0006i󴋤\u0011\u0003W𑱑譟\u0012嫢󺥖\u0004\u000c%_􃹩\u001d\u0016\u0017 N\u0000F󵞛\u0005LUua3􉻐M↝\"𗊟\u0001\u001e\n-='\u0011B#\u001c𡚱>\u0013𠓴\u000f\u001d􉩪G7v6w Zቆ􀦮𬥤𩬵\u001bP>𠀧􀫷􆷹\u000b}?ᓄJg\u0001\u001a^pl􌽧2.\u000eV\u0013坣ﯽ\u0005B󿏻􆷽𢃤<\u000c2䬴Tz@6\u0013𑢫x?𤪑週\u0008\u0010\u0018p􈃰\u0016\u0003N􌠀C\u000f\u001a\u0011l]R\u0000vL󺵶Nz\u000c-bf}f>\u0002H\u0019𡔤+Zo<ju\u0014}\u00009\n𥿬mUHuar(Z􍪝󻫌󷋥𧄋\u000c0X𘫱ᓽo􈥄/S𥙃}-E^\u0000/\u00066󸏙臿w\u000bi^47\u001ed&n𭰶oD􄢊\u001cye/s",
+    "name": "YwD󹸝r\u0015}􈨫\u0006󿴏琮\u0004􅞶iI5g󷈟\t\"r𤩇O\u0014?켍􌨂􎯠\u0000􂷐qgg\u0011X)\u0000L􁝀\u0018{\u000b4\u0000𖼯\u0008vD#󼸣$aYFk\u0008􍃘􉿓󾤭렝:1𫹢S7𐒹V)􅯗\u000b𗫝3#\u0008􍰃c槯Q/jPy󷽄P@Df󳨚쨬H􏴑Xr\u000e\u00173%􎬘aF@3A\u000f\u0017\u0002 mj9T=\u0013'XI\u0012?0􊹯𦒺VHp?􄒳YUꑬ脻𑱪,)􏵐\u000396𥛺zꗍ/4T𡏢\u001b􉍱&\u0017S􌏼㣲z[핮Z\u0012\"e\u001a𪝫&rQ\u000cJG𘛢𫽅𥼫s$\u001a$앰S𧫺E\u0003*\t+WU*𣔎󾛐8\u0015󳼐a\t\u0019􌂳_OD󵬱/嶾􌥬SmfX"
+}
diff --git a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_9.json b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_9.json
index bec01a7be35..7b035092e65 100644
--- a/libs/wire-api/test/golden/testObject_BindingNewTeam_team_9.json
+++ b/libs/wire-api/test/golden/testObject_BindingNewTeam_team_9.json
@@ -1,5 +1,5 @@
 {
     "icon": "i\u0010i|ᰜ\u0017󺗳\u0000Ẻ\u0000D'𗄅Zby󽭆⇗Y\r󹁁\\n員𩆛>󴈣6𢓖󽱓重󸒝|`dN 擦󱈠i_􁮱p󼐑J斐ngp@#􍼃A󱖱7l{;𬁛g4EX넌\u001b􄳆𤺴#z𫂓\u0016y\u0004\tG\\謖坴#s󵘆Ad􋓔Obh󶑡\u0012􉑳)3R\u001a\u001c𗳩aw]􆞷󽰤ფ𝂦kC梿\u0001󴶁󵢐d8둥\u0011\u0016ﰺf9",
-    "name": "\u000eLN\u001dr𣎸􅜗k𬙅#𥙝lTD[Jh\u0001󻕋蕠6<l+𣴓&!/1􈋑\u001cT觃@F&󿯺\u000b\u000b)螈#yX \u0008-\u0001\n􌐝┆􁧨\u0004\t􌀸𫯚{q􍣈C\u001e𓊩\u001c*6􄙜m.𣤩#?Si*㛮\u001a􏎱;g4ww#🞫\"o\\D\u0005\u0003t1󸋲􂮋EZq\u0013X􌐬\u0001蔌K)}􊛗4K𬉵󽹬\u000e󴿛3믈\u0019tt>󼧒􃟠\u0015}\u0007db𩵜-\\-1\u00142󿝈\u0012𓐮1/脼b:\u0005󽩦;Mw\u001c𬸺􏷋ITuy􀚘`SP\u0001\u000e\u001d\u0015\u0007\r7M􅄎􃳖䢷\n\u00163V\u0003R\n1$e.􋩅B~yd_z󿴉\rV􊜗\u001e\u0016𨒺l\u0013론u􂝲u\"\u0007Tc|sEw󶷶wTC|FቿB\t\u0014&\u0008UEN(+M\u000eF;􌟢𠶭\u001920\nrPW󸓢$􃽩",
-    "icon_key": "X󸸽;\u0005W\u0006Lk󳌎𣔖\u0017\n][~⠨&U亝v`I\u0017\u001fl󰉫\t􊋾?䍋KM3c􄨽󻧳= \u0017t5vKOg\u0015/NC2~i'􃝴Ojb\u0008\u0003􊇳\u0011\u0001\u0000FWc󷭕sU>P\u0001~\u0019wUHU\u000e#훞􈅯!Nwn󵠡e\u0001\u001a\u000c\u0003\u0017Tl𛀥BYU;a󷋠K7?,m𥪤Xpa뺹𡰽\u0019 ,M!~^g6}(踑\u001eᾋgX}𧓻)c\n\u00012E"
-}
\ No newline at end of file
+    "icon_key": "X󸸽;\u0005W\u0006Lk󳌎𣔖\u0017\n][~⠨&U亝v`I\u0017\u001fl󰉫\t􊋾?䍋KM3c􄨽󻧳= \u0017t5vKOg\u0015/NC2~i'􃝴Ojb\u0008\u0003􊇳\u0011\u0001\u0000FWc󷭕sU>P\u0001~\u0019wUHU\u000e#훞􈅯!Nwn󵠡e\u0001\u001a\u000c\u0003\u0017Tl𛀥BYU;a󷋠K7?,m𥪤Xpa뺹𡰽\u0019 ,M!~^g6}(踑\u001eᾋgX}𧓻)c\n\u00012E",
+    "name": "\u000eLN\u001dr𣎸􅜗k𬙅#𥙝lTD[Jh\u0001󻕋蕠6<l+𣴓&!/1􈋑\u001cT觃@F&󿯺\u000b\u000b)螈#yX \u0008-\u0001\n􌐝┆􁧨\u0004\t􌀸𫯚{q􍣈C\u001e𓊩\u001c*6􄙜m.𣤩#?Si*㛮\u001a􏎱;g4ww#🞫\"o\\D\u0005\u0003t1󸋲􂮋EZq\u0013X􌐬\u0001蔌K)}􊛗4K𬉵󽹬\u000e󴿛3믈\u0019tt>󼧒􃟠\u0015}\u0007db𩵜-\\-1\u00142󿝈\u0012𓐮1/脼b:\u0005󽩦;Mw\u001c𬸺􏷋ITuy􀚘`SP\u0001\u000e\u001d\u0015\u0007\r7M􅄎􃳖䢷\n\u00163V\u0003R\n1$e.􋩅B~yd_z󿴉\rV􊜗\u001e\u0016𨒺l\u0013론u􂝲u\"\u0007Tc|sEw󶷶wTC|FቿB\t\u0014&\u0008UEN(+M\u000eF;􌟢𠶭\u001920\nrPW󸓢$􃽩"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_1.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_1.json
index efd0feac097..a6471a66329 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_1.json
@@ -1,66 +1,66 @@
 {
+    "id": "00000006-0000-0012-0000-001900000009",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000000",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
             "conversation_role": "t4vroye869mch4",
+            "id": "00000001-0000-0000-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "id": "00000001-0000-0000-0000-000000000000"
+            "service": {
+                "id": "00000001-0000-0000-0000-000100000000",
+                "provider": "00000000-0000-0000-0000-000000000001"
+            },
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "bi8z5mc78lg3bqqk29yd36x2_haz6b05t6ybil8p7zbkj",
+            "id": "00000000-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000000000001"
             },
-            "id": "00000000-0000-0000-0000-000000000001"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000000"
-            },
             "conversation_role": "ncz23zan6fw786izkcx",
+            "id": "00000000-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000100000001"
             },
-            "id": "00000000-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0000-0000-000100000001"
+                "id": "00000000-0000-0000-0000-000000000001",
+                "provider": "00000001-0000-0000-0000-000100000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "_brjrjrldhybr251gl72y3_nqqwhdh8k2c0oznqgiwrhzf0szdd15laruwrrm640pa_z8eg5d2mvm_nppm51rszf20dwpshy7ushykyavtq5dq2mwdqqcpv_nb7lkl",
+            "id": "00000000-0000-0000-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000100000000"
             },
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0000-0000-000100000000",
-                "provider": "00000000-0000-0000-0000-000000000001"
+                "id": "00000001-0000-0001-0000-000100000000",
+                "provider": "00000001-0000-0000-0000-000100000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "jpy159h7vqij1p08dgsehcpyxg6_ovkcpjruqg6xp8b4lpegp7qrfr_qsyoo3qnngi7btjxrt6bbjcfmit2p6g_j5abxj4o5xliz",
+            "id": "00000001-0000-0001-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000100000001"
             },
-            "id": "00000001-0000-0001-0000-000100000001"
+            "service": {
+                "id": "00000001-0000-0000-0000-000100000000",
+                "provider": "00000000-0000-0000-0000-000000000001"
+            },
+            "status": 0
         }
-    ],
-    "id": "00000006-0000-0012-0000-001900000009"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_10.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_10.json
index 8a16af0b1df..44adc83f40d 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_10.json
@@ -1,15 +1,15 @@
 {
+    "id": "00000001-0000-000b-0000-001300000020",
     "members": [
         {
-            "status": 0,
             "conversation_role": "mofz",
+            "id": "00000002-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000002-0000-0000-0000-000000000001"
             },
-            "id": "00000002-0000-0000-0000-000000000001"
+            "status": 0
         }
     ],
-    "name": "􃙓#𫸜𨖜",
-    "id": "00000001-0000-000b-0000-001300000020"
-}
\ No newline at end of file
+    "name": "􃙓#𫸜𨖜"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_11.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_11.json
index b28d1fddbc5..8fdebe90fbc 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_11.json
@@ -1,5 +1,5 @@
 {
+    "id": "00000002-0000-0015-0000-000d0000001f",
     "members": [],
-    "name": "\u0005\u001f􏷺1N_󸈵Bo",
-    "id": "00000002-0000-0015-0000-000d0000001f"
-}
\ No newline at end of file
+    "name": "\u0005\u001f􏷺1N_󸈵Bo"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_12.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_12.json
index e2c5881a4ff..94d16eae1db 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_12.json
@@ -1,5 +1,5 @@
 {
+    "id": "0000001f-0000-0020-0000-00170000000d",
     "members": [],
-    "name": "Q",
-    "id": "0000001f-0000-0020-0000-00170000000d"
-}
\ No newline at end of file
+    "name": "Q"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_13.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_13.json
index 65dc2a62711..5c403eb475d 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_13.json
@@ -1,67 +1,67 @@
 {
+    "id": "0000000c-0000-0014-0000-001a00000017",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
             "conversation_role": "7argokhlu22zw7um1_4anu2_q13ldqtz2mgeszjizp9qrr8m1wn1yy0lv1bta1cjhxjp_du_5vaatnt94upydlr0v2xqx12ivlbva5eza4c",
+            "id": "00000001-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0001-0000-000000000000"
+                "id": "00000000-0000-0001-0000-000000000000",
+                "provider": "00000001-0000-0001-0000-000100000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "_tzj3fgev1_6jgm5uuhbqnskv04r7k0bkk6si04ylakfznc1qttv6pv98l07_afzg_r_hw2xszllzu49u7x9eeu2hamh4ew2g",
+            "id": "00000000-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000000000001"
             },
-            "id": "00000000-0000-0000-0000-000000000001"
+            "service": {
+                "id": "00000001-0000-0000-0000-000000000001",
+                "provider": "00000001-0000-0001-0000-000000000000"
+            },
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "x8k0vqtenaqv3tj5elrnuwxuhgjl0iugwd3v0uk_8sejey5lgyq4fr746msrtk4eqxl7r3rvaljdyrmjtqvfisx0ml512oneq3bbh7mwr_k3f36od70t3ttj_dc",
+            "id": "00000001-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "id": "00000001-0000-0000-0000-000100000001"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000001"
-            },
             "conversation_role": "89hefsk",
+            "id": "00000001-0000-0001-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000000000000"
             },
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000000"
+                "id": "00000001-0000-0000-0000-000000000000",
+                "provider": "00000001-0000-0001-0000-000100000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "65gk5l2gvypqgykq35etz1df_7",
+            "id": "00000000-0000-0001-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "id": "00000000-0000-0001-0000-000100000000"
+            "service": {
+                "id": "00000000-0000-0000-0000-000000000001",
+                "provider": "00000001-0000-0000-0000-000100000000"
+            },
+            "status": 0
         }
     ],
-    "name": "O$:",
-    "id": "0000000c-0000-0014-0000-001a00000017"
-}
\ No newline at end of file
+    "name": "O$:"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_14.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_14.json
index 935681a2f89..372959d09b6 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_14.json
@@ -1,45 +1,45 @@
 {
+    "id": "0000001f-0000-0012-0000-000100000010",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000001",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
             "conversation_role": "0oabkv381mgh54t8zcgvwg19ru1qbjub_0i8gidad9j7",
+            "id": "00000000-0000-0001-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0001-0000-000000000000"
             },
-            "id": "00000000-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000000-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0001-0000-000100000001"
+                "id": "00000000-0000-0001-0000-000000000001",
+                "provider": "00000001-0000-0001-0000-000100000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "ns3h9jzrfx8_o",
+            "id": "00000001-0000-0000-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
             "service": {
                 "id": "00000000-0000-0000-0000-000100000001",
-                "provider": "00000001-0000-0000-0000-000000000000"
+                "provider": "00000000-0000-0001-0000-000100000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "_5kwpvh_ud02gj31kh4wz0ev55qmfoiknvib6auu8nkufhe1t63871_0k52ptbydxbwiw8z0fsht6oigc1geezhsw7uosy88xhvxf4iorzc9_ji2v5760f434aem0ti",
+            "id": "00000001-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "id": "00000001-0000-0000-0000-000100000001"
+            "service": {
+                "id": "00000000-0000-0000-0000-000100000001",
+                "provider": "00000001-0000-0000-0000-000000000000"
+            },
+            "status": 0
         }
     ],
-    "name": "T",
-    "id": "0000001f-0000-0012-0000-000100000010"
-}
\ No newline at end of file
+    "name": "T"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_15.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_15.json
index 87eb25cf396..0b432933362 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_15.json
@@ -1,19 +1,19 @@
 {
+    "id": "00000009-0000-000a-0000-00010000000b",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000000-0000-0001-0000-000000000000"
-            },
             "conversation_role": "614zvjitytbb_zu",
+            "id": "00000000-0000-0000-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000100000000"
             },
-            "id": "00000000-0000-0000-0000-000100000000"
+            "service": {
+                "id": "00000000-0000-0001-0000-000000000000",
+                "provider": "00000000-0000-0001-0000-000000000000"
+            },
+            "status": 0
         }
     ],
-    "name": "",
-    "id": "00000009-0000-000a-0000-00010000000b"
-}
\ No newline at end of file
+    "name": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_16.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_16.json
index b1b8f0808af..7deb2868284 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_16.json
@@ -1,67 +1,67 @@
 {
+    "id": "0000001d-0000-0013-0000-00030000001a",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000001",
-                "provider": "00000000-0000-0001-0000-000100000000"
-            },
             "conversation_role": "q3jaysbh_g77zk0mdqsxwswvy5z9no3pk3fhy434ns6ednnzikl7n49hyc59rggbiszeor2nj1g7zqbr934nh06gnal2hlpdvtgm87smu1nqlxtibkfo5z",
+            "id": "00000001-0000-0001-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000100000000"
             },
-            "id": "00000001-0000-0001-0000-000100000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000000-0000-0000-0000-000000000000"
+                "id": "00000001-0000-0001-0000-000000000001",
+                "provider": "00000000-0000-0001-0000-000100000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "jjul6e4r5t730pq",
+            "id": "00000001-0000-0001-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000000000000"
             },
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0000-0000-000100000000",
-                "provider": "00000001-0000-0001-0000-000000000000"
+                "id": "00000001-0000-0001-0000-000000000000",
+                "provider": "00000000-0000-0000-0000-000000000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "k3bw4yhyumit9o1lpk7iy9ogve8u6nznowc1alk3x0bdl1uyaqrw_efoeypetjmwrh_g8nrjs05p5tqbxh4owg26um942kwd3dm4j284ainzekcumltvybeiy_6h_",
+            "id": "00000001-0000-0000-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "id": "00000001-0000-0000-0000-000000000000"
+            "service": {
+                "id": "00000001-0000-0000-0000-000100000000",
+                "provider": "00000001-0000-0001-0000-000000000000"
+            },
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "bl59s90cn3twutjvl959knjlt",
+            "id": "00000000-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000100000001"
             },
-            "id": "00000000-0000-0000-0000-000100000001"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
             "conversation_role": "han76ra8y4b7bhu9ozk0100nya3m2v1zsjsxp6oyjop06elopq7x87b5dxp808_6sa856be5qemzd2ut0nksn22udjbktkyz436b2x9qsw8_8tjj1lon9ph9",
+            "id": "00000000-0000-0001-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "id": "00000000-0000-0001-0000-000100000000"
+            "service": {
+                "id": "00000001-0000-0001-0000-000000000000",
+                "provider": "00000000-0000-0000-0000-000000000001"
+            },
+            "status": 0
         }
     ],
-    "name": "ᡩy\u0003𨼞K",
-    "id": "0000001d-0000-0013-0000-00030000001a"
-}
\ No newline at end of file
+    "name": "ᡩy\u0003𨼞K"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_17.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_17.json
index 4559264b27e..8a8643a8104 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_17.json
@@ -1,31 +1,31 @@
 {
+    "id": "00000016-0000-000a-0000-000c00000004",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
             "conversation_role": "qxa3cm0_p03cad6xvgfkbk7to7hxiqhvg9dfylkv6ih9nhoox94xr_1qujwkkuge61w4cu9ybwskueizi1i_8flutj9",
+            "id": "00000001-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000000000001"
             },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000001"
+                "id": "00000000-0000-0000-0000-000000000001",
+                "provider": "00000000-0000-0000-0000-000000000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "vwls3852jzjut8buz_w68y2z6ske30vctv0r9zyrp7uu_lb0ffglegoje0wd4zrl7",
+            "id": "00000001-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "id": "00000001-0000-0000-0000-000100000001"
+            "service": {
+                "id": "00000001-0000-0001-0000-000000000000",
+                "provider": "00000001-0000-0001-0000-000100000001"
+            },
+            "status": 0
         }
-    ],
-    "id": "00000016-0000-000a-0000-000c00000004"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_18.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_18.json
index c13fff10bce..faf3b1bb3de 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_18.json
@@ -1,19 +1,19 @@
 {
+    "id": "00000003-0000-0004-0000-001900000003",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000100000000",
-                "provider": "00000000-0000-0000-0000-000000000000"
-            },
             "conversation_role": "jnrstoi6mxzddy6f8u80ih39",
+            "id": "00000002-0000-0000-0000-000000000002",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000002-0000-0000-0000-000000000002"
             },
-            "id": "00000002-0000-0000-0000-000000000002"
+            "service": {
+                "id": "00000000-0000-0001-0000-000100000000",
+                "provider": "00000000-0000-0000-0000-000000000000"
+            },
+            "status": 0
         }
     ],
-    "name": "e\"",
-    "id": "00000003-0000-0004-0000-001900000003"
-}
\ No newline at end of file
+    "name": "e\""
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_19.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_19.json
index 9801ec2cb38..7ee2d6fc825 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_19.json
@@ -1,18 +1,18 @@
 {
+    "id": "00000000-0000-0009-0000-001500000004",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000100000001",
-                "provider": "00000001-0000-0000-0000-000000000000"
-            },
             "conversation_role": "jiv6dw",
+            "id": "00000002-0000-0000-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000002-0000-0000-0000-000100000000"
             },
-            "id": "00000002-0000-0000-0000-000100000000"
+            "service": {
+                "id": "00000000-0000-0001-0000-000100000001",
+                "provider": "00000001-0000-0000-0000-000000000000"
+            },
+            "status": 0
         }
-    ],
-    "id": "00000000-0000-0009-0000-001500000004"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_2.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_2.json
index 6bb8d854801..f292f3169d0 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_2.json
@@ -1,184 +1,184 @@
 {
+    "id": "0000001a-0000-0015-0000-00200000000a",
     "members": [
         {
-            "status": 0,
             "conversation_role": "1p003q7r9_fcclm1gcds98jwmgt7ilnw2p50cvvdmgu0gp2swep5k9kjs_iilqse9qkqtj7b",
+            "id": "00000000-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000000000001"
             },
-            "id": "00000000-0000-0000-0000-000000000001"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0001-0000-000100000000"
-            },
             "conversation_role": "ejicn7cgzgb5qmbd2u7azzyuxk3s7_lp1g9vq74qklpqjjpi",
+            "id": "00000001-0000-0001-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000000000001"
             },
-            "id": "00000001-0000-0001-0000-000000000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0001-0000-000100000001",
-                "provider": "00000001-0000-0001-0000-000000000000"
+                "id": "00000001-0000-0000-0000-000100000001",
+                "provider": "00000000-0000-0001-0000-000100000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "bdddc4zidwriaaj33u9qf87lwt757280x1ov2fp61al58353p79ngwnd002",
+            "id": "00000001-0000-0000-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000000"
             },
-            "id": "00000001-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000001-0000-0001-0000-000100000001"
+                "id": "00000001-0000-0001-0000-000100000001",
+                "provider": "00000001-0000-0001-0000-000000000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "k_l3q0tp4vkvnbld_k4gd6d45pyjk8u41aom2y2yh1ysfkd0cg3st9_bf2qu8genm7_r6yop0",
+            "id": "00000000-0000-0000-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000100000000"
             },
-            "id": "00000000-0000-0000-0000-000100000000"
+            "service": {
+                "id": "00000001-0000-0000-0000-000100000001",
+                "provider": "00000001-0000-0001-0000-000100000001"
+            },
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "u34kdore13nneih4_yvz6hrzdn1fbknebgfn40wqub4_at4wltiovo4jnezqqm7zkjtywx0w48v3z461f5ec2v245g",
+            "id": "00000001-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000000000001"
             },
-            "id": "00000001-0000-0000-0000-000000000001"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000001",
-                "provider": "00000000-0000-0000-0000-000100000001"
-            },
             "conversation_role": "rm3w3leb1_9",
+            "id": "00000001-0000-0001-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000000000000"
             },
-            "id": "00000001-0000-0001-0000-000000000000"
+            "service": {
+                "id": "00000001-0000-0001-0000-000000000001",
+                "provider": "00000000-0000-0000-0000-000100000001"
+            },
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "vp2rd8w7lmf6vrs10fm7pulw",
+            "id": "00000000-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000000000001"
             },
-            "id": "00000000-0000-0000-0000-000000000001"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000001"
-            },
             "conversation_role": "kkmo22xks1qlyei2_bfp44b0",
+            "id": "00000001-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0001-0000-000100000001",
-                "provider": "00000001-0000-0001-0000-000000000001"
+                "id": "00000000-0000-0000-0000-000000000001",
+                "provider": "00000001-0000-0000-0000-000100000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "z8ebnqfymon",
+            "id": "00000001-0000-0000-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000000"
             },
-            "id": "00000001-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000000-0000-0001-0000-000000000001"
+                "id": "00000001-0000-0001-0000-000100000001",
+                "provider": "00000001-0000-0001-0000-000000000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "3of35z0gjruit7b_duy8xi3bgykdsftb2ryoj_grnzfp18oqqs2jtv5q4ep0gcgd2wsjtmhf6pmdzz5ahrczci5o4mczjazfgxcno405k8azr771s4kh5at91l5yx",
+            "id": "00000001-0000-0000-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "id": "00000001-0000-0000-0000-000000000000"
+            "service": {
+                "id": "00000001-0000-0001-0000-000100000000",
+                "provider": "00000000-0000-0001-0000-000000000001"
+            },
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "i567cp5_vkae2dtra19lvhwcwj9ssgkg_r19ozt9it9gqzo14k9xed87kxpx27",
+            "id": "00000000-0000-0001-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "id": "00000000-0000-0001-0000-000100000000"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000000-0000-0000-0000-000100000000"
-            },
             "conversation_role": "txuml7po8e05djfvcd0zk4_bn0hiq_kgvyp15nxnqn14zw1r",
+            "id": "00000000-0000-0001-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0001-0000-000100000001"
             },
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000000-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0000-0000-000000000001"
+                "id": "00000001-0000-0001-0000-000100000000",
+                "provider": "00000000-0000-0000-0000-000100000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "hxcolas4lrgc4olpsi1vbdhoc6_1u89w9hywuh88_wfx859x2c_ff2wigldmoily_2agyh00476wxpwutn6d4pu22l33tugr6snuoi1teofgqr7bw49d4e8apqn5w",
+            "id": "00000001-0000-0000-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000000"
             },
-            "id": "00000001-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000000-0000-0000-0000-000100000000",
-                "provider": "00000001-0000-0000-0000-000000000001"
+                "id": "00000000-0000-0000-0000-000100000001",
+                "provider": "00000000-0000-0000-0000-000000000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "214ujq5558xx8_9mjfja0pd24itn6uadzx",
+            "id": "00000001-0000-0001-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000000000001"
             },
-            "id": "00000001-0000-0001-0000-000000000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000001-0000-0001-0000-000000000001",
-                "provider": "00000000-0000-0001-0000-000000000001"
+                "id": "00000000-0000-0000-0000-000100000000",
+                "provider": "00000001-0000-0000-0000-000000000001"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "22mdoy9vdwodcp2ms7fxjbpdlcbn_kgv0u3crai4wu57uz_41psgk5utjiv9ubef8vvck2wd4t3_obgapty8230lml462j02kc9qb5hjz50pee5cp_wn",
+            "id": "00000001-0000-0001-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000100000001"
             },
-            "id": "00000001-0000-0001-0000-000100000001"
+            "service": {
+                "id": "00000001-0000-0001-0000-000000000001",
+                "provider": "00000000-0000-0001-0000-000000000001"
+            },
+            "status": 0
         }
-    ],
-    "id": "0000001a-0000-0015-0000-00200000000a"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_20.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_20.json
index e6479f8fe65..308353f62de 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_20.json
@@ -1,5 +1,5 @@
 {
+    "id": "00000013-0000-000c-0000-000b00000013",
     "members": [],
-    "name": "(\\Fj󱿐a",
-    "id": "00000013-0000-000c-0000-000b00000013"
-}
\ No newline at end of file
+    "name": "(\\Fj󱿐a"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_3.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_3.json
index b334d103cba..f1c91d41c10 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_3.json
@@ -1,37 +1,37 @@
 {
+    "id": "0000001c-0000-0000-0000-000b00000015",
     "members": [
         {
-            "status": 0,
             "conversation_role": "629omy1y3sul2_dc6zk1v5vzfw636emtn7y4flf9em_6r1ef9dmruyf_54t1su8e4mtiswmuertnec_7m1w0f05vrwfbit8k75gmgc53ls9hcx2txudhxvi39",
+            "id": "00000001-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000000000001"
             },
-            "id": "00000001-0000-0000-0000-000000000001"
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "42x9zfnob1_hgp1rg64rvfts9msejhx35dpnbmxdl57vyzlp619mrjmi32hce89_lw1j5glj3hx64p7wvbc8mz8riemi",
+            "id": "00000000-0000-0001-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "id": "00000000-0000-0001-0000-000100000000"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000001",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
             "conversation_role": "ro15_31l0ltsuoq8ifvlnhmhb",
+            "id": "00000001-0000-0001-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000000000001"
             },
-            "id": "00000001-0000-0001-0000-000000000001"
+            "service": {
+                "id": "00000001-0000-0000-0000-000000000001",
+                "provider": "00000000-0000-0000-0000-000000000001"
+            },
+            "status": 0
         }
     ],
-    "name": "n깨",
-    "id": "0000001c-0000-0000-0000-000b00000015"
-}
\ No newline at end of file
+    "name": "n깨"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_4.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_4.json
index a1310f11287..220dc128c55 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_4.json
@@ -1,19 +1,19 @@
 {
+    "id": "00000011-0000-0011-0000-00160000001d",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0001-0000-000000000001"
-            },
             "conversation_role": "qoxen0u30fay_2le0peay0p0uo_sq2p38ti0j3zb8cl_js3r8llahlcho1xkr2o6d66g01tkgwuurg9vtwmtmcam2zvxgey7nmbvzubmphffoo788mgequau6hkos",
+            "id": "00000001-0000-0001-0000-000100000002",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000100000002"
             },
-            "id": "00000001-0000-0001-0000-000100000002"
+            "service": {
+                "id": "00000000-0000-0001-0000-000100000000",
+                "provider": "00000001-0000-0001-0000-000000000001"
+            },
+            "status": 0
         }
     ],
-    "name": "\u001b`G1w\u001cᣄ:",
-    "id": "00000011-0000-0011-0000-00160000001d"
-}
\ No newline at end of file
+    "name": "\u001b`G1w\u001cᣄ:"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_5.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_5.json
index b4f1c5c6ea9..bde3df38981 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_5.json
@@ -1,19 +1,19 @@
 {
+    "id": "0000001d-0000-000b-0000-002000000000",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000100000000",
-                "provider": "00000000-0000-0000-0000-000100000000"
-            },
             "conversation_role": "fann_bweu4i1u_wa_n5ucx6xn8s3_ozc0ynq5exwdiucsrd9k2_kmpshmvekk",
+            "id": "00000002-0000-0002-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000002-0000-0002-0000-000000000001"
             },
-            "id": "00000002-0000-0002-0000-000000000001"
+            "service": {
+                "id": "00000000-0000-0001-0000-000100000000",
+                "provider": "00000000-0000-0000-0000-000100000000"
+            },
+            "status": 0
         }
     ],
-    "name": "􆠝󶠼#nzj𪕏",
-    "id": "0000001d-0000-000b-0000-002000000000"
-}
\ No newline at end of file
+    "name": "􆠝󶠼#nzj𪕏"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_6.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_6.json
index 481039e4c84..5d9468d3b71 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_6.json
@@ -1,14 +1,14 @@
 {
+    "id": "0000001b-0000-0010-0000-001c00000006",
     "members": [
         {
-            "status": 0,
             "conversation_role": "wmap0y",
+            "id": "00000000-0000-0001-0000-000200000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0001-0000-000200000000"
             },
-            "id": "00000000-0000-0001-0000-000200000000"
+            "status": 0
         }
-    ],
-    "id": "0000001b-0000-0010-0000-001c00000006"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_7.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_7.json
index ef64c6d33b5..87d5e8bdf60 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_7.json
@@ -1,54 +1,54 @@
 {
+    "id": "00000009-0000-0006-0000-001600000013",
     "members": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000001",
-                "provider": "00000000-0000-0000-0000-000100000000"
-            },
             "conversation_role": "_zbpj8sdk6oib4_v1d0zq6znpur47kigpqp6zxv66z01y68y4h3zl9p2_5e60_l4hjmhgtrjf7hi4l5egngw5w5dlbq5fpkrdc_sb49y",
+            "id": "00000001-0000-0001-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000100000001"
             },
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
             "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0000-0000-000100000000"
+                "id": "00000001-0000-0000-0000-000000000001",
+                "provider": "00000000-0000-0000-0000-000100000000"
             },
+            "status": 0
+        },
+        {
             "conversation_role": "9_klbkp15t972yt659kdor1nskyqpow0hf9ir",
+            "id": "00000001-0000-0000-0000-000100000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "id": "00000001-0000-0000-0000-000100000001"
+            "service": {
+                "id": "00000000-0000-0001-0000-000000000000",
+                "provider": "00000001-0000-0000-0000-000100000000"
+            },
+            "status": 0
         },
         {
-            "status": 0,
             "conversation_role": "lxp4vgb4v2ij1rkqwm3uv4sybo5p0dku54d3",
+            "id": "00000000-0000-0000-0000-000000000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000000-0000-0000-0000-000000000000"
             },
-            "id": "00000000-0000-0000-0000-000000000000"
+            "status": 0
         },
         {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
             "conversation_role": "yzltfr9pcpap1pfs8jas1s7dxckgayce3jhl_6nd_k4zc_5ofutl_kprv83m9gdsqh2qcu2a_2a7tnfzm2ie8ldudjrvvd",
+            "id": "00000001-0000-0001-0000-000100000000",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000001-0000-0001-0000-000100000000"
             },
-            "id": "00000001-0000-0001-0000-000100000000"
+            "service": {
+                "id": "00000001-0000-0001-0000-000000000000",
+                "provider": "00000001-0000-0001-0000-000100000000"
+            },
+            "status": 0
         }
     ],
-    "name": "\n𨴯&;&S",
-    "id": "00000009-0000-0006-0000-001600000013"
-}
\ No newline at end of file
+    "name": "\n𨴯&;&S"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_8.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_8.json
index a0bf065a3b0..41af1671ed3 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_8.json
@@ -1,5 +1,5 @@
 {
+    "id": "00000013-0000-0005-0000-000800000007",
     "members": [],
-    "name": "\u001e",
-    "id": "00000013-0000-0005-0000-000800000007"
-}
\ No newline at end of file
+    "name": "\u001e"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotConvView_provider_9.json b/libs/wire-api/test/golden/testObject_BotConvView_provider_9.json
index d279f4f74ff..40e1f0101f7 100644
--- a/libs/wire-api/test/golden/testObject_BotConvView_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_BotConvView_provider_9.json
@@ -1,5 +1,5 @@
 {
+    "id": "0000001c-0000-001d-0000-001a00000006",
     "members": [],
-    "name": "󵥯\u0010_^w",
-    "id": "0000001c-0000-001d-0000-001a00000006"
-}
\ No newline at end of file
+    "name": "󵥯\u0010_^w"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_1.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_1.json
index a2887945a40..2b3bb1a5071 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_1.json
@@ -1,7 +1,7 @@
 {
-    "handle": "fpa2vx",
     "accent_id": -8,
+    "handle": "fpa2vx",
+    "id": "00000002-0000-0000-0000-000100000002",
     "name": "\u0011昊U5z$\u0018\u001d t1\u001e\\\u0002𧷻_4K􎢑󻣃𓉧)\u0013𩷀\u001c󽷷􉾌n᮴󶔒\\4Nn;𩶣)𬨾y\u000e\n|1#pK졥b\t<v\u001f/>𠗶+\u0001ᖍjJ𫼑𮮇Z  `$",
-    "team": "00000000-0000-0002-0000-000200000002",
-    "id": "00000002-0000-0000-0000-000100000002"
-}
\ No newline at end of file
+    "team": "00000000-0000-0002-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_10.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_10.json
index d2b23708616..2e34e78de9d 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_10.json
@@ -1,7 +1,7 @@
 {
-    "handle": "oihf1d",
     "accent_id": -6,
+    "handle": "oihf1d",
+    "id": "00000008-0000-0005-0000-000200000007",
     "name": "]􂴑<]룩󵽬𥍼⠫r🜭XH8icz𨆊|\u0008#\u0017W@T",
-    "team": null,
-    "id": "00000008-0000-0005-0000-000200000007"
-}
\ No newline at end of file
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_11.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_11.json
index 12b97ab2fcc..5686bf55b6e 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_11.json
@@ -1,7 +1,7 @@
 {
-    "handle": "pe1a",
     "accent_id": -8,
+    "handle": "pe1a",
+    "id": "00000001-0000-0006-0000-000400000008",
     "name": "VwU󺡱󽛉*n􋜟lxS\u0016j􊠗y󺲂\u0015_',[>\u000e<\n􅵣\u0003𢫛$󰹓qq{󸚢\u0010󻃏j涿2\u001e\u0003\r𧣩m𦹃\r􂴎i\u0016\u0010B硼A)}T􂎌Li:0􊝙\t{\u001f􂡂h#\"\u0016X쏿2\u0013*-b􄅅\u0015驽T᠋ \u001e𪚟w𫝿.\n𤟟X`仄a",
-    "team": "00000003-0000-0001-0000-000000000001",
-    "id": "00000001-0000-0006-0000-000400000008"
-}
\ No newline at end of file
+    "team": "00000003-0000-0001-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_12.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_12.json
index b1e59abaf83..da0997bd146 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_12.json
@@ -1,7 +1,7 @@
 {
-    "handle": "9pbwmf1pu",
     "accent_id": 8,
+    "handle": "9pbwmf1pu",
+    "id": "00000001-0000-0003-0000-000600000008",
     "name": "\u00153|𫢊{P󾀁Y[\u000e􅠷󽼞󶱘N\"\u001ds=8d4:'󻫀o&~*\"\u0018O[T9yt,9\u00027\nx\r",
-    "team": "00000001-0000-0002-0000-000300000004",
-    "id": "00000001-0000-0003-0000-000600000008"
-}
\ No newline at end of file
+    "team": "00000001-0000-0002-0000-000300000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_13.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_13.json
index 9dca5493f31..6fddee9b949 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_13.json
@@ -1,7 +1,7 @@
 {
-    "handle": "3b",
     "accent_id": -2,
+    "handle": "3b",
+    "id": "00000000-0000-0008-0000-000300000005",
     "name": "q",
-    "team": "00000008-0000-0002-0000-000400000004",
-    "id": "00000000-0000-0008-0000-000300000005"
-}
\ No newline at end of file
+    "team": "00000008-0000-0002-0000-000400000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_14.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_14.json
index ec9d1ab6178..7a1200a6d00 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_14.json
@@ -1,7 +1,7 @@
 {
-    "handle": "c96fkuf-n70btjq075dki054avcu250987uq348n5bali201abmhiil8n9aiocxhuzuaf1gd733hi-2f7.wtlbb8d30cxymsvmb5ehb_9cu1din7j-996_h1tsvigyg",
     "accent_id": 3,
+    "handle": "c96fkuf-n70btjq075dki054avcu250987uq348n5bali201abmhiil8n9aiocxhuzuaf1gd733hi-2f7.wtlbb8d30cxymsvmb5ehb_9cu1din7j-996_h1tsvigyg",
+    "id": "00000008-0000-0002-0000-000500000000",
     "name": "a\u0010\u0004#\u0001\u0003|pg~w\u001d􇩟*y쉽Mn+PUm󳏍-\u0019{󰟌( q-t\u001a7s󷲫Xy\u0012􌮮\";1𣜝G\u0014is^\u0002NN0sc\tꨌ􅓣􉕝dzcm\u000b\u000b*Ph󰧞&L􊛷S󼁨\u0016w􄍒me𥹒",
-    "team": "00000002-0000-0001-0000-000300000000",
-    "id": "00000008-0000-0002-0000-000500000000"
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000300000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_15.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_15.json
index e3a228940df..d40d3ac14f2 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_15.json
@@ -1,7 +1,7 @@
 {
-    "handle": "j4z9ty7y-wt_ldl_tddmmrhdfp4myz9fjrqdg2dkh5r9vxcs5z",
     "accent_id": -1,
+    "handle": "j4z9ty7y-wt_ldl_tddmmrhdfp4myz9fjrqdg2dkh5r9vxcs5z",
+    "id": "00000002-0000-0008-0000-000100000007",
     "name": "~;Q\u0000Y<𥊺H뚁7\u0019Q\u0016z\"\u00157\n晙㵿\\a𥖬\u0014Ip4𤷸N\u001f1X6\u0010RM\u001aC􄴣d\u00138Cs\u0000O􏡶dF\\g~vj!J\u0011\u0007􇛕3\u001eHf\u0002󰑭c亷;z茯\u0019\u0001\u0010\u0004􍟕𥥅_󿚛-\u0019󻷏+\u001f/&>rNy,U󿵊7󵡚\u00152",
-    "team": "00000006-0000-0004-0000-000300000004",
-    "id": "00000002-0000-0008-0000-000100000007"
-}
\ No newline at end of file
+    "team": "00000006-0000-0004-0000-000300000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_16.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_16.json
index 805d9548ac2..8aa1a548d54 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_16.json
@@ -1,7 +1,7 @@
 {
-    "handle": "_mvtpq.f",
     "accent_id": -4,
+    "handle": "_mvtpq.f",
+    "id": "00000006-0000-0007-0000-000800000005",
     "name": "W0\u00123𫲘_𤱋9􈂤ꄜ!\u001fNh󶴫뷵󶑆+癓𤃡S婅𗊺H[sp^\u0004(\r𭃿\u000b>I{G\u0018􊎬🠘\u001c\u001d𬙋K󺩮oOJ\u001fB]t󾠲L wY󺶵ⷢ\u0014l5Y뒍[,TcoF~_\u0005\rꐘ𡙞\u0017",
-    "team": "00000005-0000-0001-0000-000700000005",
-    "id": "00000006-0000-0007-0000-000800000005"
-}
\ No newline at end of file
+    "team": "00000005-0000-0001-0000-000700000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_17.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_17.json
index 498ac9de2b1..2a32c7ac908 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_17.json
@@ -1,7 +1,7 @@
 {
-    "handle": "f.xl",
     "accent_id": 1,
+    "handle": "f.xl",
+    "id": "00000003-0000-0000-0000-000400000000",
     "name": ")o}s)𬏻+0\u0004𥬢C󿸄􂹠\u000fD[c c\r􎯊$'f6󴭕 ~|,A\u000c罌\u001cJ󶿱?𨥱MJpۊ\u0012:}B'\u0010Q푳𡍮􂒃\u0012A\u0014𢕮\u0001\r󷓽\u0011𭼽󵷣?",
-    "team": null,
-    "id": "00000003-0000-0000-0000-000400000000"
-}
\ No newline at end of file
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_18.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_18.json
index abdd80c5f0e..9c8b174f40c 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_18.json
@@ -1,7 +1,7 @@
 {
-    "handle": "b-p",
     "accent_id": -7,
+    "handle": "b-p",
+    "id": "00000002-0000-0002-0000-000700000000",
     "name": "󱎿𠶪T^ff6\u00016@󺗜%󾼓\u001cvM_s°\u0017$K􋗌.\u0015m[\u001f🞤\u0004\u0001)𫞁f𠲫󾊬0kTn!9\u000fL󺋩\n\u0007󻝒\\K(𣷡𤳆\u001a\u0000󴖜^W?\u000en|-\nR<􌕥󿠵󽇖𦙜\u001dQu\u0015딬\u001c썿􀉖𬭭􏝞b4\u001fly`'X%$mW]k􀨂𗼦",
-    "team": "00000002-0000-0003-0000-000700000006",
-    "id": "00000002-0000-0002-0000-000700000000"
-}
\ No newline at end of file
+    "team": "00000002-0000-0003-0000-000700000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_19.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_19.json
index b7f4019477d..8710ca0610d 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_19.json
@@ -1,7 +1,7 @@
 {
-    "handle": "g_ms.jaq23mkzzhouss60itfsrux5lapflg0xqotoz76f-ori4aglkqwj-raa_wr4ypirq9c9-w17nwre3414mvmm-vgetkk-07k1dgekjrzcvk-_w33giuc8wcak590c29h457nks5xzpn6tq0wtcorgq7210uaminql8ygrklj3vh11p.sg-nrbnmm2.dxmo0zzhr3xco",
     "accent_id": -1,
+    "handle": "g_ms.jaq23mkzzhouss60itfsrux5lapflg0xqotoz76f-ori4aglkqwj-raa_wr4ypirq9c9-w17nwre3414mvmm-vgetkk-07k1dgekjrzcvk-_w33giuc8wcak590c29h457nks5xzpn6tq0wtcorgq7210uaminql8ygrklj3vh11p.sg-nrbnmm2.dxmo0zzhr3xco",
+    "id": "00000005-0000-0007-0000-000200000005",
     "name": "\u00180\u0002\u0002\u0001='\u0008\u0003𝋤Y8󿾷 \u0019a𑩽𠵯,q\u0001'",
-    "team": "00000006-0000-0000-0000-000400000008",
-    "id": "00000005-0000-0007-0000-000200000005"
-}
\ No newline at end of file
+    "team": "00000006-0000-0000-0000-000400000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_2.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_2.json
index 87dda346cff..5aef167f780 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_2.json
@@ -1,7 +1,7 @@
 {
-    "handle": "mz",
     "accent_id": -5,
+    "handle": "mz",
+    "id": "00000002-0000-0003-0000-000500000001",
     "name": "v􌚮󹄾\u000eM󱦱\t\u0017\\􄽘𭴶nE7?\u0001:\r􀢋m 􄊅}Y󱟍b_\u0010DVa􁝧uJJ|􉓂\u001f)\u0013C",
-    "team": null,
-    "id": "00000002-0000-0003-0000-000500000001"
-}
\ No newline at end of file
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_20.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_20.json
index 5d35838c427..c6e2941a090 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_20.json
@@ -1,7 +1,7 @@
 {
-    "handle": "p35n6vhgb5sh71n.-har73f0tp1urvyml_5ni8n01ommlrlx5chb9z7bhp_rehr1geua0--yxs5x3m3dgmvhy8-a-07gbc0owxv2d9mj_pqzss9op.ovxyrid8l36nkw1b5f4sr2.li7bmtmcwe76.zxj9lwbqtqt8v77v6ncnmebtl3whz6790x34rcyqe.jxc6glk2-7d.janj7d1.c70bjkjpzqp0pi64hoiei854tefqdlz246bht",
     "accent_id": -8,
+    "handle": "p35n6vhgb5sh71n.-har73f0tp1urvyml_5ni8n01ommlrlx5chb9z7bhp_rehr1geua0--yxs5x3m3dgmvhy8-a-07gbc0owxv2d9mj_pqzss9op.ovxyrid8l36nkw1b5f4sr2.li7bmtmcwe76.zxj9lwbqtqt8v77v6ncnmebtl3whz6790x34rcyqe.jxc6glk2-7d.janj7d1.c70bjkjpzqp0pi64hoiei854tefqdlz246bht",
+    "id": "00000000-0000-0005-0000-000500000003",
     "name": "QAM@y\u000ee\u0018囕3t-V𔕝?󸴣I@5􄃗\u0002ⲏ\u0010\u0006󷊮]D-􇙓U?􅿲6𪁹뻫\u0015\u000b\t*X~JNS𡝹矽\u00113r쌩怅u*iD\u00123\u0003󺆯y?`e;H𫟦\\։\"*np𣑋𢠐𒅝𢩊+\u001fs.𪁋0𠩘_yr券EkS=",
-    "team": "00000006-0000-0004-0000-000700000004",
-    "id": "00000000-0000-0005-0000-000500000003"
-}
\ No newline at end of file
+    "team": "00000006-0000-0004-0000-000700000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_3.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_3.json
index f32c23eccea..88753b296b2 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_3.json
@@ -1,7 +1,7 @@
 {
-    "handle": null,
     "accent_id": 7,
+    "handle": null,
+    "id": "00000004-0000-0006-0000-000100000002",
     "name": "\u0004\u0007.\u0006􍢚\u0017",
-    "team": "00000002-0000-0001-0000-000500000003",
-    "id": "00000004-0000-0006-0000-000100000002"
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000500000003"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_4.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_4.json
index 8870356ddd1..ea5815b20de 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_4.json
@@ -1,7 +1,7 @@
 {
-    "handle": "7.w",
     "accent_id": -2,
+    "handle": "7.w",
+    "id": "00000008-0000-0004-0000-000300000007",
     "name": "\u001a\u0002)gKj\u001c􆷍\u000b6cg\u000c]N!t\\󸟒8𑊰7I\u0003CS\u0014e\u001c\u001c",
-    "team": "00000004-0000-0000-0000-000200000000",
-    "id": "00000008-0000-0004-0000-000300000007"
-}
\ No newline at end of file
+    "team": "00000004-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_5.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_5.json
index f1e99cc8ccd..fd66c2fa55a 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_5.json
@@ -1,7 +1,7 @@
 {
-    "handle": "tidlyhr",
     "accent_id": -1,
+    "handle": "tidlyhr",
+    "id": "00000002-0000-0001-0000-000500000008",
     "name": "w",
-    "team": "00000002-0000-0004-0000-000800000005",
-    "id": "00000002-0000-0001-0000-000500000008"
-}
\ No newline at end of file
+    "team": "00000002-0000-0004-0000-000800000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_6.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_6.json
index a36e87de480..15d4e3e020a 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_6.json
@@ -1,7 +1,7 @@
 {
-    "handle": "uz3cgdxtkev-40624m0eh_y06g-c9isv-ob.r84rneq2vm.440nxc_n44_3d0-6u9l7",
     "accent_id": -5,
+    "handle": "uz3cgdxtkev-40624m0eh_y06g-c9isv-ob.r84rneq2vm.440nxc_n44_3d0-6u9l7",
+    "id": "00000004-0000-0007-0000-000000000002",
     "name": "\u0002\u0008Ed쯤:𓅰󲰔]𝣳\u000bG\u0018\u0013\u0017󼱐R􊇍Ky6e咒QT􃐆\u0018EE4W󰕃^𩨷s\t𣟩iP\u001e.XV(kK\u00187b\u0010􊤶f󿈓s􏃼EAm^󶍭\u0017𧾭2\u00017\u0000QjmaTO 󱰜W\u001fb󴟚\u0002K\u0006\u000b凒Z􇮜fwFip\u000ev#⬿󴸵/\r𘑖軶,V\u0019ﲘUy\t𢛷XJǨ󺙪^𨫳𡋕E􍙇?G7\u0003󻹺Y%)쯑.",
-    "team": "00000003-0000-0003-0000-000300000001",
-    "id": "00000004-0000-0007-0000-000000000002"
-}
\ No newline at end of file
+    "team": "00000003-0000-0003-0000-000300000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_7.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_7.json
index 6f823fe9c75..7514aac93c2 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_7.json
@@ -1,7 +1,7 @@
 {
-    "handle": "-c7916..",
     "accent_id": 3,
+    "handle": "-c7916..",
+    "id": "00000006-0000-0003-0000-000800000002",
     "name": "}$d}\u001eY􃸋􀿅𗥮np􆹗_𤮣􃵋4<Ob\u0012\u0010􉑖𠽥$Ph/`Q;7􅘗Z󰠘\"`\u000f𩐰D#%",
-    "team": "00000001-0000-0005-0000-000200000001",
-    "id": "00000006-0000-0003-0000-000800000002"
-}
\ No newline at end of file
+    "team": "00000001-0000-0005-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_8.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_8.json
index c59964b73a6..bd07af4a991 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_8.json
@@ -1,7 +1,7 @@
 {
-    "handle": "p1brgaim3u1-2grwj1-ij_m1p0_t.vqk92o0nxg1t928_r-qj58xhcg-ai.zfj9q63h2nno5om5kt38oo58vx81b27f4f_kzra9r6.56-gfb2ymhl3c2na7_pmsio59vezrgq-09g8yd_4hv2pdj.5rm62cp39qb_v7-x3q2a2yom-so1t-cpi2x5x6o1hwabe3ruci82gfar.czdlwukqi8dhvdse3b5o4_diowoozf1p5mcget81fa_zv8eff",
     "accent_id": -2,
+    "handle": "p1brgaim3u1-2grwj1-ij_m1p0_t.vqk92o0nxg1t928_r-qj58xhcg-ai.zfj9q63h2nno5om5kt38oo58vx81b27f4f_kzra9r6.56-gfb2ymhl3c2na7_pmsio59vezrgq-09g8yd_4hv2pdj.5rm62cp39qb_v7-x3q2a2yom-so1t-cpi2x5x6o1hwabe3ruci82gfar.czdlwukqi8dhvdse3b5o4_diowoozf1p5mcget81fa_zv8eff",
+    "id": "00000008-0000-0008-0000-000500000003",
     "name": "s􂽃뚮`4Ps󱹥z\u0001ef",
-    "team": "00000004-0000-0003-0000-000600000007",
-    "id": "00000008-0000-0008-0000-000500000003"
-}
\ No newline at end of file
+    "team": "00000004-0000-0003-0000-000600000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_BotUserView_provider_9.json b/libs/wire-api/test/golden/testObject_BotUserView_provider_9.json
index d8976a7e26f..6370519746a 100644
--- a/libs/wire-api/test/golden/testObject_BotUserView_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_BotUserView_provider_9.json
@@ -1,7 +1,7 @@
 {
-    "handle": "qsbule-m4sswyr84uqh0.nzlyuher98kp-fkxn7xydbazbdeg-j-8sco56tr4i928muztpmzc-6nlzi4ob.-4lyhr6ra.wsc7jn6wv.l1mno080ax890jgd7.u_-2.-4v3n8",
     "accent_id": -7,
+    "handle": "qsbule-m4sswyr84uqh0.nzlyuher98kp-fkxn7xydbazbdeg-j-8sco56tr4i928muztpmzc-6nlzi4ob.-4lyhr6ra.wsc7jn6wv.l1mno080ax890jgd7.u_-2.-4v3n8",
+    "id": "00000007-0000-0005-0000-000100000001",
     "name": "Vp9uC\u001b\u000c}g\u0013𤘺D\u0018rDl)󿣊G􏸘\u0007\u0017􂁤DQM𫯔\u001aF󿊗;󸾒x\u001eB􊻟\u0019\u0002FN\u001918W\t>\u000c\u000bu",
-    "team": "00000002-0000-0003-0000-000700000002",
-    "id": "00000007-0000-0005-0000-000100000001"
-}
\ No newline at end of file
+    "team": "00000002-0000-0003-0000-000700000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_1.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_1.json
index 7c4d34ae767..4b7b5975d2f 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_1.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_1.json
@@ -1,5 +1,4 @@
 {
-    "return": 6,
     "handles": [
         "",
         ":\u0014J",
@@ -35,5 +34,6 @@
         "2\u0002c",
         "r(\u0004󽔣\u001c\"m󸙫~4",
         "Q9Y+\u0016\u0017\tdE􀤲\u0005l\u0010"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 6
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_10.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_10.json
index 03c1ff96915..80e2f6dcd6b 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_10.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_10.json
@@ -1,10 +1,10 @@
 {
-    "return": 6,
     "handles": [
         "%\u0014=.\u0011",
         ")",
         "㻌\u0018ແ",
         "󹉓PH\u0010q\u0000",
         "䶃H\u000fP"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 6
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_11.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_11.json
index 1a72dfbc882..b216bd42318 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_11.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_11.json
@@ -1,8 +1,8 @@
 {
-    "return": 7,
     "handles": [
         "=v\u000cS4y䪗C>P􁕽",
         "j𦷍\u0001\u0000󳘹\u0018}&R",
         "a?Z\\@"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 7
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_12.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_12.json
index 433ff415370..64bd1908c90 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_12.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_12.json
@@ -1,5 +1,4 @@
 {
-    "return": 9,
     "handles": [
         "D\u0011}V",
         "􁙱:にm󹯬𩫐>󻐸Z岐b􅞇r(𧢓",
@@ -47,5 +46,6 @@
         "",
         "h/\u0003󽎘",
         "𮁅Z<\u0012~1󸂇ﴓ\u0006gL􏞃D\n"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 9
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_13.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_13.json
index 644c6c68156..ddd1d6baf53 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_13.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_13.json
@@ -1,5 +1,4 @@
 {
-    "return": 8,
     "handles": [
         "S㪧!\nf",
         "x󹚅󲎵\u000b𨂄",
@@ -40,5 +39,6 @@
         "`𣣇􀨹\u0006k",
         "KHy􍄑\u0016I𤩺gAy\u001d",
         "󲥋h3V\"🧕\nv\nj;!4"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 8
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_14.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_14.json
index e762c1a1286..d5f2d1206c7 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_14.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_14.json
@@ -1,5 +1,4 @@
 {
-    "return": 4,
     "handles": [
         "\u0008Ḇ@L[6y\u001d)M.\u000c\u0001j𧃪",
         "7P\u001bAtMGn\n9n7]",
@@ -17,5 +16,6 @@
         ":\u0001󹟤\u001bN?1𬻉𘗺󱿒\u001bN{",
         "^Vtz鍮􌑋d",
         "/9ds8AT\u001a))"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 4
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_15.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_15.json
index b173ebf4c83..770a8723d4d 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_15.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_15.json
@@ -1,5 +1,4 @@
 {
-    "return": 1,
     "handles": [
         "",
         "[󴲴3𫶬,\u000c.\u0017tY@h",
@@ -43,5 +42,6 @@
         "\u0016j`=\t/p2🇸*\u0014",
         "K􋾂pળRd",
         "J5󴐭􍽾󲥺1𪌷;􈓏𗷋QCv\""
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 1
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_16.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_16.json
index 6314b06704b..405184ad6ff 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_16.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_16.json
@@ -1,5 +1,4 @@
 {
-    "return": 7,
     "handles": [
         "󸽛䆵הּ咒7\u0006^gW",
         "ଊF󿓱n",
@@ -11,5 +10,6 @@
         "k0",
         "恔:,",
         "}\u0002^􂯦*敦OT𨢐"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 7
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_17.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_17.json
index 79108a70b45..91e81c4818d 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_17.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_17.json
@@ -1,5 +1,4 @@
 {
-    "return": 5,
     "handles": [
         "􇲉W\u001bbTB􌻨:𗷝7",
         "$N𬆹",
@@ -14,5 +13,6 @@
         "E0qZB\u0011탉",
         "yG15\u0015\u0012",
         "\u0018_􍴒J^fL\u001f&-\u0004W󻺠󽑲"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 5
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_18.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_18.json
index a1e81f09999..97e7ffb2034 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_18.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_18.json
@@ -1,5 +1,4 @@
 {
-    "return": 4,
     "handles": [
         "[󽖲\u0007\u0015",
         "*",
@@ -14,5 +13,6 @@
         "2𑌐􂟞2mm󸺊󴦑\u000fdHz",
         "",
         "\u0004*E^lq􁲃aE"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 4
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_19.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_19.json
index 33dbbbbf627..d6c52ad751e 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_19.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_19.json
@@ -1,5 +1,4 @@
 {
-    "return": 7,
     "handles": [
         "+N^󷽲􋦑'z%E%䈐M\u0003",
         "{]",
@@ -49,5 +48,6 @@
         "A`-SE┹\u0013GW탒G󿩓L",
         "􍯾\u0003",
         "\u001a|}F8\u001c`\u000e#𨱐"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 7
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_2.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_2.json
index b5760d94151..553fc2f0833 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_2.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_2.json
@@ -1,5 +1,4 @@
 {
-    "return": 7,
     "handles": [
         "\u0003\u001f󷁘W`V",
         "\u0007􆘻<􏪄\\\u0010E󹘰\\\r𧮍\u0019\u0001􏪦",
@@ -35,5 +34,6 @@
         "/􄢶N ",
         "𣟮52U\u001cv#U𑖚%1",
         ";V/"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 7
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_20.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_20.json
index 738f35ffcd8..239db865b7d 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_20.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_20.json
@@ -1,5 +1,4 @@
 {
-    "return": 5,
     "handles": [
         "Ej}",
         "􏙶t",
@@ -28,5 +27,6 @@
         "\u0018렞</侣]􀶺󰚜",
         "*kR",
         "Q_?􏊠d'L􎊸J\u0017!5\u000f"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 5
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_3.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_3.json
index 3775aa04bea..6a394e61999 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_3.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_3.json
@@ -1,5 +1,4 @@
 {
-    "return": 8,
     "handles": [
         "%",
         "\u0003\u001cq\u0019",
@@ -20,5 +19,6 @@
         "\u0006K𦮮\u0005i\u0002K4󺖽",
         "2/EqE=EW:g{z\u000f-",
         "𬆘\u001c;𢫷2\u0003V󳛶\u0012 i􌎦'⪣"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 8
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_4.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_4.json
index 65193869a22..fc5feabce3f 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_4.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_4.json
@@ -1,5 +1,4 @@
 {
-    "return": 7,
     "handles": [
         "\u000eh~䣴Wo\u001cY\u0000SD􉲰.=",
         "r􌉿\u001c\u0008榎8\u001f_u",
@@ -30,5 +29,6 @@
         "dO􎺩𡏱",
         "d\u0011𬣋~\u000b",
         "\u00049>􊩱="
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 7
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_5.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_5.json
index a088b9b55b2..3e4988f2df1 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_5.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_5.json
@@ -1,5 +1,4 @@
 {
-    "return": 3,
     "handles": [
         "e󲸕[伪KK𠍺렆7\u000e󳦄bN+",
         "vZ貎J􀊏K󻈟\u0007P3",
@@ -48,5 +47,6 @@
         "􆢣Fu\u0005C#跼|󴦲􀥾6",
         "􄘻\u0018}݇尮x",
         "g"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 3
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_6.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_6.json
index ba3b55937e9..dd2a0387b7b 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_6.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_6.json
@@ -1,5 +1,4 @@
 {
-    "return": 8,
     "handles": [
         "]_䇏U^=/",
         "󹝼(RJxy;fK7\u000c􊖏}",
@@ -27,5 +26,6 @@
         "U\u000cNvj􄉲󿘜`95",
         "Ut\u0007􎮽\u0016T\u0002^",
         "C,\u001c󳬂L"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 8
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_7.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_7.json
index 3f95604f61f..1f3694234a6 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_7.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_7.json
@@ -1,5 +1,4 @@
 {
-    "return": 8,
     "handles": [
         "6f\u0012Tꓱ𣝦\u0018Nw\u0002M􊮮",
         "􋺺",
@@ -39,5 +38,6 @@
         ">fY\u0015y맬P\u001f7𓇃'm𦠚.\u001b",
         "-K􎮎\u000b궼F杜J𘏡",
         "\u001e"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 8
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_8.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_8.json
index a24f59880c7..38018197d6b 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_8.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_8.json
@@ -1,5 +1,4 @@
 {
-    "return": 9,
     "handles": [
         "𭂬\nP􂖙󱠤xh􉜟e:𞢥􀵐󸀵\u0014䣄",
         ".󳲘􆠰Ck󶑾fj󵨑5",
@@ -13,5 +12,6 @@
         ":a_W\r\u001a-$9\"RE",
         "1J]RF",
         "ཨM4\u0004\u001b(k"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 9
+}
diff --git a/libs/wire-api/test/golden/testObject_CheckHandles_user_9.json b/libs/wire-api/test/golden/testObject_CheckHandles_user_9.json
index 77cfd6d283b..7fdff090672 100644
--- a/libs/wire-api/test/golden/testObject_CheckHandles_user_9.json
+++ b/libs/wire-api/test/golden/testObject_CheckHandles_user_9.json
@@ -1,5 +1,4 @@
 {
-    "return": 1,
     "handles": [
         ".𘩷$\u001e/",
         "O~P\u00113hJ㰍r𞠸^",
@@ -37,5 +36,6 @@
         "\u001a\u0005]70h_𤋘9튍\\󺫇n",
         "",
         "\u0006e\u0014Ke\u0006v􍓺\u0007"
-    ]
-}
\ No newline at end of file
+    ],
+    "return": 1
+}
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_1.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_1.json
index 8e2afd34277..98d9bcb75a6 100644
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ChunkSize_user_1.json
@@ -1 +1 @@
-17
\ No newline at end of file
+17
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_10.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_10.json
deleted file mode 100644
index 19c7bdba7b1..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-16
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_11.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_11.json
deleted file mode 100644
index 368f89ceef1..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-28
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_12.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_12.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_13.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_13.json
deleted file mode 100644
index bf0d87ab1b2..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_14.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_14.json
deleted file mode 100644
index 9a037142aa3..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_15.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_15.json
deleted file mode 100644
index da2d3988d7d..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_16.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_16.json
deleted file mode 100644
index da2d3988d7d..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_17.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_17.json
deleted file mode 100644
index d99e90eb967..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-29
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_18.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_18.json
deleted file mode 100644
index 3f10ffe7a4c..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-15
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_19.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_19.json
deleted file mode 100644
index 25bf17fc5aa..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-18
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_2.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_2.json
deleted file mode 100644
index 8580e7b684b..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-30
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_20.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_20.json
deleted file mode 100644
index 2edeafb09db..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-20
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_3.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_3.json
deleted file mode 100644
index d8263ee9860..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_4.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_4.json
deleted file mode 100644
index 978b4e8e518..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-26
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_5.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_5.json
deleted file mode 100644
index da2d3988d7d..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_6.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_6.json
deleted file mode 100644
index ca7bf83ac53..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-13
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_7.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_7.json
deleted file mode 100644
index cabf43b5ddf..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-24
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_8.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_8.json
deleted file mode 100644
index 410b14d2ce6..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-25
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ChunkSize_user_9.json b/libs/wire-api/test/golden/testObject_ChunkSize_user_9.json
deleted file mode 100644
index da2d3988d7d..00000000000
--- a/libs/wire-api/test/golden/testObject_ChunkSize_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientCapabilityList_1.json b/libs/wire-api/test/golden/testObject_ClientCapabilityList_1.json
index 6f56bd593ad..b2cff73f9e8 100644
--- a/libs/wire-api/test/golden/testObject_ClientCapabilityList_1.json
+++ b/libs/wire-api/test/golden/testObject_ClientCapabilityList_1.json
@@ -1,3 +1,3 @@
 {
     "capabilities": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientCapabilityList_2.json b/libs/wire-api/test/golden/testObject_ClientCapabilityList_2.json
index d7b231f8752..89c37fb330c 100644
--- a/libs/wire-api/test/golden/testObject_ClientCapabilityList_2.json
+++ b/libs/wire-api/test/golden/testObject_ClientCapabilityList_2.json
@@ -2,4 +2,4 @@
     "capabilities": [
         "legalhold-implicit-consent"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientCapability_1.json b/libs/wire-api/test/golden/testObject_ClientCapability_1.json
index 77ef059e94f..ce5ed7f4ace 100644
--- a/libs/wire-api/test/golden/testObject_ClientCapability_1.json
+++ b/libs/wire-api/test/golden/testObject_ClientCapability_1.json
@@ -1 +1 @@
-"legalhold-implicit-consent"
\ No newline at end of file
+"legalhold-implicit-consent"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_1.json b/libs/wire-api/test/golden/testObject_ClientClass_user_1.json
index cc97c8d49f0..a13203b2401 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_1.json
@@ -1 +1 @@
-"phone"
\ No newline at end of file
+"phone"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_10.json b/libs/wire-api/test/golden/testObject_ClientClass_user_10.json
index 51437a3eca1..f77055aee8e 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_10.json
@@ -1 +1 @@
-"desktop"
\ No newline at end of file
+"desktop"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_11.json b/libs/wire-api/test/golden/testObject_ClientClass_user_11.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_11.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_12.json b/libs/wire-api/test/golden/testObject_ClientClass_user_12.json
index cc97c8d49f0..a13203b2401 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_12.json
@@ -1 +1 @@
-"phone"
\ No newline at end of file
+"phone"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_13.json b/libs/wire-api/test/golden/testObject_ClientClass_user_13.json
index 51437a3eca1..f77055aee8e 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_13.json
@@ -1 +1 @@
-"desktop"
\ No newline at end of file
+"desktop"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_14.json b/libs/wire-api/test/golden/testObject_ClientClass_user_14.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_14.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_15.json b/libs/wire-api/test/golden/testObject_ClientClass_user_15.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_15.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_16.json b/libs/wire-api/test/golden/testObject_ClientClass_user_16.json
index cc97c8d49f0..a13203b2401 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_16.json
@@ -1 +1 @@
-"phone"
\ No newline at end of file
+"phone"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_17.json b/libs/wire-api/test/golden/testObject_ClientClass_user_17.json
index 51437a3eca1..f77055aee8e 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_17.json
@@ -1 +1 @@
-"desktop"
\ No newline at end of file
+"desktop"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_18.json b/libs/wire-api/test/golden/testObject_ClientClass_user_18.json
index cc97c8d49f0..a13203b2401 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_18.json
@@ -1 +1 @@
-"phone"
\ No newline at end of file
+"phone"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_19.json b/libs/wire-api/test/golden/testObject_ClientClass_user_19.json
index 51437a3eca1..f77055aee8e 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_19.json
@@ -1 +1 @@
-"desktop"
\ No newline at end of file
+"desktop"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_2.json b/libs/wire-api/test/golden/testObject_ClientClass_user_2.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_2.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_20.json b/libs/wire-api/test/golden/testObject_ClientClass_user_20.json
index 51437a3eca1..f77055aee8e 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_20.json
@@ -1 +1 @@
-"desktop"
\ No newline at end of file
+"desktop"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_3.json b/libs/wire-api/test/golden/testObject_ClientClass_user_3.json
index 51437a3eca1..f77055aee8e 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_3.json
@@ -1 +1 @@
-"desktop"
\ No newline at end of file
+"desktop"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_4.json b/libs/wire-api/test/golden/testObject_ClientClass_user_4.json
index 9b71fd2df64..763b30cf114 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_4.json
@@ -1 +1 @@
-"tablet"
\ No newline at end of file
+"tablet"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_5.json b/libs/wire-api/test/golden/testObject_ClientClass_user_5.json
index 51437a3eca1..f77055aee8e 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_5.json
@@ -1 +1 @@
-"desktop"
\ No newline at end of file
+"desktop"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_6.json b/libs/wire-api/test/golden/testObject_ClientClass_user_6.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_6.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_7.json b/libs/wire-api/test/golden/testObject_ClientClass_user_7.json
index cc97c8d49f0..a13203b2401 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_7.json
@@ -1 +1 @@
-"phone"
\ No newline at end of file
+"phone"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_8.json b/libs/wire-api/test/golden/testObject_ClientClass_user_8.json
index cc97c8d49f0..a13203b2401 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_8.json
@@ -1 +1 @@
-"phone"
\ No newline at end of file
+"phone"
diff --git a/libs/wire-api/test/golden/testObject_ClientClass_user_9.json b/libs/wire-api/test/golden/testObject_ClientClass_user_9.json
index cc97c8d49f0..a13203b2401 100644
--- a/libs/wire-api/test/golden/testObject_ClientClass_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ClientClass_user_9.json
@@ -1 +1 @@
-"phone"
\ No newline at end of file
+"phone"
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_1.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_1.json
index c41f71a3fd2..84e1858d219 100644
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ClientMismatch_user_1.json
@@ -1,52 +1,21 @@
 {
-    "redundant": {
-        "00000009-0000-005e-0000-002e00000012": [],
-        "00000072-0000-0051-0000-000500000007": []
-    },
-    "time": "1864-04-12T12:22:43.673Z",
-    "missing": {
-        "00000002-0000-0000-0000-000200000000": [
-            "0"
-        ],
-        "00000001-0000-0002-0000-000200000001": [
-            "0"
-        ],
-        "00000000-0000-0001-0000-000200000002": [],
-        "00000001-0000-0002-0000-000200000000": [],
-        "00000001-0000-0000-0000-000000000000": [],
-        "00000001-0000-0000-0000-000100000002": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0001-0000-000200000001": [
-            "2"
-        ],
-        "00000000-0000-0000-0000-000200000000": [
-            "0"
-        ],
-        "00000002-0000-0001-0000-000200000002": [],
-        "00000000-0000-0000-0000-000100000002": [
+    "deleted": {
+        "00000004-0000-0004-0000-000700000000": [
             "0",
             "1"
         ],
-        "00000001-0000-0001-0000-000100000002": [
+        "00000005-0000-0000-0000-000600000008": [
             "0",
             "1"
         ]
     },
-    "deleted": {
-        "00000004-0000-0004-0000-000700000000": [
-            "0",
-            "1"
-        ],
-        "00000005-0000-0000-0000-000600000008": [
+    "missing": {
+        "00000000-0000-0000-0000-000100000002": [
             "0",
             "1"
         ],
-        "00000005-0000-0002-0000-000800000001": [
-            "3",
-            "4"
-        ],
-        "00000005-0000-0006-0000-000400000001": []
-    }
-}
\ No newline at end of file
+        "00000000-0000-0000-0000-000200000000": []
+    },
+    "redundant": {},
+    "time": "1864-04-12T12:22:43.673Z"
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_10.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_10.json
deleted file mode 100644
index 29284287706..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_10.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "redundant": {
-        "00000016-0000-0013-0000-000a00000009": [],
-        "00000007-0000-0008-0000-001a00000011": [
-            "0",
-            "3"
-        ],
-        "0000001c-0000-0003-0000-001300000012": [
-            "0",
-            "2"
-        ]
-    },
-    "time": "1864-06-08T05:23:30.672Z",
-    "missing": {
-        "00000051-0000-007d-0000-004600000046": [
-            "1",
-            "8",
-            "e"
-        ],
-        "00000031-0000-0056-0000-007600000063": [
-            "20",
-            "f"
-        ]
-    },
-    "deleted": {
-        "0000004c-0000-006b-0000-000d00000009": [
-            "0",
-            "1"
-        ],
-        "0000006b-0000-0079-0000-007e00000028": [
-            "0",
-            "1",
-            "2"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_11.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_11.json
deleted file mode 100644
index dc601f1f2fd..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_11.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "redundant": {
-        "00000002-0000-0016-0000-000d00000017": [
-            "1",
-            "2"
-        ],
-        "00000008-0000-000c-0000-00090000001a": [
-            "0",
-            "b"
-        ],
-        "0000001d-0000-001a-0000-00080000000d": [
-            "1e"
-        ]
-    },
-    "time": "1864-04-14T22:55:33.894Z",
-    "missing": {
-        "00000015-0000-0004-0000-000300000006": [
-            "0",
-            "1"
-        ],
-        "0000001b-0000-0005-0000-001800000000": [],
-        "00000015-0000-000f-0000-00040000000f": []
-    },
-    "deleted": {
-        "00000001-0000-0001-0000-000000000000": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0001-0000-000100000000": [
-            "3"
-        ],
-        "00000001-0000-0001-0000-000100000001": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0000-0000-000000000000": [
-            "0"
-        ],
-        "00000000-0000-0002-0000-000200000002": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0001-0000-000200000000": [],
-        "00000000-0000-0000-0000-000200000000": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0000-0000-000200000000": [
-            "3"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_12.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_12.json
deleted file mode 100644
index a3a2f70f201..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_12.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "redundant": {
-        "0000007b-0000-003e-0000-002a00000078": [],
-        "00000068-0000-0004-0000-004800000071": [
-            "dab"
-        ]
-    },
-    "time": "1864-05-08T01:07:14.883Z",
-    "missing": {},
-    "deleted": {
-        "00000001-0000-0001-0000-000200000002": [],
-        "00000001-0000-0002-0000-000100000002": [
-            "0"
-        ],
-        "00000002-0000-0002-0000-000100000001": [
-            "2"
-        ],
-        "00000000-0000-0000-0000-000000000000": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0002-0000-000000000002": [],
-        "00000002-0000-0000-0000-000100000002": [
-            "1"
-        ],
-        "00000000-0000-0001-0000-000100000001": [],
-        "00000002-0000-0001-0000-000200000000": [],
-        "00000001-0000-0001-0000-000200000000": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0002-0000-000000000002": [
-            "2"
-        ],
-        "00000002-0000-0001-0000-000100000000": [
-            "1"
-        ],
-        "00000002-0000-0001-0000-000200000002": [],
-        "00000002-0000-0001-0000-000000000000": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0002-0000-000000000001": [],
-        "00000001-0000-0001-0000-000200000001": []
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_13.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_13.json
deleted file mode 100644
index 6bb9609cf53..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "redundant": {
-        "00000002-0000-0000-0000-000400000001": [
-            "1"
-        ],
-        "00000003-0000-0004-0000-000400000002": [],
-        "00000000-0000-0003-0000-000300000002": [
-            "0"
-        ],
-        "00000004-0000-0000-0000-000200000004": [],
-        "00000004-0000-0002-0000-000000000003": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0004-0000-000000000001": [],
-        "00000001-0000-0000-0000-000300000001": []
-    },
-    "time": "1864-05-09T16:28:56.647Z",
-    "missing": {
-        "00000001-0000-0001-0000-000000000000": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0000-0000-000000000001": [],
-        "00000000-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000100000000": [],
-        "00000000-0000-0001-0000-000100000000": [
-            "0"
-        ],
-        "00000000-0000-0000-0000-000100000000": [
-            "0"
-        ],
-        "00000000-0000-0000-0000-000000000001": [],
-        "00000001-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000000000000": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0001-0000-000000000000": [],
-        "00000001-0000-0000-0000-000100000001": []
-    },
-    "deleted": {
-        "00000001-0000-0001-0000-000000000000": [],
-        "00000001-0000-0000-0000-000000000001": [],
-        "00000000-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000100000000": [],
-        "00000000-0000-0001-0000-000100000000": [
-            "1"
-        ],
-        "00000000-0000-0000-0000-000100000001": [
-            "1"
-        ],
-        "00000000-0000-0000-0000-000000000000": [
-            "0"
-        ],
-        "00000001-0000-0001-0000-000000000001": [
-            "1"
-        ],
-        "00000001-0000-0000-0000-000000000000": [
-            "0"
-        ],
-        "00000000-0000-0001-0000-000000000000": [
-            "0"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_14.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_14.json
deleted file mode 100644
index e9884688ea2..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_14.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "redundant": {
-        "00000017-0000-0001-0000-005b00000037": [
-            "8a6"
-        ],
-        "00000080-0000-003c-0000-00680000001d": [
-            "0",
-            "2",
-            "4"
-        ]
-    },
-    "time": "1864-05-08T01:02:42.968Z",
-    "missing": {
-        "00000001-0000-0001-0000-000200000002": [],
-        "00000000-0000-0000-0000-000200000002": [
-            "1"
-        ],
-        "00000002-0000-0002-0000-000000000001": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0002-0000-000000000002": [
-            "3"
-        ],
-        "00000000-0000-0001-0000-000200000002": [],
-        "00000001-0000-0001-0000-000000000001": [],
-        "00000000-0000-0002-0000-000200000002": [
-            "3"
-        ],
-        "00000001-0000-0002-0000-000000000001": [],
-        "00000002-0000-0001-0000-000100000000": [
-            "3"
-        ]
-    },
-    "deleted": {
-        "00004cd5-0000-31af-0000-638a000043c3": [
-            "2a5",
-            "3d0"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_15.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_15.json
deleted file mode 100644
index 9073d154ed5..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_15.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "redundant": {
-        "00000007-0000-0003-0000-000600000006": [
-            "1",
-            "2"
-        ],
-        "00000001-0000-0002-0000-000200000005": [
-            "0",
-            "1"
-        ],
-        "00000003-0000-0008-0000-000600000008": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0000-0000-000500000001": []
-    },
-    "time": "1864-06-02T22:04:34.496Z",
-    "missing": {
-        "00000001-0000-0001-0000-000000000000": [],
-        "00000001-0000-0000-0000-000000000001": [],
-        "00000000-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000100000000": [],
-        "00000000-0000-0001-0000-000100000000": [],
-        "00000000-0000-0000-0000-000100000001": [],
-        "00000001-0000-0001-0000-000100000001": [],
-        "00000000-0000-0000-0000-000000000000": [],
-        "00000000-0000-0000-0000-000100000000": [],
-        "00000001-0000-0001-0000-000100000000": [],
-        "00000001-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000000000000": [],
-        "00000000-0000-0001-0000-000000000000": [],
-        "00000000-0000-0001-0000-000100000001": []
-    },
-    "deleted": {
-        "00002695-0000-0695-0000-494f00003295": [
-            "13",
-            "15",
-            "6"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_16.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_16.json
deleted file mode 100644
index 923c0fd58ad..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_16.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "redundant": {
-        "00000a6b-0000-5bd1-0000-7ab500002215": [
-            "55",
-            "76",
-            "c0"
-        ]
-    },
-    "time": "1864-06-01T16:55:21.151Z",
-    "missing": {
-        "00000002-0000-0000-0000-000000000002": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0002-0000-000000000002": [],
-        "00000002-0000-0000-0000-000200000001": [],
-        "00000000-0000-0000-0000-000000000001": [
-            "1"
-        ],
-        "00000001-0000-0000-0000-000100000001": [
-            "2"
-        ],
-        "00000001-0000-0001-0000-000200000000": [
-            "1"
-        ],
-        "00000002-0000-0002-0000-000000000002": [],
-        "00000001-0000-0000-0000-000200000001": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0000-0000-000000000002": [
-            "3"
-        ],
-        "00000001-0000-0002-0000-000200000002": [
-            "0",
-            "1"
-        ]
-    },
-    "deleted": {
-        "00000000-0000-001f-0000-000b0000001c": [
-            "8",
-            "e"
-        ],
-        "00000018-0000-0020-0000-002000000000": [
-            "1",
-            "3",
-            "4"
-        ],
-        "00000013-0000-0015-0000-001f0000000a": [
-            "41"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_17.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_17.json
deleted file mode 100644
index 7ba3928d356..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_17.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "redundant": {
-        "0000451d-0000-7508-0000-317f0000186b": [
-            "e730"
-        ]
-    },
-    "time": "1864-04-23T21:23:53.493Z",
-    "missing": {
-        "00000001-0000-0000-0000-000100000000": [],
-        "00000000-0000-0002-0000-000200000000": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0001-0000-000100000000": [
-            "1"
-        ],
-        "00000002-0000-0000-0000-000100000002": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0002-0000-000200000001": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0002-0000-000200000000": [],
-        "00000000-0000-0002-0000-000200000002": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0002-0000-000100000000": [
-            "0"
-        ],
-        "00000002-0000-0001-0000-000000000000": [
-            "0"
-        ],
-        "00000000-0000-0001-0000-000000000002": []
-    },
-    "deleted": {
-        "0000003b-0000-005f-0000-00330000007f": [],
-        "00000025-0000-0012-0000-002500000033": [
-            "0",
-            "1"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_18.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_18.json
deleted file mode 100644
index ac8c508ac94..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_18.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "redundant": {
-        "00000001-0000-0001-0000-000000000000": [],
-        "00000001-0000-0000-0000-000000000001": [
-            "0"
-        ],
-        "00000000-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000100000000": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0001-0000-000100000000": [],
-        "00000001-0000-0001-0000-000100000001": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0000-0000-000000000000": [],
-        "00000000-0000-0000-0000-000100000000": [],
-        "00000001-0000-0001-0000-000100000000": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0000-0000-000000000001": [
-            "0"
-        ],
-        "00000001-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000000000000": [
-            "1"
-        ],
-        "00000000-0000-0001-0000-000000000000": [],
-        "00000001-0000-0000-0000-000100000001": [],
-        "00000000-0000-0001-0000-000100000001": [
-            "0"
-        ]
-    },
-    "time": "1864-05-14T18:56:29.815Z",
-    "missing": {
-        "00000004-0000-0003-0000-000400000004": [
-            "5"
-        ],
-        "00000000-0000-0004-0000-000400000000": [],
-        "00000004-0000-0004-0000-000300000002": [],
-        "00000003-0000-0002-0000-000100000004": [],
-        "00000002-0000-0000-0000-000300000004": [],
-        "00000003-0000-0000-0000-000400000004": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0000-0000-000000000001": [
-            "1",
-            "2"
-        ]
-    },
-    "deleted": {
-        "00000002-0000-0004-0000-000800000002": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0003-0000-000800000002": [
-            "0",
-            "4"
-        ],
-        "00000002-0000-0000-0000-000000000007": [],
-        "00000000-0000-0001-0000-000000000008": []
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_19.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_19.json
deleted file mode 100644
index d1443c2b5f8..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_19.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "redundant": {
-        "00000001-0000-0001-0000-000000000000": [
-            "0"
-        ],
-        "00000001-0000-0000-0000-000100000000": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0002-0000-000200000001": [
-            "3"
-        ],
-        "00000001-0000-0001-0000-000100000000": [],
-        "00000002-0000-0000-0000-000100000002": [],
-        "00000000-0000-0002-0000-000200000001": [
-            "3"
-        ],
-        "00000000-0000-0001-0000-000000000000": [],
-        "00000000-0000-0000-0000-000200000001": [
-            "0",
-            "1"
-        ]
-    },
-    "time": "1864-06-06T11:59:12.981Z",
-    "missing": {
-        "00000001-0000-0002-0000-000100000002": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0000-0000-000200000000": [
-            "0"
-        ],
-        "00000002-0000-0000-0000-000000000002": [],
-        "00000002-0000-0001-0000-000100000002": [],
-        "00000000-0000-0002-0000-000200000000": [],
-        "00000002-0000-0000-0000-000200000001": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0001-0000-000200000002": [],
-        "00000001-0000-0000-0000-000000000000": [
-            "1"
-        ],
-        "00000002-0000-0001-0000-000000000001": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0001-0000-000000000002": [
-            "1"
-        ],
-        "00000000-0000-0001-0000-000100000002": [
-            "1"
-        ],
-        "00000000-0000-0001-0000-000200000001": [
-            "1"
-        ],
-        "00000001-0000-0000-0000-000000000002": [
-            "1"
-        ],
-        "00000000-0000-0001-0000-000000000002": []
-    },
-    "deleted": {
-        "00000013-0000-0002-0000-003500000013": [
-            "11",
-            "9"
-        ],
-        "0000003c-0000-000f-0000-003e00000013": [
-            "1",
-            "8"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_2.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_2.json
deleted file mode 100644
index 95844f41760..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_2.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "redundant": {
-        "00000000-0000-0000-0000-000000000001": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0002-0000-000200000001": [
-            "0"
-        ],
-        "00000001-0000-0001-0000-000200000000": [],
-        "00000002-0000-0000-0000-000000000000": [
-            "3"
-        ],
-        "00000002-0000-0001-0000-000100000000": [],
-        "00000001-0000-0002-0000-000000000000": [
-            "0"
-        ],
-        "00000002-0000-0002-0000-000200000001": [],
-        "00000001-0000-0001-0000-000200000001": [
-            "0"
-        ]
-    },
-    "time": "1864-04-19T08:06:54.492Z",
-    "missing": {
-        "00000016-0000-0005-0000-001b0000001e": [
-            "50"
-        ],
-        "0000000e-0000-001d-0000-00160000001c": [
-            "0",
-            "1"
-        ],
-        "0000000d-0000-000e-0000-00170000001c": [
-            "0",
-            "2",
-            "3"
-        ]
-    },
-    "deleted": {
-        "00000007-0000-0004-0000-000800000001": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0006-0000-000800000004": [
-            "0",
-            "1"
-        ],
-        "00000005-0000-0000-0000-000600000002": [
-            "0",
-            "1"
-        ],
-        "00000005-0000-0000-0000-000100000002": [
-            "2",
-            "4"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_20.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_20.json
deleted file mode 100644
index 0e69c47fa47..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_20.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "redundant": {
-        "00000003-0000-0001-0000-000100000003": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0003-0000-000300000003": [],
-        "00000001-0000-0004-0000-000200000004": [
-            "f"
-        ],
-        "00000004-0000-0001-0000-000100000002": [
-            "0",
-            "1"
-        ],
-        "00000004-0000-0002-0000-000300000003": [],
-        "00000004-0000-0003-0000-000000000001": [
-            "0",
-            "2"
-        ]
-    },
-    "time": "1864-05-20T02:14:30.091Z",
-    "missing": {
-        "00000002-0000-0002-0000-000300000003": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0004-0000-000300000002": [
-            "e"
-        ],
-        "00000003-0000-0000-0000-000400000002": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0003-0000-000300000004": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0000-0000-000200000000": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0004-0000-000300000003": [
-            "6"
-        ]
-    },
-    "deleted": {
-        "00000008-0000-0018-0000-00080000000a": [],
-        "0000001a-0000-0020-0000-000400000016": [],
-        "00000018-0000-0017-0000-00110000000a": []
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_3.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_3.json
deleted file mode 100644
index 966915a6f38..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_3.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "redundant": {
-        "00000002-0000-0001-0000-000100000003": [],
-        "00000004-0000-0004-0000-000300000002": [
-            "e"
-        ],
-        "00000000-0000-0000-0000-000300000002": [],
-        "00000001-0000-0001-0000-000300000002": [
-            "8"
-        ],
-        "00000004-0000-0001-0000-000000000000": [
-            "3"
-        ],
-        "00000003-0000-0000-0000-000000000000": [
-            "0",
-            "1"
-        ]
-    },
-    "time": "1864-05-18T16:25:29.722Z",
-    "missing": {
-        "00000019-0000-001e-0000-000e0000001e": [
-            "1",
-            "e"
-        ],
-        "00000002-0000-0006-0000-000700000013": [
-            "0",
-            "1"
-        ],
-        "0000001e-0000-000b-0000-000600000018": [
-            "b"
-        ]
-    },
-    "deleted": {
-        "00000001-0000-0000-0000-000000000001": [],
-        "00000000-0000-0001-0000-000000000001": [
-            "0"
-        ],
-        "00000001-0000-0000-0000-000100000000": [],
-        "00000001-0000-0001-0000-000100000000": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0000-0000-000000000001": [],
-        "00000001-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000000000000": [],
-        "00000000-0000-0001-0000-000000000000": [],
-        "00000001-0000-0000-0000-000100000001": []
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_4.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_4.json
deleted file mode 100644
index 65d5515c72d..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_4.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "redundant": {},
-    "time": "1864-04-20T07:47:05.133Z",
-    "missing": {
-        "00000005-0000-0006-0000-000500000001": [],
-        "00000006-0000-0001-0000-000100000006": [],
-        "00000002-0000-0005-0000-000300000000": [
-            "1"
-        ],
-        "00000003-0000-0001-0000-000200000005": [],
-        "00000000-0000-0003-0000-000800000002": [
-            "1"
-        ]
-    },
-    "deleted": {
-        "00000005-0000-0008-0000-000000000001": [],
-        "00000000-0000-0007-0000-000700000001": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0004-0000-000200000003": [
-            "0",
-            "1",
-            "2"
-        ],
-        "00000004-0000-0001-0000-000800000005": [
-            "b"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_5.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_5.json
deleted file mode 100644
index 26994652d55..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_5.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "redundant": {
-        "00000002-0000-0000-0000-000200000000": [],
-        "00000001-0000-0002-0000-000000000002": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0000-0000-000100000000": [
-            "1"
-        ],
-        "00000000-0000-0001-0000-000200000002": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0001-0000-000100000000": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0002-0000-000200000000": [],
-        "00000000-0000-0001-0000-000100000002": [
-            "3"
-        ],
-        "00000002-0000-0002-0000-000200000000": [
-            "1"
-        ],
-        "00000002-0000-0000-0000-000200000002": [],
-        "00000001-0000-0002-0000-000100000001": []
-    },
-    "time": "1864-04-26T19:31:21.478Z",
-    "missing": {
-        "00000002-0000-0001-0000-000200000001": [
-            "2"
-        ],
-        "00000002-0000-0001-0000-000100000002": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0000-0000-000200000002": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0001-0000-000200000001": [
-            "0"
-        ],
-        "00000002-0000-0000-0000-000100000001": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0000-0000-000000000002": [
-            "0"
-        ],
-        "00000001-0000-0002-0000-000000000000": [
-            "1"
-        ],
-        "00000002-0000-0000-0000-000000000001": [
-            "1"
-        ],
-        "00000000-0000-0001-0000-000200000000": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0002-0000-000200000002": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0002-0000-000100000002": []
-    },
-    "deleted": {
-        "00000001-0000-0000-0000-000100000000": [],
-        "00000000-0000-0000-0000-000200000002": [],
-        "00000000-0000-0000-0000-000000000001": [],
-        "00000002-0000-0000-0000-000100000002": [],
-        "00000002-0000-0001-0000-000000000002": [],
-        "00000000-0000-0001-0000-000000000000": [],
-        "00000000-0000-0001-0000-000100000001": [],
-        "00000000-0000-0000-0000-000200000000": [],
-        "00000001-0000-0002-0000-000000000000": [],
-        "00000001-0000-0000-0000-000200000000": [],
-        "00000002-0000-0002-0000-000100000002": [
-            "0",
-            "1"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_6.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_6.json
deleted file mode 100644
index 748e1ab4f19..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_6.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "redundant": {},
-    "time": "1864-05-28T18:24:35.996Z",
-    "missing": {
-        "00000001-0000-0006-0000-000300000003": [],
-        "00000007-0000-0001-0000-000500000008": [
-            "1a"
-        ],
-        "00000002-0000-0000-0000-000300000005": [
-            "1",
-            "2"
-        ],
-        "00000004-0000-0005-0000-000100000006": [
-            "0",
-            "1"
-        ]
-    },
-    "deleted": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_7.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_7.json
deleted file mode 100644
index 8d52a991f64..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_7.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "redundant": {
-        "00000001-0000-0001-0000-000000000000": [],
-        "00000002-0000-0001-0000-000100000002": [],
-        "00000001-0000-0002-0000-000200000001": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0000-0000-000200000002": [
-            "2"
-        ],
-        "00000002-0000-0001-0000-000000000002": [
-            "0",
-            "1"
-        ],
-        "00000001-0000-0001-0000-000000000002": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0000-0000-000100000001": [
-            "0"
-        ],
-        "00000001-0000-0001-0000-000200000001": [],
-        "00000000-0000-0001-0000-000000000002": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0002-0000-000100000002": [
-            "0",
-            "1"
-        ]
-    },
-    "time": "1864-05-26T02:38:01.741Z",
-    "missing": {},
-    "deleted": {
-        "00000001-0000-0000-0000-000000000001": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0001-0000-000000000001": [],
-        "00000001-0000-0000-0000-000100000000": [],
-        "00000000-0000-0001-0000-000100000000": [],
-        "00000000-0000-0000-0000-000100000001": [],
-        "00000000-0000-0000-0000-000000000000": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0000-0000-000100000000": [
-            "0"
-        ],
-        "00000000-0000-0000-0000-000000000001": [
-            "1"
-        ],
-        "00000001-0000-0000-0000-000000000000": [],
-        "00000001-0000-0000-0000-000100000001": [],
-        "00000000-0000-0001-0000-000100000001": [
-            "1"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_8.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_8.json
deleted file mode 100644
index 3057e470c19..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_8.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "redundant": {
-        "00000000-0000-0002-0000-000400000001": [
-            "0",
-            "1"
-        ],
-        "00000000-0000-0003-0000-000400000000": [
-            "0",
-            "1"
-        ],
-        "00000002-0000-0002-0000-000100000001": [],
-        "00000001-0000-0000-0000-000100000004": [
-            "b"
-        ],
-        "00000003-0000-0000-0000-000100000000": [
-            "0",
-            "2"
-        ],
-        "00000000-0000-0004-0000-000300000002": []
-    },
-    "time": "1864-04-11T13:11:44.951Z",
-    "missing": {
-        "00000013-0000-0067-0000-00540000000f": [],
-        "0000001f-0000-0001-0000-007600000041": [
-            "0",
-            "1",
-            "2"
-        ]
-    },
-    "deleted": {
-        "0000003a-0000-0008-0000-00740000006a": [
-            "52f"
-        ],
-        "0000003d-0000-0037-0000-005900000042": [
-            "2",
-            "3",
-            "4"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientMismatch_user_9.json b/libs/wire-api/test/golden/testObject_ClientMismatch_user_9.json
deleted file mode 100644
index b3d1a2c9118..00000000000
--- a/libs/wire-api/test/golden/testObject_ClientMismatch_user_9.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "redundant": {
-        "00000019-0000-004b-0000-00300000007e": [
-            "1b"
-        ],
-        "00000057-0000-0020-0000-006600000037": [
-            "0",
-            "1",
-            "4"
-        ]
-    },
-    "time": "1864-04-20T09:37:09.767Z",
-    "missing": {
-        "00003597-0000-21f9-0000-74b8000066b6": [
-            "0",
-            "1",
-            "2"
-        ]
-    },
-    "deleted": {
-        "0000006c-0000-002c-0000-006600000027": [],
-        "00000029-0000-004d-0000-006d0000000a": [
-            "0",
-            "1"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_1.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_1.json
index a58c9dda83f..1a651c5a325 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_1.json
@@ -1,7 +1,7 @@
 {
+    "client": "f22",
     "prekey": {
-        "key": "",
-        "id": 7
-    },
-    "client": "f22"
-}
\ No newline at end of file
+        "id": 7,
+        "key": ""
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_10.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_10.json
index 55437c260d0..97a53588666 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_10.json
@@ -1,7 +1,7 @@
 {
+    "client": "252",
     "prekey": {
-        "key": "0\u0004\u0012\u001e\u000f􈓓f",
-        "id": 2
-    },
-    "client": "252"
-}
\ No newline at end of file
+        "id": 2,
+        "key": "0\u0004\u0012\u001e\u000f􈓓f"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_11.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_11.json
index 3e26f7d6907..4bb9cc665c5 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_11.json
@@ -1,7 +1,7 @@
 {
+    "client": "b99",
     "prekey": {
-        "key": "2󺖥",
-        "id": 6
-    },
-    "client": "b99"
-}
\ No newline at end of file
+        "id": 6,
+        "key": "2󺖥"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_12.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_12.json
index 2685249852c..1737622d486 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_12.json
@@ -1,7 +1,7 @@
 {
+    "client": "be3",
     "prekey": {
-        "key": "\u001f#󽽲M𝕴\u0017?",
-        "id": 4
-    },
-    "client": "be3"
-}
\ No newline at end of file
+        "id": 4,
+        "key": "\u001f#󽽲M𝕴\u0017?"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_13.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_13.json
index 3520e8402c6..e736c44ade4 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_13.json
@@ -1,7 +1,7 @@
 {
+    "client": "1cf",
     "prekey": {
-        "key": "O,-%𤩘o",
-        "id": 7
-    },
-    "client": "1cf"
-}
\ No newline at end of file
+        "id": 7,
+        "key": "O,-%𤩘o"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_14.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_14.json
index 6c318cf672d..b8555ddabe2 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_14.json
@@ -1,7 +1,7 @@
 {
+    "client": "710",
     "prekey": {
-        "key": "\u0012𠾃𗧨𦊢x󶙡",
-        "id": 1
-    },
-    "client": "710"
-}
\ No newline at end of file
+        "id": 1,
+        "key": "\u0012𠾃𗧨𦊢x󶙡"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_15.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_15.json
index 9ea5fa28ee2..dd66040dce1 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_15.json
@@ -1,7 +1,7 @@
 {
+    "client": "97e",
     "prekey": {
-        "key": "\u000ck􌱝\u0000\u0003",
-        "id": 0
-    },
-    "client": "97e"
-}
\ No newline at end of file
+        "id": 0,
+        "key": "\u000ck􌱝\u0000\u0003"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_16.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_16.json
index fa2ebc8e2a6..70bf42f2270 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_16.json
@@ -1,7 +1,7 @@
 {
+    "client": "2b2",
     "prekey": {
-        "key": "颷",
-        "id": 2
-    },
-    "client": "2b2"
-}
\ No newline at end of file
+        "id": 2,
+        "key": "颷"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_17.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_17.json
index 3901ee23f4c..94b00d64955 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_17.json
@@ -1,7 +1,7 @@
 {
+    "client": "81c",
     "prekey": {
-        "key": "􇡞󱀔h9􂴕",
-        "id": 2
-    },
-    "client": "81c"
-}
\ No newline at end of file
+        "id": 2,
+        "key": "􇡞󱀔h9􂴕"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_18.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_18.json
index 31f7e8a45b1..ccd9d7f745e 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_18.json
@@ -1,7 +1,7 @@
 {
+    "client": "895",
     "prekey": {
-        "key": ",",
-        "id": 8
-    },
-    "client": "895"
-}
\ No newline at end of file
+        "id": 8,
+        "key": ","
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_19.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_19.json
index e71a35f7436..b2aa3556449 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_19.json
@@ -1,7 +1,7 @@
 {
+    "client": "792",
     "prekey": {
-        "key": "g娔i\u0003",
-        "id": 4
-    },
-    "client": "792"
-}
\ No newline at end of file
+        "id": 4,
+        "key": "g娔i\u0003"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_2.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_2.json
index 155cdc5a2fa..32d8bb3812d 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_2.json
@@ -1,7 +1,7 @@
 {
+    "client": "1f7",
     "prekey": {
-        "key": "\u0008劉𩙰\r;",
-        "id": 1
-    },
-    "client": "1f7"
-}
\ No newline at end of file
+        "id": 1,
+        "key": "\u0008劉𩙰\r;"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_20.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_20.json
index 2f1eede51db..bf3132277bb 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_20.json
@@ -1,7 +1,7 @@
 {
+    "client": "b02",
     "prekey": {
-        "key": "D){H",
-        "id": 4
-    },
-    "client": "b02"
-}
\ No newline at end of file
+        "id": 4,
+        "key": "D){H"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_3.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_3.json
index 63da6355a29..c5c3183d7d8 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_3.json
@@ -1,7 +1,7 @@
 {
+    "client": "fd8",
     "prekey": {
-        "key": "KA",
-        "id": 4
-    },
-    "client": "fd8"
-}
\ No newline at end of file
+        "id": 4,
+        "key": "KA"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_4.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_4.json
index a3caf8b551b..26a64b54be4 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_4.json
@@ -1,7 +1,7 @@
 {
+    "client": "83d",
     "prekey": {
-        "key": "OeYn",
-        "id": 8
-    },
-    "client": "83d"
-}
\ No newline at end of file
+        "id": 8,
+        "key": "OeYn"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_5.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_5.json
index 60fda4c3a32..4559cb32e74 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_5.json
@@ -1,7 +1,7 @@
 {
+    "client": "a69",
     "prekey": {
-        "key": "𠈻3\u0005N]5~",
-        "id": 3
-    },
-    "client": "a69"
-}
\ No newline at end of file
+        "id": 3,
+        "key": "𠈻3\u0005N]5~"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_6.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_6.json
index 54741734255..34bc4c9f789 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_6.json
@@ -1,7 +1,7 @@
 {
+    "client": "5b4",
     "prekey": {
-        "key": "􁒂(",
-        "id": 1
-    },
-    "client": "5b4"
-}
\ No newline at end of file
+        "id": 1,
+        "key": "􁒂("
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_7.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_7.json
index f3e2b7af5be..6409ad04849 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_7.json
@@ -1,7 +1,7 @@
 {
+    "client": "7b4",
     "prekey": {
-        "key": "􅷂P!+",
-        "id": 5
-    },
-    "client": "7b4"
-}
\ No newline at end of file
+        "id": 5,
+        "key": "􅷂P!+"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_8.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_8.json
index 734957355a6..579021be956 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_8.json
@@ -1,7 +1,7 @@
 {
+    "client": "4e8",
     "prekey": {
-        "key": "AZrl",
-        "id": 4
-    },
-    "client": "4e8"
-}
\ No newline at end of file
+        "id": 4,
+        "key": "AZrl"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientPrekey_user_9.json b/libs/wire-api/test/golden/testObject_ClientPrekey_user_9.json
index 4e0b143c55f..269484bf6c6 100644
--- a/libs/wire-api/test/golden/testObject_ClientPrekey_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ClientPrekey_user_9.json
@@ -1,7 +1,7 @@
 {
+    "client": "324",
     "prekey": {
-        "key": "\u000b>h",
-        "id": 5
-    },
-    "client": "324"
-}
\ No newline at end of file
+        "id": 5,
+        "key": "\u000b>h"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_1.json b/libs/wire-api/test/golden/testObject_ClientType_user_1.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_1.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_10.json b/libs/wire-api/test/golden/testObject_ClientType_user_10.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_10.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_11.json b/libs/wire-api/test/golden/testObject_ClientType_user_11.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_11.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_12.json b/libs/wire-api/test/golden/testObject_ClientType_user_12.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_12.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_13.json b/libs/wire-api/test/golden/testObject_ClientType_user_13.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_13.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_14.json b/libs/wire-api/test/golden/testObject_ClientType_user_14.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_14.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_15.json b/libs/wire-api/test/golden/testObject_ClientType_user_15.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_15.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_16.json b/libs/wire-api/test/golden/testObject_ClientType_user_16.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_16.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_17.json b/libs/wire-api/test/golden/testObject_ClientType_user_17.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_17.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_18.json b/libs/wire-api/test/golden/testObject_ClientType_user_18.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_18.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_19.json b/libs/wire-api/test/golden/testObject_ClientType_user_19.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_19.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_2.json b/libs/wire-api/test/golden/testObject_ClientType_user_2.json
index a6682364d45..75e6db13493 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_2.json
@@ -1 +1 @@
-"temporary"
\ No newline at end of file
+"temporary"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_20.json b/libs/wire-api/test/golden/testObject_ClientType_user_20.json
index 3f1c7086d4b..7ba020664b4 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_20.json
@@ -1 +1 @@
-"legalhold"
\ No newline at end of file
+"legalhold"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_3.json b/libs/wire-api/test/golden/testObject_ClientType_user_3.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_3.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_4.json b/libs/wire-api/test/golden/testObject_ClientType_user_4.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_4.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_5.json b/libs/wire-api/test/golden/testObject_ClientType_user_5.json
index a6682364d45..75e6db13493 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_5.json
@@ -1 +1 @@
-"temporary"
\ No newline at end of file
+"temporary"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_6.json b/libs/wire-api/test/golden/testObject_ClientType_user_6.json
index a6682364d45..75e6db13493 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_6.json
@@ -1 +1 @@
-"temporary"
\ No newline at end of file
+"temporary"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_7.json b/libs/wire-api/test/golden/testObject_ClientType_user_7.json
index a6682364d45..75e6db13493 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_7.json
@@ -1 +1 @@
-"temporary"
\ No newline at end of file
+"temporary"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_8.json b/libs/wire-api/test/golden/testObject_ClientType_user_8.json
index a6682364d45..75e6db13493 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_8.json
@@ -1 +1 @@
-"temporary"
\ No newline at end of file
+"temporary"
diff --git a/libs/wire-api/test/golden/testObject_ClientType_user_9.json b/libs/wire-api/test/golden/testObject_ClientType_user_9.json
index cc3c6c520d3..585db1df03f 100644
--- a/libs/wire-api/test/golden/testObject_ClientType_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ClientType_user_9.json
@@ -1 +1 @@
-"permanent"
\ No newline at end of file
+"permanent"
diff --git a/libs/wire-api/test/golden/testObject_Client_user_1.json b/libs/wire-api/test/golden/testObject_Client_user_1.json
index 485fd29d67b..3214afaac4e 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_1.json
@@ -1 +1,11 @@
-{"time":"1864-05-06T19:39:12.770Z","model":"󳇚;􇻫","id":"2","type":"permanent","class":"desktop","capabilities":{"capabilities":[]},"label":"%*"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "desktop",
+    "id": "2",
+    "label": "%*",
+    "model": "󳇚;􇻫",
+    "time": "1864-05-06T19:39:12.770Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_10.json b/libs/wire-api/test/golden/testObject_Client_user_10.json
index 8d4e645b039..98ace886b8e 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_10.json
@@ -1 +1,14 @@
-{"cookie":"L","time":"1864-05-10T18:42:04.137Z","location":{"lat":-2.6734377548386075,"lon":-1.40544074714727},"model":"\u0018","id":"0","type":"permanent","capabilities":{"capabilities":[]}}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "cookie": "L",
+    "id": "0",
+    "location": {
+        "lat": -2.6734377548386075,
+        "lon": -1.40544074714727
+    },
+    "model": "\u0018",
+    "time": "1864-05-10T18:42:04.137Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_11.json b/libs/wire-api/test/golden/testObject_Client_user_11.json
index aa134735b51..d6148975c1d 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_11.json
@@ -1 +1,16 @@
-{"cookie":"5","time":"1864-05-08T11:57:08.087Z","location":{"lat":0.44311730892815937,"lon":0.6936233843789369},"model":"ML","id":"3","type":"temporary","class":"legalhold","capabilities":{"capabilities":[]},"label":"\u001fb"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "legalhold",
+    "cookie": "5",
+    "id": "3",
+    "label": "\u001fb",
+    "location": {
+        "lat": 0.44311730892815937,
+        "lon": 0.6936233843789369
+    },
+    "model": "ML",
+    "time": "1864-05-08T11:57:08.087Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_12.json b/libs/wire-api/test/golden/testObject_Client_user_12.json
index eef9fb95c46..0609931e63f 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_12.json
@@ -1 +1,15 @@
-{"cookie":"0","time":"1864-05-08T18:44:00.378Z","location":{"lat":-2.502416826395783,"lon":1.4712334862249388},"model":"","id":"2","type":"permanent","capabilities":{"capabilities":[]},"label":""}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "cookie": "0",
+    "id": "2",
+    "label": "",
+    "location": {
+        "lat": -2.502416826395783,
+        "lon": 1.4712334862249388
+    },
+    "model": "",
+    "time": "1864-05-08T18:44:00.378Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_13.json b/libs/wire-api/test/golden/testObject_Client_user_13.json
index 62669f2484f..2eab01d9785 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_13.json
@@ -1 +1,16 @@
-{"cookie":"\u000c^󷋏","time":"1864-05-07T01:09:04.597Z","location":{"lat":-2.3798205243177692,"lon":-2.619240132398651},"model":"\u0017𐲤","id":"2","type":"permanent","class":"phone","capabilities":{"capabilities":[]},"label":"􃱽"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "phone",
+    "cookie": "\u000c^󷋏",
+    "id": "2",
+    "label": "􃱽",
+    "location": {
+        "lat": -2.3798205243177692,
+        "lon": -2.619240132398651
+    },
+    "model": "\u0017𐲤",
+    "time": "1864-05-07T01:09:04.597Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_14.json b/libs/wire-api/test/golden/testObject_Client_user_14.json
index 3ac52f48e57..4eb964907db 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_14.json
@@ -1 +1,15 @@
-{"time":"1864-05-12T11:00:10.449Z","location":{"lat":2.459582010332432,"lon":-1.2286910026214775},"model":"􀸏\r󠁨","id":"2","type":"temporary","class":"tablet","capabilities":{"capabilities":[]},"label":"x\u000e"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "tablet",
+    "id": "2",
+    "label": "x\u000e",
+    "location": {
+        "lat": 2.459582010332432,
+        "lon": -1.2286910026214775
+    },
+    "model": "􀸏\r󠁨",
+    "time": "1864-05-12T11:00:10.449Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_15.json b/libs/wire-api/test/golden/testObject_Client_user_15.json
index ab5748c5915..9dae337b828 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_15.json
@@ -1 +1,11 @@
-{"cookie":"􌨷N","time":"1864-05-08T11:28:27.778Z","model":"zAI","id":"3","type":"temporary","capabilities":{"capabilities":[]},"label":"\u0004G"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "cookie": "􌨷N",
+    "id": "3",
+    "label": "\u0004G",
+    "model": "zAI",
+    "time": "1864-05-08T11:28:27.778Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_16.json b/libs/wire-api/test/golden/testObject_Client_user_16.json
index e216def07fc..b850e39e31b 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_16.json
@@ -1 +1,12 @@
-{"cookie":"U","time":"1864-05-12T11:31:10.072Z","model":"","id":"2","type":"temporary","class":"legalhold","capabilities":{"capabilities":[]},"label":"=E"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "legalhold",
+    "cookie": "U",
+    "id": "2",
+    "label": "=E",
+    "model": "",
+    "time": "1864-05-12T11:31:10.072Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_17.json b/libs/wire-api/test/golden/testObject_Client_user_17.json
index 034aaa838f4..19dfb90c216 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_17.json
@@ -1 +1,15 @@
-{"cookie":"","time":"1864-05-12T02:25:34.770Z","location":{"lat":-1.6915872714820337,"lon":2.1128949838723656},"model":"","id":"4","type":"temporary","class":"desktop","capabilities":{"capabilities":[]}}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "desktop",
+    "cookie": "",
+    "id": "4",
+    "location": {
+        "lat": -1.6915872714820337,
+        "lon": 2.1128949838723656
+    },
+    "model": "",
+    "time": "1864-05-12T02:25:34.770Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_18.json b/libs/wire-api/test/golden/testObject_Client_user_18.json
index 6c7f06f5df6..d7342824d6f 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_18.json
@@ -1 +1,16 @@
-{"cookie":"PG:","time":"1864-05-07T17:21:05.930Z","location":{"lat":-1.2949675488134762,"lon":0.43717421775412324},"model":"􅩹","id":"1","type":"temporary","class":"legalhold","capabilities":{"capabilities":[]},"label":"󳔺"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "legalhold",
+    "cookie": "PG:",
+    "id": "1",
+    "label": "󳔺",
+    "location": {
+        "lat": -1.2949675488134762,
+        "lon": 0.43717421775412324
+    },
+    "model": "􅩹",
+    "time": "1864-05-07T17:21:05.930Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_19.json b/libs/wire-api/test/golden/testObject_Client_user_19.json
index e4c3ba8fe1b..628b6bee415 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_19.json
@@ -1 +1,15 @@
-{"time":"1864-05-12T07:49:27.999Z","location":{"lat":-1.4630309786758076,"lon":-0.5295690632216867},"model":"","id":"2","type":"permanent","class":"desktop","capabilities":{"capabilities":[]},"label":"􌇰l"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "desktop",
+    "id": "2",
+    "label": "􌇰l",
+    "location": {
+        "lat": -1.4630309786758076,
+        "lon": -0.5295690632216867
+    },
+    "model": "",
+    "time": "1864-05-12T07:49:27.999Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_2.json b/libs/wire-api/test/golden/testObject_Client_user_2.json
index d118861a2e1..1905ca5e3b0 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_2.json
@@ -1 +1,13 @@
-{"cookie":"􏬺c􄂩","time":"1864-05-07T08:48:22.537Z","location":{"lat":0.6919026326441752,"lon":1.18215529547942},"id":"1","type":"legalhold","capabilities":{"capabilities":[]}}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "cookie": "􏬺c􄂩",
+    "id": "1",
+    "location": {
+        "lat": 0.6919026326441752,
+        "lon": 1.18215529547942
+    },
+    "time": "1864-05-07T08:48:22.537Z",
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_20.json b/libs/wire-api/test/golden/testObject_Client_user_20.json
index 4217467994e..d7b5d85581b 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_20.json
@@ -1,17 +1,17 @@
 {
-    "cookie": "",
-    "time": "1864-05-06T18:43:52.483Z",
-    "location": {
-        "lat": 2.8672347564452996,
-        "lon": -0.9990390825956594
-    },
-    "id": "1",
-    "type": "legalhold",
-    "class": "phone",
     "capabilities": {
         "capabilities": [
             "legalhold-implicit-consent"
         ]
     },
-    "label": "-󼊣v"
-}
\ No newline at end of file
+    "class": "phone",
+    "cookie": "",
+    "id": "1",
+    "label": "-󼊣v",
+    "location": {
+        "lat": 2.8672347564452996,
+        "lon": -0.9990390825956594
+    },
+    "time": "1864-05-06T18:43:52.483Z",
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_3.json b/libs/wire-api/test/golden/testObject_Client_user_3.json
index 7ea430fa50e..ae3b649baf7 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_3.json
@@ -1 +1,15 @@
-{"cookie":"","time":"1864-05-07T00:38:22.384Z","location":{"lat":-0.31865405026910076,"lon":6.859482454480745e-2},"id":"1","type":"temporary","class":"legalhold","capabilities":{"capabilities":[]},"label":"pi"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "legalhold",
+    "cookie": "",
+    "id": "1",
+    "label": "pi",
+    "location": {
+        "lat": -0.31865405026910076,
+        "lon": 6.859482454480745e-2
+    },
+    "time": "1864-05-07T00:38:22.384Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_4.json b/libs/wire-api/test/golden/testObject_Client_user_4.json
index 19dab4b121f..2f4390a6520 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_4.json
@@ -1 +1,15 @@
-{"cookie":"j","time":"1864-05-06T09:13:45.902Z","location":{"lat":0.43019316470477537,"lon":-2.1994844230432533},"model":"","id":"3","type":"permanent","class":"legalhold","capabilities":{"capabilities":[]}}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "legalhold",
+    "cookie": "j",
+    "id": "3",
+    "location": {
+        "lat": 0.43019316470477537,
+        "lon": -2.1994844230432533
+    },
+    "model": "",
+    "time": "1864-05-06T09:13:45.902Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_5.json b/libs/wire-api/test/golden/testObject_Client_user_5.json
index 63593b7b014..4b59612c627 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_5.json
@@ -1 +1,15 @@
-{"cookie":"","time":"1864-05-07T09:07:14.559Z","location":{"lat":-1.505966289957799,"lon":-2.516893825541776},"model":"⌷o","id":"0","type":"temporary","class":"desktop","capabilities":{"capabilities":[]}}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "desktop",
+    "cookie": "",
+    "id": "0",
+    "location": {
+        "lat": -1.505966289957799,
+        "lon": -2.516893825541776
+    },
+    "model": "⌷o",
+    "time": "1864-05-07T09:07:14.559Z",
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_6.json b/libs/wire-api/test/golden/testObject_Client_user_6.json
index 5dbaea9e7b8..5d181c05002 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_6.json
@@ -1 +1,15 @@
-{"cookie":"l\u0002","time":"1864-05-08T22:37:53.030Z","location":{"lat":0.3764380360505919,"lon":1.3619562593325738},"model":"","id":"4","type":"permanent","class":"tablet","capabilities":{"capabilities":[]}}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "tablet",
+    "cookie": "l\u0002",
+    "id": "4",
+    "location": {
+        "lat": 0.3764380360505919,
+        "lon": 1.3619562593325738
+    },
+    "model": "",
+    "time": "1864-05-08T22:37:53.030Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_7.json b/libs/wire-api/test/golden/testObject_Client_user_7.json
index be3515d318c..d398ce42bd9 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_7.json
@@ -1 +1,11 @@
-{"time":"1864-05-07T04:35:34.201Z","model":"","id":"4","type":"permanent","class":"phone","capabilities":{"capabilities":[]},"label":""}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "phone",
+    "id": "4",
+    "label": "",
+    "model": "",
+    "time": "1864-05-07T04:35:34.201Z",
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_8.json b/libs/wire-api/test/golden/testObject_Client_user_8.json
index 5ff8579f3e4..0d86d8ff8fd 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_8.json
@@ -1 +1,16 @@
-{"cookie":"\u0015p`","time":"1864-05-11T06:32:01.921Z","location":{"lat":0.8626148594727595,"lon":-1.971023301844283},"model":"􏽉","id":"4","type":"legalhold","class":"phone","capabilities":{"capabilities":[]},"label":""}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "phone",
+    "cookie": "\u0015p`",
+    "id": "4",
+    "label": "",
+    "location": {
+        "lat": 0.8626148594727595,
+        "lon": -1.971023301844283
+    },
+    "model": "􏽉",
+    "time": "1864-05-11T06:32:01.921Z",
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_Client_user_9.json b/libs/wire-api/test/golden/testObject_Client_user_9.json
index d636494db93..be632d81323 100644
--- a/libs/wire-api/test/golden/testObject_Client_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Client_user_9.json
@@ -1 +1,16 @@
-{"cookie":"G","time":"1864-05-08T03:54:56.526Z","location":{"lat":-0.3086524641730466,"lon":1.72690152811777},"model":"㌀m","id":"1","type":"legalhold","class":"legalhold","capabilities":{"capabilities":[]},"label":"v"}
\ No newline at end of file
+{
+    "capabilities": {
+        "capabilities": []
+    },
+    "class": "legalhold",
+    "cookie": "G",
+    "id": "1",
+    "label": "v",
+    "location": {
+        "lat": -0.3086524641730466,
+        "lon": 1.72690152811777
+    },
+    "model": "㌀m",
+    "time": "1864-05-08T03:54:56.526Z",
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_1.json b/libs/wire-api/test/golden/testObject_ColourId_user_1.json
index 103aca2fcc4..6c6b340a51b 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_1.json
@@ -1 +1 @@
--7404
\ No newline at end of file
+-7404
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_10.json b/libs/wire-api/test/golden/testObject_ColourId_user_10.json
index cbb24e67b07..37633af4b4e 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_10.json
@@ -1 +1 @@
--30132
\ No newline at end of file
+-30132
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_11.json b/libs/wire-api/test/golden/testObject_ColourId_user_11.json
index 0c47a74254f..e76965a3754 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_11.json
@@ -1 +1 @@
--28959
\ No newline at end of file
+-28959
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_12.json b/libs/wire-api/test/golden/testObject_ColourId_user_12.json
index a04a7b724f8..91b25d7db9f 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_12.json
@@ -1 +1 @@
-19133
\ No newline at end of file
+19133
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_13.json b/libs/wire-api/test/golden/testObject_ColourId_user_13.json
index cf6d4e904c2..93b388470f0 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_13.json
@@ -1 +1 @@
--27443
\ No newline at end of file
+-27443
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_14.json b/libs/wire-api/test/golden/testObject_ColourId_user_14.json
index 1590b264ad5..f4b0fbf114d 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_14.json
@@ -1 +1 @@
--19025
\ No newline at end of file
+-19025
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_15.json b/libs/wire-api/test/golden/testObject_ColourId_user_15.json
index d6565c4a7b5..9af3bbf115e 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_15.json
@@ -1 +1 @@
--9638
\ No newline at end of file
+-9638
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_16.json b/libs/wire-api/test/golden/testObject_ColourId_user_16.json
index e26a1a3a675..26fc75a8d1a 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_16.json
@@ -1 +1 @@
--13889
\ No newline at end of file
+-13889
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_17.json b/libs/wire-api/test/golden/testObject_ColourId_user_17.json
index 4e35d696955..43352ce1b5d 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_17.json
@@ -1 +1 @@
-31293
\ No newline at end of file
+31293
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_18.json b/libs/wire-api/test/golden/testObject_ColourId_user_18.json
index 5e8414505ab..f38f83bd94b 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_18.json
@@ -1 +1 @@
--10194
\ No newline at end of file
+-10194
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_19.json b/libs/wire-api/test/golden/testObject_ColourId_user_19.json
index c9b3caad81e..9ca5b4d9ead 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_19.json
@@ -1 +1 @@
-31286
\ No newline at end of file
+31286
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_2.json b/libs/wire-api/test/golden/testObject_ColourId_user_2.json
index 09c6c9a19ff..395845bf64d 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_2.json
@@ -1 +1 @@
-27569
\ No newline at end of file
+27569
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_20.json b/libs/wire-api/test/golden/testObject_ColourId_user_20.json
index 72883d5131b..29723fb65f2 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_20.json
@@ -1 +1 @@
--7467
\ No newline at end of file
+-7467
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_3.json b/libs/wire-api/test/golden/testObject_ColourId_user_3.json
index c28daf08e20..f8ed81f01e2 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_3.json
@@ -1 +1 @@
-4183
\ No newline at end of file
+4183
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_4.json b/libs/wire-api/test/golden/testObject_ColourId_user_4.json
index 5404a33b424..527c9fa8458 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_4.json
@@ -1 +1 @@
-31095
\ No newline at end of file
+31095
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_5.json b/libs/wire-api/test/golden/testObject_ColourId_user_5.json
index 1e863f00d3c..1a775d09e82 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_5.json
@@ -1 +1 @@
--14835
\ No newline at end of file
+-14835
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_6.json b/libs/wire-api/test/golden/testObject_ColourId_user_6.json
index e45a74e643e..c340a93c948 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_6.json
@@ -1 +1 @@
-4611
\ No newline at end of file
+4611
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_7.json b/libs/wire-api/test/golden/testObject_ColourId_user_7.json
index 949e86bfa4b..8f69581fff7 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_7.json
@@ -1 +1 @@
-21595
\ No newline at end of file
+21595
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_8.json b/libs/wire-api/test/golden/testObject_ColourId_user_8.json
index b08509baf47..e34aaf76df3 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_8.json
@@ -1 +1 @@
-23554
\ No newline at end of file
+23554
diff --git a/libs/wire-api/test/golden/testObject_ColourId_user_9.json b/libs/wire-api/test/golden/testObject_ColourId_user_9.json
index a8eddd42144..25a3e397c80 100644
--- a/libs/wire-api/test/golden/testObject_ColourId_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ColourId_user_9.json
@@ -1 +1 @@
--16722
\ No newline at end of file
+-16722
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_1.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_1.json
index 625698be6fa..1a75044d53d 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_1.json
@@ -1,5 +1,5 @@
 {
+    "code": "W0CLFxLOL",
     "key": "Cd9b4n7KaooqOhOciMIf",
-    "password": "󷏋􏣑顴5𩋧𩒭rs𖼢4wo~󴱁l=󻽗㋲\u000f1nt谴􀤉N떧>?\"\u0007T𑂖\u001fgg\\f\u0016𨔀#tS\u00158\u0011C轜q\r!2d\u0014𮎹m\u001a\u0007\\V'W\\𛃩,\r𣀦?\u0006x\u0007gVQy9\u000f3'h]𓍵n0ue\u0008󼇷?@\u00171zJ6\u0000I\u0007;DL\u0005邎c𖧽\u001f\u0017z􋴹?0\u0000𭅑\"A&&軡E𦟻\u001f7fG􇿪VpxI'􍐟\u0010󶎷g,\u0000H\u0012@+􈹩􃵻\u0014􊙲\u0002J􍖈dPQ\u0002|\u00049^9_󼚮\u000e]\u0007󹫛Of'd\u0016\"^\u0004w􆅫_􏵠\u0010}𗖐\u0011s5𧠻N1􇘎RkTZ&𤪅X􄆔~''v{4MDK𥥶\u001f\u0001|oB𣃴'q,HU󺔚\u001a\u0000􂺇+%~v𗸽V|5🏇|󴁊􂦗HTFhF\u001cdelLB\u0018\u001abiC󺻇\n𛆀u}g!隌M𢣂󽖟Pt$2(W%𤙖0i-H\u001a@ii󽓝\u00152ੌhg욺漍#{岑\u000e\u0000𣴛\u000c\u000c󽮉A\u001d:\u0004]𘗉qf\u0001'x𢄎\u0016\u000c\u0010\nT𤝊sK5O\u0004\u0016^&3\u000ef!𤷀\u001d\u0016\u000c􏡻wy􀽷􊥡󿊜\u0016\u0006ijjq&\u001e\"\u0012􃰃e🟩\u0003-\\\u0012E\u0003鵀馎Z\u0013噄iD7Xv𡜰m\u001a>~\u0018W𡽥脍YYZE󹢊J|ᑿ\u0018.𡣝p󶿹\u0003S:Y<.YBcP筹􎜕v4U\u000c󱉼􅐬W!9Z󼶪;􎉊\u0010𠐅\u0001(kH\u001a\"\u000bdX𡘉⩕x𥵄6/b$A\"jH𠦢뻥9\u0013,𣋘􊤋{\u0012ハ&>󾁍",
-    "code": "W0CLFxLOL"
-}
\ No newline at end of file
+    "password": "󷏋􏣑顴5𩋧𩒭rs𖼢4wo~󴱁l=󻽗㋲\u000f1nt谴􀤉N떧>?\"\u0007T𑂖\u001fgg\\f\u0016𨔀#tS\u00158\u0011C轜q\r!2d\u0014𮎹m\u001a\u0007\\V'W\\𛃩,\r𣀦?\u0006x\u0007gVQy9\u000f3'h]𓍵n0ue\u0008󼇷?@\u00171zJ6\u0000I\u0007;DL\u0005邎c𖧽\u001f\u0017z􋴹?0\u0000𭅑\"A&&軡E𦟻\u001f7fG􇿪VpxI'􍐟\u0010󶎷g,\u0000H\u0012@+􈹩􃵻\u0014􊙲\u0002J􍖈dPQ\u0002|\u00049^9_󼚮\u000e]\u0007󹫛Of'd\u0016\"^\u0004w􆅫_􏵠\u0010}𗖐\u0011s5𧠻N1􇘎RkTZ&𤪅X􄆔~''v{4MDK𥥶\u001f\u0001|oB𣃴'q,HU󺔚\u001a\u0000􂺇+%~v𗸽V|5🏇|󴁊􂦗HTFhF\u001cdelLB\u0018\u001abiC󺻇\n𛆀u}g!隌M𢣂󽖟Pt$2(W%𤙖0i-H\u001a@ii󽓝\u00152ੌhg욺漍#{岑\u000e\u0000𣴛\u000c\u000c󽮉A\u001d:\u0004]𘗉qf\u0001'x𢄎\u0016\u000c\u0010\nT𤝊sK5O\u0004\u0016^&3\u000ef!𤷀\u001d\u0016\u000c􏡻wy􀽷􊥡󿊜\u0016\u0006ijjq&\u001e\"\u0012􃰃e🟩\u0003-\\\u0012E\u0003鵀馎Z\u0013噄iD7Xv𡜰m\u001a>~\u0018W𡽥脍YYZE󹢊J|ᑿ\u0018.𡣝p󶿹\u0003S:Y<.YBcP筹􎜕v4U\u000c󱉼􅐬W!9Z󼶪;􎉊\u0010𠐅\u0001(kH\u001a\"\u000bdX𡘉⩕x𥵄6/b$A\"jH𠦢뻥9\u0013,𣋘􊤋{\u0012ハ&>󾁍"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_10.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_10.json
index 13e4c511e85..7fbac2300aa 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_10.json
@@ -1,5 +1,5 @@
 {
+    "code": "BBwqW3",
     "key": "Myzdj2g7NTl0ppCPXiN1",
-    "password": "\u001b.笠\u0016🙫􉎲0EI웎􂠂A\nyﻏ􊦬~\u0018;p",
-    "code": "BBwqW3"
-}
\ No newline at end of file
+    "password": "\u001b.笠\u0016🙫􉎲0EI웎􂠂A\nyﻏ􊦬~\u0018;p"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_11.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_11.json
index b8808610312..f3af2b66af7 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_11.json
@@ -1,5 +1,5 @@
 {
+    "code": "5BuwQHalK",
     "key": "nQSYG43lVn8kYS-MPtOO",
-    "password": "󿌢k󺪾)t\u0000㳀jgI\u0017P\u000e𮅂𤁅􄙬G髊jb\u000c`\nTq+Ut𖣉江UBpVU 󲚗f9劓󹂛1hYp9Ja𣺼EBN\u0013t@􇝪i;P󾠍𫼨8a􊜯T𦳨V𡳐\u000f䨉fx⭏d:\u000e\\􁣼?b\u0015Ktz\u001d􍨗颛\n􆐞3\u0001󺚳\r87\u00059@ᕟY\u001b⳥O󿐯\u0017⤶󽖌$Fph\u001f9\u0017e\u000cC伱%>\u001fP@\u0002o蕀h*󾣕􍨮󱆪Eꟸ⬌緥Ft{A=零#k\u0016𭘟Fi𘙇>&oy𘅢\u000c_􌘈YIL𐄣2𭄇􃦶v3\u001e\u0014泍T𢟑S󿼗\u0015K𤩉1Y􂧬\u0000k\u0010y􄬕𧭕𖨈B𓐪 of ,",
-    "code": "5BuwQHalK"
-}
\ No newline at end of file
+    "password": "󿌢k󺪾)t\u0000㳀jgI\u0017P\u000e𮅂𤁅􄙬G髊jb\u000c`\nTq+Ut𖣉江UBpVU 󲚗f9劓󹂛1hYp9Ja𣺼EBN\u0013t@􇝪i;P󾠍𫼨8a􊜯T𦳨V𡳐\u000f䨉fx⭏d:\u000e\\􁣼?b\u0015Ktz\u001d􍨗颛\n􆐞3\u0001󺚳\r87\u00059@ᕟY\u001b⳥O󿐯\u0017⤶󽖌$Fph\u001f9\u0017e\u000cC伱%>\u001fP@\u0002o蕀h*󾣕􍨮󱆪Eꟸ⬌緥Ft{A=零#k\u0016𭘟Fi𘙇>&oy𘅢\u000c_􌘈YIL𐄣2𭄇􃦶v3\u001e\u0014泍T𢟑S󿼗\u0015K𤩉1Y􂧬\u0000k\u0010y􄬕𧭕𖨈B𓐪 of ,"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_12.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_12.json
index b8fa8847853..7e81ace0800 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_12.json
@@ -1,5 +1,5 @@
 {
+    "code": "sj64oWB",
     "key": "NeuDtdyLCvq11nGkkEal",
-    "password": "an-<\r\u001ba$\n\u0001𤭓@, daTW󾇬􉒱󶔤O\u0007𪞠􊀥𭬻E=󼓿\u000b𢯝l\u001b\u0006\u0006𐠠g>h(;󰆌\u0005N:d᪓R\u0016$<;䚳:@\u000cWrO𝉅\\\u0001E\u0000X\u000fL&Qc𣆻\u0006Kx+K\u001cF\u001f󸨯\n:\\\u0001~a𣼷𓐔\u001e\u0013Jr0c5󵒧88󿽿(m󸪩e-cWRQ`N􊝾🅻+i?\u0011𪄳(􇞽󹙦󹷷􋙺\u0000zNO\"hq\u0015%𤕙|ℯA𩵅>󹲱\u0000*𣖍\u0008􋮗6\ty􈷔􎇄9󲈑4햊󲩵69𮃂𓎰/\u0019ర\u0016X𧎨􊼫e􌵔!(|\u0004𬈝C㬄\u001dj𒁋\t@\rsQ{ZZ-嚚\u0017_\u0019&6#\u0008sD\u000b\n\td𒊦D錅9𑲲󷼆3\u0015N󻃕Fnk\u0005&\u00043Q&涋Ys𗶯H𬛝󳺻돂5VB󾽆I+􍩀7fㅣ𠥽]\r '𧼧\u0016mbE󷹉\n2?HK@\u0010\u0013\u0013󹷀Z(\u0014\u000e\u0010k{r6%*󼠮\u0004M=/\u0002󼺊&4􌊚\u0008)TI}󳴼[+2\u0019V\u00010h\u000b䟬@\u0008QZG\u001d_󳾱Cim\u0014)m󹙪\u001eP峩zv쒊󵣊mi\u0011𘧯󾧺\u001fC-zT\u000fQY^;f\u0000\u001b畖N𖮌\u0001\u0010T󽨼I\u0011𭳩n\u0013\u0018\\\r&<\u00015𑗎󺱑X􊨴mF#h/{\u0010!(㽊3\u001b縛𭙳[h}I􅦭:𬯽R/󵎝𢏡#\"󻍉\u000b𫒱_m𡯫(\u0001%^􍿑[󼬌RF\u0018􁡆希\u0011\u001c\u0000𑧊\u0002\u0006d\u0003>#qn\u0016w=}󴠺𫏻&^\u0000$BP%5ൺ𫱓\u0010\u0017\u0016{y袷􏿃\u0015:䌸na𠬋󷪞c􎋂NDB𧄜㮲uꭾXpr*#𪊡\u0007\u001a𮇐󺧧F$\u00052\u0017B?Q'asS\u001b𗥇\u0010\u0010󷊟e?\u000c\u0002T􋱮Q{\u0013R\u0018􄅈$􆏖j\u000f𡁉3󼵂􆅹ꧥ9ecd2\u0003𢂧@Pvv𞄋𦙤q\r􊝛<H-;\u0008\u001d\u0000􁄻ma鵐Yg􂐑􁌀@;W\u001f-🧶8P\u001b*@g𩃷\n𓆉ᮅE/\u0014󰲢jD&[@+AIx怭-S\t􀎥\u001f",
-    "code": "sj64oWB"
-}
\ No newline at end of file
+    "password": "an-<\r\u001ba$\n\u0001𤭓@, daTW󾇬􉒱󶔤O\u0007𪞠􊀥𭬻E=󼓿\u000b𢯝l\u001b\u0006\u0006𐠠g>h(;󰆌\u0005N:d᪓R\u0016$<;䚳:@\u000cWrO𝉅\\\u0001E\u0000X\u000fL&Qc𣆻\u0006Kx+K\u001cF\u001f󸨯\n:\\\u0001~a𣼷𓐔\u001e\u0013Jr0c5󵒧88󿽿(m󸪩e-cWRQ`N􊝾🅻+i?\u0011𪄳(􇞽󹙦󹷷􋙺\u0000zNO\"hq\u0015%𤕙|ℯA𩵅>󹲱\u0000*𣖍\u0008􋮗6\ty􈷔􎇄9󲈑4햊󲩵69𮃂𓎰/\u0019ర\u0016X𧎨􊼫e􌵔!(|\u0004𬈝C㬄\u001dj𒁋\t@\rsQ{ZZ-嚚\u0017_\u0019&6#\u0008sD\u000b\n\td𒊦D錅9𑲲󷼆3\u0015N󻃕Fnk\u0005&\u00043Q&涋Ys𗶯H𬛝󳺻돂5VB󾽆I+􍩀7fㅣ𠥽]\r '𧼧\u0016mbE󷹉\n2?HK@\u0010\u0013\u0013󹷀Z(\u0014\u000e\u0010k{r6%*󼠮\u0004M=/\u0002󼺊&4􌊚\u0008)TI}󳴼[+2\u0019V\u00010h\u000b䟬@\u0008QZG\u001d_󳾱Cim\u0014)m󹙪\u001eP峩zv쒊󵣊mi\u0011𘧯󾧺\u001fC-zT\u000fQY^;f\u0000\u001b畖N𖮌\u0001\u0010T󽨼I\u0011𭳩n\u0013\u0018\\\r&<\u00015𑗎󺱑X􊨴mF#h/{\u0010!(㽊3\u001b縛𭙳[h}I􅦭:𬯽R/󵎝𢏡#\"󻍉\u000b𫒱_m𡯫(\u0001%^􍿑[󼬌RF\u0018􁡆希\u0011\u001c\u0000𑧊\u0002\u0006d\u0003>#qn\u0016w=}󴠺𫏻&^\u0000$BP%5ൺ𫱓\u0010\u0017\u0016{y袷􏿃\u0015:䌸na𠬋󷪞c􎋂NDB𧄜㮲uꭾXpr*#𪊡\u0007\u001a𮇐󺧧F$\u00052\u0017B?Q'asS\u001b𗥇\u0010\u0010󷊟e?\u000c\u0002T􋱮Q{\u0013R\u0018􄅈$􆏖j\u000f𡁉3󼵂􆅹ꧥ9ecd2\u0003𢂧@Pvv𞄋𦙤q\r􊝛<H-;\u0008\u001d\u0000􁄻ma鵐Yg􂐑􁌀@;W\u001f-🧶8P\u001b*@g𩃷\n𓆉ᮅE/\u0014󰲢jD&[@+AIx怭-S\t􀎥\u001f"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_13.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_13.json
index d6062d02bfd..c0d96f37c5b 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_13.json
@@ -1,5 +1,5 @@
 {
+    "code": "eBfsdKsok0a",
     "key": "4b48rrAxwAV84s13Xtv5",
-    "password": "f󵓧#MW\u000b牷􊙗PO\u000e󹐜T\u0011&/fR,#a􎵓󵞛6\t\u001e􄺐\"\u0017\u0000󰎂ឥ\u000f\u0019s\rଽ𬝦`M;W~%䱭&XKO\u0003H􅰜𬐑\u0001>􀷉宂𭗥􌑺,[a%􉞳\"RLOU竴V􂸪K\u0015\u0004𫾏S\"Wes\u0006H415𓎏-S\u001a\u0014h:d󽁩NZ\t󾮴m𨲋i& 􎜩`dP4/\u0014Q\u0003팝B%𭤀0;Nb1\u0011\u00049\u000e.󷬳𭪆q\u001b􇍓f\u0003ﱜH􂶁\u000bY\u001e󿒚\u0010C𫴎\u0007\u0015Ww\u0005󼸩[3^3B𥨒\"_\nPK􆺞{\u0006\u0003O\u0010r\u000fvc=+af\u000e\u0006􍁖𨹴\u0002@\u001dQ󶼨s\u0017^c\u0018wJY$􎞃s\u0011Gs􀊘\u0014\u0015𩱈k\u001f\u0017|􄅪\u0019󼳕tJ(􆝫ڗxc\u0008􂀾q.蔳7\u0015F󹲽\u0013C\u0007𪄞S][\u0011:\u0006朶qL󽭩2\u0019꼅\u0003?NG|x􄂰>/Iz􃌑ms\u001f\u000f󵝖𠁑𦾳3\u0015􀃄󳠱nd\tv4\u0012􇭬􌿚\u000b1Iw􀗕\u000b}?1m^\u00025#V𣹔􃤄w\u0004#󻠀𣧜\u000c\u0012𠌀ឱ\u001c8O\u0000S\u001b󼛳X8N𢲒󾉮.\u0003𧵭\u0006\u0012\u001e2\u001dr\u0019V\nK\u0000\u0011󸲆畔_W┅\u0001􋍉/ƈ僒𧁨𬒋\u0019\u000bGDR𭺎\u00012G0{\u001c􈭐JX)𮈶SE𫈗B􊃱\u001f𠔲&\u0016g\"ݮUCP􁣹􎉳􎁱YU\u0004i+,?𣺃󾹶󻌟􏏁󸏊􎉴\u00121𭧺􋛒L󻡮󳤕󳵁\u0016c'\u001bp[\u0002\u0004N\u00178^󹓁Bk\u0008\t[",
-    "code": "eBfsdKsok0a"
-}
\ No newline at end of file
+    "password": "f󵓧#MW\u000b牷􊙗PO\u000e󹐜T\u0011&/fR,#a􎵓󵞛6\t\u001e􄺐\"\u0017\u0000󰎂ឥ\u000f\u0019s\rଽ𬝦`M;W~%䱭&XKO\u0003H􅰜𬐑\u0001>􀷉宂𭗥􌑺,[a%􉞳\"RLOU竴V􂸪K\u0015\u0004𫾏S\"Wes\u0006H415𓎏-S\u001a\u0014h:d󽁩NZ\t󾮴m𨲋i& 􎜩`dP4/\u0014Q\u0003팝B%𭤀0;Nb1\u0011\u00049\u000e.󷬳𭪆q\u001b􇍓f\u0003ﱜH􂶁\u000bY\u001e󿒚\u0010C𫴎\u0007\u0015Ww\u0005󼸩[3^3B𥨒\"_\nPK􆺞{\u0006\u0003O\u0010r\u000fvc=+af\u000e\u0006􍁖𨹴\u0002@\u001dQ󶼨s\u0017^c\u0018wJY$􎞃s\u0011Gs􀊘\u0014\u0015𩱈k\u001f\u0017|􄅪\u0019󼳕tJ(􆝫ڗxc\u0008􂀾q.蔳7\u0015F󹲽\u0013C\u0007𪄞S][\u0011:\u0006朶qL󽭩2\u0019꼅\u0003?NG|x􄂰>/Iz􃌑ms\u001f\u000f󵝖𠁑𦾳3\u0015􀃄󳠱nd\tv4\u0012􇭬􌿚\u000b1Iw􀗕\u000b}?1m^\u00025#V𣹔􃤄w\u0004#󻠀𣧜\u000c\u0012𠌀ឱ\u001c8O\u0000S\u001b󼛳X8N𢲒󾉮.\u0003𧵭\u0006\u0012\u001e2\u001dr\u0019V\nK\u0000\u0011󸲆畔_W┅\u0001􋍉/ƈ僒𧁨𬒋\u0019\u000bGDR𭺎\u00012G0{\u001c􈭐JX)𮈶SE𫈗B􊃱\u001f𠔲&\u0016g\"ݮUCP􁣹􎉳􎁱YU\u0004i+,?𣺃󾹶󻌟􏏁󸏊􎉴\u00121𭧺􋛒L󻡮󳤕󳵁\u0016c'\u001bp[\u0002\u0004N\u00178^󹓁Bk\u0008\t["
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_14.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_14.json
index 5a0090c6a61..e00e9abcedd 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_14.json
@@ -1,5 +1,5 @@
 {
+    "code": "emsaYZVuPvQ1U",
     "key": "4hqO6D9=V3BKXLXcLie2",
-    "password": "󻅐Q~ἍF+9Dc7󺠺jl\u000fC?xdB\u0005x蓉\u0003\u001dj/^#NS}fiO𝌆At>\u001dh0U`\r\u0007V\u001f􏠕_v蒼w\u0005𬻶8⸷󼋾}e\u0003i\u0000RC-- 鋏Xd\u0005\u0007n/,?\u001a\u001a􄓰ꕘgQ`𑋴ꏧ󷑆Q\u001f\u0017𭄛&LR𤤽>󷅁tRg",
-    "code": "emsaYZVuPvQ1U"
-}
\ No newline at end of file
+    "password": "󻅐Q~ἍF+9Dc7󺠺jl\u000fC?xdB\u0005x蓉\u0003\u001dj/^#NS}fiO𝌆At>\u001dh0U`\r\u0007V\u001f􏠕_v蒼w\u0005𬻶8⸷󼋾}e\u0003i\u0000RC-- 鋏Xd\u0005\u0007n/,?\u001a\u001a􄓰ꕘgQ`𑋴ꏧ󷑆Q\u001f\u0017𭄛&LR𤤽>󷅁tRg"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_15.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_15.json
index b560d56ea48..38a92e3227f 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_15.json
@@ -1,5 +1,5 @@
 {
+    "code": "K_xVBcX5bLpjvL",
     "key": "bbFHebGp6h_3F4QpSrud",
-    "password": "\u0017椎'\u000cd3E𝖩󻗅􃿖Y\r􍪝H~4aF㻯&&\u001f􈹴􉊁KtୀXoS\r\u0010\u0000󿀝\u000b󰅚q𬨧􆩃𤒊N=􃜭󵊶R.\\\t6!E𨇭\u001d_$F\u0002\u0014l#!\u0017\u0013+􇍞P_󽕻\u001d󵅇~HhsY󶒱\u0018'󳍈wy\u001bA􋲭2𩣋􂸼\u0001O\u001a\u0017c\t􊑖ud󽘼\u0018~𪐻􋪑\rB7􀑚o\u0010􋘖fL󳕗\u0003i_=\u0007\u0016LE}<􎐖\u0007El싙\u000b.6H\u0018w󳉌ZH𫀲삯䩫o1?􄀮!W\u0010Y@!􂖗S`mq㫯𧚐𨺞\u00078🌔~rLꀰ𩼃\u0013[󱨒K\u000e\u0017𥓗$jRxH\u0016m􆴵\u0010𩛅'\u0019/xd촮𗒴8\u001b险6bYZ%𢅒光讴~𑲔SG􆩁`0pL.𭔧4f`7\u0013􏳹*\u000b/T𫾨C􏑿Z\u001aZ껿\u0011@\\􂹸2\u0004⭱K󽰃||\u0011h]3&\u0010Y]\u001dk \u0004\u0001U𧠽.\u0010k_𠦫O󾒸h􈠜{ﰔ\u0007w\u00033Kꁑl􅇸\u0007=\u0004𥐏\"\u000cyH𓅓\u0001/L09𤢰\u0010vw:\u0017O􄙦%#(Js𩝵'9s_&9肭m𤡗$󹜠N󰑜WE\u0014=y$=3􈚐唹<\t\th􉜚\u0015x/󴅷V)\u0002𬬺􆋒BI)\\gk2I]#l\u0015Pn$𪆢\u0003&\u0011;\u001dY\u0019O𬉳\u0017􋠪d\u001b6𤹛}$𪲭\u0015ajf<Y֟\u0013𪖨o􏶑􆏙p쬵S`v\"f󺂺ᐩ⻱纾)⅘󱗊[R\u001fw\u0007jR5􋴒􃫇􁹊\u0017𥦲mU9-􆻩QYX?\u0004)\u0007쳥\u0011/}\u000esG5\u0002𪟅󴪘M&󾚉\\󵅦􆼩\u0008􄘑󹖚E󸐑d􏙸𥩠\u0000𗲖S",
-    "code": "K_xVBcX5bLpjvL"
-}
\ No newline at end of file
+    "password": "\u0017椎'\u000cd3E𝖩󻗅􃿖Y\r􍪝H~4aF㻯&&\u001f􈹴􉊁KtୀXoS\r\u0010\u0000󿀝\u000b󰅚q𬨧􆩃𤒊N=􃜭󵊶R.\\\t6!E𨇭\u001d_$F\u0002\u0014l#!\u0017\u0013+􇍞P_󽕻\u001d󵅇~HhsY󶒱\u0018'󳍈wy\u001bA􋲭2𩣋􂸼\u0001O\u001a\u0017c\t􊑖ud󽘼\u0018~𪐻􋪑\rB7􀑚o\u0010􋘖fL󳕗\u0003i_=\u0007\u0016LE}<􎐖\u0007El싙\u000b.6H\u0018w󳉌ZH𫀲삯䩫o1?􄀮!W\u0010Y@!􂖗S`mq㫯𧚐𨺞\u00078🌔~rLꀰ𩼃\u0013[󱨒K\u000e\u0017𥓗$jRxH\u0016m􆴵\u0010𩛅'\u0019/xd촮𗒴8\u001b险6bYZ%𢅒光讴~𑲔SG􆩁`0pL.𭔧4f`7\u0013􏳹*\u000b/T𫾨C􏑿Z\u001aZ껿\u0011@\\􂹸2\u0004⭱K󽰃||\u0011h]3&\u0010Y]\u001dk \u0004\u0001U𧠽.\u0010k_𠦫O󾒸h􈠜{ﰔ\u0007w\u00033Kꁑl􅇸\u0007=\u0004𥐏\"\u000cyH𓅓\u0001/L09𤢰\u0010vw:\u0017O􄙦%#(Js𩝵'9s_&9肭m𤡗$󹜠N󰑜WE\u0014=y$=3􈚐唹<\t\th􉜚\u0015x/󴅷V)\u0002𬬺􆋒BI)\\gk2I]#l\u0015Pn$𪆢\u0003&\u0011;\u001dY\u0019O𬉳\u0017􋠪d\u001b6𤹛}$𪲭\u0015ajf<Y֟\u0013𪖨o􏶑􆏙p쬵S`v\"f󺂺ᐩ⻱纾)⅘󱗊[R\u001fw\u0007jR5􋴒􃫇􁹊\u0017𥦲mU9-􆻩QYX?\u0004)\u0007쳥\u0011/}\u000esG5\u0002𪟅󴪘M&󾚉\\󵅦􆼩\u0008􄘑󹖚E󸐑d􏙸𥩠\u0000𗲖S"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_16.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_16.json
index 23e343671db..a8a41086c17 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_16.json
@@ -1,5 +1,5 @@
 {
+    "code": "JRb0=pLR6I3a9YN8jH",
     "key": "kMY9Yz6qKv_aDoeJTELh",
-    "password": "󻓮~IpB𘦣@󺾱x}𘑱􌂘ꥃ`\u000b\u0001sg󳁇󺰡 /oO(\u000e깻k\u001d&H^󼵋 \u0018󷋻Ztl\u0008hR\u000f\u0004🤴v\tF\u0019\u0004\u0005뺿 \u0012y􊔺T\u001b𓁠^\u001a#ꒋ󾛵tٙ󸰝\tNR\u0011 .e\u0006袺\u001c\u001en#j\u0018*\u0016\u001c1耥0 #𪝑E\u0016\u0018Hj'\u0014D􌊷kFo鷵#IK\u000br􊉸$\u000cw􊠸3􈠙Eu𭎸嬦\u0017𩊷@e-@\u001d2%/􋎅\u0007\u0016⸱m\t\u0019Nj𫵱X𨪻𮎵Y<󺨤Jm\u0007J􏳯D$v𣸃@jX*􀖷\u0006𤩿쵴[XE󶋓\u0000󿬫\u0010\u0019V\u0005%*4􉚰\u000f\u001f,Hr\ta\"󳍛\u0018\u001f춴𗮴𥫩{CS$\u001d4\u00052\u0005鲂𡴲\u000c􌹬_o􍮲\u0005썫#󵳸𣧴?&\u0004FOk\u0015褅𛀷􁲕𭻘\u0007\nc􌦪􋏗󻧀\u00067d\u0003\u0002V􋬚?/6Yz㿮7󺮲\u0018𧼯𭆴`\u000c,$𦳺,AN\"V&i\u001aH\u0006󾇒􍪸6\u001drPS󸕥􆘐\u000e=\u00046paA\u001f%\n󹄢󺠶\u0000\u0017k\u000b&󴔿\u001e:_\u0016T\u001cRM!\u0010\u001eRU1B靔4*\u0008r腐s<2\u0011\u0017 􍋣_H𘗞𤺧s\u0008𢎾b􉫜\n+np~l􀾑'<𒌶𤲛ru`\u001d󰜫𧦬\u001f\u0018\\뾤f\t(\u0015\u0001㴞𨼻]T<󼐯w<\u0004d>􋄢v𭆍 \u0006a!\u000b𨩷\u0004S󷉹'𥥡j􌇻\u0004\u001cE􃍡􁂠#5Zg=𩿬ጓ𐇭<W\u0005ae󺎕\u001b􆍁y?'hi珮9\u001c􎿘恉.Pg􅽫P2밻El\u0019c6Q骲緤􏜣bpD𫌓Cc􍱜󼪮􊙱\u001d𨛁\u001fB\u0002\u0013:󸡴 𑿇)r􋭆*+2竿\u0018\u0014\u0012􊅼浂&𑨛𥘏8󸉰D􎠒*󵅥7J[:Cyd\u0004\u0012-朝5a𫈷O",
-    "code": "JRb0=pLR6I3a9YN8jH"
-}
\ No newline at end of file
+    "password": "󻓮~IpB𘦣@󺾱x}𘑱􌂘ꥃ`\u000b\u0001sg󳁇󺰡 /oO(\u000e깻k\u001d&H^󼵋 \u0018󷋻Ztl\u0008hR\u000f\u0004🤴v\tF\u0019\u0004\u0005뺿 \u0012y􊔺T\u001b𓁠^\u001a#ꒋ󾛵tٙ󸰝\tNR\u0011 .e\u0006袺\u001c\u001en#j\u0018*\u0016\u001c1耥0 #𪝑E\u0016\u0018Hj'\u0014D􌊷kFo鷵#IK\u000br􊉸$\u000cw􊠸3􈠙Eu𭎸嬦\u0017𩊷@e-@\u001d2%/􋎅\u0007\u0016⸱m\t\u0019Nj𫵱X𨪻𮎵Y<󺨤Jm\u0007J􏳯D$v𣸃@jX*􀖷\u0006𤩿쵴[XE󶋓\u0000󿬫\u0010\u0019V\u0005%*4􉚰\u000f\u001f,Hr\ta\"󳍛\u0018\u001f춴𗮴𥫩{CS$\u001d4\u00052\u0005鲂𡴲\u000c􌹬_o􍮲\u0005썫#󵳸𣧴?&\u0004FOk\u0015褅𛀷􁲕𭻘\u0007\nc􌦪􋏗󻧀\u00067d\u0003\u0002V􋬚?/6Yz㿮7󺮲\u0018𧼯𭆴`\u000c,$𦳺,AN\"V&i\u001aH\u0006󾇒􍪸6\u001drPS󸕥􆘐\u000e=\u00046paA\u001f%\n󹄢󺠶\u0000\u0017k\u000b&󴔿\u001e:_\u0016T\u001cRM!\u0010\u001eRU1B靔4*\u0008r腐s<2\u0011\u0017 􍋣_H𘗞𤺧s\u0008𢎾b􉫜\n+np~l􀾑'<𒌶𤲛ru`\u001d󰜫𧦬\u001f\u0018\\뾤f\t(\u0015\u0001㴞𨼻]T<󼐯w<\u0004d>􋄢v𭆍 \u0006a!\u000b𨩷\u0004S󷉹'𥥡j􌇻\u0004\u001cE􃍡􁂠#5Zg=𩿬ጓ𐇭<W\u0005ae󺎕\u001b􆍁y?'hi珮9\u001c􎿘恉.Pg􅽫P2밻El\u0019c6Q骲緤􏜣bpD𫌓Cc􍱜󼪮􊙱\u001d𨛁\u001fB\u0002\u0013:󸡴 𑿇)r􋭆*+2竿\u0018\u0014\u0012􊅼浂&𑨛𥘏8󸉰D􎠒*󵅥7J[:Cyd\u0004\u0012-朝5a𫈷O"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_17.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_17.json
index 8e0bb96c2a9..1264f994dc9 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_17.json
@@ -1,5 +1,5 @@
 {
+    "code": "YuQRgAUJdiXJ",
     "key": "ivJjwO0avz22igK80GCq",
-    "password": "㑱\u0019u\u0014mS𧯠\u0008,\u001a\u0019\u001bE\u0000󸸢29\u000ettH~w!hU|\r󳬇\u001cUeJw𤟂󳴊3𩝔\u000c\u001d={w\u001aP\u0013􈱌d􏶴0󴚄T\u0006n;uZC\u0015\u0005W7Ip5\tqU8+\u001d2琷z隀俺\u0014󷍩\u0017\u00144𪁐[g􀉻s嘗\u0008􊈰xF󶖃􀼁\\\u0005w`PEട0^N,gi􃬊I\u0002􉀾լK;᳥z窧Z;X;1y+h􄿰􈩴󹒬@󸤟>ZU辷壛&C\u0002Zh,􉳏᭭􉙁\u0005xC󱌌骭=l,\u000cu󳯢\u0003 }&𬮬󱣻𨓦󽾕𠾹\"\u000b\u000fd\u001f\u0019J'6WK㏒\u0006>𑒗󳃯y\r\"𘅜,\u0014\u001ad\u0000ne+廓,&!9Y㳠T🄱<􇆤d祢e.#w|?󼠏G󺺩S1恇\\􊏉\u0008z3\u0014,󱒙<\\􆈿\u0013󼊯󳝨%-ﰔ\u0004C\u001b!2𦊄𣛜DT \u000c\u000fXja\\R󷫹\u0016`\u0018J\n댺󹹊\u000e㙡ab\u0015 d0\u0016X{:줋\u0018?𭬺1txQ]󵙧?𫂯[)𓇜1O[Xl#\u0010鑾옃~g󾪉{𠑹_g\u001b!\u0001't􌻶I󴸤􃭑?𡪻`Nd𬦢`*1rD25c𩞳owK僪(􁧅6i&j(U6p􍧟zK𒂾mEⱯ\u000bjr:ꦷ`􋓱w\u0001\u0016^3\u0013<**`j\u000c ",
-    "code": "YuQRgAUJdiXJ"
-}
\ No newline at end of file
+    "password": "㑱\u0019u\u0014mS𧯠\u0008,\u001a\u0019\u001bE\u0000󸸢29\u000ettH~w!hU|\r󳬇\u001cUeJw𤟂󳴊3𩝔\u000c\u001d={w\u001aP\u0013􈱌d􏶴0󴚄T\u0006n;uZC\u0015\u0005W7Ip5\tqU8+\u001d2琷z隀俺\u0014󷍩\u0017\u00144𪁐[g􀉻s嘗\u0008􊈰xF󶖃􀼁\\\u0005w`PEട0^N,gi􃬊I\u0002􉀾լK;᳥z窧Z;X;1y+h􄿰􈩴󹒬@󸤟>ZU辷壛&C\u0002Zh,􉳏᭭􉙁\u0005xC󱌌骭=l,\u000cu󳯢\u0003 }&𬮬󱣻𨓦󽾕𠾹\"\u000b\u000fd\u001f\u0019J'6WK㏒\u0006>𑒗󳃯y\r\"𘅜,\u0014\u001ad\u0000ne+廓,&!9Y㳠T🄱<􇆤d祢e.#w|?󼠏G󺺩S1恇\\􊏉\u0008z3\u0014,󱒙<\\􆈿\u0013󼊯󳝨%-ﰔ\u0004C\u001b!2𦊄𣛜DT \u000c\u000fXja\\R󷫹\u0016`\u0018J\n댺󹹊\u000e㙡ab\u0015 d0\u0016X{:줋\u0018?𭬺1txQ]󵙧?𫂯[)𓇜1O[Xl#\u0010鑾옃~g󾪉{𠑹_g\u001b!\u0001't􌻶I󴸤􃭑?𡪻`Nd𬦢`*1rD25c𩞳owK僪(􁧅6i&j(U6p􍧟zK𒂾mEⱯ\u000bjr:ꦷ`􋓱w\u0001\u0016^3\u0013<**`j\u000c "
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_18.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_18.json
index ed496a39f8f..03add92e31b 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_18.json
@@ -1,5 +1,5 @@
 {
+    "code": "88xU9QOF1FPXdL6e4",
     "key": "m3ruXwhym9ERHyTAJo1y",
-    "password": "cW\u0007c,#ㅗ\n}𮁿\u0004\u0000`v\u0002뷿\u0016O^􃃆󿓢􋧴\tUs\u0019\u0001[b[uz\u0011􎆺\u0013-󲼋􁢋+]\u001d90\u0013X\u001d\u000b>8𥬠𓊫\t!\u0016徛2 \u001e\u000cW?\u000e\u0019䍼>\\S\u0006@Qt~8`T􆄠𗯄a,#􁝠]X󸴡-􏠎]󵚲\u0016}􏩉T󳹠􃜠\rH𩼪d@9/pab%컷**pK4q$󰑌+e\u0015\u001fZ\u0013狐3𫀂􆃠(\u0005y\\(5$'|૰!_𥳼_􆄌2\u0016󳖇𭮵I\u0014Y\"B􀌠=􍡀6𐐧v𥛵\u0000𡝼𝐳𤂀'䇵GJe\u001c\u000fPk\u0015\u0005#率尜\u000fa>m.𧞅to\u000e􀐽_\u000b𨕜\u001c\u0017\u001b\trn󻚤􇎾\rM𤧄2S8\u000735\\\u0017o𮪘\u0014~?𫦐\u0002/\nNZSjbWH\r􌎶X󲦶ဘ/󿡨y}#\u0006.Voi9윱\u000c*Y\u0002󴙠ꢬ\u0011\rS󹗔𣔁qSj䒨X𤜎􈆑􆳝M􃩫坋\u0018댳龷B\u0015)U\"~V󽉘󶄥/Sy\u0001<\u0008\u0005^\u000eY󷝑;\u0016-RKy\u001bO󼕁[;\u0008􋔙EDjW󳠇𬧔bKx💥lZ\u0013J(󼂂1mK𑄉z𠁌𣋹i/RxiQ􈺢}E嬱pA􄌾q\u000b.\u000b\ng佟Gb떋Kt#\u001fP@8s0\u000bg[c𩕰\u0013\u001f}{/󴯐D8𩦈𧃿󱄫𐚀􁇭M􇩾􆈓\u00110i𦾊􏑂\u001b\"󹀺\u0016g󺐰M󹨊􂬀IsD\u0008􉌤𑐚Z󷷗g\u0012;\u0001󶜎cQ0f\u0002]0p<􄇍.j\u0013\r[W^rsM\u000cUￇ=h􂤕L94󲠸oNs󸎏Z;8眄lw\t;S\u001d`V\\f󲠇󴧃싓󸢠󻽪X\u001b\u0015𠙟sb\u000f􏊺C\u0003i_7𡱄\u0015謽}㉱𘥋go\u001cVj\u000btr\u0016𬐠𨣃;𡨢𧠘\u00196􄳝􂝶/\n𑖘\u000cp󽇻O\u001a댋>S1=\u0014>m=Li]y󷪖\r\u001fᝉ+Dæ햣UWo@􍫒n/\u0004\u001cDR􈫣4\u0018`-}/\u000b=<\u0011󶻁\u0010\u0016󴌥oB8􆉮\u000cT𭚊?\u00105lJ󠇤􀩠󲡎1\\\u0016Gx𧋂󲟻HF󱕍􋬓N&\u0013A􇛉\u0017􉂛𑘙@\u0007\u000eN\u00177\u001e8kT㓈\u0001🜘}!`].7C\u0006\u0019a󲋼\u0001\u001bR\\Iw/y􁃿𧥝;*!\u001a;)󼟧\u0013\u001djQ)𘉙􈛺 \u0007QJf𣁪న􉲝q𬳜D륊Z\r􀯁􄔺󷁗秇􆾦䫕\u000c}􆜐\u0018{󺠼\u0006𨖕󱬩󹗇ዧ󲥮_9\u001cYzI=JL0]늘/W\u0015D\u0005𣂔WJ\u0018\u00108\u00042JsPn󺘶便\u0008hB\u0011؁Xj\u001b\u001d%:pﶘ@gL\u0017􉠶𣚠􏘵Q",
-    "code": "88xU9QOF1FPXdL6e4"
-}
\ No newline at end of file
+    "password": "cW\u0007c,#ㅗ\n}𮁿\u0004\u0000`v\u0002뷿\u0016O^􃃆󿓢􋧴\tUs\u0019\u0001[b[uz\u0011􎆺\u0013-󲼋􁢋+]\u001d90\u0013X\u001d\u000b>8𥬠𓊫\t!\u0016徛2 \u001e\u000cW?\u000e\u0019䍼>\\S\u0006@Qt~8`T􆄠𗯄a,#􁝠]X󸴡-􏠎]󵚲\u0016}􏩉T󳹠􃜠\rH𩼪d@9/pab%컷**pK4q$󰑌+e\u0015\u001fZ\u0013狐3𫀂􆃠(\u0005y\\(5$'|૰!_𥳼_􆄌2\u0016󳖇𭮵I\u0014Y\"B􀌠=􍡀6𐐧v𥛵\u0000𡝼𝐳𤂀'䇵GJe\u001c\u000fPk\u0015\u0005#率尜\u000fa>m.𧞅to\u000e􀐽_\u000b𨕜\u001c\u0017\u001b\trn󻚤􇎾\rM𤧄2S8\u000735\\\u0017o𮪘\u0014~?𫦐\u0002/\nNZSjbWH\r􌎶X󲦶ဘ/󿡨y}#\u0006.Voi9윱\u000c*Y\u0002󴙠ꢬ\u0011\rS󹗔𣔁qSj䒨X𤜎􈆑􆳝M􃩫坋\u0018댳龷B\u0015)U\"~V󽉘󶄥/Sy\u0001<\u0008\u0005^\u000eY󷝑;\u0016-RKy\u001bO󼕁[;\u0008􋔙EDjW󳠇𬧔bKx💥lZ\u0013J(󼂂1mK𑄉z𠁌𣋹i/RxiQ􈺢}E嬱pA􄌾q\u000b.\u000b\ng佟Gb떋Kt#\u001fP@8s0\u000bg[c𩕰\u0013\u001f}{/󴯐D8𩦈𧃿󱄫𐚀􁇭M􇩾􆈓\u00110i𦾊􏑂\u001b\"󹀺\u0016g󺐰M󹨊􂬀IsD\u0008􉌤𑐚Z󷷗g\u0012;\u0001󶜎cQ0f\u0002]0p<􄇍.j\u0013\r[W^rsM\u000cUￇ=h􂤕L94󲠸oNs󸎏Z;8眄lw\t;S\u001d`V\\f󲠇󴧃싓󸢠󻽪X\u001b\u0015𠙟sb\u000f􏊺C\u0003i_7𡱄\u0015謽}㉱𘥋go\u001cVj\u000btr\u0016𬐠𨣃;𡨢𧠘\u00196􄳝􂝶/\n𑖘\u000cp󽇻O\u001a댋>S1=\u0014>m=Li]y󷪖\r\u001fᝉ+Dæ햣UWo@􍫒n/\u0004\u001cDR􈫣4\u0018`-}/\u000b=<\u0011󶻁\u0010\u0016󴌥oB8􆉮\u000cT𭚊?\u00105lJ󠇤􀩠󲡎1\\\u0016Gx𧋂󲟻HF󱕍􋬓N&\u0013A􇛉\u0017􉂛𑘙@\u0007\u000eN\u00177\u001e8kT㓈\u0001🜘}!`].7C\u0006\u0019a󲋼\u0001\u001bR\\Iw/y􁃿𧥝;*!\u001a;)󼟧\u0013\u001djQ)𘉙􈛺 \u0007QJf𣁪న􉲝q𬳜D륊Z\r􀯁􄔺󷁗秇􆾦䫕\u000c}􆜐\u0018{󺠼\u0006𨖕󱬩󹗇ዧ󲥮_9\u001cYzI=JL0]늘/W\u0015D\u0005𣂔WJ\u0018\u00108\u00042JsPn󺘶便\u0008hB\u0011؁Xj\u001b\u001d%:pﶘ@gL\u0017􉠶𣚠􏘵Q"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_19.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_19.json
index be19bd23ef8..8b641a584cf 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_19.json
@@ -1,5 +1,5 @@
 {
+    "code": "AHGkmRBXJr=",
     "key": "nBmwchpz6q_fDPCPZYQe",
-    "password": "oZHN𔖹\u0007%S󽮃I􅲐0\u0014!􍲛0\u0014\u001cc|\u0016o\r𢡹m\u0014󸓵&\u0017X\u001d𘪐sXzlOS􉋳nZ\"\u00129睬S\n󻊷􏉺\u001a1>𥸜*K󠇧蛩\"𥊛𪟁GW𨖃󠀤PPO􌠿󰆀9c󴚤U{fLy\u0001\u001c\u0002|诠52\u0001P\n 𞴯/ꛅ𮅪s^_󷋣MW7M\u0004s\u0012M\u001e9\u0005g􈶿@%o\u0012\u00116m&B𗓢𮦷wL􄑴o\r􈔦y\u0003\tk;>􎡸􁉑A\u001f9ᅵ\u0002%긌\u001aghb󿧆\u0008%0󶼑㿶'kz𞲫\u0015󽿍3:<󻈉ㆥ􉈆X[g77_\u0003󸮜󻰠7\u0002\u001d𧴢\n\u000c🧒󲦐iG𬛠𩌶갾`i삢r﹐\u001du󻤇b󴵢􁊶O)󾣿YQ𮤽=fZa)T0j􅏀K/􍬵%v𘛵qsY󸓁R芫󳛠3a덦\r\u001b󻻉\u0015西𬴿'aⶉB𛋎\u0002=\u001e>n􁭅)d\u001f\u001c.F􏏾M𠩿󹓉3x\u0003쨣􍅦⸎Z覆3𪚛P\u001eV3GeGN\u000b3淨a^k`犟塭\rK\u0016\u0015e(\u001dQ%b􇶟u\u0010\u0006\u0000𘏈􋖻y{9IbP\u000f% \u0018^􃲧+f𣍤r䝚G\u0012?y\u0013􆊥\u001e8蘪}r끸|y,\u0008󺮬𣦻/\u0011R󸟕0W󱜳N\u0000貋q\u0008c􊘱\u0000􉧄\u001d,d\u0018{J8[󻺉\u0018\r𡵠\u0019|\nz渀G-{\u000f(1뫏\u001dl1䦦iL𓁏j^\u00104\u0003𧃒􍼝𔕴\u001coj\u001b2z\u0002󹒛t䔧;K\u00024Yhr\u0002󱂗fO6h𦩺t􆺇3Tpef\u000f\u0017􎹔jC𤭐eh⡘nf",
-    "code": "AHGkmRBXJr="
-}
\ No newline at end of file
+    "password": "oZHN𔖹\u0007%S󽮃I􅲐0\u0014!􍲛0\u0014\u001cc|\u0016o\r𢡹m\u0014󸓵&\u0017X\u001d𘪐sXzlOS􉋳nZ\"\u00129睬S\n󻊷􏉺\u001a1>𥸜*K󠇧蛩\"𥊛𪟁GW𨖃󠀤PPO􌠿󰆀9c󴚤U{fLy\u0001\u001c\u0002|诠52\u0001P\n 𞴯/ꛅ𮅪s^_󷋣MW7M\u0004s\u0012M\u001e9\u0005g􈶿@%o\u0012\u00116m&B𗓢𮦷wL􄑴o\r􈔦y\u0003\tk;>􎡸􁉑A\u001f9ᅵ\u0002%긌\u001aghb󿧆\u0008%0󶼑㿶'kz𞲫\u0015󽿍3:<󻈉ㆥ􉈆X[g77_\u0003󸮜󻰠7\u0002\u001d𧴢\n\u000c🧒󲦐iG𬛠𩌶갾`i삢r﹐\u001du󻤇b󴵢􁊶O)󾣿YQ𮤽=fZa)T0j􅏀K/􍬵%v𘛵qsY󸓁R芫󳛠3a덦\r\u001b󻻉\u0015西𬴿'aⶉB𛋎\u0002=\u001e>n􁭅)d\u001f\u001c.F􏏾M𠩿󹓉3x\u0003쨣􍅦⸎Z覆3𪚛P\u001eV3GeGN\u000b3淨a^k`犟塭\rK\u0016\u0015e(\u001dQ%b􇶟u\u0010\u0006\u0000𘏈􋖻y{9IbP\u000f% \u0018^􃲧+f𣍤r䝚G\u0012?y\u0013􆊥\u001e8蘪}r끸|y,\u0008󺮬𣦻/\u0011R󸟕0W󱜳N\u0000貋q\u0008c􊘱\u0000􉧄\u001d,d\u0018{J8[󻺉\u0018\r𡵠\u0019|\nz渀G-{\u000f(1뫏\u001dl1䦦iL𓁏j^\u00104\u0003𧃒􍼝𔕴\u001coj\u001b2z\u0002󹒛t䔧;K\u00024Yhr\u0002󱂗fO6h𦩺t􆺇3Tpef\u000f\u0017􎹔jC𤭐eh⡘nf"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_2.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_2.json
index 866d443a876..1dc3c5eb756 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_2.json
@@ -1,5 +1,5 @@
 {
+    "code": "EoNo4PH=cFSyQ-yuHhP",
     "key": "8XosCtq4Dzhyo=UoMRg_",
-    "password": "\u0013~d{ 󱏂󶍗7\u0010\u0000d􄉲\u0001?NT.𭤛􎅞JJ敏^rd𣲫N[ꤜ\u0001t#dn𢵳}u\u000e󹦠<􋊳䞭즠\u001d\u0018n\n05󰍍4Z\u000bIJXz1ia僚&\u0016'<𧫻\u000b䳝B\u0005\u000f􀇢\u00101dt󽛐)$𡉶1b𗬑Fvi轹J\u0007_T(-`S\u0015\u000cU共dBbTgi𨻾\rfp𩿅ED=\u0002􉌔\u001aXa<*#󽙜<􎁵𮩣^%Xx\u001bOM󲹁􂦬X _3\u0014K\u001d\u0007(&68[󿓿􏖋Mʩ>f]o\u0005`m􏡝􍌱⺩\u000c𧝴)Q1󸣭q󵗓9􍈌UD]$ꈅ\u000c6j𮧇3jAG󵾮!ys\u0015s?䍡Z𧆙cfpz\u000cGC_\u000ff%xb𘗔1\u001bj𗈪4K\rQ7𤴓:훡%:\r\"-ZqU|\u0010Na>𠃼K𠋶G\u00063#\"V\u0015-w\u0006􇻽(屍􊣐\\H劾\u0005􀒄󽊍~M;FHW$X󱔕Wy|x5N\u0018TrX\u001f,\n!쨎U==I}\u0006􄡟󾊕􈿙\u0004󰊕{ }1𣕙yu8_\u0012p􁎪l)S🞲fZ7\u0017>hnRXNJM{U~Hw;𑂸󼳤v=J⌞:󴔛􋦖𑋟o\u001bs=\u0015󸒸\u0001\u0000b􏖰𥍱H%f󾇺\u0004",
-    "code": "EoNo4PH=cFSyQ-yuHhP"
-}
\ No newline at end of file
+    "password": "\u0013~d{ 󱏂󶍗7\u0010\u0000d􄉲\u0001?NT.𭤛􎅞JJ敏^rd𣲫N[ꤜ\u0001t#dn𢵳}u\u000e󹦠<􋊳䞭즠\u001d\u0018n\n05󰍍4Z\u000bIJXz1ia僚&\u0016'<𧫻\u000b䳝B\u0005\u000f􀇢\u00101dt󽛐)$𡉶1b𗬑Fvi轹J\u0007_T(-`S\u0015\u000cU共dBbTgi𨻾\rfp𩿅ED=\u0002􉌔\u001aXa<*#󽙜<􎁵𮩣^%Xx\u001bOM󲹁􂦬X _3\u0014K\u001d\u0007(&68[󿓿􏖋Mʩ>f]o\u0005`m􏡝􍌱⺩\u000c𧝴)Q1󸣭q󵗓9􍈌UD]$ꈅ\u000c6j𮧇3jAG󵾮!ys\u0015s?䍡Z𧆙cfpz\u000cGC_\u000ff%xb𘗔1\u001bj𗈪4K\rQ7𤴓:훡%:\r\"-ZqU|\u0010Na>𠃼K𠋶G\u00063#\"V\u0015-w\u0006􇻽(屍􊣐\\H劾\u0005􀒄󽊍~M;FHW$X󱔕Wy|x5N\u0018TrX\u001f,\n!쨎U==I}\u0006􄡟󾊕􈿙\u0004󰊕{ }1𣕙yu8_\u0012p􁎪l)S🞲fZ7\u0017>hnRXNJM{U~Hw;𑂸󼳤v=J⌞:󴔛􋦖𑋟o\u001bs=\u0015󸒸\u0001\u0000b􏖰𥍱H%f󾇺\u0004"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_20.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_20.json
index 6e4b99f9724..0afc16348d1 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_20.json
@@ -1,5 +1,5 @@
 {
+    "code": "padtz-lbyFICM8PEzCj",
     "key": "n7oUiCMAvjokyCwCwIZx",
-    "password": "n.睰`Ab}1x?dyrWEI\u000e\u0008|\r n\\𪤧𧽾yzk\u0018󼊩㌔q􍱍h􇗮􄁸􆀋󺂴\u0016zt󾐮oY\u000fv􎼶󴄜!\u0014b\r\u0017𢋊󽚢97|𐳟Is𓆓뱒󰕍􎬀R􆻲y*\u001b 􇲄ᣎ;󴲕*F\u0017|l0\\-슀/d,76W\u0001􊥲a촛\u001bkY6\u0004e*6􄰬󶬹\u0002􎾂%B\"\u0011X𣧁Z􎟃󱖹\u0001\r󰈱\u0017󺶥's\\g\u000f_=𭱦춞𢅲oOcZ\u0019 ZWd\u0019\u0002e搊Zz􁰾󹾉Me憴\u0012N􃐟o𥩃BmCD\u001b𣴸𨚚Wsw<\u0003s\u000e󲓢⸱,\u0015𗺨\u0006􏨌je1m􇬱5\u0018@\u000f)(骝y%~d󹪹0z1||L{1\u0004􈟎Ja𒌨\u0004hHi\u0015󼏰\u0001\u0018\u0006𪰐𬸵\u00134&q\u001d>\u0001𬽋\u0001\u001bQsꏟa􅂡bv[u\u0008X􇘹􀀹^󷾞;[\u0002\u0013󴝠jYw󵀭􆼷\te3𤌈+ᴃ\\\u001aq􎠺r$(zD)\\7p\"𩐘\u0002?⇑<\u0000󼸼cP𥪧[>\u001fm2Y󶬀􎇾后P\u0011.􆕐誘\u0006\u0019\u00011npVW\u001a2+\u001b􂭁蓍\u001dk\u000b 󲧟A)*uk󻤵L0􇖠󾺫\u0012󻛳\u0010n\u0019$􁙔?\u0000\u000bji4Y\u0011\u0019󺺄=/S󺀨`P.\u0005\u000f\u001d􊉱쎱mwwe󲲜󻥂\u000c𔔚f\"\u0018{X)\u000bኼ\u0016\u0002𝒊󲐭+骭jv^𩒽\u001a%C\"]v5?𭕸/M󱽄󶨰󺲟󰓢+\u001a+𭧺VG\u00012󵀘VM\u000f\u000c2'󶚑􂮲?Lx󰸪<,Q󶛏t?􄬈䧞\u001d\u0018-􊎍Cਫ󵎪⣮XZ\u0002o󸶼\u0008y󰪩,돦'\u0007匑\u0010\u000fH󴼑$J\u001f􀯀\u0017\r6\u0006\u001c_1닲󷡷󳬭𨲃\u0012>􈙀<0롩G,T􁬣㉇􂄶:>4󵥕􂸐\u001d\u001cED\u0012:\rzSMQw)P욊s􀩞^-~𗛭,v,\u00011=/GNsO🥆6\u001d㺍_4􋹦!\u0001'M𢊃+$熤𥯽<~E𗫢, U8\u0003󰶽#􊩲[󾝢.H\u0010􌎹\u0006􃕨\"𠥏?I󵟃e𨴾\t灏󸌜𧁑\u001d'𧍿9k\u0004ZPj􈱒󽭯O𠇏L@𩾭\r%2>M<\n𝢣󻱀9/󰦊C\u0001av𢫮\u0005-|\u001b)\u0008$\"\u00126㿻\u0018CT|Ut𠇄𤥒𗧕Xﴽ\u000b滠'yR󹡌􁹉r攴o𨓗􆾘.𭙈8\u0000;\u00155\u0005\u00178Y\u0014g􍀩Q􉁰𤲭7!HO;\u0008r󺡗C幺鏃\u000e\u0006𨡏E\r\u0012\u0014l3􊈹🁦\u0014\u0016\u0008UF㱃\u0013.wO\u0004hm𨍈L]y&󺏙0Ĵ;Nwyw#\r8Om@x󵺁\u0008\u0006o823U𣴔C\u000fMN6t\u00128󿰸\u000eF\u0003Rna\u0007~\r6\u000cE\u001f#\tn󵮇wr'B\rnlolj󸔼𣏒􉟵tT𝈻󾿜\u0016|4G}\u0016En󴌓0D\u0010\u000ejn}`0󲴒+󸲾𭆿",
-    "code": "padtz-lbyFICM8PEzCj"
-}
\ No newline at end of file
+    "password": "n.睰`Ab}1x?dyrWEI\u000e\u0008|\r n\\𪤧𧽾yzk\u0018󼊩㌔q􍱍h􇗮􄁸􆀋󺂴\u0016zt󾐮oY\u000fv􎼶󴄜!\u0014b\r\u0017𢋊󽚢97|𐳟Is𓆓뱒󰕍􎬀R􆻲y*\u001b 􇲄ᣎ;󴲕*F\u0017|l0\\-슀/d,76W\u0001􊥲a촛\u001bkY6\u0004e*6􄰬󶬹\u0002􎾂%B\"\u0011X𣧁Z􎟃󱖹\u0001\r󰈱\u0017󺶥's\\g\u000f_=𭱦춞𢅲oOcZ\u0019 ZWd\u0019\u0002e搊Zz􁰾󹾉Me憴\u0012N􃐟o𥩃BmCD\u001b𣴸𨚚Wsw<\u0003s\u000e󲓢⸱,\u0015𗺨\u0006􏨌je1m􇬱5\u0018@\u000f)(骝y%~d󹪹0z1||L{1\u0004􈟎Ja𒌨\u0004hHi\u0015󼏰\u0001\u0018\u0006𪰐𬸵\u00134&q\u001d>\u0001𬽋\u0001\u001bQsꏟa􅂡bv[u\u0008X􇘹􀀹^󷾞;[\u0002\u0013󴝠jYw󵀭􆼷\te3𤌈+ᴃ\\\u001aq􎠺r$(zD)\\7p\"𩐘\u0002?⇑<\u0000󼸼cP𥪧[>\u001fm2Y󶬀􎇾后P\u0011.􆕐誘\u0006\u0019\u00011npVW\u001a2+\u001b􂭁蓍\u001dk\u000b 󲧟A)*uk󻤵L0􇖠󾺫\u0012󻛳\u0010n\u0019$􁙔?\u0000\u000bji4Y\u0011\u0019󺺄=/S󺀨`P.\u0005\u000f\u001d􊉱쎱mwwe󲲜󻥂\u000c𔔚f\"\u0018{X)\u000bኼ\u0016\u0002𝒊󲐭+骭jv^𩒽\u001a%C\"]v5?𭕸/M󱽄󶨰󺲟󰓢+\u001a+𭧺VG\u00012󵀘VM\u000f\u000c2'󶚑􂮲?Lx󰸪<,Q󶛏t?􄬈䧞\u001d\u0018-􊎍Cਫ󵎪⣮XZ\u0002o󸶼\u0008y󰪩,돦'\u0007匑\u0010\u000fH󴼑$J\u001f􀯀\u0017\r6\u0006\u001c_1닲󷡷󳬭𨲃\u0012>􈙀<0롩G,T􁬣㉇􂄶:>4󵥕􂸐\u001d\u001cED\u0012:\rzSMQw)P욊s􀩞^-~𗛭,v,\u00011=/GNsO🥆6\u001d㺍_4􋹦!\u0001'M𢊃+$熤𥯽<~E𗫢, U8\u0003󰶽#􊩲[󾝢.H\u0010􌎹\u0006􃕨\"𠥏?I󵟃e𨴾\t灏󸌜𧁑\u001d'𧍿9k\u0004ZPj􈱒󽭯O𠇏L@𩾭\r%2>M<\n𝢣󻱀9/󰦊C\u0001av𢫮\u0005-|\u001b)\u0008$\"\u00126㿻\u0018CT|Ut𠇄𤥒𗧕Xﴽ\u000b滠'yR󹡌􁹉r攴o𨓗􆾘.𭙈8\u0000;\u00155\u0005\u00178Y\u0014g􍀩Q􉁰𤲭7!HO;\u0008r󺡗C幺鏃\u000e\u0006𨡏E\r\u0012\u0014l3􊈹🁦\u0014\u0016\u0008UF㱃\u0013.wO\u0004hm𨍈L]y&󺏙0Ĵ;Nwyw#\r8Om@x󵺁\u0008\u0006o823U𣴔C\u000fMN6t\u00128󿰸\u000eF\u0003Rna\u0007~\r6\u000cE\u001f#\tn󵮇wr'B\rnlolj󸔼𣏒􉟵tT𝈻󾿜\u0016|4G}\u0016En󴌓0D\u0010\u000ejn}`0󲴒+󸲾𭆿"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_3.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_3.json
index 30227297d14..5b47e3b6435 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_3.json
@@ -1,5 +1,5 @@
 {
+    "code": "RMQ-RtgFDI-b",
     "key": "=aYXtgLJZX77qMIx0Oah",
-    "password": "􆉺󹩍󻧛|@\u0010􀚐Ꭴ\u0001教J\u0019kH󰼹=Ⳑ\"SP\\\u001cw𗌨lR[.29𡣺1W_ﴻ𗢄M\u001eU\u0007!\u001dꪧNKv󲣵􋾋X쎕;?𦠷47.\u0018􍝈𡩇𭣎}\u000b8\u00023fj\u0011\u000f𬕾=-3ZmNn10\u0011󳛿􂦱𧡒CT\u0000:N\"\u0016\\@|q💮\u001cv_u𗖲􇳕J-*󼟛;􄼒hC (_u𧝈gꮰ萑\u0015\u001f',m}\u0007硈\u0012Dt𩷃𥊃HimƋ|𞥗q𧗇r𛃬27A\u0015\u0004\u001cgP􊍖\u001f󲛱󾙤O9\u0004EB]\u0010<𦏄🂦𠣮󷹦rJu\t󺵜􀗢F\u0008fxm/f\u0007\rC𥑨t~D\u001bO]_i\u001f馋\u0001譖>\u0016􉒊\u0015\u0002Dz\u0013􀂬ZC\u0011x0bLFjXI𤋧\u0019Z\u001dR2!\u0005\u0013\\Mffm󰴔󾪄𖽙F􋫥uᰋ*\u0010M.q葖\u0007􎆵GdxHmuSTrb`cn\u0015+(@KZ\u0005]󼢾QEf?fw\u0003𫕻.W\u0002~k\u0005󲠼􏣅\u001f\tB\u000e-\u00024b𭘚o,\u0018}P\u000eKD\u000b􌧣O*\u0008􃋕\u001e􎆿\u0006\u0015=󿼍eh\u0010\u0019Y㋂󰲭𭖤\u001d\u0011#)v>a􀡩L䉠&gh1\u000e恰18\u0011􊜙(𨴜󻰴lc\u0006#􋭣Poe𫩉~\u0003[%e𠧾{󹐲31𘐴낟\u0001I1z􋀁s#y󿺆\u001c⌜g\u001fPE5P\u000e/\n􊇌 *Z\u0013ஊ膊p}sh;[Sr\u0002<Y􃦒R\u0005𢳻;m\u000e!j􃼦Y曣0󶗚f!\u0011􂚔:Fm\u0012<h􃗩􆢿L;q𠢪\u000b鈅!\u0008\u0017#B\u0012󼵾L𘆒\u0007~K\u0001􈚌J?ix􍝤旚󾍃󹻷9pq𐍮󼃍u\u0000)􍲪7a󴞮\u000f~/b\u0007su&\u000b.󴍄)󿺘Vo𪊣\"8U%􉕝{=크\u0000j\u0008)u􃓟e4a\u000c󸙊o󰃯jRi\u0012\u001aM\u0006g𦒤𥭡O\u0012Q󽿠C\u0005􀄠y~\u0000\u0018𦢚R\u00082\u0003􎧶aZ\td뇶P6𪰑8#𡠣󾻛\u0011_%?\u001b𪄠1𦡠\t$\u0005t%\u0000󰺄u/g*􍼚'\u001blY薣Pv\u001a2켭􅨽􍎢1B󾌥g[󵮎\u0016𘍭\u0006\n}󽓌㙉􌃏􋳚؅\n𪒇\u0006𘗦\u0016嫟wx𧃗\u0007\u0005?;㍋\u0003U{^\u001b㚑雐󸶍\u0013p\u001eH\u001fX\u00168！􍴅e\u0016􊤤m",
-    "code": "RMQ-RtgFDI-b"
-}
\ No newline at end of file
+    "password": "􆉺󹩍󻧛|@\u0010􀚐Ꭴ\u0001教J\u0019kH󰼹=Ⳑ\"SP\\\u001cw𗌨lR[.29𡣺1W_ﴻ𗢄M\u001eU\u0007!\u001dꪧNKv󲣵􋾋X쎕;?𦠷47.\u0018􍝈𡩇𭣎}\u000b8\u00023fj\u0011\u000f𬕾=-3ZmNn10\u0011󳛿􂦱𧡒CT\u0000:N\"\u0016\\@|q💮\u001cv_u𗖲􇳕J-*󼟛;􄼒hC (_u𧝈gꮰ萑\u0015\u001f',m}\u0007硈\u0012Dt𩷃𥊃HimƋ|𞥗q𧗇r𛃬27A\u0015\u0004\u001cgP􊍖\u001f󲛱󾙤O9\u0004EB]\u0010<𦏄🂦𠣮󷹦rJu\t󺵜􀗢F\u0008fxm/f\u0007\rC𥑨t~D\u001bO]_i\u001f馋\u0001譖>\u0016􉒊\u0015\u0002Dz\u0013􀂬ZC\u0011x0bLFjXI𤋧\u0019Z\u001dR2!\u0005\u0013\\Mffm󰴔󾪄𖽙F􋫥uᰋ*\u0010M.q葖\u0007􎆵GdxHmuSTrb`cn\u0015+(@KZ\u0005]󼢾QEf?fw\u0003𫕻.W\u0002~k\u0005󲠼􏣅\u001f\tB\u000e-\u00024b𭘚o,\u0018}P\u000eKD\u000b􌧣O*\u0008􃋕\u001e􎆿\u0006\u0015=󿼍eh\u0010\u0019Y㋂󰲭𭖤\u001d\u0011#)v>a􀡩L䉠&gh1\u000e恰18\u0011􊜙(𨴜󻰴lc\u0006#􋭣Poe𫩉~\u0003[%e𠧾{󹐲31𘐴낟\u0001I1z􋀁s#y󿺆\u001c⌜g\u001fPE5P\u000e/\n􊇌 *Z\u0013ஊ膊p}sh;[Sr\u0002<Y􃦒R\u0005𢳻;m\u000e!j􃼦Y曣0󶗚f!\u0011􂚔:Fm\u0012<h􃗩􆢿L;q𠢪\u000b鈅!\u0008\u0017#B\u0012󼵾L𘆒\u0007~K\u0001􈚌J?ix􍝤旚󾍃󹻷9pq𐍮󼃍u\u0000)􍲪7a󴞮\u000f~/b\u0007su&\u000b.󴍄)󿺘Vo𪊣\"8U%􉕝{=크\u0000j\u0008)u􃓟e4a\u000c󸙊o󰃯jRi\u0012\u001aM\u0006g𦒤𥭡O\u0012Q󽿠C\u0005􀄠y~\u0000\u0018𦢚R\u00082\u0003􎧶aZ\td뇶P6𪰑8#𡠣󾻛\u0011_%?\u001b𪄠1𦡠\t$\u0005t%\u0000󰺄u/g*􍼚'\u001blY薣Pv\u001a2켭􅨽􍎢1B󾌥g[󵮎\u0016𘍭\u0006\n}󽓌㙉􌃏􋳚؅\n𪒇\u0006𘗦\u0016嫟wx𧃗\u0007\u0005?;㍋\u0003U{^\u001b㚑雐󸶍\u0013p\u001eH\u001fX\u00168！􍴅e\u0016􊤤m"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_4.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_4.json
index 430f0b80cba..8e0bd4bdea3 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_4.json
@@ -1,5 +1,5 @@
 {
+    "code": "WrNRVUakdiR3TfEn",
     "key": "jZVyHFe3sRymJkt0NFpJ",
-    "password": "׳\u001753G􃥗\u0013󾐥<&eK􍠞\u001f\u001e\u0003e\r祠|F\u0015\u0012U`f\na\u0004\u0001vz\u0015=󲬇,\u0000勺U_SJ\u0005\u000c\u0015\u0014\u0008\u0019N𐘡\u00166Qd𪢰(O􏦌O\u001b􈕊\u0007mQwe\u000c󻍛9󽯠\u001d\u000fD@2Q,L\u0003\u0011𪰦\u0001-􌓾\u0011\n\u0010\u00166*rW@x\u0019Pjd\u0017k'uAe\u0001t[-$\u001a󺿿:\u001e\u0014\u00142\nsz8\u0002􌉽􄮜l􊛌{%|pNࠍo\u0012b󼴋󿉅Bjhn57\u0018\u0008KY􀷾\u0013𫓣Gs)\u001b􀯕􌪜/4\u0007!󻮺z,󴅶%9\u0017󾌚!m􆬡?4󷌔\u001c\u001e𤐹)s󱉚>󷿀\u001b\tO𥍆\u0002/_Q^a𦗖􌸧󰡍y",
-    "code": "WrNRVUakdiR3TfEn"
-}
\ No newline at end of file
+    "password": "׳\u001753G􃥗\u0013󾐥<&eK􍠞\u001f\u001e\u0003e\r祠|F\u0015\u0012U`f\na\u0004\u0001vz\u0015=󲬇,\u0000勺U_SJ\u0005\u000c\u0015\u0014\u0008\u0019N𐘡\u00166Qd𪢰(O􏦌O\u001b􈕊\u0007mQwe\u000c󻍛9󽯠\u001d\u000fD@2Q,L\u0003\u0011𪰦\u0001-􌓾\u0011\n\u0010\u00166*rW@x\u0019Pjd\u0017k'uAe\u0001t[-$\u001a󺿿:\u001e\u0014\u00142\nsz8\u0002􌉽􄮜l􊛌{%|pNࠍo\u0012b󼴋󿉅Bjhn57\u0018\u0008KY􀷾\u0013𫓣Gs)\u001b􀯕􌪜/4\u0007!󻮺z,󴅶%9\u0017󾌚!m􆬡?4󷌔\u001c\u001e𤐹)s󱉚>󷿀\u001b\tO𥍆\u0002/_Q^a𦗖􌸧󰡍y"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_5.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_5.json
index 5bbc21f223a..1092afc0f95 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_5.json
@@ -1,5 +1,5 @@
 {
+    "code": "rr3lleg-Tu4eJ",
     "key": "OU56F44t-0ybJj7eKUaS",
-    "password": "k󾹫Pnu'6Z\u0015󸞷𤙴\u0005🤑l䠆[􁛠TMgddIb𭢕mt.TCQW󺚵O􏜋M\u0003氘\u0003\u0017􈣓􊜷F\u001e^𬥄C\u0001<\rs\u000c#\u0002?A\n𩨻𐳕\t 88|;\u001a󷺒&\n󾞚'󵁪𤸢 <\u000b\u0004󾬺w󷎨\u0013l\u001c2)\u0016󴼯o4G𧛎1;0IVKt6t$Y\":㌞𦔶􁤸\"\u001dᢃ$y\u001b㱭)#󶻵H\u001a \u0016Lk|\u0010$\u001dh;䵖G(?ft*V%|█\u0008C\u0008,𠌥\u0016᷌eI?:T1\u00052󾟰B+\u0002\\\u001d>4󾧩󷶜􀠞\u0005\u001edH\u0015\u000f\u000bK\u0000󹆆\u0007\u0008:9𧳇3큳%^[X\r:󿇪c\n󼱅kk'RA𓌘􁟦幞􀮵c\u001e!𨿤瀺\u0005\u000f􄸍\r/\u001a􎈨1ott&\u000eK",
-    "code": "rr3lleg-Tu4eJ"
-}
\ No newline at end of file
+    "password": "k󾹫Pnu'6Z\u0015󸞷𤙴\u0005🤑l䠆[􁛠TMgddIb𭢕mt.TCQW󺚵O􏜋M\u0003氘\u0003\u0017􈣓􊜷F\u001e^𬥄C\u0001<\rs\u000c#\u0002?A\n𩨻𐳕\t 88|;\u001a󷺒&\n󾞚'󵁪𤸢 <\u000b\u0004󾬺w󷎨\u0013l\u001c2)\u0016󴼯o4G𧛎1;0IVKt6t$Y\":㌞𦔶􁤸\"\u001dᢃ$y\u001b㱭)#󶻵H\u001a \u0016Lk|\u0010$\u001dh;䵖G(?ft*V%|█\u0008C\u0008,𠌥\u0016᷌eI?:T1\u00052󾟰B+\u0002\\\u001d>4󾧩󷶜􀠞\u0005\u001edH\u0015\u000f\u000bK\u0000󹆆\u0007\u0008:9𧳇3큳%^[X\r:󿇪c\n󼱅kk'RA𓌘􁟦幞􀮵c\u001e!𨿤瀺\u0005\u000f􄸍\r/\u001a􎈨1ott&\u000eK"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_6.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_6.json
index 8f504bc97cc..2ec75fa0a7a 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_6.json
@@ -1,5 +1,5 @@
 {
+    "code": "RcplMOQiGa-JY",
     "key": "54Yh4fa_ClTVqjEEubnW",
-    "password": "􄾥Mz􏨋\\b󱛮艬􈅒\u001cSi8:\"\r3\u001dc󱦹I=8L>uA'\u000f&I𖾘!W󳀨7z;r\u0005nj_+3u/8竮{缽𩤔\u0019$vy\rB)𞢱l󹢥'iN8\u000e}vd󺝍𠎷uw󳔂17\u0017F#𥩩:s󸶀\u0004\u0018〫🄴p$테2㥂\u0010㎱\u001aHl攲\u0001w􁘈4[𩻌\u0011\u001e\u000e!lS\u0019􅿒𐎋\\(릐N󻕫M\u0000\"\u0001d􉶯 U?箰d𡯩(o\u001e'렇\u000b􌀹{A\u0017b=󽰪􋰸?o\n𨈲*⼿P\u000e84,Qf􄋲D\u0019Z\u0001ux􋬌<\u000b)􎼓𭓻扈𑃴8t𡔀Ya\u001d\u0005╧\u0000`\u001f7󹯦p󼊰42縰h𐧄\u0004+W\u0007󹫝aH+XE󸍅p\u001a⅓\n\u0010𡐒􇸉􅅄𝑍\t籩k󹐳𦿲\u001e𘎬􌪿㦾G\nh𩏘\u001a\u0014{􎟦5,\u001f\u0012L\u0011(𡤘<|\u0008Z𪅇\u000fK\u00197\t2V|K\u0003,\u0016)F씔凿𘥆􌑞􎾧\tJ\u0016)𠬪",
-    "code": "RcplMOQiGa-JY"
-}
\ No newline at end of file
+    "password": "􄾥Mz􏨋\\b󱛮艬􈅒\u001cSi8:\"\r3\u001dc󱦹I=8L>uA'\u000f&I𖾘!W󳀨7z;r\u0005nj_+3u/8竮{缽𩤔\u0019$vy\rB)𞢱l󹢥'iN8\u000e}vd󺝍𠎷uw󳔂17\u0017F#𥩩:s󸶀\u0004\u0018〫🄴p$테2㥂\u0010㎱\u001aHl攲\u0001w􁘈4[𩻌\u0011\u001e\u000e!lS\u0019􅿒𐎋\\(릐N󻕫M\u0000\"\u0001d􉶯 U?箰d𡯩(o\u001e'렇\u000b􌀹{A\u0017b=󽰪􋰸?o\n𨈲*⼿P\u000e84,Qf􄋲D\u0019Z\u0001ux􋬌<\u000b)􎼓𭓻扈𑃴8t𡔀Ya\u001d\u0005╧\u0000`\u001f7󹯦p󼊰42縰h𐧄\u0004+W\u0007󹫝aH+XE󸍅p\u001a⅓\n\u0010𡐒􇸉􅅄𝑍\t籩k󹐳𦿲\u001e𘎬􌪿㦾G\nh𩏘\u001a\u0014{􎟦5,\u001f\u0012L\u0011(𡤘<|\u0008Z𪅇\u000fK\u00197\t2V|K\u0003,\u0016)F씔凿𘥆􌑞􎾧\tJ\u0016)𠬪"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_7.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_7.json
index 7bc6369f745..c7382ea1d61 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_7.json
@@ -1,5 +1,5 @@
 {
+    "code": "X-ySKT",
     "key": "muTkNflRkN4ZV2Tsx=ZS",
-    "password": ")jtk/z𬾞F!N~\u0003󱳰􁲜{8𒃻𥙎!D󾩑%𡊪𩆬u7WynrV\u0017𤐨p􇁏Lt͊e^}?􋄃l`.`Y\u000bZ\u0002􏨅P}[~磗=}L􋣃\u0007\u000b!󻉯\u0017H)>5\u0003{\u0015D\u0003UEh^ ~\u0004CC\u0003\u000e䀈p閘z3jt\u0015󰕙\u0008B7 P\u0018Su_𬷭o䗸\u0012𫟸I\u000b`,󹮧N8\\\u0011^⡇m\u0018󻤀\u001cZ_\"$\u0017B/\u0000!\u000f[\u0013\u000by\u000c\u0005\u001b𡫃OC\u000ft々:\u0004l\\\u0008\u0004rG@\u001f뇮J𗑎𨫭-✧8tTT#MD\u001c\u0014lJQ9s諾戶\u0011jlVF𗨚P{ᑬ懍\u0015KEC􌍼[kg2*C󲊮\u0000[谢&𒅎𭺓?𬝎8𣚟\rSYlf𗑮q碬𗆕\u0000M.\u0008\t􍑳󸬇;\u0013_󻛋|@\u0016d􈋧)\n$an\u000f\u001ep\n=󷔵D+𗵘\u000c􎃆󱐥љ\u001db𬘺\u000f􊞤YQx]􃢖c䙼󲦦𤋕􅵣󾠮J:\u001b\u001e􀿎𭣆<>\u0004\u0011\u001c,􆬽i4@\u0005u^𫬜􈕢Dd󵫒\u0004𐇹>Tx􊞏#u\\`\u0002􋂚,Kt-󼺖D󺌤𥬹,I.𮤂:㵪&3n\u000b!鱪Pmꋞ$\n\u0001𬬿𒔛􊼒ఱ>ihpLGl@L\u0005\u0017𬜏\u0001 厺\u000f)D` wC\u0002\u000b\u0005`풆}$魆\u0010[\"􉧈'q󾲣tP\u0004%\u0005eG\r􂚤􏆯C\u0013g󽞼#\u001cYrht𨉫@􈾥tMo\u0006WM\u001a\u000b鵽o&}~45𧆾4K􍫃\u0018l!x𨴽k\u001b\\h\u0005/4,𫛟Yp󳆯d𗿒N􎥝vw\u001bK􌌠\u001c\u0017RSf0\u0010𤒙𖭓*Wukxd3>\u0006'gN󾿂\u00138;2FN˫ '󵢃Yt<􍽪哩󿋬\u0013]㎤\u0003@\u000c􌽗ꘊf9i.󵢷5\n𠉝2%$󿱂N𩙐Y~47󰰪\u000e󵺼󴞣箼3􂃤le􂥓4\u00101Q\u001c󰹸#5?𒀪􊭔󶼂𩵨𨲸4l<􅃍H7]=\u0011aod􃷡A\u001d:l\u000f4q^b􂑀D𪓅􂱌$b _oH'\u0011Kv\\n<-\t\u001f􈠬𧶟\u001b􌑢FԱ\u0002-\u0005,\u0018G$\u0000闄.􎔓;𞡑𩜀§O\u0005H󸦽%\u0006󺘉󶹪j\u001e󲭟􋎅mEB𝝄󻹑A侻𬀠YN\u0002FRm\u001f\u0003Q􅴍V`+𗐦m\u00161󷙂\u0008󺄹1}O􎤅󴩱쀗\u000c󵺷j$t롔4!8%#v\u000c=\t<뿠\u0006M􂁌\u001a3\"\r󱠻\u001aX%~n+:\u0000M𠴕X-v𑨅\u000c\u0017󳋉\u0004\u001007󶗛\u0018U},,}𢠲\u0008Hy\u000cLa\\\n﮼󰎍;jo0𦛟􃉊󾕡\u0004MlW\u00107뀸􏸶󰘅B􉤫Z 􄮡/󺶭R5F]X\u0005F|`𧰊E🟍\r\u000b󰙰c􌮘􆓓T󾌶\u000e*(\u001e\u0006bNs􁽯ST𢁅𩮢K󼆳?\u0001􋡶󵰷㚊\"S[TY};\u0001*r55\u0007T󵬜\u0016\u0001􏘃􈔚\u001eZ\u0007󹐌s𧱕t􁱺}􁰌deI𥠾뚓\rR\\]'􈱃􁺜\\y𡇀\u001c)@o盥Ci􇺸󾧁|[Q}}󺑶\u0001^􈿾|S\u0004Wa\nE,󷫢S\u0010q\u0013s\"h辢)􈸠\u001eB:",
-    "code": "X-ySKT"
-}
\ No newline at end of file
+    "password": ")jtk/z𬾞F!N~\u0003󱳰􁲜{8𒃻𥙎!D󾩑%𡊪𩆬u7WynrV\u0017𤐨p􇁏Lt͊e^}?􋄃l`.`Y\u000bZ\u0002􏨅P}[~磗=}L􋣃\u0007\u000b!󻉯\u0017H)>5\u0003{\u0015D\u0003UEh^ ~\u0004CC\u0003\u000e䀈p閘z3jt\u0015󰕙\u0008B7 P\u0018Su_𬷭o䗸\u0012𫟸I\u000b`,󹮧N8\\\u0011^⡇m\u0018󻤀\u001cZ_\"$\u0017B/\u0000!\u000f[\u0013\u000by\u000c\u0005\u001b𡫃OC\u000ft々:\u0004l\\\u0008\u0004rG@\u001f뇮J𗑎𨫭-✧8tTT#MD\u001c\u0014lJQ9s諾戶\u0011jlVF𗨚P{ᑬ懍\u0015KEC􌍼[kg2*C󲊮\u0000[谢&𒅎𭺓?𬝎8𣚟\rSYlf𗑮q碬𗆕\u0000M.\u0008\t􍑳󸬇;\u0013_󻛋|@\u0016d􈋧)\n$an\u000f\u001ep\n=󷔵D+𗵘\u000c􎃆󱐥љ\u001db𬘺\u000f􊞤YQx]􃢖c䙼󲦦𤋕􅵣󾠮J:\u001b\u001e􀿎𭣆<>\u0004\u0011\u001c,􆬽i4@\u0005u^𫬜􈕢Dd󵫒\u0004𐇹>Tx􊞏#u\\`\u0002􋂚,Kt-󼺖D󺌤𥬹,I.𮤂:㵪&3n\u000b!鱪Pmꋞ$\n\u0001𬬿𒔛􊼒ఱ>ihpLGl@L\u0005\u0017𬜏\u0001 厺\u000f)D` wC\u0002\u000b\u0005`풆}$魆\u0010[\"􉧈'q󾲣tP\u0004%\u0005eG\r􂚤􏆯C\u0013g󽞼#\u001cYrht𨉫@􈾥tMo\u0006WM\u001a\u000b鵽o&}~45𧆾4K􍫃\u0018l!x𨴽k\u001b\\h\u0005/4,𫛟Yp󳆯d𗿒N􎥝vw\u001bK􌌠\u001c\u0017RSf0\u0010𤒙𖭓*Wukxd3>\u0006'gN󾿂\u00138;2FN˫ '󵢃Yt<􍽪哩󿋬\u0013]㎤\u0003@\u000c􌽗ꘊf9i.󵢷5\n𠉝2%$󿱂N𩙐Y~47󰰪\u000e󵺼󴞣箼3􂃤le􂥓4\u00101Q\u001c󰹸#5?𒀪􊭔󶼂𩵨𨲸4l<􅃍H7]=\u0011aod􃷡A\u001d:l\u000f4q^b􂑀D𪓅􂱌$b _oH'\u0011Kv\\n<-\t\u001f􈠬𧶟\u001b􌑢FԱ\u0002-\u0005,\u0018G$\u0000闄.􎔓;𞡑𩜀§O\u0005H󸦽%\u0006󺘉󶹪j\u001e󲭟􋎅mEB𝝄󻹑A侻𬀠YN\u0002FRm\u001f\u0003Q􅴍V`+𗐦m\u00161󷙂\u0008󺄹1}O􎤅󴩱쀗\u000c󵺷j$t롔4!8%#v\u000c=\t<뿠\u0006M􂁌\u001a3\"\r󱠻\u001aX%~n+:\u0000M𠴕X-v𑨅\u000c\u0017󳋉\u0004\u001007󶗛\u0018U},,}𢠲\u0008Hy\u000cLa\\\n﮼󰎍;jo0𦛟􃉊󾕡\u0004MlW\u00107뀸􏸶󰘅B􉤫Z 􄮡/󺶭R5F]X\u0005F|`𧰊E🟍\r\u000b󰙰c􌮘􆓓T󾌶\u000e*(\u001e\u0006bNs􁽯ST𢁅𩮢K󼆳?\u0001􋡶󵰷㚊\"S[TY};\u0001*r55\u0007T󵬜\u0016\u0001􏘃􈔚\u001eZ\u0007󹐌s𧱕t􁱺}􁰌deI𥠾뚓\rR\\]'􈱃􁺜\\y𡇀\u001c)@o盥Ci􇺸󾧁|[Q}}󺑶\u0001^􈿾|S\u0004Wa\nE,󷫢S\u0010q\u0013s\"h辢)􈸠\u001eB:"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_8.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_8.json
index 6e4e5ab3373..9e19254c833 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_8.json
@@ -1,5 +1,5 @@
 {
+    "code": "jgfbzV60",
     "key": "4h1kCFffI4sHePSIIfS1",
-    "password": "[_.VrDh󷾜󼅰3\u0012=M𧼍rhfOlZuP￠\u0011\u001a\u000c\rx\u001cJ5\u000c𬐮si𨯝{P\u0018\u001dG3%'O\u0007\u000c\u001ea􊭴x:􁏊􆅌+髖fMP􁔻B\\nu\\\u000f:a4㪢qI\n{󻚓\u0015󾑌(r꾍EI㒚G𢨈>\u001c󹦌\u0019@*y\u001f4{,\u0017𥀖p\u0006􎙝R􁭟H,\u0011\u000b\u001f󶣷C!\u0016󺹳i}2󵬹󷕞pu\t?4\u0017诛갿\u0000\t7&\u000c𖽰󲠏􄷩􇈂\t&\u0007b𧈁'\u0000M:璸oI\u0013\u0005tG\u0013`/0\u001e𨦇v\u0008_c}m\u001fT7;he𥷰#𘙬󸥾􃠳S4K\u0019R;\u0017\u001f\u0005󹝠\u0002󴾺:彸\u0004|p<e𑅧➜챑}𘑤镊*\u001e9oZ'􌟋\u0007?𨰥+$𩵵[𩁶H􄙁\u0002\u001a2hN\"e\u0004𢗟􀀣g鸟G(G?𦺤󹐕;􎖲cF𛀜􁻺湡\u0019\u0017k^\u000f6𗧯ph{1!3𩇣6bCPZ􎃒E\u0010\tCJ𗼎\nglꖵd𦞀m𦁫3󵞺V\"􇻍\u001a􂸹0눗􆆫%BR\u0017󻰒~]\u0003-^\u001d􉩧\u0012_Q6mk𓃷N鵶˾Ib韽\u0008!hdBz\u0010\u0019\u001b\u001e\r\u001cG2{{\u0010Vw\u0008􅔪a9􌒽얳\u0012􌈩f\u0005𐼻\u0017w\u0016^\u0018rm컂\u0011𬵋r1**\"\u0011󼙝\t㋇H􎻝}.𥭸%\u0014픚􉍴}𑵂(\u0017CS􁚂w9!a\u001eKSL5\u0013棏]\u0004EU\u0019􀦭s𓇰B\u0014SOW\u0010𦄀46󲃼O<𔐥6􍜗\u000b膿%S𤘒\u0010󱽦4︭=38!\u0007􉅖w \u0011𤣏f<\u000e\u0004,m<\u0019􄉥2BX\\\u001eK塕#\u0003^󷷿Ṁ}S􃍆`\u0013𢊻M\u0006􇫁F&K𨅅6𥢨L\u001e\u0018e\u0017xp\u0015I󾲚.@>^ZN皍&WtKz(S&M\u000e`\u000e𬛬#󷂯C:^\u0017𤁊f\u0019\u00073jp/􂔼|p\u0016/9?Wn㗔\u001eH\u0005*𩃃􆠏𝆎ghࢱ􊆕T1𠥔𓀨󽚁=󰶎󵋅&1Z[󾵝󴲏4U\u0014󳭾K%2\u001fp&q􁯬o3QhHE:}\u0005hil􋩕fc\u000c\u00161U\u0006TK\u0012𪜺!4Ch>f\u0016V뿒QcXO3\t\u00161𭔺𤁕ii5;?\u0006󹼂󲴧W\u0012뇂yDu𠝕𢌫󵹀\"\u0004Vsg􉷝`󾨁:阠'\u0002E󲙀\u0016J\u0003ﲎ\u001e\rV)6K󴜙u\n􃍋\u001bWq4k'xZ\u0018󵑿Pp`𓍲\u0013s\u000bb'󺣮\u0010젵쇞.v􇖹W2u*󺬇\u000c\rc;=l2.𡉢􄧓𐌻'AT󽛰僔mc\u001b\u0013?Y\u0019󾰮erF?lU𫙜\u00162𡨈ZW\u0016e}𛁖i\r8󿐖%\u0010􂿔Wu\u001bwr\u0016Z󰗎\u0011\u0014*F󺝔j႔\u0015𑃔\u000f&幛t?\u0016:󳕅\u0004􋳫\\d\u001b\rV􀅆\u0010Y\u0001HDi#'#\u000e3\u0010󼔸􄛨hP'\u000f>,#;B-\u0003\u001c\u0008􇮜\\O𪐾𦃻茌𧝜r\u0013v󼼟\u0015wY>@P{&𞹵muC眙\u0010\u001eW\u0013bzp#\u000fNO\ng.f\u00018󿆘\u001fM3\u00029M#竜A,S𣎧\u0010iK\u0006i5\u0012􎉈𧹀93~\u001a;z銡H\u000en𒉅􌃮嘞h\u0001H\u000e󷲝rSW!􆹦󸶧\u0005,Texo􍡭\\U􎚑ef~\u0015A\u0018􋖲\u00081\u001ciW\u0019:i􃣆𘣋󻅒\u000c@댴^20\u0019n!􏍡\u0017'\t`\"^",
-    "code": "jgfbzV60"
-}
\ No newline at end of file
+    "password": "[_.VrDh󷾜󼅰3\u0012=M𧼍rhfOlZuP￠\u0011\u001a\u000c\rx\u001cJ5\u000c𬐮si𨯝{P\u0018\u001dG3%'O\u0007\u000c\u001ea􊭴x:􁏊􆅌+髖fMP􁔻B\\nu\\\u000f:a4㪢qI\n{󻚓\u0015󾑌(r꾍EI㒚G𢨈>\u001c󹦌\u0019@*y\u001f4{,\u0017𥀖p\u0006􎙝R􁭟H,\u0011\u000b\u001f󶣷C!\u0016󺹳i}2󵬹󷕞pu\t?4\u0017诛갿\u0000\t7&\u000c𖽰󲠏􄷩􇈂\t&\u0007b𧈁'\u0000M:璸oI\u0013\u0005tG\u0013`/0\u001e𨦇v\u0008_c}m\u001fT7;he𥷰#𘙬󸥾􃠳S4K\u0019R;\u0017\u001f\u0005󹝠\u0002󴾺:彸\u0004|p<e𑅧➜챑}𘑤镊*\u001e9oZ'􌟋\u0007?𨰥+$𩵵[𩁶H􄙁\u0002\u001a2hN\"e\u0004𢗟􀀣g鸟G(G?𦺤󹐕;􎖲cF𛀜􁻺湡\u0019\u0017k^\u000f6𗧯ph{1!3𩇣6bCPZ􎃒E\u0010\tCJ𗼎\nglꖵd𦞀m𦁫3󵞺V\"􇻍\u001a􂸹0눗􆆫%BR\u0017󻰒~]\u0003-^\u001d􉩧\u0012_Q6mk𓃷N鵶˾Ib韽\u0008!hdBz\u0010\u0019\u001b\u001e\r\u001cG2{{\u0010Vw\u0008􅔪a9􌒽얳\u0012􌈩f\u0005𐼻\u0017w\u0016^\u0018rm컂\u0011𬵋r1**\"\u0011󼙝\t㋇H􎻝}.𥭸%\u0014픚􉍴}𑵂(\u0017CS􁚂w9!a\u001eKSL5\u0013棏]\u0004EU\u0019􀦭s𓇰B\u0014SOW\u0010𦄀46󲃼O<𔐥6􍜗\u000b膿%S𤘒\u0010󱽦4︭=38!\u0007􉅖w \u0011𤣏f<\u000e\u0004,m<\u0019􄉥2BX\\\u001eK塕#\u0003^󷷿Ṁ}S􃍆`\u0013𢊻M\u0006􇫁F&K𨅅6𥢨L\u001e\u0018e\u0017xp\u0015I󾲚.@>^ZN皍&WtKz(S&M\u000e`\u000e𬛬#󷂯C:^\u0017𤁊f\u0019\u00073jp/􂔼|p\u0016/9?Wn㗔\u001eH\u0005*𩃃􆠏𝆎ghࢱ􊆕T1𠥔𓀨󽚁=󰶎󵋅&1Z[󾵝󴲏4U\u0014󳭾K%2\u001fp&q􁯬o3QhHE:}\u0005hil􋩕fc\u000c\u00161U\u0006TK\u0012𪜺!4Ch>f\u0016V뿒QcXO3\t\u00161𭔺𤁕ii5;?\u0006󹼂󲴧W\u0012뇂yDu𠝕𢌫󵹀\"\u0004Vsg􉷝`󾨁:阠'\u0002E󲙀\u0016J\u0003ﲎ\u001e\rV)6K󴜙u\n􃍋\u001bWq4k'xZ\u0018󵑿Pp`𓍲\u0013s\u000bb'󺣮\u0010젵쇞.v􇖹W2u*󺬇\u000c\rc;=l2.𡉢􄧓𐌻'AT󽛰僔mc\u001b\u0013?Y\u0019󾰮erF?lU𫙜\u00162𡨈ZW\u0016e}𛁖i\r8󿐖%\u0010􂿔Wu\u001bwr\u0016Z󰗎\u0011\u0014*F󺝔j႔\u0015𑃔\u000f&幛t?\u0016:󳕅\u0004􋳫\\d\u001b\rV􀅆\u0010Y\u0001HDi#'#\u000e3\u0010󼔸􄛨hP'\u000f>,#;B-\u0003\u001c\u0008􇮜\\O𪐾𦃻茌𧝜r\u0013v󼼟\u0015wY>@P{&𞹵muC眙\u0010\u001eW\u0013bzp#\u000fNO\ng.f\u00018󿆘\u001fM3\u00029M#竜A,S𣎧\u0010iK\u0006i5\u0012􎉈𧹀93~\u001a;z銡H\u000en𒉅􌃮嘞h\u0001H\u000e󷲝rSW!􆹦󸶧\u0005,Texo􍡭\\U􎚑ef~\u0015A\u0018􋖲\u00081\u001ciW\u0019:i􃣆𘣋󻅒\u000c@댴^20\u0019n!􏍡\u0017'\t`\"^"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_9.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_9.json
index 13ed8789472..983b4e6d500 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_provider_9.json
@@ -1,5 +1,5 @@
 {
+    "code": "qXaaBJ",
     "key": "8QW8mjnVnIisvrtQDzWV",
-    "password": "7\u0018󲻱􈗪>#𤧝T􏷇e\thUr𮏺/𭥱o%\u0014\u000f o6n8仐c󾲐[C􂏽72@t;6t𩑬⸦𝝏\u0011\u0004􇪖\u000b\u0007S\u0001\u0019ey\u0006:\u0007ii>􇜓u-<􏬾􈞼\u0016[#b$<\r􁻝󼍺􍾛\u0017!e</\u0003\u001b𦪰\u001d\u000eF󱙖Z8#\u001e눐$7^\u0012P#!ȫ𢙜gY\nUw󾤾􁣠󾬤<wT%4J𗜬XWK󺲬F𠨫a`\u0018LJDRa|Bl󺋖S[]䩼퐮F\u0001p\u001dLZ2~>Wg󲉙d\u0010\u0018\u0003 @\u000f𭗠7\u0008(黂3\u0000􏂍!X\u001ce,t\u0003􋜄3🙵󺙽p󴑨𬿙𬿩l摘V]􄴧v𥊂MF\u000b*􀗵􄁥 \u001bT\u001a-剱0>`{|bal􂻉\u001b\u001f\u001d|\u0006󻁠V𣅙dq'6mCCjv&󷽽\u0014n9󹢼My[ K0p\\`6r𬧞􇮚\u0011$|#𡦤H\u0012?0{%`\u0002󵜻k!\u001eIg\u0001\u0016J\u001c{9b􂰤/4@􂽣ldKAH\u0003'8𬁲𫬷󷘖O􆧥Dko婑04%/N9B󴸬aW*􅚟󾴊w8\u0016\u001er=\u0019nX􅣞]\u0000\u001d􈕞𡿳􇦰\u0012EfW\t\u0016&GÄ2󶋆b󹵡􍎳󿩷5[f\u0015𘛺J/7曼\t4\u0001S\u0018;7𭌱R<;`L􏤾󹪢1?yCIiS𥘗\u001d\u001c\u0019\u001b𦊚LH𢏈\\:K󴱑MP}q𢀝J\u0003𥂓􀹈􎨞\u0000+X󻓂𬔩D}-!EF<wm:\u000cṉm[w\u001e3m󾑁\u000c\u000f𢝮bs璑C\u0005\u001e\u0000r\t𮓴\u0019􀔤%#𫰚􃰡􌿙쟪\u0019v󺻪\r󹵄\t\u0000j2|嚊,𥑪~6G\u000eyﳯK(\u0015𐊐􅤮{Er\u001a\u0013I\u0019\u0003􀼠\u0005𧉧,qo눯>\u0001E|𠁯6鮡􃖺吀\u0001<*x𫸤󷵜k\u0011\u0013𘄏\u0017\u0004|\u000f~grઆYyEY)Z𥿔&\u0014󳟿󵑋赗𤿁𢿿犴\u0013P0R(|󿅫(%Y4󿅕?3\u0005\u000b<X~𨹆a🞟ZcA􌩩𠬝D\u0014\u001b󵱀:t\u0005R󽶭hmq#x󷪚TC7l𗥞^󸞆𡍰\u001b\u0000\tfysN𢝔+`f舥\u001f(𦘎\u0002􃩜Rv[n^b.Kꣀ󿛆R\u0012}Tf\u001b줢#󻀡󳇚𩀎1y𫃾+㞫7\nt-\u001a\u0012g\u00014\u00003\u000b\u001be1󶻱󲠊\u000e𤘟:䭈􊜼Z ,\u0018{e𪗪\u0004H𧹨$V\u0002􉫌*\u0014絇T􄪳\u000f \u0019\u0019\u0004\u0018\u0001Y􌑇A𢛃NJ𡰠𗼩𫿕h􅑠􌶦bKFr'\u0010n@\u0019𢦟EK𤳶>\u0006U󱓘瞮Y\u000c0L\u0008󰰩\u0002󳞱,\ru['",
-    "code": "qXaaBJ"
-}
\ No newline at end of file
+    "password": "7\u0018󲻱􈗪>#𤧝T􏷇e\thUr𮏺/𭥱o%\u0014\u000f o6n8仐c󾲐[C􂏽72@t;6t𩑬⸦𝝏\u0011\u0004􇪖\u000b\u0007S\u0001\u0019ey\u0006:\u0007ii>􇜓u-<􏬾􈞼\u0016[#b$<\r􁻝󼍺􍾛\u0017!e</\u0003\u001b𦪰\u001d\u000eF󱙖Z8#\u001e눐$7^\u0012P#!ȫ𢙜gY\nUw󾤾􁣠󾬤<wT%4J𗜬XWK󺲬F𠨫a`\u0018LJDRa|Bl󺋖S[]䩼퐮F\u0001p\u001dLZ2~>Wg󲉙d\u0010\u0018\u0003 @\u000f𭗠7\u0008(黂3\u0000􏂍!X\u001ce,t\u0003􋜄3🙵󺙽p󴑨𬿙𬿩l摘V]􄴧v𥊂MF\u000b*􀗵􄁥 \u001bT\u001a-剱0>`{|bal􂻉\u001b\u001f\u001d|\u0006󻁠V𣅙dq'6mCCjv&󷽽\u0014n9󹢼My[ K0p\\`6r𬧞􇮚\u0011$|#𡦤H\u0012?0{%`\u0002󵜻k!\u001eIg\u0001\u0016J\u001c{9b􂰤/4@􂽣ldKAH\u0003'8𬁲𫬷󷘖O􆧥Dko婑04%/N9B󴸬aW*􅚟󾴊w8\u0016\u001er=\u0019nX􅣞]\u0000\u001d􈕞𡿳􇦰\u0012EfW\t\u0016&GÄ2󶋆b󹵡􍎳󿩷5[f\u0015𘛺J/7曼\t4\u0001S\u0018;7𭌱R<;`L􏤾󹪢1?yCIiS𥘗\u001d\u001c\u0019\u001b𦊚LH𢏈\\:K󴱑MP}q𢀝J\u0003𥂓􀹈􎨞\u0000+X󻓂𬔩D}-!EF<wm:\u000cṉm[w\u001e3m󾑁\u000c\u000f𢝮bs璑C\u0005\u001e\u0000r\t𮓴\u0019􀔤%#𫰚􃰡􌿙쟪\u0019v󺻪\r󹵄\t\u0000j2|嚊,𥑪~6G\u000eyﳯK(\u0015𐊐􅤮{Er\u001a\u0013I\u0019\u0003􀼠\u0005𧉧,qo눯>\u0001E|𠁯6鮡􃖺吀\u0001<*x𫸤󷵜k\u0011\u0013𘄏\u0017\u0004|\u000f~grઆYyEY)Z𥿔&\u0014󳟿󵑋赗𤿁𢿿犴\u0013P0R(|󿅫(%Y4󿅕?3\u0005\u000b<X~𨹆a🞟ZcA􌩩𠬝D\u0014\u001b󵱀:t\u0005R󽶭hmq#x󷪚TC7l𗥞^󸞆𡍰\u001b\u0000\tfysN𢝔+`f舥\u001f(𦘎\u0002􃩜Rv[n^b.Kꣀ󿛆R\u0012}Tf\u001b줢#󻀡󳇚𩀎1y𫃾+㞫7\nt-\u001a\u0012g\u00014\u00003\u000b\u001be1󶻱󲠊\u000e𤘟:䭈􊜼Z ,\u0018{e𪗪\u0004H𧹨$V\u0002􉫌*\u0014絇T􄪳\u000f \u0019\u0019\u0004\u0018\u0001Y􌑇A𢛃NJ𡰠𗼩𫿕h􅑠􌶦bKFr'\u0010n@\u0019𢦟EK𤳶>\u0006U󱓘瞮Y\u000c0L\u0008󰰩\u0002󳞱,\ru['"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_1.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_1.json
index ce059c7226a..7328dbef7ee 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_1.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_1.json
@@ -1,5 +1,5 @@
 {
+    "code": "uLtYG9FEhpfNHht=ndxYbhEsOaZJJTPjEsBsnJt0UngpmW5OvqpW2F9E5VuFikdraC8s1xMQs9yOzKlgdV4rf371UTMjWzc59HdqfqFDx8=ARnQtIJ8VyAnd784fYJv2A=IiSQJhfc=tc7UKa4n_TN9Hq7BvAQ0YLBFuCRsH1cBsr35-I0aEKev_48AFCC2r2LceURv7tsXpODU=pjneuYFQSD2u8GmiQ3NxRqJEiIfvj3IE_S2gFTqb3Qod=rvVoT7yAejNg=F89T6bacNnzM-sdRhB7ZoQrQYQRc7j7d_1hDOzKsmkBVqpZ3466SwlHld09GyIAYBOo7TipyvgBENFlXnor2sPS2TwCtzmMdyMxhEt780DAdUgiasCsS08_rFrx3j8_wNCBzYsWRTYi7LSaY_IxpcH-mOkH86L=8SAMcCs_pJpKsoWa1EY4Ep0h8jTspHT-6tKd2s0gT_v5GvTPEg8BZyz04gt6I5JgdSrOJ1A0=w_zy4O-KSS-ba73v2v4p3x-N19X88brW3VCwbqgS_G3DAMDEr76Ekn7q0UMAd2MR13SgKWjM35lFtS6vN6b5a4QVqIxOqAvA2EPHV2UY4zGhJsgl7KpgtCzUMKIl-mTyjXP_a_c9y0uu9u6I",
     "email": "\u0002Q=萱k@",
-    "password": "Tu􆢵8\u0013\"9\u000cB]𫧆\u0010<􈋋.C<6W sgS8_􈓌\n\nD$A\u0010鰞I\u0003󳋷跌\u001d>𒑖S𒅘EI_󴽘 a[𤊰󲼶𝄖\u00170﮽\t󺉨~죻$`\u0011𠘄y.Q)\u0016a󵚭\u000f^𩗉󰑹+\u0008E𢷞P\u000f\u001a\u000eg}>🤷>\u0015&HS𫭱󱙼M\u0010\"~?󺜵gd刍\u0012\\)􃄘F\u001fI􎟛V🌘\u0006𮨕[T5'wP\u000f\u0014!y+d\u001f𬒦󶌬󴼺\u0007h\u00122r\u0016~󽇘I\u0016YO\u0004􋯶sT𢍨6q\u0010Xjp(ᰛ\u000ec\u001c\u0007􆇮fc>8?Sy\u001c\u000f몋\nN\u000b&O俶􀟉\u0006/\u00178𮜹􋷬𩌣𗽺k笷𗖩b\u0017]\\\u0018\u0011;3 j3F+􉓛.0冀(p􅅽H\u0017j⾙d\u000e𢽵W] Hz@Eb􄂄zW}\u001f칛!\u0016;󶶏T\u0013![*BS􅌧w]쎡3\u0006􀴕𫐚G.A\u0019}%\u0014\u000bk𪅓\u0013Tf\u0011\u0003󶔜\u0004&󳖞o.ﻧE?jK|6z􇭾BC\u0011ዏ𮔟!>\u0001󱊸\t;Y廒\u0001#𝨄\u0016`w%\u0002\u0018𢌉zT􏲈2􏬙\u0018>Ü𗋢𧔨&7 8U\u001e4籢􉓺􀃫--\"\u0017",
-    "code": "uLtYG9FEhpfNHht=ndxYbhEsOaZJJTPjEsBsnJt0UngpmW5OvqpW2F9E5VuFikdraC8s1xMQs9yOzKlgdV4rf371UTMjWzc59HdqfqFDx8=ARnQtIJ8VyAnd784fYJv2A=IiSQJhfc=tc7UKa4n_TN9Hq7BvAQ0YLBFuCRsH1cBsr35-I0aEKev_48AFCC2r2LceURv7tsXpODU=pjneuYFQSD2u8GmiQ3NxRqJEiIfvj3IE_S2gFTqb3Qod=rvVoT7yAejNg=F89T6bacNnzM-sdRhB7ZoQrQYQRc7j7d_1hDOzKsmkBVqpZ3466SwlHld09GyIAYBOo7TipyvgBENFlXnor2sPS2TwCtzmMdyMxhEt780DAdUgiasCsS08_rFrx3j8_wNCBzYsWRTYi7LSaY_IxpcH-mOkH86L=8SAMcCs_pJpKsoWa1EY4Ep0h8jTspHT-6tKd2s0gT_v5GvTPEg8BZyz04gt6I5JgdSrOJ1A0=w_zy4O-KSS-ba73v2v4p3x-N19X88brW3VCwbqgS_G3DAMDEr76Ekn7q0UMAd2MR13SgKWjM35lFtS6vN6b5a4QVqIxOqAvA2EPHV2UY4zGhJsgl7KpgtCzUMKIl-mTyjXP_a_c9y0uu9u6I"
-}
\ No newline at end of file
+    "password": "Tu􆢵8\u0013\"9\u000cB]𫧆\u0010<􈋋.C<6W sgS8_􈓌\n\nD$A\u0010鰞I\u0003󳋷跌\u001d>𒑖S𒅘EI_󴽘 a[𤊰󲼶𝄖\u00170﮽\t󺉨~죻$`\u0011𠘄y.Q)\u0016a󵚭\u000f^𩗉󰑹+\u0008E𢷞P\u000f\u001a\u000eg}>🤷>\u0015&HS𫭱󱙼M\u0010\"~?󺜵gd刍\u0012\\)􃄘F\u001fI􎟛V🌘\u0006𮨕[T5'wP\u000f\u0014!y+d\u001f𬒦󶌬󴼺\u0007h\u00122r\u0016~󽇘I\u0016YO\u0004􋯶sT𢍨6q\u0010Xjp(ᰛ\u000ec\u001c\u0007􆇮fc>8?Sy\u001c\u000f몋\nN\u000b&O俶􀟉\u0006/\u00178𮜹􋷬𩌣𗽺k笷𗖩b\u0017]\\\u0018\u0011;3 j3F+􉓛.0冀(p􅅽H\u0017j⾙d\u000e𢽵W] Hz@Eb􄂄zW}\u001f칛!\u0016;󶶏T\u0013![*BS􅌧w]쎡3\u0006􀴕𫐚G.A\u0019}%\u0014\u000bk𪅓\u0013Tf\u0011\u0003󶔜\u0004&󳖞o.ﻧE?jK|6z􇭾BC\u0011ዏ𮔟!>\u0001󱊸\t;Y廒\u0001#𝨄\u0016`w%\u0002\u0018𢌉zT􏲈2􏬙\u0018>Ü𗋢𧔨&7 8U\u001e4籢􉓺􀃫--\"\u0017"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_10.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_10.json
index 27d8b99b5dc..e2de4e1dcf5 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_10.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_10.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+9868360466",
+    "code": "XN46KP0FmYS7lNGLjjqWYNLUWhPsIIWw_uCi7=2ykPbWDB1UMR97y3rlxkhy7rUQPMyoVm5bwoVGATyN1Tps5dGy8ZojWlX5ESixwgzTJ-4JiOGMwZAkzA8ebLHE7w0D2APu77pur3=X2pU3=paqSBe7U6qSgYP0vmogT_XVJEHvEqGP9qI7wCeF4mBu8WyazncZ8wvb_Ag0AW1vfq=U9coksPKZLLqMByf_XXCgtuNWIikeLYx0qhNMy4cLjYyKXQOfnfFUvYFj01x2pOJqVOnz=",
     "password": "Pc=𑐐𤙴~ix􀋳4Bv=j󼀢Rj􌇰\u001b\u001ehm\u0002𨆴F𨁿𧝻\u0005𩛨\u0003\u0010/$,\u000bm󿆙0zS褳\u000b\u0011爨\u0002\n\u0017\u0004甿N`??嚤\u001c\nh􋪊/m\u001ee\u000ehP!\u000c+Hv\u0000.k\"⑀\u0017Q􎂑𠕮%􆅅󺖇D\u000f8X_pI\u0013󼨧${c𨬦𬟘7󳺭qZ\u001d-\u0005vze@𬵥\u000eK\u001c3󽱌\ni\u0006i𣴾/!\u0013󵛲\u0008TV}\u001b\u0018RlY8\u000f𡄽xo쾟\\𮏙\u000c󾲂𠾁H\u0000킐qZ\u0007?G4𤭹􅖏𣼨m󱖗WX󳾗L3'𤽢S𨱷攢[SlhR𥖩'6󺎀g􃴖;t\u0000\u000b\u0005󸍏'Wx\u0000|𢣖𦐽\u0011gᇐ󻸍\u000b<􇣄󿧹n\u0010?Nn\u0006e\u000e郥F;\n⽁wG慈\u000f9􀩒\u0016pCq8\u0004O4| !\u001f\u0013閆\u0019\u0015,`'{4𬦛x󹱕\u0000&~w4YtF]e𘦌#\u0019]𫹘K8X\u0002\u0006㚷𢞏J\u001c􈗆𤭰?􄕛􋀭%𭃸N\t\u0002\u0011𧰴󶠶𩨪\"􆜁\u0010뷤\u0006=㝤󺍒)󱟋\u000e\u0008\u0005,𤃓xI$𗛱𢇤\u000ems𧭓K㖅R\u0018鋇9\u0018ﶠ\"\rW2󾿂ql$𥭠uwڃx9u𨮓ᇳ\u0006씖𠮳yT:7*𨊝󶣑v7z>Y|\\\u000f\\ _k􊙌󲞯:\n𗋛Y\u001a\u0006s4Y&Y]+5g𮮸􎝵!\u0004󰌈\u000c󾩺z昧M\u000f󻰨!;`8-𩫈􍰆&nh&돂󳦈{`>o󲑚dt-\u0015󲯟6􏖳C𬹯\u0005l󲖎𭓋WKb6\u0006fz𮀬\u0012\u001f*t\t\"Uz{􃐼\u001bጶ\u0004Sp\u001b+5~\u0004z􂒖\u0006u/!\r慬ቅc􂵼ᜊI\u0007U3M1)l󳪴P\u001b䎦:<{\u0003uVsp3X􀸸\u000e;:\\`i8SL's󰎻d𘆧UnI",
-    "code": "XN46KP0FmYS7lNGLjjqWYNLUWhPsIIWw_uCi7=2ykPbWDB1UMR97y3rlxkhy7rUQPMyoVm5bwoVGATyN1Tps5dGy8ZojWlX5ESixwgzTJ-4JiOGMwZAkzA8ebLHE7w0D2APu77pur3=X2pU3=paqSBe7U6qSgYP0vmogT_XVJEHvEqGP9qI7wCeF4mBu8WyazncZ8wvb_Ag0AW1vfq=U9coksPKZLLqMByf_XXCgtuNWIikeLYx0qhNMy4cLjYyKXQOfnfFUvYFj01x2pOJqVOnz="
-}
\ No newline at end of file
+    "phone": "+9868360466"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_11.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_11.json
index 6dca01cf241..b11cc7dffa8 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_11.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_11.json
@@ -1,5 +1,5 @@
 {
+    "code": "AATe5J7gYuNUJw2BWIgyUJ7ld=oZlXDJ90izhMBkm1YvY5P0veHAIZznC7vIb6Z9kqILaWeeMdo10U9FLaWB78Fm1976InX8VLss4e0MP0zB=6LE7monmdCppp_0U88bw2_=6ouW-DzfjrRws4xG-hqwE8kYTf5poAMn26xQbqSRcfwNdD5xfTer1-OsVP-toLd2DwulQ0cHZh9RaosS4Qug6c-K9Fi64WteCMZqeapifL9KIHggmJGBgwN1SSb2iOOfNHRLkHzoXHte0ULW3cXwHTEnl=5a0n4XO59UeTMrjNeVaEYXakxsuagxAce3bZoLCnMeCMgBjJRwCeBIBQjY4WjQ5Q-igN8u4wAAReQ0NtVZpXhGnKYA5g-HQos4nWGfYhNYw5xH1hbS=zAGCksBP9Fd4lqx_oL_fCtK5rjBmAnEtdZD6wETNupejUgC1gLSLKJxa6cTSGvk21-3f-WgMbYDv0HPCzp-w8ZKyhXsD_ndJhm60sBvOc43HCFM8Ruz2WldUSX3GhoyqHBfKABXDWsRZHrs3ssUrYhsconyesE1E6aDxTXC1N6bG-_MEYvPhKzZbmOxiGWTsMYETe7lb=l2OCD1l=EJUyCX8T2_DLH2LlJ87BNkp156_UAmRyaPAaRSS9icTdM4bsHmFeAqoe=stSY5UDB=C3JbXKXbW-1bZMk-HRl3WtYxDO74CSarkSEesdrJwwgbbTvgXfBj7Mth8zBdSCndU9U5GQYBm5i2nPKY=fel2V=YgAF5_8XLi95A",
     "key": "DDWmxyZvXA==",
-    "password": "B!󾽜}up\u0015据p􅂮􁬉 鯎󹳊]􏰁􃌨\u0012M𠆫.\u001c𨼩􄺨LEKN󽘄@0\u000f_j!\u000b󰴜<\u0005\u0008pJ2\u0017󲜋v}\u0012a𮜩\u001d\u0010싨8W􍝠󿇡\u0012􎋏E%􏤒\u0002>\u0011]f\u001as𠣝𩂺󷠐\u0001􃌽t.>㟽4>\u00149\u0008]f@k󼢏\u0019:󶖀D􎿨\u0002\u000f󶡮\u001a\u0007󴁣\u0002󽦹ua\r;I🨫􃭚𦴫)>sa1-󲊜R}􋕊^გ􋠙\u000c\u0014t\u001aJ􇂒W^罷a wajy􆾘%Scn𧨠9󲔤𡤔b\u001bG}y􎼁xg\u0000$􉭍w)\n9",
-    "code": "AATe5J7gYuNUJw2BWIgyUJ7ld=oZlXDJ90izhMBkm1YvY5P0veHAIZznC7vIb6Z9kqILaWeeMdo10U9FLaWB78Fm1976InX8VLss4e0MP0zB=6LE7monmdCppp_0U88bw2_=6ouW-DzfjrRws4xG-hqwE8kYTf5poAMn26xQbqSRcfwNdD5xfTer1-OsVP-toLd2DwulQ0cHZh9RaosS4Qug6c-K9Fi64WteCMZqeapifL9KIHggmJGBgwN1SSb2iOOfNHRLkHzoXHte0ULW3cXwHTEnl=5a0n4XO59UeTMrjNeVaEYXakxsuagxAce3bZoLCnMeCMgBjJRwCeBIBQjY4WjQ5Q-igN8u4wAAReQ0NtVZpXhGnKYA5g-HQos4nWGfYhNYw5xH1hbS=zAGCksBP9Fd4lqx_oL_fCtK5rjBmAnEtdZD6wETNupejUgC1gLSLKJxa6cTSGvk21-3f-WgMbYDv0HPCzp-w8ZKyhXsD_ndJhm60sBvOc43HCFM8Ruz2WldUSX3GhoyqHBfKABXDWsRZHrs3ssUrYhsconyesE1E6aDxTXC1N6bG-_MEYvPhKzZbmOxiGWTsMYETe7lb=l2OCD1l=EJUyCX8T2_DLH2LlJ87BNkp156_UAmRyaPAaRSS9icTdM4bsHmFeAqoe=stSY5UDB=C3JbXKXbW-1bZMk-HRl3WtYxDO74CSarkSEesdrJwwgbbTvgXfBj7Mth8zBdSCndU9U5GQYBm5i2nPKY=fel2V=YgAF5_8XLi95A"
-}
\ No newline at end of file
+    "password": "B!󾽜}up\u0015据p􅂮􁬉 鯎󹳊]􏰁􃌨\u0012M𠆫.\u001c𨼩􄺨LEKN󽘄@0\u000f_j!\u000b󰴜<\u0005\u0008pJ2\u0017󲜋v}\u0012a𮜩\u001d\u0010싨8W􍝠󿇡\u0012􎋏E%􏤒\u0002>\u0011]f\u001as𠣝𩂺󷠐\u0001􃌽t.>㟽4>\u00149\u0008]f@k󼢏\u0019:󶖀D􎿨\u0002\u000f󶡮\u001a\u0007󴁣\u0002󽦹ua\r;I🨫􃭚𦴫)>sa1-󲊜R}􋕊^გ􋠙\u000c\u0014t\u001aJ􇂒W^罷a wajy􆾘%Scn𧨠9󲔤𡤔b\u001bG}y􎼁xg\u0000$􉭍w)\n9"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_12.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_12.json
index 0121f2185c8..797d2e40a6f 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_12.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_12.json
@@ -1,5 +1,5 @@
 {
+    "code": "GkNBvt5WkpZiqOtxpVKuBy8dXcbWuV8x4ejoV3EHdIAU=fZo3d_PjWQ36EzyO9eGbt5F8oQ=7vBzrTr9dpeETyJQWi9Vu38Efi7Dz-zsBvBp9p=AszTX69gzjPQ-xgcPvCw2Kvv6EStPojy",
     "email": "(𢶈\u0019=]=\u0007@𪸹\u0016\u0008\nﮛ\u000b&􈝾",
-    "password": "\u00118莱\u0010\u0011꡶~KSy0􌍉\u001f𥌴lR􍴸+!\u0018\u0018[kv\u0016<\u0018􀘑kW󴚛𧽺+刻i[癭e2[u#\u0018 ",
-    "code": "GkNBvt5WkpZiqOtxpVKuBy8dXcbWuV8x4ejoV3EHdIAU=fZo3d_PjWQ36EzyO9eGbt5F8oQ=7vBzrTr9dpeETyJQWi9Vu38Efi7Dz-zsBvBp9p=AszTX69gzjPQ-xgcPvCw2Kvv6EStPojy"
-}
\ No newline at end of file
+    "password": "\u00118莱\u0010\u0011꡶~KSy0􌍉\u001f𥌴lR􍴸+!\u0018\u0018[kv\u0016<\u0018􀘑kW󴚛𧽺+刻i[癭e2[u#\u0018 "
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_13.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_13.json
index 208819e1223..863a868173f 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_13.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_13.json
@@ -1,5 +1,5 @@
 {
+    "code": "hidTvA__HaXG0Xa3Ko28nN8AQpYNQf0bdzzlgcsBJ76LL6AqUqJRE6D4G_OF0GF-Xxpbgz1OdRLxVXST7QbLsMVyMkIDamWXJa2TkKzcdZZb4hhVDZnIaWYjSfIHLMZa-ywj6C=a-nd2=E62_Lde3qlQ8544-iTn9TzY-CAqGOyrlwysJJNeib_F8Q1u-VW_blqtP3Oo0=18FlDa9y5U3ARIUQ4IAb5OG4XpvaspBuW_-PSrC79vNmABk0vuwM0DLFQAJNuwmRCOF2mvoQF6rMrYsSdJUYB=Pt5Mv5pGRbUwsdUYT-L3HXk77Ebd=c=nfxW34JvGdCZaqbE1_KnqZ1SA=WFGJ6SZfkmPEGwWkwDT=AKsDeekP_L-7zvQHesSE1xdHYs1LWXGYDYCRWDFzLpy3PTtNoIdKj0HvGubtuJK-3DfFUhG4IeA8qmTPHK8TbLD1KlH-eIfsgrPkVX=ik5Jww4AdPDBl-Ad=si9bWREe1Mzn42pP__pu8h1XL8ue5-z3JLbkDLiuFowzzZZj60a-gtf2hlluf9AVqcM_-6herg58y9GRr8xU3Y5Yuno1Fc_eGGshq5RNh5mbE4VUU7BfRweH6su=q=mxLyy62CZ68FUArY=CL_5SscZ5=e6zCf1=Al96BiNilAu0trDDqg0VCagXf_r4-bwSc159X=WNAI6NpQASkXyxg73ouQwsoX-enuFdb7oJWlnfDABZR4FE8sEO=VCc3A4iYUL1LsqaZ",
     "key": "Pvdg7A==",
-    "password": "NQi󿓙6\u0014(㩓-I𮝊\u0010\u0011sA'巛\t\u001fE6\\\u0012W󱑔\u0012On􌴼m𖡸g󴄚k\u000e\u000c'5\u0014%5\u0000}_K8󹯦1㪃B𩹓5􏍚=/)RYG\\\u001b󵻹xd󰀚\u00001R󽂃C!B|1t𗥻r󺘡暛\u0004t𭪩Xz\u001cI𫉪f􁲔7N2^ d:愫\u001blo𮑣OPgZ\u0007\u0012󾘑.x\u0016/󶄚y(𬝃\u0019Bo3\u001a\u000b􊋉\t󶚤󼗈K􅾌{𦚟Q(𒅙M𘘙􃏛;`rO\u000c𧊓=q%Y􂯨𘎥\u001a𢠕 UM\u000c𨷭\u0001D7,\u000bGnW\u001c3>\u000b+\u0004zuQ{JtF\u001c|쪿+􍮛{𒅵3󳑙XfBgA\u001b\u001e[\u0013#􎉣􀟷i􉴲\u0013*\n<3!𦻂\u000e(\u001f\u0011BVHm𪼥􏕼\u0008g󷸐\u0014H!X𢣉q\u001c\u001fW\u0007r_#𬱀󲱶\u001a\u001f\\󿣡𗓾󽪷7\u0014㲨􌱾H􁗳\u0014𫽇\n7oEg\u001f\u0002\u0003\"|J߾􍆚n󻺁&d󲙎𨕤CK\u0018?𗫍𤦠\u0010\u0010\u0006\u0000H\u0019w\u000c?\u0019\tv^\u0003X\u001b\u001e𗙷\u001d\u000e\u001fB7lFo\u0002󵆠䓰 \u0016􌰖Lꑕ+J铂Ov󹀐6#9@\u001e\u0008'dAKT'tzk󺧒\n\u00123􊗭YI禽\"􆯑xY\u0013􂗯ꏓ\u001a}9nyZv􏁒\u0007\u00126r􂠯𘪂:\u0012'󾟚𦇒 𤗽9&\u0015o-Y,[󳧠_􃣍\u0017l􉱉\u001d儌\u000c \u0019v}𩌯.󵨊\u0017hgE\u0014c\u0000]H\u000c1\u0008W􁝃\u0001󾳓QnV󷶗\u001e5\u001e𡡵7I􉧩a\u0000SF,W豅7~rO󺨛]􉓀?c𗩎WlpOk\nok\\􎵓DC7\u0003\u000c@\u0015J8󿑶\u0017e(A󿸑𥵭.\u0008􉆓oJ􊯬c\u00030p􉺰🆍&Hp_w\u0006\t\u0015&T9`󼷷s腑\u0010_𦥈v\u0006h\u0006F\u0013]\u0007\u0015H;lMLOqz󳺧􏆙t@󳐌aK]*\u00171\u0004큁7b\u001a𪀈鹩E塴pHt􌃓𠞀A麷󰳚\u000f\u0019\u0012X󰇼P%o?􍉒\u0002\u001ex)r󶽡t𩕘A\"?8伫\u001a𭟱^\u0015𩡞\u000310kV󺶘𓇹55𝟲琠\u001dC&S􊙎g1\u0005ku2ytc\u0002\u0016&;\rU􅗔'󳘏+OX9_\u00045fp<YkQG󺷃𡴩􅌜o􂎝\u001b󷜅𒅒ｲ\t􅥠𬁜𓅸z\"\u0015𡠇!%\u001d`􊶣[\u000e\u0017r 25􀖐+􊍃󷿼󾫚&*5󶥤𠭆🍝k~@8kⱍG;]󱕝\u00102e.𢾼+7􃃸􉵛K00\u0014^WZ\u0011u𭓕\u0001#>\u0015枼𬳎!9s's\u0014\u0007sP\t|\u000b\u0010T󰻐V􍇺,󱀪6𢐶P\u001e\u0016\u001f\u001b󾛣\u001b\u0001+8<;/+\u0006Bq𢑔􀢸Y󶙼빹nጧ8\u000fF\u0007\u001f(}'\"/煃Y?𧻫}n뇶=4\u000eC-󾴽\u0001\\/eI'􀚜u.5𩡳Y\u0017Y('兞\u0010z7b󱸡0𪋪􊿙sNkD􏿇\u000e󺬢|-\nA\"Em&Sj^𫥓}\u0005🚵\u000eEq􉟙𤦫ES65.E\u0007􁔤\u0004{\u0016(߰\u0019\u00053\"qZ}2\u0017i'(󱲾Dur c-\\c㉐M9mY\u0003L*eAuQ桏5en󰠋u𬱵\u001d7𘕹w􌧜+\u000c\u000eYd\\𡟽𗅱}<g`𐡢𤟐M냼􆗈\"%\u000f\u000eI;y􍨐􅱀\u001d\u0015ꎊ􀪍M󲿘O􃴋Ks\u0003\u001c3〉UW~`\u0018\u00106󹢻[𭋩ᮅ]W+aUq9q7󳉽\u0019{\u0018\u00192\u0014u􊸳䧅𦺿󲗳^\u0000𪁾\tq𖣪vLMm􌑿\u0008&: u\u0008LvA\u0018p4.􂭆\u000e\u0002𝈏O$y𥘰ggU-䄹(\n3\u0004M6*h\u000eE=+\u0001}I`䛭d󿚭+n%𧹑\u001c󰷶ud>\u0019$W뾂󶘤>7",
-    "code": "hidTvA__HaXG0Xa3Ko28nN8AQpYNQf0bdzzlgcsBJ76LL6AqUqJRE6D4G_OF0GF-Xxpbgz1OdRLxVXST7QbLsMVyMkIDamWXJa2TkKzcdZZb4hhVDZnIaWYjSfIHLMZa-ywj6C=a-nd2=E62_Lde3qlQ8544-iTn9TzY-CAqGOyrlwysJJNeib_F8Q1u-VW_blqtP3Oo0=18FlDa9y5U3ARIUQ4IAb5OG4XpvaspBuW_-PSrC79vNmABk0vuwM0DLFQAJNuwmRCOF2mvoQF6rMrYsSdJUYB=Pt5Mv5pGRbUwsdUYT-L3HXk77Ebd=c=nfxW34JvGdCZaqbE1_KnqZ1SA=WFGJ6SZfkmPEGwWkwDT=AKsDeekP_L-7zvQHesSE1xdHYs1LWXGYDYCRWDFzLpy3PTtNoIdKj0HvGubtuJK-3DfFUhG4IeA8qmTPHK8TbLD1KlH-eIfsgrPkVX=ik5Jww4AdPDBl-Ad=si9bWREe1Mzn42pP__pu8h1XL8ue5-z3JLbkDLiuFowzzZZj60a-gtf2hlluf9AVqcM_-6herg58y9GRr8xU3Y5Yuno1Fc_eGGshq5RNh5mbE4VUU7BfRweH6su=q=mxLyy62CZ68FUArY=CL_5SscZ5=e6zCf1=Al96BiNilAu0trDDqg0VCagXf_r4-bwSc159X=WNAI6NpQASkXyxg73ouQwsoX-enuFdb7oJWlnfDABZR4FE8sEO=VCc3A4iYUL1LsqaZ"
-}
\ No newline at end of file
+    "password": "NQi󿓙6\u0014(㩓-I𮝊\u0010\u0011sA'巛\t\u001fE6\\\u0012W󱑔\u0012On􌴼m𖡸g󴄚k\u000e\u000c'5\u0014%5\u0000}_K8󹯦1㪃B𩹓5􏍚=/)RYG\\\u001b󵻹xd󰀚\u00001R󽂃C!B|1t𗥻r󺘡暛\u0004t𭪩Xz\u001cI𫉪f􁲔7N2^ d:愫\u001blo𮑣OPgZ\u0007\u0012󾘑.x\u0016/󶄚y(𬝃\u0019Bo3\u001a\u000b􊋉\t󶚤󼗈K􅾌{𦚟Q(𒅙M𘘙􃏛;`rO\u000c𧊓=q%Y􂯨𘎥\u001a𢠕 UM\u000c𨷭\u0001D7,\u000bGnW\u001c3>\u000b+\u0004zuQ{JtF\u001c|쪿+􍮛{𒅵3󳑙XfBgA\u001b\u001e[\u0013#􎉣􀟷i􉴲\u0013*\n<3!𦻂\u000e(\u001f\u0011BVHm𪼥􏕼\u0008g󷸐\u0014H!X𢣉q\u001c\u001fW\u0007r_#𬱀󲱶\u001a\u001f\\󿣡𗓾󽪷7\u0014㲨􌱾H􁗳\u0014𫽇\n7oEg\u001f\u0002\u0003\"|J߾􍆚n󻺁&d󲙎𨕤CK\u0018?𗫍𤦠\u0010\u0010\u0006\u0000H\u0019w\u000c?\u0019\tv^\u0003X\u001b\u001e𗙷\u001d\u000e\u001fB7lFo\u0002󵆠䓰 \u0016􌰖Lꑕ+J铂Ov󹀐6#9@\u001e\u0008'dAKT'tzk󺧒\n\u00123􊗭YI禽\"􆯑xY\u0013􂗯ꏓ\u001a}9nyZv􏁒\u0007\u00126r􂠯𘪂:\u0012'󾟚𦇒 𤗽9&\u0015o-Y,[󳧠_􃣍\u0017l􉱉\u001d儌\u000c \u0019v}𩌯.󵨊\u0017hgE\u0014c\u0000]H\u000c1\u0008W􁝃\u0001󾳓QnV󷶗\u001e5\u001e𡡵7I􉧩a\u0000SF,W豅7~rO󺨛]􉓀?c𗩎WlpOk\nok\\􎵓DC7\u0003\u000c@\u0015J8󿑶\u0017e(A󿸑𥵭.\u0008􉆓oJ􊯬c\u00030p􉺰🆍&Hp_w\u0006\t\u0015&T9`󼷷s腑\u0010_𦥈v\u0006h\u0006F\u0013]\u0007\u0015H;lMLOqz󳺧􏆙t@󳐌aK]*\u00171\u0004큁7b\u001a𪀈鹩E塴pHt􌃓𠞀A麷󰳚\u000f\u0019\u0012X󰇼P%o?􍉒\u0002\u001ex)r󶽡t𩕘A\"?8伫\u001a𭟱^\u0015𩡞\u000310kV󺶘𓇹55𝟲琠\u001dC&S􊙎g1\u0005ku2ytc\u0002\u0016&;\rU􅗔'󳘏+OX9_\u00045fp<YkQG󺷃𡴩􅌜o􂎝\u001b󷜅𒅒ｲ\t􅥠𬁜𓅸z\"\u0015𡠇!%\u001d`􊶣[\u000e\u0017r 25􀖐+􊍃󷿼󾫚&*5󶥤𠭆🍝k~@8kⱍG;]󱕝\u00102e.𢾼+7􃃸􉵛K00\u0014^WZ\u0011u𭓕\u0001#>\u0015枼𬳎!9s's\u0014\u0007sP\t|\u000b\u0010T󰻐V􍇺,󱀪6𢐶P\u001e\u0016\u001f\u001b󾛣\u001b\u0001+8<;/+\u0006Bq𢑔􀢸Y󶙼빹nጧ8\u000fF\u0007\u001f(}'\"/煃Y?𧻫}n뇶=4\u000eC-󾴽\u0001\\/eI'􀚜u.5𩡳Y\u0017Y('兞\u0010z7b󱸡0𪋪􊿙sNkD􏿇\u000e󺬢|-\nA\"Em&Sj^𫥓}\u0005🚵\u000eEq􉟙𤦫ES65.E\u0007􁔤\u0004{\u0016(߰\u0019\u00053\"qZ}2\u0017i'(󱲾Dur c-\\c㉐M9mY\u0003L*eAuQ桏5en󰠋u𬱵\u001d7𘕹w􌧜+\u000c\u000eYd\\𡟽𗅱}<g`𐡢𤟐M냼􆗈\"%\u000f\u000eI;y􍨐􅱀\u001d\u0015ꎊ􀪍M󲿘O􃴋Ks\u0003\u001c3〉UW~`\u0018\u00106󹢻[𭋩ᮅ]W+aUq9q7󳉽\u0019{\u0018\u00192\u0014u􊸳䧅𦺿󲗳^\u0000𪁾\tq𖣪vLMm􌑿\u0008&: u\u0008LvA\u0018p4.􂭆\u000e\u0002𝈏O$y𥘰ggU-䄹(\n3\u0004M6*h\u000eE=+\u0001}I`䛭d󿚭+n%𧹑\u001c󰷶ud>\u0019$W뾂󶘤>7"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_14.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_14.json
index d72f8c9ab61..6d6080bb458 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_14.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_14.json
@@ -1,5 +1,5 @@
 {
+    "code": "FSTMhXuS1rYF_f_3aJfy8sn7CaY7BMCg6onJCAqtnt54fEvCkS40ml06ufrX9wvy192yCErw5Xei33_FoSQmC0RAjRN9eLFSBq15MclWbPrIsrwluYCiLmIB72IaR7ig8xGPv3-H8v=J_5xfvvpYRYSFZMZvTwTHKqaRL_uF8r=JULb6AQnLUG6__-nBrCq=91TRJ26VknMDuFrk-0Tfu72OJ73LrGfJqmWCR7gcFeyACyR17n3FI4GQquQ5Bb5qbfl5KZc7W_E3H=5sScZCa9r2Hj9ot5noSq-9nq2NlptoDc4mYTaWklhfbNCT8Wn2=3T8GfAx9nYW__2ZyAPlW9NPmbRSj5FYqqJAprLVa4GrT=PELXTFIba3inReJYtM4thgQ2LAgZYew4L0YGpIMOgr=uFKs3I3u4Bgd_77uNR-wayH3ENL0A97aV7p9DLLC6A2FeVugc2jMn1wViS06PkxJoM5ZtGZkibUTuycstG3VmGtC8ZMR3q2lAVNsfsiugBUZLg=MtzPz2Pqe=QaxCNq5N04ekL",
     "email": "󿦘Q?􇩑􌾱@𫪞󴩴䤐",
-    "password": "A􈉖9YM4fO􊈾s􋍂\u0005\u0012\u00081𫸍\u0000#􉥳𬶼󸻰f󾏞ញ,z$h#\u000c\u0003࣫\u001f5󳑍识.𩹯 􄳩\tiW\u001a𭳌V\u001a5\u001b\u001a\u0001􇱒\u0013\u001df-J𡯠}0\u0012(&R*}𦗂6\u0019\u0012$\u0012e\u0017𪎏@ 󰺑M5N狭􆇳O㒅\u000f:]䝃\u0003󻻌됣*󸎅qGﴬ<&􏭝罺\u0006􄓃\u001b{\r󵼱l󲎿\\\u0007\u0019\t.𨩢󿸈\u0006{4g\u0005\u0017\u0005𝔎\u0018)a{=J#XSJ\t戍/\u000cu󷙞v2YZY-k$ #4𥵽^\\􎊶\u0013>b/5-Z}𢬢\r>󼇈\u0003\u0008\u001cRS9\u000bE&\u0018\u000fz#m5z\u0006\u0012pe𧱻0𩭠픝Q𣗚f,sH\u0015\u0013@󱯄󳴈&l󻅮\u0015\u0005.f$s\u000c\u0007\u0000趌F\"\u001d\u0011\u0005H\r𢾱j󰯜?\r𝀿𗎡lf􏗑􈩇s'󹭞􊪜𭬕t-\u0007sh\u001f󿼛w󶦖\u001bj𡘝L􅎿~H\u0017-🖎\u0019vml󷚍Eug\u000e\u000bDTR\u0005TO\u0016󷞟|\u0005􌺊\u0001\\\u00040Q*𨖃Ly4󵦨It恭w",
-    "code": "FSTMhXuS1rYF_f_3aJfy8sn7CaY7BMCg6onJCAqtnt54fEvCkS40ml06ufrX9wvy192yCErw5Xei33_FoSQmC0RAjRN9eLFSBq15MclWbPrIsrwluYCiLmIB72IaR7ig8xGPv3-H8v=J_5xfvvpYRYSFZMZvTwTHKqaRL_uF8r=JULb6AQnLUG6__-nBrCq=91TRJ26VknMDuFrk-0Tfu72OJ73LrGfJqmWCR7gcFeyACyR17n3FI4GQquQ5Bb5qbfl5KZc7W_E3H=5sScZCa9r2Hj9ot5noSq-9nq2NlptoDc4mYTaWklhfbNCT8Wn2=3T8GfAx9nYW__2ZyAPlW9NPmbRSj5FYqqJAprLVa4GrT=PELXTFIba3inReJYtM4thgQ2LAgZYew4L0YGpIMOgr=uFKs3I3u4Bgd_77uNR-wayH3ENL0A97aV7p9DLLC6A2FeVugc2jMn1wViS06PkxJoM5ZtGZkibUTuycstG3VmGtC8ZMR3q2lAVNsfsiugBUZLg=MtzPz2Pqe=QaxCNq5N04ekL"
-}
\ No newline at end of file
+    "password": "A􈉖9YM4fO􊈾s􋍂\u0005\u0012\u00081𫸍\u0000#􉥳𬶼󸻰f󾏞ញ,z$h#\u000c\u0003࣫\u001f5󳑍识.𩹯 􄳩\tiW\u001a𭳌V\u001a5\u001b\u001a\u0001􇱒\u0013\u001df-J𡯠}0\u0012(&R*}𦗂6\u0019\u0012$\u0012e\u0017𪎏@ 󰺑M5N狭􆇳O㒅\u000f:]䝃\u0003󻻌됣*󸎅qGﴬ<&􏭝罺\u0006􄓃\u001b{\r󵼱l󲎿\\\u0007\u0019\t.𨩢󿸈\u0006{4g\u0005\u0017\u0005𝔎\u0018)a{=J#XSJ\t戍/\u000cu󷙞v2YZY-k$ #4𥵽^\\􎊶\u0013>b/5-Z}𢬢\r>󼇈\u0003\u0008\u001cRS9\u000bE&\u0018\u000fz#m5z\u0006\u0012pe𧱻0𩭠픝Q𣗚f,sH\u0015\u0013@󱯄󳴈&l󻅮\u0015\u0005.f$s\u000c\u0007\u0000趌F\"\u001d\u0011\u0005H\r𢾱j󰯜?\r𝀿𗎡lf􏗑􈩇s'󹭞􊪜𭬕t-\u0007sh\u001f󿼛w󶦖\u001bj𡘝L􅎿~H\u0017-🖎\u0019vml󷚍Eug\u000e\u000bDTR\u0005TO\u0016󷞟|\u0005􌺊\u0001\\\u00040Q*𨖃Ly4󵦨It恭w"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_15.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_15.json
index fb2fc81425f..c0b383904c7 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_15.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_15.json
@@ -1,5 +1,5 @@
 {
+    "code": "hmgODqiry_V_t87ih4Ezo7GS8C38DYKENIE2t5nRiJMdagPBW-lTEhID3_8_ApDfxAfSNxAF03y2L8MCLqWWsX_wxkaLYtAI39FLtZZAwxHkSRRazNp7LAc_3QzGXR4O_iFiCqo0f3ZbmODskuoeNVUGBBPJhQ=uw1yVKyMVHojWD16khERjcHww2=hSmqUdh3W-46WPWaZe7IRN0_gk_UaBGwdMb4aDcTHJ6jIaTfQ58djcLVGrKpuO1xO=eQ2BjLJiK6Ik30JgICpvS5ZuumMjgkNFKtHwCu0C-E-oUDUmi3sWKkFQPCxpIy0Ol0SAyN2llCWAADjTR6SW-zRT4qDQNbtDe8nKWpJxZYjFj=IvyBHaK1q6NjPsrXQBEUfajtkh7OwbQwqOOBk5nt8RPP7xwUewzHEtkQUJUjbgGh80nuOdC7sMa2zOSEOy33oC1bjncA23BsaJoisQbFfju_UWiCSyDD-oUXsWkKR1cMGmwyVpf1IpZRnQq_8dwpgMKL4j4ehPxPrVBefQPmzdoK4nncLDB_zDKBBn4M5nbqDsLmO9OqSKeDH6tg=uKTaftrDK2w6Mhfo_fSZOsJAEouS02TJwr6vE_VlJbiOCPysMdVmCdn6Ai2n-p_WlwFoBIHLPkVnx7yYyskHuUMhYQfaq8=CHCwa8CDyOGu=cZVxOd6mTHRD=mXc2_cgkYJ94pdZOL0",
     "email": "6\u000bF\u0004]\u001b􉡴.'@JEe􊐼􈼡2dK󳘱",
-    "password": "\u000e䆛@?󼡏\u0013\tMt\u001d\u001cD!Y𦷤􈭕9\u0013𓍟􌈯􉕺 _P󶐹/3𫑳bZ7鑴.u\u000ej㒛[𒎊\u0014𣺨%7Y󲝈󲷳)ﳀh𧁁\u000cYt𨥔󼽈#%y\u0003O\u0000옛Qo%E]𬫪6컅)\u0018\u0016,􂲁󸡜􈴸󻣝􎝀>砯\u0006dSfz\u001cX󶿪TU∃jM𧟥S🅞\u0014qE\u001cJ\u0016\u0000􁧥\u001aFg9󰘵x󽠏􏞞\u000f\u00019\u0014􌞒􀔶厡󽭶aSIN1s\t🜯\u001c y\u0008\u0002+\\G𬄫⪕9희 M#|=Bhd\u000f\u001et{a\u0002Az.𫮗㥬\"􏠤\r�I[\u0007T\u0017`ㄌ~3􉙟\u000fn󲸣}c;􀟺9\u000f󰡣/n󿾴5-\u0006Z=󻩎35𣮯]B\u0008\u001c7\u0005\u0010Gl'y\u0015b|4󱦦=\u0010g*y􂃡󰈗3Ej\u001e􏥯􉫯:𨵈􍥧p\u0005V\u0016𖧰\u001a\u0007DBA\u0018􁷡𨥬𬠨i_x𡰊#\u000bh5􈹓d􍺲𮜑`𮢊\u0011h\u0019K\nW\u0007ꊊ⢨Y\u000e#3`\u001f\u0018l􃁞\u001a[pr\u000c\u001fX)\u0018\u001a􍊩\u00183NrV3\r}\r𨉦\n\u0012h\\􀍂󼧸=쁐%*^|vp咝ix\u0011\u001bi𩂎78\u0007𓇉 g󹢷`\t?󸹮'W=􈮵\u001ej0\u0016k`Y\u0006\u0001\u000f4!𭮤𫕼90󸒿𭾭䙣FD!􆫐&𦩫)F<jd\u00156쪿\u000f𠌺wh&\u0019\u0006\u0008X;\u0008𡅛Rv􂳲i,Y鿡%Hvr\u0010󱳁\u000cQ𨉕q𫼭_ᨘ􃮂𩒾뺔X\u0003\r􆬲𗫱2G\u0019e1\u0016\u0004R\u00027,􄧭c\u0001?!H.>\u0017&𣏩\u0007쟼\u0007K].^9~\u0012J6󷕕7𥴀}\n]W𫔟0e\u0005L𦕽a\"䗒ꈵ;\u00198ꃽ]J,m>\u0008\u000b^󹁲j60G󳟰1fMGY;[<2q󸡫􍗋󸌪O\u0006\u0014. +Q𣴻L\"\u0000QQ􈃎pfK𦅹.i􏅥\u0006\u0016𣊧g4Z\u001b􋄞yh\u0017 􍸱껷\u0012,\u000b}\u000f\u0015oSV𭉆lUZ?Fi^H𘖧\u001e􎞳oR\\\u000f'b\u0013a\u0002\u000eT\u001f𭀳Xm\u0004󹑸{Y\u000fQDO1OZ@􋯉􌋨)􂱾V\\F\u0010󵥀􃺚{0D\u0008j\u0012l-\u0003󿥵󻌷􊍨禲O\u0019a􍄩Jẻ^\u0018?:󾌫󳙷󻽜gz𣮸\u0014瘷\u0002🅈􁒊]N`􏼢𡷈\u0016t2nqJ!p\u000bI𖡛H\"5\u0011y7l􂯮EZ|kA\t㲺l\u001c7t\n\u0001?t􏥙\u0019.𮭖zJ󱦌󿀙WA{􁕵􊥫m\r\u000b4:㫡{􇆓\u0005권祱;i雐𤊔􈭌\u0019~󻨇𗑊\n,y7D\u0004⎭\u0010􀢷Zo􏵲MUD𣼄􆇆\u0011|'Q뎜\n2󴑥𢊗Nk󹽩@\u000eDia-0\tD\u0011󼻃􂇵\u0007*L􍿧\u001c\u0019󻨡\n\u00059󾒴\u001eF\u001dK𠯙\u0000\rA_􎜼{\\\"𔓷󱩯T@𗉉\u001bV戴󷝔l\u0012Ea🄵􉐫\u0017z7󵯓P`䙂\u000f𔘢S`u󿅋\n􉌯t\\wfㅐm\u0019 󶋪􅌲R􄄦\">[N\n\"ǧIQ\u001e2s\u0003J6\u001cU%錬HnDm\u0002@\u0004T 檻imm\u000ek\u0000J?*\u0002\u0012+hhIj$2𔓼𩜤􎍨\r.􎈨𣎱􌕭+o\u001ag􊕺o\\\u0007,\u0002\\𧣡\u001a󸮌$[􅒮Q\u0018󼥯#\u0010\u000f󳻺􊇻𤠏\\谠B\u0016s_ꗑ9\u000bZ𘣙avv:􅄱\u0019𐔄rv󰯚󾒜&𗼼,'/)􅊫'6􏩚5)\u0018꾜1XG􇃴>&󳋸0\t,N\u00014H􊦑\u001aR\tNT^;\u000fs;欐  󰹰#𨠢|uKo󽝘𡖮\u0016.􂏝af󼵒vu%󽁆adVJ󼸑r𦼩㩻#\u0018󼚿z􃍛\u001d_d\u0015\u0003Ql+&fe&2󶟢hbj􌗌[b\u0001kXF󺱱QZ\u0007*(\u000cOqN3f\u001b",
-    "code": "hmgODqiry_V_t87ih4Ezo7GS8C38DYKENIE2t5nRiJMdagPBW-lTEhID3_8_ApDfxAfSNxAF03y2L8MCLqWWsX_wxkaLYtAI39FLtZZAwxHkSRRazNp7LAc_3QzGXR4O_iFiCqo0f3ZbmODskuoeNVUGBBPJhQ=uw1yVKyMVHojWD16khERjcHww2=hSmqUdh3W-46WPWaZe7IRN0_gk_UaBGwdMb4aDcTHJ6jIaTfQ58djcLVGrKpuO1xO=eQ2BjLJiK6Ik30JgICpvS5ZuumMjgkNFKtHwCu0C-E-oUDUmi3sWKkFQPCxpIy0Ol0SAyN2llCWAADjTR6SW-zRT4qDQNbtDe8nKWpJxZYjFj=IvyBHaK1q6NjPsrXQBEUfajtkh7OwbQwqOOBk5nt8RPP7xwUewzHEtkQUJUjbgGh80nuOdC7sMa2zOSEOy33oC1bjncA23BsaJoisQbFfju_UWiCSyDD-oUXsWkKR1cMGmwyVpf1IpZRnQq_8dwpgMKL4j4ehPxPrVBefQPmzdoK4nncLDB_zDKBBn4M5nbqDsLmO9OqSKeDH6tg=uKTaftrDK2w6Mhfo_fSZOsJAEouS02TJwr6vE_VlJbiOCPysMdVmCdn6Ai2n-p_WlwFoBIHLPkVnx7yYyskHuUMhYQfaq8=CHCwa8CDyOGu=cZVxOd6mTHRD=mXc2_cgkYJ94pdZOL0"
-}
\ No newline at end of file
+    "password": "\u000e䆛@?󼡏\u0013\tMt\u001d\u001cD!Y𦷤􈭕9\u0013𓍟􌈯􉕺 _P󶐹/3𫑳bZ7鑴.u\u000ej㒛[𒎊\u0014𣺨%7Y󲝈󲷳)ﳀh𧁁\u000cYt𨥔󼽈#%y\u0003O\u0000옛Qo%E]𬫪6컅)\u0018\u0016,􂲁󸡜􈴸󻣝􎝀>砯\u0006dSfz\u001cX󶿪TU∃jM𧟥S🅞\u0014qE\u001cJ\u0016\u0000􁧥\u001aFg9󰘵x󽠏􏞞\u000f\u00019\u0014􌞒􀔶厡󽭶aSIN1s\t🜯\u001c y\u0008\u0002+\\G𬄫⪕9희 M#|=Bhd\u000f\u001et{a\u0002Az.𫮗㥬\"􏠤\r�I[\u0007T\u0017`ㄌ~3􉙟\u000fn󲸣}c;􀟺9\u000f󰡣/n󿾴5-\u0006Z=󻩎35𣮯]B\u0008\u001c7\u0005\u0010Gl'y\u0015b|4󱦦=\u0010g*y􂃡󰈗3Ej\u001e􏥯􉫯:𨵈􍥧p\u0005V\u0016𖧰\u001a\u0007DBA\u0018􁷡𨥬𬠨i_x𡰊#\u000bh5􈹓d􍺲𮜑`𮢊\u0011h\u0019K\nW\u0007ꊊ⢨Y\u000e#3`\u001f\u0018l􃁞\u001a[pr\u000c\u001fX)\u0018\u001a􍊩\u00183NrV3\r}\r𨉦\n\u0012h\\􀍂󼧸=쁐%*^|vp咝ix\u0011\u001bi𩂎78\u0007𓇉 g󹢷`\t?󸹮'W=􈮵\u001ej0\u0016k`Y\u0006\u0001\u000f4!𭮤𫕼90󸒿𭾭䙣FD!􆫐&𦩫)F<jd\u00156쪿\u000f𠌺wh&\u0019\u0006\u0008X;\u0008𡅛Rv􂳲i,Y鿡%Hvr\u0010󱳁\u000cQ𨉕q𫼭_ᨘ􃮂𩒾뺔X\u0003\r􆬲𗫱2G\u0019e1\u0016\u0004R\u00027,􄧭c\u0001?!H.>\u0017&𣏩\u0007쟼\u0007K].^9~\u0012J6󷕕7𥴀}\n]W𫔟0e\u0005L𦕽a\"䗒ꈵ;\u00198ꃽ]J,m>\u0008\u000b^󹁲j60G󳟰1fMGY;[<2q󸡫􍗋󸌪O\u0006\u0014. +Q𣴻L\"\u0000QQ􈃎pfK𦅹.i􏅥\u0006\u0016𣊧g4Z\u001b􋄞yh\u0017 􍸱껷\u0012,\u000b}\u000f\u0015oSV𭉆lUZ?Fi^H𘖧\u001e􎞳oR\\\u000f'b\u0013a\u0002\u000eT\u001f𭀳Xm\u0004󹑸{Y\u000fQDO1OZ@􋯉􌋨)􂱾V\\F\u0010󵥀􃺚{0D\u0008j\u0012l-\u0003󿥵󻌷􊍨禲O\u0019a􍄩Jẻ^\u0018?:󾌫󳙷󻽜gz𣮸\u0014瘷\u0002🅈􁒊]N`􏼢𡷈\u0016t2nqJ!p\u000bI𖡛H\"5\u0011y7l􂯮EZ|kA\t㲺l\u001c7t\n\u0001?t􏥙\u0019.𮭖zJ󱦌󿀙WA{􁕵􊥫m\r\u000b4:㫡{􇆓\u0005권祱;i雐𤊔􈭌\u0019~󻨇𗑊\n,y7D\u0004⎭\u0010􀢷Zo􏵲MUD𣼄􆇆\u0011|'Q뎜\n2󴑥𢊗Nk󹽩@\u000eDia-0\tD\u0011󼻃􂇵\u0007*L􍿧\u001c\u0019󻨡\n\u00059󾒴\u001eF\u001dK𠯙\u0000\rA_􎜼{\\\"𔓷󱩯T@𗉉\u001bV戴󷝔l\u0012Ea🄵􉐫\u0017z7󵯓P`䙂\u000f𔘢S`u󿅋\n􉌯t\\wfㅐm\u0019 󶋪􅌲R􄄦\">[N\n\"ǧIQ\u001e2s\u0003J6\u001cU%錬HnDm\u0002@\u0004T 檻imm\u000ek\u0000J?*\u0002\u0012+hhIj$2𔓼𩜤􎍨\r.􎈨𣎱􌕭+o\u001ag􊕺o\\\u0007,\u0002\\𧣡\u001a󸮌$[􅒮Q\u0018󼥯#\u0010\u000f󳻺􊇻𤠏\\谠B\u0016s_ꗑ9\u000bZ𘣙avv:􅄱\u0019𐔄rv󰯚󾒜&𗼼,'/)􅊫'6􏩚5)\u0018꾜1XG􇃴>&󳋸0\t,N\u00014H􊦑\u001aR\tNT^;\u000fs;欐  󰹰#𨠢|uKo󽝘𡖮\u0016.􂏝af󼵒vu%󽁆adVJ󼸑r𦼩㩻#\u0018󼚿z􃍛\u001d_d\u0015\u0003Ql+&fe&2󶟢hbj􌗌[b\u0001kXF󺱱QZ\u0007*(\u000cOqN3f\u001b"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_16.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_16.json
index 69474510b4f..f1186d4bb6e 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_16.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_16.json
@@ -1,5 +1,5 @@
 {
+    "code": "4rP0eWj_NPxojYzkU_pdkW9LqEqBCpwqu_CzQ2HRWUDWNC-B2gKZnICvQwM-6ynjWXae_jlxWt0A9cQPRCddj-GurZImbB7fuiSpIQH_zsc817_M47P0NZDzEvL7jXOf8RdpUH9n_X9UK0uICUvuwY9voyAwvlyxKnfFmWM9g4VhzyK7-Z5c6M4eMksFBdADNZcjJavPD1hFxfMiTK5wzDrTIXIGetf-jHFYdnbru60wCJh3iCiYLRtOTCBltY8MM5LsoZi4jfAh5qDEZ94NZR2b64MXjVa5QY3FEer0hj5s29zMrUd=pN8YNnfpagV1cN=v5Xy2BCGDPt-vurTbZFWan=KC44G28LYu7fPzAvEgaECUX2OrxZb5B8A4gB59weiDl=HHO88JU5Fp3cfDonTTP97AI_JIvBY0KjnMhvs2JupxCpyPbsgrHe6a=0WSXppIRPCqSAYWCWY_Jldr=g3b-hytjaCcL9iMVXo-L8Xj9ET2k9xUNf_aj1aYVpT4LHBlX3rY91JqLI7QRYccS489z0ydALwWRMO7spGOcUBwcfuxcGhtvwyc4IYlEm=hDWQ7=8lswjoFvGLJXE-P33ChzPTUO2gMZwgKydl6d8t-sQ7g7zxd9XFFDk0G4AJtevGCxL1=79X4ob5yW7bV7D=TBfIUc=L_-B1n3b7STRbN1s88--LK3jBg9P36L32EObOa7T9ExK3DZPlRVyN5J=OWu8mzcTaEXRF5x6Z0oHMyEjBSTTC2a3_GF4YBcuaaKNKIU9WkdYnmkDLYpnJDk",
     "key": "",
-    "password": "U󷢧頔zjM\u0006󱢹\u0016󱜫굻晃􌝖[\u0019᥅\u0013L󶅈C-Q󱋒[%D3\u000fjP𦶍\u0006􍩁\u0002.P/\u0004j𘕨U\"#X𣊼a\u001cp􁻝\u0018Z\\F}Vy෯ᲇ󸡕)#\u0004NJ+\u000f赶\u0004\u0005K𩳮fgeﺧ\u000fu^s\rsa\u0001G\u0004󹤪>4􁆲\u0017D\u000f󽏯􈒼#!􄍵𩢙qw榭Je\u0011n1Vu󾛡4~$y𣫈:Y\u0001\u0007_K\u0007\u001b\u0014G3􅌰}a􀬶\u0005+𤫍\t#v\u0018P\u0011\u0017󺯉mΊNi󲻺\u0003\u0018C0󺏹\u0005􇘕\u000eo^𦉳@'󴝱􀲼\u0013/󰝒4􏦹󼚈𧠛r󼖙u􉊲󵇺nUW𣹉㦙f󰝓𣻟6L􁷾J\u0004p:\u00101彲󽇁8󰾶󺖄\u001bf􂔝SB\u00007ᘼ|\u0008@`𨃞CF\tOP\n\u001b!5\u001aQZ3\u0017&}􆍕\u001cl􂾶溌􀲾􂄑𖠝𩯅h\u0019.!<􍽼𝥘℥#,^\u001c𗭁\r\u001f󹔒E<\u000e\u0011\u0002e󿧱𦝚\u001b􎧭🌘󼎉7Z\u001eg󱛍^}o􊪋\u0001\u0008\u0003xi(#\u000f󿹱]󰆫\u0014󷌥`𪑝i(4@ C\u0001?sT[[o盇C3\u0014*Vd󶟗􇭮\t𥤱󱆇)ⵕT􍢢0\u0001󼃧􌌻\u0013{犒눭\u0008uk󳝶􆚹\u0015赴/Q󼫛\\s\n\u0005\u001a\u0003(󽧜q\n􄁟\\M*,-𐼢k􃉻\u0004$\n󾶈\u0013\"\rPf,e􆖘\u0015M^]\u0010NtE)\u00040󽵛9}>\u001a󻺍>hr#\u000cnYe \u00133\u001f4𢴃\"Df䫥O􅁪/+F/Ps\u001e-\u0001GxR𧹡\u0011\u001fJS\u0001P󽖎幛􅕐a0^>𘐆q2㞶󹬬𤋁.\u0011C𪖞?L𦝍dPU􅩟𡬿UV\u0003􋣼S􈜺𥘋𦉧g@'/𬄟Mp\u0000U󾚠6𥣰🩂Q\u0014q󶮐8\u00061O)~\u001d❵^󼸦\"'\u000c\u001c\u001a\u0006M4􃉌,QRꏹ쓒􌵀\\,\"𐲧󶨺\u001d3󾐱q𭺣X㷍\u0019$RS[W\u000e툇%Z􍅦󰟛P\u0000浊\u0007R_T󰠧D\rf󱉿\u001a<\u0008B󶡷􏔙𡫘ꥢ􍤦\u0018􎹣[\u0005G􋂉\u0016\u0014CH虍\t\u000b0d􉝚/V􈫐䏲r\u0010𤆎\r$𤬁L𭰼\u0010T󷇉󱼽룳5bw-}/𩅬kHB揲n𤁋#z󿣑󶯴T􋯾\u0016_\"𮨒Q𬣖@4r􋁜y𩒯Z#㱦\u0019􉸛𦬞󻡥k\n𩿶(\u001bL&N繒􂢳H􍐴\u00040'𥘧\u0004@-𦛝\u0001t&=e&\u001d1󾶨L\r󽯤⡮\u0010𤱁%\t􄩵4󰰙#Po%R𧒻",
-    "code": "4rP0eWj_NPxojYzkU_pdkW9LqEqBCpwqu_CzQ2HRWUDWNC-B2gKZnICvQwM-6ynjWXae_jlxWt0A9cQPRCddj-GurZImbB7fuiSpIQH_zsc817_M47P0NZDzEvL7jXOf8RdpUH9n_X9UK0uICUvuwY9voyAwvlyxKnfFmWM9g4VhzyK7-Z5c6M4eMksFBdADNZcjJavPD1hFxfMiTK5wzDrTIXIGetf-jHFYdnbru60wCJh3iCiYLRtOTCBltY8MM5LsoZi4jfAh5qDEZ94NZR2b64MXjVa5QY3FEer0hj5s29zMrUd=pN8YNnfpagV1cN=v5Xy2BCGDPt-vurTbZFWan=KC44G28LYu7fPzAvEgaECUX2OrxZb5B8A4gB59weiDl=HHO88JU5Fp3cfDonTTP97AI_JIvBY0KjnMhvs2JupxCpyPbsgrHe6a=0WSXppIRPCqSAYWCWY_Jldr=g3b-hytjaCcL9iMVXo-L8Xj9ET2k9xUNf_aj1aYVpT4LHBlX3rY91JqLI7QRYccS489z0ydALwWRMO7spGOcUBwcfuxcGhtvwyc4IYlEm=hDWQ7=8lswjoFvGLJXE-P33ChzPTUO2gMZwgKydl6d8t-sQ7g7zxd9XFFDk0G4AJtevGCxL1=79X4ob5yW7bV7D=TBfIUc=L_-B1n3b7STRbN1s88--LK3jBg9P36L32EObOa7T9ExK3DZPlRVyN5J=OWu8mzcTaEXRF5x6Z0oHMyEjBSTTC2a3_GF4YBcuaaKNKIU9WkdYnmkDLYpnJDk"
-}
\ No newline at end of file
+    "password": "U󷢧頔zjM\u0006󱢹\u0016󱜫굻晃􌝖[\u0019᥅\u0013L󶅈C-Q󱋒[%D3\u000fjP𦶍\u0006􍩁\u0002.P/\u0004j𘕨U\"#X𣊼a\u001cp􁻝\u0018Z\\F}Vy෯ᲇ󸡕)#\u0004NJ+\u000f赶\u0004\u0005K𩳮fgeﺧ\u000fu^s\rsa\u0001G\u0004󹤪>4􁆲\u0017D\u000f󽏯􈒼#!􄍵𩢙qw榭Je\u0011n1Vu󾛡4~$y𣫈:Y\u0001\u0007_K\u0007\u001b\u0014G3􅌰}a􀬶\u0005+𤫍\t#v\u0018P\u0011\u0017󺯉mΊNi󲻺\u0003\u0018C0󺏹\u0005􇘕\u000eo^𦉳@'󴝱􀲼\u0013/󰝒4􏦹󼚈𧠛r󼖙u􉊲󵇺nUW𣹉㦙f󰝓𣻟6L􁷾J\u0004p:\u00101彲󽇁8󰾶󺖄\u001bf􂔝SB\u00007ᘼ|\u0008@`𨃞CF\tOP\n\u001b!5\u001aQZ3\u0017&}􆍕\u001cl􂾶溌􀲾􂄑𖠝𩯅h\u0019.!<􍽼𝥘℥#,^\u001c𗭁\r\u001f󹔒E<\u000e\u0011\u0002e󿧱𦝚\u001b􎧭🌘󼎉7Z\u001eg󱛍^}o􊪋\u0001\u0008\u0003xi(#\u000f󿹱]󰆫\u0014󷌥`𪑝i(4@ C\u0001?sT[[o盇C3\u0014*Vd󶟗􇭮\t𥤱󱆇)ⵕT􍢢0\u0001󼃧􌌻\u0013{犒눭\u0008uk󳝶􆚹\u0015赴/Q󼫛\\s\n\u0005\u001a\u0003(󽧜q\n􄁟\\M*,-𐼢k􃉻\u0004$\n󾶈\u0013\"\rPf,e􆖘\u0015M^]\u0010NtE)\u00040󽵛9}>\u001a󻺍>hr#\u000cnYe \u00133\u001f4𢴃\"Df䫥O􅁪/+F/Ps\u001e-\u0001GxR𧹡\u0011\u001fJS\u0001P󽖎幛􅕐a0^>𘐆q2㞶󹬬𤋁.\u0011C𪖞?L𦝍dPU􅩟𡬿UV\u0003􋣼S􈜺𥘋𦉧g@'/𬄟Mp\u0000U󾚠6𥣰🩂Q\u0014q󶮐8\u00061O)~\u001d❵^󼸦\"'\u000c\u001c\u001a\u0006M4􃉌,QRꏹ쓒􌵀\\,\"𐲧󶨺\u001d3󾐱q𭺣X㷍\u0019$RS[W\u000e툇%Z􍅦󰟛P\u0000浊\u0007R_T󰠧D\rf󱉿\u001a<\u0008B󶡷􏔙𡫘ꥢ􍤦\u0018􎹣[\u0005G􋂉\u0016\u0014CH虍\t\u000b0d􉝚/V􈫐䏲r\u0010𤆎\r$𤬁L𭰼\u0010T󷇉󱼽룳5bw-}/𩅬kHB揲n𤁋#z󿣑󶯴T􋯾\u0016_\"𮨒Q𬣖@4r􋁜y𩒯Z#㱦\u0019􉸛𦬞󻡥k\n𩿶(\u001bL&N繒􂢳H􍐴\u00040'𥘧\u0004@-𦛝\u0001t&=e&\u001d1󾶨L\r󽯤⡮\u0010𤱁%\t􄩵4󰰙#Po%R𧒻"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_17.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_17.json
index 30f6a58f5a3..6c4c26edd0b 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_17.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_17.json
@@ -1,5 +1,5 @@
 {
+    "code": "3gq6=cswHZ9ri64_HJPb0GHqnIvQsgakJ=HkufysG_pLk8piT7CmIFMoO0lif83sPks6mv-UWRbQCOyTECbFMlPIR57uJSHFmxolrFw",
     "email": "퉁[僥@靖wC\u001aE䕣𫶙",
-    "password": "\u0015\u0003\u0015\u001eVB-^K[QI!h𥵶𑗍􈯞Z豂,\r𒂩>\u001cMI<Y\u000e𩊅f􏳰*PG\u0003\u0017R𗈍d-\u001ef𨻡\u0010\u001dQHlG𠇳\u0008𠫶\u0019Z\u001a@􅉓IA\u0013|󸛓𝘰)􂫛:dtD@QG𥗓|kV\u001d𩸜􆱶WO\u0010`z\rS𧳫/A)\u0016𘥺j\u0008􈓀q\u001a]Nx󼋟\u001d􏸗\u00141󽅬!M?\u0004󶕈P𬬊􍢉\"P/5\u0011\u000cK}$O\u001fq@\u0000hi>𝨝󾎴㌉44\u000fiw\u00157(\u000bu𮬯oy\u0012\u0015,GLefv}q2Zn@jp\u001aRucnj쏩1𬂡BC`\u0019󺆴\u0011dA\u0007w踇\\)yrkSp􀿗䪑􈤰d\u0006b􍥮V'\u0008{\u001b\u000b5𭤼\u0001Lp􃐝\u0002b𘆞69\u0007o\u000b󽠪䷙7㜹\u0011𭜣\u00179qT\u0000\u0015\u001fN{=w󱋏P􅄿>􈍆􂘾U\u0011L𓋧\u000fqV\u0005<\u0004\u001d?􅪺X􈂆rtX$F!R\u0010\u0002𢴜☸H𐁒*\u0012弥Z!Sq%3蠑\"r􎚼WCc⁆P]𩇱i󿧫e\u0016󿾜L센􆣌27V硤𗀍L􄙻P곻m󲑡𩀁S􃕱s!\u001d󷐍Sa𨉇(􎼄\u001f􂒦󴆵<nR􋮮\r𧤍-𥏬𦻭Pb𨐎U𨪬f\nm󻸚xo T󼐮𒄿mY>\u00061\u000b\u0006󰣟􌑚󻔤\r5N53\u0016k𭬵=<1\u0016H𗉻Mᚚ訰E𤗦QSy*fwg]Q]Y\"s󹷏\u0015􏦎!𣣭\u0000\u0017n􍞠\u001f\u0002!g랑[翍ഖ􎻤_􋝘\u0005\u001c\u000b$\nth𫍬\u001c\"y\u0001􅜂\u001b:6ZfF.Fs\u0018𫞐jnSm\tO9\u0017P@;\rO\u001eM\u0010󻒝\u0015󶷁𝙠쌃󽨴&5𗮣􂾎𬖢\u001b􀷉\u0014k0𧆡\u0014OcMAZy􄅶5\u001c}t8rUzI袷\u000fIL\n|q|\\W\u0014c􍌼=𢩃S(𝥈K󹗥Oꃡ\"7㒼Axp\u0007F\u0018$H6E\u0012{𫢶\u0013𣢋\u0015揂󻐾'࠶\u0012j𢙆W?&\u0014nF^s󱗳􅃽𢧢\u001a\u000esV㉺\u00157𭷿{\u001eꆙ\u001bꂵW𒋙\u000e\u0004g\u0000n\u0001}\u001e\u0003T􌷲\u0007\u000c𦗡ne𛈃NP",
-    "code": "3gq6=cswHZ9ri64_HJPb0GHqnIvQsgakJ=HkufysG_pLk8piT7CmIFMoO0lif83sPks6mv-UWRbQCOyTECbFMlPIR57uJSHFmxolrFw"
-}
\ No newline at end of file
+    "password": "\u0015\u0003\u0015\u001eVB-^K[QI!h𥵶𑗍􈯞Z豂,\r𒂩>\u001cMI<Y\u000e𩊅f􏳰*PG\u0003\u0017R𗈍d-\u001ef𨻡\u0010\u001dQHlG𠇳\u0008𠫶\u0019Z\u001a@􅉓IA\u0013|󸛓𝘰)􂫛:dtD@QG𥗓|kV\u001d𩸜􆱶WO\u0010`z\rS𧳫/A)\u0016𘥺j\u0008􈓀q\u001a]Nx󼋟\u001d􏸗\u00141󽅬!M?\u0004󶕈P𬬊􍢉\"P/5\u0011\u000cK}$O\u001fq@\u0000hi>𝨝󾎴㌉44\u000fiw\u00157(\u000bu𮬯oy\u0012\u0015,GLefv}q2Zn@jp\u001aRucnj쏩1𬂡BC`\u0019󺆴\u0011dA\u0007w踇\\)yrkSp􀿗䪑􈤰d\u0006b􍥮V'\u0008{\u001b\u000b5𭤼\u0001Lp􃐝\u0002b𘆞69\u0007o\u000b󽠪䷙7㜹\u0011𭜣\u00179qT\u0000\u0015\u001fN{=w󱋏P􅄿>􈍆􂘾U\u0011L𓋧\u000fqV\u0005<\u0004\u001d?􅪺X􈂆rtX$F!R\u0010\u0002𢴜☸H𐁒*\u0012弥Z!Sq%3蠑\"r􎚼WCc⁆P]𩇱i󿧫e\u0016󿾜L센􆣌27V硤𗀍L􄙻P곻m󲑡𩀁S􃕱s!\u001d󷐍Sa𨉇(􎼄\u001f􂒦󴆵<nR􋮮\r𧤍-𥏬𦻭Pb𨐎U𨪬f\nm󻸚xo T󼐮𒄿mY>\u00061\u000b\u0006󰣟􌑚󻔤\r5N53\u0016k𭬵=<1\u0016H𗉻Mᚚ訰E𤗦QSy*fwg]Q]Y\"s󹷏\u0015􏦎!𣣭\u0000\u0017n􍞠\u001f\u0002!g랑[翍ഖ􎻤_􋝘\u0005\u001c\u000b$\nth𫍬\u001c\"y\u0001􅜂\u001b:6ZfF.Fs\u0018𫞐jnSm\tO9\u0017P@;\rO\u001eM\u0010󻒝\u0015󶷁𝙠쌃󽨴&5𗮣􂾎𬖢\u001b􀷉\u0014k0𧆡\u0014OcMAZy􄅶5\u001c}t8rUzI袷\u000fIL\n|q|\\W\u0014c􍌼=𢩃S(𝥈K󹗥Oꃡ\"7㒼Axp\u0007F\u0018$H6E\u0012{𫢶\u0013𣢋\u0015揂󻐾'࠶\u0012j𢙆W?&\u0014nF^s󱗳􅃽𢧢\u001a\u000esV㉺\u00157𭷿{\u001eꆙ\u001bꂵW𒋙\u000e\u0004g\u0000n\u0001}\u001e\u0003T􌷲\u0007\u000c𦗡ne𛈃NP"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_18.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_18.json
index 1ba8f6c7153..a9a74b8a4b8 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_18.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_18.json
@@ -1,5 +1,5 @@
 {
+    "code": "gBlCfS7vL5ZlXMN2EWV5eSisvsqKezrNgWoI05VsTNJTtsB",
     "key": "gKIq1jpiCDg=",
-    "password": "\u001f6f􏛭/l\\L\u0003\u001b\u000e𗢧󳁽HW?-v\nqn𨁺n\u0006@\u001bS5z\u0003i\u0019𦒫P󾫑\u0001En􎧙}𨬑𗌰z󶼖Fx\u0016t`\u000bt󽉝p\u0016@󿨁'\u001bጯcIWs}0Bgj􊍚\u0011𧲭𬐐\u000f􋻋\u0003􏂮mK]𧈤&Md􃎥\u0018󶓪\r𪞠y\u0018󼲘骸|^𣐺𦙦􈮥}V\u0006󱤽[w\u0001[C",
-    "code": "gBlCfS7vL5ZlXMN2EWV5eSisvsqKezrNgWoI05VsTNJTtsB"
-}
\ No newline at end of file
+    "password": "\u001f6f􏛭/l\\L\u0003\u001b\u000e𗢧󳁽HW?-v\nqn𨁺n\u0006@\u001bS5z\u0003i\u0019𦒫P󾫑\u0001En􎧙}𨬑𗌰z󶼖Fx\u0016t`\u000bt󽉝p\u0016@󿨁'\u001bጯcIWs}0Bgj􊍚\u0011𧲭𬐐\u000f􋻋\u0003􏂮mK]𧈤&Md􃎥\u0018󶓪\r𪞠y\u0018󼲘骸|^𣐺𦙦􈮥}V\u0006󱤽[w\u0001[C"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_19.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_19.json
index 63d27a291e0..198a56dec52 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_19.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_19.json
@@ -1,5 +1,5 @@
 {
+    "code": "jiXROuSghHnJYlGM3vQmMTKoAHxSW_pRvQy1uP=aZ3FYAv1Cx_gTn7H2bQpQ1eIVFykU3yTMU5oUoCb-4ZjTXblJXM7vK1YEcZt9j8gp5Oh_lUUvAA2g8Z5zDkvuror_Rkmu2hqb1haFUrbF_fsIpsUWe5yaJyb2v3sIFRRSYtDCxWyUUPi--4mXwUd7kyB8NeOsn8nzdjp5YbgDAil=Iz2zxnry_lhjTYSdGs_MZGg=sekX0llThwNr5P_eD8xOl2vkMSxFyZd0DL_3YkosLLupwjCrngbmvGurqHbJ0-=11LsFDwqdvVesj15wSXW-XaUTkYfBbOBfmHRRp4GSYZ-yU5aL8_pNXU2FG7OMEZFmrok=y6V3L=AzVQpC8RFCpDat3E6uartY31DXFb8NjSxlYmVn4KUj4el1l2cvkv5hdLhsqxX--80fn7KP=_Y7ToGMX4E7i7Jzp5gBI9h2nNFyG76l6dfMvhXGcUyYjm1R74VUsRD5lCeG0mFgvGct2gTmDhd_3Lkb4vFsZTOKP0qE4w4wEuqKJFJrgpQcqCmX_E2WOQLT=bagdpS7tob-Rf1CT3cKNEiVqNno-hiNcHtdYzAe=QnBAQ1OG6O-eJzkdVKmeVeXy6tycFCg_fusv023l4TB53=sBHCXly_pAdWqOGXJkI2RY9ZcI0S6z8=A3APUVDGZzd3jn7-SPsv9q4XrvS-78VnChlw8KRl-l5HjxykqxAu=BW9XtCPVysQCbvD-mNnBUu4FBs",
     "key": "jNA=",
-    "password": "Nf%棩`C$1\u0017󸄻󷝡#:􊸏߉\u0014_D> q\u0019<7􎓊{􃌪𗴤~Z\u0002\u0007 #\u0007W퀀'&\u0016\u0018s\u0014=\u001ea􈾄󱬖gA􇤠\u0003!C\u0007󱷹(4PN?@􈈁^#\n\u0002brdyr􎐞󲠗\u000b4􌀿!#􁁞\u0001dK\u0000𑫒^Si\u0001𣫂'nw]M\u0017󷄹i#*W<lQ{)\u000e󹚺\tb𨧾M󷲫󴹚\u001bdi꩕;􁳀a\u001b#\u0012\u001fy)\u0011\rD𬯡~GmjH𦬹􁯠𡸚v󾲱􎒵S\u001b󻳾𫠔g+_\"Lz􂎁\u000e\u000b􌦪tZDq;?k\n󷍇<Gp5\u0017\u0017>\u000c\u0014􋿯􊜕f󼠞\u0004Ŭ\u000e\u0005.\"\u0016+􉥺𣖑\u0006CTe𣰓\r9𭈸ifa􏼈䗇k^-^|I4f𩘍󰫃E\u0013󱆢t0h\u00020󷽅\u0007\u0017p(}\u0015tB􂻽+\u000e𠾻󿄟9󴕈5S鋱qQV𤁅?폋Zrt\u00121\u0019\u0008\u001d\u0006?\u0013𦊘􊰕𑀣Q祊y𫮐y𢋂S]I}\u0015i󲃺\u0000h\u0016R漰[(\u0001Hxq󽂷7\u001a􋈁󹨈V/.(]󲆎R\u000ca\u001fJ󳶟\u00067~7TT\u0016Ro\u0012疩\u001erm󺯉𤹯ry\u001d\u001d쨵e\u0014/`N\u0015$k\nx\u0013U\u001b𨩟Q=󸷯\r\u0005󻳀􎴺𭿪Z퇱gpꘈ\t\u0008I:'k󰇮|Nu􆨩6s$#%p䎁cB󴸒M9S𪗚ፖ𘠖\tv)𑁨M𐎗Xwug𗨶7e\"Nj\u0014󹼵\u000c)󲼈\u0002\u0011>Xi%󸶿𩆳b!\u0016Xq\u001e6\u0016)\u0011\u0001\u001aq𠓝,8\u001e[𒑓R[l􍒱\u0018E뗾-Ccw /\r𠬞=󳔗W􎍔􋱭𘊪\t󽤊m􉚡􏒝g𪆨.\u0018?$%Y5$\u0008⧫W󼆣盾H|𪓘\u001f\u000fUq􅧎\u0006􆯦󱊎󿐙\u000f\u0002Ss%8Yo\u001c榰Uw%𣀑R/'\u0015󸞓箣~A@\u0015]M\t󾪡k\rvR%N< %hWk<a𭏃Z\u000e@`;5\u000bc􂣃􁊺\rj\u0018\u000c|\u001do.]}1sLm𠢺\u0001d\u001aW\u0012UNuKW󼾒N{QlZ𢱌B\u0000R8\u0013:Ctw\u0011s8󵐥#s䞈􁇚[􏮺\u001b0HC𢬱􃤬K\u0012pCJǭB@mw6\u000c𞢩\u0013a'\u000e)󵑷8`􀧳=BL)EWbi􈙏𨻦󸊫𧍡Q5𘅩蒋\r􂼍󸝗􀘣􎃅[\u001bNBd9\"𨫺;𝘢眍0f󳮅LD\u0015x\\M.58R\u001ajL%{􄷼𞄻Q8y󷆘󾃭>7\u000e\t󹢂󵷡2HDZ5\u0016D\u000b\"3􈛉!L󻅳u󾺓,\u0002%􎀚$iN(\u000c𭷖𤈈󱒤dAA\u0008\u0019<\t%FꉽS󱞝\\􌊣𛁺ax]褻󳫻퐰󱚰@*󼽱?󾂏S$\u0014𣷚𗢍\u0008:a<0\u0016\u0001\rd/z-\u0012😥\u000cG𥖒O?H𢗓\\ኾi^🎖み󾉵躎;챴\u0014\rI𧾤􌅐􆚌\u0007(DwA\ryq@󻏵􇀍\u0011\u0013\u0010𐘣sn4r#𝙞E􏷭;\u001a\u0000Dq856󷤲𩽙\u0003􄇛%TP􉎈*;S\u000f{>\u0007#𫏒\u0004Zc\u0016F7󶖵a亂Y?\u0002p𡂱!p旗.\u0010\u0005\t\\󼾿a󾇩+𧷩\n65\u001bNb8󹉰sc\rQ\u0011\u0015􎕙B%=vP\u00119𮢏8$WC!𮡾\u0008􆢂i.V[묘W𭞑I􊣨𖧊D{􍬠OBm~xx.aVlU\u0018\"Ou\u001foA\r|OD\u001a^pB𨬨Q,H\u0005\u0014󵆇ꚓJ\u0013\u0000'bVi\u001ab&WS􎌥\rqm(𭱑4;$N󴦞\u0002AU\u0013t\u0018\u000fJ\\~_\u0011+hq;𫾤C\u0011\u001f&􆩹s\u0017\u001d𣢵\u00055v𩑤12s+8\u0014󳌪𨴨\u0007t애j\u0002𣅁𮏖U󶚆",
-    "code": "jiXROuSghHnJYlGM3vQmMTKoAHxSW_pRvQy1uP=aZ3FYAv1Cx_gTn7H2bQpQ1eIVFykU3yTMU5oUoCb-4ZjTXblJXM7vK1YEcZt9j8gp5Oh_lUUvAA2g8Z5zDkvuror_Rkmu2hqb1haFUrbF_fsIpsUWe5yaJyb2v3sIFRRSYtDCxWyUUPi--4mXwUd7kyB8NeOsn8nzdjp5YbgDAil=Iz2zxnry_lhjTYSdGs_MZGg=sekX0llThwNr5P_eD8xOl2vkMSxFyZd0DL_3YkosLLupwjCrngbmvGurqHbJ0-=11LsFDwqdvVesj15wSXW-XaUTkYfBbOBfmHRRp4GSYZ-yU5aL8_pNXU2FG7OMEZFmrok=y6V3L=AzVQpC8RFCpDat3E6uartY31DXFb8NjSxlYmVn4KUj4el1l2cvkv5hdLhsqxX--80fn7KP=_Y7ToGMX4E7i7Jzp5gBI9h2nNFyG76l6dfMvhXGcUyYjm1R74VUsRD5lCeG0mFgvGct2gTmDhd_3Lkb4vFsZTOKP0qE4w4wEuqKJFJrgpQcqCmX_E2WOQLT=bagdpS7tob-Rf1CT3cKNEiVqNno-hiNcHtdYzAe=QnBAQ1OG6O-eJzkdVKmeVeXy6tycFCg_fusv023l4TB53=sBHCXly_pAdWqOGXJkI2RY9ZcI0S6z8=A3APUVDGZzd3jn7-SPsv9q4XrvS-78VnChlw8KRl-l5HjxykqxAu=BW9XtCPVysQCbvD-mNnBUu4FBs"
-}
\ No newline at end of file
+    "password": "Nf%棩`C$1\u0017󸄻󷝡#:􊸏߉\u0014_D> q\u0019<7􎓊{􃌪𗴤~Z\u0002\u0007 #\u0007W퀀'&\u0016\u0018s\u0014=\u001ea􈾄󱬖gA􇤠\u0003!C\u0007󱷹(4PN?@􈈁^#\n\u0002brdyr􎐞󲠗\u000b4􌀿!#􁁞\u0001dK\u0000𑫒^Si\u0001𣫂'nw]M\u0017󷄹i#*W<lQ{)\u000e󹚺\tb𨧾M󷲫󴹚\u001bdi꩕;􁳀a\u001b#\u0012\u001fy)\u0011\rD𬯡~GmjH𦬹􁯠𡸚v󾲱􎒵S\u001b󻳾𫠔g+_\"Lz􂎁\u000e\u000b􌦪tZDq;?k\n󷍇<Gp5\u0017\u0017>\u000c\u0014􋿯􊜕f󼠞\u0004Ŭ\u000e\u0005.\"\u0016+􉥺𣖑\u0006CTe𣰓\r9𭈸ifa􏼈䗇k^-^|I4f𩘍󰫃E\u0013󱆢t0h\u00020󷽅\u0007\u0017p(}\u0015tB􂻽+\u000e𠾻󿄟9󴕈5S鋱qQV𤁅?폋Zrt\u00121\u0019\u0008\u001d\u0006?\u0013𦊘􊰕𑀣Q祊y𫮐y𢋂S]I}\u0015i󲃺\u0000h\u0016R漰[(\u0001Hxq󽂷7\u001a􋈁󹨈V/.(]󲆎R\u000ca\u001fJ󳶟\u00067~7TT\u0016Ro\u0012疩\u001erm󺯉𤹯ry\u001d\u001d쨵e\u0014/`N\u0015$k\nx\u0013U\u001b𨩟Q=󸷯\r\u0005󻳀􎴺𭿪Z퇱gpꘈ\t\u0008I:'k󰇮|Nu􆨩6s$#%p䎁cB󴸒M9S𪗚ፖ𘠖\tv)𑁨M𐎗Xwug𗨶7e\"Nj\u0014󹼵\u000c)󲼈\u0002\u0011>Xi%󸶿𩆳b!\u0016Xq\u001e6\u0016)\u0011\u0001\u001aq𠓝,8\u001e[𒑓R[l􍒱\u0018E뗾-Ccw /\r𠬞=󳔗W􎍔􋱭𘊪\t󽤊m􉚡􏒝g𪆨.\u0018?$%Y5$\u0008⧫W󼆣盾H|𪓘\u001f\u000fUq􅧎\u0006􆯦󱊎󿐙\u000f\u0002Ss%8Yo\u001c榰Uw%𣀑R/'\u0015󸞓箣~A@\u0015]M\t󾪡k\rvR%N< %hWk<a𭏃Z\u000e@`;5\u000bc􂣃􁊺\rj\u0018\u000c|\u001do.]}1sLm𠢺\u0001d\u001aW\u0012UNuKW󼾒N{QlZ𢱌B\u0000R8\u0013:Ctw\u0011s8󵐥#s䞈􁇚[􏮺\u001b0HC𢬱􃤬K\u0012pCJǭB@mw6\u000c𞢩\u0013a'\u000e)󵑷8`􀧳=BL)EWbi􈙏𨻦󸊫𧍡Q5𘅩蒋\r􂼍󸝗􀘣􎃅[\u001bNBd9\"𨫺;𝘢眍0f󳮅LD\u0015x\\M.58R\u001ajL%{􄷼𞄻Q8y󷆘󾃭>7\u000e\t󹢂󵷡2HDZ5\u0016D\u000b\"3􈛉!L󻅳u󾺓,\u0002%􎀚$iN(\u000c𭷖𤈈󱒤dAA\u0008\u0019<\t%FꉽS󱞝\\􌊣𛁺ax]褻󳫻퐰󱚰@*󼽱?󾂏S$\u0014𣷚𗢍\u0008:a<0\u0016\u0001\rd/z-\u0012😥\u000cG𥖒O?H𢗓\\ኾi^🎖み󾉵躎;챴\u0014\rI𧾤􌅐􆚌\u0007(DwA\ryq@󻏵􇀍\u0011\u0013\u0010𐘣sn4r#𝙞E􏷭;\u001a\u0000Dq856󷤲𩽙\u0003􄇛%TP􉎈*;S\u000f{>\u0007#𫏒\u0004Zc\u0016F7󶖵a亂Y?\u0002p𡂱!p旗.\u0010\u0005\t\\󼾿a󾇩+𧷩\n65\u001bNb8󹉰sc\rQ\u0011\u0015􎕙B%=vP\u00119𮢏8$WC!𮡾\u0008􆢂i.V[묘W𭞑I􊣨𖧊D{􍬠OBm~xx.aVlU\u0018\"Ou\u001foA\r|OD\u001a^pB𨬨Q,H\u0005\u0014󵆇ꚓJ\u0013\u0000'bVi\u001ab&WS􎌥\rqm(𭱑4;$N󴦞\u0002AU\u0013t\u0018\u000fJ\\~_\u0011+hq;𫾤C\u0011\u001f&􆩹s\u0017\u001d𣢵\u00055v𩑤12s+8\u0014󳌪𨴨\u0007t애j\u0002𣅁𮏖U󶚆"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_2.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_2.json
index bf91726c759..3fe123e1ffb 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_2.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_2.json
@@ -1,5 +1,5 @@
 {
+    "code": "2I7=q77Q8QCiyaoKVP8TXpdDJIFfol2dXkYJJpNtOp6ne39Ktkfsdhiw-Hs=TCndYZBOHhGwXI7xi-0VYGH=B=6n5dUmNlG8IttqQyD17FRIiylJktAq7ZYH884=9TpOE-woQD=XQiwuAp=hXEIMayRAkoT2K=SHUR2n0P-o9tz8oJ=6DOBtQOxhn3yFtvJe6ZbgcJ0dJGHzG3UDxtAR1SBIjsKNNOVZSFckzxzH-K0IZX32h=oTWcNuqllszjvRpA4Q5JdO-cWpH4j71ZDLdrEbjAdj0l7=DgH187pgSvLedE-xi_gNmUKOKHRAHVd-j1",
     "key": "",
-    "password": "a3d괙璆ps\u0007𡒵TjCIX􅠛~🂊[BRsm镰Xฟ!<]{\u0016𠂇;jYj8\u0008󼀈\u000cNT𨺉\u0006HGp𡜧7\u001e󵉾𔖔>7\u000fJq<\u000b @𥏨;\u001e\u0002𖤄\u0016&}􃜒-ฟ𡾋𮩛Ef􈘬\u0019*९/[x<*;0𠯭>l7⚄k\u0004\\\nhl𘒾q􂲚󺏷1􅵎􁹈\u0008󽀱 %R-\t󸿌Sn󾗐\u000f1󰣉\u0000\u0012ꂂ\u001f醚[6X𘄉nRMHw#tB3Gf\r4S%\u0017\rC=*rQ\u000b~}H󽟂8\u0000Myd9 p\u0013\u000e{@\u0006\u0006\"rs{Uo9\u0011\t\u0010\u0005)0𒈃m󽸑\u001e􊢬9o쥈􎣽\rƷd\u001b𡢤M\u0006\u0008􎋺:\u001d\u000eB0􍷗ss5G𬭢nmPIoPE\u000e2\u0013\u0005H\u0003䢓p􀆱v\u000bc󴩻󷀪o^?𥚂#H駝@附@𘤴V𝄼+\u001ck􎳣)/𬗢8NOᆖ껅95𬂕WT󲌑ᙄi=e\u0002𭈿\u001e!>𨢡`􌯈gtG 3\u0006􂁤\u0007=x8\u0011x@R\u0005$|\u0014;ZL\u000e\u0004t!\u0016𗄲6^'㩶r+\u0006}𤄒\u0002􌟚i\u001b􌲘4k1};C$4\u000b\u0003\u0003H􉥉Z#=㶗\n1%􅀦 􍎓䎕$fz\u0010cA槧Vy2#󶞅\rF9L􂑘2Eh\u001c鲹_jm蒻8猌\r+/.{K\u0014\\𑛄[􇍤􈯶ꉐ+yU&F\u0017j\u0016N;r~=\t𦥲󱐠𣟪1w8ro􇟃󱔦\u0002d􊖦mN􇘅髊D\u0011Ne,b쮢\u000fB^\u000b\u0015|E-$n]𤱐󴝐d\u000c3\u001a\u0015\u0004w󸙏㖅ᝊ'3𗆚\u001eO\u0019𫙯U𢱷9􈜈:tS,?\u0002*\u0007\u0019/\rNꭧu󾔷4:t󰲴~wGh🍕󳃅%mVc\u0018#rd\u0007𐹷_T2m\u0015rDfO,\u0003@ \r+Ab􏬶e\u0003H&#媎俳[䟩l1󸻍\u001ae𥠱'㻓\u00154°\u000b㏪*E\u0003\u0018\u0014\u000fJ󱍓jo𗘧3lo--,𡒌@\u000bHTw\u0019毁󲸀XY4𗍽u}qFJ󿲽\u001a󵍲<\\󻞗,*~\t\u0008ed󷛷<p3𫏥<捐U\u0008o4*𧎘\u00017R㑖P|衟\u0006\u0007\u0006\n\u0012\t\u0018\u0010'1[L?\u0011􈊱h3&\u000f􈡨e\u0015z^o\u0010叓\r椧}<Z\u00083T󷑧\u0000X󳤶󳛶𛅒R\u00009󽵹\"𤲰l\u0012d􍏃\u001b;=󿲅B𣳛30䮟𗿺,>\u0007\n􉠱u省?c嘘\\𮀥\u0018!􌔅\u001d2s􅐇󸴨Y;虐\u0017􅋞=]Qs('<hU끙Lೄ䏤𥺠\u0012\u000fG&2\u0018\u0015ni$\\𤌲\u0012\u001c󿒽􏏕9⼳𫄢|[\u0004󱰖􊭮_//~V𧨉\u0017\u000b#E\u0005\u00170\u0010\u0007𡵩bG\u0015\u000cTT(\u0014𠜞$i\u001a\u0002e\u0001{\u0007s􆱥僙b􌾿^߷fR􇽕e6AEe󺆣\u000bq\u001a4^:.w\u0019\u0017-/󾙨\u001a,GelX􃬕J",
-    "code": "2I7=q77Q8QCiyaoKVP8TXpdDJIFfol2dXkYJJpNtOp6ne39Ktkfsdhiw-Hs=TCndYZBOHhGwXI7xi-0VYGH=B=6n5dUmNlG8IttqQyD17FRIiylJktAq7ZYH884=9TpOE-woQD=XQiwuAp=hXEIMayRAkoT2K=SHUR2n0P-o9tz8oJ=6DOBtQOxhn3yFtvJe6ZbgcJ0dJGHzG3UDxtAR1SBIjsKNNOVZSFckzxzH-K0IZX32h=oTWcNuqllszjvRpA4Q5JdO-cWpH4j71ZDLdrEbjAdj0l7=DgH187pgSvLedE-xi_gNmUKOKHRAHVd-j1"
-}
\ No newline at end of file
+    "password": "a3d괙璆ps\u0007𡒵TjCIX􅠛~🂊[BRsm镰Xฟ!<]{\u0016𠂇;jYj8\u0008󼀈\u000cNT𨺉\u0006HGp𡜧7\u001e󵉾𔖔>7\u000fJq<\u000b @𥏨;\u001e\u0002𖤄\u0016&}􃜒-ฟ𡾋𮩛Ef􈘬\u0019*९/[x<*;0𠯭>l7⚄k\u0004\\\nhl𘒾q􂲚󺏷1􅵎􁹈\u0008󽀱 %R-\t󸿌Sn󾗐\u000f1󰣉\u0000\u0012ꂂ\u001f醚[6X𘄉nRMHw#tB3Gf\r4S%\u0017\rC=*rQ\u000b~}H󽟂8\u0000Myd9 p\u0013\u000e{@\u0006\u0006\"rs{Uo9\u0011\t\u0010\u0005)0𒈃m󽸑\u001e􊢬9o쥈􎣽\rƷd\u001b𡢤M\u0006\u0008􎋺:\u001d\u000eB0􍷗ss5G𬭢nmPIoPE\u000e2\u0013\u0005H\u0003䢓p􀆱v\u000bc󴩻󷀪o^?𥚂#H駝@附@𘤴V𝄼+\u001ck􎳣)/𬗢8NOᆖ껅95𬂕WT󲌑ᙄi=e\u0002𭈿\u001e!>𨢡`􌯈gtG 3\u0006􂁤\u0007=x8\u0011x@R\u0005$|\u0014;ZL\u000e\u0004t!\u0016𗄲6^'㩶r+\u0006}𤄒\u0002􌟚i\u001b􌲘4k1};C$4\u000b\u0003\u0003H􉥉Z#=㶗\n1%􅀦 􍎓䎕$fz\u0010cA槧Vy2#󶞅\rF9L􂑘2Eh\u001c鲹_jm蒻8猌\r+/.{K\u0014\\𑛄[􇍤􈯶ꉐ+yU&F\u0017j\u0016N;r~=\t𦥲󱐠𣟪1w8ro􇟃󱔦\u0002d􊖦mN􇘅髊D\u0011Ne,b쮢\u000fB^\u000b\u0015|E-$n]𤱐󴝐d\u000c3\u001a\u0015\u0004w󸙏㖅ᝊ'3𗆚\u001eO\u0019𫙯U𢱷9􈜈:tS,?\u0002*\u0007\u0019/\rNꭧu󾔷4:t󰲴~wGh🍕󳃅%mVc\u0018#rd\u0007𐹷_T2m\u0015rDfO,\u0003@ \r+Ab􏬶e\u0003H&#媎俳[䟩l1󸻍\u001ae𥠱'㻓\u00154°\u000b㏪*E\u0003\u0018\u0014\u000fJ󱍓jo𗘧3lo--,𡒌@\u000bHTw\u0019毁󲸀XY4𗍽u}qFJ󿲽\u001a󵍲<\\󻞗,*~\t\u0008ed󷛷<p3𫏥<捐U\u0008o4*𧎘\u00017R㑖P|衟\u0006\u0007\u0006\n\u0012\t\u0018\u0010'1[L?\u0011􈊱h3&\u000f􈡨e\u0015z^o\u0010叓\r椧}<Z\u00083T󷑧\u0000X󳤶󳛶𛅒R\u00009󽵹\"𤲰l\u0012d􍏃\u001b;=󿲅B𣳛30䮟𗿺,>\u0007\n􉠱u省?c嘘\\𮀥\u0018!􌔅\u001d2s􅐇󸴨Y;虐\u0017􅋞=]Qs('<hU끙Lೄ䏤𥺠\u0012\u000fG&2\u0018\u0015ni$\\𤌲\u0012\u001c󿒽􏏕9⼳𫄢|[\u0004󱰖􊭮_//~V𧨉\u0017\u000b#E\u0005\u00170\u0010\u0007𡵩bG\u0015\u000cTT(\u0014𠜞$i\u001a\u0002e\u0001{\u0007s􆱥僙b􌾿^߷fR􇽕e6AEe󺆣\u000bq\u001a4^:.w\u0019\u0017-/󾙨\u001a,GelX􃬕J"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_20.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_20.json
index 8ab5c941c81..57844e8c404 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_20.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_20.json
@@ -1,5 +1,5 @@
 {
+    "code": "S4EnT8ajkuHyeuozGd_HX3VmHqhmNMJn3LuxAiPku8F9hwk8fWvQlmoZkhreAOGYE1o5dWORSFivpNp1RRCOP2-SvkAxCX5TFlx8Pv=ZD1O5tusMN2jraJpT060KRHe9tpQeEzOItpavn_M=L8JfXdu_KPimxKGMvqedw4QSqpRAtbWSPyn0YIWwnBzGM1=UNzlueBptrYkNbxLN4jmTBvw4dys8pUEUW71uKeHM0HcGHVfkKn4LDGtJnA=4UX6duOsGee_GVLePjlAQP8gzeV68siIbbVJp4BmUIwh0FyZ2tcaN5=nYxs9rg78V8ukl1lH7srQFh1TtvuHTnR6e9bUkF2IP2MbJKPCBL4DnLNfZE7yoW5X",
     "key": "wGwL",
-    "password": "%:F]T\u0005\u000bt`c/$x\u000c\r𛅲<𨼂\u0012%3gF1!&DM[Alw₮M :\tg\u000f +3\\襻r𭜙A'󾤡\u0007U8󸋄𓆞c\u0000\u0011[&w𦨔􌁣6\u0017U\u000e󼱉_\\\u0014?􏦴􈋦q3􎜃Z󺓑20\u0005𦮎fkc\u0002,FT醑F0m_8o~!\u0001􋚄`A𩝠!𫾧匪Kh4;f;.􃆏*q􍖠􅪚􇧇𫉈󲦯_Ay]󽛁I\u001e𬷥b4𧐕Vt\u0007;!\u000c􇙺󹔭Z^,r\u001aC\u0014𑻳1𧝐󸟏 aS=ak\u00161\u001a󸸩􅥴\u0008H拘]𫅑]%􌒱娮;󴊃01\u0004􅝉X𤋚𑘺\u001e󿗍􋛐􎛧.+e\u0011􊵽MeAY󻰝YvK\u0010i\r􄪌\u001e@f[>>\\m;T_\u0013u𦣉󵽥矊T􂺋\u001c+󸹙􏛼󸓷9ta6k󷯔7&󸽄RD81g(L쵟􍹩^k\u001f􉦳C%𑙔㒧T-(\u0004\r:V𬞒𘚈1𪐣𨷭\rJ􂛊T7NM6D􊸻=+\u0010U𣍒\u0016v\u0015f\u0016zﷂ󠇩[64=b\u0019\u0012𛀀󽑨>C\u0004𡂛S*饨p/\u0012\u0018m#󸽬\n_~*P뛌D~𭙎􃆤\u001e\u0019\u0016h􂡯<^􆯇V:yL\u0011󰎀퐠𗏱Me\u0011𪙅点}嫁SEyGN~eCꉵ󶍰\u0011{)빏^NC󾑻󶫢𥖧\u001b}􀡚󾽛<yp滮o󱺸𡁣[Ks\u0016FTF𦐑\u0018\u000f眆\u0007\u000f\u0013`i\"$h*!Tu\u000f\"󾰪󼄹\u001av\u0014}󷴖\u0016󻵰`\u000f/jH)俨𨿶n鲸*󵔅\u0017􍑜𑋪Q\u001fp\u001a捰'{=\u0008\"\u0018DqBTN\u0015R ?󿛦\u0000\u000f;'󲤡𢡍j@𣗍􍷉𫣺\u001f.GiېG!s𬷀\u001dcHK\u0007`Tkr󺊯BZN󼚌𫎤+\u0014㰿惗𘀚ah2㞞{𭱒Q?`󿉉5\u0016􆈮\u0006D\u00197􃍵#p󲰩h^m󴜆\"𥒍𮐯lV􆪇P\u001f-)󾹘𣠍jr#,X􇁈᠁\u000c󰉮\u0018>50h*\u0011\u000f{\u000f\u001a]􅤐>|\u001b_$[𬓨\u0004bN3j\u001e𩰑\u0017𣜣gP􄌵𪝶󶘗𘓁󺸵󺙓.z𭋹\u0012\t𦞴fB\\\u0018\u0013|\u0014G题6\u0006\u0008\u0010h𞠉\u0015𒊰Gw,+5\u000b+k𘑡O󵓴F&T𘟷\u0003>GTX#𝚡􎶫?BS玛lQ𩕶誗􀐠=\u001e\u000e󳖨흢^\r0n\u0015𣳳🕡󽡽\u0002Eq𫕋󲟊]h\u0013B\u001a!󱯆璬N󱀁󺨝2.𫱮ᣓ2u\u0011$􂄪H􇊒ua)󾰑v\u001ey\u00047KC\u0005󺄯8kuY󲂜􆡭:F𩒦E2\u0006ZY𭦮􃋽J𤦴s\u001f􍂠7G6\u001b\u000bf\u0011𘤻􃙗𘔺\u0017\u0008E􆐞룖켁wl'𖣴𩏤󲢚gl󱥯!U);v\u0003I\u0007K\u001fa\u0000󰾳F\u0010􋬅Z\u0012%󲱴u􎖔{Ah\u0006􏽡\u0008\u000e\u0010z\u0013\u0005]\u001a𨏶Ft`\u001a&󽖓bwŊVSO\u0006z\u0004@\\`𤁘ဏr%\"%;􂃈7\rs?􌅃g􌈝P\u0001t\u0000$𭝦􅪀󹩸󷣖c\u0005o,[􁳄\u0001𪉀rc.𤇅\u0016g\u0000<\u00001hO\u0003hhN󵺟P\u0011\u000f\u0016Y𘂹mBIk\u001a\n􇬕𡄬\u0014U\u000cu(LakUtಛ🐶t\u0008'􏑔{=8\u0014♺jzt\u001b𠲟\u0002Q\u0011 7\u001e𪶮;􎡟\u0015e󷲷趬\u00012.F膨:󼺿֭𥈽\u0013\u00058EC|𪛒xy\u001e/~P𢖼[􉝎\u001e󸮁+0j7z𬻚\u001ffr\u000c\u0018Sm\u000e􄡛󷮆U\u0010\u0015𨍴^+*\\k\u000b\u001f'<2󹧎\u001b㨩Щ𦧯𮀁)\u001d~됰Nr\u000cu𣟣𩆨<R󲼈FUs󳽸#󿯴Q>\u001dl\u0006cUjm X\u0004M\\3j\na-Y",
-    "code": "S4EnT8ajkuHyeuozGd_HX3VmHqhmNMJn3LuxAiPku8F9hwk8fWvQlmoZkhreAOGYE1o5dWORSFivpNp1RRCOP2-SvkAxCX5TFlx8Pv=ZD1O5tusMN2jraJpT060KRHe9tpQeEzOItpavn_M=L8JfXdu_KPimxKGMvqedw4QSqpRAtbWSPyn0YIWwnBzGM1=UNzlueBptrYkNbxLN4jmTBvw4dys8pUEUW71uKeHM0HcGHVfkKn4LDGtJnA=4UX6duOsGee_GVLePjlAQP8gzeV68siIbbVJp4BmUIwh0FyZ2tcaN5=nYxs9rg78V8ukl1lH7srQFh1TtvuHTnR6e9bUkF2IP2MbJKPCBL4DnLNfZE7yoW5X"
-}
\ No newline at end of file
+    "password": "%:F]T\u0005\u000bt`c/$x\u000c\r𛅲<𨼂\u0012%3gF1!&DM[Alw₮M :\tg\u000f +3\\襻r𭜙A'󾤡\u0007U8󸋄𓆞c\u0000\u0011[&w𦨔􌁣6\u0017U\u000e󼱉_\\\u0014?􏦴􈋦q3􎜃Z󺓑20\u0005𦮎fkc\u0002,FT醑F0m_8o~!\u0001􋚄`A𩝠!𫾧匪Kh4;f;.􃆏*q􍖠􅪚􇧇𫉈󲦯_Ay]󽛁I\u001e𬷥b4𧐕Vt\u0007;!\u000c􇙺󹔭Z^,r\u001aC\u0014𑻳1𧝐󸟏 aS=ak\u00161\u001a󸸩􅥴\u0008H拘]𫅑]%􌒱娮;󴊃01\u0004􅝉X𤋚𑘺\u001e󿗍􋛐􎛧.+e\u0011􊵽MeAY󻰝YvK\u0010i\r􄪌\u001e@f[>>\\m;T_\u0013u𦣉󵽥矊T􂺋\u001c+󸹙􏛼󸓷9ta6k󷯔7&󸽄RD81g(L쵟􍹩^k\u001f􉦳C%𑙔㒧T-(\u0004\r:V𬞒𘚈1𪐣𨷭\rJ􂛊T7NM6D􊸻=+\u0010U𣍒\u0016v\u0015f\u0016zﷂ󠇩[64=b\u0019\u0012𛀀󽑨>C\u0004𡂛S*饨p/\u0012\u0018m#󸽬\n_~*P뛌D~𭙎􃆤\u001e\u0019\u0016h􂡯<^􆯇V:yL\u0011󰎀퐠𗏱Me\u0011𪙅点}嫁SEyGN~eCꉵ󶍰\u0011{)빏^NC󾑻󶫢𥖧\u001b}􀡚󾽛<yp滮o󱺸𡁣[Ks\u0016FTF𦐑\u0018\u000f眆\u0007\u000f\u0013`i\"$h*!Tu\u000f\"󾰪󼄹\u001av\u0014}󷴖\u0016󻵰`\u000f/jH)俨𨿶n鲸*󵔅\u0017􍑜𑋪Q\u001fp\u001a捰'{=\u0008\"\u0018DqBTN\u0015R ?󿛦\u0000\u000f;'󲤡𢡍j@𣗍􍷉𫣺\u001f.GiېG!s𬷀\u001dcHK\u0007`Tkr󺊯BZN󼚌𫎤+\u0014㰿惗𘀚ah2㞞{𭱒Q?`󿉉5\u0016􆈮\u0006D\u00197􃍵#p󲰩h^m󴜆\"𥒍𮐯lV􆪇P\u001f-)󾹘𣠍jr#,X􇁈᠁\u000c󰉮\u0018>50h*\u0011\u000f{\u000f\u001a]􅤐>|\u001b_$[𬓨\u0004bN3j\u001e𩰑\u0017𣜣gP􄌵𪝶󶘗𘓁󺸵󺙓.z𭋹\u0012\t𦞴fB\\\u0018\u0013|\u0014G题6\u0006\u0008\u0010h𞠉\u0015𒊰Gw,+5\u000b+k𘑡O󵓴F&T𘟷\u0003>GTX#𝚡􎶫?BS玛lQ𩕶誗􀐠=\u001e\u000e󳖨흢^\r0n\u0015𣳳🕡󽡽\u0002Eq𫕋󲟊]h\u0013B\u001a!󱯆璬N󱀁󺨝2.𫱮ᣓ2u\u0011$􂄪H􇊒ua)󾰑v\u001ey\u00047KC\u0005󺄯8kuY󲂜􆡭:F𩒦E2\u0006ZY𭦮􃋽J𤦴s\u001f􍂠7G6\u001b\u000bf\u0011𘤻􃙗𘔺\u0017\u0008E􆐞룖켁wl'𖣴𩏤󲢚gl󱥯!U);v\u0003I\u0007K\u001fa\u0000󰾳F\u0010􋬅Z\u0012%󲱴u􎖔{Ah\u0006􏽡\u0008\u000e\u0010z\u0013\u0005]\u001a𨏶Ft`\u001a&󽖓bwŊVSO\u0006z\u0004@\\`𤁘ဏr%\"%;􂃈7\rs?􌅃g􌈝P\u0001t\u0000$𭝦􅪀󹩸󷣖c\u0005o,[􁳄\u0001𪉀rc.𤇅\u0016g\u0000<\u00001hO\u0003hhN󵺟P\u0011\u000f\u0016Y𘂹mBIk\u001a\n􇬕𡄬\u0014U\u000cu(LakUtಛ🐶t\u0008'􏑔{=8\u0014♺jzt\u001b𠲟\u0002Q\u0011 7\u001e𪶮;􎡟\u0015e󷲷趬\u00012.F膨:󼺿֭𥈽\u0013\u00058EC|𪛒xy\u001e/~P𢖼[􉝎\u001e󸮁+0j7z𬻚\u001ffr\u000c\u0018Sm\u000e􄡛󷮆U\u0010\u0015𨍴^+*\\k\u000b\u001f'<2󹧎\u001b㨩Щ𦧯𮀁)\u001d~됰Nr\u000cu𣟣𩆨<R󲼈FUs󳽸#󿯴Q>\u001dl\u0006cUjm X\u0004M\\3j\na-Y"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_3.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_3.json
index 55a20d52fc2..f26ce5ef14b 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_3.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_3.json
@@ -1,5 +1,5 @@
 {
+    "code": "3Hscxcggm_aoPZM=w-hJ5Z-xXSkr-X4MID-WGI42TXbR8rnMfnj4m7Kvv7PsVwkZ-DVxkR4Fitcfs=G4h0B-R5zmaJ67fShX-KWP0pqGoEsn=9jqUrfzJfHlVbEMgvxITTgmbaLF-yDREL5_fUzeWi1X3uM4aoqRQkU8tnJx6_Rl57T-nBM5v_cQPtP_8KrqWPyXjnA0wxZ72OXbSJiGyVZ8S4tM6ibL1SI2zj7xEAinA2wr4xDFsQRnBLNi0kI9wfsU4Ba5uxiMZ_KJOSFWeH_V=C7LaTX4u-ApwjieRe_O9xp6RRU5d-Dw41ZMYRH0QZqTPzaggqDBt0H9pv0k2E3FO4-foGKNreFIhhsvETA3EGetN-dpvb=v6WvBdV3Oke6KXPAGibFuTXZlygqkiG29afP_IwbBTi81tSsThZ_Ellw7Nn=N5Kqpo8qfTqEVr0ou72hQqcFw-d9F7jG30qhcHMoidQzru1qmF01F9mNmJmmFOlhhUImpVxeLroHheb6UaJj5kUFnlzZDjqtMCjKGaOL3che0NUlompYVZezm2KyIOMhCOqWAYzmsKNZZS1aliDqMrj_2B=txX3oLManHxFJljcKAX00CbObuwOw8IX98TmrZbSWUgpdLGL",
     "key": "cuBaj2u5",
-    "password": "o𠙭h#\u000b𮕲6𡔔~c$􀊷\\l􊏽\u001c\r!𫆜􍤚HPdHISOx7𑪆⺠\u0013&`abl󽞥}𒂡\"􆩆7XK\u0014􍶞􈫎􉒆d0􍥁I\u001d󼋗估𦰚F\u0004𬝑x#+y𢊜P􁸆zjK𩏯𡖕?ผ\u0012Q/𩣿j!𭌚\u0000,󺡣n9d𨯮$\u001b5F􊊴􏩞􄣊􄑇𮔻#󽔤󼹿􀟃=\\\u001f􌞞>p)󺪆o𗐛𝞭󵯾􉣁􆬛􉝴􁱜Q\u0011Ğ󰤇ი\u0001W󶾋\u0004\u000e\u001e(|3滒捳|\u000btfO􊦴D\u0017\u000f\u000etV\nFJ\u0019%𩻶b\u001fcc\u0004㥵􊟴𥏣]\r陚\u0005嶤q;\u001a 9\u0010L/󸄮\u0017TḺ\u0004\u0014喜𥣐m􉣥􊓿hwib𥏄𖩐𢝃\u000f􎝒I𩫁}k\u0016:]4􏭳^h󾓲󿇍U󸍸Q@<\t1jU\u0019H6iA󺒚YG\u0014󶘿]7b\u0018𥇆55󾜒𐑚\u0001s-𑖗\u000e𪖜;\u0015\u0014hb𥐏(􊈒kKv7\u001f,\u000c`頻\u0012𡾄t𪷙af\"󵥛w[{󲥑V󴙃0 ]\u0012𧞻DbWCZ0\u0000𘅹iYvW\u0019𬎆i\u0008𣼒J\u0003\u001enuC𮛿6􈉞A5!\u0014F|G􆘬}󸔏\u0005'l𘅛PP읛󿽂\u00109𤄮\u0005[󴗇𧋲\u0019즰\u000fOO𦤷갋􈅇=𢂸52gc)-)da\u0002􏐿\u0013􏭏􂩤]\u0003􈆇􊶀FBo\"𡕖hTU\u0006\u001b_z 󸁏d\u0017캿d\u001b\u001a^@JcAF\u000cy\u0018􀫺󸀊\u000f)\u001dꌀW3Z\\J􇂐(􊠾t􌝮\u000c\u001c𢅯􍟕s󿈠{<9\u001aOBEj<\u00026𭑒[𦢧\u0008󹊍\u001a%:􁴻?ރx𩲔x\u001bﻐ0iv+󱖛eF=􌮴𮤽󷗧EP\u001e4󷰀0\u001c$?\u0000𑩀􌾦c󺟡\u0018\rcb𗣰𦬕l𨫧􆋁J􅰘'逾w\u0001𧿳,>󵕇\u0008`𫹍𫹰󴯄p)𠔷(ol𣢰t䄊\"\u0015o𧏨洚qsiAV\u001eHaK/\u0014s\u0005}󱮓\u001bG􍍫\u001cd(\"𦙙m\u0000+\u001a󿃂b\u0007+[Z)_@=r𮍇}~샤8bE.\u00043𠞎N\u00088\u001cGn𠥳\u00141𨖃\u001c4\u0014\u000c;\u000c􄣋J\t􃷦􈥍O%᠖D\u0015D%6S\u0017,#>곴c𡼑q󶚆왱=TfJ]􀐡U􊖫􊍦\tB*xn~𢎬myl𮄺\u0013I.<d􊶉n\u001aq_\u000b󿷊q󷌝LZ􆾉<`\u001d9掊%h",
-    "code": "3Hscxcggm_aoPZM=w-hJ5Z-xXSkr-X4MID-WGI42TXbR8rnMfnj4m7Kvv7PsVwkZ-DVxkR4Fitcfs=G4h0B-R5zmaJ67fShX-KWP0pqGoEsn=9jqUrfzJfHlVbEMgvxITTgmbaLF-yDREL5_fUzeWi1X3uM4aoqRQkU8tnJx6_Rl57T-nBM5v_cQPtP_8KrqWPyXjnA0wxZ72OXbSJiGyVZ8S4tM6ibL1SI2zj7xEAinA2wr4xDFsQRnBLNi0kI9wfsU4Ba5uxiMZ_KJOSFWeH_V=C7LaTX4u-ApwjieRe_O9xp6RRU5d-Dw41ZMYRH0QZqTPzaggqDBt0H9pv0k2E3FO4-foGKNreFIhhsvETA3EGetN-dpvb=v6WvBdV3Oke6KXPAGibFuTXZlygqkiG29afP_IwbBTi81tSsThZ_Ellw7Nn=N5Kqpo8qfTqEVr0ou72hQqcFw-d9F7jG30qhcHMoidQzru1qmF01F9mNmJmmFOlhhUImpVxeLroHheb6UaJj5kUFnlzZDjqtMCjKGaOL3che0NUlompYVZezm2KyIOMhCOqWAYzmsKNZZS1aliDqMrj_2B=txX3oLManHxFJljcKAX00CbObuwOw8IX98TmrZbSWUgpdLGL"
-}
\ No newline at end of file
+    "password": "o𠙭h#\u000b𮕲6𡔔~c$􀊷\\l􊏽\u001c\r!𫆜􍤚HPdHISOx7𑪆⺠\u0013&`abl󽞥}𒂡\"􆩆7XK\u0014􍶞􈫎􉒆d0􍥁I\u001d󼋗估𦰚F\u0004𬝑x#+y𢊜P􁸆zjK𩏯𡖕?ผ\u0012Q/𩣿j!𭌚\u0000,󺡣n9d𨯮$\u001b5F􊊴􏩞􄣊􄑇𮔻#󽔤󼹿􀟃=\\\u001f􌞞>p)󺪆o𗐛𝞭󵯾􉣁􆬛􉝴􁱜Q\u0011Ğ󰤇ი\u0001W󶾋\u0004\u000e\u001e(|3滒捳|\u000btfO􊦴D\u0017\u000f\u000etV\nFJ\u0019%𩻶b\u001fcc\u0004㥵􊟴𥏣]\r陚\u0005嶤q;\u001a 9\u0010L/󸄮\u0017TḺ\u0004\u0014喜𥣐m􉣥􊓿hwib𥏄𖩐𢝃\u000f􎝒I𩫁}k\u0016:]4􏭳^h󾓲󿇍U󸍸Q@<\t1jU\u0019H6iA󺒚YG\u0014󶘿]7b\u0018𥇆55󾜒𐑚\u0001s-𑖗\u000e𪖜;\u0015\u0014hb𥐏(􊈒kKv7\u001f,\u000c`頻\u0012𡾄t𪷙af\"󵥛w[{󲥑V󴙃0 ]\u0012𧞻DbWCZ0\u0000𘅹iYvW\u0019𬎆i\u0008𣼒J\u0003\u001enuC𮛿6􈉞A5!\u0014F|G􆘬}󸔏\u0005'l𘅛PP읛󿽂\u00109𤄮\u0005[󴗇𧋲\u0019즰\u000fOO𦤷갋􈅇=𢂸52gc)-)da\u0002􏐿\u0013􏭏􂩤]\u0003􈆇􊶀FBo\"𡕖hTU\u0006\u001b_z 󸁏d\u0017캿d\u001b\u001a^@JcAF\u000cy\u0018􀫺󸀊\u000f)\u001dꌀW3Z\\J􇂐(􊠾t􌝮\u000c\u001c𢅯􍟕s󿈠{<9\u001aOBEj<\u00026𭑒[𦢧\u0008󹊍\u001a%:􁴻?ރx𩲔x\u001bﻐ0iv+󱖛eF=􌮴𮤽󷗧EP\u001e4󷰀0\u001c$?\u0000𑩀􌾦c󺟡\u0018\rcb𗣰𦬕l𨫧􆋁J􅰘'逾w\u0001𧿳,>󵕇\u0008`𫹍𫹰󴯄p)𠔷(ol𣢰t䄊\"\u0015o𧏨洚qsiAV\u001eHaK/\u0014s\u0005}󱮓\u001bG􍍫\u001cd(\"𦙙m\u0000+\u001a󿃂b\u0007+[Z)_@=r𮍇}~샤8bE.\u00043𠞎N\u00088\u001cGn𠥳\u00141𨖃\u001c4\u0014\u000c;\u000c􄣋J\t􃷦􈥍O%᠖D\u0015D%6S\u0017,#>곴c𡼑q󶚆왱=TfJ]􀐡U􊖫􊍦\tB*xn~𢎬myl𮄺\u0013I.<d􊶉n\u001aq_\u000b󿷊q󷌝LZ􆾉<`\u001d9掊%h"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_4.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_4.json
index e0f544b6614..8b35c603e18 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_4.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_4.json
@@ -1,5 +1,5 @@
 {
+    "code": "FKnQwRcbB-bCQwdDH6OTQsc5g-I9IDiHheM6TakPeV4ZwP3x3i5rlkV7mHpp07ciotHX_jsPVzD4xjtCgFHnVTP1jIflndRa558zctQSaIml6BKUej6fC6WmS_Y1=28ti0mhMAlxsU3FX84O6Dt83kW5aeRuVPK-yrzlEg7k_oWB36DY2F_wwbJMJ3294j4owo1Y-p3VAi7nB9FKZZd2WuJGk3jryStw3BNQIeOY66Y4n3RLeFOA3rfTd=TwjuWlD4M42UfTQkT_-H_h-oJiQG-dltrDXiT0bFtuu6u=Cotl8PPUY1YR5wp_fQZgzeNe5C94hXBctqRszGbHZVzdXbwq0-M3J4XL2tyAXqLhMfmyWB3EwCpo5DGA17=PfMkNBMIA0dIAnF5s=Ir7hOlc=Z98t2SxKcLgD8cxMnsVnbYRd3D3FsL0BSya92yYkqWSF=gE2i61-BiwlN=RReUKoHXWHXMGsjpiud5YykaWtUge78A=V2yPkzYCIbp8_3FWi3-Yp6g5eLEPtW=Dv6fcPbkCrQebdHgW4nQp3qRDCvE-qTH92",
     "key": "pg==",
-    "password": "\u001a\u0010\u001c|\u001d4􋤞+,3RmA\u0004@m胊𤱩t!󷎷NX,|\u00121!+bnXFS$\u0016~􃧰l\u001d󴧨l7q,z\u001b\u0003({hu􈾣|맴䤁Hu\u0017G\u0007󿓹kK𗿩󸞸𔓄m\u0008󹢿𗯦_𘈹\u000cᕲ\u0019)+N)\u000c𠐎篒fmyEb𭩗tb\u0017>8G-􏁮B]g\u0008\u001fS;W󾋧꩒/𫚬\u0002+\u0013f󵵚J\u0016\u0007 \u0000􎱨\u0012\u0008􀬮󹰤!\u000c阩e󿣭6[U𢘽\u0007􌰂;|O𛂒󱙼#B𝃑t>D'wo\t#ꘜo𮂇sq\u000fY\u001d@-<:sY9P|ꚵV\u001b]KQ\u000e\rJ\u000e\nD􀆩\u0010]PX𔕪􃸔𫟾锧\u0002𑋝\u0011\u000fO$/􏽞\u000f󳤀\u001eK쐢AzE𪴖𛋱JZ𢼉\u001b#*\u0002\u001aUR]\u0006)󽦽𑵮𬴚\u0011oW\u001b`􇜖𣋋\u00081u88\u0014𑜠\u000c𬣴󶞞􆄌u𪚭C\u0017Lj籀Nn>wD\u0002vwN􆝥p㖐􄶕\u0011l;N~􊇰󵞝?󷡅Jy?W𬽷󳕠T%􀂀SwB𠎑g }O_yZ}G󳥕Khr󿟈#􉧎au.T8𘟊s\u0002󶬟,\u0005EF🈝QF ꖎU濢\u0006􆰃􆘪*\u0006\t󵳴-BH3梫\u0008\u0006󳱚js6_𘃋1|\u0013󿭮󶤄\u0010D8R\u0018G􇔑\u0011􀟆󰃸v<􍤤􋅫\u001a\u001f\u0001_𫟡􁫴}󸟬q~\u001d?\u0008톗P􀁘SV󰆽Jd O𐧊C􏞐)퐸𝪩&􅔢9󾼬aࡓꤘ\u0011.䵊O상󳍰󼻓ଁ\u0011v\u000f𮚼𘣨\u001a󽒥%ܚz\u001b\t󸝺𝌤B[𣓳Ei􋆱􂿉~<",
-    "code": "FKnQwRcbB-bCQwdDH6OTQsc5g-I9IDiHheM6TakPeV4ZwP3x3i5rlkV7mHpp07ciotHX_jsPVzD4xjtCgFHnVTP1jIflndRa558zctQSaIml6BKUej6fC6WmS_Y1=28ti0mhMAlxsU3FX84O6Dt83kW5aeRuVPK-yrzlEg7k_oWB36DY2F_wwbJMJ3294j4owo1Y-p3VAi7nB9FKZZd2WuJGk3jryStw3BNQIeOY66Y4n3RLeFOA3rfTd=TwjuWlD4M42UfTQkT_-H_h-oJiQG-dltrDXiT0bFtuu6u=Cotl8PPUY1YR5wp_fQZgzeNe5C94hXBctqRszGbHZVzdXbwq0-M3J4XL2tyAXqLhMfmyWB3EwCpo5DGA17=PfMkNBMIA0dIAnF5s=Ir7hOlc=Z98t2SxKcLgD8cxMnsVnbYRd3D3FsL0BSya92yYkqWSF=gE2i61-BiwlN=RReUKoHXWHXMGsjpiud5YykaWtUge78A=V2yPkzYCIbp8_3FWi3-Yp6g5eLEPtW=Dv6fcPbkCrQebdHgW4nQp3qRDCvE-qTH92"
-}
\ No newline at end of file
+    "password": "\u001a\u0010\u001c|\u001d4􋤞+,3RmA\u0004@m胊𤱩t!󷎷NX,|\u00121!+bnXFS$\u0016~􃧰l\u001d󴧨l7q,z\u001b\u0003({hu􈾣|맴䤁Hu\u0017G\u0007󿓹kK𗿩󸞸𔓄m\u0008󹢿𗯦_𘈹\u000cᕲ\u0019)+N)\u000c𠐎篒fmyEb𭩗tb\u0017>8G-􏁮B]g\u0008\u001fS;W󾋧꩒/𫚬\u0002+\u0013f󵵚J\u0016\u0007 \u0000􎱨\u0012\u0008􀬮󹰤!\u000c阩e󿣭6[U𢘽\u0007􌰂;|O𛂒󱙼#B𝃑t>D'wo\t#ꘜo𮂇sq\u000fY\u001d@-<:sY9P|ꚵV\u001b]KQ\u000e\rJ\u000e\nD􀆩\u0010]PX𔕪􃸔𫟾锧\u0002𑋝\u0011\u000fO$/􏽞\u000f󳤀\u001eK쐢AzE𪴖𛋱JZ𢼉\u001b#*\u0002\u001aUR]\u0006)󽦽𑵮𬴚\u0011oW\u001b`􇜖𣋋\u00081u88\u0014𑜠\u000c𬣴󶞞􆄌u𪚭C\u0017Lj籀Nn>wD\u0002vwN􆝥p㖐􄶕\u0011l;N~􊇰󵞝?󷡅Jy?W𬽷󳕠T%􀂀SwB𠎑g }O_yZ}G󳥕Khr󿟈#􉧎au.T8𘟊s\u0002󶬟,\u0005EF🈝QF ꖎU濢\u0006􆰃􆘪*\u0006\t󵳴-BH3梫\u0008\u0006󳱚js6_𘃋1|\u0013󿭮󶤄\u0010D8R\u0018G􇔑\u0011􀟆󰃸v<􍤤􋅫\u001a\u001f\u0001_𫟡􁫴}󸟬q~\u001d?\u0008톗P􀁘SV󰆽Jd O𐧊C􏞐)퐸𝪩&􅔢9󾼬aࡓꤘ\u0011.䵊O상󳍰󼻓ଁ\u0011v\u000f𮚼𘣨\u001a󽒥%ܚz\u001b\t󸝺𝌤B[𣓳Ei􋆱􂿉~<"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_5.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_5.json
index 3457f3de3f4..db785fd0782 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_5.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_5.json
@@ -1,5 +1,5 @@
 {
+    "code": "uflt8-lJr8O5DUtHfpzwZQ5-iv_WTBeV-pAWB1PHemDlUwPAE89lcppmSr43jwfaSLGrRWovF-APHJjreuOTvF9=HVLO63tQ-lE1=wmlKGIZx_guJr_mDF3Xa5aYjUH9",
     "key": "2cpMpg9R9Lk=",
-    "password": "𦉍ℬ\u0004:c􇙱$\u001e{6o|ap<V\u001a𠨺~P補;\u0010\u0017#􇜮󳵲%!\u0014/𝍢\u0007\"7𥿋\u001f@Xuu􎁰𡋙􊚗G]5#􊾖Z𢣫􁯍w\u0007\u000bP󴃚Nd9L𦸕𑴪􋣫󿃾\u0007t|\u0015􁅂󰆑Ar\u0004%扣\u0005襤/\u0005v󱂱%wxZ\u001c󻴔󿱆~>\u001e",
-    "code": "uflt8-lJr8O5DUtHfpzwZQ5-iv_WTBeV-pAWB1PHemDlUwPAE89lcppmSr43jwfaSLGrRWovF-APHJjreuOTvF9=HVLO63tQ-lE1=wmlKGIZx_guJr_mDF3Xa5aYjUH9"
-}
\ No newline at end of file
+    "password": "𦉍ℬ\u0004:c􇙱$\u001e{6o|ap<V\u001a𠨺~P補;\u0010\u0017#􇜮󳵲%!\u0014/𝍢\u0007\"7𥿋\u001f@Xuu􎁰𡋙􊚗G]5#􊾖Z𢣫􁯍w\u0007\u000bP󴃚Nd9L𦸕𑴪􋣫󿃾\u0007t|\u0015􁅂󰆑Ar\u0004%扣\u0005襤/\u0005v󱂱%wxZ\u001c󻴔󿱆~>\u001e"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_6.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_6.json
index dd0b82631f2..aa1af0792c7 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_6.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_6.json
@@ -1,5 +1,5 @@
 {
+    "code": "f2375AvFIRnzj4uO7vdU4GrYBhp_Ddfpv-W_0YOyiS6XyDlnNANkEl6ba9exKJfBhxedtQuAeie7L9OnscS8lG6TpFN=nsuSg3BW4a4hYCa-izXNj7",
     "key": "nA48KL8=",
-    "password": "lm\u000fxﲼmY\u001f􋾮\u0007n<p\u0005𝒎@`)Gq\u0014𡬍4\u0008󺥢𬕪\u0005ﻌ7󴺔(l\u0004<x鏕bDw\u000c\u0004𠯪或NV\rH4]􅚔gB\u0012\u0002ꜶL*\u0013]K\u0004x\u0011Im(pY𥁵􅰀𓎮\u0006􎧔=o𥙱\u0004;]D\u000f𨐂i !𡣵\u0012?F\u001a\u0002󹆍󲛋􋨎󰌏\u000bt<l(3\u0006\u0001#>G\\hm2󱷳𗈧@\u001f󶼥􆈓🤋𒉢𑑒k󾧰5\u0014󳛄h\"\u00004\u0014\u000bkోyC\u0005A󹻾\u001770铕쨺>{W\u001c𫐻r? =\u0005A_&7q\u000c\u001b\u0010f𐫋0\u0016_WP\u0010󹘿\u0004\u0004􄇲-4죓Z𤄞\u0011h\u0005X􇠪1hG1𪮪uD󷐦-v04m􂰉l!+6󾈮\u0010\u001e`욳~Y\"􍃸[hAR𗒪0R󵮰󴆼*o\u000f\u0004:-J􎷊8\u001d8PF^$󲗃)H𩚪ix\\\rE󱩀(]!l_󵕧期\u0010\u0019p\u000bEWR)#㐕1j~'􁧛𧧄𩳈􋡋𬸒\u001a𪎶H\u0003\u0001g \u0003𘓙\u0006P\u001a\"迦󰫋u􁈸mZeROa\te\u000e\u000brm􆀖\u0011$2q)N\u0001'\u0016\u0014󸅤󸤃Q,Pi\"ﮱ]\u001d-&%\u000cgKib𭙀\u0005\u000c󻭛𭀽𤪕5JV𤖛.𤡊1𥯖5\u0018󰿼\u0008\u001bfz\u001a\u001e]1}\u0006\u0017UXlpT`𥌯4%\u0004H\"󱚊F\"끹MAHa54\u0014QM􎿭\u000e[􏲤/9aN𧩈󷌴;oI𗜯QR큓+󵑆􁴽!y~􊟤\n졢I􇊳|m𐚶\u0004%0yMLir7E;\u001fq\u0006xm\u0014􍾊^/Ui\u001e𮥶32󲋎!t\tZ􂔺\u0008~}o]\u000bO㠑􃉗'l$\u001e}Uy1\u000c\u001c𦵑\u0000\u001c\"W\u0016K7z\u0014\u001f#􂸊\u0010\u0003:𬪏O=Wx🂷zR\u001cP󺑐􈱠nNm𢢴퓴kw􋧨+瀉n\u0018\u0000W󵩉/L󹥣D憯𗅕m\u0016jOU5\u0004\u0013\u001de{P-󸅒95r㓣x_􉺰\u000eojT6Y𧕎\u000b󵨧V/Csbbwf+V\\mu6󺶗D\u000f󺰦\u000b\u001e󵹑M𧂫o􀞚暌\u0000\u0017ys熞CN\u0012|gNc\u0010=#c顉𠜪9m26󲛞Gb[$^\u0011J\u0003􏁄SR\u000c\u001e\u0012;\u0003?\u0008ꬒ[􀂵\u0007O懜󶅇󻌫K\tp\u001b󺝯J󺃮,L{\u0014iA᥊\u000bE\u00166U=􎠕􋟭\u001bC-􏋽􏥂*oh􄏅J\u001b󲙑\u0013\u001ff,#<R7D~󹽑z\u001dr󺑢l⫻L\u0014🁿𩿅\u0001W:(vf*\u0003\rxⁱ\u0014<a|\u0000_",
-    "code": "f2375AvFIRnzj4uO7vdU4GrYBhp_Ddfpv-W_0YOyiS6XyDlnNANkEl6ba9exKJfBhxedtQuAeie7L9OnscS8lG6TpFN=nsuSg3BW4a4hYCa-izXNj7"
-}
\ No newline at end of file
+    "password": "lm\u000fxﲼmY\u001f􋾮\u0007n<p\u0005𝒎@`)Gq\u0014𡬍4\u0008󺥢𬕪\u0005ﻌ7󴺔(l\u0004<x鏕bDw\u000c\u0004𠯪或NV\rH4]􅚔gB\u0012\u0002ꜶL*\u0013]K\u0004x\u0011Im(pY𥁵􅰀𓎮\u0006􎧔=o𥙱\u0004;]D\u000f𨐂i !𡣵\u0012?F\u001a\u0002󹆍󲛋􋨎󰌏\u000bt<l(3\u0006\u0001#>G\\hm2󱷳𗈧@\u001f󶼥􆈓🤋𒉢𑑒k󾧰5\u0014󳛄h\"\u00004\u0014\u000bkోyC\u0005A󹻾\u001770铕쨺>{W\u001c𫐻r? =\u0005A_&7q\u000c\u001b\u0010f𐫋0\u0016_WP\u0010󹘿\u0004\u0004􄇲-4죓Z𤄞\u0011h\u0005X􇠪1hG1𪮪uD󷐦-v04m􂰉l!+6󾈮\u0010\u001e`욳~Y\"􍃸[hAR𗒪0R󵮰󴆼*o\u000f\u0004:-J􎷊8\u001d8PF^$󲗃)H𩚪ix\\\rE󱩀(]!l_󵕧期\u0010\u0019p\u000bEWR)#㐕1j~'􁧛𧧄𩳈􋡋𬸒\u001a𪎶H\u0003\u0001g \u0003𘓙\u0006P\u001a\"迦󰫋u􁈸mZeROa\te\u000e\u000brm􆀖\u0011$2q)N\u0001'\u0016\u0014󸅤󸤃Q,Pi\"ﮱ]\u001d-&%\u000cgKib𭙀\u0005\u000c󻭛𭀽𤪕5JV𤖛.𤡊1𥯖5\u0018󰿼\u0008\u001bfz\u001a\u001e]1}\u0006\u0017UXlpT`𥌯4%\u0004H\"󱚊F\"끹MAHa54\u0014QM􎿭\u000e[􏲤/9aN𧩈󷌴;oI𗜯QR큓+󵑆􁴽!y~􊟤\n졢I􇊳|m𐚶\u0004%0yMLir7E;\u001fq\u0006xm\u0014􍾊^/Ui\u001e𮥶32󲋎!t\tZ􂔺\u0008~}o]\u000bO㠑􃉗'l$\u001e}Uy1\u000c\u001c𦵑\u0000\u001c\"W\u0016K7z\u0014\u001f#􂸊\u0010\u0003:𬪏O=Wx🂷zR\u001cP󺑐􈱠nNm𢢴퓴kw􋧨+瀉n\u0018\u0000W󵩉/L󹥣D憯𗅕m\u0016jOU5\u0004\u0013\u001de{P-󸅒95r㓣x_􉺰\u000eojT6Y𧕎\u000b󵨧V/Csbbwf+V\\mu6󺶗D\u000f󺰦\u000b\u001e󵹑M𧂫o􀞚暌\u0000\u0017ys熞CN\u0012|gNc\u0010=#c顉𠜪9m26󲛞Gb[$^\u0011J\u0003􏁄SR\u000c\u001e\u0012;\u0003?\u0008ꬒ[􀂵\u0007O懜󶅇󻌫K\tp\u001b󺝯J󺃮,L{\u0014iA᥊\u000bE\u00166U=􎠕􋟭\u001bC-􏋽􏥂*oh􄏅J\u001b󲙑\u0013\u001ff,#<R7D~󹽑z\u001dr󺑢l⫻L\u0014🁿𩿅\u0001W:(vf*\u0003\rxⁱ\u0014<a|\u0000_"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_7.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_7.json
index aa835ccc9c4..1dab60edd1b 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_7.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_7.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+742946612",
+    "code": "bjOVKa11ziNp9wvnuPVs=p83OrCk9-7W-B6VqDTfOqVdJOsPguq08yUjmSp7IdMcCm5=ENBWRmN4cNsd2V8PMi9809xW2HncAxUiLCtGehB6y3DGDfi4l3VoajT3Q7E1EmgOtxwMVog5=ppAFPpJdI0vMKSCknZajOA_pOA4p1yAj-m=iH53-NcxRBCMTpVh2t34th03Lyh_sxnYInBzgsw7r1IgO3Uyh0KruIoK6nF=qzVpuy7g_J0Wpq-OemMG9PApaHZpMfGHKkWIevQrmP6DBcWHfmeJJPmzqIPN_cig-8grl=CLKQJM-tuNC5sEj82vFIa0ewAZ_VG-z56DL9v8J9v2Q-XQ6gK48y9VSFwYt=BFAOLRuwNUkbCP=BeM10OVgE6vd5zsz61M5rAGlOIgEXG4MsrDt5_iUmHsocsUGdRfk0_=SO84vkjxZl_D0HX-PhkYBzN71IIXY4Ycg5iswNSMV=4XFn9Pxy1bYGBnWs36Ayn6kDYPBRKPfZgPrX7ogYKWtFE",
     "password": "\u000cR𫹁\u0018\t󳭳a\u0005,\u0014𮛋\n-􃬭\"u?𗔇M󿞑'䠥e󸽂F\u0006^󴕃9􃶵cn\u001boH𣋧I\"􁀏󽞷覩`PG𪩧% u'ad|𖢢-d𠻹M y-\u0016\u0016\u001dq[c\u000bS\u0019r,g􆮏!'Ct'p\u0001q􀇼1 \u0007Hn\u0012=p킛ᙴK<\u0012r%󵸸 􊇦]UQ@𮎫')\u0005󰳩\u001d􍿋\u000bDxu캑󲋨\u001cŋIR,X𧻖:M𧡄\t\r􆔦Yb\u0008➹\u0005𡡨\u001e#H𢽂G1TnY<!`𘄄􄥆􅢦mV\tq\u000f󻑦d􆡛\u000cL󶩰d3\u0012\u0013tT.\u0012뚃b6􃕈d$􀿭nm\u001a\u001bt\u000e\u0010g~\u0007\r\u000c'𗰢+[\u000b^뾰n\n\u000bwD𠖴𝐪\u001d󵬜\u001a\u0000P\u001a󲑓O\u0007\u000b>=𮂴o\u001f\u0006󹇴\u000eE\u001fyᖛ🥅sJe\u0008\u0005'o\"󺡿\u000c|􊜝.􂧻:􎆫\u0006𠶏􂆉m#4\u0008 \tgl𔐸\n\u001f=\t\u001c?/󼦤\u0018;􈺝XOW.\u00147􉙴+^\u000c\u001d⯬􀲺\u0011A\u0011Q􇽴`6X\u001bJ~󰦡M\u0000􊭽\u001f.\u001fU𪞘D+_􌯐F􂵹)𑪇D\u0018\u0016\u0013h󽫀q7\u001cV鷫\u0015A\n昚jiDW+d𥦾\u0008󸍅B𘉀s𠮅y_",
-    "code": "bjOVKa11ziNp9wvnuPVs=p83OrCk9-7W-B6VqDTfOqVdJOsPguq08yUjmSp7IdMcCm5=ENBWRmN4cNsd2V8PMi9809xW2HncAxUiLCtGehB6y3DGDfi4l3VoajT3Q7E1EmgOtxwMVog5=ppAFPpJdI0vMKSCknZajOA_pOA4p1yAj-m=iH53-NcxRBCMTpVh2t34th03Lyh_sxnYInBzgsw7r1IgO3Uyh0KruIoK6nF=qzVpuy7g_J0Wpq-OemMG9PApaHZpMfGHKkWIevQrmP6DBcWHfmeJJPmzqIPN_cig-8grl=CLKQJM-tuNC5sEj82vFIa0ewAZ_VG-z56DL9v8J9v2Q-XQ6gK48y9VSFwYt=BFAOLRuwNUkbCP=BeM10OVgE6vd5zsz61M5rAGlOIgEXG4MsrDt5_iUmHsocsUGdRfk0_=SO84vkjxZl_D0HX-PhkYBzN71IIXY4Ycg5iswNSMV=4XFn9Pxy1bYGBnWs36Ayn6kDYPBRKPfZgPrX7ogYKWtFE"
-}
\ No newline at end of file
+    "phone": "+742946612"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_8.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_8.json
index eed45686e29..e22002100a2 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_8.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_8.json
@@ -1,5 +1,5 @@
 {
+    "code": "HT4YR3Ac3K6GCYNAgnzgbhNlP8wQLztp3kTgMzgcfZNgMDkrRlHRubahDXvPmSCGZxbF6wEPajDPybsW3KXV_vc1-ZSOHI4YxOCsOKiKGyE4LNtwZbG9bKAy9QikyM7tHi3he65-0l7heybNjr3z0IW9Ju4oe8CeQyxdCMuL=Qn3bZTqE97t71neQvy_DXv27gjQPTze2KuCHfQskIZI5LJ=iaTkm7V=273xb-8p=tIzAfNGFcBkq136zeeBPUvuiFa5y7YS25ajFbWF3SxFlbBnxclB_Burg2IFF=S5ueWWB0CrhkL0nZTE5c0blnJ9UbieK8L7LnuzEezronadngQcwL0iXW9sRq6MkpV4KISqdjvaTXDzR61ETnLpzM9zLeCPhnJSI9TLlz7BtgrtIlKvr6OCQiX9UF9YH46KdegQbGog3Hgejpeusa9gQLeKoRRstGqTrw1UERzJv=FJ2h4gUz6YuUKsktYUu-vu9C_Cbmaz1COaqsTGLd5Q8fUJUNYGRrl_6oRdoDcu_0YxfNJXRd_vk=7o4I6dtXhpUdvEH7q0X41bs5rli7CN9hoY_6tgeceOeISVI3amefP4fO75ZJAyHPkDJl1W-P2YpKuu8kylD9LvpanoMBCKT0PGStidrTxW0srUYbQi8O7QJ7OH4Tlwh7ndJ9qZYrxLNakB3SvHy62kRgSWSKAf8cZatgQq69easXNalOvs9J6_yNgUv_QbOuOdDJgXaYxNyetKSN2tN8tMAI7nkjJb5htohSPoIxKCnomb971LqSmHt5u-qvPQL9BCIkF=27CjGBr0MK7KdLOoVE9k-T=06uLB7Ah8vNuH6-p0npqBRKcznIVMWCUrqOaMJLvdpbHlPpanfaW1JPH8_HQsUZzW4WKvlQWW0QNb1c-zIYpNw-LXA1NDnYMOu3Rgdg0nDsa8jkvf_NCGrow7ncDH5DdNQc-HnIvzv0NEK5V7y1iLBsW",
     "key": "",
-    "password": "z𫼃%]MV𢝽󰵠phO๋X𣁋v\u0008\u0018􄲯\\쟐Ps􆤁󶮳\u001dY\t󰇷lQ\np4h\u001ci󹛍𣷐\u0012􃌭Wv𫆛\u001bF\u0016\u000e􉔽BL*\u0002)M𣂗󺒷R?𨿀􋳽9h,\u0018Zd􌤪M)󳸕6g\u001e\n\u001d읜l􋪶nhX󶠝󻮭🚅),\u000ctEZ􆴙X7\u0012X􆈳%󳧞#𫑲\u0014f?􁳭\u0010a\u001f\u0013󴸃ꝇ\u0002p􁑹7D\u000c!Z&]\u001ab8>\\Y4𦂹𣃛1-MG\n𫞿\u001dw𡢨NZ\u001f|=\u001e𥻜J𨥯s󰕉󹏌𗾌q\u0007*𬭐\u0016emSmVk𮗇mU鰴\r\u0013uz\u0000)\u0010A𥎅$􋅶?&󸊗|\u0001\u0018|x󱒢\u000042\t􊄔lm\u0000z󹣜_\u001b\u0008k󳻐/퓿!l󻀑w\u0013#'p\u001dK\u0019#,3t􄲀K𠾛\u0008I?ᯭ\u000f\u000c\u001cQ..\u001c@\u0001\u0006B3pyR\u000c󿲲􏟘\u001b>\u0008x𫫡\r􃹴o\u0013J\u0006󷽤󶭎\u001e15~V󴇕\u001bw\u0010\u0005y]C󲕼􂿘m?\u001a5$\u001bDǍ􋑖􉆸8𖭷_V~N0𢫪듃\u0011\u001f􀈬\u0001𓌘ﾎ\u0015IEX%\u000b􆒜~󲂂𦑕p6\u0015𬽯Z󷓪6\u0015\u001f􅤺*󿪽x\u001c\u0007HQ\u0019\u0010┽􀔖􇨖>dXY\u00034l󱋛.*,Jt)Q[7\u001f\rP\u000fgy𥦼GB󲡋\u000ctX\u0013\u0011OB󶉯\tV\u0000Kicto毡󷘪\u0008\u0007\u001cPqgE𣃒􍁜\u001ak\u0018:q2\\􂶝\u0000e\u0005w󿒆Rqk+𘥕)\u001c󱐐9`ᢕXj\u0001\t𭞞󰏯\u0006\"\n$3󶒷𢠝(\u0000t\u000bb/%'𭐫\u0015\u00149@Hb=\u0005𝋰n}o\u0016󼀉'󺔮䭮\to\t(􅏔\u0013\u000b󰉸𭕋\u0005)\u0017􊤛9퉚\u0004􊪓\u001dEv)$╧\u0008^󴫻󼂆v6/Ⅵ􂘘%C.\u001eP\u00076\u0013pI⺳gpH BAc􈵵Jb;MFI\u001aꂖH\u000fVI𥣀S𦧽I\\\tZq0&\u001d?/DE'󶤩\u000e21Kq\u0005褌󺇒\\ml\u0014F^%I\u0001𪨀,󰒯𩌋x󼬔ꮯ\\SVb+6\u0004v\u0008\u0001zA_󿗼\u0010󳸔*􉄩+ᵢ􀆸@>oP󾗮\u0006\u0013􊉯DK𢱛z-eh\u000e𬖊*\u000e]Cb󲮝󷏮EQ𞋨蕫dGy\u000c󻿮Z󸻳M𒓙M󽡘W\u0013\u001c󷱓ẏ!r\u0001\u001c𩓌杨V􁌩?K𔐡\"/N=|Jdr0\\𓂦𩴌$U1𝩖rE􅿞\u0016YG󼤳詷\u0014\u000fs􆺴NR9lmd𦜭\u0001g𝈬FK\u0007%aq96נ_冯\u0002苃庳g\u0008.K(ѝ\u0015-잕/dc},󰱔x?䞅V\tℱUC",
-    "code": "HT4YR3Ac3K6GCYNAgnzgbhNlP8wQLztp3kTgMzgcfZNgMDkrRlHRubahDXvPmSCGZxbF6wEPajDPybsW3KXV_vc1-ZSOHI4YxOCsOKiKGyE4LNtwZbG9bKAy9QikyM7tHi3he65-0l7heybNjr3z0IW9Ju4oe8CeQyxdCMuL=Qn3bZTqE97t71neQvy_DXv27gjQPTze2KuCHfQskIZI5LJ=iaTkm7V=273xb-8p=tIzAfNGFcBkq136zeeBPUvuiFa5y7YS25ajFbWF3SxFlbBnxclB_Burg2IFF=S5ueWWB0CrhkL0nZTE5c0blnJ9UbieK8L7LnuzEezronadngQcwL0iXW9sRq6MkpV4KISqdjvaTXDzR61ETnLpzM9zLeCPhnJSI9TLlz7BtgrtIlKvr6OCQiX9UF9YH46KdegQbGog3Hgejpeusa9gQLeKoRRstGqTrw1UERzJv=FJ2h4gUz6YuUKsktYUu-vu9C_Cbmaz1COaqsTGLd5Q8fUJUNYGRrl_6oRdoDcu_0YxfNJXRd_vk=7o4I6dtXhpUdvEH7q0X41bs5rli7CN9hoY_6tgeceOeISVI3amefP4fO75ZJAyHPkDJl1W-P2YpKuu8kylD9LvpanoMBCKT0PGStidrTxW0srUYbQi8O7QJ7OH4Tlwh7ndJ9qZYrxLNakB3SvHy62kRgSWSKAf8cZatgQq69easXNalOvs9J6_yNgUv_QbOuOdDJgXaYxNyetKSN2tN8tMAI7nkjJb5htohSPoIxKCnomb971LqSmHt5u-qvPQL9BCIkF=27CjGBr0MK7KdLOoVE9k-T=06uLB7Ah8vNuH6-p0npqBRKcznIVMWCUrqOaMJLvdpbHlPpanfaW1JPH8_HQsUZzW4WKvlQWW0QNb1c-zIYpNw-LXA1NDnYMOu3Rgdg0nDsa8jkvf_NCGrow7ncDH5DdNQc-HnIvzv0NEK5V7y1iLBsW"
-}
\ No newline at end of file
+    "password": "z𫼃%]MV𢝽󰵠phO๋X𣁋v\u0008\u0018􄲯\\쟐Ps􆤁󶮳\u001dY\t󰇷lQ\np4h\u001ci󹛍𣷐\u0012􃌭Wv𫆛\u001bF\u0016\u000e􉔽BL*\u0002)M𣂗󺒷R?𨿀􋳽9h,\u0018Zd􌤪M)󳸕6g\u001e\n\u001d읜l􋪶nhX󶠝󻮭🚅),\u000ctEZ􆴙X7\u0012X􆈳%󳧞#𫑲\u0014f?􁳭\u0010a\u001f\u0013󴸃ꝇ\u0002p􁑹7D\u000c!Z&]\u001ab8>\\Y4𦂹𣃛1-MG\n𫞿\u001dw𡢨NZ\u001f|=\u001e𥻜J𨥯s󰕉󹏌𗾌q\u0007*𬭐\u0016emSmVk𮗇mU鰴\r\u0013uz\u0000)\u0010A𥎅$􋅶?&󸊗|\u0001\u0018|x󱒢\u000042\t􊄔lm\u0000z󹣜_\u001b\u0008k󳻐/퓿!l󻀑w\u0013#'p\u001dK\u0019#,3t􄲀K𠾛\u0008I?ᯭ\u000f\u000c\u001cQ..\u001c@\u0001\u0006B3pyR\u000c󿲲􏟘\u001b>\u0008x𫫡\r􃹴o\u0013J\u0006󷽤󶭎\u001e15~V󴇕\u001bw\u0010\u0005y]C󲕼􂿘m?\u001a5$\u001bDǍ􋑖􉆸8𖭷_V~N0𢫪듃\u0011\u001f􀈬\u0001𓌘ﾎ\u0015IEX%\u000b􆒜~󲂂𦑕p6\u0015𬽯Z󷓪6\u0015\u001f􅤺*󿪽x\u001c\u0007HQ\u0019\u0010┽􀔖􇨖>dXY\u00034l󱋛.*,Jt)Q[7\u001f\rP\u000fgy𥦼GB󲡋\u000ctX\u0013\u0011OB󶉯\tV\u0000Kicto毡󷘪\u0008\u0007\u001cPqgE𣃒􍁜\u001ak\u0018:q2\\􂶝\u0000e\u0005w󿒆Rqk+𘥕)\u001c󱐐9`ᢕXj\u0001\t𭞞󰏯\u0006\"\n$3󶒷𢠝(\u0000t\u000bb/%'𭐫\u0015\u00149@Hb=\u0005𝋰n}o\u0016󼀉'󺔮䭮\to\t(􅏔\u0013\u000b󰉸𭕋\u0005)\u0017􊤛9퉚\u0004􊪓\u001dEv)$╧\u0008^󴫻󼂆v6/Ⅵ􂘘%C.\u001eP\u00076\u0013pI⺳gpH BAc􈵵Jb;MFI\u001aꂖH\u000fVI𥣀S𦧽I\\\tZq0&\u001d?/DE'󶤩\u000e21Kq\u0005褌󺇒\\ml\u0014F^%I\u0001𪨀,󰒯𩌋x󼬔ꮯ\\SVb+6\u0004v\u0008\u0001zA_󿗼\u0010󳸔*􉄩+ᵢ􀆸@>oP󾗮\u0006\u0013􊉯DK𢱛z-eh\u000e𬖊*\u000e]Cb󲮝󷏮EQ𞋨蕫dGy\u000c󻿮Z󸻳M𒓙M󽡘W\u0013\u001c󷱓ẏ!r\u0001\u001c𩓌杨V􁌩?K𔐡\"/N=|Jdr0\\𓂦𩴌$U1𝩖rE􅿞\u0016YG󼤳詷\u0014\u000fs􆺴NR9lmd𦜭\u0001g𝈬FK\u0007%aq96נ_冯\u0002苃庳g\u0008.K(ѝ\u0015-잕/dc},󰱔x?䞅V\tℱUC"
+}
diff --git a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_9.json b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_9.json
index 692494eb4ea..79a5551e162 100644
--- a/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_9.json
+++ b/libs/wire-api/test/golden/testObject_CompletePasswordReset_user_9.json
@@ -1,5 +1,5 @@
 {
+    "code": "uyqP0_aQl3yI0f7i0fpyL6quXIf6WSJRbPrU6Z0j2gElHzfIXLenrK4ZwQl42i99XCnAjLGA2=sQczG10h7DBcYH4TmbO-li6YDpcduZ3XkbGQ=EalL5L2xZbwUpVFGp5J5e=yea3gDvfUwq0sdTrRFCFbTJBG5cU9K_5zQMB=DTFJoHAh=L_0uTZCRF_bj36cGxLegs42ji4GGO3kG4kcvpSCMpJV20a47V7GbqfEdQ3HV2gdN5CXpWXxRu71Y2XvAMijj8O-ciqslgJCveAgm6JlkZJf8-Cbj3tmBD1xYveBLOBVOW1=vaD23ST6FDLpzbRJslhJzwInpu5AaIxndPmLzeXH3I5mfrMBFyGO6e9Pro51aJPGV5COmIinyjxcM-vEmWYYkLy7owuVyswR89m--SRwgOWL5UtF-QbkS5bpltl6BmnrTEeaZNMQRPrcpPL4RT=0GFy=ka7Oq1Ixi5OR5EDYgIa_Rl3I9jq034w6wCQjW=33Z5wFRWcdX4lfqvA-66Huc--Xk3hAKScqNeL3Xre5eN1pwOrEFsMhncwuGoFZoXaHSMrQZEqVhVJcFA8afI_vpIk0Ft6NMcS3AtYLQgdqrvaBe42_s",
     "email": "A@9L\u0008󹒲鏠",
-    "password": "t%􎈲'􈽛G\u0000G\u0011􄄕V𖨱H헣󿹑[3𤩜\u0005𢹖Y륓\nm\u000b󴧕d5􊓫O:\u0011􌛀\u001fb`🧎\nW\u00198\u0000\u0002𣯭W!mX𠎬z-􆚷ﾐ 󸘞M\u0007xT(\u000b-\"3Xx\u0007\u000c󱷮b7*P󹒝.\n\u0006fz\u0004N𝦺\u0019弴Z𔒷[7󾟖luXV\u0017Rh\u0019U5}y󳒹&􁍡UO𥼑L\u000ez󵓖\u0013G奣d邗5(iM\u001a\u0000\"󹧡QKY]_\u000b-󵰔𣛡1a\u0001}5]'L%s7􋼓5u\u000b9|F\u0005𫰔j\u001f󼧴L𪣳\u0014o뷃󼞩􌖦lqDs􀺛 ]\u0010\u0003f\u0001bO.\u001e\u001dj󴫟E\"\r󼷥𧮶Ig;~\u001f霙\u0017WQ󽢯𘢚?􌙰\\e:@ჼ󰵗Cq\u0010♞>\u0018zT]\u001c\u0011過\u0005)\u0003󻊛7𪄵\u0001\u0017\u0004𠽘r6;D%FM\":􁅞\u000e-S\u0015c`]쑔\u0018O\u000b$􍹁\u0005\\i󼴋\tk𠩘nME\u001d\u0018mi󺐛~K[K󶍼4\u0012jl\u00132𧹎w.\u0019O󽄜x󹮜榪\u0001􅴂蛂:JY\u0008榊\u0003DPH5􅫨Hh\u0002j!y󲵥􃹶\u001c\u001a0\u0015g\t􄇬q\u000b(c\u0008R=\"󶇑\u0014\u0012\u0015\u001ai󳴯M􃶪𫖿(幦l𫬿\u0012𡙎*聭Y󾊪DžW\t\u0000_pk#=r󼇕{HN􏙇󹓑W3 <%*0𢙮?\u0018|Q𤻀oE*\u000fx,\u0003㷥𒉀L{NC􈒵t𬘨I\u0010{\u0015M\u0011<󶮍efpSGC󱚵Cl\u0001-+\t\u000c􊓉\u0011'uWmR􉴝𠤛9󿌐>𢸀7\u0012s{󴊡my|􏹣\u0007\u0000+󼵙t'N\u0014\u000f礤7􈳣󺵧o􈊞􋯚Yx𠣿5{;𣷳0XM#󷩠Q瘗􈅞\tx􄷧M𧹔^-[a|󲆍聧\u0019\\=\tH􄈌2\u0010W􈲚#h'K󴎄\u000bpX\u0019\u000e\t𘇚_~𫁃󺕵G\u001fwX텣􈒼씚@/E\u000f󵩤\u0010Q𦙊p#pR󶃁\u0012󾫫$\n`l94.𩾱gun\u0004RG\u001bF󱨄Hbf㎕e^󵼝9R.\u0008\u0003;\u0000N$4\u000cVy𧉽,h贚𩍿󱾙\"^莱J\u0000#𭀤ᾣ𓏞z{|\u0006)g􉀃[DK\u0001:(jNn\r:D􏪫dM􁛄G,􉫘𤓀s9\u000eoy􎓰󱶄5Y&𨈘\u000b𥗖\u0016\"Ob50𡝮Q_W+'\"!𒍉\t5𥼍􃂽㿄>\u001a𤗗8𗪬y:U􀦵\u0010\u0001𮤑𩠛\"\u001f,q\u0001a􏯗\u001a_(j 𡕾B􎖩B!􊍔RL^𢶓\u0008𗵍쥻\u0007f\u0018󸸅\niK𠣾\u0004_㫪췝\u0016󲗔\u0007왑\u000c\u001c;\u001f|V󳚅\u0013\u0014󶒯Km\u001e\u0005𠷁􁟠\u001bnz\u0012wy𢡇􇠛𦋎5Q\u001c𑙑J\u0001􂡮/9Ew\u0000Sbe\u0007覿𤝤\u0017\rd1󵶒侜Rᮜ\u000f🟧\u0001v \\𬜗v`iF𬭓93\u0006dSl^I2.W洞󷎪V%*Nv􋉯󿯔]濺xi󶻔󠄝H殈\u001fJ>M􂕓𭜫_&𮚁󱺩󷌾딟.unqC\u0004y󿬔\u0011i#}􃃶𣿈`^󾲸Q\u001b.\u001e)f󱵙𣸍\u0000^\u0000i!\u001f쁏~\\󽮘t􋨚⑿\u0013\n\u0002;E\u000b\u0005z3󹮠2\u0002v\u00175k󹲋𫪢\u001bs\u0000\u000bꢱ9Y𖠺\u0016Q􉝖\u001b\\_7􎂅􊩧J\u00197󷦐v\u0003댡\u0001G󿿤{\u0018PE􆁌𤯦\u0014㕷:N/􌜊􈨫􂅔󻽶V\u0013}𪡿m>{𣼸4\u0000I\u0005y^$\n=)S; R`𢋐@xtE\u000f3",
-    "code": "uyqP0_aQl3yI0f7i0fpyL6quXIf6WSJRbPrU6Z0j2gElHzfIXLenrK4ZwQl42i99XCnAjLGA2=sQczG10h7DBcYH4TmbO-li6YDpcduZ3XkbGQ=EalL5L2xZbwUpVFGp5J5e=yea3gDvfUwq0sdTrRFCFbTJBG5cU9K_5zQMB=DTFJoHAh=L_0uTZCRF_bj36cGxLegs42ji4GGO3kG4kcvpSCMpJV20a47V7GbqfEdQ3HV2gdN5CXpWXxRu71Y2XvAMijj8O-ciqslgJCveAgm6JlkZJf8-Cbj3tmBD1xYveBLOBVOW1=vaD23ST6FDLpzbRJslhJzwInpu5AaIxndPmLzeXH3I5mfrMBFyGO6e9Pro51aJPGV5COmIinyjxcM-vEmWYYkLy7owuVyswR89m--SRwgOWL5UtF-QbkS5bpltl6BmnrTEeaZNMQRPrcpPL4RT=0GFy=ka7Oq1Ixi5OR5EDYgIa_Rl3I9jq034w6wCQjW=33Z5wFRWcdX4lfqvA-66Huc--Xk3hAKScqNeL3Xre5eN1pwOrEFsMhncwuGoFZoXaHSMrQZEqVhVJcFA8afI_vpIk0Ft6NMcS3AtYLQgdqrvaBe42_s"
-}
\ No newline at end of file
+    "password": "t%􎈲'􈽛G\u0000G\u0011􄄕V𖨱H헣󿹑[3𤩜\u0005𢹖Y륓\nm\u000b󴧕d5􊓫O:\u0011􌛀\u001fb`🧎\nW\u00198\u0000\u0002𣯭W!mX𠎬z-􆚷ﾐ 󸘞M\u0007xT(\u000b-\"3Xx\u0007\u000c󱷮b7*P󹒝.\n\u0006fz\u0004N𝦺\u0019弴Z𔒷[7󾟖luXV\u0017Rh\u0019U5}y󳒹&􁍡UO𥼑L\u000ez󵓖\u0013G奣d邗5(iM\u001a\u0000\"󹧡QKY]_\u000b-󵰔𣛡1a\u0001}5]'L%s7􋼓5u\u000b9|F\u0005𫰔j\u001f󼧴L𪣳\u0014o뷃󼞩􌖦lqDs􀺛 ]\u0010\u0003f\u0001bO.\u001e\u001dj󴫟E\"\r󼷥𧮶Ig;~\u001f霙\u0017WQ󽢯𘢚?􌙰\\e:@ჼ󰵗Cq\u0010♞>\u0018zT]\u001c\u0011過\u0005)\u0003󻊛7𪄵\u0001\u0017\u0004𠽘r6;D%FM\":􁅞\u000e-S\u0015c`]쑔\u0018O\u000b$􍹁\u0005\\i󼴋\tk𠩘nME\u001d\u0018mi󺐛~K[K󶍼4\u0012jl\u00132𧹎w.\u0019O󽄜x󹮜榪\u0001􅴂蛂:JY\u0008榊\u0003DPH5􅫨Hh\u0002j!y󲵥􃹶\u001c\u001a0\u0015g\t􄇬q\u000b(c\u0008R=\"󶇑\u0014\u0012\u0015\u001ai󳴯M􃶪𫖿(幦l𫬿\u0012𡙎*聭Y󾊪DžW\t\u0000_pk#=r󼇕{HN􏙇󹓑W3 <%*0𢙮?\u0018|Q𤻀oE*\u000fx,\u0003㷥𒉀L{NC􈒵t𬘨I\u0010{\u0015M\u0011<󶮍efpSGC󱚵Cl\u0001-+\t\u000c􊓉\u0011'uWmR􉴝𠤛9󿌐>𢸀7\u0012s{󴊡my|􏹣\u0007\u0000+󼵙t'N\u0014\u000f礤7􈳣󺵧o􈊞􋯚Yx𠣿5{;𣷳0XM#󷩠Q瘗􈅞\tx􄷧M𧹔^-[a|󲆍聧\u0019\\=\tH􄈌2\u0010W􈲚#h'K󴎄\u000bpX\u0019\u000e\t𘇚_~𫁃󺕵G\u001fwX텣􈒼씚@/E\u000f󵩤\u0010Q𦙊p#pR󶃁\u0012󾫫$\n`l94.𩾱gun\u0004RG\u001bF󱨄Hbf㎕e^󵼝9R.\u0008\u0003;\u0000N$4\u000cVy𧉽,h贚𩍿󱾙\"^莱J\u0000#𭀤ᾣ𓏞z{|\u0006)g􉀃[DK\u0001:(jNn\r:D􏪫dM􁛄G,􉫘𤓀s9\u000eoy􎓰󱶄5Y&𨈘\u000b𥗖\u0016\"Ob50𡝮Q_W+'\"!𒍉\t5𥼍􃂽㿄>\u001a𤗗8𗪬y:U􀦵\u0010\u0001𮤑𩠛\"\u001f,q\u0001a􏯗\u001a_(j 𡕾B􎖩B!􊍔RL^𢶓\u0008𗵍쥻\u0007f\u0018󸸅\niK𠣾\u0004_㫪췝\u0016󲗔\u0007왑\u000c\u001c;\u001f|V󳚅\u0013\u0014󶒯Km\u001e\u0005𠷁􁟠\u001bnz\u0012wy𢡇􇠛𦋎5Q\u001c𑙑J\u0001􂡮/9Ew\u0000Sbe\u0007覿𤝤\u0017\rd1󵶒侜Rᮜ\u000f🟧\u0001v \\𬜗v`iF𬭓93\u0006dSl^I2.W洞󷎪V%*Nv􋉯󿯔]濺xi󶻔󠄝H殈\u001fJ>M􂕓𭜫_&𮚁󱺩󷌾딟.unqC\u0004y󿬔\u0011i#}􃃶𣿈`^󾲸Q\u001b.\u001e)f󱵙𣸍\u0000^\u0000i!\u001f쁏~\\󽮘t􋨚⑿\u0013\n\u0002;E\u000b\u0005z3󹮠2\u0002v\u00175k󹲋𫪢\u001bs\u0000\u000bꢱ9Y𖠺\u0016Q􉝖\u001b\\_7􎂅􊩧J\u00197󷦐v\u0003댡\u0001G󿿤{\u0018PE􆁌𤯦\u0014㕷:N/􌜊􈨫􂅔󻽶V\u0013}𪡿m>{𣼸4\u0000I\u0005y^$\n=)S; R`𢋐@xtE\u000f3"
+}
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_1.json b/libs/wire-api/test/golden/testObject_Connect_user_1.json
index 1128e634d70..551cb7d2b1e 100644
--- a/libs/wire-api/test/golden/testObject_Connect_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Connect_user_1.json
@@ -1,6 +1,6 @@
 {
-    "email": null,
-    "name": ".🝊]G",
+    "email": "test email",
     "message": "E",
+    "name": ".🝊]G",
     "recipient": "00000002-0000-0001-0000-000400000004"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_10.json b/libs/wire-api/test/golden/testObject_Connect_user_10.json
deleted file mode 100644
index 092b6e483f5..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_10.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": null,
-    "name": null,
-    "message": "",
-    "recipient": "00000006-0000-0008-0000-000700000005"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_11.json b/libs/wire-api/test/golden/testObject_Connect_user_11.json
deleted file mode 100644
index 122a558f1a8..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_11.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "",
-    "name": null,
-    "message": "XiM",
-    "recipient": "00000007-0000-0008-0000-000100000007"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_12.json b/libs/wire-api/test/golden/testObject_Connect_user_12.json
deleted file mode 100644
index 259d1b98884..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_12.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "XZ\u0003",
-    "name": "w􏺇ay",
-    "message": null,
-    "recipient": "00000008-0000-0000-0000-000500000005"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_13.json b/libs/wire-api/test/golden/testObject_Connect_user_13.json
deleted file mode 100644
index 89f9700ba27..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_13.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "J{",
-    "name": "\u0018",
-    "message": "\u000c.\u0003",
-    "recipient": "00000000-0000-0001-0000-000200000003"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_14.json b/libs/wire-api/test/golden/testObject_Connect_user_14.json
deleted file mode 100644
index 653a7817e72..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_14.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "䈜tFqj\u0016",
-    "name": "",
-    "message": null,
-    "recipient": "00000003-0000-0006-0000-000000000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_15.json b/libs/wire-api/test/golden/testObject_Connect_user_15.json
deleted file mode 100644
index c6e361377c0..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_15.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "F|,rJR",
-    "name": null,
-    "message": "\u000f!xG",
-    "recipient": "00000005-0000-0006-0000-000500000008"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_16.json b/libs/wire-api/test/golden/testObject_Connect_user_16.json
deleted file mode 100644
index 188007d61c3..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_16.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "㴡i\u0014gW𢠞",
-    "name": "",
-    "message": null,
-    "recipient": "00000000-0000-0008-0000-000600000006"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_17.json b/libs/wire-api/test/golden/testObject_Connect_user_17.json
deleted file mode 100644
index 857dfe315d8..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_17.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "\u000e",
-    "name": "\u0012X",
-    "message": null,
-    "recipient": "00000001-0000-0000-0000-000800000006"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_18.json b/libs/wire-api/test/golden/testObject_Connect_user_18.json
deleted file mode 100644
index 90c6636645c..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_18.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "",
-    "name": "\u0005(`\u000e",
-    "message": "A",
-    "recipient": "00000006-0000-0002-0000-000200000008"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_19.json b/libs/wire-api/test/golden/testObject_Connect_user_19.json
deleted file mode 100644
index fba2583c3ea..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_19.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": null,
-    "name": "\u0001j(􉘽",
-    "message": "|:\u0015",
-    "recipient": "00000005-0000-0007-0000-000500000007"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_2.json b/libs/wire-api/test/golden/testObject_Connect_user_2.json
index 6c241df4872..8ce9a35dd43 100644
--- a/libs/wire-api/test/golden/testObject_Connect_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Connect_user_2.json
@@ -1,6 +1,6 @@
 {
-    "email": "𩡚󻮡p",
-    "name": "",
+    "email": null,
     "message": null,
+    "name": null,
     "recipient": "00000005-0000-0007-0000-000200000008"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_20.json b/libs/wire-api/test/golden/testObject_Connect_user_20.json
deleted file mode 100644
index d4df86c2a05..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_20.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": ":m\u0019\"'𘫂􃵳",
-    "name": "*􉈗\u001aj|\\h",
-    "message": "雡",
-    "recipient": "00000004-0000-0003-0000-000700000008"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_3.json b/libs/wire-api/test/golden/testObject_Connect_user_3.json
deleted file mode 100644
index b7d6b2695db..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": null,
-    "name": "6䡧c",
-    "message": null,
-    "recipient": "00000007-0000-0004-0000-000700000001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_4.json b/libs/wire-api/test/golden/testObject_Connect_user_4.json
deleted file mode 100644
index d628202598e..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "􍂇'󹫇",
-    "name": "\u000b\u001d(V\u0016",
-    "message": null,
-    "recipient": "00000007-0000-0004-0000-000400000003"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_5.json b/libs/wire-api/test/golden/testObject_Connect_user_5.json
deleted file mode 100644
index 37b88940f76..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "󶩶&\u0003\u0007",
-    "name": "",
-    "message": "𮀋&\u0016O<F",
-    "recipient": "00000003-0000-0004-0000-000100000004"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_6.json b/libs/wire-api/test/golden/testObject_Connect_user_6.json
deleted file mode 100644
index 9647640a665..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_6.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "t\r[\u0001",
-    "name": "{C\u001e~Lⴲ",
-    "message": "􊍊𗤛z]",
-    "recipient": "00000000-0000-0005-0000-000000000004"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_7.json b/libs/wire-api/test/golden/testObject_Connect_user_7.json
deleted file mode 100644
index 34974f186f4..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_7.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "`\u0004",
-    "name": null,
-    "message": "𗪡\u0005d↼_T",
-    "recipient": "00000007-0000-0006-0000-000500000002"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_8.json b/libs/wire-api/test/golden/testObject_Connect_user_8.json
deleted file mode 100644
index 8e738e973a9..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_8.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": null,
-    "name": "o􈐠\u000b",
-    "message": "ꬒ\u0015\u0002쇚q䧿",
-    "recipient": "00000002-0000-0000-0000-000400000006"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Connect_user_9.json b/libs/wire-api/test/golden/testObject_Connect_user_9.json
deleted file mode 100644
index 453f2643451..00000000000
--- a/libs/wire-api/test/golden/testObject_Connect_user_9.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "b",
-    "name": "\u0018XT\u0013^{",
-    "message": null,
-    "recipient": "00000008-0000-0006-0000-000200000001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_1.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_1.json
index a32e8d831c3..548331fcd67 100644
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_1.json
@@ -1,5 +1,5 @@
 {
-    "user": "00005686-0000-796a-0000-712b00006414",
+    "message": "X[l\u001d}\u0000c𣈚@\u0004b,{\u0002DSZ7\n\u0013\"V󳇉Wox𝌥*᷈q4IO\u001f\u000b]Y<d𦘭􍉇k􍁾\u001em󱓑\u0011)d\u000e\u0006`L]\u001b:-Y`\u0011\u0003󽵽󳉹>J\u0004!􍳘􃛁瑹\u001a:󿄟*b\u001a+4nByz7uF\u0003셇􀨚$𨴺􊰀<;9\u0015*\u0012&\r'*(^>C􄴦LxZ륬\u001b󲇯𨩹zM\u0016𣟧s􄸩i⌧\u000b𨟑􈄬\u0007dO\u000c\u0015l",
     "name": "$Sz%e泐9湬NfG a\u001a􍥰士\u0000kF\u000eq𘎖W\u0014K\u0010\u0004F1e\u000b\u0004Q1D󶸏𩞈R󰊠\u0008\u0010QNvP!i󿊤A雷\u0011fE􁱥𗜗􉟫+g~r%'J󱵟s\u00139/'󼆮󲫈𓅢w\u001d\u0006ㅘ􇝅<(o􀦬",
-    "message": "X[l\u001d}\u0000c𣈚@\u0004b,{\u0002DSZ7\n\u0013\"V󳇉Wox𝌥*᷈q4IO\u001f\u000b]Y<d𦘭􍉇k􍁾\u001em󱓑\u0011)d\u000e\u0006`L]\u001b:-Y`\u0011\u0003󽵽󳉹>J\u0004!􍳘􃛁瑹\u001a:󿄟*b\u001a+4nByz7uF\u0003셇􀨚$𨴺􊰀<;9\u0015*\u0012&\r'*(^>C􄴦LxZ륬\u001b󲇯𨩹zM\u0016𣟧s􄸩i⌧\u000b𨟑􈄬\u0007dO\u000c\u0015l"
-}
\ No newline at end of file
+    "user": "00005686-0000-796a-0000-712b00006414"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_10.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_10.json
deleted file mode 100644
index a2b0ccfb49f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_10.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "000072f7-0000-560e-0000-69940000570b",
-    "name": "3󳜬c7+ﹳ󴫆^rxc􈾋𤩑$c#S\"\u0017z𢐯1%󻝌5a,K\u000e`=틕C\u0016,,󳢀O麻\nBT𢣢`𬇿aAd",
-    "message": "𛀈cm\tL\u0014J\u00051\u0000A\u0018\u0007𗾔\u0000I#\u000f󳭪,𮀤\u0001\u0002\u000057k𨵫𘜤d󷾧t𭪷r0u\u0014pg3\u0002EXE\u0006𦤃lmI3E󿊘\u0002C􄔻\u0002X󹋭\"o\u001a󻄱kY𣸾(\u0012w􁴉鴱b&7𘠻ZFi#\trz󷲰􋷿\u0010<zc󼿇,􌒭S@𢲄tT#\u001f\u0011\u0014"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_11.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_11.json
deleted file mode 100644
index 936b8fe38a3..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_11.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "000027fd-0000-298b-0000-789300000666",
-    "name": "?햄\tⶮk3\u0013fz𩖮FJQ/󱤇𒒩82S/𠎍𭊈i􄂽v8𬈹\u0000}OBj8imW􀕃𩐺D/G\u0004Gҫ\u0017uY\u0006󻺂\u0013g\u0010z𬚬KA\u0019-\u0004i\u001ft#w&U'pd􄁆􌖂\u0005󻔌?􋈅~S𢺐𑿔",
-    "message": "\u000bW󲕢𭋊p}𡙽+\u000e\u0017𩕠6z내􄬹;.􃒇8\u001c\u0010礼𤑉d/\u001a􈫹MZ 􍸐7𩺝EUx󸙋L(〟^w􂄴P\u000f貥iov􆕥𦩂Ru\u001a6󻉜\u0006魡)h㊎𤓯쳿u1==LB#鵼T􉳛􂯖\u0012b󰔖󳻊Mp􅯀𨱏nM𠱌Sx 9c-𭳠"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_12.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_12.json
deleted file mode 100644
index 174bbdb9013..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_12.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00000833-0000-6086-0000-3aa800000600",
-    "name": "-󲉅􃞺P𪦰𤝴t󰥦\u0011r􅁻䴞󿼟$𢙮􈌍\u001b!oa뵂J\u0000\u001c2q|L兟\u001c\u0007'𬰦Pe|\u000c󻚄(S\\-}𦳣𭫔[\u0011􁃽(Kn丸\u001b𓃅O专3Q􎇞_MY󼺽󵲯Ak_캸\u0008<o_𫅹뵧􉇪m􆂵\u001a\u001cN\u0011c]𠳱p𗼸_t\u0003\u001f󠆂􀰫\u0015\u0008\u0017\u0001󲉺\u001e_76+􇎤騍Y\t*`Kk𡄇E\u000f 㩿\\4",
-    "message": "𬤪V\u0006\u001bPgdON !Cpk`\u0014􀪪촣h􁆑𢅷2m[𫚊\u00165 볾􁭼 $𬁯o\u001a\u0012𦕐K𤾈󻪢􀅵\u0011P 󿺼'y皷󰭟\u000c􏒸\u0004v\nAyi灢\u0002􄹕c?BLMJ󲖶\u0013v\u001e2\u0019\\󱭋\u0017%Nr\u0002㏚}q}󲧧𨍏3𦁕X\u0000W]\u0015\u000c/tE󴛙s/U<6ITb􇹢\u0017E\u0001es"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_13.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_13.json
deleted file mode 100644
index 49f8770087d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_13.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00002d2a-0000-6ef0-0000-663d00007aa4",
-    "name": "\u0010AIꂤ*\u0008\u0011.^^90󹼥T[\u000bpq󴝷\u0011:\u0003x𖼾\"mC3\u0014 􊼢\u000c_ᚡ*􎙚\u0016>\n􅁩㆞󶉯냾\u0015h\u0011𦙺V\u001c\u0006\"rU쐣􍍔7?6]):\nr6𮪥T𗫝𑲍 􍎟m(e0􋀯MY􀌐",
-    "message": "o(󴀉)󳬚􎧘𘆚1D.𪴖𧇖\u0013^󳘹󳭽c\u000e󿠘T&\u0008\u0000\u000e\"(#f𩁅􋶨𫰭𫏹na\u0000󾺛\u001a\u0001꜖R\u0017󼃶􉷝[7[𤠼`􀜛\u0008R^\u000e6F\u0005pW<􈀵~󳻋o󹺤\u0019\nr}@ \n𩟤l\u0003\u0002􊌥􌀃vh2鏹stx𠹟X\tuw0𐩶U󹥁Z\u0016w𢺲I7Kn􋓾\u001d\u001dI󴐮\u0000PW\u000baD䎎Z'𦥥\u0010㻿6&4q\u0016oT子RZmQ !𤂘7~S+l0{󴬬0v󵎸z\u000f𝐻s􋳚?gd\u001c2$𞺨𔘦`u􅭷5)`JZrK"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_14.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_14.json
deleted file mode 100644
index 78558e0ce0a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_14.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00004b71-0000-7031-0000-222700006fb6",
-    "name": "\u0014?WI(f󰒞T\u0002F$(\u0012w􎉧興o몰𦼹|\nb𬵾󻳵L\u001b\u0005P,㣗贻Y(7𢊌𭤋𦢦􍰮󼓇[𨶐\th􆩼A\u0015\u0018􁴓􏩢K\u000bm\u0017􇜲x􆇕m8􎚘d&}X𦓴􎂷&\u001e\u0019𬱁\u0008㓈􍁙1k􃩟𬌎\"q+Ap|𥅐%\u0016𨉷=}􋞺X\u000e",
-    "message": "􄳾c/󽘗EOc􃻚\u0008B󷈾𡓎UrR􀿺dO,\u000f\u0003\u00013ۗS[/\u0018􋟕6 ,󺹥:\u0003z*𐔼&5𭟞𖤖􍤕i8\u0000#R_󼒥􆫣O0*=E\u000b+\u001c𠄈\u001a 􊌛fnI^J𪯁Y~\u0007𘨍?\rv\u0005🖎\u001bvy]𩙵\u0015[􄈪􉧱)6TE󺊆\u0003x􈜁\u0010􊈓2\n)h\u001f]\u0015鞝Bu󲌐/\u001d\u0007\u0001\u0007M+O\u0003𤋮抵Y7jBix􇀸\u000cO􊏺S0O+)F鬣\u0013EE􍛱\u0015u􂒶o𔓒󽒴ᐌ乀\u0010v_[􁖗F\u0006G󵇃\u00012󱔕@U\u0010+"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_15.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_15.json
deleted file mode 100644
index 72ccf0ceef9..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_15.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00000837-0000-4ace-0000-1ac300001b43",
-    "name": "o#)z􍋑󱥋>p\"ie󿥞-+䥩6c^ \u0010Q󶜻)𒁢C𪔔8VYnJ𑨰𠝫O\u001c\t\u0015XQ􇘟\"0wS-𮩫 b;\u0003h𭉁󾨸𪱏B\u0017􌤖􍑂􀰃Y\u0000􂟙?\u0005!*;@\u0006a𦠕\u0016O\u0017p9󱗧騳CW熕/x𡠰u\u0010@t$r\u0007Z󸠻X8'!\u000f;6 Og\u001d\u0002󸁹^\u0019)􂧠l𣱸7G󴧀⨼j𦪮1\"􏅭𩲗c\u0010\u0012`\u00001w󰹏􏖎𐑚\u001c\r𢢷)KO\u0002d\u0000UQX\u001c𩚑zg􉍲Er􊡋\u001bdQB\u001fY\u0012M\u0010i󵪞\u0014B󹑂􈆹)5\u0000\t !?𐀼3󶣐",
-    "message": "PB㻎1𐰛\u000cY\u000f𭽫\u0016$暏6𨤮"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_16.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_16.json
deleted file mode 100644
index 0d68437f623..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_16.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00006f84-0000-3c4b-0000-2d2f00001f49",
-    "name": "􌞍󴘠󶝢p\u0012IO2􊢇눶H!\u001bᴻ𪻞\u0005Gf\u0018Z\u0013􎡉H􍦝`0gt􆭣9$i\u000c𮞵r蟞\u001a\u0017\u0002>𖦯\u0018;/x\u0006Vr𪫯J\u001eP>ꌪ󳷺V󲒋+S􋏝􇜑3$𧠳𡇐_\u0010l𣻛\u0006𭋳🗐T#H🍽\u00186󱎣dQ𪱩㷆\u001bE\u0010E\u00105􇖈\u0002j󰪘G`U_5f4H\u001f\u000bI&-􋏕󻀅$A懾\u0004ꨇk􋷴2@l$S󲦌􂖖?uV=:\u0016wG􁱘$%􊭝6~\u0003E\n8c\u000f\u001e\u001c\u001cDa󲉊Ik\u0011􍍾􈑷|c\u0006W]g\u001b9\u0013(􋀐4qk\u0012𮦋븙󶅃-􉪩_\u001eO\u0005mIg𮦄))󴩮@\u0016\u0018🌓T'she?􎑳𡙳z9xS􌷡N\u0003엺&󵝇󷳫\u0011M\u0010𡭙`b+",
-    "message": "K𓇬0(𬸲󽡋H[_MMT󽧫F*g&䡢􇑵\u0015𥦼𤛣F埵\\􍼹w\u0007*-\nu_\u001aB[%{ 끭[\u0019\u0001&󳗓9K\u0019$\u0012󱞻'􎊏8#𔓉FO/\u000b𘛻oPf)\u0007﹌pb\u001dG=HZ?]:g8eHF\u001aW󾍦<󷋌#𡬳`󻳱􅻧\u001en]\u0019\u0007g'\u00147\u0001 X󴋶PQㇼyb\u0001KXs􎑁𬑌􁚪H鯏\u0013􊒝b􂷾r\u000e\u0017_\u0006sgr:􏐨\u0014\u0013?\u0008[qgE𡠢𨡒6YXVp2l\u0006𭛥\u000cC\u0019\u0016\u0005EU\u001b*\u0016}󰇲O?Z檥Z\u0011H\u0002caW.\u0001N􋝞w$+\u001dJ󱤁Myt𡅾tTRC1`􆪚ऍ\u0010􄱓𦾡\u000fTlᬖ\u0008󺛙'\rB􉑿𨾗\u0008#.H螐J⑸󸖟ey𪏐x3\u0008󼊌"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_17.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_17.json
deleted file mode 100644
index 9c91d8282cf..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_17.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00003719-0000-6c7b-0000-4b5f00002419",
-    "name": "𝃊{𗕜f\u0016#𤨄dCp\u0014F(H\u0019\u0007\u0017\t*􈒒\u0006C?\u001d􏒄G𐰄:􈌼󺟞\u001549A\u001dt%c:\u0001\u0010''\"TX2\u001c𠤳쑍A\u0016𨨭𬣾𪪞\u0014ld󲠓#<𩶦\u0011#󻵅\u001a𬪳\u0011pࠩ]OZR9\u000b󳁊o𩍮@a󴐱q𗃈𑌏󻓻/b󹩀v`aGk4獝􎦅􋫴󹚰􃽽`iu󵓸mxw$",
-    "message": "/쬲\u0004\u0001\u000f5k\u0013(,􋦜\u0018󷻦\u0006e􉎯􇥙\u001b=\u0006󼷹_\r𣊭iO𧀣a\u0013ຖ\\@?k\u0007U.?\u0006YEu5\u001bn@omOE㑙󺅬􃁆f6􍦗}M𐡔􃈆󱂅\u0019I\u0017w\u0004{'󳞩\u000e𘧻􄡵P륭믃􆇚䶒!첚\u0004\u0012*袡z𭾺𥫨l^d\tQ\u001cZI􃖇\u000c#\u001a\u0008\"|v)𣍼𬑕^NV\u0019\u001f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_18.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_18.json
deleted file mode 100644
index cfd9b48854a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_18.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "0000085b-0000-3152-0000-694d0000363f",
-    "name": "~\u00044𨲼HEA",
-    "message": "~C\u0012󴩃$𤲙#?]Y󺮊ǒ3󿵦큳\u0019\n𪘀I􃋎Mc𭤝昡jBb{􍄤i\u0018\u0007􇙵<C(𢳒󻿰 O\u001fo󳓫a􍨋!b㊦~⭨𥡆`\t~r󳽠\u0000\"#Yk㧑~P3DEef\u001f+𒇰\\\"0Ae\u0014gi6\u000bj7{颷\"~􄲾\u0011<qc\u0007r󻋾󾏽\\&)𪸣\u0010Ayl\u0017\u000b}ᔢ\u0016󰿰y\u0017󳘆^𩣶\u001d0􋂷k|󿈰@hpG\u0018\u0008$s􊨏\u0013J\r𨏎\t酧𥙸󾲬P\u0018\\6+.󵚢Ah88k\"􌤔U𦌔[uy\u001b#u􌻦\riKR󻗅\u0018?𩅤+🦿:􇴪𠉒\u0019Q󴉅\u0007󴫳𠎇W\u0018IrLk5k\u000f qZF\r\t󸇞lnH\"\u000f󾹜􀱬\u001fNfw\u0012\r;$\t~!hV\t䊫􍋴􆘳j쟼\u00154mI𠊚\u001b󰱻𒐃u𬹁0𪦢b𦻭W􈵪K)"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_19.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_19.json
deleted file mode 100644
index ccf4f3591e8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_19.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "000038c8-0000-3e70-0000-4bde00001bd1",
-    "name": "+󽈋.\u0017w砆v]􎃡\u0019𘗑-\u0006󳽂𥥅Y.\u0014>&\u000c#:𥠮a\u000b𨃠𠴪x󶺛\u0016 E\tj𠶨𪡠H󴵞\u0019(Y@􊷜䟦􈰔<~\u0010?_𠡀rn\u001d3\"E4%<L\u0000b[\u0001^𧖨&\u0006N\u0010n쥩|𧻐9\u000c7𬹸ھ󵊤%)FUov􊎪l@)\u0012u\u001f-\u0000>V\u0015L\u0017p𓂬&𨬯4𣱣3楏\u0019-\u000f\u0007\u0003h偁s~\u000b󸞴\u0004盀ED\u0006\u0002*󼥸z*\u0006-e𦾌HA\u0002Q4",
-    "message": "}Vr6f\n\u0015m􄶡󼆕\u0011y󼞐\u0003\u0002󾮝o𗌥V\u000b1-/댡.M+LJq􅔀f^o􆝹\u0018K掸\u001c𨯦wh\u001a\u000c=6t(L󰑙g\u0019\u0004󳅽:}\u001b\u001a􋜶}q􆫾\tJ􊮃\u0002?󿕠娴󽮢\u001b@x:2󲃆&h"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_2.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_2.json
index bca7dc7e499..20cd8230bc9 100644
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_2.json
@@ -1,5 +1,5 @@
 {
-    "user": "00003697-0000-346d-0000-6baf00003034",
+    "message": "}k󲊔\u0000𐚺\u0013𣑛T.kjW@󲚕cㅏ􏂲n𝜰0\u0001pH,?^+󷉴8\u0002𤶞b\tF𐊎n\u0003!![\u000b󺐯3󳱌\u0002𝀵\u0015󵸲􅇫I􀻀La𨲸.碅󵰮33a\u0011H󺓶X𡰧𣷖pSyL2\"y\\8ꎴ󿄈@!F\u001cQ\u000c􃜻𦼗\u000e󱘯[!\u000e麪\u0006=uH󴼌㺨\u0003󻋣󰩞B2􃿍𑱃\u0000yy𢝴\u000c\"􌩢鑋!𢓿\u0017󻋟K 舧Z􃄌5.m󰁱n\u001c\u001ds頒JXo[8󸧹􃄙%\u0001}I|>\u00084aG4􍝌􎨳(U􇐍􉿗e4q\u0004\u0006\u0010\"𬺖Q*u|􉸾T}bT\u000ct\u0012UꜮ_Y\u0003􀼶v𗧅􇏆'󲙄.%󿠇v8\u001b;\u000bl>🖋s􂡋􄠈f\"\u0002\u0003𤘍",
     "name": "垏󿄣a𨪺\u000f$\u001b2&\u0012S<\u0011􊐙o󳜛𑐤U",
-    "message": "}k󲊔\u0000𐚺\u0013𣑛T.kjW@󲚕cㅏ􏂲n𝜰0\u0001pH,?^+󷉴8\u0002𤶞b\tF𐊎n\u0003!![\u000b󺐯3󳱌\u0002𝀵\u0015󵸲􅇫I􀻀La𨲸.碅󵰮33a\u0011H󺓶X𡰧𣷖pSyL2\"y\\8ꎴ󿄈@!F\u001cQ\u000c􃜻𦼗\u000e󱘯[!\u000e麪\u0006=uH󴼌㺨\u0003󻋣󰩞B2􃿍𑱃\u0000yy𢝴\u000c\"􌩢鑋!𢓿\u0017󻋟K 舧Z􃄌5.m󰁱n\u001c\u001ds頒JXo[8󸧹􃄙%\u0001}I|>\u00084aG4􍝌􎨳(U􇐍􉿗e4q\u0004\u0006\u0010\"𬺖Q*u|􉸾T}bT\u000ct\u0012UꜮ_Y\u0003􀼶v𗧅􇏆'󲙄.%󿠇v8\u001b;\u000bl>🖋s􂡋􄠈f\"\u0002\u0003𤘍"
-}
\ No newline at end of file
+    "user": "00003697-0000-346d-0000-6baf00003034"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_20.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_20.json
deleted file mode 100644
index 2a6b2f1e96c..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_20.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00003c50-0000-35a1-0000-2a52000060b5",
-    "name": "H𘁓upBf󼀰z𮈬\u001aR\u0003S[\u0017\u0015H9GdJ!\u001bRj󽞨)\u0002c6􌰖|\u001dn\u001a`F.\u000e𩞊y𬜳웘X<egN\u001bTb𓉷\u0000𬹭j$<J)\u0012\u0000\u00181tbﯕbA𪈿CN\u000b-瘲􄀺<\u0001𩐭_\u0012MOh\u0005(1𭽈􊻲8𐳪􅱽w\n\u0004\u00141;󺉝󽂽GlM󻍵[玿ꀛu+\u0003_h|\u0017a\u0005\r{r𫧫94?󰼧77z\u0005\u001e[y\u0002Nh(Nz{\u0010h􍀞4\n\u000f\u0018\u00005i8퐶i7􀯐KGD󴌹RY𬲂!a7~\u0003\u001ckq54\u0013)n\u0007\u0013\u001c4b]󹵁𣌩_Pz!󻺧􆿥(\u000b=qjhQ󻻙\u001e􃓟賏􎒉\u0014󻇶\u0017!ZW~vm\u001ab$\u001a󳪗\u0013I%:}㎽췏􂼦S𢯗􇙮󰕵3\u0007e\u0002D<?(ڃv8𧯡􀺠𘜛]ꍈ\u001c􏳛𦩭w󱘖{𤄍q\u0016",
-    "message": "𡄵󽗤\u0003P𒒠M{􉷪󾉧瞣an\u0002^X\u001eW~ﾄ\u0006gF󲐳"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_3.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_3.json
index ac057c6298a..57fafed82e6 100644
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_3.json
@@ -1,5 +1,5 @@
 {
-    "user": "0000302a-0000-1612-0000-459400001b2a",
+    "message": "􉈤󲚥\u0002\u0012\u001aj𩰙X\u001ez[r\u0010꼃L]zl𣦂\u0015",
     "name": "e\u001cx膂IBV 5􎑇hWeYpU􃣠(\n딾\tn𨐺󲵽𤜅󴈔\u0007MNk 3V\u000c~𭮩XltD'\u0018𤡶􈖘g\u0015L3S\u0018𣂲􈲎煪莧Y\u0005󼲖T󱖃I𪴏E [\t􌝤!􈟌\u0014\u0011􇕊⃪jn'(cw\u0002\u0013󾔴\n\u0010T%\u0018𩓔`󾘜㸈|iGOZ\u0001R8FC\u00087黼\u001dN*dT#𭕙\\<\u0010?𣓃%\tZC+Ht௸;\u000f􃶕(𤀀H𦬊=P\u000e𧉽\u001buO*\\QM\u000c{r)~E\u000b!k􍴫W}1\u0017[𦿡a󿠏7/LM9𪭩隝pk\u0001>m􂳡1z􉝪\\𐇜𤙷\u001c5􈐣𗲿0\u0007\t󲵭a\u001a󴣽`XY\u001d^𐒩!ၘ\u001b냨Z뼽\u001f\u001a[R>\u001a*\u0012=X󴐝/UE\u0016􅙗𨙾>􊆍>\u0015\",\u0014",
-    "message": "􉈤󲚥\u0002\u0012\u001aj𩰙X\u001ez[r\u0010꼃L]zl𣦂\u0015"
-}
\ No newline at end of file
+    "user": "0000302a-0000-1612-0000-459400001b2a"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_4.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_4.json
index dc223aa4a55..e48c0c38ae6 100644
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_4.json
@@ -1,5 +1,5 @@
 {
-    "user": "00005bd6-0000-77a4-0000-2a3600001251",
+    "message": "bJiQ􍌐m_\u0013!\u000bD㩄>京'eᘬ]1i㎛\u000fiy𣘃\t🖼)􎣗\u001aD|_慃\nDP\u0011>𨡰<󵛖\u0013\u0011\u001a0:Z1V\u0015\u0010j󴢀r🜼𪌺𠽊DgC&3┩0~󹄛S\u0018z:L\u001b]󽎺%xM󴇏ᙰ\u0019!64%ｖ\u001bsj\u0014Io3$逖SH:N4𭠈Do䋞;|u跢u{&􃣒󰐲\u0014vX󳿒g\"O􋘆%􁷫ᔣ<S\u000by𨴲𒇬,󹹂3🎗\u0014\u0001_󾍿;\u0013햄\u0014\u001eo`/\\\u001e􊥕I\u0011\u00110𣡠L󷻥{c0󱉽愆a@󳐅\u0005#G+\u0003\u0006O𡳘!𪍫`\nP%냤<\u001asBr𤜮?󰝩Nv>盍􊙯(\u000e\u0017\u0014-^F\u0010\u0013n𪽯𝘴\u0001whiU󵥙l\n􂾆s󽁛\u0010 􄁌􂲛\nu$*P􀲊R5w`𫁰U𣊻_5𥫎G\u0017\u000c~d\u00104",
     "name": ".#Y󻇶\u0004D|<.╭\u0007@v󹬯Nn􂗨k󻺱f=M\u0000쀿彸Pd\u0018&s󿙰􆘎b\u001b󳖤G}󿞇\u0015iE\u000c\n|\u0013\t􆃾\u001d騃\u0002R&>∞\n\u0005􋨧8$󲤺G\u0008\u001eYA8.}!k*􌍀𬭮X󲲔^𘓥𫒞󳏋Z􍭬7X\u0002󵺣\"=&Sr^o􇓉`鼬/\n'𓍿8f\n𡅲{",
-    "message": "bJiQ􍌐m_\u0013!\u000bD㩄>京'eᘬ]1i㎛\u000fiy𣘃\t🖼)􎣗\u001aD|_慃\nDP\u0011>𨡰<󵛖\u0013\u0011\u001a0:Z1V\u0015\u0010j󴢀r🜼𪌺𠽊DgC&3┩0~󹄛S\u0018z:L\u001b]󽎺%xM󴇏ᙰ\u0019!64%ｖ\u001bsj\u0014Io3$逖SH:N4𭠈Do䋞;|u跢u{&􃣒󰐲\u0014vX󳿒g\"O􋘆%􁷫ᔣ<S\u000by𨴲𒇬,󹹂3🎗\u0014\u0001_󾍿;\u0013햄\u0014\u001eo`/\\\u001e􊥕I\u0011\u00110𣡠L󷻥{c0󱉽愆a@󳐅\u0005#G+\u0003\u0006O𡳘!𪍫`\nP%냤<\u001asBr𤜮?󰝩Nv>盍􊙯(\u000e\u0017\u0014-^F\u0010\u0013n𪽯𝘴\u0001whiU󵥙l\n􂾆s󽁛\u0010 􄁌􂲛\nu$*P􀲊R5w`𫁰U𣊻_5𥫎G\u0017\u000c~d\u00104"
-}
\ No newline at end of file
+    "user": "00005bd6-0000-77a4-0000-2a3600001251"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_5.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_5.json
deleted file mode 100644
index 2f8721d0ac8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_5.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00001274-0000-57b7-0000-64890000603a",
-    "name": "𢈺\u0006豱?襊J]󵚰\u001d􅐇n5췶7𣜂Ld\u000f@𢳲%*\u0016涄t0o\u0013󿿲􂤢lO'aU\u001e􌸵j\u0013𠁐󸞭\"𛄈gb\u000fo\t@𠭽\u001f#sLWTzX1𦜚Pr\u0003j1󱲈􍽒H𤴟8~?󴊢󻠾􀘿fn}\u0018dy\u0017Cۖ*p^=\u0000\t𪪺\u000f'҈\t\u0013)𣼏ᢔ\u0011󹹛CNNrR\u0006\u001d\t``~鴓Cz=⇃*(J􋺢\u000bw-\n82󺩏",
-    "message": "GE쾳\"𑖌􀢒\t\u001b>K_;VUgy\u0012󳤷;𘛊Y𪒤.;㢇:];&𭈻G\r󽘁LV𗾴b𥜃9I-\u000b\u0006\u001c%?6Jz\u0015\u000b6鈤\u001eM.5^𤨖f\u000cZSR~󼻣󶔽\u0012\u0018T\u000cJ􃸸󸥣\u0004􉹆+z\u000buw姁[󰌊UdG󿚅𛃳\u001bZ4 󽾽t\u001e7\u001d!􀖩􉶜I\u001cv\u0016}XW􄆹~y\u00165tQ+W󵀶\"\u0001r8􀡿Gt(郪zdyG􋢢\u0019\u001bo婤:E\nHr.\u0003lX4rj'G\u001d3}\tTA[]\u0018"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_6.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_6.json
deleted file mode 100644
index dfff521980f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_6.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "0000200a-0000-7079-0000-227700005bf2",
-    "name": "t\u0015|(Y𑶩2⏺􇽼|@󾅌Ii¾",
-    "message": "\u0002IN(D=E􈮌<{XlM|F\u0007P𧥼𗶥󷚳\\@\r\t󺍮o~󽲿{\tZ\u0013󵹂\u001ewZR숿2 \u0003s􇣘&q!$\u0015󹢒V\u001d𡛝󶒪W\u0014󱜱Q\u0017⠊𠶲<d\u0008I8𐛳⪽xS\u001eN^𢂒XN\u0012-\tz􉄲\u0018=\u000bG\u0018 𝠖󽻼a𣮲T󱤬\n;R:%?'󰳇\u0002󺿛\u0012r嬹6?Ql\u0019p1Ⴥ􇰑;,j\u0012Iꚽq4prR􆾺T𠫡\"Id\u000f\u0015RN)Yr];ec;뀳X YR<\u0000E<m\r#󱀳􂗻WN󼔣bL\u0008􅘒aO'􋇱;𘓭K\u001e\u001fx>\u001e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_7.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_7.json
deleted file mode 100644
index 3b3c970ddd8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_7.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00002c2c-0000-63f7-0000-542100007c8e",
-    "name": "5\u0007mXn\u001d􅦨X䰪#/MM\u001c[􆊣Wd8󽄿𫫿PM\rz`N}d􊿒.􄰾󻋺􍀞6\u0010~F\nRj%\u000e5T𦙣\u0002𢡺e]\u0015j_􁥝?\u0007\u001ef𫀕酳`CSX𬝉4zW􎻝2\u001e𝕀𤢽󾭙jU🏠󱋝\u0003\u0018⩸𦜘\u0019󰅦𮋎\u001b*X󴽲w𨗈\"\u0016􅜌~\u001d;\u0000<😗",
-    "message": "/􎝎}+v\u000bF>v◴a􅔩\u000b\u00060󺫘>j\u0008|B\u0007+49w|$rj\u000b!􇼏󻲸󱴉\u0011􃐡x\u000b􎅪\u0014Q􎒍􈒚7\u00046𡑿𫑿􎛤6􋁶󿹷\u000b$\u0003?e\u0015x\u0018􍑮\u0013.\u0001󶪬W𨡓U𝝣*c<􆈷\u001e󾜔O􁥢􇩂Dh𢄈]󲌀I\u0005q𮔩J\u000f$𣐩9\u000faD󾓅HR7Jl_\u0013(熬\u0006𬑋zM𢴼\u001d􋉢󾛶#(𧾞q:󿠨\u000cH|5\u0003/󶽭/5c_vY\u0017􏉙𤛄􌓁[\u0015𪹽\u0017I5\"󺘠W\u001e/\u0018\u0004;62{"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_8.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_8.json
index 8111d42d0e7..bd1d8f16df0 100644
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_8.json
@@ -1,5 +1,5 @@
 {
-    "user": "00001ab1-0000-6eb7-0000-71e900007867",
+    "message": "u𗠶:@o\u0005W&\u0004_\u001f{𗗩L󾍽E\u0002䩩&\u0010\u0004󸤴\u0011[\u0007KU_\tC왛G8$doଉ󵹁ZU6\u0000\u001eT{4;mq󰃌󺿘\u001a𒉉\u0012\u0008􀵜|fs7􊢗\u0014\u0018⇊>^,K1l\u0004{t󾟀𩪋W\u00025𞠰rS\u0011i\u001d<CfWmI\u0016󼣠\u00133YDuPj\u0006}B\u0007.귷話𫳯􈰥\u000c\u001eGv^𤌼x\u000f\u0001E6WS\u000bT:H󾝌-s𒃦\u0016Fl'zxE𘪂\u001d𬙈D\u001e:􁦮𧶋Q\u0005!\u001bhu}a􅔵k\\|䟍 I7\u0013\u0010𢆉🚼历㋾{Cv>\u0007\u0004K6𦕔f69lZdw\u000c\n\u0013T𝡭#j\u001ey𥹦7󲱨un𭑯􈚱xa#5D\\\u00114\u0011𮡟􀮵?\u00070>Z𧹓v\u000b",
     "name": "󺽑;𣶡W莡%vJ\u0011馶/#\r󵯝mUO𠉙5\u0001È⭝𢐨u\u0008\u0006K4\u0011\u0004`%)3\u0019\u0016\u0010uUqQP-\u0008\u0015╓\u0017\u001d*,1\u0003j󴂰h𩽬:ㇿ𦡀t\u0007\u000cH􋁺\u000b䶌TDxd\u0013\u0000<📅𧬨M7\u0011|C\ttLD􊑌􉐑[\u0007z􃛪y𥄖캹V8󽳄󰟚rRD \u0002𨚚􏙞F\u0010G\u001f{%;\u000buaJ\"\u0010!=D묡\u001b;~w>\u001a_\u0018'𝥶]~􂩛0\u000f󾎥\"\u0016'>\u000f4\u0015㭼\u0017[eFL\u000e%W$𨪓_􃨞]\u00135*>$u𣆅\u0001󶛍\u001d󹂓\u00134\u0008\u000b",
-    "message": "u𗠶:@o\u0005W&\u0004_\u001f{𗗩L󾍽E\u0002䩩&\u0010\u0004󸤴\u0011[\u0007KU_\tC왛G8$doଉ󵹁ZU6\u0000\u001eT{4;mq󰃌󺿘\u001a𒉉\u0012\u0008􀵜|fs7􊢗\u0014\u0018⇊>^,K1l\u0004{t󾟀𩪋W\u00025𞠰rS\u0011i\u001d<CfWmI\u0016󼣠\u00133YDuPj\u0006}B\u0007.귷話𫳯􈰥\u000c\u001eGv^𤌼x\u000f\u0001E6WS\u000bT:H󾝌-s𒃦\u0016Fl'zxE𘪂\u001d𬙈D\u001e:􁦮𧶋Q\u0005!\u001bhu}a􅔵k\\|䟍 I7\u0013\u0010𢆉🚼历㋾{Cv>\u0007\u0004K6𦕔f69lZdw\u000c\n\u0013T𝡭#j\u001ey𥹦7󲱨un𭑯􈚱xa#5D\\\u00114\u0011𮡟􀮵?\u00070>Z𧹓v\u000b"
-}
\ No newline at end of file
+    "user": "00001ab1-0000-6eb7-0000-71e900007867"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_9.json b/libs/wire-api/test/golden/testObject_ConnectionRequest_user_9.json
deleted file mode 100644
index 1a29a72d1a0..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionRequest_user_9.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "user": "00006ce0-0000-7032-0000-655d0000553a",
-    "name": "\u001fibm\u0008\u0013n\u0006W\u000b;M󵗀4\u0014K\u0018𠛜ܶr靆핷+e󿽿@\u0003󼅵𢙼F􉩹\u0002\u0001\u0016<\u001cqV쇌󳼞r\u0002\u0012CeG{~󶙹󿐯냼U璌ZOTFfn􃶳)cr􏦩\r=\r]V\u0019亄.su]󱫅𢖢Ꚋu9􇡗\u0003翲p)\u0004𢉕󶫐\u0000g𩣒K𘦴Fcx\u0002􉾣\u0017Pe-JA𩇯\u000b󲑰􅤭5$w󹈑🢖13P 7yBHLx$G+5d󿂟,!阊!2zz􇖉􉈏0jz󷗷𦶣j\u0013B\u000f.nE󻉩M\u0016둷󸮹B)D|KRBa\u0016呣\u001ei𝓒zn\u001b\u000c𖠀Q:􏨠'󻙂i},J\u0007wn\u000f5O=X~\u00190𖦢@k󲽖k\u0014󿍰j礮Ez\u000f𨊎\tebq&􏷈󶃺M𓁨r𩫅􉲕8a,\u000c",
-    "message": "\u0008gⵛ\u0015𥝠\r\u0005~𭂽󺁣䀳C5jnvRJ𗈕𣐑aF\u0011􌄢󼵁󻫟c𫫜\u001a\u001euG$=8I󸀕\t\u000fAg%\u0011v\u0012𪁃\u0015\u0010\u0000\u001b\u000c2\u0015v􏐵`\u000f<\u0016\u0013}T􈨎(\u0000>!\u0001\u0013󼭛n\u001a𩠜m@h\r𢲈k󴤼7+^4\"뽞􂣵,r𤾣􎯄$簋0+Q\u000e󺸿M1󶺃󹕺v𩻏\u000e\u001f\u0012-6𗝙竓\np􃹋6􍩲[\u0007\t\u001cr\u0012s\u0017\u0006\u000f;c]Y]\u0008􍏃y/𠽨\u001e\u001b^0:\u0019-\u001eR\u000cjSA9~󲽱Z\u0010y-~H+\u0014:\u000f\u0001h𡜉𨳵\u000bu\u0004\nm'#ke,𛁣l󿋠𭳪䦰\u0012􃂵𒐘𮪝@𗄥(p-p&1􉵣9\u0010𨮼3K􈄎O\u001f\n.E\"A(ᥞ#i뜲d\u001a\u001c'\u001b[栤S$}\u0008H􃅱\u0014􎷥\u001c/\u0008󽣝"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_1.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_1.json
index a96b3973d9f..57f273585ff 100644
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "status": "cancelled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_10.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_10.json
deleted file mode 100644
index c353ff9bd0a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_10.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "pending"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_11.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_11.json
deleted file mode 100644
index 22071b48617..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_11.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "sent"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_12.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_12.json
deleted file mode 100644
index c353ff9bd0a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_12.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "pending"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_13.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_13.json
deleted file mode 100644
index 03ef42e38a5..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "ignored"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_14.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_14.json
deleted file mode 100644
index 22071b48617..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_14.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "sent"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_15.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_15.json
deleted file mode 100644
index c0d3d873b04..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_15.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "accepted"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_16.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_16.json
deleted file mode 100644
index c0d3d873b04..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_16.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "accepted"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_17.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_17.json
deleted file mode 100644
index 22071b48617..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "sent"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_18.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_18.json
deleted file mode 100644
index 22071b48617..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_18.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "sent"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_19.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_19.json
deleted file mode 100644
index eaf12f22923..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "blocked"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_2.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_2.json
deleted file mode 100644
index eaf12f22923..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "blocked"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_20.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_20.json
deleted file mode 100644
index eaf12f22923..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_20.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "blocked"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_3.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_3.json
deleted file mode 100644
index c353ff9bd0a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_3.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "pending"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_4.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_4.json
deleted file mode 100644
index a96b3973d9f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "cancelled"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_5.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_5.json
deleted file mode 100644
index c353ff9bd0a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "pending"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_6.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_6.json
deleted file mode 100644
index 22071b48617..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_6.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "sent"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_7.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_7.json
deleted file mode 100644
index a96b3973d9f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_7.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "cancelled"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_8.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_8.json
deleted file mode 100644
index a96b3973d9f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_8.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "cancelled"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_9.json b/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_9.json
deleted file mode 100644
index eaf12f22923..00000000000
--- a/libs/wire-api/test/golden/testObject_ConnectionUpdate_user_9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "blocked"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_1.json b/libs/wire-api/test/golden/testObject_Contact_user_1.json
index 391d4750ca6..825287dc786 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_1.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": 6,
     "handle": "􉿺\u0000|\u000e",
+    "id": "00000007-0000-0003-0000-000300000005",
+    "name": "",
     "qualified_id": {
         "domain": "j00.8y.yr3isy2m",
         "id": "00000007-0000-0003-0000-000300000005"
     },
-    "accent_id": 6,
-    "name": "",
-    "team": null,
-    "id": "00000007-0000-0003-0000-000300000005"
-}
\ No newline at end of file
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_10.json b/libs/wire-api/test/golden/testObject_Contact_user_10.json
index 3c37a176a5c..7618387345c 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_10.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": 0,
     "handle": null,
+    "id": "00000000-0000-0000-0000-000800000007",
+    "name": "(􍓮􍺑H/",
     "qualified_id": {
         "domain": "avs-82k0.quv1k-5",
         "id": "00000000-0000-0000-0000-000800000007"
     },
-    "accent_id": 0,
-    "name": "(􍓮􍺑H/",
-    "team": "00000005-0000-0006-0000-000700000000",
-    "id": "00000000-0000-0000-0000-000800000007"
-}
\ No newline at end of file
+    "team": "00000005-0000-0006-0000-000700000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_11.json b/libs/wire-api/test/golden/testObject_Contact_user_11.json
index f79a03327f7..f6831f331bb 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_11.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": 6,
     "handle": null,
+    "id": "00000002-0000-0005-0000-000700000004",
+    "name": "+\u0014􃬃<",
     "qualified_id": {
         "domain": "156y.t.qxp-y26x",
         "id": "00000002-0000-0005-0000-000700000004"
     },
-    "accent_id": 6,
-    "name": "+\u0014􃬃<",
-    "team": "00000007-0000-0008-0000-000600000004",
-    "id": "00000002-0000-0005-0000-000700000004"
-}
\ No newline at end of file
+    "team": "00000007-0000-0008-0000-000600000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_12.json b/libs/wire-api/test/golden/testObject_Contact_user_12.json
index ef25c944181..38ca139c600 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_12.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": -4,
     "handle": "",
+    "id": "00000004-0000-0002-0000-000300000003",
+    "name": "l\u0011\u0017`\u0003",
     "qualified_id": {
         "domain": "d2wnzbn.8.k2d4-103",
         "id": "00000004-0000-0002-0000-000300000003"
     },
-    "accent_id": -4,
-    "name": "l\u0011\u0017`\u0003",
-    "team": null,
-    "id": "00000004-0000-0002-0000-000300000003"
-}
\ No newline at end of file
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_13.json b/libs/wire-api/test/golden/testObject_Contact_user_13.json
index 5c6fe6394f3..3ee4544fc48 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_13.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": -3,
     "handle": "E\u0019\u001f[58",
+    "id": "00000002-0000-0006-0000-000800000006",
+    "name": "\u0016󻦍\u000b8z",
     "qualified_id": {
         "domain": "902cigj.v2t56",
         "id": "00000002-0000-0006-0000-000800000006"
     },
-    "accent_id": -3,
-    "name": "\u0016󻦍\u000b8z",
-    "team": "00000001-0000-0003-0000-000000000005",
-    "id": "00000002-0000-0006-0000-000800000006"
-}
\ No newline at end of file
+    "team": "00000001-0000-0003-0000-000000000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_14.json b/libs/wire-api/test/golden/testObject_Contact_user_14.json
index 5361fdc937a..876b00ee25e 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_14.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": -2,
     "handle": "h\u0018",
+    "id": "00000000-0000-0003-0000-000300000006",
+    "name": "7",
     "qualified_id": {
         "domain": "6z.ml.80ps6j5r.l",
         "id": "00000000-0000-0003-0000-000300000006"
     },
-    "accent_id": -2,
-    "name": "7",
-    "team": "00000005-0000-0008-0000-000700000008",
-    "id": "00000000-0000-0003-0000-000300000006"
-}
\ No newline at end of file
+    "team": "00000005-0000-0008-0000-000700000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_15.json b/libs/wire-api/test/golden/testObject_Contact_user_15.json
index 2caf0afb772..5664eab7866 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_15.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": null,
+    "id": "00000002-0000-0000-0000-000200000002",
+    "name": "U6\u001b*\u000e",
     "qualified_id": {
         "domain": "739.e-h8g",
         "id": "00000002-0000-0000-0000-000200000002"
     },
-    "accent_id": null,
-    "name": "U6\u001b*\u000e",
-    "team": "00000006-0000-0006-0000-000800000006",
-    "id": "00000002-0000-0000-0000-000200000002"
-}
\ No newline at end of file
+    "team": "00000006-0000-0006-0000-000800000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_16.json b/libs/wire-api/test/golden/testObject_Contact_user_16.json
index 070c93b757e..a04c2bf386f 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_16.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": null,
+    "id": "00000000-0000-0006-0000-000500000006",
+    "name": "l",
     "qualified_id": {
         "domain": "t82.x5i8-i",
         "id": "00000000-0000-0006-0000-000500000006"
     },
-    "accent_id": null,
-    "name": "l",
-    "team": "00000000-0000-0006-0000-000200000007",
-    "id": "00000000-0000-0006-0000-000500000006"
-}
\ No newline at end of file
+    "team": "00000000-0000-0006-0000-000200000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_17.json b/libs/wire-api/test/golden/testObject_Contact_user_17.json
index e6260daca1f..fd68c31c3ae 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_17.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": "3",
+    "id": "00000003-0000-0008-0000-000700000002",
+    "name": "fI⊤3z",
     "qualified_id": {
         "domain": "o5b0hrjp3x0b96.v1gxp3",
         "id": "00000003-0000-0008-0000-000700000002"
     },
-    "accent_id": null,
-    "name": "fI⊤3z",
-    "team": "00000004-0000-0007-0000-000000000001",
-    "id": "00000003-0000-0008-0000-000700000002"
-}
\ No newline at end of file
+    "team": "00000004-0000-0007-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_18.json b/libs/wire-api/test/golden/testObject_Contact_user_18.json
index 408c696305e..b5f25e02fcb 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_18.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": null,
+    "id": "00000004-0000-0006-0000-000800000006",
+    "name": "\"jC𒐱𣓁\u0012",
     "qualified_id": {
         "domain": "72n2x7x0.ztb0s51",
         "id": "00000004-0000-0006-0000-000800000006"
     },
-    "accent_id": null,
-    "name": "\"jC𒐱𣓁\u0012",
-    "team": "00000001-0000-0002-0000-000000000007",
-    "id": "00000004-0000-0006-0000-000800000006"
-}
\ No newline at end of file
+    "team": "00000001-0000-0002-0000-000000000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_19.json b/libs/wire-api/test/golden/testObject_Contact_user_19.json
index d8fb211ba6f..7cf17bc4f54 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_19.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": -1,
     "handle": "\"7\u0006!",
+    "id": "00000005-0000-0003-0000-000700000007",
+    "name": "I",
     "qualified_id": {
         "domain": "h664l.dio6",
         "id": "00000005-0000-0003-0000-000700000007"
     },
-    "accent_id": -1,
-    "name": "I",
-    "team": "00000006-0000-0004-0000-000000000003",
-    "id": "00000005-0000-0003-0000-000700000007"
-}
\ No newline at end of file
+    "team": "00000006-0000-0004-0000-000000000003"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_2.json b/libs/wire-api/test/golden/testObject_Contact_user_2.json
index 14a034c75af..4ad15e595a3 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_2.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": -5,
     "handle": "",
+    "id": "00000006-0000-0004-0000-000100000007",
+    "name": "\u0016D",
     "qualified_id": {
         "domain": "z.l--66-i8g8a9",
         "id": "00000006-0000-0004-0000-000100000007"
     },
-    "accent_id": -5,
-    "name": "\u0016D",
-    "team": "00000002-0000-0008-0000-000400000002",
-    "id": "00000006-0000-0004-0000-000100000007"
-}
\ No newline at end of file
+    "team": "00000002-0000-0008-0000-000400000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_20.json b/libs/wire-api/test/golden/testObject_Contact_user_20.json
index faa345d5aaf..079817785aa 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_20.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": null,
+    "id": "00000000-0000-0000-0000-000500000001",
+    "name": "|K\n\n\t",
     "qualified_id": {
         "domain": "pam223.b6",
         "id": "00000000-0000-0000-0000-000500000001"
     },
-    "accent_id": null,
-    "name": "|K\n\n\t",
-    "team": null,
-    "id": "00000000-0000-0000-0000-000500000001"
-}
\ No newline at end of file
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_3.json b/libs/wire-api/test/golden/testObject_Contact_user_3.json
index 0f59fd55af1..e8cb5a2eee8 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_3.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": -4,
     "handle": "𪱉~豳c",
+    "id": "00000005-0000-0003-0000-000700000003",
+    "name": "S󽎃D\u001d",
     "qualified_id": {
         "domain": "h.y-2k71.rh",
         "id": "00000005-0000-0003-0000-000700000003"
     },
-    "accent_id": -4,
-    "name": "S󽎃D\u001d",
-    "team": "00000006-0000-0005-0000-000700000008",
-    "id": "00000005-0000-0003-0000-000700000003"
-}
\ No newline at end of file
+    "team": "00000006-0000-0005-0000-000700000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_4.json b/libs/wire-api/test/golden/testObject_Contact_user_4.json
index 2d549687ffd..13b1b0c89a5 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_4.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": "6",
+    "id": "00000003-0000-0002-0000-000000000004",
+    "name": "@=\u0003",
     "qualified_id": {
         "domain": "2347.cye2i7.sn.r2z83.d03",
         "id": "00000003-0000-0002-0000-000000000004"
     },
-    "accent_id": null,
-    "name": "@=\u0003",
-    "team": "00000000-0000-0000-0000-000500000004",
-    "id": "00000003-0000-0002-0000-000000000004"
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000500000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_5.json b/libs/wire-api/test/golden/testObject_Contact_user_5.json
index aa4fd4237ed..4442242a90e 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_5.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": null,
+    "id": "00000004-0000-0000-0000-000300000005",
+    "name": "5m~\u0014`",
     "qualified_id": {
         "domain": "v0u29n3.er",
         "id": "00000004-0000-0000-0000-000300000005"
     },
-    "accent_id": null,
-    "name": "5m~\u0014`",
-    "team": null,
-    "id": "00000004-0000-0000-0000-000300000005"
-}
\ No newline at end of file
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_6.json b/libs/wire-api/test/golden/testObject_Contact_user_6.json
index 264d70d875c..9ca25db0d52 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_6.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": null,
     "handle": "qI",
+    "id": "00000003-0000-0001-0000-000400000000",
+    "name": "Cst󳃛U",
     "qualified_id": {
         "domain": "6k.p",
         "id": "00000003-0000-0001-0000-000400000000"
     },
-    "accent_id": null,
-    "name": "Cst󳃛U",
-    "team": "00000005-0000-0004-0000-000600000000",
-    "id": "00000003-0000-0001-0000-000400000000"
-}
\ No newline at end of file
+    "team": "00000005-0000-0004-0000-000600000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_7.json b/libs/wire-api/test/golden/testObject_Contact_user_7.json
index d0829e08427..df0499cc7e5 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_7.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": 5,
     "handle": "",
+    "id": "00000001-0000-0002-0000-000800000008",
+    "name": "\u000874\u0005",
     "qualified_id": {
         "domain": "yr.e1-d",
         "id": "00000001-0000-0002-0000-000800000008"
     },
-    "accent_id": 5,
-    "name": "\u000874\u0005",
-    "team": "00000008-0000-0001-0000-000400000008",
-    "id": "00000001-0000-0002-0000-000800000008"
-}
\ No newline at end of file
+    "team": "00000008-0000-0001-0000-000400000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_8.json b/libs/wire-api/test/golden/testObject_Contact_user_8.json
index 02a25a58f4e..67ad84dfe7e 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_8.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": -2,
     "handle": null,
+    "id": "00000002-0000-0002-0000-000600000008",
+    "name": "w􀙒󲢵#\\",
     "qualified_id": {
         "domain": "51r9in-k6i5l8-7y6.t205p-gl2",
         "id": "00000002-0000-0002-0000-000600000008"
     },
-    "accent_id": -2,
-    "name": "w􀙒󲢵#\\",
-    "team": "00000001-0000-0007-0000-000500000002",
-    "id": "00000002-0000-0002-0000-000600000008"
-}
\ No newline at end of file
+    "team": "00000001-0000-0007-0000-000500000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_Contact_user_9.json b/libs/wire-api/test/golden/testObject_Contact_user_9.json
index 734727e3898..9318c77233b 100644
--- a/libs/wire-api/test/golden/testObject_Contact_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Contact_user_9.json
@@ -1,11 +1,11 @@
 {
+    "accent_id": 5,
     "handle": null,
+    "id": "00000000-0000-0000-0000-000600000008",
+    "name": ",󾌯 \u000b􇀉",
     "qualified_id": {
         "domain": "37-p6v67.g",
         "id": "00000000-0000-0000-0000-000600000008"
     },
-    "accent_id": 5,
-    "name": ",󾌯 \u000b􇀉",
-    "team": "00000005-0000-0002-0000-000500000000",
-    "id": "00000000-0000-0000-0000-000600000008"
-}
\ No newline at end of file
+    "team": "00000005-0000-0002-0000-000500000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConvIdsPage_1.json b/libs/wire-api/test/golden/testObject_ConvIdsPage_1.json
index e56981dcc2d..458d7929648 100644
--- a/libs/wire-api/test/golden/testObject_ConvIdsPage_1.json
+++ b/libs/wire-api/test/golden/testObject_ConvIdsPage_1.json
@@ -2,4 +2,4 @@
     "has_more": false,
     "paging_state": "AA==",
     "qualified_conversations": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConvIdsPage_2.json b/libs/wire-api/test/golden/testObject_ConvIdsPage_2.json
index 54491bffe9d..36536b222b7 100644
--- a/libs/wire-api/test/golden/testObject_ConvIdsPage_2.json
+++ b/libs/wire-api/test/golden/testObject_ConvIdsPage_2.json
@@ -7,4 +7,4 @@
             "id": "00000018-0000-0020-0000-000e00000002"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_1.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_1.json
index e0efc654e73..6670b96e5d8 100644
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConvMembers_user_1.json
@@ -1,35 +1,35 @@
 {
-    "self": {
-        "hidden_ref": "2",
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0000-0000-000000000000",
-            "provider": "00000000-0000-0000-0000-000000000000"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "pqzher6cs67kz8fg0cd4o8aqs00kvkytkovzkjs1igz9eub_5xey_no8m2me3or8ukbtv05uq7gc54p6g52kwiygyqs3om7yu0istkixp_3395mkaxh9zljjyy8",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0001-0000-000100000001",
-        "otr_archived": true,
-        "otr_muted_status": null,
-        "otr_muted": true,
-        "otr_archived_ref": ""
-    },
     "others": [
         {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000200000001",
-                "provider": "00000000-0000-0001-0000-000000000000"
-            },
             "conversation_role": "y4zf98vsd7b6zi1_3wch87_k8m0t8mpdhh8zlcq461s80oc0sl7yn85twxn89f7f4kwpd4_hj9q2m3za",
+            "id": "00000004-0000-0004-0000-000400000001",
             "qualified_id": {
                 "domain": "golden.example.com",
                 "id": "00000004-0000-0004-0000-000400000001"
             },
-            "id": "00000004-0000-0004-0000-000400000001"
+            "service": {
+                "id": "00000000-0000-0000-0000-000200000001",
+                "provider": "00000000-0000-0001-0000-000000000000"
+            },
+            "status": 0
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "self": {
+        "conversation_role": "pqzher6cs67kz8fg0cd4o8aqs00kvkytkovzkjs1igz9eub_5xey_no8m2me3or8ukbtv05uq7gc54p6g52kwiygyqs3om7yu0istkixp_3395mkaxh9zljjyy8",
+        "hidden": false,
+        "hidden_ref": "2",
+        "id": "00000000-0000-0001-0000-000100000001",
+        "otr_archived": true,
+        "otr_archived_ref": "",
+        "otr_muted": true,
+        "otr_muted_ref": "",
+        "otr_muted_status": null,
+        "service": {
+            "id": "00000001-0000-0000-0000-000000000000",
+            "provider": "00000000-0000-0000-0000-000000000000"
+        },
+        "status": 0,
+        "status_ref": "0.0",
+        "status_time": "1970-01-01T00:00:00.000Z"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_10.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_10.json
deleted file mode 100644
index 46b4574b773..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_10.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "",
-        "status": 0,
-        "service": null,
-        "otr_muted_ref": "",
-        "conversation_role": "7dbiql5aifhtio8krbpps8i1r20uplkfvmii9o7nem8r2xe9jyh4vqgw_dt8dznua4ms_ojuy7x8mhko5",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000001-0000-0001-0000-000000000001",
-        "otr_archived": true,
-        "otr_muted_status": -1,
-        "otr_muted": false,
-        "otr_archived_ref": "􊂩"
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "svx4t8g9wwsxnjh",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000000-0000-0000-0000-000000000000"
-            },
-            "conversation_role": "ozu_7m73jbvhbk0i3jcoyoe4dh2tuew",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000000-0000-0000-0000-000100000001"
-            },
-            "conversation_role": "tm8gb5smre1aboo4262eckaqv0imy0ke4kzbi9l8eq0yem6g6jjqcx6uavcsuavc",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000001",
-                "provider": "00000001-0000-0001-0000-000000000001"
-            },
-            "conversation_role": "50w5dsrib7kvjl_i3w_w8wx0kiilysbj_mdy0hycpcico768nytkqi0d",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "t6f29t4sp_bg9v3_6g2inptndogq1yya8hena72erf5pwi5o47k9hp3x_n4wusj9gfwnhn7v419ovmug4ttvghtlfvyzqgls2wcj_",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_11.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_11.json
deleted file mode 100644
index ab59c11de1d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_11.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "self": {
-        "hidden_ref": null,
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0001-0000-000100000001",
-            "provider": "00000000-0000-0001-0000-000000000001"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "7gd37ta2eg_",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0001-0000-000000000000",
-        "otr_archived": false,
-        "otr_muted_status": 0,
-        "otr_muted": true,
-        "otr_archived_ref": "\u0011"
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000000-0000-0001-0000-000000000000"
-            },
-            "conversation_role": "w9hqf8lcwwex77nxrgqaro7a97i0up89j1xsz9zv65vvy2vbshfue_bk6h0dqsfcom4yhiy_eusbj84s8hi33rps5lxr",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000100000000",
-                "provider": "00000001-0000-0001-0000-000100000001"
-            },
-            "conversation_role": "bkf39px76nwbf4mz6_b8wuqltfv5dgiwp75ji5bh7tfjrl37zcchv",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0001-0000-000100000001"
-            },
-            "conversation_role": "4_9pqyp2h9wt3g2ek62u5zxfs7njrdsbbas9_pnigxjyru5wbbd8rvd1",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000000"
-            },
-            "id": "00000001-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000001",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "x8aoqx69ptpetu2ijqtdgfcnn4i_fs53xuuvd8wk0w62az2ifcf3",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "3x2x2c653mxqbc3033be6nw33o4kbz59c_m2840prcxccsih0vu_xiiij4p2bcuapi2a5pdah43f0cdcw",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000001",
-                "provider": "00000001-0000-0001-0000-000100000001"
-            },
-            "conversation_role": "5mxf8j2rudyj_qp34xght54oi5ze5ibz9gdn0r4c3bswshmh24289g8sexu90fxpbi2in3b0fnim_zkyh7w5jzwl_rr4pxd35sqq4spql3ky60zdoobj",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_12.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_12.json
deleted file mode 100644
index f500270d65a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_12.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "?",
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0000-0000-000000000000",
-            "provider": "00000000-0000-0001-0000-000100000001"
-        },
-        "otr_muted_ref": null,
-        "conversation_role": "metu5hokrekxgyamdqvu5pub1efki_5x00gpjigwjuj5wmyfi6ipy425i87a3phcq",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0000-0000-000100000000",
-        "otr_archived": true,
-        "otr_muted_status": 1,
-        "otr_muted": false,
-        "otr_archived_ref": "𦝕"
-    },
-    "others": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_13.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_13.json
deleted file mode 100644
index 4b933dd0e9f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_13.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "\u0011",
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0000-0000-000100000001",
-            "provider": "00000001-0000-0000-0000-000000000000"
-        },
-        "otr_muted_ref": "\u000b",
-        "conversation_role": "42ujl2m6nrjp4ieej3a79t55_q2aqubgpihl2e1q3pv98wtyqxhaebz2n_rnzc95wyzurylgh8ju5g",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000001-0000-0000-0000-000000000001",
-        "otr_archived": false,
-        "otr_muted_status": -1,
-        "otr_muted": true,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000100000000",
-                "provider": "00000000-0000-0000-0000-000100000001"
-            },
-            "conversation_role": "ucf8dtd6st2z1dpc4vty0rkep2m2",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0000-0000-000100000000"
-            },
-            "conversation_role": "z9plklhipd9vc9xsrmmnjgxvcmn88wd8bsxksz4fz0m_vxochm6fknmxlhv8q7t6pz7zem",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            "id": "00000000-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "conversation_role": "p5hsxn0iq7cuh0m49o1ra9x3kji9ku088q",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000001",
-                "provider": "00000000-0000-0001-0000-000000000000"
-            },
-            "conversation_role": "a7nlm4pb71iu7auorq2wfdwvbqjamumby1l8o_0t_mrrdq8ucurulsrl8j35ulczgcw4h9vli187z74gh2ibutc5jt6esfil9m9t",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            "id": "00000000-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000001",
-                "provider": "00000000-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "tjzby42utlpbmouqok_0l9zhoqba03bfz_7hgmuk2r1gcd5laozwgu6zwactg8okxg07url_2huwyn1w_5yl9e0dqq_oweplfx3fkg6c365949zbi86c9tsfyf35h0o",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "conversation_role": "pk30v1kj11lzl1l3dty1i5eucmceer6p41wwq5hlewecwzxn_s5sv8lpwmvr7b5_b",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "conversation_role": "mh1oif358ntz8xlflodiay7alkiktphvvkfy0jerup_gryt4gm0p08q7ynx1kak7de0uup8o9rdblv118f9fal2c8flmub8vdgt1u8nyphxoj2kq17y",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "conversation_role": "y000q2czyxtw7ix6b0cma",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_14.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_14.json
deleted file mode 100644
index 47e12d52385..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_14.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "self": {
-        "hidden_ref": null,
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0000-0000-000000000001",
-            "provider": "00000000-0000-0001-0000-000100000000"
-        },
-        "otr_muted_ref": null,
-        "conversation_role": "dzc663lqhsl5koo9zoydav2svibxi2rldgfs21lozv_47live4tdb_6etua7xbo2h08iehbijx6cnvaiamahoh304_6cua4cce27n8uf1y",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000001-0000-0001-0000-000100000001",
-        "otr_archived": true,
-        "otr_muted_status": null,
-        "otr_muted": false,
-        "otr_archived_ref": "_"
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000000"
-            },
-            "conversation_role": "t7iw7icbnz53p8to8m6b0qjgp8aqd1w",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000001"
-            },
-            "conversation_role": "dpw7b81s21xnmn230l3meyc9xb50h44adxfjrlcwc4rvu9y46whvv_9_06gr1o8mxqa6fwmhvzq8ugirkige_o440kgu1xzncja856hbiy0wosrfbkohxlnt3ad0n1nf",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_15.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_15.json
deleted file mode 100644
index 4416fb9ef67..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_15.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "󶃻",
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0001-0000-000000000001",
-            "provider": "00000001-0000-0000-0000-000000000001"
-        },
-        "otr_muted_ref": "y",
-        "conversation_role": "gtot_tiqu6niipivhw02eu",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0001-0000-000100000001",
-        "otr_archived": true,
-        "otr_muted_status": 1,
-        "otr_muted": true,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "q2bss_quf29jonuixms3y4xvohcq387gmgft5imwjk04u1skbjjvg6h92jgfk00j9g5meownkwzijda98xkdzs6",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "jmp56f7fu12_0ufmn4ykdhtdqwxy3atmutw7hkix8ed6",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000001-0000-0000-0000-000100000000"
-            },
-            "conversation_role": "razn_c23lmdd_fpf41hto60aw5iftmyrwna_1o",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000000000001"
-            },
-            "conversation_role": "e5zwjlctzwwxuks0hxcl8an6oas840jrs7xl2gw1p8rlnun2_rtfa_rw9tsb67x3g4dh4cv62tvx10x4bmmj0dzczsyb_ic0gvzhvsm1vo",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "conversation_role": "6bsf2pcmtt15vznyahwm_hsz4fvc94fd9l3etor9h5eok2ggp7gmy8512428lrq1sezdb9xqz8v33ooyr7vyc39x8kohh0cxc_dja4wqgqx_59xyxqbah94tsyx",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            "id": "00000000-0000-0001-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0000-0000-000100000001"
-            },
-            "conversation_role": "7t50u1ug50o9xo49dbv0g46wbhgu17_4pe6hsooiqye50_a0s0p7i78lwx",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            "id": "00000000-0000-0001-0000-000000000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_16.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_16.json
deleted file mode 100644
index 27988384272..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_16.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "",
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0001-0000-000000000000",
-            "provider": "00000001-0000-0001-0000-000000000001"
-        },
-        "otr_muted_ref": null,
-        "conversation_role": "0cbihjuksvzpyno3h86i34yoy6hr2o2yg16_wi8247u84jontkapcs_cms98qq8qkuw9zoa240fdjf8vlyhfsxidoxy1t3k_wefqly5",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000001-0000-0001-0000-000000000000",
-        "otr_archived": true,
-        "otr_muted_status": -1,
-        "otr_muted": true,
-        "otr_archived_ref": null
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "xswztznf4h445esgv862hlnl_w12ofs6gudt5rqm0fmcy1ji1j1tmdxud9knxuv6_1tkj9xdm8e6heqi2aa3nczuyzfckca",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "bdee121l0vor_rgs35m64b7akc1ulu2djh36kzp53faqyk2d366wzr56xk2ozzqy2gnq2it_rox4ir6",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            "id": "00000001-0000-0001-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000001-0000-0000-0000-000100000001"
-            },
-            "conversation_role": "iuv0fiqut43alvkb_1b3h7dw_nkxu7yco1lbwot_4ly_3r9ru8qudjl4u4rh1xqcmuxh8t6oob6e06br1kn9x6niubo13xwetasp3",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000000"
-            },
-            "conversation_role": "c3cjc",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_17.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_17.json
deleted file mode 100644
index 3c10766c01f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_17.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "",
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0001-0000-000100000001",
-            "provider": "00000001-0000-0000-0000-000100000001"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "gfzbewc89276dh2bhpftvkqv1lfti5ai_n",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000001-0000-0001-0000-000100000001",
-        "otr_archived": true,
-        "otr_muted_status": -1,
-        "otr_muted": false,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "rd9k2n2q8n7gbm55",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "yctlmr8wp0tiyiyn5qld86rpeqigr83h6hn99zo4x1s5ps5j5es4w00wvpcg9h3eplsvctvzryjle1ynou4f7h7s_z0awql5ownx1joi5var2tt0g",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000000"
-            },
-            "conversation_role": "6s2wm62g83wg327vlylm0rv64e3yt41j9ofekhhybvwlxx6b9hwtst9sed3s6kh3dlkp61ocjbpxqt033xic98ujq__ck3yn",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000001-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "mjpdiejf9fgpxz",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            "id": "00000001-0000-0001-0000-000000000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_18.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_18.json
deleted file mode 100644
index a5fcd784e19..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_18.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "self": {
-        "hidden_ref": null,
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0000-0000-000100000001",
-            "provider": "00000000-0000-0000-0000-000100000000"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "5crfexlvlxn_",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0000-0000-000000000000",
-        "otr_archived": false,
-        "otr_muted_status": null,
-        "otr_muted": false,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000200000000",
-                "provider": "00000002-0000-0001-0000-000100000002"
-            },
-            "conversation_role": "zb1ddtg",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000200000000"
-            },
-            "id": "00000001-0000-0001-0000-000200000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_19.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_19.json
deleted file mode 100644
index f91437ec361..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_19.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "I",
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0000-0000-000000000001",
-            "provider": "00000001-0000-0000-0000-000000000001"
-        },
-        "otr_muted_ref": "G",
-        "conversation_role": "t4grrg6rq1gacy62wjoc_h5ytk9o4_jv25gr1a6ycai9ylhuyis7m5s062y4e5iyz0xtw_rbmjuzvgdjkn0tzl9a23p_nycqtp7foswfpxgmwahe02iae1eih",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0001-0000-000100000000",
-        "otr_archived": false,
-        "otr_muted_status": -1,
-        "otr_muted": true,
-        "otr_archived_ref": "v"
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000002-0000-0000-0000-000000000000"
-            },
-            "conversation_role": "oqgwbsi97htc7jnxrlo",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000004-0000-0003-0000-000200000003"
-            },
-            "id": "00000004-0000-0003-0000-000200000003"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_2.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_2.json
index def7a14dc4d..80eb4d1c716 100644
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConvMembers_user_2.json
@@ -1,21 +1,21 @@
 {
+    "others": [],
     "self": {
+        "conversation_role": "hoz2iwweprpt270t14yq_ge8dbej",
+        "hidden": false,
         "hidden_ref": "",
-        "status": 0,
+        "id": "00000000-0000-0000-0000-000000000000",
+        "otr_archived": false,
+        "otr_archived_ref": null,
+        "otr_muted": false,
+        "otr_muted_ref": "",
+        "otr_muted_status": null,
         "service": {
             "id": "00000001-0000-0001-0000-000100000001",
             "provider": "00000001-0000-0001-0000-000000000001"
         },
-        "otr_muted_ref": "",
-        "conversation_role": "hoz2iwweprpt270t14yq_ge8dbej",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
+        "status": 0,
         "status_ref": "0.0",
-        "id": "00000000-0000-0000-0000-000000000000",
-        "otr_archived": false,
-        "otr_muted_status": null,
-        "otr_muted": false,
-        "otr_archived_ref": null
-    },
-    "others": []
-}
\ No newline at end of file
+        "status_time": "1970-01-01T00:00:00.000Z"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_20.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_20.json
deleted file mode 100644
index bfea6336ff6..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_20.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "*",
-        "status": 0,
-        "service": null,
-        "otr_muted_ref": "䦑",
-        "conversation_role": "3esspudy3w9915yyyonlb3dzmp3blkjrvdfdjejfojfkrhosbtnhsivt6dhutihlq6ija_azgdrx6r4_pdw1a9cj0opv77g087t",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0001-0000-000000000000",
-        "otr_archived": true,
-        "otr_muted_status": 1,
-        "otr_muted": true,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "b_1s3qhqvz8buhk16hx5kz7moxy6w",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "k5dvtuimn88rwf702hfi3dyn3mmcp_4_rlqogl2t4v29vl5ynu9cnv4n4zi7lat5lwptqerygp5vbq9297sniahtqof3nrah_lotb9m5mowj1p8r049",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            "id": "00000000-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000000-0000-0000-0000-000000000000"
-            },
-            "conversation_role": "qhzt3rgqtwdtenauy_ju9kov8ezecou02bo9y3sj4gl7thjyw7hvwmryfmnyzjx0r25zzdsi9f8kifueppwtcmlz8kwq0vj31j88ziu2p66o5quz2vt9w",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "conversation_role": "4fn4nrdzoy1wqumz7550ee6kof6om6e5vy2iii_91ejzcvb8h8rihehyz",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000001-0000-0000-0000-000000000000"
-            },
-            "conversation_role": "t7fwbdtuxk3vgdd_x_q5rpdpz6m_iirgo62f151bh1m191gtu6rirc3wrthfjz188k22cip05ds6k15klrl6",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "axoworkfvytprcph0ztay_w55o7ipzy7uj4x52evws9mfw987n30w3",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            "id": "00000001-0000-0001-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "conversation_role": "bhkqaueueah3dgdxrjw8a_mvd2y1jatjhzz5nhx6smsy5dw2a9ru67mqdnx1cbwc8bl5_fupckro1vh5scexr9o1z7pyy4",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000000"
-            },
-            "id": "00000001-0000-0000-0000-000100000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_3.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_3.json
deleted file mode 100644
index 4c811ce4554..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "self": {
-        "hidden_ref": null,
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0000-0000-000100000000",
-            "provider": "00000000-0000-0000-0000-000000000000"
-        },
-        "otr_muted_ref": "M",
-        "conversation_role": "l3e1jootef7",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0001-0000-000000000001",
-        "otr_archived": true,
-        "otr_muted_status": null,
-        "otr_muted": false,
-        "otr_archived_ref": "5"
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000001-0000-0000-0000-000000000000"
-            },
-            "conversation_role": "_iat9eeo3d3hpegxoagnv_edxygxnt22l8x018dcrvdn1yldv",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000000",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "24cmwkzx__1kpkialogtzp4709ii9aa1_j91lxewed0jl15bsoka50u44_m2yp2tn5jcyk353rlj17a4lfs5mu9psf2mrz484mr38t_w4uiemk",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000002-0000-0002-0000-000100000001"
-            },
-            "id": "00000002-0000-0002-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_4.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_4.json
deleted file mode 100644
index 0ab80073e56..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_4.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "",
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0000-0000-000000000001",
-            "provider": "00000000-0000-0000-0000-000000000000"
-        },
-        "otr_muted_ref": null,
-        "conversation_role": "h7lmyguc3tspi_iq2rb96dnujrrnumratq1xtq6aj15x3uzme6jptzvww78_u22iakspdllhuwsap36t4m2j2cui6cjqciv5b_qqfql2r2rrevw9saof6q77d",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0000-0000-000000000000",
-        "otr_archived": true,
-        "otr_muted_status": null,
-        "otr_muted": false,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "8pab2pgrjaf085srseyhvavmz9nveubwyrgh4788ilfb0rj2t3gh9izi6bkk97io06aj0bwv1868hzpufqnf_pdilz4ho",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000001"
-            },
-            "conversation_role": "mhxmfwnaxzygxlgoomh4jg1l2pttlem3seyve7cqheq7n8rtdyv2ovxfi7x84",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000001",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "jx92xe1j6i9wkc9na5um7bca1m94at3gjoc81nn09667vg9xt32zlkldec05cumwltcyxwzj2sj089cdzu0iqso5br2nuk7s67je6xj8i9g8h5tmhzuosqq4wktmmf",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000100000000",
-                "provider": "00000001-0000-0001-0000-000000000000"
-            },
-            "conversation_role": "3lwoqfe65zjajm279ixflg1es4vbo8u004reefel78tgyo231qj968zo9bhr3",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "8178_",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_5.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_5.json
deleted file mode 100644
index f00ee941763..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_5.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "\u0011",
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0001-0000-000100000000",
-            "provider": "00000000-0000-0000-0000-000100000000"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "v1y6zn1esg9ptv72rpu4speujl6uqick58m5bsbuqjdg9xs83ei1hvryvsyhvn7o1zntculg6adry1gvglpe",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0000-0000-000000000000",
-        "otr_archived": false,
-        "otr_muted_status": -1,
-        "otr_muted": true,
-        "otr_archived_ref": "2"
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "j6cd868soxwsiwf4iaynv371tiotfd9kio",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "conversation_role": "h9e303sddeozp391xuq19j0xt6dc26",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0000-0000-000100000001"
-            },
-            "conversation_role": "w0f6se19tlklqr46v0i1c5t5ii4dc123",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "conversation_role": "xew1uato1o",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "conversation_role": "zz07p8aovj0wfrztrwe7b4u02ysxeg72oyfo8dnqzw7odzl7iym1tdsok27d76po1t8b3n9fsin0r8543ruheaoylie99aqjjeiz5ce2wjmdcb4nro2b1pb7p",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_6.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_6.json
deleted file mode 100644
index 70830a8cf17..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_6.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "T",
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0001-0000-000000000000",
-            "provider": "00000001-0000-0001-0000-000100000001"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "tyugtdx7b6_tnvz0btwo03zht0ee07jgmjgn5cbi6vxf8ge3dte6s2_hz0owrju_hx5g14wpkpr_9wdr_lepejkncj",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0000-0000-000000000000",
-        "otr_archived": false,
-        "otr_muted_status": 1,
-        "otr_muted": true,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0001-0000-000000000001"
-            },
-            "conversation_role": "w794tuc4_7uds0z1njq0n64rfwgh1ejkzozuikjk845ybh9r4l3d6y1o_v1qo108ri4yhnbpetkhzy1ie95",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000000"
-            },
-            "conversation_role": "skl0wbt9",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "2u7h4liwioxhdyw2ums20wc4uuu078x416195m0",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0000-0000-000100000001"
-            },
-            "conversation_role": "v7lfuggvm03jjo87bwn1kdwdt86rj7x75gp4t8e8iyii6_rcotf6ojkaczcs93ydllwfn4fybjasv4ediol0auyb7_l2omz74k8iw7lkm4l622v5i2qbqn2e",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0001-0000-000100000001"
-            },
-            "conversation_role": "s53zd8pxzf5jnywo11tcqhus0v86oo93vgffrnfao7zv7ddvutnwzs1sv_zoh1nxeqanlyj29x2crpuhrged_hn40pdiefm",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "conversation_role": "tn14gkbhny6tynh1ijhruy_nsvw17_wnrd19sbcffh9xmkrpilwfc9wnbv",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            "id": "00000000-0000-0001-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000001-0000-0001-0000-000000000000"
-            },
-            "conversation_role": "xlaoiqbhmdxeak4vygfx2yw9y1dwxlv2u3_80yrdtu5i5wtkk1y",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            "id": "00000000-0000-0001-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "conversation_role": "by4w8spnxlbgatis64iz_",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000000-0000-0001-0000-000000000001"
-            },
-            "conversation_role": "20ki2zvvhvpe4jlvdvvbpzxlfx3nije8ionba35ovbcdrte4y7pjws17jz3bhct7dy20x_8k9sxo34smx25",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_7.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_7.json
deleted file mode 100644
index f32c4771a62..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "",
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0000-0000-000100000000",
-            "provider": "00000001-0000-0001-0000-000100000000"
-        },
-        "otr_muted_ref": "\u001e",
-        "conversation_role": "lqx9nuwumdniap26x6xql_bqj63xsg345w41xmlgddcdcalubn3yz8xddzyw7q0447yy5xs9g_s3lyfvq7vbmgl25up11z9yt",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": false,
-        "status_ref": "0.0",
-        "id": "00000001-0000-0000-0000-000100000000",
-        "otr_archived": true,
-        "otr_muted_status": 1,
-        "otr_muted": false,
-        "otr_archived_ref": "퓷"
-    },
-    "others": [
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000000000000",
-                "provider": "00000000-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "gslt5tuoes3wnlf6td917g650hvja7d9lsl7imebq8hy6he50xoz498jxu37m2kdm98egyblf6e9jk8k71gj",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000001",
-                "provider": "00000000-0000-0001-0000-000000000001"
-            },
-            "conversation_role": "vb3ptbhwr5pdikr5avb56bsc2qmlbvmxr_bjry6j1veyz4ppilanfkzq2bv",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_8.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_8.json
deleted file mode 100644
index e65fc9cf2e2..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_8.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "?",
-        "status": 0,
-        "service": {
-            "id": "00000001-0000-0000-0000-000100000001",
-            "provider": "00000000-0000-0000-0000-000100000000"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "4mpg6odm53b6afqtdk1wwr57dsoa1jiwhne",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000000-0000-0000-0000-000100000000",
-        "otr_archived": true,
-        "otr_muted_status": null,
-        "otr_muted": false,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "vcat_x7n_17ig7gxw1mjyk912pjh8furzbhzfxpo0citjipmkf0cy3j9sqekrxcn1su7fs",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000001",
-                "provider": "00000000-0000-0000-0000-000000000000"
-            },
-            "conversation_role": "m_7vhmo6z7kwi0mu1qh9d1o0ztn3t9u1l1gv62bwcbawq89bgy",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0002-0000-000200000001"
-            },
-            "id": "00000000-0000-0002-0000-000200000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvMembers_user_9.json b/libs/wire-api/test/golden/testObject_ConvMembers_user_9.json
deleted file mode 100644
index da306625179..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvMembers_user_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "self": {
-        "hidden_ref": "I",
-        "status": 0,
-        "service": {
-            "id": "00000000-0000-0001-0000-000100000001",
-            "provider": "00000000-0000-0000-0000-000000000000"
-        },
-        "otr_muted_ref": "",
-        "conversation_role": "pi6noe34tsfw6",
-        "status_time": "1970-01-01T00:00:00.000Z",
-        "hidden": true,
-        "status_ref": "0.0",
-        "id": "00000001-0000-0000-0000-000100000000",
-        "otr_archived": true,
-        "otr_muted_status": -1,
-        "otr_muted": false,
-        "otr_archived_ref": ""
-    },
-    "others": [
-        {
-            "status": 0,
-            "conversation_role": "ytko3vik7nviewv_mlrluswwsoxkxdwexmdy1r7yy1l265cdg5nluqedrxby2zma",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000000-0000-0000-0000-000000000001"
-            },
-            "conversation_role": "pwsqgpb966m2o9g9oahmfp83gjb0ll987xdvus_bdxgo3p0gokb6spardga87x__5ueyjpgvy_6lzhimz2_1d967fpvfbs236x6ed777nf0mfuw4j5x4wtk",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000001",
-                "provider": "00000001-0000-0001-0000-000100000000"
-            },
-            "conversation_role": "8mveq505d0ftsgaefuyu",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "status": 0,
-            "conversation_role": "tr_",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_1.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_1.json
index 4461cf2f24d..aa7788d3812 100644
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_1.json
@@ -1,4 +1,4 @@
 {
     "managed": false,
     "teamid": "0000003f-0000-0059-0000-002200000028"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_10.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_10.json
deleted file mode 100644
index 73055ff83a3..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_10.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "00000028-0000-001d-0000-00210000004c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_11.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_11.json
deleted file mode 100644
index 8a2d2b0485e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_11.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "00000066-0000-000f-0000-006500000001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_12.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_12.json
deleted file mode 100644
index daa641f3f2a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_12.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "0000005f-0000-0066-0000-00640000004d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_13.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_13.json
deleted file mode 100644
index f8af39ab704..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_13.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "0000001e-0000-005d-0000-006d0000000a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_14.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_14.json
deleted file mode 100644
index bd559792e6f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_14.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "00000057-0000-001d-0000-003200000055"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_15.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_15.json
deleted file mode 100644
index d6f7c16dc29..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_15.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "00000024-0000-0048-0000-00500000005b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_16.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_16.json
deleted file mode 100644
index d55ea9b4cfe..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_16.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "0000001e-0000-0035-0000-004c00000034"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_17.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_17.json
deleted file mode 100644
index 7de5841367d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_17.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "00000023-0000-007d-0000-00740000005b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_18.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_18.json
deleted file mode 100644
index fd0c97b70b5..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_18.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "00000030-0000-000a-0000-007c0000005e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_19.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_19.json
deleted file mode 100644
index d5ae163af0a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_19.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "00000073-0000-0048-0000-007000000018"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_2.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_2.json
deleted file mode 100644
index f4716b46545..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "0000000c-0000-005d-0000-006000000003"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_20.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_20.json
deleted file mode 100644
index fe359ada8b6..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_20.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "0000002f-0000-004e-0000-00150000007b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_3.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_3.json
deleted file mode 100644
index 53f957a0af8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "00000051-0000-003c-0000-00070000001e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_4.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_4.json
deleted file mode 100644
index 3334b06efe6..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_4.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "00000063-0000-0034-0000-007300000025"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_5.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_5.json
deleted file mode 100644
index cee16d8d6b1..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_5.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "00000009-0000-0043-0000-00690000004c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_6.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_6.json
deleted file mode 100644
index f4d9cdaba67..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_6.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "00000059-0000-005a-0000-00720000005a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_7.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_7.json
deleted file mode 100644
index 4a1bfeaf714..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_7.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "0000000e-0000-0009-0000-007500000036"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_8.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_8.json
deleted file mode 100644
index bacddbba268..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_8.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": false,
-    "teamid": "00000074-0000-0043-0000-006e00000018"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_9.json b/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_9.json
deleted file mode 100644
index 8f8ad142aba..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvTeamInfo_user_9.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "managed": true,
-    "teamid": "00000080-0000-0039-0000-000f00000009"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_1.json b/libs/wire-api/test/golden/testObject_ConvType_user_1.json
index 56a6051ca2b..d00491fd7e5 100644
--- a/libs/wire-api/test/golden/testObject_ConvType_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConvType_user_1.json
@@ -1 +1 @@
-1
\ No newline at end of file
+1
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_10.json b/libs/wire-api/test/golden/testObject_ConvType_user_10.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_11.json b/libs/wire-api/test/golden/testObject_ConvType_user_11.json
deleted file mode 100644
index d8263ee9860..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_12.json b/libs/wire-api/test/golden/testObject_ConvType_user_12.json
deleted file mode 100644
index d8263ee9860..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_13.json b/libs/wire-api/test/golden/testObject_ConvType_user_13.json
deleted file mode 100644
index c227083464f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_14.json b/libs/wire-api/test/golden/testObject_ConvType_user_14.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_15.json b/libs/wire-api/test/golden/testObject_ConvType_user_15.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_16.json b/libs/wire-api/test/golden/testObject_ConvType_user_16.json
deleted file mode 100644
index c227083464f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_17.json b/libs/wire-api/test/golden/testObject_ConvType_user_17.json
deleted file mode 100644
index c227083464f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_18.json b/libs/wire-api/test/golden/testObject_ConvType_user_18.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_19.json b/libs/wire-api/test/golden/testObject_ConvType_user_19.json
deleted file mode 100644
index c227083464f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_2.json b/libs/wire-api/test/golden/testObject_ConvType_user_2.json
index d8263ee9860..0cfbf08886f 100644
--- a/libs/wire-api/test/golden/testObject_ConvType_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConvType_user_2.json
@@ -1 +1 @@
-2
\ No newline at end of file
+2
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_20.json b/libs/wire-api/test/golden/testObject_ConvType_user_20.json
deleted file mode 100644
index c227083464f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_3.json b/libs/wire-api/test/golden/testObject_ConvType_user_3.json
index d8263ee9860..00750edc07d 100644
--- a/libs/wire-api/test/golden/testObject_ConvType_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ConvType_user_3.json
@@ -1 +1 @@
-2
\ No newline at end of file
+3
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_4.json b/libs/wire-api/test/golden/testObject_ConvType_user_4.json
index 56a6051ca2b..573541ac970 100644
--- a/libs/wire-api/test/golden/testObject_ConvType_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ConvType_user_4.json
@@ -1 +1 @@
-1
\ No newline at end of file
+0
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_5.json b/libs/wire-api/test/golden/testObject_ConvType_user_5.json
deleted file mode 100644
index e440e5c8425..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_6.json b/libs/wire-api/test/golden/testObject_ConvType_user_6.json
deleted file mode 100644
index c227083464f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_7.json b/libs/wire-api/test/golden/testObject_ConvType_user_7.json
deleted file mode 100644
index d8263ee9860..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_8.json b/libs/wire-api/test/golden/testObject_ConvType_user_8.json
deleted file mode 100644
index e440e5c8425..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConvType_user_9.json b/libs/wire-api/test/golden/testObject_ConvType_user_9.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConvType_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_1.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_1.json
index 12aa801a05e..5da5d4b0788 100644
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_1.json
@@ -1,4 +1,4 @@
 {
     "access": [],
     "access_role": "non_activated"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_10.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_10.json
deleted file mode 100644
index 27eb44cb809..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_10.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "access": [
-        "link",
-        "private",
-        "code",
-        "invite"
-    ],
-    "access_role": "activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_11.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_11.json
deleted file mode 100644
index 2a61322516f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_11.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "access": [
-        "private"
-    ],
-    "access_role": "activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_12.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_12.json
deleted file mode 100644
index eebd0af5244..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_12.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "access": [
-        "invite",
-        "private"
-    ],
-    "access_role": "activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_13.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_13.json
deleted file mode 100644
index 0a5e91371d3..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_13.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "access": [
-        "invite",
-        "code"
-    ],
-    "access_role": "team"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_14.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_14.json
deleted file mode 100644
index 91b2ffee146..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_14.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "access": [
-        "link",
-        "code",
-        "invite",
-        "link",
-        "code",
-        "code",
-        "code"
-    ],
-    "access_role": "team"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_15.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_15.json
deleted file mode 100644
index 038827d5309..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_15.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "access": [
-        "invite",
-        "code",
-        "code"
-    ],
-    "access_role": "activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_16.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_16.json
deleted file mode 100644
index a747516fb06..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_16.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "access": [
-        "invite",
-        "link",
-        "private",
-        "private",
-        "link",
-        "code",
-        "code",
-        "code"
-    ],
-    "access_role": "activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_17.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_17.json
deleted file mode 100644
index ab9f16b48f6..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_17.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "access": [
-        "private"
-    ],
-    "access_role": "private"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_18.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_18.json
deleted file mode 100644
index e6c5e951343..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_18.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite",
-        "private",
-        "private",
-        "link",
-        "code",
-        "private",
-        "invite"
-    ],
-    "access_role": "non_activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_19.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_19.json
deleted file mode 100644
index d1f1544d106..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_19.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "access": [
-        "link",
-        "code"
-    ],
-    "access_role": "private"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_2.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_2.json
index 9145442885c..2a272fa6748 100644
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_2.json
@@ -3,4 +3,4 @@
         "invite"
     ],
     "access_role": "activated"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_20.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_20.json
deleted file mode 100644
index 12aa801a05e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_20.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "access": [],
-    "access_role": "non_activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_3.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_3.json
deleted file mode 100644
index 12aa801a05e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "access": [],
-    "access_role": "non_activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_4.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_4.json
deleted file mode 100644
index 223414588c2..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_4.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "access": [
-        "link",
-        "invite"
-    ],
-    "access_role": "team"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_5.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_5.json
deleted file mode 100644
index 5ca91242f06..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_5.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "access": [
-        "code",
-        "private",
-        "private",
-        "private",
-        "code",
-        "code",
-        "link"
-    ],
-    "access_role": "non_activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_6.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_6.json
deleted file mode 100644
index a5fbcfeaff7..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_6.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite",
-        "invite"
-    ],
-    "access_role": "team"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_7.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_7.json
deleted file mode 100644
index 961dd62cdea..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_7.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "access": [
-        "link"
-    ],
-    "access_role": "team"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_8.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_8.json
deleted file mode 100644
index e2d10084bfe..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_8.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "access": [
-        "link",
-        "invite"
-    ],
-    "access_role": "activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_9.json b/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_9.json
deleted file mode 100644
index 7d6145b4de0..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationAccessUpdate_user_9.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "access": [
-        "code",
-        "link",
-        "invite",
-        "private",
-        "link",
-        "code",
-        "private",
-        "invite",
-        "code",
-        "invite",
-        "private",
-        "code",
-        "link"
-    ],
-    "access_role": "activated"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_1.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_1.json
index a0255751309..784e20ffcef 100644
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationCode_user_1.json
@@ -1,5 +1,5 @@
 {
-    "uri": "https://example.com",
+    "code": "sEG3Y60tIsd9P3",
     "key": "M0vnbETaqAgL8tv5Z1_x",
-    "code": "sEG3Y60tIsd9P3"
-}
\ No newline at end of file
+    "uri": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_10.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_10.json
deleted file mode 100644
index ab62f2ea97f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_10.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "1zhL_Hp9mlkMM3OW47I8",
-    "code": "2VrAbmBi1"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_11.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_11.json
deleted file mode 100644
index 47a3f5fefa8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_11.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "key": "ReyDOsYF_D5HyDMX81FP",
-    "code": "FRpchhjXoWB2"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_12.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_12.json
deleted file mode 100644
index aca67febf5b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_12.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "u2EODzrdg6Z7aAgci4MV",
-    "code": "kMx3bFGd"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_13.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_13.json
deleted file mode 100644
index ef121fa5ad7..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_13.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "16xoACse_WkiFLw1S6w7",
-    "code": "3acAKsrSdrIHN"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_14.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_14.json
deleted file mode 100644
index a3d449765e1..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_14.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "skREPTCY5lQiIoT5_sCo",
-    "code": "mCwcpFiVwi=1ORILCy5l"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_15.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_15.json
deleted file mode 100644
index b6820ea6fb6..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_15.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "4VKcH84qTo23jJvTUv8O",
-    "code": "wUEY-g7"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_16.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_16.json
deleted file mode 100644
index 6376fc974ae..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_16.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "2zRLkYlMAPXsQKL1CM3e",
-    "code": "XXxpZiqgIwPzcfUBdZh0"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_17.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_17.json
deleted file mode 100644
index d03f5e8b79d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_17.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "KXXYAV8HosezGSSpNhqR",
-    "code": "-aQqXyAyXO21ucrJhBQ"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_18.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_18.json
deleted file mode 100644
index 32e5b4fc324..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_18.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "jwP8Otm06gVqxYkvSEmm",
-    "code": "tSN=4EHIKYVAJz=Ycax"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_19.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_19.json
deleted file mode 100644
index 8952c72811d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_19.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "gk_qLO=OSCUiGqJNRfE3",
-    "code": "FHEnKf"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_2.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_2.json
index 2ac5b486371..84e47ff315f 100644
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationCode_user_2.json
@@ -1,4 +1,4 @@
 {
-    "key": "NEN=eLUWHXclTp=_2Nap",
-    "code": "lLz-9vR8ENum0kI-xWJs"
-}
\ No newline at end of file
+    "code": "lLz-9vR8ENum0kI-xWJs",
+    "key": "NEN=eLUWHXclTp=_2Nap"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_20.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_20.json
deleted file mode 100644
index cb6fad40bd8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_20.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "xCco2bPKwJ6xf0DGH2a7",
-    "code": "3jUkNeT"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_3.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_3.json
deleted file mode 100644
index 416a393af99..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_3.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "0=qjmkA4cwBtH_7sh1xk",
-    "code": "XRuFWme95W-BwO_Ftz"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_4.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_4.json
deleted file mode 100644
index 1553a47a8ae..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_4.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "voBZnPMFx8w7qHTJMP7Y",
-    "code": "fEPoIgD4yWs0mBa-bJ3"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_5.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_5.json
deleted file mode 100644
index 818bd3cf6df..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_5.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "05wvfrdJeHp6rJprZgWB",
-    "code": "3UvuxN9u"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_6.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_6.json
deleted file mode 100644
index 87b9b5b08f0..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_6.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "-luNrgw7W3X0kFR4izG0",
-    "code": "ju-=kF9RH8Jd"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_7.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_7.json
deleted file mode 100644
index 5c7914d4ab5..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_7.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "YUZI4FpWueY0v_l9_JQa",
-    "code": "L7vTY6vgEeYGzTBtcL"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_8.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_8.json
deleted file mode 100644
index 2f22b1a2b28..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_8.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "bY-JjZMrTX8teN75SHjn",
-    "code": "rkSyHahGe=J-lDQ45S"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCode_user_9.json b/libs/wire-api/test/golden/testObject_ConversationCode_user_9.json
deleted file mode 100644
index 165cdeed799..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationCode_user_9.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "uri": "https://example.com",
-    "key": "Keb12zuEIzF7IUsB6SfQ",
-    "code": "-L5q5MU16hmMXL"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationCoverView_1.json b/libs/wire-api/test/golden/testObject_ConversationCoverView_1.json
index 596836f0508..485f5b1ca3c 100644
--- a/libs/wire-api/test/golden/testObject_ConversationCoverView_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationCoverView_1.json
@@ -1,4 +1,4 @@
 {
-    "name": null,
-    "id": "00000018-0000-0020-0000-000e00000002"
-}
\ No newline at end of file
+    "id": "00000018-0000-0020-0000-000e00000002",
+    "name": null
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationCoverView_2.json b/libs/wire-api/test/golden/testObject_ConversationCoverView_2.json
index 7df37f4dcc4..2087db7b13c 100644
--- a/libs/wire-api/test/golden/testObject_ConversationCoverView_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationCoverView_2.json
@@ -1,4 +1,4 @@
 {
-    "name": "conversation name",
-    "id": "00000018-0000-0020-0000-000e00000002"
-}
\ No newline at end of file
+    "id": "00000018-0000-0020-0000-000e00000002",
+    "name": "conversation name"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationCoverView_3.json b/libs/wire-api/test/golden/testObject_ConversationCoverView_3.json
index bf2abe4d0b8..0c280976b14 100644
--- a/libs/wire-api/test/golden/testObject_ConversationCoverView_3.json
+++ b/libs/wire-api/test/golden/testObject_ConversationCoverView_3.json
@@ -1,4 +1,4 @@
 {
-    "name": "",
-    "id": "00000018-0000-0020-0000-000e00000002"
-}
\ No newline at end of file
+    "id": "00000018-0000-0020-0000-000e00000002",
+    "name": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_1.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_1.json
index 63b34b3b629..a13add1af1c 100644
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_1.json
@@ -1,449 +1,40 @@
 {
-    "has_more": false,
     "conversations": [
         {
             "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
             "access_role": "private",
+            "creator": "00000000-0000-0000-0000-000000000001",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "last_event": "0.0",
+            "last_event_time": "1970-01-01T00:00:00.000Z",
             "members": {
+                "others": [],
                 "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
                     "conversation_role": "71xuphsrwfoktrpiv4d08dxj6_1umizg67iisctw87gemvi114mtu",
-                    "status_time": "1970-01-01T00:00:00.000Z",
                     "hidden": false,
-                    "status_ref": "0.0",
+                    "hidden_ref": "",
                     "id": "00000000-0000-0000-0000-000100000000",
                     "otr_archived": true,
-                    "otr_muted_status": 0,
+                    "otr_archived_ref": null,
                     "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000",
-            "type": 0,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4760386328981119,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000000",
-                        "provider": "00000000-0000-0000-0000-000100000001"
-                    },
                     "otr_muted_ref": "",
-                    "conversation_role": "gja5abzmdbher18aju2a5odl4",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000001",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001",
-            "type": 2,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 3500896164423997,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000001",
-                        "provider": "00000000-0000-0000-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "8uujf_ntws83s6ndw2vtmfl_lvtjm8ryz8_s_vb",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000001",
-                    "otr_archived": false,
                     "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001",
-            "type": 0,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000100000000",
-                        "provider": "00000001-0000-0000-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "jyj4ssa0em95hapzqakg8dre3b2n3serk2rxycbu31h4qehsfwkcwsy4nd2cjazw3b2rlnr6xct7_j6h5tj7",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                 "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001",
-            "type": 3,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
                     "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "ezb8hqfaiurv",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001",
-            "type": 3,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4702135969825321,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000001",
-                        "provider": "00000000-0000-0001-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "6ehv3qr8615hrwur4am",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            "id": "00000000-0000-0001-0000-000000000000",
-            "type": 1,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
                     "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "cw7mbuwcp403kkn41os05211qyd4_kwo5yqog8vvqfph3efrsgqli_xzrk52_206s2tk9uyngsz4j03zqzmwihf83qgoxvt9g28kjq7u101r8l",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
                     "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
+                    "status_time": "1970-01-01T00:00:00.000Z"
+                }
             },
+            "message_timer": 4760386328981119,
             "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
             "qualified_id": {
                 "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000",
-            "type": 1,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7888194695541221,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000000000001",
-                        "provider": "00000000-0000-0001-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "rlvq6ir4ydawfd_xbw_g48u0z6nslo74nc05whuh8lirhoo7s6h",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
+                "id": "00000001-0000-0000-0000-000000000000"
             },
-            "id": "00000000-0000-0000-0000-000100000000",
-            "type": 3,
             "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7607042969989865,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000000000001",
-                        "provider": "00000001-0000-0001-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "u59pfu92v2v2bwy79i_t4vzc8n3vgkfu26j15annzdzip7rb0rxqmpbcp514oatnxxzb4neht40vx5fzxp453td4vmyvil_1ivyo1twrw1h34p48w5xtoih7hikle9w",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
             "team": "00000000-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001",
-            "type": 0,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "k0eaeecf",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000000"
-            },
-            "id": "00000001-0000-0000-0000-000100000000",
-            "type": 1,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7007725933930634,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000001",
-                        "provider": "00000000-0000-0001-0000-000000000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "2zndnqqoy09lt9sv0yuiqp9seu0eyzm1rpd_",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            "id": "00000001-0000-0001-0000-000000000001",
-            "type": 1,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 5891726360812026,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000000",
-                        "provider": "00000001-0000-0000-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "ng9mkv_c44e_bf2sx1kc8z6nddk29xpccow72fmcmq4fw9qqkdy38m9bx7_n3qnwwisfjxvzqf56why",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000001-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001",
-            "type": 1,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 8461564964314645,
-            "last_event": "0.0"
+            "type": 0
         }
-    ]
+    ],
+    "has_more": false
 }
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_10.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_10.json
deleted file mode 100644
index 2ececde0816..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_10.json
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000000",
-                        "provider": "00000001-0000-0001-0000-000100000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "_9l9cqokichtgtjnvhtu32ss0ck6y48muyd69oomsb8713p_gost2_9jcg23j6lt5tbuu9qkpsapo2nm_5h4m4t1zenaoe349pzw",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001",
-            "type": 2,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 282891492942411,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000000",
-                        "provider": "00000000-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "9r1618v8rx6b9f",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            "id": "00000000-0000-0000-0000-000100000001",
-            "type": 1,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000000000001",
-                        "provider": "00000000-0000-0000-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "1ieq3sbt572tc4czhsdl1pf6vd3u4tf17z4p1hmu_ovnv8xjir7nczr6tz5u647z70wxwm41xex4it",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000001",
-                    "otr_archived": false,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000",
-            "type": 2,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "71wzrfb9ty0rveunyh_moqu0g0e6ttkahj7mvl_pqwbfc9n8ohxto2wt6xxbfrcoi8kybqv0qgsgtgtimnbfj4r2fpms2eycvxmbt2yzgxa",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001",
-            "type": 2,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 1406036180844894,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "un3yos7xctb371e8fku5qi9yfayz6keo8z38mpjcf96ttqoqrxk40456t1jlnt4iq6uaep5kq4kwn4bu4vg7zxgcbzouvpcipnj33kffl1e8itjt",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001",
-            "type": 2,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_11.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_11.json
deleted file mode 100644
index 6c15bacc254..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_11.json
+++ /dev/null
@@ -1,300 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000001",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "crronx0noee9iatd0gh5r",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            "id": "00000000-0000-0001-0000-000000000000",
-            "type": 2,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 6077261848303961,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000000000000",
-                        "provider": "00000000-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "qa2h42sfabr2se34jysgbor858",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000000"
-            },
-            "id": "00000001-0000-0000-0000-000100000000",
-            "type": 1,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000000",
-                        "provider": "00000001-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "o48adlocil8hrhc2yiydxkrhj9466c139d8jeau2zahe8bkfc2ao_hdowdnhwa82iz8cgdd1ilda7d9aoiuk5sevqk_upk2qq91331mh",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000100000001",
-                    "otr_archived": false,
-                    "otr_muted_status": 1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000001-0000-0000-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000",
-            "type": 3,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4626765468655396,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000000",
-                        "provider": "00000001-0000-0001-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "5kh29zl85ii36dgzj60dmvswzi69ofij0o4d0mvioixrjs5nc5k395ix5gcr7",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000100000001",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000001-0000-0001-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            "id": "00000000-0000-0001-0000-000000000001",
-            "type": 2,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 3172216229144519,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000100000000",
-                        "provider": "00000000-0000-0000-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "q_co4y4_1hpcxpq50pcsrlxauuq25i0efge",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000",
-            "type": 2,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 3354972227724755,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000000",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "i4pr7249xf3ittu5s6r",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000",
-            "type": 0,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "m9qbh7lvffqb7k80cee",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000000"
-            },
-            "id": "00000001-0000-0000-0000-000100000000",
-            "type": 3,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000100000001",
-                        "provider": "00000001-0000-0001-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "pi8v0uezeyjseqsjw6da9h74lbhgp1fc9d_rxk2n82pd5sqam7skankou8vi66kuqavz_11e4lqvw78qxfvfesvav7c",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 1,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000",
-            "type": 0,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4699647814583777,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_12.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_12.json
deleted file mode 100644
index ead3af02e24..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_12.json
+++ /dev/null
@@ -1,233 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000000000000",
-                        "provider": "00000000-0000-0001-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "u14r7cx401i7qyhh9n868itmh316p67992oko18pfjacl8qe66ww9sl62qfohq4eapx7fg4fbonw7mm43naj21csjzos5rvgppli8927a8m38_yh0a5",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001",
-            "type": 3,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 8314115697628639,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000001",
-                        "provider": "00000000-0000-0001-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "u78l36rd2zqd4",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000",
-            "type": 0,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000001",
-                        "provider": "00000000-0000-0001-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "famszv2ugu59f0d53o8i7hjc092bwqe8tccwhvl0aappyemhfs3sbc94wo3_oentu_wqzmn8hmrb",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            "id": "00000000-0000-0000-0000-000100000001",
-            "type": 3,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4496481998290983,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000001",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000100000001",
-                        "provider": "00000001-0000-0001-0000-000100000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "0juii56qpd0864vcj",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": null,
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001",
-            "type": 0,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 6904576004663823,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000001",
-                        "provider": "00000000-0000-0001-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "n5q4dhulov8_ms5zpw5d6fl_x4jilyq1rxawgpomq78zrwslui8s88d50w3eblxom0qb2gujjb8u970o7ah1wc0k300",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000000"
-            },
-            "id": "00000001-0000-0000-0000-000100000000",
-            "type": 1,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 1823461342077434,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000000000001",
-                        "provider": "00000001-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "gxhbc2t7q6rrcftfwmg3jse0gy8fyw0iw84bv58kr76d49o17h8mnggopexntbij12qafzyz1o2ep52cf",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            "id": "00000000-0000-0001-0000-000100000001",
-            "type": 2,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 2685267653752513,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_13.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_13.json
deleted file mode 100644
index c0003ff3b34..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_13.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000001",
-                        "provider": "00000000-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "_l7oykl7ycvdlba5pe73y9epds",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000",
-            "type": 3,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000001",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "_hy7i5xm_11rafcrfebghyi906l330ufunaiyo6k0alofoory6hl7h4xjt75o1_a7pt2xnwcbudqbka4csvzbpbnlllngukfah8bqx7zcoq3",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000",
-            "type": 2,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000000",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000100000000",
-                        "provider": "00000001-0000-0001-0000-000100000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "utby2ypvyrwlys82_edw23ytrpj",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 1,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000001-0000-0001-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000",
-            "type": 0,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000001",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "w4vn9eu815hobipm_n3da9jhd7yb9ny_f47_0zlk8jrluhdvk0y39fvczidx3q848tc3s_o8cfiuon",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000",
-            "type": 2,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 1294477963626888,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_14.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_14.json
deleted file mode 100644
index 8d70e9b7056..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_14.json
+++ /dev/null
@@ -1,341 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000100000000",
-                        "provider": "00000000-0000-0000-0000-000100000001"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "lgd71k4qvxtih",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            "id": "00000000-0000-0001-0000-000000000000",
-            "type": 0,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000100000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "r_gc0fohzp_yawd_k1c4tofh_m0ngos87kgxcacjyde1n1js9knbrq5ytdzns3rtyq9k0yciwn7xagtefk7b",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            "id": "00000000-0000-0000-0000-000100000001",
-            "type": 2,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 2256129941904898,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "ohfwggqn9gstvw220280kws34kjr3fa51mg8babmrist1_tgins9q4iwjz4jwg8hzfa4glbqe9c5df1",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000",
-            "type": 0,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7574050251117485,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000000000001",
-                        "provider": "00000000-0000-0000-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "n743vdsooo4ajvp9t_sok1n9i",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000000"
-            },
-            "id": "00000001-0000-0000-0000-000100000000",
-            "type": 3,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 671261490527917,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000100000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000000",
-                        "provider": "00000001-0000-0001-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "m27atvp24yytpx19vp2_2e83pk27eievke6k7d2v1qgs2rncfdz5spzaq6ngt2hg4kobual7bhb29q1npixng71v05o",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000",
-            "type": 3,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000100000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000100000001",
-                        "provider": "00000000-0000-0000-0000-000100000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "b3e571bd4l2sxhdnm_4r0hpznzish0m0zudnoh",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            "id": "00000000-0000-0001-0000-000000000000",
-            "type": 2,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 1925949395505672,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000000000001",
-                        "provider": "00000001-0000-0001-0000-000100000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "bzkw84_boyuhiqe51_ancwl1bx6c_sl5usf_6xf39dmgvui2uvz87_9xr42_sg8wqokxge_hkmyjo6dhu3des",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000",
-            "type": 2,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4416586316876087,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000001",
-                        "provider": "00000001-0000-0000-0000-000100000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "6l9clln0mj4nu7emkz3ds07iiyduug29o33ecg66g02of2t8xd3llb09vz3d95",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000",
-            "type": 3,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 5544703373031406,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000001",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000100000000",
-                        "provider": "00000000-0000-0001-0000-000100000001"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "tak8j21oh9iuwj1ivx7717hs5iokypsmm_zgfln47wvc4v2pshgl5k3cmsv3_vj8",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000000000001",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000000"
-            },
-            "id": "00000001-0000-0001-0000-000100000000",
-            "type": 1,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7382109943964396,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_15.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_15.json
deleted file mode 100644
index 3baf0c4986b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_15.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [
-                "code",
-                "link",
-                "private",
-                "private",
-                "code"
-            ],
-            "creator": "00000000-0000-0001-0000-000100000000",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "k1lnvywuwtpvcblff04ediu27__le7is9hj1fsp7sx9ba8tjwa0zllzrr21g_9ek9joqzjwyiit7drvnylthvmbyepvs_cua7",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001",
-            "type": 0,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 6813643981796860,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_16.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_16.json
deleted file mode 100644
index a8faa1ab2ea..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_16.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000100000001",
-                        "provider": "00000001-0000-0001-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "5xme3oh72w6fjk_hz6ktni1qol3jdamb704o24oi4z4l09u",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001",
-            "type": 3,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 5060646367946340,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000000",
-                        "provider": "00000000-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "a7gz0gjpe",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000001",
-                    "otr_archived": false,
-                    "otr_muted_status": 1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            "id": "00000000-0000-0001-0000-000000000001",
-            "type": 2,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000001",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000100000001",
-                        "provider": "00000001-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "7sbkqx73wmlxh7jzclg7ugfne6t0oiw",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000000-0000-0001-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            "id": "00000000-0000-0000-0000-000100000001",
-            "type": 0,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000000000001",
-                        "provider": "00000000-0000-0000-0000-000100000001"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "7_j2lhoa8blqpxe6ieoxgj13g44fc3os5c0hzdw0vkicytmm38c1ti44jtwk0awi1p8h3j21ayaoxhgikdf8aqk92sxf",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000",
-            "type": 0,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4425540032419297,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_17.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_17.json
deleted file mode 100644
index 1e5e653304e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_17.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": false,
-    "conversations": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_18.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_18.json
deleted file mode 100644
index 3375a546f0e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_18.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000001",
-                        "provider": "00000001-0000-0000-0000-000100000001"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "o8_",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000001",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001",
-            "type": 3,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 8298377768402548,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "u_xhbk",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001",
-            "type": 0,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "cl5sp8vi0rzm5nzkg3v3518zc5kixfqvc35qi",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000001",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000",
-            "type": 3,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4445775551954449,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000000",
-                        "provider": "00000001-0000-0001-0000-000100000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "_moxeapv0m19z7oqm15_r00uzfaelz3ql_k6j3ceccc0mk8h8icj2m6dkvx0v_d0vltz318",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001",
-            "type": 0,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7034560312247301,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_19.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_19.json
deleted file mode 100644
index fb72ec23d00..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_19.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000000",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000001",
-                        "provider": "00000001-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "39cavf2gxmdivwom4sbqacf5qid3jeh2_yon0puszvkl4e9rof60k4f9t48xqme95zv0zhn4z5m98_x0g9eig6wlj04is6zvwg6byi7z07c6gt9090ny2u3lt",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000001",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001",
-            "type": 3,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000000",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000000",
-                        "provider": "00000001-0000-0001-0000-000000000001"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "5h13g6f13e8vecpsadfwntn970iek5v4zl_421qw1p6_v0dudbh1ac_h70og_d7ed4m_q1trwmk9evrzqeq2s1llbwh7mn6ar_g1mikt6s",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000",
-            "type": 0,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_2.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_2.json
index 30923a68b0e..6a06bb351b5 100644
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_2.json
@@ -1,46 +1,4 @@
 {
-    "has_more": false,
-    "conversations": [
-        {
-            "access": [
-                "code",
-                "private"
-            ],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000100000000",
-                        "provider": "00000001-0000-0001-0000-000000000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "i6wt1ve04kf7cnif2ql0mx26pmv4x7i01nsd53lmxdhzdas11y6kzu3rc32tx2c4krryakjh79zdqg7nhdvpfisfvvip9a7oc8qjvmtqlm8y9t1stodu",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000",
-            "type": 0,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        }
-    ]
+    "conversations": [],
+    "has_more": false
 }
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_20.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_20.json
deleted file mode 100644
index 293f88c7aac..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_20.json
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000001",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "smh85kmu7ryn_0gf0oo5y5xlwpl714k2anilkpdl3lpn_gm3bh4oe4uk_y2sfizmh6odeuyw4odrvlwq0rc8lvsrtv31uqtvdpuadokpzfz8ho53c4kb1ify606d6ou",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000000000001",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000001"
-            },
-            "id": "00000001-0000-0000-0000-000000000001",
-            "type": 2,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7973507983724794,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000000000000",
-                        "provider": "00000001-0000-0001-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "g286jwpeoptn5z1yaxa_zij_buu4fch4plgoz6v59ai1zu_rxc__0le2zxamri3jsgq0tiiwxcb29gkmds2q2zl_pc37w9ikexf2s44ynyzs",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000001",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            "id": "00000001-0000-0001-0000-000000000000",
-            "type": 2,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 713209987069426,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000001",
-                        "provider": "00000001-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "lvva20nz949u9uoh6d653ukgy_qtpugz40j6122",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000",
-            "type": 2,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 5611100743084448,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "nm0c0tgty7ycwx2sazcmpcubcf_oh6iqufse0ml5u7cl3xxbjzyir8li6iew8t3agg5isko50ha58m9lv5vj933vwrxvpsv",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            "id": "00000000-0000-0001-0000-000000000001",
-            "type": 3,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 3460496531316381,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "nk8qm1m6euslkb4j1x0cs18mfffhmtv9sg7eyudgbd3b2ysqnlr1jkted9s7fhd8v93irig2pk_v4p12_lwu52ml3r2a1eb1gxqrakupmrdp_wm",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000001",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000",
-            "type": 2,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 2052301235302529,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "ahcbvp03bcrsmxc1rmnripjsaxw99dpw",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000001-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001",
-            "type": 1,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7068596443593491,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_3.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_3.json
deleted file mode 100644
index ac0b5b0ff2e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_3.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000000",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000000",
-                        "provider": "00000001-0000-0000-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "knvo5u3vhp8392gdab",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001",
-            "type": 2,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_4.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_4.json
deleted file mode 100644
index cde2750c679..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_4.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": true,
-    "conversations": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_5.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_5.json
deleted file mode 100644
index 655c932ac4d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_5.json
+++ /dev/null
@@ -1,481 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "2qzgr5wkn_ldz36qss3cwuwi7oqf_tqnoyvdpa3_g78ci97jnd6vdac5jh9i3narrk6xdxk9g1wntubp",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000",
-            "type": 0,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 1119369570957591,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000001",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000001",
-                        "provider": "00000000-0000-0000-0000-000100000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "awjusc8ycco4z4tulpb22yvxi8bhj2v5r566om",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000001-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            "id": "00000001-0000-0001-0000-000000000001",
-            "type": 0,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000100000001",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0000-0000-000000000001",
-                        "provider": "00000001-0000-0000-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "38lml9xkjpmsj719ju264ji_4zj8fn6jllcacwuvbc2jtazsm8",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000001",
-                    "otr_archived": false,
-                    "otr_muted_status": 0,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            "id": "00000000-0000-0000-0000-000100000000",
-            "type": 0,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 5569638481918792,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000100000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "14077ahakaln46bwhorrw07_o_y0ja14nz6ev2e7kja9y2q2p8bgj8pzep3ayn6c2o6ksxqoc4e45l4ilwof9hh_l5vzxr6",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            "id": "00000000-0000-0001-0000-000000000001",
-            "type": 1,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 308227151936615,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000001",
-                        "provider": "00000000-0000-0001-0000-000100000001"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "b6j6ik3lxqm6f7i3o5m4xaw78ca2q10jv0ein_ky4sbdl20gsdxq5c7c3d0wbarn8o3rmpjtu8qktjszo63jcdzq",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000001"
-            },
-            "id": "00000000-0000-0000-0000-000000000001",
-            "type": 3,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 7093551156016339,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000000000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000100000000",
-                        "provider": "00000000-0000-0000-0000-000000000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "n6fl88imnu_da5t7w7s7",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000001-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000",
-            "type": 2,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4373112121894721,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000000000001",
-            "access_role": "non_activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000100000000",
-                        "provider": "00000000-0000-0001-0000-000000000001"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "xu0i3ibm5xk_4s3yo8j253zcx0r9fkzs4u4ft5m3idjbky2d_jk_orairyygciww9buthauyexxj7ii7p_a172r42n5wa3x7ji0",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000000000001",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            "id": "00000001-0000-0000-0000-000100000001",
-            "type": 1,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000001",
-                        "provider": "00000001-0000-0000-0000-000000000001"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "rwdp",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0000-0000-000100000001",
-                    "otr_archived": true,
-                    "otr_muted_status": -1,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            "id": "00000000-0000-0001-0000-000100000000",
-            "type": 3,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 8777284529043899,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": null,
-                    "conversation_role": "abxvawljqg8hsondqgphn8akwbj2rkzfrx0hsuvjjvfp8exd5w_g0aeuhats9633jc5h_byziq7ereq6wzzcvio3c6gd16fs4",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000001",
-                    "otr_archived": true,
-                    "otr_muted_status": 0,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001",
-            "type": 2,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4697061064867958,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0000-0000-000100000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "zvu0tvsjfpn3v9wzlxbjry6gebhfe826b4ywxdr6vxt4przgzxvbg7e803xjorr6hyk8pnq__gac8nwpme",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            "id": "00000001-0000-0001-0000-000100000001",
-            "type": 1,
-            "receipt_mode": 0,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 4941125897110968,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000000",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000000",
-                        "provider": "00000000-0000-0001-0000-000000000000"
-                    },
-                    "otr_muted_ref": "",
-                    "conversation_role": "ll0_fnj8kds0ciu4gxcaaiwfwj26g896vhudwgdrj_v7pzs50_cs1nil5fbsa57qvf3qljeb3vldv10kdvx69wf",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000000000000",
-                    "otr_archived": true,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": null
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            "id": "00000001-0000-0001-0000-000000000001",
-            "type": 3,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 312342954800141,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000000-0000-0001-0000-000000000001",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "yzw8646ov72hhh_w2bhbz56wigwvli06mnli8dxegyl79zko8j0y0g2fvqtd_zq__zzzl8i6s3zy6lk80js_7z9k35u6xceo6_btyebbpgw4ivi301j9fsxq",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": -1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000000-0000-0000-0000-000100000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            "id": "00000001-0000-0000-0000-000000000000",
-            "type": 3,
-            "receipt_mode": null,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 8527199323798608,
-            "last_event": "0.0"
-        },
-        {
-            "access": [],
-            "creator": "00000001-0000-0001-0000-000100000001",
-            "access_role": "private",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "m8_lmrnkmpccq3xliv3mjvdbrqcaxjteav21_01txrkzue3dxkhsutmcjfd2mylai2t4",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": false,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": null,
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            "id": "00000000-0000-0001-0000-000000000001",
-            "type": 1,
-            "receipt_mode": 1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 829895852395824,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_6.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_6.json
deleted file mode 100644
index cde2750c679..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_6.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": true,
-    "conversations": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_7.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_7.json
deleted file mode 100644
index 9be98aba344..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_7.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        {
-            "access": [],
-            "creator": "00000000-0000-0000-0000-000000000001",
-            "access_role": "activated",
-            "members": {
-                "self": {
-                    "hidden_ref": null,
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000100000000",
-                        "provider": "00000000-0000-0001-0000-000100000000"
-                    },
-                    "otr_muted_ref": null,
-                    "conversation_role": "dv1d_nl54nkabi7vrfixhxo8fzyrt2ji0kp0668koza673_1__wmna4t2hl8twtatz9tjqnu",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": false,
-                    "status_ref": "0.0",
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "otr_archived": false,
-                    "otr_muted_status": null,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            "id": "00000000-0000-0000-0000-000000000000",
-            "type": 0,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": 1559334665101385,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_8.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_8.json
deleted file mode 100644
index a0f9869637d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_8.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        {
-            "access": [
-                "private"
-            ],
-            "creator": "00000001-0000-0001-0000-000100000000",
-            "access_role": "team",
-            "members": {
-                "self": {
-                    "hidden_ref": "",
-                    "status": 0,
-                    "service": null,
-                    "otr_muted_ref": "",
-                    "conversation_role": "kklpzjg",
-                    "status_time": "1970-01-01T00:00:00.000Z",
-                    "hidden": true,
-                    "status_ref": "0.0",
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "otr_archived": false,
-                    "otr_muted_status": 1,
-                    "otr_muted": true,
-                    "otr_archived_ref": ""
-                },
-                "others": []
-            },
-            "name": null,
-            "team": "00000001-0000-0000-0000-000000000001",
-            "qualified_id": {
-                "domain": "golden.example.com",
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            "id": "00000001-0000-0001-0000-000000000001",
-            "type": 3,
-            "receipt_mode": -1,
-            "last_event_time": "1970-01-01T00:00:00.000Z",
-            "message_timer": null,
-            "last_event": "0.0"
-        }
-    ]
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_9.json b/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_9.json
deleted file mode 100644
index cde2750c679..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20Conversation_user_9.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": true,
-    "conversations": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_1.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_1.json
index 051cbb90680..2d83352e799 100644
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_1.json
@@ -1,6 +1,6 @@
 {
-    "has_more": false,
     "conversations": [
         "0000002e-0000-002d-0000-00410000001e"
-    ]
-}
\ No newline at end of file
+    ],
+    "has_more": false
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_10.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_10.json
deleted file mode 100644
index 61e903e23ec..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_10.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        "00000001-0000-0000-0000-000100000001",
-        "00000001-0000-0001-0000-000100000001",
-        "00000000-0000-0001-0000-000000000001",
-        "00000001-0000-0001-0000-000000000000",
-        "00000001-0000-0001-0000-000000000000",
-        "00000001-0000-0000-0000-000100000001",
-        "00000001-0000-0001-0000-000100000000",
-        "00000001-0000-0000-0000-000100000000"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_11.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_11.json
deleted file mode 100644
index 8ab002af86e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_11.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "00000002-0000-0000-0000-000100000001",
-        "00000002-0000-0001-0000-000400000003",
-        "00000001-0000-0000-0000-000200000000"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_12.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_12.json
deleted file mode 100644
index 1a505b47993..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_12.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "00000002-0000-0001-0000-000100000002",
-        "00000000-0000-0001-0000-000100000000",
-        "00000002-0000-0002-0000-000000000002",
-        "00000000-0000-0002-0000-000200000000",
-        "00000001-0000-0000-0000-000100000001"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_13.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_13.json
deleted file mode 100644
index 1e5e653304e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_13.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": false,
-    "conversations": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_14.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_14.json
deleted file mode 100644
index 695fa3198e9..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_14.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        "00000000-0000-0000-0000-000000000000",
-        "00000001-0000-0000-0000-000100000001",
-        "00000001-0000-0001-0000-000000000001",
-        "00000000-0000-0001-0000-000100000001",
-        "00000000-0000-0001-0000-000000000000",
-        "00000000-0000-0001-0000-000000000001",
-        "00000001-0000-0000-0000-000000000001",
-        "00000001-0000-0000-0000-000100000001",
-        "00000001-0000-0000-0000-000100000000",
-        "00000000-0000-0000-0000-000000000001",
-        "00000001-0000-0001-0000-000100000001"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_15.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_15.json
deleted file mode 100644
index cde2750c679..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_15.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": true,
-    "conversations": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_16.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_16.json
deleted file mode 100644
index 111d1200138..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_16.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0000-0000-000100000001",
-        "00000001-0000-0000-0000-000100000000",
-        "00000000-0000-0001-0000-000000000001",
-        "00000000-0000-0000-0000-000000000000",
-        "00000000-0000-0001-0000-000100000000",
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0000-0000-000000000001",
-        "00000000-0000-0001-0000-000100000000"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_17.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_17.json
deleted file mode 100644
index 1d9b0753f09..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_17.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "0000006d-0000-0005-0000-00150000005f"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_18.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_18.json
deleted file mode 100644
index dc593ac2b5c..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_18.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        "00000000-0000-0001-0000-000100000001",
-        "00000000-0000-0000-0000-000000000000",
-        "00000000-0000-0001-0000-000000000001",
-        "00000001-0000-0001-0000-000100000001",
-        "00000001-0000-0001-0000-000100000000",
-        "00000000-0000-0001-0000-000000000000",
-        "00000000-0000-0000-0000-000100000000",
-        "00000000-0000-0000-0000-000000000000",
-        "00000000-0000-0000-0000-000000000001"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_19.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_19.json
deleted file mode 100644
index 65de8d8727a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_19.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "0000003a-0000-002f-0000-00300000001b"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_2.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_2.json
index cd2780812d4..6a06bb351b5 100644
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_2.json
@@ -1,7 +1,4 @@
 {
-    "has_more": false,
-    "conversations": [
-        "00000000-0000-0004-0000-000700000004",
-        "00000000-0000-0006-0000-000600000001"
-    ]
-}
\ No newline at end of file
+    "conversations": [],
+    "has_more": false
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_20.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_20.json
deleted file mode 100644
index 9c75d57cdad..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_20.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "00000000-0000-0000-0000-000200000000",
-        "00000001-0000-0002-0000-000100000002",
-        "00000002-0000-0001-0000-000100000002",
-        "00000001-0000-0000-0000-000000000001"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_3.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_3.json
deleted file mode 100644
index 60b89421b95..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_3.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "00000000-0000-0001-0000-000100000001",
-        "00000001-0000-0000-0000-000100000000",
-        "00000001-0000-0000-0000-000000000001",
-        "00000000-0000-0001-0000-000100000000",
-        "00000000-0000-0001-0000-000000000000",
-        "00000001-0000-0001-0000-000100000000",
-        "00000001-0000-0001-0000-000000000001",
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0000-0000-000000000000"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_4.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_4.json
deleted file mode 100644
index 32dd00afff2..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_4.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        "00000001-0000-0002-0000-000200000000",
-        "00000001-0000-0002-0000-000100000002",
-        "00000000-0000-0002-0000-000100000000",
-        "00000002-0000-0000-0000-000200000001",
-        "00000000-0000-0001-0000-000200000002",
-        "00000000-0000-0001-0000-000200000000",
-        "00000000-0000-0002-0000-000000000001"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_5.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_5.json
deleted file mode 100644
index 4e9167454f0..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_5.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        "00000000-0000-0001-0000-000200000000",
-        "00000000-0000-0002-0000-000200000002",
-        "00000001-0000-0002-0000-000200000001",
-        "00000000-0000-0000-0000-000200000001"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_6.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_6.json
deleted file mode 100644
index cde2750c679..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_6.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": true,
-    "conversations": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_7.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_7.json
deleted file mode 100644
index 88452697790..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_7.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "00000003-0000-0024-0000-005000000011"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_8.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_8.json
deleted file mode 100644
index c321ac143e9..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_8.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "has_more": true,
-    "conversations": [
-        "00000056-0000-0072-0000-00160000007a"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_9.json b/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_9.json
deleted file mode 100644
index dcafaa841ff..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationList_20_28Id_20_2a_20C_29_user_9.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "has_more": false,
-    "conversations": [
-        "00000002-0000-0000-0000-000100000000",
-        "00000002-0000-0001-0000-000100000000",
-        "00000002-0000-0002-0000-000000000001",
-        "00000000-0000-0002-0000-000100000001",
-        "00000001-0000-0001-0000-000000000001",
-        "00000002-0000-0002-0000-000100000000",
-        "00000001-0000-0000-0000-000100000002"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_1.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_1.json
index 4ee53d0065a..24fe9783c2d 100644
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "message_timer": 826296577605189
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_10.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_10.json
deleted file mode 100644
index 9d8f77b16a4..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_10.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 3813387496832226
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_11.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_11.json
deleted file mode 100644
index 27040bd67dc..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_11.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 6759007605839267
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_12.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_12.json
deleted file mode 100644
index b6bb303a507..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_12.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 3236786237768237
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_13.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_13.json
deleted file mode 100644
index 45a464dc592..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 365752479822859
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_14.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_14.json
deleted file mode 100644
index fab7b5a395f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_14.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 3294372135518732
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_15.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_15.json
deleted file mode 100644
index 14202a2604e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_15.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_16.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_16.json
deleted file mode 100644
index 14202a2604e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_16.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_17.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_17.json
deleted file mode 100644
index 52d8c0defd7..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 1100608128235247
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_18.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_18.json
deleted file mode 100644
index 14202a2604e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_18.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_19.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_19.json
deleted file mode 100644
index 14202a2604e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_2.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_2.json
index c7d441a7df9..a0d8d48a416 100644
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_2.json
@@ -1,3 +1,3 @@
 {
-    "message_timer": 5800340606245917
-}
\ No newline at end of file
+    "message_timer": null
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_20.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_20.json
deleted file mode 100644
index 0d1e62f92f8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_20.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 4970702216850713
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_3.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_3.json
deleted file mode 100644
index e8039d5b6ae..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_3.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 7882681684697857
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_4.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_4.json
deleted file mode 100644
index 14202a2604e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_5.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_5.json
deleted file mode 100644
index a754d4a8181..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 717333267646117
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_6.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_6.json
deleted file mode 100644
index f037c14abd5..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_6.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 8986531660044029
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_7.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_7.json
deleted file mode 100644
index 69ffd4bb034..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_7.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": 2024121451468806
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_8.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_8.json
deleted file mode 100644
index 14202a2604e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_8.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_9.json b/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_9.json
deleted file mode 100644
index 14202a2604e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationMessageTimerUpdate_user_9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "message_timer": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationPagingState_1.json b/libs/wire-api/test/golden/testObject_ConversationPagingState_1.json
index 12ccb495bea..719ff799745 100644
--- a/libs/wire-api/test/golden/testObject_ConversationPagingState_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationPagingState_1.json
@@ -1 +1 @@
-"AA=="
\ No newline at end of file
+"AA=="
diff --git a/libs/wire-api/test/golden/testObject_ConversationPagingState_2.json b/libs/wire-api/test/golden/testObject_ConversationPagingState_2.json
index 400bef583ca..e408b286515 100644
--- a/libs/wire-api/test/golden/testObject_ConversationPagingState_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationPagingState_2.json
@@ -1 +1 @@
-"AAABWGN9WA=="
\ No newline at end of file
+"AAABWGN9WA=="
diff --git a/libs/wire-api/test/golden/testObject_ConversationPagingState_3.json b/libs/wire-api/test/golden/testObject_ConversationPagingState_3.json
index 3ca82884d86..57dc64dcb97 100644
--- a/libs/wire-api/test/golden/testObject_ConversationPagingState_3.json
+++ b/libs/wire-api/test/golden/testObject_ConversationPagingState_3.json
@@ -1 +1 @@
-"AQ=="
\ No newline at end of file
+"AQ=="
diff --git a/libs/wire-api/test/golden/testObject_ConversationPagingState_4.json b/libs/wire-api/test/golden/testObject_ConversationPagingState_4.json
index f04aaae71e3..330b0f2b37c 100644
--- a/libs/wire-api/test/golden/testObject_ConversationPagingState_4.json
+++ b/libs/wire-api/test/golden/testObject_ConversationPagingState_4.json
@@ -1 +1 @@
-"AVgMFw=="
\ No newline at end of file
+"AVgMFw=="
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_1.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_1.json
index 21865e11845..05055058387 100644
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "receipt_mode": -6145
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_10.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_10.json
deleted file mode 100644
index 7a1ec10d798..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_10.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 1083
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_11.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_11.json
deleted file mode 100644
index ba1011332a6..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_11.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": -8195
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_12.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_12.json
deleted file mode 100644
index 46073913d35..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_12.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 4632
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_13.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_13.json
deleted file mode 100644
index 543871c17a1..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": -14797
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_14.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_14.json
deleted file mode 100644
index fe3290b9aa9..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_14.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 6949
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_15.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_15.json
deleted file mode 100644
index 2726ef7cef9..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_15.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 6004
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_16.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_16.json
deleted file mode 100644
index 5243da29287..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_16.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 11751
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_17.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_17.json
deleted file mode 100644
index 93c473bd538..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 523
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_18.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_18.json
deleted file mode 100644
index b3eda8b6663..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_18.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 7756
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_19.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_19.json
deleted file mode 100644
index f5c470839de..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 3357
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_2.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_2.json
deleted file mode 100644
index b2de459762e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": -5552
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_20.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_20.json
deleted file mode 100644
index 3a9050a5cbd..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_20.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 4465
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_3.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_3.json
deleted file mode 100644
index b05dfb63064..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_3.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 11916
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_4.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_4.json
deleted file mode 100644
index 3c8cc5ba368..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 12045
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_5.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_5.json
deleted file mode 100644
index e1b2f048a1a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": -12284
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_6.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_6.json
deleted file mode 100644
index fc78a345589..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_6.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": -14518
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_7.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_7.json
deleted file mode 100644
index 207837c828f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_7.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": 1851
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_8.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_8.json
deleted file mode 100644
index 3def240d9cc..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_8.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": -12424
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_9.json b/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_9.json
deleted file mode 100644
index 87e52ffaa84..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationReceiptModeUpdate_user_9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "receipt_mode": -1022
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_1.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_1.json
index 4509ba41e7c..c9331d93af4 100644
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationRename_user_1.json
@@ -1,3 +1,3 @@
 {
     "name": "𧆧.󼙋)𥬯Fw령ucnv\u0010?w+𖥯K􋇧`4󸪚9􄔗\n\u0019>"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_10.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_10.json
deleted file mode 100644
index bc3f9bdb54c..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_10.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "\u001a3\u0016󶎗rv\u001ai􉌠9􁷸hC>/$ \u001e\u0014𩎪\u000fq\u0016"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_11.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_11.json
deleted file mode 100644
index eab469b9c8f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_11.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "𦝊𭕂\u0001\u0011(𤵏"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_12.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_12.json
deleted file mode 100644
index a94cf4e9569..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_12.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "󺬙[\u001eo󺥧\u001djLS눼\"\u000b(iU\u0010W\u00116穑󻡉[5􌪅i9\u0007(0"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_13.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_13.json
deleted file mode 100644
index 4cc088488f7..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "\u0004\u001cx\u0019\rNX\u0012<\u0015􆱞\u0010$c9"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_14.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_14.json
deleted file mode 100644
index f57106413f7..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_14.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "\u0012N,ᮈ􆯕w𮏺\u0018&\u0005􁴤\u000b󿭼􎴯3𛃤"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_15.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_15.json
deleted file mode 100644
index f8905d6db1d..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_15.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "<E0\u001bVm\u00187󳾓𦒵{.\r𫋅#n 𤫏34: 󾚓◪"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_16.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_16.json
deleted file mode 100644
index 3e9b50f1b20..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_16.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "Z\u0019\u00190󼟦\u001c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_17.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_17.json
deleted file mode 100644
index a5978112197..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "\u000eM_|#\u0008O"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_18.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_18.json
deleted file mode 100644
index 2d25e714475..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_18.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "B#󴁌!𬅝-bH0 '󾎥􃣢\u0003\u0003􉒪Xi#9?^"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_19.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_19.json
deleted file mode 100644
index 2085dc658fb..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "mgq\u001b\u0011*x≉Y%\u0007n𧑙^W\u0005\"\u0004\u0006dk\u0004K\u001a4&S"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_2.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_2.json
deleted file mode 100644
index 831a6773b10..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "JWR甪 !\u0019TZ"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_20.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_20.json
deleted file mode 100644
index a680debc0e0..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_20.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "\u001d9𧔁9󽪆M\u0001􋋬\u0018D&5􅙃𩘾\u000bOF"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_3.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_3.json
deleted file mode 100644
index 17496518f20..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_3.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "{fF\t;\u0014\u0002wE\u0007쑏"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_4.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_4.json
deleted file mode 100644
index 3f203d0b372..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "E>\u001f𡁎󲔥|X\u0014A𤲫^󹯗SWSJUK"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_5.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_5.json
deleted file mode 100644
index 906352a59d8..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "hu\u001az톿\u001b\u001d𣄝;𭘶󱰙3􏂂\u001e3{\u0017CPk𐘣|\u0004`慀"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_6.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_6.json
deleted file mode 100644
index 11d0843734e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_6.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "抆"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_7.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_7.json
deleted file mode 100644
index 215e7560839..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_7.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "DA]𝆄􊽑zQ屜b%{$\u000fp\u0019ue\u000bVtFzb"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_8.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_8.json
deleted file mode 100644
index 23499e13957..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_8.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "\u0012\u000e7o\u0007\u0017\u0011\u000e/\u0016\u000e\nn6󰫲y臛0\u0002<𠱰|Vn\u001d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRename_user_9.json b/libs/wire-api/test/golden/testObject_ConversationRename_user_9.json
deleted file mode 100644
index 8bc6f6e5374..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRename_user_9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "I*<\u0003d􄢶4U㢝w󰘙"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_1.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_1.json
index 6180ec6b339..62fade17577 100644
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationRole_user_1.json
@@ -11,4 +11,4 @@
         "delete_conversation"
     ],
     "conversation_role": "wire_admin"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_10.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_10.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_10.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_11.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_11.json
deleted file mode 100644
index 32bb374678e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_11.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_receipt_mode",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "4yqqhwyg4cxggtjhjb55f32pn8h9p71tbzxymmlw8hlmz3f79zoai6bw75wy0433ut7is1m2hgs17vokq_hk9udz2jua_leu_l21oqeffcoy"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_12.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_12.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_12.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_13.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_13.json
deleted file mode 100644
index e0ecc799953..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_13.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "actions": [
-        "leave_conversation"
-    ],
-    "conversation_role": "wire_member"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_14.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_14.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_14.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_15.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_15.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_15.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_16.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_16.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_16.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_17.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_17.json
deleted file mode 100644
index e0ecc799953..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_17.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "actions": [
-        "leave_conversation"
-    ],
-    "conversation_role": "wire_member"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_18.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_18.json
deleted file mode 100644
index e0ecc799953..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_18.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "actions": [
-        "leave_conversation"
-    ],
-    "conversation_role": "wire_member"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_19.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_19.json
deleted file mode 100644
index 474daffc235..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_19.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "modify_conversation_access"
-    ],
-    "conversation_role": "idsg79l46dbcc6qqm12fucmnni7fe4xf6x_rnushx6gojdlgu5"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_2.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_2.json
index e0ecc799953..f65ab5e08ba 100644
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationRole_user_2.json
@@ -3,4 +3,4 @@
         "leave_conversation"
     ],
     "conversation_role": "wire_member"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_20.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_20.json
deleted file mode 100644
index e0ecc799953..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_20.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "actions": [
-        "leave_conversation"
-    ],
-    "conversation_role": "wire_member"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_3.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_3.json
index e0ecc799953..7ed3293d20e 100644
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ConversationRole_user_3.json
@@ -1,6 +1,7 @@
 {
     "actions": [
-        "leave_conversation"
+        "modify_conversation_message_timer",
+        "modify_conversation_access"
     ],
-    "conversation_role": "wire_member"
-}
\ No newline at end of file
+    "conversation_role": "32s49begziet8bw2zajkjk5flc26_pl8lnx5vs"
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_4.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_4.json
deleted file mode 100644
index 416ff4940c4..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_4.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "actions": [
-        "modify_conversation_message_timer",
-        "modify_conversation_access"
-    ],
-    "conversation_role": "32s49begziet8bw2zajkjk5flc26_pl8lnx5vs"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_5.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_5.json
deleted file mode 100644
index e0ecc799953..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "actions": [
-        "leave_conversation"
-    ],
-    "conversation_role": "wire_member"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_6.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_6.json
deleted file mode 100644
index 5b2dc5c5c1e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_6.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "delete_conversation"
-    ],
-    "conversation_role": "xtbwm41ey1yulpxoqnzn2lzfc6bmdy2k1pc1wglp51t4_kaj2nxqh9pwj8umsta3tvdh7fne2gdwvnntrbchkgw31f12q9sg46r9qh1qvu8"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_7.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_7.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_7.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_8.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_8.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_8.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRole_user_9.json b/libs/wire-api/test/golden/testObject_ConversationRole_user_9.json
deleted file mode 100644
index 6180ec6b339..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRole_user_9.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "actions": [
-        "add_conversation_member",
-        "remove_conversation_member",
-        "modify_conversation_name",
-        "modify_conversation_message_timer",
-        "modify_conversation_receipt_mode",
-        "modify_conversation_access",
-        "modify_other_conversation_member",
-        "leave_conversation",
-        "delete_conversation"
-    ],
-    "conversation_role": "wire_admin"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_1.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_1.json
index 77b39ef41a5..d0dfaf3cc1f 100644
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_1.json
@@ -6,19 +6,6 @@
                 "modify_other_conversation_member"
             ],
             "conversation_role": "0g843hmarr"
-        },
-        {
-            "actions": [
-                "remove_conversation_member",
-                "modify_other_conversation_member"
-            ],
-            "conversation_role": "8t_l205nb44v3byrnei9os7rah6d23arw3z"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_10.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_10.json
deleted file mode 100644
index 6f06908a1e6..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_10.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "hryh5cdsxc6mgbwf_q6"
-        },
-        {
-            "actions": [],
-            "conversation_role": "rg7zsbeqar03dc8tm0cpbbarywzgx7zfwx0dxixp52mui8m88wf0okpeq8e5g0szljl1ycz3a_9f_wizfvmzpuz05_e7ooxnzetu3u0j0td3ut9fslvprt"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "308ppv2ivrzqmc2xu9_uj3rs4f3qmzyc"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "__vsppi2uimni18xnaeuxzv5j0x56w2oma53ln3ib14l1p56b_0rnwklk8ogkc2u3zuw1ypz4uty1epak92byhp42rq_a3"
-        },
-        {
-            "actions": [
-                "delete_conversation"
-            ],
-            "conversation_role": "k3z3lop8j_k"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_11.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_11.json
deleted file mode 100644
index 8f12af5ea91..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_11.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "bnsi81m0tcsgtrah39sunugjnf5cv4qe9cy2_4084vghyzey6giq6ttpkqms2je"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_12.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_12.json
deleted file mode 100644
index 3562505aa9b..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_12.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member"
-            ],
-            "conversation_role": "b04tpm3tvoex80nz98e90lefymeti4w7sp1a4uwcvgm381j16byr2nessks63v0dtru96ckva6cnbh0"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_13.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_13.json
deleted file mode 100644
index c87b5c51684..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_13.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "123mi1cdo99vdqdnp_ol1pg2h24bf__5_"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "10u348q"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "omk31lw6wrxlnicz79hznnlx5eozskm3r3w3jhzipw2pdg3b09h5zglxifmqti2zjlqnm_hmr6g8op5vpn7lg4_h2tnrenrmgbtan5nqinchf1"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "qdk4sqhbn9mku06gey_k0sm3ek3m8yt6wxb8shgph1m0ks00"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_14.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_14.json
deleted file mode 100644
index d311eca9114..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_14.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "h7b57x14ns6437z_mesx0j57zpsixjpd3wl0vpgo3ew2gytiyymsoj5hewbfhb_2dl1eswjbj88k_ww_zigj"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "djhu4mvus"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_15.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_15.json
deleted file mode 100644
index 3d518550bae..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_15.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [],
-            "conversation_role": "bxb790gxo1o8dh99kofgn0m463fg_nupp5_rmlzn_ikitu8un98x3teiybvx7srcqejb2dx"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "modify_other_conversation_member"
-            ],
-            "conversation_role": "vtkdq7dc620aog28hmkxr7j8n2_3xib0dxpgv28d8ypqn_nf61utf69v9t2dy6kepnd_1"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_16.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_16.json
deleted file mode 100644
index 1f35ee5c4d9..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_16.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "jcqbg6ctrw91f_rayto59n4i786tg3n8acm4nf28qggd1zuxo4jgf5b59er3eard_pg1xogrdmizf1rgc3ksqo12qkhcaia2on6"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "6am2fi2abl47qpqi6yjozqqc1szr1oxovggb_nhmjg2vpjablbiwia_b77azg7pqyk1v7691wspxv"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "modify_conversation_message_timer"
-            ],
-            "conversation_role": "nuyqeanpyt42ye0u5_on94mdkt3j4gljn"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "modify_conversation_receipt_mode"
-            ],
-            "conversation_role": "fqqq98mmj2z_7_6dxfajrl4ml6hvmqxn57z9wfmwahaxd9kvdebv6hughxqzxn5w8jdogq3hbxn8qoq7w2ev6lwo6zvq15"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_17.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_17.json
deleted file mode 100644
index 45ef5461493..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_roles": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_18.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_18.json
deleted file mode 100644
index e25be5c787f..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_18.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [],
-            "conversation_role": "s2cl6cisn_jaw94"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "modify_conversation_name"
-            ],
-            "conversation_role": "5st295e8exhw_ozq5_fbzyztszh1thu16g3rwx4but8f3m"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_19.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_19.json
deleted file mode 100644
index 45ef5461493..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_roles": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_2.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_2.json
index 0a37ae3c8f3..dc6942c5197 100644
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_2.json
@@ -1,52 +1,3 @@
 {
-    "conversation_roles": [
-        {
-            "actions": [],
-            "conversation_role": "e83gfmq4_n2ei6jqgj565t3nuk6yu8wpuctbgspd1ja"
-        },
-        {
-            "actions": [],
-            "conversation_role": "s3ymkciq3hqvtcl5efbsucpb3rnis8lioqm377vq3eg46ghz2ewh3u3vcrscubfog_2zorb1z7zzx7saa01qepie8m_w011r6_unlz_6s0xskl8_cfusxpkbx1f"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        }
-    ]
-}
\ No newline at end of file
+    "conversation_roles": []
+}
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_20.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_20.json
deleted file mode 100644
index 232aa7ceeed..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_20.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "b85f9ja4y8xih_39u8j2z3w2w0pexfyyawadiq1qxhrnjvfluzq_p3fbmlb8h9ph9y"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "5doti_"
-        },
-        {
-            "actions": [],
-            "conversation_role": "hj97_m0bam8n53ly3jy8k6oqcq4j3rfjn_4bphxakifcuy8uoqhd90cd"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member"
-            ],
-            "conversation_role": "gla3ue0e95dzuyiy03bls5q2rj3bwzjs9hd"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_3.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_3.json
deleted file mode 100644
index 3473706b319..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_3.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "remove_conversation_member"
-            ],
-            "conversation_role": "heihzbym4l1etr1m_njqa19sqy"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "delete_conversation"
-            ],
-            "conversation_role": "4ufidhmy67qfeix7mspuo2iwhdet_cygi8sm5_i3xlc3t7ijnu81a59dcdz1zyqcgutzwugfddd5i10nnzumfo90mntok"
-        },
-        {
-            "actions": [
-                "modify_conversation_message_timer"
-            ],
-            "conversation_role": "ywdeyduc7ufos8m5zw15zgpm2jy006x6htzd7xt7qs4p36t401epiqvl928a1"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "remove_conversation_member"
-            ],
-            "conversation_role": "2xpcq7dwfj3z2yiwuvucdgz71q9qka7cs6vnju6vpsnnuxvnwg563lt0wkld4s4xxwno3i1v446fws77a4wrhasgsccc3jv_gpubdxzmvevbw0ccbq"
-        },
-        {
-            "actions": [
-                "modify_conversation_receipt_mode"
-            ],
-            "conversation_role": "ycok9utkz3_l_h99sao16bbv1fc7ky7oki9gzi3mx5yao_vmlgmin46fttl4arm31f8smcmuq0sc1xtnlu2ubkw2k6inrge9sxt8dkgf4mc_9h2w_2hheuwr6s"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "modify_conversation_name"
-            ],
-            "conversation_role": "cqsgxrpcsqpc9lh8avqirs5y0o7y5_sbf7oofqha55jl1enj1mjaaih39t7cmmcx2hi7akh2ksyr5al5"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_4.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_4.json
deleted file mode 100644
index 45ef5461493..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_roles": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_5.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_5.json
deleted file mode 100644
index a1c34d72ddd..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_5.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [],
-            "conversation_role": "p2bm1_l6vbj4qefxizficnju6_iyl6t2sdlzbhif94i7p2n6s"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "b4hn3o_rowfzdef6uj4z7d3yvmrg7kf2"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "7bgbztsquv_u3j6tj5hgz4o2ajnhza6y16tla8al79rp8g1h0fha7f7ducn"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_6.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_6.json
deleted file mode 100644
index e7b36fb117a..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_6.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_7.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_7.json
deleted file mode 100644
index 91b7ea46807..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_7.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "modify_conversation_name"
-            ],
-            "conversation_role": "ksyk7k7cb739t77es2iluk3336btnq2y52938t4b7ugz2vl0bovd"
-        },
-        {
-            "actions": [
-                "delete_conversation"
-            ],
-            "conversation_role": "isfh6p6g_to3f9bc4af6qa_rz3xjw_p"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "gvone2nabpj79ryqs696wdglpf23xs65vv5cbyga3vutq"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [],
-            "conversation_role": "i4trq6lq11"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_8.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_8.json
deleted file mode 100644
index 229f80127e7..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_8.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        },
-        {
-            "actions": [],
-            "conversation_role": "l6osv5ffa9a4woj9d7f3eg66_4nx7uereh2f05wuqt8ulk0pgjjdvdnimc5hcvofbeysbpm6b2n88lghp715h_9hn0e02u9gqh4b0pz04_"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_9.json b/libs/wire-api/test/golden/testObject_ConversationRolesList_user_9.json
deleted file mode 100644
index db5fa1d759e..00000000000
--- a/libs/wire-api/test/golden/testObject_ConversationRolesList_user_9.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "conversation_roles": [
-        {
-            "actions": [
-                "remove_conversation_member",
-                "modify_conversation_access"
-            ],
-            "conversation_role": "rmefq7syeavictewvu7hzpoc3tl2gqjoq0o0kxgjypwrkw30s_nhea59v4lxg4gq708wksgqmonkmep0czln_s45qu_blv8y9"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "leave_conversation"
-            ],
-            "conversation_role": "wire_member"
-        },
-        {
-            "actions": [
-                "add_conversation_member",
-                "remove_conversation_member",
-                "modify_conversation_name",
-                "modify_conversation_message_timer",
-                "modify_conversation_receipt_mode",
-                "modify_conversation_access",
-                "modify_other_conversation_member",
-                "leave_conversation",
-                "delete_conversation"
-            ],
-            "conversation_role": "wire_admin"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_1.json b/libs/wire-api/test/golden/testObject_Conversation_user_1.json
index cdd6d071ce2..67d5c3ed06d 100644
--- a/libs/wire-api/test/golden/testObject_Conversation_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Conversation_user_1.json
@@ -1,35 +1,35 @@
 {
     "access": [],
-    "creator": "00000001-0000-0001-0000-000200000001",
     "access_role": "private",
+    "creator": "00000001-0000-0001-0000-000200000001",
+    "id": "00000001-0000-0000-0000-000000000000",
+    "last_event": "0.0",
+    "last_event_time": "1970-01-01T00:00:00.000Z",
     "members": {
+        "others": [],
         "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": null,
             "conversation_role": "rhhdzf0j0njilixx0g0vzrp06b_5us",
-            "status_time": "1970-01-01T00:00:00.000Z",
             "hidden": false,
-            "status_ref": "0.0",
+            "hidden_ref": "",
             "id": "00000001-0000-0001-0000-000100000000",
             "otr_archived": false,
-            "otr_muted_status": null,
+            "otr_archived_ref": "",
             "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": []
+            "otr_muted_ref": null,
+            "otr_muted_status": null,
+            "service": null,
+            "status": 0,
+            "status_ref": "0.0",
+            "status_time": "1970-01-01T00:00:00.000Z"
+        }
     },
+    "message_timer": null,
     "name": " 0",
-    "team": "00000001-0000-0001-0000-000100000002",
     "qualified_id": {
         "domain": "golden.example.com",
         "id": "00000001-0000-0000-0000-000000000000"
     },
-    "id": "00000001-0000-0000-0000-000000000000",
-    "type": 2,
     "receipt_mode": -2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": null,
-    "last_event": "0.0"
+    "team": "00000001-0000-0001-0000-000100000002",
+    "type": 2
 }
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_10.json b/libs/wire-api/test/golden/testObject_Conversation_user_10.json
deleted file mode 100644
index 7fb512db567..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_10.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "access": [
-        "code",
-        "private",
-        "invite"
-    ],
-    "creator": "00000001-0000-0002-0000-000200000002",
-    "access_role": "non_activated",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0001-0000-000000000000",
-                "provider": "00000000-0000-0001-0000-000000000001"
-            },
-            "otr_muted_ref": null,
-            "conversation_role": "f6i7jiywt5z70w0_2uo5nzl6a7jeb8uij_mlvzkutbuzmuv_kfgl4myu_wh5bjkhbm0qdzacid1zytxvl8jjzyxn3u29enr20563j1mx0cm6vayj",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0001-0000-000000000001",
-            "otr_archived": false,
-            "otr_muted_status": -1,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0001-0000-000000000001",
-                    "provider": "00000001-0000-0001-0000-000100000001"
-                },
-                "conversation_role": "8jz06l_sqgy5jsy2tkj36fx2xtkdhuwhuiktpq2trp9i438bk4xw1lzoi3aysancdc15ihj6r5kr67tkw9hsbhaybyv1356wnfkqsdkzo4kgc",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0001-0000-000000000001"
-                },
-                "id": "00000000-0000-0001-0000-000000000001"
-            }
-        ]
-    },
-    "name": "",
-    "team": null,
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0000-0000-000200000000"
-    },
-    "id": "00000002-0000-0000-0000-000200000000",
-    "type": 3,
-    "receipt_mode": 2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 1131988659409974,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_11.json b/libs/wire-api/test/golden/testObject_Conversation_user_11.json
deleted file mode 100644
index 78fda68a366..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_11.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "access": [
-        "link"
-    ],
-    "creator": "00000002-0000-0001-0000-000000000000",
-    "access_role": "team",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0000-0000-000100000001"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "eq24_qppnbjp8nxeda3bgg62wy7uviku7tugpzds1sh_rhois7of0ht1yr37ytdgntv9iz_mmvpxd1sl6uwjj75yehuskmxdnsow6wxi08mykn0lgcal5fix28dd0",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0000-0000-000100000001",
-            "otr_archived": true,
-            "otr_muted_status": -1,
-            "otr_muted": true,
-            "otr_archived_ref": null
-        },
-        "others": [
-            {
-                "status": 0,
-                "conversation_role": "7yp6ch28sx90qjew7i2oa6f3a0a67xtkmef1ronl_lmf7u0lve4z6468jswcqkq7ovr48idryq7dqurpehzzl262oqnoi3bj2_",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0001-0000-000000000000"
-                },
-                "id": "00000000-0000-0001-0000-000000000000"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "provider": "00000001-0000-0000-0000-000000000001"
-                },
-                "conversation_role": "ogmflb36qx1edb7q8wxacedus_2ppb6pu2vzph4fnhlc_x3kf271v1x127vin878egys54n3hkgs315xo3ufylmom8v25g3snrauoyxmta_iz",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0001-0000-000000000001"
-                },
-                "id": "00000001-0000-0001-0000-000000000001"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0000-0000-000100000001",
-                    "provider": "00000000-0000-0000-0000-000100000000"
-                },
-                "conversation_role": "if7jp_ofhfnlx9amsxhapq21fipzxyg0n1fvawnot0z67qbx_2rgu768eq13gyrtv_35y7kx7nizjbmea6mxg8bf9vl_k9fq7bwlzxty",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0001-0000-000100000000"
-                },
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "provider": "00000001-0000-0000-0000-000100000000"
-                },
-                "conversation_role": "1p2vr4mofv6q14vovgx5fnqh_ux",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0000-0000-000000000000"
-                },
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            {
-                "status": 0,
-                "conversation_role": "b61vxuzhoqvvdl6",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0000-0000-000100000000"
-                },
-                "id": "00000001-0000-0000-0000-000100000000"
-            }
-        ]
-    },
-    "name": null,
-    "team": "00000002-0000-0000-0000-000000000000",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0001-0000-000200000002"
-    },
-    "id": "00000001-0000-0001-0000-000200000002",
-    "type": 1,
-    "receipt_mode": 1,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 2882038444751786,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_12.json b/libs/wire-api/test/golden/testObject_Conversation_user_12.json
deleted file mode 100644
index b30ee4014c7..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_12.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "access": [],
-    "creator": "00000000-0000-0001-0000-000000000001",
-    "access_role": "team",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": null,
-            "conversation_role": "svdfjv4ckfm7gre62yh0l1i7x5k49wq1pxd1btsv4g4pz9ikhmfgkfqngjcuo_y08fyrq_lkf9ny2iubxwy",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0000-0000-000100000000",
-            "otr_archived": false,
-            "otr_muted_status": null,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": []
-    },
-    "name": "",
-    "team": "00000000-0000-0002-0000-000200000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0000-0000-000200000000"
-    },
-    "id": "00000001-0000-0000-0000-000200000000",
-    "type": 3,
-    "receipt_mode": -2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 7684287430983198,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_13.json b/libs/wire-api/test/golden/testObject_Conversation_user_13.json
deleted file mode 100644
index 8d4c4a189b7..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_13.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "access": [
-        "private",
-        "private",
-        "link",
-        "link",
-        "invite",
-        "code",
-        "invite"
-    ],
-    "creator": "00000000-0000-0000-0000-000200000001",
-    "access_role": "activated",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000000000001",
-                "provider": "00000000-0000-0000-0000-000100000000"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "pj33g65zp3y35dnme_vedta8j2a3lx85z7m1isi_e87c3dztjm4_1duhtzn1fpkahqnwsdjwk50xqgawspoedhxkxld2bxmgyk9ghhz310hjtgy676sb0zbujo3",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000000-0000-0001-0000-000000000001",
-            "otr_archived": false,
-            "otr_muted_status": null,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "conversation_role": "8evjw_y7w0w2l8qxaxr60chk7hd6hj98_mt3ing6xnwnpdca0qp42tomkmlci_jz4",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0000-0000-000000000000"
-                },
-                "id": "00000000-0000-0000-0000-000000000000"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "provider": "00000000-0000-0001-0000-000100000001"
-                },
-                "conversation_role": "nyucucx8i_emmsvmhhpfn3o8h9zidow5qn3hu60jnocrhi_9llcgqo5gc396rxdz6lpkct73l9h2bnfkyqyo1lpo1ga283fn2mqel3lrfopztj64siuzcxtl",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0001-0000-000000000000"
-                },
-                "id": "00000000-0000-0001-0000-000000000000"
-            }
-        ]
-    },
-    "name": "􂱕𝖪",
-    "team": "00000002-0000-0000-0000-000200000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0000-0000-000000000002"
-    },
-    "id": "00000001-0000-0000-0000-000000000002",
-    "type": 0,
-    "receipt_mode": -1,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 4379292253035264,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_14.json b/libs/wire-api/test/golden/testObject_Conversation_user_14.json
deleted file mode 100644
index 5af2eaf6e4a..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_14.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "access": [],
-    "creator": "00000000-0000-0001-0000-000100000002",
-    "access_role": "private",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000100000000",
-                "provider": "00000000-0000-0001-0000-000000000001"
-            },
-            "otr_muted_ref": null,
-            "conversation_role": "pil4htbefn8i9yvwdkfam83c9gb70k1n3zkn_qb9esx177lofhgcv26no2u97l5uasehqgbb5rc36k46uf",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0000-0000-000000000001",
-            "otr_archived": false,
-            "otr_muted_status": 1,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": []
-    },
-    "name": "",
-    "team": "00000000-0000-0000-0000-000200000000",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000000-0000-0000-0000-000000000002"
-    },
-    "id": "00000000-0000-0000-0000-000000000002",
-    "type": 0,
-    "receipt_mode": null,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 3200162608204982,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_15.json b/libs/wire-api/test/golden/testObject_Conversation_user_15.json
deleted file mode 100644
index 4a3dd3f89df..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_15.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "access": [
-        "private",
-        "private",
-        "invite"
-    ],
-    "creator": "00000001-0000-0002-0000-000200000000",
-    "access_role": "private",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": "",
-            "conversation_role": "h2fasn_kwjucmy4spspzb6bhgimevoxevulwux13m3odd1clvy_okzb3rqpk9jg07z21fyquztzdrwpa2xa",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0000-0000-000000000000",
-            "otr_archived": false,
-            "otr_muted_status": 0,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "conversation_role": "vztm5yqke",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0000-0000-000100000000"
-                },
-                "id": "00000001-0000-0000-0000-000100000000"
-            }
-        ]
-    },
-    "name": null,
-    "team": null,
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0002-0000-000100000001"
-    },
-    "id": "00000001-0000-0002-0000-000100000001",
-    "type": 1,
-    "receipt_mode": null,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 6620100302029733,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_16.json b/libs/wire-api/test/golden/testObject_Conversation_user_16.json
deleted file mode 100644
index f5ace1538f1..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_16.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "access": [
-        "invite",
-        "link",
-        "link"
-    ],
-    "creator": "00000002-0000-0002-0000-000000000000",
-    "access_role": "team",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000001",
-                "provider": "00000001-0000-0000-0000-000100000001"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "6e8c9xxescuwzsvmczd844iza6d6xkkxklsgv52b9aj03a0_bkatzwfjsvtz313d6judvbpl0dlgswr2_nrd7h2hpw0_veg",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0001-0000-000000000001",
-            "otr_archived": false,
-            "otr_muted_status": null,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0001-0000-000000000001",
-                    "provider": "00000000-0000-0001-0000-000000000001"
-                },
-                "conversation_role": "amfmp778lcab6emu_l7z3ofb5lkbc1pvksfa9o226g9",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0000-0000-000000000000"
-                },
-                "id": "00000000-0000-0000-0000-000000000000"
-            }
-        ]
-    },
-    "name": "\u001fv",
-    "team": "00000002-0000-0001-0000-000100000001",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000000-0000-0002-0000-000000000001"
-    },
-    "id": "00000000-0000-0002-0000-000000000001",
-    "type": 2,
-    "receipt_mode": 2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 3688870907729890,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_17.json b/libs/wire-api/test/golden/testObject_Conversation_user_17.json
deleted file mode 100644
index 3dfed08e557..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_17.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "access": [
-        "link",
-        "link"
-    ],
-    "creator": "00000000-0000-0002-0000-000000000001",
-    "access_role": "activated",
-    "members": {
-        "self": {
-            "hidden_ref": null,
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000001-0000-0001-0000-000000000000"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "km3i",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000000-0000-0000-0000-000000000001",
-            "otr_archived": false,
-            "otr_muted_status": -1,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": []
-    },
-    "name": null,
-    "team": "00000001-0000-0001-0000-000100000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0001-0000-000200000000"
-    },
-    "id": "00000002-0000-0001-0000-000200000000",
-    "type": 3,
-    "receipt_mode": null,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 5675065539284805,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_18.json b/libs/wire-api/test/golden/testObject_Conversation_user_18.json
deleted file mode 100644
index b2ca8a5edae..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_18.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "access": [
-        "private"
-    ],
-    "creator": "00000001-0000-0001-0000-000000000000",
-    "access_role": "activated",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": "",
-            "conversation_role": "u5k_f768_gbc0efd76xdd25k9xad2p4mxit0gpn4ihbp6iukqherpt3hop841_",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000000-0000-0001-0000-000100000000",
-            "otr_archived": true,
-            "otr_muted_status": 1,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0000-0000-000100000000",
-                    "provider": "00000001-0000-0000-0000-000100000000"
-                },
-                "conversation_role": "8eai0sl3c2b0ude_hcp1ntoli4didzqbff",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0000-0000-000100000001"
-                },
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "provider": "00000000-0000-0000-0000-000100000000"
-                },
-                "conversation_role": "fbksch480c5wfn2d64n7mpjjiohdbpzpudtr4fkx8xknon122tia9kspnni_j0d53nx44nos47ms4l7v1v5c8srvc5v2",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0001-0000-000100000001"
-                },
-                "id": "00000001-0000-0001-0000-000100000001"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "provider": "00000000-0000-0001-0000-000000000000"
-                },
-                "conversation_role": "qft4gqk2wm7fcd7vsmnl9hsmo7izfqp7cnn_9mh6i9dme",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0001-0000-000000000000"
-                },
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0001-0000-000000000001",
-                    "provider": "00000001-0000-0000-0000-000100000001"
-                },
-                "conversation_role": "9z5plhmkixcljnsfq4",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0000-0000-000000000000"
-                },
-                "id": "00000000-0000-0000-0000-000000000000"
-            }
-        ]
-    },
-    "name": "",
-    "team": "00000000-0000-0000-0000-000200000000",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0000-0000-000200000000"
-    },
-    "id": "00000002-0000-0000-0000-000200000000",
-    "type": 2,
-    "receipt_mode": -2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": null,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_19.json b/libs/wire-api/test/golden/testObject_Conversation_user_19.json
deleted file mode 100644
index bd7e6e45820..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_19.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "access": [
-        "link"
-    ],
-    "creator": "00000002-0000-0002-0000-000200000000",
-    "access_role": "team",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000000-0000-0001-0000-000100000000"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "2x93m15qf1a7el4t7sl_nob1q5q7urc7bb71l816331ktafgxukqlf1oc2b10e9w_5y724upn8kpzdfnpto1__keuuh217g0z1kq32v0w24hjus6s3tdxz1",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0001-0000-000000000000",
-            "otr_archived": true,
-            "otr_muted_status": null,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": []
-    },
-    "name": "",
-    "team": "00000001-0000-0001-0000-000100000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0001-0000-000000000002"
-    },
-    "id": "00000001-0000-0001-0000-000000000002",
-    "type": 1,
-    "receipt_mode": 2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 8984227582637931,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_2.json b/libs/wire-api/test/golden/testObject_Conversation_user_2.json
index 1ff8b9eca5e..3d7c556f9b6 100644
--- a/libs/wire-api/test/golden/testObject_Conversation_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Conversation_user_2.json
@@ -13,36 +13,50 @@
         "private",
         "invite"
     ],
-    "creator": "00000000-0000-0000-0000-000200000001",
     "access_role": "non_activated",
+    "creator": "00000000-0000-0000-0000-000200000001",
+    "id": "00000000-0000-0000-0000-000000000002",
+    "last_event": "0.0",
+    "last_event_time": "1970-01-01T00:00:00.000Z",
     "members": {
+        "others": [
+            {
+                "conversation_role": "r1rg526serx51g15n99y1bw_9q0qrcwck3jxl7ocjsjqcoux7d1zbkz9nnczy92t2oyogxrx3cyh_b8yv44l61mx9uzdnv6",
+                "id": "00000001-0000-0001-0000-000100000001",
+                "qualified_id": {
+                    "domain": "golden.example.com",
+                    "id": "00000001-0000-0001-0000-000100000001"
+                },
+                "service": {
+                    "id": "00000001-0000-0000-0000-000000000000",
+                    "provider": "00000001-0000-0000-0000-000000000001"
+                },
+                "status": 0
+            }
+        ],
         "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": null,
             "conversation_role": "9b2d3thyqh4ptkwtq2n2v9qsni_ln1ca66et_z8dlhfs9oamp328knl3rj9kcj",
-            "status_time": "1970-01-01T00:00:00.000Z",
             "hidden": true,
-            "status_ref": "0.0",
+            "hidden_ref": "",
             "id": "00000000-0000-0001-0000-000100000001",
             "otr_archived": false,
-            "otr_muted_status": -1,
+            "otr_archived_ref": null,
             "otr_muted": true,
-            "otr_archived_ref": null
-        },
-        "others": []
+            "otr_muted_ref": null,
+            "otr_muted_status": -1,
+            "service": null,
+            "status": 0,
+            "status_ref": "0.0",
+            "status_time": "1970-01-01T00:00:00.000Z"
+        }
     },
+    "message_timer": 1319272593797015,
     "name": "",
-    "team": "00000000-0000-0001-0000-000200000000",
     "qualified_id": {
         "domain": "golden.example.com",
         "id": "00000000-0000-0000-0000-000000000002"
     },
-    "id": "00000000-0000-0000-0000-000000000002",
-    "type": 1,
-    "receipt_mode": 2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 1319272593797015,
-    "last_event": "0.0"
+    "receipt_mode": null,
+    "team": null,
+    "type": 1
 }
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_20.json b/libs/wire-api/test/golden/testObject_Conversation_user_20.json
deleted file mode 100644
index f61c295859e..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_20.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "access": [],
-    "creator": "00000000-0000-0002-0000-000100000000",
-    "access_role": "team",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": "",
-            "conversation_role": "0z8ynysylxkk56hg4kp26scdeuzyegfhcyzeroujq9vnm1pauclleesi3ql5f_zre59otqxymh6ege8p7d313djsxz3b78177ok1bx7k_gvll923r57a0",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0000-0000-000000000000",
-            "otr_archived": true,
-            "otr_muted_status": -1,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": []
-    },
-    "name": null,
-    "team": "00000001-0000-0002-0000-000000000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000000-0000-0002-0000-000200000000"
-    },
-    "id": "00000000-0000-0002-0000-000200000000",
-    "type": 3,
-    "receipt_mode": null,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 5214522805392567,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_3.json b/libs/wire-api/test/golden/testObject_Conversation_user_3.json
deleted file mode 100644
index dd25b94cad7..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_3.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "access": [],
-    "creator": "00000000-0000-0002-0000-000100000001",
-    "access_role": "activated",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000000000000",
-                "provider": "00000000-0000-0000-0000-000100000000"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "c6vuntjr9gwiigc0_cjtg2eysqquizmi27hr5rcpb273ox_f3r68r51jxqqctu08xd0gbvwwmekpo7yo_duaqh8pcrdh3uk_oogx6ol6kkq9wg3252kx5w9_r",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000000-0000-0001-0000-000000000000",
-            "otr_archived": true,
-            "otr_muted_status": 0,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": []
-    },
-    "name": "󲳯",
-    "team": "00000001-0000-0000-0000-000200000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0001-0000-000100000000"
-    },
-    "id": "00000002-0000-0001-0000-000100000000",
-    "type": 2,
-    "receipt_mode": 0,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 158183656363340,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_4.json b/libs/wire-api/test/golden/testObject_Conversation_user_4.json
deleted file mode 100644
index 188e29996f3..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_4.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "access": [],
-    "creator": "00000001-0000-0000-0000-000100000000",
-    "access_role": "private",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0000-0000-000100000001",
-                "provider": "00000000-0000-0001-0000-000100000001"
-            },
-            "otr_muted_ref": null,
-            "conversation_role": "m123vuiwu65elqzh2xslj7koh_hoaozqcokprzujft6k_g_uv1hwo7xts",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0001-0000-000100000001",
-            "otr_archived": true,
-            "otr_muted_status": null,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "provider": "00000001-0000-0000-0000-000000000001"
-                },
-                "conversation_role": "r1rg526serx51g15n99y1bw_9q0qrcwck3jxl7ocjsjqcoux7d1zbkz9nnczy92t2oyogxrx3cyh_b8yv44l61mx9uzdnv6",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0001-0000-000100000001"
-                },
-                "id": "00000001-0000-0001-0000-000100000001"
-            }
-        ]
-    },
-    "name": "\u0015-J",
-    "team": "00000001-0000-0000-0000-000100000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0002-0000-000100000000"
-    },
-    "id": "00000001-0000-0002-0000-000100000000",
-    "type": 3,
-    "receipt_mode": 1,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": null,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_5.json b/libs/wire-api/test/golden/testObject_Conversation_user_5.json
deleted file mode 100644
index addfb9dbd7d..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_5.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "access": [],
-    "creator": "00000000-0000-0002-0000-000000000002",
-    "access_role": "private",
-    "members": {
-        "self": {
-            "hidden_ref": null,
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": "",
-            "conversation_role": "xvfvxp6h5e0sngt_bnwfa4tyn1lw028rzrxhnuz1mxgyi1ftcj7o9hilr4qo_ir59q9gktkdb6qmmyvju1n9l6ev4vh2clfi7whq4uxtq",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0000-0000-000000000001",
-            "otr_archived": false,
-            "otr_muted_status": -1,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "conversation_role": "94maa8a519kifbmlwehm5sxmkuokr6",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0001-0000-000100000000"
-                },
-                "id": "00000000-0000-0001-0000-000100000000"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "provider": "00000000-0000-0001-0000-000000000000"
-                },
-                "conversation_role": "lmzpvgv4f8kt1wzdmecu8aqvnfv5l0cs0x1odmpdvaz25u2kofhywz92kx7mfxvld99im98_ksi0feski60eq63nlwtst2_ud5r2bi3k",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0001-0000-000100000001"
-                },
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            {
-                "status": 0,
-                "conversation_role": "8euvagsxew2ds5r8yiy_soqa2yhy12oi9ljyxmcm40j_oxt4i0q1rsd3twu43af9q6fotbrzeyjktmewqehafl6ax9372wxcg4r5",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0000-0000-000100000001"
-                },
-                "id": "00000000-0000-0000-0000-000100000001"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0000-0000-000100000001",
-                    "provider": "00000001-0000-0000-0000-000000000000"
-                },
-                "conversation_role": "leerha8jseiakvd1pdzoq0sjf6bq1_yxepvf62d_jurktowqwiyswks3fhgm",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0000-0000-000000000000"
-                },
-                "id": "00000001-0000-0000-0000-000000000000"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0000-0000-000100000000",
-                    "provider": "00000000-0000-0000-0000-000000000001"
-                },
-                "conversation_role": "n0txwqcuxeq_76cffv3mc4lbddiqtyjzrklf93yfcrw6mmhqoa3na5dm_egdgiflqt29v6t61n32qvvujtk_gs1iue0dbsldj0",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0001-0000-000000000001"
-                },
-                "id": "00000000-0000-0001-0000-000000000001"
-            },
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "provider": "00000000-0000-0000-0000-000000000000"
-                },
-                "conversation_role": "ughz4ajb27yd55w_i9idbgelgut_ksa4pj0k1iwuwgstmwc0ly9_pt1zr3fs1vqph1fzobfccklzmdam_6dbiktrpriqpad8itw4ezzah6d8e27w8xe7751xztz_b",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0000-0000-000100000001"
-                },
-                "id": "00000000-0000-0000-0000-000100000001"
-            }
-        ]
-    },
-    "name": "'",
-    "team": "00000001-0000-0002-0000-000200000001",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0001-0000-000100000001"
-    },
-    "id": "00000002-0000-0001-0000-000100000001",
-    "type": 3,
-    "receipt_mode": 1,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 3545846644696388,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_6.json b/libs/wire-api/test/golden/testObject_Conversation_user_6.json
deleted file mode 100644
index dd229834f78..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_6.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "access": [
-        "private"
-    ],
-    "creator": "00000001-0000-0000-0000-000000000000",
-    "access_role": "activated",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": "",
-            "conversation_role": "7yrq155bja2p68pkx0ze6lu_i9paws_55wd89qsdghna3muu9eryz4wfu8",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000000-0000-0001-0000-000000000000",
-            "otr_archived": true,
-            "otr_muted_status": 1,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0001-0000-000100000000",
-                    "provider": "00000001-0000-0001-0000-000100000001"
-                },
-                "conversation_role": "iw0eer5er3zfvoqdlo",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0000-0000-000100000001"
-                },
-                "id": "00000001-0000-0000-0000-000100000001"
-            }
-        ]
-    },
-    "name": "",
-    "team": "00000000-0000-0000-0000-000000000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000000-0000-0000-0000-000000000001"
-    },
-    "id": "00000000-0000-0000-0000-000000000001",
-    "type": 0,
-    "receipt_mode": -2,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 8467521308908805,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_7.json b/libs/wire-api/test/golden/testObject_Conversation_user_7.json
deleted file mode 100644
index f4e40a28748..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "access": [
-        "private",
-        "code"
-    ],
-    "creator": "00000000-0000-0000-0000-000000000000",
-    "access_role": "activated",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": null,
-            "otr_muted_ref": "",
-            "conversation_role": "jfrshedq51a",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000001-0000-0001-0000-000100000000",
-            "otr_archived": true,
-            "otr_muted_status": null,
-            "otr_muted": true,
-            "otr_archived_ref": null
-        },
-        "others": [
-            {
-                "status": 0,
-                "conversation_role": "7_boa_ycz2wuxjejoukgch7q0ity8k2k7sd6gn_rkk5l6_m4dpmlx0k4klo6mdvc11noo78qeo7d_n05lojjs9",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000001-0000-0001-0000-000000000001"
-                },
-                "id": "00000001-0000-0001-0000-000000000001"
-            }
-        ]
-    },
-    "name": null,
-    "team": "00000000-0000-0002-0000-000100000002",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0002-0000-000200000001"
-    },
-    "id": "00000002-0000-0002-0000-000200000001",
-    "type": 1,
-    "receipt_mode": 1,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 118554855340166,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_8.json b/libs/wire-api/test/golden/testObject_Conversation_user_8.json
deleted file mode 100644
index 478c519f419..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_8.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "access": [
-        "invite",
-        "private",
-        "private",
-        "invite",
-        "invite",
-        "private",
-        "link"
-    ],
-    "creator": "00000001-0000-0002-0000-000200000000",
-    "access_role": "team",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000000-0000-0000-0000-000100000000",
-                "provider": "00000001-0000-0000-0000-000000000000"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "othyp2hs",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": true,
-            "status_ref": "0.0",
-            "id": "00000000-0000-0000-0000-000100000001",
-            "otr_archived": true,
-            "otr_muted_status": -1,
-            "otr_muted": false,
-            "otr_archived_ref": ""
-        },
-        "others": [
-            {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0001-0000-000100000001",
-                    "provider": "00000000-0000-0000-0000-000100000001"
-                },
-                "conversation_role": "fl2vgxnc40qnxz7eivgmb9uer3y_mtfk0whgu5tv4m108ftmryr4ji5duw2srp_7gh73y46f6krak3ef0by6fnko4rnxodby2voxfgb6u05k6z1hwgh4j8ce_as",
-                "qualified_id": {
-                    "domain": "golden.example.com",
-                    "id": "00000000-0000-0000-0000-000100000000"
-                },
-                "id": "00000000-0000-0000-0000-000100000000"
-            }
-        ]
-    },
-    "name": null,
-    "team": "00000001-0000-0001-0000-000000000001",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0002-0000-000200000000"
-    },
-    "id": "00000001-0000-0002-0000-000200000000",
-    "type": 1,
-    "receipt_mode": null,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 5923643994342681,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_Conversation_user_9.json b/libs/wire-api/test/golden/testObject_Conversation_user_9.json
deleted file mode 100644
index 920fea48e8f..00000000000
--- a/libs/wire-api/test/golden/testObject_Conversation_user_9.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite",
-        "link",
-        "link",
-        "invite",
-        "link",
-        "code"
-    ],
-    "creator": "00000000-0000-0002-0000-000100000001",
-    "access_role": "team",
-    "members": {
-        "self": {
-            "hidden_ref": "",
-            "status": 0,
-            "service": {
-                "id": "00000001-0000-0001-0000-000100000000",
-                "provider": "00000001-0000-0000-0000-000100000000"
-            },
-            "otr_muted_ref": "",
-            "conversation_role": "xpb7s51x2p54ban1kuq9d5bkwfnmep835yf1r1azgbrusdn12xpi13estxii5t4cval1qkwuskt9yc",
-            "status_time": "1970-01-01T00:00:00.000Z",
-            "hidden": false,
-            "status_ref": "0.0",
-            "id": "00000000-0000-0000-0000-000100000000",
-            "otr_archived": true,
-            "otr_muted_status": 1,
-            "otr_muted": true,
-            "otr_archived_ref": ""
-        },
-        "others": []
-    },
-    "name": null,
-    "team": null,
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0002-0000-000200000002"
-    },
-    "id": "00000002-0000-0002-0000-000200000002",
-    "type": 0,
-    "receipt_mode": -1,
-    "last_event_time": "1970-01-01T00:00:00.000Z",
-    "message_timer": 3783180688855389,
-    "last_event": "0.0"
-}
diff --git a/libs/wire-api/test/golden/testObject_ConversationsResponse_1.json b/libs/wire-api/test/golden/testObject_ConversationsResponse_1.json
new file mode 100644
index 00000000000..205d0782828
--- /dev/null
+++ b/libs/wire-api/test/golden/testObject_ConversationsResponse_1.json
@@ -0,0 +1,107 @@
+{
+    "failed": [
+        {
+            "domain": "golden.example.com",
+            "id": "00000018-4444-0020-0000-000e00000002"
+        },
+        {
+            "domain": "golden3.example.com",
+            "id": "99999999-0000-0020-0000-111111111112"
+        }
+    ],
+    "found": [
+        {
+            "access": [],
+            "access_role": "private",
+            "creator": "00000001-0000-0001-0000-000200000001",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "last_event": "0.0",
+            "last_event_time": "1970-01-01T00:00:00.000Z",
+            "members": {
+                "others": [],
+                "self": {
+                    "conversation_role": "rhhdzf0j0njilixx0g0vzrp06b_5us",
+                    "hidden": false,
+                    "hidden_ref": "",
+                    "id": "00000001-0000-0001-0000-000100000000",
+                    "otr_archived": false,
+                    "otr_archived_ref": "",
+                    "otr_muted": true,
+                    "otr_muted_ref": null,
+                    "otr_muted_status": null,
+                    "service": null,
+                    "status": 0,
+                    "status_ref": "0.0",
+                    "status_time": "1970-01-01T00:00:00.000Z"
+                }
+            },
+            "message_timer": null,
+            "name": " 0",
+            "qualified_id": {
+                "domain": "golden.example.com",
+                "id": "00000001-0000-0000-0000-000000000000"
+            },
+            "receipt_mode": -2,
+            "team": "00000001-0000-0001-0000-000100000002",
+            "type": 2
+        },
+        {
+            "access": [
+                "invite",
+                "invite",
+                "code",
+                "link",
+                "invite",
+                "private",
+                "link",
+                "code",
+                "code",
+                "link",
+                "private",
+                "invite"
+            ],
+            "access_role": "non_activated",
+            "creator": "00000000-0000-0000-0000-000200000001",
+            "id": "00000000-0000-0000-0000-000000000002",
+            "last_event": "0.0",
+            "last_event_time": "1970-01-01T00:00:00.000Z",
+            "members": {
+                "others": [],
+                "self": {
+                    "conversation_role": "9b2d3thyqh4ptkwtq2n2v9qsni_ln1ca66et_z8dlhfs9oamp328knl3rj9kcj",
+                    "hidden": true,
+                    "hidden_ref": "",
+                    "id": "00000000-0000-0001-0000-000100000001",
+                    "otr_archived": false,
+                    "otr_archived_ref": null,
+                    "otr_muted": true,
+                    "otr_muted_ref": null,
+                    "otr_muted_status": -1,
+                    "service": null,
+                    "status": 0,
+                    "status_ref": "0.0",
+                    "status_time": "1970-01-01T00:00:00.000Z"
+                }
+            },
+            "message_timer": 1319272593797015,
+            "name": "",
+            "qualified_id": {
+                "domain": "golden.example.com",
+                "id": "00000000-0000-0000-0000-000000000002"
+            },
+            "receipt_mode": 2,
+            "team": "00000000-0000-0001-0000-000200000000",
+            "type": 1
+        }
+    ],
+    "not_found": [
+        {
+            "domain": "golden.example.com",
+            "id": "00000018-0000-0020-0000-000e00000002"
+        },
+        {
+            "domain": "golden2.example.com",
+            "id": "00000018-0000-0020-0000-111111111112"
+        }
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_1.json b/libs/wire-api/test/golden/testObject_CookieId_user_1.json
index 9d475799ddb..ac91af054f6 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_1.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_1.json
@@ -1 +1 @@
-16065
\ No newline at end of file
+16065
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_10.json b/libs/wire-api/test/golden/testObject_CookieId_user_10.json
index 9af206a7fbe..e2359f99bbb 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_10.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_10.json
@@ -1 +1 @@
-27433
\ No newline at end of file
+27433
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_11.json b/libs/wire-api/test/golden/testObject_CookieId_user_11.json
index fc41973a737..1c407db2763 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_11.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_11.json
@@ -1 +1 @@
-27559
\ No newline at end of file
+27559
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_12.json b/libs/wire-api/test/golden/testObject_CookieId_user_12.json
index a948e2cab7c..8fe8d57d9ee 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_12.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_12.json
@@ -1 +1 @@
-27974
\ No newline at end of file
+27974
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_13.json b/libs/wire-api/test/golden/testObject_CookieId_user_13.json
index 26028d79f8c..cd09776aebe 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_13.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_13.json
@@ -1 +1 @@
-17088
\ No newline at end of file
+17088
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_14.json b/libs/wire-api/test/golden/testObject_CookieId_user_14.json
index 38d15080d9a..187237c2acf 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_14.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_14.json
@@ -1 +1 @@
-25289
\ No newline at end of file
+25289
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_15.json b/libs/wire-api/test/golden/testObject_CookieId_user_15.json
index bb599d0cd55..88e2cafa9d7 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_15.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_15.json
@@ -1 +1 @@
-9317
\ No newline at end of file
+9317
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_16.json b/libs/wire-api/test/golden/testObject_CookieId_user_16.json
index eeda05b4a06..bdfdf3e0e84 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_16.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_16.json
@@ -1 +1 @@
-16949
\ No newline at end of file
+16949
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_17.json b/libs/wire-api/test/golden/testObject_CookieId_user_17.json
index 416fe2bc7da..707ec4d4c06 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_17.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_17.json
@@ -1 +1 @@
-19999
\ No newline at end of file
+19999
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_18.json b/libs/wire-api/test/golden/testObject_CookieId_user_18.json
index 7c958bd1b19..33d75f737b1 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_18.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_18.json
@@ -1 +1 @@
-27271
\ No newline at end of file
+27271
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_19.json b/libs/wire-api/test/golden/testObject_CookieId_user_19.json
index 0561f649e5b..75e2da23ca9 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_19.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_19.json
@@ -1 +1 @@
-25770
\ No newline at end of file
+25770
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_2.json b/libs/wire-api/test/golden/testObject_CookieId_user_2.json
index 76ca7148539..e5d9e3c86f7 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_2.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_2.json
@@ -1 +1 @@
-27640
\ No newline at end of file
+27640
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_20.json b/libs/wire-api/test/golden/testObject_CookieId_user_20.json
index e23cbaaba4c..ddbe4f470b6 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_20.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_20.json
@@ -1 +1 @@
-11230
\ No newline at end of file
+11230
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_3.json b/libs/wire-api/test/golden/testObject_CookieId_user_3.json
index e9258e7560d..f9ce5ed8c58 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_3.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_3.json
@@ -1 +1 @@
-21839
\ No newline at end of file
+21839
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_4.json b/libs/wire-api/test/golden/testObject_CookieId_user_4.json
index a718dbf894b..edd0488a70a 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_4.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_4.json
@@ -1 +1 @@
-7679
\ No newline at end of file
+7679
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_5.json b/libs/wire-api/test/golden/testObject_CookieId_user_5.json
index 990db6b7f40..565cb595127 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_5.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_5.json
@@ -1 +1 @@
-15379
\ No newline at end of file
+15379
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_6.json b/libs/wire-api/test/golden/testObject_CookieId_user_6.json
index a092e56488b..476374f682c 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_6.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_6.json
@@ -1 +1 @@
-26192
\ No newline at end of file
+26192
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_7.json b/libs/wire-api/test/golden/testObject_CookieId_user_7.json
index ec07812d8b1..3d650bdc202 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_7.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_7.json
@@ -1 +1 @@
-24326
\ No newline at end of file
+24326
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_8.json b/libs/wire-api/test/golden/testObject_CookieId_user_8.json
index 9af10f1f091..3259e5281b5 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_8.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_8.json
@@ -1 +1 @@
-31657
\ No newline at end of file
+31657
diff --git a/libs/wire-api/test/golden/testObject_CookieId_user_9.json b/libs/wire-api/test/golden/testObject_CookieId_user_9.json
index ec8faf05675..7d072ed21e4 100644
--- a/libs/wire-api/test/golden/testObject_CookieId_user_9.json
+++ b/libs/wire-api/test/golden/testObject_CookieId_user_9.json
@@ -1 +1 @@
-28251
\ No newline at end of file
+28251
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_1.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_1.json
index e33a73f1501..0c1420f1711 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_1.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_1.json
@@ -1 +1 @@
-"\"$s럧󲶲*\u0018"
\ No newline at end of file
+"\"$s럧󲶲*\u0018"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_10.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_10.json
index 2f7e01e4186..a494a1d0ea3 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_10.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_10.json
@@ -1 +1 @@
-"f~\"􉋶锞\u0015bw\u001a=ri"
\ No newline at end of file
+"f~\"􉋶锞\u0015bw\u001a=ri"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_11.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_11.json
index 293aaa3f02a..1e4a7f6a6d3 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_11.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_11.json
@@ -1 +1 @@
-"󰿙"
\ No newline at end of file
+"󰿙"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_12.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_12.json
index a5cb1809a49..7c8bee417b3 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_12.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_12.json
@@ -1 +1 @@
-"h-쾪"
\ No newline at end of file
+"h-쾪"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_13.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_13.json
index 93a715cbdee..5b8ea36731f 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_13.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_13.json
@@ -1 +1 @@
-"󷋧}u\u0015󽅠P2 xj􋞣>G,2@e󲡓n{"
\ No newline at end of file
+"󷋧}u\u0015󽅠P2 xj􋞣>G,2@e󲡓n{"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_14.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_14.json
index 3cc762b5501..e16c76dff88 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_14.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_14.json
@@ -1 +1 @@
-""
\ No newline at end of file
+""
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_15.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_15.json
index e97d9e0013d..045a574b313 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_15.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_15.json
@@ -1 +1 @@
-"~\nB􄂴\u0019𦆄t苝\u0004-:'󱑢1􅄢\u000cw`|\u0007d|cr7iP"
\ No newline at end of file
+"~\nB􄂴\u0019𦆄t苝\u0004-:'󱑢1􅄢\u000cw`|\u0007d|cr7iP"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_16.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_16.json
index 7940c2b82c9..98652949c0d 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_16.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_16.json
@@ -1 +1 @@
-"𣧻"
\ No newline at end of file
+"𣧻"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_17.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_17.json
index 58cd9c2d885..97fec7e0bb8 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_17.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_17.json
@@ -1 +1 @@
-"X󷲕𡼅\u0014㯲󼏁"
\ No newline at end of file
+"X󷲕𡼅\u0014㯲󼏁"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_18.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_18.json
index 67a61dfa3da..470ec0ab8eb 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_18.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_18.json
@@ -1 +1 @@
-"i󱋇􎻅\u0006瑅󴣚􃳂:-𐙍E|􀈱z|\u0015vWz/t𧵴\u000f􉶙)'h"
\ No newline at end of file
+"i󱋇􎻅\u0006瑅󴣚􃳂:-𐙍E|􀈱z|\u0015vWz/t𧵴\u000f􉶙)'h"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_19.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_19.json
index 67733e390a4..33d9850a676 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_19.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_19.json
@@ -1 +1 @@
-"0𗐠;𓉳\u0004"
\ No newline at end of file
+"0𗐠;𓉳\u0004"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_2.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_2.json
index a009bf9cca2..c3fc146e536 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_2.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_2.json
@@ -1 +1 @@
-"綌NvZa\u000bZ\u000b\u0018􋢻Dy↹鸅 "
\ No newline at end of file
+"綌NvZa\u000bZ\u000b\u0018􋢻Dy↹鸅 "
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_20.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_20.json
index 137e5ac5ecf..0aa8328d8b9 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_20.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_20.json
@@ -1 +1 @@
-"􂆦mI𒐉.Cov\u000e𑂅6󿃊"
\ No newline at end of file
+"􂆦mI𒐉.Cov\u000e𑂅6󿃊"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_3.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_3.json
index f4f760131ce..1f9531c5792 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_3.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_3.json
@@ -1 +1 @@
-"\u0013􇩝󰒡lOn\"q\u0011/\u000f\u001e𦶞\u000e6𤠐_"
\ No newline at end of file
+"\u0013􇩝󰒡lOn\"q\u0011/\u000f\u001e𦶞\u000e6𤠐_"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_4.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_4.json
index 86735a8f53f..2eaaab7b51f 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_4.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_4.json
@@ -1 +1 @@
-"\u0014'\u0010⥐\u0015J\u0018􈑘\u0014J6p=\u000f#\u0005Qw\\󽢦􍛝]NYv%"
\ No newline at end of file
+"\u0014'\u0010⥐\u0015J\u0018􈑘\u0014J6p=\u000f#\u0005Qw\\󽢦􍛝]NYv%"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_5.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_5.json
index 7009722ad7b..f3ebf8e2afc 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_5.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_5.json
@@ -1 +1 @@
-"#\u000eV2\u0014􁔁s<\u0004\u000f𦶺\u001a\u0000"
\ No newline at end of file
+"#\u000eV2\u0014􁔁s<\u0004\u000f𦶺\u001a\u0000"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_6.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_6.json
index 85968c86152..3794a936199 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_6.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_6.json
@@ -1 +1 @@
-"6\u0010𝜴Z\u001c(\u0018.[f\u001b\r𞤍:\u0000A&\u000e'\u001f\u0006𘧊e􋊡"
\ No newline at end of file
+"6\u0010𝜴Z\u001c(\u0018.[f\u001b\r𞤍:\u0000A&\u000e'\u001f\u0006𘧊e􋊡"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_7.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_7.json
index 4360fb9446b..685e8a1cd9d 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_7.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_7.json
@@ -1 +1 @@
-"\u000ex^J\u001c"
\ No newline at end of file
+"\u000ex^J\u001c"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_8.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_8.json
index 4044dafedbf..c8542a5b5fd 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_8.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_8.json
@@ -1 +1 @@
-"&#d󰊡8\u0010!r@藐\u0011\u0017𝦜󴶅{Zg\u000c𑠛V󱠠F\u001fO􀄋ꪳ󵰌N2P"
\ No newline at end of file
+"&#d󰊡8\u0010!r@藐\u0011\u0017𝦜󴶅{Zg\u000c𑠛V󱠠F\u001fO􀄋ꪳ󵰌N2P"
diff --git a/libs/wire-api/test/golden/testObject_CookieLabel_user_9.json b/libs/wire-api/test/golden/testObject_CookieLabel_user_9.json
index eee1ba9a609..569106e1833 100644
--- a/libs/wire-api/test/golden/testObject_CookieLabel_user_9.json
+++ b/libs/wire-api/test/golden/testObject_CookieLabel_user_9.json
@@ -1 +1 @@
-"󱊰!&U \u0002\u001e􅏣\u0005\u0014\\󻿴_"
\ No newline at end of file
+"󱊰!&U \u0002\u001e􅏣\u0005\u0014\\󻿴_"
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_1.json b/libs/wire-api/test/golden/testObject_CookieList_user_1.json
index 5659a529769..3489cd8588c 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_1.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_1.json
@@ -3,82 +3,82 @@
         {
             "created": "1864-05-09T08:11:45.247059932094Z",
             "expires": "1864-05-09T16:19:23.612072754054Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T12:23:41.340450966061Z",
             "expires": "1864-05-09T16:26:21.672514665806Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:30:18.630967130428Z",
             "expires": "1864-05-09T16:27:25.033827715997Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T01:38:25.011758527197Z",
             "expires": "1864-05-09T00:53:49.0388530702Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T08:15:25.293754839567Z",
             "expires": "1864-05-09T03:04:32.680681666495Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T07:13:26.879210569284Z",
             "expires": "1864-05-09T22:44:15.24273381487Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T03:29:48.880520840213Z",
             "expires": "1864-05-09T13:14:10.114388869333Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T20:03:42.485268756732Z",
             "expires": "1864-05-09T15:10:30.315157691402Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T13:32:43.602366474813Z",
             "expires": "1864-05-09T10:38:51.062644241792Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T01:25:21.950720939454Z",
             "expires": "1864-05-09T15:05:12.304221339079Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_10.json b/libs/wire-api/test/golden/testObject_CookieList_user_10.json
index f6984ea6aaa..709f4bc1f02 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_10.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_10.json
@@ -3,82 +3,82 @@
         {
             "created": "1864-05-09T04:57:13.636138144232Z",
             "expires": "1864-05-09T06:08:36.968195238867Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T23:50:51.792305176524Z",
             "expires": "1864-05-09T03:18:04.608330256629Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T10:32:27.054576834831Z",
             "expires": "1864-05-09T23:13:27.56360005727Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T21:38:37.888899460143Z",
             "expires": "1864-05-09T21:55:16.206930486572Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T11:09:02.103624280483Z",
             "expires": "1864-05-09T01:56:31.540275991461Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T14:48:28.152138016055Z",
             "expires": "1864-05-09T15:27:07.486485718422Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T07:55:47.416846033422Z",
             "expires": "1864-05-09T11:24:43.689150545273Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T07:04:46.718340155686Z",
             "expires": "1864-05-09T09:46:41.711855764238Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T04:39:39.746532251047Z",
             "expires": "1864-05-09T17:35:50.22617001945Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T12:07:58.91972156339Z",
             "expires": "1864-05-09T01:24:39.345224418125Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_11.json b/libs/wire-api/test/golden/testObject_CookieList_user_11.json
index 3bf361f228b..711cb71cec8 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_11.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_11.json
@@ -3,10 +3,10 @@
         {
             "created": "1864-05-13T08:19:14.217624017961Z",
             "expires": "1864-05-05T05:14:27.024865656105Z",
-            "successor": 4,
             "id": 2,
-            "type": "session",
-            "label": "\r8^"
+            "label": "\r8^",
+            "successor": 4,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_12.json b/libs/wire-api/test/golden/testObject_CookieList_user_12.json
index a773565b280..ac770671125 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_12.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_12.json
@@ -1,3 +1,3 @@
 {
     "cookies": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_13.json b/libs/wire-api/test/golden/testObject_CookieList_user_13.json
index 6431f914688..3b037c12d89 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_13.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_13.json
@@ -3,34 +3,34 @@
         {
             "created": "1864-05-10T17:25:06.901627917177Z",
             "expires": "1864-05-10T23:16:48.964734609311Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": "A"
+            "label": "A",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-08T00:59:53.715758102357Z",
             "expires": "1864-05-09T02:53:10.370977876871Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-10T04:00:37.506988047232Z",
             "expires": "1864-05-09T20:15:08.356758949536Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-08T23:15:35.154377472412Z",
             "expires": "1864-05-10T22:54:59.641375513427Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": "\u0008"
+            "label": "\u0008",
+            "successor": 1,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_14.json b/libs/wire-api/test/golden/testObject_CookieList_user_14.json
index 581b69d1b14..532c35ac0f6 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_14.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_14.json
@@ -3,18 +3,18 @@
         {
             "created": "1864-05-08T13:06:48.101997018718Z",
             "expires": "1864-05-09T12:29:39.285437577229Z",
-            "successor": 0,
             "id": 2,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-11T18:36:14.96072575364Z",
             "expires": "1864-05-08T20:00:26.995784443177Z",
-            "successor": 2,
             "id": 2,
-            "type": "persistent",
-            "label": "y뛷"
+            "label": "y뛷",
+            "successor": 2,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_15.json b/libs/wire-api/test/golden/testObject_CookieList_user_15.json
index a624eec8711..46cbeb53b21 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_15.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_15.json
@@ -3,58 +3,58 @@
         {
             "created": "1864-05-09T23:42:22.463805358522Z",
             "expires": "1864-05-09T18:28:03.932826813077Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T15:46:20.719053342851Z",
             "expires": "1864-05-09T02:45:00.119890827496Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T15:04:00.936256506363Z",
             "expires": "1864-05-09T09:08:56.792900807158Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T23:09:22.403535680059Z",
             "expires": "1864-05-09T07:57:11.854146729099Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T09:43:36.838179452985Z",
             "expires": "1864-05-09T10:23:43.915798699963Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T09:49:18.595961881808Z",
             "expires": "1864-05-09T10:51:57.490564487066Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T02:11:22.633124161057Z",
             "expires": "1864-05-09T06:14:08.602895294174Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_16.json b/libs/wire-api/test/golden/testObject_CookieList_user_16.json
index beeb6fcbf60..9731fe3bd09 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_16.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_16.json
@@ -3,114 +3,114 @@
         {
             "created": "1864-05-09T12:00:27.276658197151Z",
             "expires": "1864-05-09T01:54:16.672289842468Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T16:01:15.129996103969Z",
             "expires": "1864-05-09T05:49:57.556804885534Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T05:55:16.46479580635Z",
             "expires": "1864-05-09T20:42:10.458648722298Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T11:15:08.365259295213Z",
             "expires": "1864-05-09T18:00:18.662996900631Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T11:45:20.397833179427Z",
             "expires": "1864-05-09T07:07:18.247068306493Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T01:42:04.76385204735Z",
             "expires": "1864-05-09T16:46:25.33589399408Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T03:25:44.710313848676Z",
             "expires": "1864-05-09T19:46:29.959694540229Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T16:59:32.170300107165Z",
             "expires": "1864-05-09T14:56:15.800372774188Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T21:04:37.60538916949Z",
             "expires": "1864-05-09T12:14:07.019845858128Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:25:48.382730928676Z",
             "expires": "1864-05-09T02:41:51.123612675322Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T19:14:33.950057302805Z",
             "expires": "1864-05-09T01:47:05.737848270671Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:44:31.697866013259Z",
             "expires": "1864-05-09T04:07:44.709319258579Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T21:33:23.515716434732Z",
             "expires": "1864-05-09T06:15:22.054257588544Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T03:39:01.113036868526Z",
             "expires": "1864-05-09T21:39:55.354063482533Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_17.json b/libs/wire-api/test/golden/testObject_CookieList_user_17.json
index 01c6b5de99f..781519dd9f7 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_17.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_17.json
@@ -3,58 +3,58 @@
         {
             "created": "1864-05-09T21:38:36.962487709315Z",
             "expires": "1864-05-09T17:24:08.4207201721Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T05:32:54.535236659092Z",
             "expires": "1864-05-09T02:08:31.382135612599Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T02:58:57.072719529853Z",
             "expires": "1864-05-09T19:37:02.8130152956Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T23:51:38.654707901616Z",
             "expires": "1864-05-09T03:57:54.743030292927Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T04:36:48.48199209557Z",
             "expires": "1864-05-09T05:21:46.868629016909Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:07:33.742323455186Z",
             "expires": "1864-05-09T19:38:39.447967135478Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T08:44:40.136721832699Z",
             "expires": "1864-05-09T03:39:04.647771815878Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_18.json b/libs/wire-api/test/golden/testObject_CookieList_user_18.json
index efc3cba3016..3766f0e5976 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_18.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_18.json
@@ -3,18 +3,18 @@
         {
             "created": "1864-05-10T20:39:22.959383769615Z",
             "expires": "1864-05-11T06:07:15.274794340493Z",
-            "successor": 1,
             "id": 2,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-08T19:20:12.20001762321Z",
             "expires": "1864-05-09T19:29:38.456132738603Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_19.json b/libs/wire-api/test/golden/testObject_CookieList_user_19.json
index 643bf765327..538aabc1434 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_19.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_19.json
@@ -3,18 +3,18 @@
         {
             "created": "1864-05-09T22:44:30.730713163284Z",
             "expires": "1864-05-09T16:18:29.456765614188Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": "􆱦󳲌"
+            "label": "􆱦󳲌",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-08T16:19:58.811779123243Z",
             "expires": "1864-05-09T03:10:20.890964940734Z",
-            "successor": 2,
             "id": 2,
-            "type": "session",
-            "label": "H\r"
+            "label": "H\r",
+            "successor": 2,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_2.json b/libs/wire-api/test/golden/testObject_CookieList_user_2.json
index 66e3fc8f276..69ecaa318af 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_2.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_2.json
@@ -3,74 +3,74 @@
         {
             "created": "1864-05-09T22:19:39.925259747571Z",
             "expires": "1864-05-09T04:30:18.185378588445Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T08:39:54.342548571166Z",
             "expires": "1864-05-09T18:28:31.576724733065Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T23:54:29.966336228433Z",
             "expires": "1864-05-09T15:35:01.695251247096Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:20:31.592673496648Z",
             "expires": "1864-05-09T19:59:24.79675052948Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T00:17:18.209473244544Z",
             "expires": "1864-05-09T08:56:09.569836364185Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T01:27:05.499052889737Z",
             "expires": "1864-05-09T19:07:47.285063809584Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:27:10.027218640074Z",
             "expires": "1864-05-09T15:02:40.621672564484Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T17:52:24.162768351125Z",
             "expires": "1864-05-09T19:47:14.34928403508Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T14:40:37.509012674163Z",
             "expires": "1864-05-09T02:05:47.644898374187Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_20.json b/libs/wire-api/test/golden/testObject_CookieList_user_20.json
index 99e9ecc2cfb..6aca3b91c46 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_20.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_20.json
@@ -3,234 +3,234 @@
         {
             "created": "1864-05-09T08:06:58.639041928672Z",
             "expires": "1864-05-09T15:54:22.365531263189Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T18:48:47.558654197171Z",
             "expires": "1864-05-09T04:32:10.969833190745Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T09:10:02.113796886536Z",
             "expires": "1864-05-09T14:15:47.860550523473Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T05:00:36.84392117539Z",
             "expires": "1864-05-09T18:21:04.675856170753Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T16:55:28.997986847556Z",
             "expires": "1864-05-09T06:15:55.387941840828Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T15:25:40.867545726854Z",
             "expires": "1864-05-09T17:01:15.858285083915Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T22:29:23.772075463246Z",
             "expires": "1864-05-09T16:31:33.536750998413Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T08:28:42.7055861658Z",
             "expires": "1864-05-09T06:01:17.508326921451Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:35:33.330185032381Z",
             "expires": "1864-05-09T14:36:03.873052358125Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T12:09:10.29317763797Z",
             "expires": "1864-05-09T22:11:01.462326681794Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:13:26.504756178954Z",
             "expires": "1864-05-09T20:14:55.998946168576Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T03:29:09.783324332702Z",
             "expires": "1864-05-09T03:01:33.387304269326Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T05:39:50.110190658859Z",
             "expires": "1864-05-09T15:32:10.979833482735Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T02:03:15.187534976039Z",
             "expires": "1864-05-09T11:53:25.444713695811Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T06:28:52.941909526183Z",
             "expires": "1864-05-09T06:20:37.901798616734Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T17:47:27.661022872816Z",
             "expires": "1864-05-09T23:44:20.944594867149Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T05:50:00.529587302706Z",
             "expires": "1864-05-09T09:32:05.839236279076Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T07:56:02.85544994417Z",
             "expires": "1864-05-09T18:01:18.902001307651Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T12:24:49.643960000241Z",
             "expires": "1864-05-09T08:29:12.96271476677Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T05:16:55.098143637525Z",
             "expires": "1864-05-09T10:50:30.117720286179Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T15:34:54.252671447276Z",
             "expires": "1864-05-09T17:18:31.73847583527Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:13:22.834095234235Z",
             "expires": "1864-05-09T09:06:58.83050803106Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T15:56:00.791675801548Z",
             "expires": "1864-05-09T19:36:26.357858789968Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T02:55:57.906310333752Z",
             "expires": "1864-05-09T08:04:52.147590690645Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T13:50:02.63156654108Z",
             "expires": "1864-05-09T21:24:37.629738475035Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T06:34:25.097135193354Z",
             "expires": "1864-05-09T04:22:54.991041026267Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T12:42:17.003849254404Z",
             "expires": "1864-05-09T06:07:35.98955454546Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T17:27:37.8613473328Z",
             "expires": "1864-05-09T15:55:53.309850731813Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T12:25:30.408292737207Z",
             "expires": "1864-05-09T05:30:34.287748326165Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_3.json b/libs/wire-api/test/golden/testObject_CookieList_user_3.json
index 4b889bd16ca..6d40b0483ab 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_3.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_3.json
@@ -3,274 +3,274 @@
         {
             "created": "1864-05-09T01:27:25.557815452016Z",
             "expires": "1864-05-09T05:20:38.194678667052Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T05:43:23.971529012662Z",
             "expires": "1864-05-09T02:53:38.455864708797Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T16:36:50.475665468766Z",
             "expires": "1864-05-09T22:30:52.701870277174Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T21:37:19.243912276549Z",
             "expires": "1864-05-09T00:26:08.451232804077Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T01:20:39.296454423491Z",
             "expires": "1864-05-09T15:01:33.122231286251Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T13:53:46.838517153788Z",
             "expires": "1864-05-09T11:30:45.539559560638Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T18:04:19.816315114891Z",
             "expires": "1864-05-09T04:56:50.534152910338Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T15:39:15.937068331222Z",
             "expires": "1864-05-09T13:49:06.675383967114Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T11:04:07.726296806999Z",
             "expires": "1864-05-09T06:32:10.667028238269Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T02:25:05.446979993128Z",
             "expires": "1864-05-09T11:23:36.038765999786Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T01:53:39.407752379484Z",
             "expires": "1864-05-09T03:45:15.602509018717Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T05:36:47.625411610475Z",
             "expires": "1864-05-09T18:17:43.492825079869Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T02:23:35.872761506436Z",
             "expires": "1864-05-09T13:27:54.741895768202Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T10:28:24.868631031378Z",
             "expires": "1864-05-09T17:15:13.501502999199Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T01:26:44.617166083564Z",
             "expires": "1864-05-09T05:44:07.442049379405Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T13:47:18.386913379894Z",
             "expires": "1864-05-09T15:19:03.601505694263Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T13:06:58.743967376954Z",
             "expires": "1864-05-09T19:17:18.167156642404Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T21:23:34.336759134675Z",
             "expires": "1864-05-09T08:47:11.021709818734Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T16:10:24.643222325816Z",
             "expires": "1864-05-09T19:15:56.335527820672Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T15:40:20.805988933454Z",
             "expires": "1864-05-09T19:49:23.296340858621Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T15:30:40.550989406474Z",
             "expires": "1864-05-09T01:32:05.586237465851Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T07:24:46.114369594397Z",
             "expires": "1864-05-09T22:43:01.421438522142Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T07:50:01.995354759779Z",
             "expires": "1864-05-09T09:01:18.013357675717Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T20:03:54.418818066667Z",
             "expires": "1864-05-09T12:59:11.322184322816Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:59:17.24854512091Z",
             "expires": "1864-05-09T15:29:41.78704703621Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T12:49:18.045557329831Z",
             "expires": "1864-05-09T20:46:55.228537922885Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T13:41:49.602725874348Z",
             "expires": "1864-05-09T10:05:12.943838359329Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T11:34:22.2140404788Z",
             "expires": "1864-05-09T02:05:51.050444108567Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T12:04:47.125300697894Z",
             "expires": "1864-05-09T01:25:14.385551280732Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T21:20:52.163408857872Z",
             "expires": "1864-05-09T15:18:07.231580997227Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T13:44:02.471530610404Z",
             "expires": "1864-05-09T06:38:59.669089688544Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T05:33:48.288298198745Z",
             "expires": "1864-05-09T01:59:32.505125066582Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:44:56.438503040562Z",
             "expires": "1864-05-09T21:00:07.48604242911Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T07:20:47.968477268183Z",
             "expires": "1864-05-09T23:52:06.472967194305Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_4.json b/libs/wire-api/test/golden/testObject_CookieList_user_4.json
index 1356091f521..c1a7f44fdaf 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_4.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_4.json
@@ -3,42 +3,42 @@
         {
             "created": "1864-05-09T22:43:55.881865613322Z",
             "expires": "1864-05-09T08:56:47.675779265864Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T20:00:55.407915876625Z",
             "expires": "1864-05-09T07:46:54.345549772213Z",
-            "successor": 0,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T04:07:57.947385008952Z",
             "expires": "1864-05-09T19:25:27.529068654403Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T02:20:26.147424008137Z",
             "expires": "1864-05-09T05:49:43.73124293629Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:14:24.709257954742Z",
             "expires": "1864-05-09T04:01:49.187385201039Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_5.json b/libs/wire-api/test/golden/testObject_CookieList_user_5.json
index 287277cb2d5..a5e48cd0ba1 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_5.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_5.json
@@ -3,106 +3,106 @@
         {
             "created": "1864-05-09T02:24:33.409929272836Z",
             "expires": "1864-05-09T09:28:14.894312093718Z",
-            "successor": 1,
             "id": 0,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T22:16:21.031766916159Z",
             "expires": "1864-05-09T02:17:58.908743803962Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T23:58:40.43481054969Z",
             "expires": "1864-05-09T01:08:15.083891456454Z",
-            "successor": null,
             "id": 1,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T07:52:00.957508665782Z",
             "expires": "1864-05-09T10:58:02.674587451183Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T04:11:22.130421642978Z",
             "expires": "1864-05-09T04:55:18.957214306738Z",
-            "successor": 1,
             "id": 1,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:12:35.717981578059Z",
             "expires": "1864-05-09T07:46:10.51530247067Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T14:53:57.714043632542Z",
             "expires": "1864-05-09T12:22:56.570590160379Z",
-            "successor": 1,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "session"
         },
         {
             "created": "1864-05-09T16:12:21.802019785973Z",
             "expires": "1864-05-09T10:17:31.721949677856Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:24:07.508270461346Z",
             "expires": "1864-05-09T14:20:30.637854904307Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T01:02:43.844591482658Z",
             "expires": "1864-05-09T10:10:08.846001197278Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T16:55:15.663670762289Z",
             "expires": "1864-05-09T08:40:35.826337206312Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T01:50:42.873693144224Z",
             "expires": "1864-05-09T18:41:46.968652247087Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T20:41:45.103795474205Z",
             "expires": "1864-05-09T20:45:46.921795958856Z",
-            "successor": null,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_6.json b/libs/wire-api/test/golden/testObject_CookieList_user_6.json
index a773565b280..ac770671125 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_6.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_6.json
@@ -1,3 +1,3 @@
 {
     "cookies": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_7.json b/libs/wire-api/test/golden/testObject_CookieList_user_7.json
index 7a6697d3965..bd2bb661570 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_7.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_7.json
@@ -3,66 +3,66 @@
         {
             "created": "1864-05-09T11:14:58.099749644105Z",
             "expires": "1864-05-09T20:24:55.029381103828Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T10:06:10.491020367007Z",
             "expires": "1864-05-09T15:04:30.093775016306Z",
-            "successor": null,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": null,
+            "type": "session"
         },
         {
             "created": "1864-05-09T00:16:19.909453661738Z",
             "expires": "1864-05-09T05:54:39.512772120746Z",
-            "successor": 0,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T18:26:23.718288941861Z",
             "expires": "1864-05-09T16:11:38.770254728195Z",
-            "successor": 0,
             "id": 0,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "session"
         },
         {
             "created": "1864-05-09T15:13:20.879830850957Z",
             "expires": "1864-05-09T01:25:18.552525669912Z",
-            "successor": null,
             "id": 1,
-            "type": "persistent",
-            "label": null
+            "label": null,
+            "successor": null,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T22:54:28.824084324791Z",
             "expires": "1864-05-09T17:04:10.053358596502Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T02:27:17.023081634382Z",
             "expires": "1864-05-09T01:10:27.638644713358Z",
-            "successor": 1,
             "id": 1,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 1,
+            "type": "persistent"
         },
         {
             "created": "1864-05-09T20:54:04.990126375152Z",
             "expires": "1864-05-09T00:53:54.744162891679Z",
-            "successor": 0,
             "id": 0,
-            "type": "persistent",
-            "label": ""
+            "label": "",
+            "successor": 0,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_8.json b/libs/wire-api/test/golden/testObject_CookieList_user_8.json
index f032835b24b..cfd8fb080c1 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_8.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_8.json
@@ -3,10 +3,10 @@
         {
             "created": "1864-05-05T03:14:14.790089963935Z",
             "expires": "1864-05-12T17:48:11.290884688409Z",
-            "successor": 1,
             "id": 3,
-            "type": "persistent",
-            "label": "L"
+            "label": "L",
+            "successor": 1,
+            "type": "persistent"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieList_user_9.json b/libs/wire-api/test/golden/testObject_CookieList_user_9.json
index 45bcd9f6251..01d0b01859c 100644
--- a/libs/wire-api/test/golden/testObject_CookieList_user_9.json
+++ b/libs/wire-api/test/golden/testObject_CookieList_user_9.json
@@ -3,10 +3,10 @@
         {
             "created": "1864-05-09T12:01:58.187598453223Z",
             "expires": "1864-05-06T13:12:12.711748693487Z",
-            "successor": 3,
             "id": 2,
-            "type": "session",
-            "label": ""
+            "label": "",
+            "successor": 3,
+            "type": "session"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_1.json b/libs/wire-api/test/golden/testObject_CookieType_user_1.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_1.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_1.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_10.json b/libs/wire-api/test/golden/testObject_CookieType_user_10.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_10.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_10.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_11.json b/libs/wire-api/test/golden/testObject_CookieType_user_11.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_11.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_11.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_12.json b/libs/wire-api/test/golden/testObject_CookieType_user_12.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_12.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_12.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_13.json b/libs/wire-api/test/golden/testObject_CookieType_user_13.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_13.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_13.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_14.json b/libs/wire-api/test/golden/testObject_CookieType_user_14.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_14.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_14.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_15.json b/libs/wire-api/test/golden/testObject_CookieType_user_15.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_15.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_15.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_16.json b/libs/wire-api/test/golden/testObject_CookieType_user_16.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_16.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_16.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_17.json b/libs/wire-api/test/golden/testObject_CookieType_user_17.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_17.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_17.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_18.json b/libs/wire-api/test/golden/testObject_CookieType_user_18.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_18.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_18.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_19.json b/libs/wire-api/test/golden/testObject_CookieType_user_19.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_19.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_19.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_2.json b/libs/wire-api/test/golden/testObject_CookieType_user_2.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_2.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_2.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_20.json b/libs/wire-api/test/golden/testObject_CookieType_user_20.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_20.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_20.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_3.json b/libs/wire-api/test/golden/testObject_CookieType_user_3.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_3.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_3.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_4.json b/libs/wire-api/test/golden/testObject_CookieType_user_4.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_4.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_4.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_5.json b/libs/wire-api/test/golden/testObject_CookieType_user_5.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_5.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_5.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_6.json b/libs/wire-api/test/golden/testObject_CookieType_user_6.json
index 46fa8a8bbf0..8f458ce822a 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_6.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_6.json
@@ -1 +1 @@
-"session"
\ No newline at end of file
+"session"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_7.json b/libs/wire-api/test/golden/testObject_CookieType_user_7.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_7.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_7.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_8.json b/libs/wire-api/test/golden/testObject_CookieType_user_8.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_8.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_8.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_CookieType_user_9.json b/libs/wire-api/test/golden/testObject_CookieType_user_9.json
index d30c4c46f35..ec03d333072 100644
--- a/libs/wire-api/test/golden/testObject_CookieType_user_9.json
+++ b/libs/wire-api/test/golden/testObject_CookieType_user_9.json
@@ -1 +1 @@
-"persistent"
\ No newline at end of file
+"persistent"
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_1.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_1.json
index ae8cad9acb9..2e7fd0642fb 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_1.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-13T05:47:44.953325209615Z",
     "expires": "1864-05-05T23:11:41.080048429153Z",
-    "successor": null,
     "id": 4,
-    "type": "session",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "successor": null,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_10.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_10.json
index 8197d3d7a31..fe60f03d42a 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_10.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-05T13:10:26.655350748893Z",
     "expires": "1864-05-11T07:40:26.20362225993Z",
-    "successor": 2,
     "id": 0,
-    "type": "persistent",
-    "label": "@🠕f"
-}
\ No newline at end of file
+    "label": "@🠕f",
+    "successor": 2,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_11.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_11.json
index 653ee207736..8b0b614573b 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_11.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-05T18:46:43.751100514127Z",
     "expires": "1864-05-05T20:09:58.51051779151Z",
-    "successor": 2,
     "id": 1,
-    "type": "session",
-    "label": ""
-}
\ No newline at end of file
+    "label": "",
+    "successor": 2,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_12.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_12.json
index db908f3d252..5037b359ff5 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_12.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-08T10:13:20.99278185582Z",
     "expires": "1864-05-13T09:17:06.972542913972Z",
-    "successor": 1,
     "id": 3,
-    "type": "persistent",
-    "label": "0i"
-}
\ No newline at end of file
+    "label": "0i",
+    "successor": 1,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_13.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_13.json
index 890f8a4c6a1..2829c13078f 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_13.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-08T13:32:34.77859094095Z",
     "expires": "1864-05-11T23:26:06.481608900736Z",
-    "successor": 2,
     "id": 0,
-    "type": "persistent",
-    "label": "\u000f"
-}
\ No newline at end of file
+    "label": "\u000f",
+    "successor": 2,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_14.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_14.json
index 9ecc1ab29dd..ecd9b59316b 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_14.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-13T05:03:36.689760525241Z",
     "expires": "1864-05-13T09:20:52.214909900547Z",
-    "successor": 2,
     "id": 3,
-    "type": "session",
-    "label": "\u00075"
-}
\ No newline at end of file
+    "label": "\u00075",
+    "successor": 2,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_15.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_15.json
index ca0e94f3004..3883ad78492 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_15.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-13T15:06:06.162467079651Z",
     "expires": "1864-05-07T20:56:24.910663768998Z",
-    "successor": null,
     "id": 4,
-    "type": "session",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "successor": null,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_16.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_16.json
index 07167d10085..4bd539b4a84 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_16.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-11T01:41:37.159116274364Z",
     "expires": "1864-05-08T08:29:26.712811058187Z",
-    "successor": null,
     "id": 1,
-    "type": "persistent",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "successor": null,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_17.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_17.json
index 9b8f699e220..5439ac68b16 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_17.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-12T11:59:56.901830591377Z",
     "expires": "1864-05-10T21:32:23.833192157326Z",
-    "successor": null,
     "id": 3,
-    "type": "session",
-    "label": "㘳"
-}
\ No newline at end of file
+    "label": "㘳",
+    "successor": null,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_18.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_18.json
index 81983a1920f..f082f3ac6a6 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_18.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-13T18:38:28.752407147796Z",
     "expires": "1864-05-12T15:17:29.299354245486Z",
-    "successor": 0,
     "id": 0,
-    "type": "persistent",
-    "label": "􅏥"
-}
\ No newline at end of file
+    "label": "􅏥",
+    "successor": 0,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_19.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_19.json
index 8baa7937f76..16d7c0bbdb0 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_19.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-13T07:03:36.619050229877Z",
     "expires": "1864-05-10T10:06:17.906037443659Z",
-    "successor": 3,
     "id": 4,
-    "type": "session",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "successor": 3,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_2.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_2.json
index e94ead17b37..5f5658f645d 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_2.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-11T05:25:35.472438946148Z",
     "expires": "1864-05-13T13:29:31.539239953694Z",
-    "successor": 1,
     "id": 4,
-    "type": "session",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "successor": 1,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_20.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_20.json
index 2160e632c2d..53e51c73527 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_20.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-13T12:22:12.980555635796Z",
     "expires": "1864-05-06T11:24:34.525397249315Z",
-    "successor": 0,
     "id": 2,
-    "type": "persistent",
-    "label": "􈀶0\u0014W"
-}
\ No newline at end of file
+    "label": "􈀶0\u0014W",
+    "successor": 0,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_3.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_3.json
index 700f7699f31..eeae8cafa97 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_3.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-09T06:32:09.653354599176Z",
     "expires": "1864-05-07T07:38:14.515001504525Z",
-    "successor": 1,
     "id": 0,
-    "type": "persistent",
-    "label": "\"\u0017\u0003"
-}
\ No newline at end of file
+    "label": "\"\u0017\u0003",
+    "successor": 1,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_4.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_4.json
index 80eea8eed1d..b1cf35013b1 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_4.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-12T17:39:22.647800906939Z",
     "expires": "1864-05-08T21:05:44.689352987872Z",
-    "successor": 0,
     "id": 3,
-    "type": "session",
-    "label": "\u0001\u0002"
-}
\ No newline at end of file
+    "label": "\u0001\u0002",
+    "successor": 0,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_5.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_5.json
index f89b1f376f6..cd7768a85b6 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_5.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-05T18:31:27.854562456661Z",
     "expires": "1864-05-07T20:47:39.585530890253Z",
-    "successor": 1,
     "id": 1,
-    "type": "persistent",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "successor": 1,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_6.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_6.json
index 12d5d3530c3..a131bcf40fc 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_6.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-09T21:11:41.006743014266Z",
     "expires": "1864-05-11T13:07:04.231169675877Z",
-    "successor": 0,
     "id": 3,
-    "type": "session",
-    "label": "x"
-}
\ No newline at end of file
+    "label": "x",
+    "successor": 0,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_7.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_7.json
index 538c7a86aee..36c9cdb21e8 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_7.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-10T10:07:45.191235538251Z",
     "expires": "1864-05-08T11:48:36.288367238761Z",
-    "successor": 3,
     "id": 3,
-    "type": "session",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "successor": 3,
+    "type": "session"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_8.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_8.json
index 196598ac46e..9c01b864380 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_8.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-13T23:20:18.620984948327Z",
     "expires": "1864-05-10T17:19:51.999573387671Z",
-    "successor": null,
     "id": 2,
-    "type": "persistent",
-    "label": "W􋗌"
-}
\ No newline at end of file
+    "label": "W􋗌",
+    "successor": null,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_9.json b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_9.json
index 6a42223f929..220143c1006 100644
--- a/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Cookie_20_28_29_user_9.json
@@ -1,8 +1,8 @@
 {
     "created": "1864-05-10T21:07:17.237535753229Z",
     "expires": "1864-05-07T13:26:23.632337100061Z",
-    "successor": 3,
     "id": 0,
-    "type": "persistent",
-    "label": "_"
-}
\ No newline at end of file
+    "label": "_",
+    "successor": 3,
+    "type": "persistent"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_1.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_1.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_1.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_1.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_10.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_10.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_10.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_10.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_11.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_11.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_11.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_11.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_12.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_12.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_12.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_12.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_13.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_13.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_13.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_13.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_14.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_14.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_14.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_14.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_15.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_15.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_15.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_15.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_16.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_16.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_16.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_16.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_17.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_17.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_17.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_17.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_18.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_18.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_18.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_18.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_19.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_19.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_19.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_19.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_2.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_2.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_2.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_2.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_20.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_20.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_20.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_20.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_3.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_3.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_3.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_3.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_4.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_4.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_4.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_4.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_5.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_5.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_5.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_5.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_6.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_6.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_6.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_6.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_7.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_7.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_7.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_7.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_8.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_8.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_8.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_8.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_CustomBackend_user_9.json b/libs/wire-api/test/golden/testObject_CustomBackend_user_9.json
index 0ef00b42988..1f1a362bfbd 100644
--- a/libs/wire-api/test/golden/testObject_CustomBackend_user_9.json
+++ b/libs/wire-api/test/golden/testObject_CustomBackend_user_9.json
@@ -1,4 +1,4 @@
 {
-    "webapp_welcome_url": "https://example.com",
-    "config_json_url": "https://example.com"
-}
\ No newline at end of file
+    "config_json_url": "https://example.com",
+    "webapp_welcome_url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_1.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_1.json
index 99fabeb1c1d..d92ceebc3ed 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_1.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0011@\u0011>'􍑣󲻐󾩥'\u0000Ur,\"􁎟𥯚\\󰂐󵘄'\u0018*\r𝄴Jx𦰒(󼟼􏐜\u001d`\u001e󹳽$#𬔋𭥜\t=㿨z9\\,v\u00169􈊉\u000b󴸜>\u0007✾42Y\u0015S𫂒|팥x=a9k\u0016epY갧N󹏷痹/\u0004󺄡1𦰰`PŒ:Zgr\u0019䐊?𢧀>[ᅸ氚j𢧪N𬹦\u001al𩫖{𩲺𦔝v씤\\yDx櫅x􅖭8O⟍\u0013\u001b\u000fwn]󴪮:\u0000'\u00005\\(\u0008i𔕴F􎒴X\u000f\u001ai󱵮I[Z󻋽\u00181􍸃P@S\u0016I𫯬%\u00001#8}\\;}])\u001fh_N9􇞠ḍm\u000e_􅵏B\u001a\u0000X\tc\u0000R\u0006w|3_xn\\󹆾ⱋm󸗔Q&}\u0010k&+뜀M𮫕􆾚h\u0014,\u00119|FB}𗵱\u000c󴬷󳍂.\u0003AL쭸/\u0017X\u0008;<\u001dX䬣\u000f\u0008oB𭏶\u001c[!𨯗P󻗱?R|\u0004􊐭\u0019\u0000}𣔥\u001dk\u000b9\u0017GL宵-抪B\u0018𮑈0\u0017𠎖󷫬\u0007}ns\\~[𩀘4D4V\u000f*\u0005k8gBN\u000f 䡺i󱱀𤧙󶓹o􊟇[(I𨞳:\u000fc@]V>>\u0001*\u00139h?𖤯U\u001c\u000f\rR󱣣o홸']s󹖭􋞯󽌉淒\u0008𧓡y󳙦𨚐n)\u0005󳶽~􅐱􅠃bA\u000cc<ᖜ葚#pUG\u001d/\u0018𦂹컠"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_10.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_10.json
index c379040c611..6b6c7169fe3 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_10.json
@@ -1,3 +1,3 @@
 {
     "password": "~󾉌jRa\u0001\n\u000f0K󱳜𠤿\u00149\u001c,|\u000f6󹯨P6G5\u00036\t􆥽:k𗤩Q\u0001谺\u0011j𪂏}5fvp4\u001cc7􌄽/J𐴢46󸩕\u0018Z􄁡􊉵\u0015􅳦\u0010\u0004ﾦ昬/XU􇝋R$=\u000ca6f\u0008􌌠8?E􃖜OU\u001f\u001a\u001cC􏸉\u000c\"ᖩM𪩌e\u0005\u0011M󱫩A~qq\u0002\u0004Y\u001bG􁃀>\u0003쐿󲼽T\rB\u0008n\u001b\u0006L𣩾𨪦𩷝Z\u000be,𧄸􋈱UZ\t󴱽\u0005d/\u0011ᕡ泥[.%01w3\u0019tZt󵐽􌟚v\t𭱞)<GI_4I\u0000󰋷<󲒪[􈼴ꕛ8%wg\u0002슨l\u0005@u𐑛󸑼<󻭘\u0018𬭪Ꝝh\u0013􊣞\u0007l2x_t\u0003᪻\u0014\u0019𮦿\u000c<|4^𮟈𨇡\u0015=0𠑤!Fm3𬒂V󿚟\u0002𫖫􄎵􎍭(F0\u0008󲕀)w\u0008jH\u0014'C\u001d\u0002\u0017\u0011𬡸⏅0eo\nX|\u0018z`\u000eK\u0016>LM\u001ef\u0006𢗛󷯸9\u000f@󼹯\u0010\u001c\u001b0oQe?[󼺉􏚼3$_𮏉\u001dZ\u0015锫i<\u0011􅳢3􆯄YF-\u000f♤ࡒ\u0007\"nP􈼨e?1㽟nIWsC鐈\u0003􃤕󴕬\u001eax'𭋆\u0003𣹎O9\u0002E󱱖\u0019\u0014t&;X\r\u0004%E9\u0008M\u0003𮂪pfI됐lm𫰾\"B󽸡\u001a雋<[ u\\􂔳󰶲󱚗𫡍j|\u0011\u000c\u0004z\"󰱱fs􉬊yØ%.𡵜KU\u0008\u0000󽛯3S𧵍􈆘W`\u0013U𭒩灥A󻮽\\eM\\)OB]xep4z𢮻ml<:0􋵠\u0017r\u001c=f\u000c*3\u0016'M_\u0010\u0002\u0001𧜨}󰤠R*𮪘휡M\u0000\u000fꏇ\u001b`𬵟#q\u000bc@$Z􅬶\u0016Q*,[𭸋𠈍󴲧􏜖\t𥆩o\u001d{\u001b4\u001f[2gGs\u0010Y)𥕮E􈱊|肘7𩵎􂌖j\u0018􋞷~=\u001cI􆤣03=\r󵕲󶨣|\u0013\u0018\u0002(}^􄅓w\u001cJ턦H􌆟𦞐\u0016쉫󰍼􍾻\"5~o퓔𝩰r𥧶:ov𮌟F􍷶;6HkT뵦𘙂ei􍅠󼹢;A\u001f^\u0010𨣎\u0019\u0010t5餟󴏎*󱁤跖U俚}􅠨\u0003ﮨOs?󽽂.s1􍪧\n\u0019􈤑혾wuY_Q\u000e1\\Y#哞S岻'\u001d=\u0005\u000b\u001b\u0006𨄑\u0005tA/R;𦦙𠋕\u0018𪆚􃹻]sq\u000e<\u0008^\u0019\u0013\u0005󴾩{\u0016棴3럝ik^\u001d\u0014P\u0001􈌜\u0019<z&5Y𫈝椈F烘5bh,:씶,a\u001d\r.P}\u001d𭮝\u0011&7\u0016Vj\u001by~\u0003X\u000497Y\u0018𨠱\u001e\u0018M괾MI𦠊!􈍍S\u0004|\u0000\u0003\u000fL\u0019󻒊^\u000b{"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_11.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_11.json
index 9e49e0e246d..883adaf37e2 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_11.json
@@ -1,3 +1,3 @@
 {
     "password": "f\u001br<\u000e賮%vg#=𤻯9&𫂾\\-b𤺈\t9\u0002\u000e𤫣%𪐖𬋑K\u0004矩􈸵吔\u0002~u1e\u000e4󹘐𦉵뫘G󵥺:S􊷾􇍊𬽣W􈅠G|곞K\\^s\u000f󲙅{!𩹕i\u0017\u0008<W[M𦒕[jd0\u001c􉈫\u0007\u0006QU6􄬫󿉯,\u000fMS1􉍸𡨗+轃󵬶V󹚶t\u001dO85\u000bN>𐦌+:􂼑󽈃R:9􌥢\u001fi\r|]𫥩􉸛󸲰=󴴊]Hd!,3\u001f\nt𧅉Rਐi(og􏒛u㱠\u000e󾃩V-􅭴\u001f󹯤\u0001L!𬥕?IsQ\u001e:l?I;*#󿙱_K[󾕔XA1a󺍰󰴮X䙘aYf󿌽􁊢󽨋\"𢯤󳄦\u0008\u001574󶔸\\eCp瘒\u0000\u000e𣂤}v$􀘝䜩螗S;T󵛈"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_12.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_12.json
index 661a2bf52a8..9a9df4b15b6 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_12.json
@@ -1,3 +1,3 @@
 {
     "password": "󶄔𨦚.1裻q<R𫻅Iu\u0016WP\u001f󾧖.𝝝Vᱛ\u0019􃂬\u0019ẉ\u0004Hh𮞐jY;=SRhp䃌.dkc𩔯>|X\u0015􇯺5O}\u0018󾴩c|~HBX|k(􁅿j􎡡J\u000c(W􎟳\u0017𨬗CO@\u001dX􏦩􊗩\\BCg!\rX\u001d󱉏𑒠\t./\u0016判tkovvp􎙣s\u001d𢽤󵚶{󰩚V9;"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_13.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_13.json
index 93fa7ebcaa0..01b48f44341 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_13.json
@@ -1,3 +1,3 @@
 {
     "password": "􈋭s>O}(4𮖛=h🌜7􋒥\u0002鬒GR􇂾?󶊋,𪿥M,/Z\u0004s~𘞧zj\u0015𖽤/_'-=3\u000c\\~8W\u0018󰍀/\u001fm🧖1\u001c𬋙5묧Z\n3?󴠺\n󽙰'6􆇓𣋾m\u000e\u00028\u0015/􈭕Z=\u000f􃋿􁝟B\u000b3yU*\u0012󺘟@T\u0005\u001c󸱄\u0002i\u0011w𦟾c􈠚\u0000𝒃:𨴅𗪉\u001f𢄟􌠼3*\u000f\u001cb+Z\u0011K􋛛R嗧n.ᧈ=D@NX\u00154_&\u0012\n,XMʦ\u001fUw\u0004RMi)-錒J=\u0003-\u000c$k\u0007%4\n𡃳󷝏U􃐓>㴺z촰nV>\u0016a*𢃂塸/!𣚸K􉭤s\u000c󳌘u\u0015􌽺\u000c\u001e7\u0017󳆓띞oA⼸IK(\u0007?🐑i7󿯶\u0010󸂸\u0014e𡗷􋾗yyJ􀜸>]𫠉\u0007鈕cﳌ\u000ez󽘝z_\u000bK52}B\u0004Q`'k㽋􉂞󿗍+􏯉􎨜v􅀍\u0018􀌋qsJ\u0006>y\u0015膺6b\u0012b|HtPl布W^%\u0018𞹨\u000b1􆱪Ts(Km\u0015(c\n30\u0018e%\u00120\u0006Av􍼂\u0016\u0015n\u001f졌4y[󳠾qo+f맯󱷣􃫨󽻻_zn\u0000%Q^FZ\u0005%ﲇ᯽\u0000󾄌𫟺\u001ds􆕥Q\u0010?-&= \u0005󲜸g󳶓Y?\u001dzb+\u0010N\u0014\u0002Da3󶴅\r\u0002wQ󸭴\u001c]T􇪇\u001d@P\u001cн􏴤2扙\u000b\u0014𖥃`\u0015\u0010;䇺𪻃?\u0011􄖢\u000f􉍷Em𥕚.𪇋W󴀐𮒰*􊌡G~O\u0017\u0012Y󺗲J\u000c𨀯\u0000x𪆊@\u0011A(𩃦GC%\u000f{t\u0014F冫WE􆈨\u0017_%m=𬼼\u000c롆A3\u000cI,뒫y\\\\Y-\u000b𖬶A󺹝oY\u0005d\r/\r\u0000F󲆗&HHqr=Y\u001aX_🙱H6(qXk\u0008󺛖NR\u001e䢂?,󿩼􎘪p`\r􆙽\u001f􎋾䇂4d/)_`\u0013\u001a🔓'QL󺀢k.屃󸳩^w7𨠺Qt􈩞􎩬i𦝶}H(n\u0004\\􂏠\r􀆗􄋓󱺰\u00083b\u000b/e󶟵W\u0007jg\u0012󼗉Mu+g\u001b!䮝h\u0011Y;\u001c@;Jd\u0014]P1Y\u000bY\u0019[\\󿇶#\u000fZN!k\u0011a7􎥳1ⴌD\u001f撷f`\u0012􀠔􍚨'v\"􅊔m􎬸􎁿j󾻜􉘝\u0013\u00111\u0008t+k8\u001d\u0014'hh􁸙j\u001ak󽑙\u0013\u001e\u0012,󵟑o좫t\u0003􀰖􎹖\u0008?𞲣𮕂e聡?)h\n>=\u0019w\u0004>LeG\u0008\u000bZ0\u001d_[\u00019\u0010c󹒂5𘪕^\u0012\u00174\u0003󽛍s\u0001𮃌K\u001c\u001d𖤖\rL\u0017U\u0017@𒊻\u0003@\"e颥LUj􅅴⨱\u001a?\u0012w\u0001ZZ\u001c9㼅X2\u0017\rq&󷯜󸾠pO+?􍇦6T"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_14.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_14.json
index 7e489ed5f90..a60488b84d7 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_14.json
@@ -1,3 +1,3 @@
 {
     "password": "bt꧵CR[疂\u00057𘞗󼣝􉛟[􆶣R;\u0016+\u0004🛲j/􇯝y􋅈􆚵􏗗􍤖\u001c槇2\u0019\u001e%􈑛\u000f貧\u0008󿬣l\u000f\u0014a\u000bA󾛭z\u001c\u0017)􃲁\u000f!d􇩸\u001c붯󲕤0X#𡆰r􃽫P]X=AC⇥\u0019)\u0007筤𥃙􈱮ᕃ𫾾𠰒T_\u001de,+dh\u001e㌳_UD;Y󷶘q#K􃐶𗱗󽼜\\Y:芍h!_]󿾄\u0007$/\u0005\u000e\u00125𗈘Pw2;G𩯈\u0003\u0000y!pb뀸􍡸󲴂􎣧\u0003<uXZ𣸫>\u00106𫟖\u0002L^☮\u0011Y\u0017刊𫏆􆦨󱋟s𝁜􆁳~ធc=.G􁀳𑻧;>[􂥈0𥅃楯|􏁏󵳸Cz󱸷,U6􍧮ᇪ􃅶e𨩈&>79\u0016Y!<丐@92𪹴Z\u0011$!\nkI\u00166GN􈉌'2S\u0000󸽪\nL𬴨i\u0018iE;󸊇~󱉰u5󴇦Q\u0018;x􉘷𥨱₊󲇤BUW𬩦v𡳓%\u000bL𑰗NI&OMAda\u00051J \u000cn𧖺d_ne\u0000ln>vBY2\u0010迫𫏘m􍣹\u0002\u001417,~ය\u000e􅣹Ze\u000eW􌘴 h􊤫/\u0001\u00191\u00074\u001d􉔘=􇂶N𤁝5\u0019󳢃𝃱\u0005􄐓z𘩞M\u0010zjMOt􆂧:󸠆*䉡𗟧\u0001X\u0002m\u0018u\u0000𛀻.\u001c^􇳲M/𩚪󵽁3UJ\u0000]􊉠`4􁚡<0$ƛ\u0003\u00116̲A􏈩\u000e.𬃻􉹆\\󿶭㽈#\t3y\u001e\u000c⯦\u000b-FO1'dC3 󱕽!􎹸\u0015}p𡝲 \t\u0003􊂀\u0017>󼐐]\u000e]ꍏ\u0005z A벣􇯹󳳥{\u000fꡡ[\tM镆h%{7\u0010A󱳂>𩖷nC&󶱹\u000c?􊅢󿎩SW'𠵙Vi5􃥢T)\u0004<!􂻽A\u000f㓗8&ku?e\tp'~,X6\u0019𦃄J󰨗m(g@hXitI4K\u0003Du\u001b@r_'kywhWvCG𭃁>𡏂\u0012\rA-2􇋏𩻶E^𥾩.\u0005GU\u000feK*j\u0017􄞆>|󸅫𧠅N󲿁\r/^?𫋟SH[뼰F󶉉G;W\u0003.\\푸𠬒􌠾xPTzJOxK#+\u0001QS\u001b_\u0005󱌎\u0003/J\u0006\u0015\u001f\u0018\u001c;\u001ch\t􆨽\u001d󴿇U𢍧\u0002\\{5𞺹󾺗𧵠\u0010'􂜆\u0016r{𞹔Yn􍋪_🚛U祲M2\u0007􂢜\u001e\u001d8\u001b<󵕃WJ􈤔\u0010j\u0000𪳾@XnT\u0005agg&\u000fj\u0002:8\u001csD"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_15.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_15.json
index 90af5cfc393..2ecc5c8dd2c 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_15.json
@@ -1,3 +1,3 @@
 {
     "password": "\u001e\u0001𧶮|􈃨&􆪲.N\u001dU.3Oq𥅇a\u001cH\u0016s􆴤􎂺\u001e􏟰nH-LNꔈ1\u000b𬌷􏰑j󴝗C󵑒5g}􄀷cw󰰵􅝟:EvZ𪧲(㙙\u0002F\rs=\u000f꺝k𢕴9􆬶󷘌\tK󾗟𨅸󼨊󿬆$o\r6𩋪9f𩜒𨵴+P􊊘󼳚𪇋zW􍎠i󲕿&M󠆭y(\u0017\u0017􅽷􌿉Z<A\u0010Vmc{QWT>\nd𣌕!p\u0000>􁕁7󶗚h𩮘􌥍E(𧖄\u0005c\\􆿤엀7vZृrwu_􁌀]C𢒶􊪊.\"5\u001f*𡠈6\u001a󿚂\u001a8q\u0015𪔑A𨺷=^a􉀾{\\*𔔔󵅨\u0005⤄l~W􃮝Tr󵊕\u0011\u0012x?셴wO}\r\u0004𣋭*􄯥 \u000c𝝯v\nBs𬎎ja!\"oi󽍦)\u0003𒒆gOW7-\u0010-\nP1AO󼚖F\u0012\u000c.\u0005]\u0012𠽓vL\u0018R􃢜\u001b>UMz+􊤬r\nDsb𨂋\u0015\u0007 \u001e𗧽贇Zf@\u0017\u000fm\u000e5\nkr\u001cc󳗪\u001f\u0006𪹔󶛸4r𒒮:􎟉|7\u001aE\u0011󰩣`C𤴂^𮮞􆳀\u001ceX=C䮽S\u0016_颊雓 􊯨𩿲\u0015孝\u0008i23U≽.\u0014\u001f\u0004\u001dc]_y􆖜H뫇3\u001bL􊮣3j\u0000\u0015􌼊,ㄕ:\r3𨴣R,n𘢄\u0017\u0013\u0010EPw􆠍\r󺹢P󷳲H0띤󶖚tE\u0005\u0007L`\u0003鰀\u0000b􊯽󲂲D(󺏵\u0011\"\u0000c𝀒G믢\u0007$󻲆􋃤I氇>#𤊌ot2󻜐1墭Mpឞ[W5𭁋h鈺\u000bOㄩ󰬉)\u0000𣃆W\t,@\u0004󲶷􋾞G泈𢡆\u00198mc⋿\u0016\u0016/[𪘄j\u0019侈􏘨氦\u00053󼲔b󽋺󲦭EFnU}9󹚟􍃭\u0006 \u001b󿎔`圷]\u0015x𒎆W􇧿\tᥰ5yR󻅅Nc0]:^Ɍ:\u001b8uz>o\u000fP,[\u001b{󿹼𩨨w=]2\u000e󶟞\u0019\"\t\u001b\u00041ꁁ𥞭8\n𡍠N]\"c*c1uH\u00050qjKC󼤡@&𩆞\u001ab􌾘*d8\u001c{𬇇^\u0012\u0012󼻒􏪷󺝻7𦀽􍓣ﮐ鷸󽸊\u0006𐼞z)\u0012M#C\u0000])\u0006_D?\u0006>+}7^^<sG\u0003<󶃁=\u0000A\u0019󶄉^Q\u0008Ru|+󼜤􌓕􆒄Q$PBQ󹙵\u000b𥿄Eqwcb𣻀 J5􁷇𣯴󳪴*7Jf𧈯􊫸󷃙􊽋d\u0010\u0004󻉥Zt\u0008􆼧l􆻊\u0003#!|33\u0007$𠭓𤇂Z\u0014$Z\u0003􍉼R󴢏3y|\u00083齗oaY󻻻\u001b󽢬z\u001c哑_CX󽲺􂹶􌹊:G\u000b~F𩋚m􁸬Jo\"\u0012X't𗊨\u0012 2I\u000fVW/wV􏌎W?C󱎒z􇵏󽷆9𣘞𒑴\u0008\u0007?^\u0011Bw2,!x\u0008[O_\u001c;c1'e7?y9􃒐\"蝓\u0001𣢃\u0004𭂎^oc𓐛\u0007\u000eQf𨊡K<𢌋t(;n+䇁\u000cl\u0005| \u0005V']\u0000𫻧AT\n0Dk\u001b䳃𡣖'M9􆃓_A#6𣡠󻫏@Q쥧GRR\u001d󼃽q@\u0011c\u0005Rf􌟩\u0016􃲢𨵭.\u0017\u0010\u0010"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_16.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_16.json
index c4b1762539f..b0bf7f4f5cf 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_16.json
@@ -1,3 +1,3 @@
 {
     "password": "􈇄\u0018팂b[2\u0011{|y᪲ALGcEv\u0003O󾳉\u0014\u0010𬢤&𘠫>*>\u000bOj꽁G/k\u0015Zy\n诅\u0014q󸢯P𥀻:G􎏩v􇵧\n󾩑割d8𮙉\u0013e7d𐐝󲂖\u0018OY$KN@+\u0014y=tt\u0016𭲗\u000b󳓮OH(棁\u0014\u001aB􆪃4Q𣃎t\u0016-\\\u0008䬍w.\u001d~􂒩rB\u000f􍦞um󺫚𭞚6\u0017^\u001b\u001f\u001e􂳛\u001a𪶔y\u0001󻹯n\u001cty𨦭\u001b|\n[\u00194𦪵t\u001e\t6K\u001d􃘡]\u0015E%\u0013q^R0𗊩Ya􊳣o􍓯&󷋻s#j,􉨲DYum䋚틗䡊𩬏󱖲􎊳𡰖!𘈠T_!1X󰳼󾇲\u001d傐mA󷎃㯓U\u000f\u001e.v\rQ\u001a𓉖eh\u000eks:Ke\r𡓈"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_17.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_17.json
index b514e9f11a3..7b36a30f39a 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_17.json
@@ -1,3 +1,3 @@
 {
     "password": "Y􏚆{C\u001a$)A5}󽖃rנּi\u0019\u0012l$􇯀B'/N#^(𨜮薃}𪭐󻟵\u000c~hK5)*%a)o󺶎B\u0008\u000cm$F𘉢v𣽭(𦨑􋾴6󸱊=>pzgR𐩃D4ⷻ&\u0013?𘍮𨠁\u0017\u0017H`Lly#^Iz\"mp5'󻤘i𭱬N⟹􊟂⽚3\\󽥙[XZb􏐿󶏊x𘁁\u0010U!Q5\u0000\u0014Mi|M\u0015q\u0016𣳏k\\R\u0000x\u0010뭱R;V#=|=\u0017&\u001f𢥾p1\u0003\u0010󽊥'\u001d\u0014,b1󴢳\u0000b(Q\u001ahu\u0019D<𬇎𧀚9\u0001Xm)􁳾𦿃􌣂:9𘐝hLfB#Fw`e󷙌\u0004Fb\u000b\u0017莫Y\u000e-󠄹􆥄R 􉺍\u0001g*!2\u0017􊤤o33.I@8𮜛l􃴞\u0016󼲖鉸\u0008hp-\u001f{􆯑E%r\"&㡞\u00129\r\u0015Ab6\u0013􍆌𠷁頎6-U\u0005筒劲^=\u0010鎌𢣮5\u001bL\u0017-󿗉􁍜wo􌢋'vt𑰙\u00019𢭠𓄞\u0013\u0016\u001bI𢬘󻖅l\u0004𧽍7\u0012t\u000e􇩙~$;g\u001d줰\u001d3𧪟s𮆛湺rZL󱠆L󾁭^h[h􂭸䙖\u0003\u0006짿TꉹC𧒶􉾼}-+U,B꧐䤾\u0012^􎺢쿚𝈲𒓬󸤔\u001d⣂󾎷抁\u0000􁪵\\q.2\u0017F􅞱쭞O辭󸙁k􅋛H􉠷;𨱳\u0015r󲴥b8!-𪶯䭕𝪊뛉z󳶚􄺊D\u0019k\u001a#*𛋻gzC\u001cg-{\u001e𗥟W9𩄒𥂆\u001a4\u0012\u0010E\u0004r𦓗􏉞r\u0007|eY3𨻿x4𑈇4\u000b󰡔\u0014]\u0005\u0014Ⓞ󴇱⎭(O@`@鱐\u0010[Em󹅕/96f𭥈Y}lftO􀻨_SiS𤂰嫛\u001fSL\u0006\u000b\u0004-{R󼍢k6 𑇡3\u0003^\u0001⪽u%V􏘊┹𑠰g몒D㼏J2?Z|􀕇\u0012Z\u0017𢥸\u0013A𝟘(@𬸰󳃆\u0005󳗷+\u0011DᎩ8a6>󽅏\u0012P[󺀅3a5P\u0005/𦉆𤽈⼎7B\u001bk몋Sİ%󶑾􃅶a𨤣\u0000𠬍Yahy􇯻g@􆊯󼟮BvE\u0010#Pe􂴰;\u000f󼼟􋴓[U&棘f;Bc􄂃R􊣑(l\u0003󺬴VT]%0\u0011\u0018e\u0003󷀔\u0007\u0014\u00064Y\t~\"a􄯫\"􀶗\"{a7􈵩(;J`la(K0\u000feE溕䧘~𩴞\u0004\u000f󳿜\t=􄰭􇡥􄸲d3}8剐\u0004M+𑌂󽼡척􃉧# 􄞵󶷰. 诃\\\u0016(V]}\u0019󿧕z󷷓c􂫠>𤖥󺖍z6󴃈󴭆\u001a鯖\u0016Y㈲rK9S㛟󳍞ps\u0000^e\u0006S󻮍g楐+󶻻󺋚^\u0007󾅷i𗴧w􆬇􃉄4a\u001e\u001c𖬨􌗮𠽧\u0004E譥ON$`\u0010G𝂟l􋋧𡠱$ᜬ\u0006􋖳\u000e󽑊|􆏒^􂇡r맾\u001cw\u0003󻣾tH3m𭯮\u0000\u0003op𬥬"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_18.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_18.json
index 7427ebd3251..8f186747cd8 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_18.json
@@ -1,3 +1,3 @@
 {
     "password": ";inV{\u0006:k<𦴸'f𣢧OO𩾄Jg~䈶y 􃥹4f𭎣L8􄟺\u0015E)\n$[𥤕𨂴W)􊉆Vq􆶵􁹽\u0017v\u001c3\"갧L\u0003Y3|䐙D.𪼹𢤷裰OW𩙾 c󲤄9#c`]\u0012oZl𩆿EYp04qh^u\\𝆇􍋅􀈱PB:\u0012x\u001c􌭻\u0017R&e\u0008󻜂\u0016Vq\u0008𠑞\t^q2\u0016􎄋C𭛬􊟑|3H󵞽🧪Q\rQ𐅨\\'%F5yon𬅅g!*JR\u0013|_XT:\u0002/\u000f􊁰􆅊ts􏪤𦎣⢹\u0017󳓉\u001e+󰲱R}4䴗K.y󹗏𧡗!6Qe𢭣􀟬𮂺\u0004v𪊸H\u0010\toXZv𑈌2𢢴$𧷝l𢐢􃼜#\u0012󿗭掂\u0015\u000bJ󵴓&B-^5A󾧼\u0003jz6R|{]f􆚷~..U }#s𠒕\u0000𠗒s|𗆼\"𠟻\u0010\u0018Lhq󼗾\u001b\u000b󴷂􃅦8\u0004EC\u000f𣓫cP⨈\u0012x󳝠h𦃦9\u001cA}1\u001esx'\u000cKᵰDDH⊙\"QBw\u00008\u0002{~\u0005\u0017B\u001e􁒩:i\u0000]\u001cuOG渮@|=#\u0019'W9d*_@\u0003go󳇧\t\u0004h\u000fD?T9𬛡󹁨m𣁒>c󴦚\u0000i𤡁y\u0018𬊪EPq𓊑=I>\u001f\u001c\u000e􋏌󰲂p󼒭菸/\n\u0007~exe󳔀&E|A𡩔\u001b𩓒GV􄊜:󷆖󰅶􈎠m艤\u001d\u001b􆜗\u0008𥨥*p~*=)g\u0005\"𐑁\r+󽜐1Mg*A􂿷h\u000b냧>K }HCM󰤒\u00163tr󾉎) Fs+1R𤍫4𬮩\u001f\u0005􎝻wpἚ\u000b\\𤊿r􄡻u𭎕\"'𧾖$\u001c\u001b5󵣆=#'\u0006a󻣌󺞲􏒽6hb\u0005\u0008h\u000cz-\u0001𛂖UⶏOⱆ\u0015􄟨+>􎏦􌩢𠥦$\u0014󿄛I󰿙s\u000f㪍s\u0014^q\u001d42Y\u0003FI\u001c6L\u0003􁇺&󱠰󼽣쮛􀌩5􊕼|\u0006}0T𔒴󴝸iP+[\u0004Z\\U\u0007🍡AZ宊Ik˃#0`RB\u0012{𥛪\"1𤞝s\u0013V!<𨑎𦚹󽲊𝩳󼂮𪴗윮iyh_\u001dP=e}𮥢a6\u0015=\u0005䨇\u0007􉊝C荓𥏖\u0012N[𫅃󵍚o􏅫{\u0015󶥙H%𭛐e\u0014\u0006𐚗󻼾P|􅱨O\u000f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_19.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_19.json
index ca242ed4d6b..e630d25026e 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_19.json
@@ -1,3 +1,3 @@
 {
     "password": "Kl\u0005BCU󽻹X^𝈿\u0008K&\u0016>ij\u0007傠\n+R􁏰%^'铣jae@?󾶵𝩻uy:2@'y Q\u000eF\tQ󳉯􇈑km4\u001fx2􋞫X􌊁𐝈\u000144󻯽z%􈌡B\u001b󿦶𣦷𪼒\u0001🕁󵮟-3LD\u0002)f𢕱?\u001f\n𥎩3\u001b𮠂<y_𥋺󱤄i@g&𠉄P\u0013o矂:7$GU\u000e𧍌黓4sbo\u0005듁Zk\\󻛺.p<󷲑D_𦥛L_S*B󺺥T󷼛󿞞t󳠄iO􈭽;E畬lM𠈼󲶺\u0006󾺖^􁅍s󺷊󲞯R[<\u001d\u0003𫡥􀾆?^?󽃵\u0017m󲘲G}K\u0007~»\u000f[\u0003𤩬嚥\u0011=zr\u001dF\"\u000bw󷉊\u00077L%mC\u0001\u001e𦻃󼠚j,<\u0003F󺔊柙lJC~K􂡲#n𢆕\u0010?`􉔗2]璔󶘩U뷴\u0013}CkP度,*𨒂\u0016󺤂*\u000e􀘁<j􅂔l^v\u0003󺩶^뉺a3v(yz\u0008j\u00042𪁟$@1\u000c󳉅\u0015~y󱂆\u0018󴑴Qcv倫􌉑𡷤dI<󽙵G붙\u0004y\u0019Vr\u0000𭟯(\u0001z\u0005%(𠙿v\u001aEWcrY]'\u0002\u001d\u0017C\u00185􊗯^_\u0007\"ꆠ🕆P\u0013|O󸶊i럝=\u00185\u0003xl\u0008vm\u001f,G:~\u0005Y\u000eCF\u0016#슰HZN-p\nd犩}Re`\u0004\u0005M\u00026𞴊􄚘𗳚|IA*\u0001c󶵲[󼏸\u001e󼺰avPC߁\nMV𦫘Jo󹠅9H𦩠󲔆m蓻NX𗟵󹧦Pc𬑜#𢆼|\u0001\u0014􁦢`𤬮.Ud𭶚\u0014\"𥪁S\u0006F􈲀V\u0014􅱭톔蕬0􍵱\u0003o.\u0017G.n~\u0008T@#v􁆝9\u001dj󷋂o󶁗\u00145PeKO*Nd鐡\t'&B\u0015EMq4m􈌍j\u00013󰌇􇣢|\\\u0019X\u000cK\u0000\u001fW􀀕𨁆\u0008#rL𠷑\u00010I\u001cexU*᙮t{\u0013𗈎N4􁐮MND\u0005𔒯F\u00135Q9\u0013&\u001b\u0011Z#Y\u0017\u0006󷹽J󻧫󾏚\"}r\u000f\r󾣯SR)<g&]t􈈇𝓠󹑼`𠛔\u0010\u0008󻵨t\u000fq=L.芨􅈅:󺜗𧂡m%Hs!j\u0006P∘#9o驥nm쥇^f􌼆\u001e𥦔]>tIH\u001c%!棻\u00170蟇L\u0017𫪍o𭺕\u0007Es󲱤|0ᬆ8(b!xZz㝐Cኝ\u0006\u0015S/\u0002\u0003m󲥬E愇E󶨕\u0015􋋃6\u0008U􈭡\u0000􊄯\u0019oM\u0007𤿴H\u0016\u0004\tp]wK𧉆𠂀𩭉oCzL\u0000鈙᪐`󶍇\u0001`𥶺F+B𮫮\u0014s\u001d􎟯󶻗𣨊󷀇*Va󸏮3𖣀U󾕨$󰸝𩢴i𤫎鹂sᠩK𥏖􄸶6a􏫾A\u0018yOᄡ\u000ff􄐘󺵟;\u001d\u0006\u0011H\u00179$􇇗黕-5􈇹h\u001d󵭜\u000e\u0003{\\BCh:Vh\u001bv\r.𢹢󷊰fo𭧋􊯓𮈾no\u00038\u000b\"/j󵂿􍉬bHq)s\u0018~q퓠\u00062􈺕󰚸\u001d|\n󱹘R𨗣Me#/_두\u001c3\u0003囁&L\u0008'pT\"UR󳘪+=>^\u000e5?r𭫝}Q:\u00003/$6ꭷ􇘄"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_2.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_2.json
index 6aca7bf98ac..c3f8f3bc49d 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_2.json
@@ -1,3 +1,3 @@
 {
     "password": "󰗍󾷸OXS9n+u\u000b3\u001a9𮍍)\u0000\u001dd.xf.3H1mc\u0018\u000f@i8>7ob󿳔\ry\u000e𤃬J`U{𖺗j@)𫷓\"{􁉾,𭺛s󿏥\n@\u000c#㬱\u0017E4?7禙)\u000bh󵟖\u0008'𠔭~-{CwZ*󽋩𮡞\u0017eJ%\u0014󹷔\u000br𧓒蟊|A[!U\u001a🙇\nvᑅ\u0018}r_\u0015\u0003k.\u001e𡣓>􁖰,胨[w\u0016\u000b𪿓SHH\u0013i𝈿\u0006a\u000b*\u0001o)P3nB\u0017VI\u0004@3;5pl\u0016\u0011\u0000l􏸢g\u0018\u0013G􂅁𧣎4\nn𗹰󾯬\u000bk\u0019\u0016V-\\ 4Lu+𪒁C:fd'綡]\u0001DW\u0000^9\u0000\u0005M4r\u0003檥u󾉰O𧲓`2+4l􌴈􇂔􈐴Z31&OE\u0019􉠗3󼟛R\u0004󴒱h\u001c󿈝􍵢kV𮡓|PP󽏁+hYd\u000e=\t_\u0002쒨󼴟,\r|ṍ)󴓴 \u0004)Q9S󿸻rH^\u0003晕m\u0003𝜮\u0016`\u0014𦻴L(󼇛\u0013nGeQԼ\u0006󼴨𐢃ha\u000f\u001e\u0013Ph8#RềS#Q\u0004#/󽌂Crw𥕛OK\u0016\u000fpT{6f󽑠j\\Yb𩋳6/v\u0002\u0001󴜩\u00187P􊖲󴽮ﺫ𗠑󴵨O\u0003Z&󳸦A\u0016Z􇜽@We\u0001yeD󿧯]\u0007@􀹱F\u001b\u000e󲿣\u0000?#K\u0014\"Ꮎ&_[:TEq?w𬙝𥚗\u0011\"\u0016rd𣙰y\u0013c󾨝󼭧{\u0018\u0017;>?󳕸\u000e\"\u001e𨹛\u001a2\u0013n-􋄟z\u0004GD-S6b帚󵫦:0[#Bb\u0012􊃥\u0015zF\u0007e\rC\u001ax<󱁛K\u0003\\\u000e=􉛳,943m 𬯍𮤜-\n=\u0011\u0015𢬦%[YX爫?\u000e~2R~h\u0008\u0008X𖭵e-7?նD.OLru}L𠁯\t8∄搵)󲴞􄄵Z~l\u0012싊𧬁\nZ>[mZ\u001b\u00187,\u0001\u0000*𩘅7|􋢛[l𩲒\u0001\u0016\u000fF|f\u0004\"끙W󱕉wtC𠆋ꓴ],K\u0019=d𧨫\\󳴒e7u=􉙊;\u000e&lIT)K2癊獒U0W8𢿁5v𦷈7Pb샍􉑣{ \r]󼺫\u000et\u001fv􏓓\u001dMk%\u0002\r;zw󿑑k\u00076T\u0011I\rkᇭlQ\u000b􉞓U^U(f%樥W󱳵\u001cF63V\u0005Q󽲹9\u0003󺼰K\u0018;?Nᗇ#p=􍛜m󹒾𡊓\u0015q.p󺨊k;.\u0001gF􄁹􌱯g6\u0002R􉀼𩆿a\u0007\u0016Z\u0000󾵤A𗸾7[w􂺧袒lhR\u0004轺𑲇\u0011(l\u0007av3q{*P􈨷\u0003RbJO<𪕖􄞆6㨇\u0007Ls\u0013\u00157]\u0002絁\n뎉𐄒5􇇏<󲠑\u000e-c랽l\u0001+\r*`0O\u0003􄇢_3\u0014$I[\u000e^􋅏h'^Ir:\u0011󳣖=W\u001f\u0000W󰾌-fR\u0015k}hxB\u0000"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_20.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_20.json
index f319fd04f7e..522fe368726 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_20.json
@@ -1,3 +1,3 @@
 {
     "password": ",P\u0000/􃜒c󺗜\u0003\u0012􊲮ᵛ⠁􀯯\u000c xY}쪗𨭫Ys^>\\&􌼺\u0010@%󴣜l􀆑\r\u0016\u0004􌎣uJ􊕌󴝷𫋍zR\tm󱿭\u0004􍢲S:\u0000q~𓅪QQj𠱢FFS\u001bT󾌣C\u00145/4ꍈL󹛪]nn\u001b:&zx峝DY*se)Gjyt\u000ft\u0008𦧭󷁏𒆧𭦠󱘶q􁣐📱􈯩􈦗\u001e𦠫𢐆/>y\nB*WG\u001f\u0006?E􇅥\u0001\u0006`F\u0000wv\u001fBFZEi􂒳􅩕\"(\u0005\u0016w⣃qD\u0006{󿑍\u0015󴘎?@􁜁\u001bd𧉮㡢\u0004\u000e[[2Q𑣪q\u00038𭡋䍂\u0014<J\u0011\u00129\u0000*ꩿsD+<듨v4\n\u0010VM􈭷2F🠅V'Fd\u0018);xg3*OZq:\u0011\u0001뛑3󺈨Wrb@﹅󿦸𐫵𤳈0𨄦.\"<๔+󹃺x\u0015:*2󸁀q?􉎱A\u0000Z󽾮s\u001fP𝞏􄖥\u0008\nr`\u00051⨎CPOD4\u00008󷺊$\nh\\HQ?뉶 \u0018Ig\u0017vxmG𫗱󶟍5􈂴\u0011㦱\u0016^\u001f𮃙;7:􄃙h\tF􁰷\u001c\u0017\\B𧡣\t3\n\u00071#Pq\u0003𩆧\u0011)\u000fu\u0006󾎐aUk\u0000 \u001fw\u001bF󷧀@\u0003.􌢅i\u0013𥎦<􂴼倪G&oA􂲯:𭉉G􈿄\rvG{O[`W#l:\u0013􄿔(?\u000f'Y𩋖9Qo\nh􂊸\u001a\u000b\u0017R0WFx^즥㈣%\u000e=v)\u001c㸍\nﳔ𘣤𤂇If󴯽􎪬𢀍H\u001c?}V\u0008T>[\u000e<9F\u000f/:𡅯\u000bp\u0006*X須# x=(𤔜𗆿󻴤䭈$iWu𦹺𪩦\u000fDXF\"􍐿:r\u0000I󹪹\u0004+󼓭\u0012x\u0002\u0000󹺘{r\u0000]\u0002<q\u000b𮮙Q\r\u0011#\u0005(\u0017z'\u0001\u0012\r坞A𬦨𣮅z착󺞜N!1\u0011DEJ\r\u001b\u0013h\u0019ங󿥍󷿺\u001c5t`}O\u0018bM􂄴~\u000b\u001ah􈶬zt/J\u0007<󻽁\u0011># 􊫬S仪w𑘄;Fo\u0007\u000e𐜜hzv󴗶iJZZ뤁I?|~Zz\n$N7𬦼s\u0007\u0015HG\u0003_zp\u0001]\u001b᯳H#?uu\u000b𬛅J\u0007\u00193#9\r\u0015🄧/v-􋧠sṸ-\u001a=󿎟󳢗𮪝󲧨󳱥Z`䬭𐲖DY𢗁𫦯𗽼#􋼵9\u0010ahKQ!wk{c𦣒4𠕿?\t<O:{1%ুta䲖𩼮󲇀𣔇\"𮡋m)m𓌸l\u001aTV}-(d𣆢𮛄􏱵LC\u0007m󿿭q\u0008􆢐\u001ak\u0011yh󾪗땤𤔹􌄎탴⊁󻐢q竛\u0002􏻒$𑩠𠍔.g􌂿𠘺,􊀀KZ\u000bJ􂃒^讉me鴞M𢶢wE𗨖iG\"Y\u001dfkU\u0003襴\u0010\u0004􃆛#*0󸗘𮩴淀m"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_3.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_3.json
index e2f3ba7a239..c9405a62b5c 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_3.json
@@ -1,3 +1,3 @@
 {
     "password": "+\u0014M􇢖\u0008N􊵰ḩWC󿦚W\u00062\u00005􁠓\u000b𫻭{Q􅏤ZnyA-\u001d# ;;􂙬"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_4.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_4.json
index 308cc83da44..4f034d1c096 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_4.json
@@ -1,3 +1,3 @@
 {
     "password": "{k󻾿j89m󻍌!.,󶺦󱨪Tg \u001dG􃚱i𫰰X\u0013䏍~觬􇬑KB\u00173Z𝓅\u000e沃ytV&UZ\u001fjaO/󷯴\u0006~\u0005{𭞨\u000b𩭳🦁G􁴄󴏩)𦲺.\n>􇾙:@𥇱\u0003a\u001bMW|%\u001fh󻔈x_{\n.>\u00106R@d\tCW𢑑\u0001_\u0014<n\u000f\u000e󻦂\u0000`E󼩍H􈺈𗡜<l\u0005\u0004\u000f\\~$0⪡H0󻍻{ku𑄿􇬤6m\u001e\u0005\"\u0005\u000c󺰃􄛗\u0010Bt\r\u0004[ic\u0007H7T􆺍􏬟\u001fz🛅H;𓁰d1BX\u0010𪊹􀭼攁\u0011趈¨& (s痥u1C󵈄\u0018\u0011*(󼱄𮧺_􌓶)@P\u0016𪰆𦷥v\u0016i-\r'᭧r\u0013%󶟭\u000f􄙞􋖕lmxi6\u001a\u0014\u0005V\u0003G5􆠅5X~B\\\u0004\u0014𭥽L篫D噥\u0005\u0012<QA\t~\u001fBE󲩦󾛿\u001d𢳣􋉤#]𒁞YY!RK]mtlXau󱗖q!z\u0010)H􈕘vW\u001eim󹾣N\u001b3􉭿􎖕AS?󻘖B#\u0012􅢦;\\𘨘)䧀E\u0003\u0003􍕴\u0012\u0014Z\u001f\u0011~1(&𮞞m𑰋iBK8\u0007P󳩜O\r⡗/𡵌.𠉾#$󼑁A󺮎X]\u0005􂷵-\n𧨴,%𢸔 P4Z攀`\u0006H=O,?\u0015!\u001c(*HhNU\u0011b\u0001􎣸\u0019b\u0016Gt󳑄c*󸐋l(b􁪴턫.􏎑􊏽?4Q𧒝'&􊶥􆀨􏧰p\u0001􏬖th{|\u0011𦢠]\r`=!\u00029`2j{\n􎋿r\u0006O)1Vz𧍇󰇈\u0016􀿫\u001bmV\n𐎢3\u0010\u0015\u001f􇼣W\u001d`𑒃\u0018\u0017y󾡒su~\u0004a\u00029\u000fs𤛱E1Sh\u0018pu󵑹+\r\nW􍤽,첒\u0019|!n\u0003痖R5\u0004V貫􅈋󸧘\u001e󴆘:7𑒬ḾB𡕪h􁎘sl~󹩺H!:q\u000eB 𝌼\td祵^8h󲄮􂓶􂴻\"}L\u0002d󸊶𧢫𥐅\u0015jt?PBW,Wq:!󴄭Fx󰛣󴖺YGD\u0013lhe0G\u0003?󿣝8xk\u0006i;z󽝪􀩷󳻟躎\u0016Pr0􂅂-4􅶓\u0019|EV+p*V􂝆y􁓵\u0002ᔌY\u0000惮c𫶳;vW􌟰3Z󴻕Ij|\u001c󽚘Q󿹓_〔㴓􋯩+g!􇠐\u001b뼂􏊐9eV}C\u001e𢹢2ꗐ\u0017dA\u0018\\\"K𪤸*%,fQ\u0006*\u0012\u0012􌆻w\u001c3Nz􆂭x󽸤c_j1D\u001cM\u000f󺠡Fm𣷧Hno𝣃􋼖Oqb\u0001\u001c@jW􆭇e𝥡\u0004?r𣁍Igm\u0005榝a𨜣󿖕w!􅭕(<\u0011󰗷󵨶󱮎\u0002\u0010􂌨􆜖Dd\u000ba󾢉 J𑵥lW𦾰뮒㻦AHU󲓘A\u0002'􆱯Rr穡ꪤ}\u0019*ԍँ 8'+]/AmR𒈆\u000fk󳠽􎭃6=.^'0􈷽=\\\u000cZKVb \u0000\u0005YJrK⳽\n#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_5.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_5.json
index 170f002a6f0..7a91c6f9785 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_5.json
@@ -1,3 +1,3 @@
 {
     "password": "m^+铁\u0017e.R\u0000􇑱:􏮒jr𧫅O󾀈I疴i󹺚'I1􆉆AK\u001c\u001a+Q8S\td􈠫䓫>𓋬!'g\u0016󿆧!RS\u000c\u0015ᦐ\u0002(貿:F|=\u0013\u001dtg𪂅&\u0016,r_󺝛OT檜Y6HquP`\u0005Q\u0001\u000eD)=\u001bs琭\u000f?􆁘BO%[𧐷!P昳󷨌Rp\u001e!Xe$x􏋈𣊠S󱎑󱺮䠿\u001dT􍼛삄𪨢󠆗}oZl"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_6.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_6.json
index fb6fae92828..f46629852fe 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_6.json
@@ -1,3 +1,3 @@
 {
     "password": ",\u000cT\n⬝𤯹􏭧6惄\u00022𢭴Rjw\rX!Us􇇪f\u0005%MA􊁟𢍐Oꊑfs嬯u^簞ᕽk9\\g4&CyT􇻥.􍈩𝈉󽭷\u001c\u0015VQX={\u000c9\\􆪞$w(w=\u0012\u0017󱘖\t𡂋\rX0𒊢]􌐨G􅘘Z\u0005[M1S𣈤󳑗\u000b𨴭`nwh^へ^𢞸,힎VM\u0000W𦰖J󼩈󾤼\\\u0007=6峿uFὩj𧒏\u0006\u0013􃂿c=\u000e\u000b썅C[']<\u0003\u001dFm􋢬\\J$jd\u0006w滲}\u0018!^-\u001e^\u000b`𣣚9E{𢁢>\u00021n𡾝V󷻖fN\u001e싕xžm73􀼠\u00154𩻌wtm𗅏f-V츠\u001e󺎃(Ey𭳘~\u0010𞺎\u0004󱒂􋇳<(􍉵㹛M󱊏1L*𫠾󰴕<s􌹵c{&r\u0010/%Ap.\u0014𮩿}w󶽑󽩄\u0019󹋽\u0001I􌙠􌰳\u0011O󿁥\u0011ih􌄋`􋊩𩙀\r)\u000eQ\u0015󿲠_A\u0014+t?C⊨\u0003𦘖`R\">P􏉮ew\u001a*;󹊒𦌗󿧞b􋯳2\u0003,3_\u0017g𭇁w\u0003-ẁFwX󶌱)&𣒍^+  =n}S(\u000f󸰿\tM{Q\u001d3z􍶀s𠫟\u001d\u0004Fs3𑐍)ᨄ\u0007mom:Rᾮ\u0013譒O;c\u0014qM𩋘f#;E\u001f:(茠(\u0002󶮊FN\u0003)􁌫\nIOuG\u0006󸃷xoA\u001c`m\u0001s]:󺕇^5\u0019\u0017𦶵z󹒮~\u0008뱄𡁑\u0002􊱑oj\u0017$𠤥$MK􅂌n\nⅿG\u001e󺎾E%􈊥iLRpbg\u00106𝡠倚=\u001d.𥅐?qW􍃺&0\u000c)\u000e^V_-Utb촰竰]RT𣣂|\u001a%l\u0015\u0003􄥌P\u0018\u0019 >\u0019􎏦𫯶M#3\u000fQ\u0000󸭴si- 𭫐\u0011HT𗙳T􍩏/\u0013\u0002\u001f󴙍M\r𦛼䉀󲝃􉆬󹣧V\u00174\u000fB􉂥(=BQw$\u001a􄮱𢁏Z\u00180\u0011🉄B7<(mb\u0013h𗞢훚\u0012z\u0008𣧴QaQV𪲒𤼟\n󰡇&\n\u000e󸯧Q\u0002j\u000b3\u001e=_, \u000f\u0019Qu\u0004\u000fY\u0011\u001e{\u0019􄆀\u0016W𣗆𤜘X􈅖j𘌞yg\u0005w㣑Y4g%\u0010󹸟z􂇀>_󺵉\u000f􆿶W\u000f􊱢\u001a/E/\u0008#*\u0014(\")I𫋘󴟺4>3邭O\u0012\u001d𗈳x𛈐󼐭\u0013\u0001􁃂T쒃A8N+`:f\t\u0019󰫫<􃴿EL𧍼3㢐🍩\r`\u0006y\u001e\u000c𥁲𨝖QdS'Rw𫴁>S𧋃􇔯\n\\L𤰕}𠮋􄊒qj=􂧶𪏡Qz嘄𭼌\u001a9yf\u0019c𭹻le📧\u0010=G,k\t\u0003\u0004ѭ\u0014^'\r\u0018S馛;f\u0007󽗨w\u000bjV>\u0019\u0013􊜨W$rc􊆆𪈼\u000e\u0005􆐨NE\u0000\u0016ᬉ𩓳Bz,[/2W󱖍\u0006󱢨𫨵~s=􅸳\u000cA"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_7.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_7.json
index b8180e405c0..504d5f2b6b7 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_7.json
@@ -1,3 +1,3 @@
 {
     "password": " ɰM孺J\u001c􁗺Lej\u0006坝ꊶ뙑𗑅^5\u0012󰕐<K\n􀉓&:􊭅Dt\u001bg;/R\u0019w\u001b\u0012,Q𠬖9􇟡\u0004|S\u0003\u0007AyB]\u0004󹿅`g\r}37P󵾃𬙬l\u001a2\u0017H4ʃ\u000b]Q1eL<fw\")\u0014-p\u000f\\\u001c𠰅#{􄉎􅣻(vM7ጭXG𦂫z𡨠hq\u0013\u0011<\u0001\u0004l\u0017Lu>TJ󰝔9R\u0014􀢽,,$E[\u000e0\u0003sb\t'\t0>U􉾈\u000fr33f𡝃𢿟fQ\u0005Q\u0008\u001b@51u*!\u0017􀒼w뗇>]L账󽭑𨀶L\u00192i\\m􊦀4c%\u0016␚\u0014i>𝓸R𨋵\r:z\u0013,`49s곞𡳱􍓠m\u00120I2󲝢𡠏􇁢[ge\u0013HS\u0010G𪮺:#j\u0012X(*KSOs>\u0015rB􂕀!'\u001e\u0010*.j\u0018\u001dJpS\u0007/,\u0007酒)\n󺽨s􊥪\u001ee􌍴􉕠\u000eNꭇr\u001d􍴂󸵳\u0019|!𗧭n\u0014k󹽀󴙛􅄈+󳷈%𝃋S\u0012U[O\u0005􏎫\u0015󴝜𩨲\u000e\u0004L􏏢d\u001bP\u0006YF\u0011\u0001𐅋漃𫑪\u001a􃘙󰩂\t𤽼xI󹅲𪮝\u00131F𫅟I𩙍;󲞇\u00004:󶪚!\n}k􇲍AaoT𤱾X(_\n\u001d\u001bf슝𘉲>)\u00126\u00128𦚕B􂾨:󹻛}=3\u0000󲼶𗸒T-%fT#`,J,\u0015[\u0000e]D\u0018\nw\u0012𝠜\u001epW%𣼔X󰮞o{Jek\u00069𬤟?H\u0014󳙆\t>^Sa\u001dK𢑮\u000eQHX𢤆+W3L\u0018|􄲌\\\u001bl𪩪g󱁽 P\n#3\u000c󷘐X</\u0011跒\u0013%\u001atfMDVd\u0014\u001c󶆸n󹩩\u0002m󿘾}_,|pF\u0010(`錈do~:\u00133󻒵\u000f^􏎈㻆U􉌁󻉳\u0008(p󻫶`_𫩍H󺦼􀳬\u00028r󳨥\u0008+y􏡌􂹖D%S􊋺S\u0014􊵧𓅵On\u0014kt􎎠1𘇴;\u001f󼥔\u0006'\u001a\u0014u}睋\t9zI\u00168-\nD\u000e]fQ㈮󷿒c>\u000b\u000f\tm-\u001e𭘓:'􁈯󱱸%j<vY\u000f\u0004hv\u0012MlKt𧳩jٙ􆈁,K􄊧5e󾣖靪XP􂪒NN?󶇄\u0007v_]\u0004ߦ%𩀣\u001d\u0005?|𮠲l\n3r7Ux\u0006v\u0002Lja\u0000􏢴h3tLRe=28a\u0012\u0018𢒯AfamV􉴟b󿀜@V묒\u0004䞍l𔐴.3Fz􌛝L\"\u001fSKK\u0007ᅌ􏳮EKG\"FBq\nR𬾼+􅊜􌘩Jbo꾉//\u0005>𝗴\u000f_󴌒1/tiHCDZ\u0001Z𢊁􏱐3m4Qq\u001c\u0001kuS6Tx2b\u0019\u000e!󹴘XT􌸜/3V􅣟5􉏻.`C\u0018wOA@3􅁥Wqx\u0007K\u0014\u001c󼲈Zu`🡶􇦣m?f􅾉\u001d\u0004}X᪤2:<.C𦰕E𐊐2.􆊷;2g\u001ad\u000eX𬓚P]􍒷V𘒬ؽ\u0005\u001b籞\u001e嗗\u0018,g\u0016u\u0001=^𑚜𥼤u@\u0008\u0002\u0007D\n𛂙F\u0017@&󸇃Z\t𢻛\u0019_\u0011~m𥸩􁭇y84c\"[;DU𢤒N^~󸝉s\u0013I𗌞\u0002m\u001f@_􈠢H𖹴Z\u0019Z(𬯭\u0006􉻧𠤲J_NE-𥮵𩠘\u001c~a􂢯𬎃\u0019.𫍙=𫅽\u0016\t󸷱p𘟯Y󺳵}􅚽~\u0014d\u0019w\u0003nYW<V3\u000b󻍣\u0002󶗯􁲭v𭆩[ \u0007y\u0000qZ\u000e\u0001~𗎡北􏏥DP P󹙬\u000e5~􀩘󶟝𡦶𗇡L.85S\u001b\r&h\t8g\u001fB6"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_8.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_8.json
index d720e7fa2c4..bbf26df7c49 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_8.json
@@ -1,3 +1,3 @@
 {
     "password": "z\u001e󻨹K&裂󽷰_@\u0015\u0018YuW\u001d# a? a>B􍟯󵽼R\u0019􈀭'ZXzP󴜼\u0006B\u0005y9(}z䟋'1x\u0002p?MM\u0005󼒹􋠖u?𡥃눶;𐀿来l:)w𣛧\u001d\u0003􃏛z􇱉_v{𥄩𨑯↷X\u0019I悑Y\u0000𤛀\u0002𪵟\u00074𦠻0e.r󳼡%b<mHH𨱨k\u0013ꔽ\u001c=ctK\u001f'􍀵\u0002qBQ󱅟󿦄󵔒\u0018􇑁󲆭􊟓;d\"4bBW\n\u0014!;:|󴼨\u0015j\u0012d𖾒𧌅O\u0005v4>6𮟉%\u0001\u001a 􎷺󰕆𬩁K^CERXA~#v荳{\u0002􀄵棔\u000eGbz\u0013􁸅K􂉣1)𭚠\r잼2𮋠\u0015󳒉Vr\u0007G󺫄ax\u001cN󵒨\u001cc\u0006\u001f3K6=횮\tY_􄮩|􈮣\u001c\u001a􁬉\u00109<􄌡\u0012#󷜥\u0019{Z'd욡脘\u00124𑐙𫞰-󻌾\u0000C1d\u000e󿩊\u001cN\u000cB𦜪𛈁/\u00108h\u000c󼠆e󳝿[𛃞𫂫\u0011l#𘜷󳎟蠯𪑐􊖅\u001f\u0013\u0002\u0010􀨙\r\u0001GR:丱'2\u001f㖽喲\u001b󸂟%􏗸󷝈VXq~a-2\u00032f\u0012>.E􈙃tY@Y?uEX󾜢J-F`LL2N\\O\u0005IE"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_9.json b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_9.json
index a5bbde9e2b6..fa2e3b52c5c 100644
--- a/libs/wire-api/test/golden/testObject_DeleteProvider_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_DeleteProvider_provider_9.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0011􃵤\u001a!8V𨦪\u000e\u0006\u0017\"5ﱗj𮔌e\u00147dNxU'㿥J"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_1.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_1.json
index 1b4665537cd..0f5f32017cd 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_1.json
@@ -1,3 +1,3 @@
 {
     "password": "􂶸\u001c$矾⍟4y\u0007\u000e󹥍{H幜⪄Xw/􄫉k?QwB%𮥽I6𣲬jYG\u0015䈞\u000e<󹸐V􎼼/𬗦3\u0015󸞸\t\u0013H:\u000b􉍖B~𮕏(K󲴋s𧋪f3A|𢢹\u0008C0\u0004=𠵨:\u001dJb@m]𦫂\u0004󲈍lP(=wp8N[V\u0008𒋫j󶃂􀿠y\u0018\u0017\u001f:\u000f\u0011;$,󶦰.󱴟fs\u0006:󱜶D:\u000e\u0007𤜨\n𬉙H(\u0016P𨲳Au\u0011Q\u0001["
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_10.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_10.json
index bfb453442e5..f938e8de1bf 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_10.json
@@ -1,3 +1,3 @@
 {
     "password": "\u000f𧤂󶮰[􀎿n\u0008\u0005iN<Z{&󱔟X你㒠}$\u0015bQ}2';6lVS}je􋄙􄉤@󴺏S딎MOU}'[\\K󻘚\u0014<\u0014BsQ􁱛G\t\u0017􀛯r𬑅0\u000e𢪔v\u0018\u0011 e𬙝\t𡫮􏮔e砌t\u0005qc􆆖YaC<wi4􋎹N􋔫\"L`0󾬂s\u0018􆖫\u00067\u0007 F􄍛\u0017Y󰓌\u0016y{􎺳:=\u0012_⼞fR\u0016=T𦊉摤|𗣟|\n􇈴s\u0004\rl\u001c&󽊰𠰵􌀱柽􎱘󳣅𗕃􀎲\tW G-𡲈J\u0013ຳ:b􄰤+<\u000fᛟ\u0003o􈦡4󿉖\nO\tX2\u0015)-􂍭󰁿J󼅒Yﳘ'\u0016=f\u0017d􍻣P*%#&\u0007\u0002\u0006\u0014ld.-\u0005󺳆:|f炞eoA𧮑1H\u0017d􃄓-𒆦𪶑aK󴟆?𧑽􏋖WWzI𦼊\t避]6W\u0001䤛\u0014*Rq􌶳8󶛴𢜍w𡍴󹖯2D=󷘥S\u001b|'w\u001cP\u0011|Al8tr4󼽯'\u0006\u0016􆱨\u001f<\u0011\u0019<蹫􊦛J!\u000f +􌑧X𢶵෧\u001f1ㅔ\nJ\u001ed彉b-%\u0014󰐝)\u0011oNn𘧹󺌡'@\u0011.B󳫦-3\u0012;􄐁审z\tS=BT={j\u0004\u001f\u001fᵾ𬧼m=w`븒xㆭ(𣕟鬎b\u0007FY𡥲F&󺭞eQOE\\Z􏏦衠\u0017\u0012m\u001a\u0003ָb;#􄔒􋶆C(+𮮏𠻍8:䔑􀆙󺥶1MGW\u0002N\u001e􆆚&Hk𪸱T\u0018!晌􌖁\u0011\u001fu(-JT􆠃E抯$e1뛺𩖳\u001f\\91n+\u000b\u0007d8pI􌧻󱀖5\u0012󰚢􂸑ZW珥DY|󿧮㛲;/𩫚󵭥$2􄪈q-\u0013M𑇗N\u001f𨱙􋂀\u0003𬅮4S$TS𗞐~󶷀\"v\t.\n!CG\t\u000c쭶\u0016a\u000c䉰k&𥔁E\u000cZguaP%vR;㳬x狌􍁝\u0004􇸸𬋧aP\u000b\u001dFC󾇻\u0012󰥟d\u001d\u0000𦕘\r{\u0011\u0010T7\u001eu\n&]󰯅;'i󻹌7\u0000䛇\u0011󺣤a9]p\u00149*$'tl1⪪\u0013\u0006\u0008j樞\u001d?\u00043􌁰.T𣙆GM\u0000\u0018H )li𥰗𘦤Ym\u0006F֝0t\u001eyl\u001f𭞕9*\u001f]D\u0016bVu\u001d雷h}<vf󳅚WbWk\u0013\u0008𢵺𖨙\u0019𭘃骑<4<oz.t\u0010$󶡰_\u00037J雖0WM\u0019I\u0008B@>\u0015\u001f\u0000\u0016,𦘶)Ac)]d󶓍󵳨Y󹦦􈊢FhaWXY\u0000\u0004bCK쌉𗗜(7􎃹󶴅F\u0004xP9\u001c\u001d􈗣\u0015󷁩P둵QJw\u0002?𫌲+Q\u0000𮟻!x!~𥾯󿸍\u0000i,Q'<s9VG\u0013󿚭2\u0004\u000bP2XB𐳔𣮹󳠦h\u000b󱿫{𔓩{P3󱫫\u001e𥑓\u0013h⃟\u0015h\u001c󻖛\u0019@n>ᔙh󴐦jp󻘚\u0006:Oq&v\u0014󷄦8\u0018\u0010+\u0006}󽧤\"5L7􁇛􎼲𒇃7m\u000b\u001e𧢊􆪄\u001eS疤P𠒆kˍ󽿄\u000b\rBP󲰅W*M63-J𦘰𧶀6RH󺫏'\u001c'rsf\u00148\u0010T\")K\u0010\u0012X<}󾄋^𧼊S:󵸭𦨢UZ􅇬\u0004i胪𦩶_<f㽛𑁢"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_11.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_11.json
index 01ff7da592d..81700c00313 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_11.json
@@ -1,3 +1,3 @@
 {
     "password": "攭nR󾥃􏇌\u001a\u0006t3v+\u000c4W{/e𨄪Hy𦥥N\u0016\u0011%𦬴oV{l7⼚􂆯S_gA㲮TmCiX𧉮'􉟧\t{W\u0002exꈸ*R,;eü1􄁜𧤍Z<\u0008S@\u0017gp\u0015􉁴\u0006𢈣S𫇢\u001c㌃`)@褾􎍼􂽨Er\u0011󿙬 󲾊\u0010%𝀣\u001cn\\ZUx\u0006􌃮𧿏k\u001b]\u001e\u0011𢿻僳A(\u0015\u001a󷳂zeK\u001f_$4\u001a5@F𦸱桩@*\nd\u0003U󸩹\u00191󳠬􇝔얚sS99*𘚐\u0002hH􅙚&Px@cn􉳷\u0019\u0012󿛞Jcq\u001a44󵯺\u0000􎓀\u000bQ\u00138<z_}?𡅐2U켯\u0005􄃟􏬪$Rwc𗭥)\u0004ab\u0000𡴼W𪯤=\u0017𩛎Q&𡐑<\"\u0001N_\rYylk⸧\u0019𦖐l󠆸kX\\🅆C6􉑬M\u0008 XtI􊂗𑵀\u0003]!C$\u001c\u000ea`\u0012𬫡􇲄᷈梱d4c\u0005\u0015N𮢫\u0011>汙%𫝍Kq󴿄%~\u000b蟆T\u001dps􍚧1󶻕癥to\u0012t$󸜞I𩧗|1D𩮎𧎁+􍚞+v7\u0002~ᔓ󵌪Ju\u0019擖cx\"#E9w𨧇ONY􅠘O1𝣦p%t^\u0003NT𓏜\u000b\u000c~\u001e\u0001\u000f\n'{\r\u0018\u0015\u000et\u0002𐳒@P\u001d󵾘\u001fy9^U\u0017)mj:􃜘B^󶏓x+\u001e5U𢄎𘅏\u001d𬀃抔H􂺩$)wbin𮇫󱂌\u0003:5󽸬\u0006\u0006󰲅󿿑hl'\tb?`%vC\"D1[𛄌+𨦋)PV󿂽Gh\"䷼⼋R>󵱆𬉲\u0005A?\u0001𠘜H􎧊$2𗢵󷙍\u0013?mLdM𮁓/%\u0012\u001c[I8v\u0006􃌢U𐦓$GrCg\u000e𨳞􇊟n4?r \u001b􀤂Tq\u0003u󹿯\u0006_|L信a􋒟vAaO𢃗r=4骐:p􂷌\u0007􊭟?􏋾q9\u0003E\u000e\u0008K-밄\u0016븯𣫬2\u000eSj#\u0006􈥽l)%G􇐀K𦓹R₵\u0018󲡢v\u0011\u0006🕨󽭜\u0019o`6\u0008筭v|WoQ3<\u0002𗮢o󰱎\u0018􉲘\u0015`\u001c6\u0001F􃭜[zXs󾽄$𩽎\u001doH-|\u0017=B􏬄춙\u0015ox𒀠q\u0005\u0010𣗯𫈉􊻖\u0018􀆿4K𑘄[Y𣖩\u000e􆸴f\"7\u0012Xj]s\u0001j􉴔7i􏕐b⦏\u0000=\u001e娔󳢹𮫬A0\u0011N\u0002\u0003\u000e🕒[魀OU\u0001^x󼇦J@F~`n;i\u001e\u001a)jI\u0004^𑵗Y\u0007M㐮塉𘦸좖\"o􇀘R\\𫧱썋'&\u0004Utq𢙒.I𦐖tꁈ䓀cBk?\"4}􂔇􏶽'\n󸯬⽅\u0000a,􋍼'Jl􃞘\nS:<\u001d􃵋t\u0005)5ow􁯄􊆿\u0006𧿠6䂀{%5􋡴^󺎉􄔍$\u001d\u0011`W\r粆\u000ctiT\u000e􅧆1E;Zd\u000cx󽍷\u0012𝨅🔛\u0000󲗕\u000e)􁰦D󲏦"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_12.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_12.json
index c94e215b851..609bc468e45 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_12.json
@@ -1,3 +1,3 @@
 {
     "password": "hW; ''\u000b)Eou>D.9b核􂎤\t\u0018Te\u0000RQT@󴴞\t\u001bNaY𭡽𥌌\u0000􆨹~h𤯾􋺕󹜫𗤭CNA,(b\u00122PB`Xe\u0017I\u001d\u0014`_YVE*𘑥?kS𩒉󹊺C󶒎\u00181U0𭴄aq\u0007󽠫o􉇍Z{)%b\u001aX𣮆B_􀇄+ag$=]􃥩冽;QY&M]𩽹g\u0003󳩇T"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_13.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_13.json
index 959271f52b0..1a04b1b9583 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_13.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0007F*􁴺.J􅼓b\u0017󱖋cDt󷏝{M󵸛􃳻󿜇m\u0007󸇫xR􆒬􆇼􊂮𧪰󹹈*󳺓\u0014K\u001d\u0016\u0015\u000f}<;\u001f䱵􆚊EN\u0011􄷮8􂬤\u0008𪲘󼛇󺼔\u000f\t\u0014󻙒k𡌁xj\u0013;i5\u0017\\𘛙𨉌𭫐䅠kE\u00174X␚WZ\u001f𢾉y\"󲳆f\u0017\u000em🢑r\u001bh\u001dwN&Q:K𐨡𢜱ﮙJ𘋼Ⱓ󶽋\u0006󿮻󹮻N5=&b2\u0001󲿴P󳒓E8􊯇!|\u0001\u001b:9*5􅛰:h2`𐧀\u0013gᅘG􂮬悌󾕢v\u001a\u0016󾓽7+5vGr+f\t\u00038\u001avk\u0004P!?[9琾􏙍:\u0012𩔈ಕk𡨽#덳Kx\n𪠝󾥦,\u001b귌VM󲮊㟷pG𪀤􃝞0%{;J\u0006蔶󾻇ꄷrᣵ~|\u0008\u000be\u0012|􋥯􍂠).!\u0012󻖧Jw(5뙮t𧉝쌥1\u0019󱃌xC\u0010\n\u001e{(\u0014\\\u000b\u001c󶓑|.5_𨐲2d5󲅺\u0016>\u0001w󹰸Iw𨍽󹃓\"쳪\u001f|Zn\"w\u001eb?󰏏"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_14.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_14.json
index a1b9984a5ff..164a82425e8 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_14.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0011妫\u001fO\u000bৼ𭷷\u0017X𭱪\u0002L$󽫯$\u00077\u0011c\u0018\"(䝷󽪅􉯎\u0002W7𡑽]=􈩀\t!/\u000fg󽗭쀍n\"\\\"c\u001f\u0013xB%=I󶠚\u00056m\u0011𨰓 N\u0019@s􏟳\u001b\\s𮨎\"󰴒x.&K𬅚1b1]􁂉󹛍vQ𤠂+zퟪ􈻵f?6󶟟y/Z\u0018A\t#\\02x𦾁WF,FJ^A_􈷈7o\u001chuK\u0003*#󼔪]qK/W𣜘QI?@󴩥p\u001a\u0010g\u0006􆼿\u0010𢥿_G𤤵{\u0003\u0002:)A󹖪Qd\u001e@􋎪\"!\u001b\u0001=\u0018Hu#>𥤎0'Jmv]\u0002\u001a\u0000Ij􂗯HGw󱕖􁞊㓺-\u0016CR\u0016􅍅#E'w􍣱;􁤾􋜫f}2GV􎶎1𢌀󸢲@7\u001d0[O𬈅𨘇9𩉽Ah"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_15.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_15.json
index 3614d0d8899..811d062ad77 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_15.json
@@ -1,3 +1,3 @@
 {
     "password": ">s$:Gkysvp)1g`^C:􋹅\u0010󾙵􃀉}\u0001gS\u0004󷯲-,Wg􂯭W_r'옊𪟊X>􂋴\\釽r$\u000c?󿱁L\u0007LAw\u0011h2\u000cJ𥣸x\r\"\u0012=󱞾\u000e\u0017%\u001ap\u00066󾗰楂\u0000qJ󾚻UZTK\u0018u󰛪󴖭.A8hサ'\u0010\u0010닑\u0012\u000b𝃜X0qXo󸆜MVB𮀊Hrv=\u0000G𫛚\u000c\u001b\u000c􅹳􃭘\u001e\tB!t'\u001f0v􋐖H\u001b5􀽱V憉𫼞E𬯽E􉸹L<?󷊳閹x="
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_16.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_16.json
index a1e18fef8c6..b1a2146c28d 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_16.json
@@ -1,3 +1,3 @@
 {
     "password": "Q𔑿y96=㳺]V𗱥\t\u000fuq5𦋒c%=1{Z\u0016F,􂩾\u001f\u0004EWB繊im􄲊䷱\nO\t^"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_17.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_17.json
index 9c2e803cf83..c7bd3f18449 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_17.json
@@ -1,3 +1,3 @@
 {
     "password": "Sy1\u000cQ㊱(㗥\u0008tq9󴫒􎒓\u0015\u0019m?􁇹\u0017')0|/𦏲8[y r\u0005\u000b\n\u001c\u001ev:􂼈\u001c\u0011n;\u00173\u0005B𠤚\u0014|a\u001f󷛥\u000bC⒫󳧈+dVF\u001awjq󰓋䮇缱M-\u001e󳢮\"Oc\u000b𪖻i\u0001FX󻯻\u0011󶘦󷬺悅q1m؋\u000c2酶j\u0008\u001dw󵃞cNa􉾤槂𡎗\u0006[\u0007\u0015<QDE{d\u001e󺽣'lr㫅\u0001K,77m?󷘴s0vm\t\u000f𝋳󼂢𧵩by􂈋z\u0005zy𡘶h\u0003?\t𫭸\u0001\t謌.\u0003𮮈qAYﭝ󹕜>𢲊ࢤd󷹋\u0017{5\u0008􈿹r\u000cN+\u00035󠇦\u0015 ==5^憐W􋓰\\􉣬뛚r󼨟􌢳1D7\u0000$𤩲娨\u0017U󰋄j\u0012F!.󶼖5󵚠󶬰8<RY\"\u0016D\u000b󷌪<􈉏p}𓄠(-p󴷁pჲe粢)\u001fT_\u0001B_o􃉂\u0003\u0004W\u000f_\u00105~\u001eY:}󹥌\r􃵹\"u&8d~\n1LJ\u001e𫤣B𞺡N:􀩣0􌖝$P1􅰊V!c\r𪩷\u0005+𛋊\u0006\u000c1V\u001e󶁏5ਲ਼\u0019;\u0014􂗨ri*c\u001am%tIc􄶷.\u0019P1FrJ6\u0018bS*>0𥒸􄵈𗪁5𧑆/䐁𨼻􄀣叇􅈤􊡱牖L𤰥ჾ󶎻GR\u0011󺄖:͂􍮖bꍱ􃴆)Jn븤􀫭\u001f䆴󳸷/>'d&hQP炛MC\u0016aq𔖋(*𮭙\u0014>l骘~\u001e*\u0013OAh舕z{脣JK\u0007Yw\u0013;d\u001c􀩜!W\u0016󲗢n\u000f󻫤V\u001f\u0019𧇾Mp􃎍~!儹h\u0010+M\u0010i\u0004?5t@4!/0󶭞D;\u001f6Oj𣁽`+\u0012^𬪋:)7\u001a𨊓㾇y~\u0005#!𫯼㳐􂌞\n2\u0011Z𛱧󵗸y\t?􈃓&w_󸲕S<犱O\u0002ﹱ\u0014󽴉H\u000e[\u0013\rH􈽓􁹎􂮽m\u0004%𢰩2\u000f憡5PC󴹀1⽓[\u000b𢎏\n󳤛M\n&?q􉬔Q󹞬9𗧸F;v{<􀵊𗱬h𖨠\u0000\u0000\u0010n𩞺㲿\u0015l@󻊗+\u000fzb#\u001c\u0016*gX[{H{)\u0008긡ꑘ\u00108H+0<X+􌎲ev􋡀=𭍯Zp󱨵}b\u0002t;3𢄰M\u001e}#󷓆䇈𒂊摖q󻧣N>~@懅􌓻;/+\u000b\u0018* 󸣦淔4\u0007wM\u000b!KR\u0002B𝌙B\u000f.s\u0015\u0017\u0019D𝔂\u0013Y8Md0󸋸KHS􉧴\u0017\u0006􀛰9𧮌\u000c􄂮uV󱎄l]􆻍9􆊪\u0015G􀽲𡐺?\u001am𫭧\n\u001e]\u0012wkgn\u00144𣣵󾧁Ah@𬨺􀬷k󳰀ja󲬌\u0001夒\u001eo\u0001᷹.􎶦󻎞\u001c\u001a􂈧7eW鸺\u000eF\u000cD\u0014Zq)옧a|󽴚\u001b깅􈯫\u0016󱸣ᦧc\u000cl𣍋\u000bk\n\u0005􀲢h\u0008\u0015\u0000pc󴻇:劙'6~䧃𡘌:\t􏶵*􃛑𑆑;𫑼`\\XM9􌜹Y\"\u000bX􋴃\u000bI􃾥t<󸷈F\u001e爕5㈑\u0004\u0003􀪣󶄩W􈎭akuU􋲊A+.􍂵𮕿𢸜\u0011􆦫kJ󽀡S󸈮t𞢼7.J\u0004f痤X􋸵\u0011WO𥑈`􇤒㇅󺻓𑍳\u000c𩎺~y\u0014\u0010c7BGJ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_18.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_18.json
index 436e6a37bc7..b26a1f22377 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_18.json
@@ -1,3 +1,3 @@
 {
     "password": "<\u0006(𖽸7\tg瀑x\u001f[󷾣$r🧖叫n𣢃P]􋢺\u0014\u0006𝐩qP𧾰W󹰠􈥪􏥑󽰦𣴰 d4𫿾dw\u001f\u0015S/㐬.\u0005𘌂W<gE`CLJ\u001b\u0011\u001eU]\u0001 V􆽸𗍂呈h\u0016\u0004[>c􂌠𡦂󻝛=;<C~Gs\u0004\u001e e'𣤛Z𡱼=w<􊏎\u0010𭨪Qt5\u000c\u0000L󷑀\u0000d𡥹L􂴙󻜢5\u0011􌣫8\u001cdJ\u000b􋯭w\"p,6,Ug󷴠u𣥒W􍴝p1 lt\u001d󻆈r􊷈󾚼qX󲨼D;=ImE\u0010Mp+\u0004󾞍2\u001d[\u0016􇇌󰃖\u0006X𦁍J1M󿍶􃪻%\u00032ﾕ􀘬𪣍\u0004𨇲x󠁘!z𤲼K􌴉󵧗#\tE\u001fPᕸ\u0003𢕶&pn{8\u001d󷯆V4RQG\u001bb󽗲SV\u001c0i𡓧𦝃s/\\a\u000cy󽴙=󼖥>\u0016󵘻 \u0007\u001e렕87R𣀨􍀃{\u000c{𩳰?Bu󰑥An6\t󳨭gw1!拋]􋪸[M􁵈􂢈TBu6Xs)WmT󱳗𩋯<N-*qR|.Z)u\u000f0TSY𫠧h1z9𭘢6𦩰*dSLh􁗆k\u001aLr6S./\u0000\u0004\u001b󸹝k䲞\u0013ꬓᩦꨜ6죉+Rj.8𦅒,,3\u0002d>\u001b<:\u000f\u0019i徨{抖78n#\u0013𠰡b|\u0008}\u001e\\7|W(𮝆 w\u0017􌱲]󳼾#\u0001&𗇻M!%.\u000e?𩉌󷀝lM􋚤\u0011Yꘚ𓇙4\u0002\u001an\u0003sGD󲅚\r􇶉󹼝$«1dp.\u001f\u0017\u001a\u001c`o\u0004nX쾁c*owi=&𦭌𬪛\u0008󸏻\r\t\u000f6pTy\u001e\u001dk󼼝-O\u00010玶P𤰫X󷽀􇖅c􁌍6Oi9џuaᛮF𓀉S锩NtB!KUf𥔮1􋁇}󺮎Q#m\u0003>Z?E\u000f,Nmc\n\u001f􋑕3\u0013\u000c\u0013`\u0016t\u001a<[\u0008\u00038𤸢h󵇖,\u0000𘑲'5\u0001C𖢍#鷻\u0006*Y𑨓m"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_19.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_19.json
index 4a72fea65af..4c027ee3ef1 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_19.json
@@ -1,3 +1,3 @@
 {
     "password": ">\u0006𡞓\u00160P굈𪋁C􈒵pv􋷬/\u0003𭴔L𗪎𭟋O|i\u0017\u000e0\u001eL󴃇\u001fvv\u0013Ka􆻭.>\u001d?􎻜_\\󶼓I𗈡􇲘06pm`l󾋼㓮0󶬩\u0019^ゥ\u001b\u000c\u0019B4g\r􌓨䙕􎘝\n5^f\u0003&G姬T\n\u001c\u0015󽲩<|\u001bw\n𥰫G\u001f|f\u0010|5\u0010ݚ$􆛸􊖯`^𢗲\rA*~R.妾*Q$Z*I󽳨^𧱺KC􅚺ZF􃁬䖆)\u00146\u0005\u000f0󶂻ze☤괵𬼍􇮟\u0017j0􏝋yx\u001b\u0004|VW|\nQs텛]N􈛷h󾦣\u0014G󴔎T3I%n󸘼qER󴵗A𤈷𧦳A腍a(\u0003P|\t^𓏊u􋷳\u0011\u0004\u0007\u0016\u0018\u0008䄄Y󰽘pn-\u0001#󳰢󰜀&󸗌9G#\u000f\u0019\"$K\u0017gg6e\u0003!vQ𦸔\u0012C*\u000f?~\u0002󶁉`Ue\"􂯶\u001fkh&9BZUuVl2\u001e`󺖬\u0006xtOiU#{%x[\u000b1@\u0002a&\u001e𩅓\u0006~PXM𥨪\u0018*}&􃞃wt󸻲󸉥\u0004VT-o#\u0010\u001cnw\u0016󷛍r'/u\u0010㱄#\u0012稤\u0001\u000c6㜣akz\u001cF;wq+폫[\u001b<𪭇(E&+eOh\u0013h󻊹T恙\u0017뛧\u0005f􎴐w1+b􎮲s\"菈E󸶀<󱎥j􅦁t?븪u\u0002\u0003\u001f9/>􇻓󲰴T/\u0007𪦔󷧼󼈭yI삿JS\u000f\\_󾷕1W\u0013:붣h撈\nZ\u001a\u000c횞)No󹐍x𭂏H􎉞v𓆇𨈊1;\u001e袧𧑠.􂙸*\u001a𪥥ؘTA􏭕^s3󽠏[􁉌\r5J􀐴\n𦚖>,[`h?-W󷔢\u0015\u0007\u0006\"󵇴WM栧䤵5X􊭚W^KY\u000c􀊆𧝺4d'혂\u0010U\u0003QCbQ蓈3ci\\\u0007j𠕰X\u0019V9<p\u00117U:BL𣑩rV\u001f\u0016U\u0017\tP,x\u0010&𭇁^[n\r\u001c{s󰅋M8X㢸HေE󱶝]o𢯳j󱰆􍏃0=\u001e\u00086\u000c󺖴+Mg\u001e*\n\u001bP%_ks\u0002\u0000\u000fE\u0006󿊴k\u0005'I{B)\u000ei7>𘨘t*7JF󿧃R>ˆ矓🅓?f𨌷4\u0006􅬩󲞁\u001ajY(#r󵚭o/Yi󾌢l\u0008X90G𫧯W\u0015e󼾴󰈈Jk\"\u001fmW\u001dz?+S[RM;FI𮌵\u0018T(\u0004\u0008`c󵙜q3B1r𬟔)N\u0004y|Vsjb|𗅂h󼤤g|w$5𢉁8?QE柉d78󼝙{n2lJZ\u001f6\u0011=|r􁬆󿄌\u001b\u0013x!w&􏵂퓴l󹹪󱖢\nMR􈢧!N󻟸󶤳6J5𬵐;ﲋ𘨂\u001d󶔭誋𒓘\u0018e\u001d>󷚁􌧸w4\nIr6啮]FN\u0000W𨹏*U󽆴󱊞\r_w\u000cl沽\u0004\u0005ᅋ\u001c胮𥡃ሉm𩭜L\u0008\u0010둏\u0007\u001d􄺣#3\u001d᷈X6P❑\u0011o]F󵅇G(_9\u0006\u00076\u0003P\u0014[i󻲈_A􇥗{뫃2+fn\\pyx\"B\u0014󶅌;9,霞\t\u0006o𢭑'BV󼘝晣M􀜝N𣳧𖢫󾔶'𤒄􃃰hf~2:\u0012"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_2.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_2.json
index e54ea9f1082..82cc25b738c 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_2.json
@@ -1,3 +1,3 @@
 {
     "password": "\"󼸉\u0008ᲐF-V漜DL=n𠸏𣷄m蟶Qr󻼡Y\u0000􋺍[\\\u0017⢵G4𐂲󼽧4QL=#h\u00159༺􂸬R/N\u0000\u0002=􃠩\u001bag@:𮥎l􆻈6zz𪠦+\u0019]\u0014󾇷쉫\u000f.&n󱌓\u0019􄸂x𧫤\u0003M\u0008@󸖧\u000c\u00128+8.􇭿𫴺O!4\u0012GXD􊶷󹓯\u0015<㤘\n𥂹學􋦴\u001aqBSA󺣩't*\u0018ov𥍘\u0018􇬅%\u0014\u0001cv0t\u000e\\\t󸖉\u0005S;\u0016)􁼕\u0013/\r𭨸鍸㾾.􆩄􏄒雊𓄤\\%H󰌪g* Sq\u0001绷\u0000R\u0011F1Sai𡪿타\u0006dh*𣓳𐙓\u0017-􀇊iM\u000b,r\u0004흦\u0000'F𬴖e\u0005\u000c.N􊠨1~ꄃE_F\u0005`厊^%1𠋮~xz\u001b,*0{\\;L,5e(􂯐(~\u0010E\"&󷖑aᕑ>g\u0010趜\u0014󰜐\u0014N\u001f􎚌e%e箷Wj*/Xd􎜾X+\u0000\u0000i\u000e\nyl􎍕󰀲Tt풭𫮹zO9@\u0013\u0002\u0001?*Z\u0003ѣ>`\u0017􈷅GW\u0001\u000bZv\u000e󲄲.a_\u001cP\u0008䢥𣇴蚐AMq\u0008|JSh.6􅹭2甔鮇o𭅄컛/T;>g%\u001e?_[h'𐒓~􆤕􍧹`E6o\u0000󼹯껲\u001e\u001d'􁵿|䥟𥖀d@􀟽UG󰟬c\u0011𡽌𥵌.TQ􀃊\u0008\u0018\u0012zE󺈥V🨏􌫱𒐁\u0003;\u001b􂎰Yl󸯂u𨰗跉􎱥𢢵ZO#\r\t\u0015𫯂\u001fh\n󰔮O𢗚𢮮𩁧a.K\u0012𢭯Gy𥭡<𦩠+D󸮃a𬂘q\u001b\t􀹰󴢒𝤇R\u0007㬷$<e^󼽰\u0002ऊ𗋺)\u000f\u0008H\\8gp𧀺\u0011\u00117雁?󲭀'\u0010옯P𣄋.\u0014yi/\u0018𧟏󲽁'󶬓2L\u0018\"'O<3d\u0003𧸸𨋾𬸨⤇𪌯TRrZ;𬖑 2vt\u0019휂󸿁d𡾟E\u001aa\u0011菭􌃎\\]𗝩􂨧\u000e\u001a~\u0018\u0013~\u000b=󲴁􈢿􅈼哳\u0000􂺘,i\u0005\u0011"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_20.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_20.json
index 0ad3f35100c..cf6b6e98643 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_20.json
@@ -1,3 +1,3 @@
 {
     "password": "떥M0🔑%rM􄓄9\u0017C\u000e=\u001c\n1\u00174\u0005\"E\"FUnG󲷾!b𐲝󷂾􎔟ᑱ\u000c𨁱eO馛C9o𨾙aӊ𥁘~􆥯HEg􋲫2?!+a󼺃⟤󹌧n󿏜#%|m󲝋\u0007𖨂8:[\u001f􉄎@qD1/\\OG!艑󴕄%w\"􌭰&\u001aE\u0013;w]󻀈hz􈓨MN.􁾾􉛚 𬴞m\u0018!2;\rAH:9#𓌪1%􏪀?6󽰵\u001a\u001dC\u0001\n\u0013oj\u0000h\t󼄞[BH􆬁a󽂖:m;OKj\u0001z,<辏R\\\u0007󵬥􈚋Z'z󳐽􋐎\u0013V\u001eÁyq]G󳿜𭸩⯄\u0000嵜0-\u000b􉁝𐑇\u0001f䨉䔿f/\u0010T\u0017􆈪.x𮘳xR&􀲺\u0013Db*|𪊇d\"fHx.x\u000c􀼋!\u000bv𪀼\u0016lSC4 #𨹅𢊆2j=\u0006E8\u0008jc\u0000C3`󻇯#ඳ􃔴􂫙MTJ􂑌[:r\u00013c\u0010\r𩲹|M5a\u000bCn䕜^􃟩\u0010yc7\"\u0012T#\"ms\rM󹆿N&\u0015􉳉CS\u0016𭕩\u0005be;Z뤉=yS|f\u001bA\u0013\u001cF4mv􉲄\u0000N6u\u0017|\\ \u0017雵봑(u𗷴N2󸆜5󺒾\u0000\"=L$`)"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_3.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_3.json
index b61606491de..21631f9d62d 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_3.json
@@ -1,3 +1,3 @@
 {
     "password": "🂮󷜦󹤒Q􋦤􏃡𠓭?𫲘󹦜𩭽n\u001a,U@U^W%㒓q\u0014vwX?uYF=\u0001a\u000eZ𣂲@\u0000\u001b4􀱙m`Y𡋐XhGa┈*皃s-𗵺𫊄j\u0018\u001fO󰳝M!𭑙\u000e𥖳\u0007s𤠩#!1\u0018OU$p\u0002𥍩𐭰󰂬\u00174,󿿚▁%Z𤈮<\u0014𥍾bTl3􄴔\u0005\u001cb󶨤qwꢞQ#\"\u0013o#i\u001b\u0000𠨬\n4o(G稩Rfm𣌆]2𝄞5-|𧨣I\"@V􈙨굺r\u0017D\u0012mp󸔖~DZ`ID8N|-{\u000b\nC􃉾Av􀻯\u0008!ZG_𧇜󸵉0=􂤔$+h𦭗􌝨\u0005Us\u001fv7𨰲=䁽󺁛^;1\u0006\u0012j\u0003訕&[cXzz\u0014HcI𗣅nMg\"􁚨2t%*𗳻R󵗡cEX%6⁌􅈢=^\u0003i'\u001067a2EH+\u001e\u0010]l􀙘a!\u001feT6j\u001e\t\\𢬓 􇖄,D𗔙x\u0013𨮸ME12u뫴𬬕\u00089\u0007Wc\u001dv|嵵A>%R LRT:jH\u0013d󹯸\u0008R𥎄*t| 3\u0005k䧄󿦲4%{\u0005s\u000e8x\u001ekw󳒲V+O\u0005mT)Y/$Q&?󵛟4EZ󰅙~􈽠$U7H󴪊}e􅚴i졚󸿠D!C\u0015\n!\u001cE;V􎒦bj\u0015􃃪_\u0011\u000ek􂗜),H0PE𥈻r;+*l󰡘1w`\u0012ﭛ\u0016$vR􋪰*ij52𥀎󿦇D;e􊭛E쬙\u0012B9􉠉k蹃z(KTc=f)ꫢ􎐶\u001ac\u0010󱨥itu𩯗{k󽗡㥱𫿹 G%\u0000(󼮐e󻪺|*mU<7w7󲟬O\u0015vd㤭𐼍􋈻&􏎇F\u0015g󽽊󲐚\u0012cI\u000f_\n\u000f󲣅H𡠉𗏟󸖵?􆩄􈺔G󹨌\r\u0016𩎬\u0012\u0008\\m^􁏊5uh?N*\u0012􈳻|/𪗪䗠U\u0003I𪪱\u000c󻌬\u00040𭽎#vQC\u000cv\u001aS9󿁙4􉨐􆒰c\u0015󲛬4-6M𡞐s2\u00046\u0001\u0010!\tShpJT9󾲢􇐃𨀢~G%𣽐K\u001c\u001f\nH\u0019c_\u0018􉤽ty뮶\"(󳐅Jal믁w,Q暎MM𠽹􀄀𓃎\u0005𡇲8!识\t蘨ᯜ;-<鮙ਗ਼S[􄟦󹪖󺍁vF.\u0016󾄦wu\u000ecNpEY􍻲q\u0011;\u0007<\u0017\u0008􋕎󿻺D:󸱤^B=\u0008𫔾T􈠒|a􁵐LK\u0010\u00132)h\u000bi𗿫\u0014e\u0004_\u000cf𪸁_W\nM8_B6󸖓^촹lN􍉵Q 𗑎󵁃㙅^>󵨾`󳯄􎞠픐T㏣:\\\ty\u001c𭽆\u00159\u0014W40\u00138?\u0018hOX9\u0016𧫱}\u0013\"𫃷􊑢𗑬`-5!\u0000&󱎾R.\u000cₓ\u0013-g\u0007\u0017\n銈𝐛\u0011\u001b󶢟}󿞩Ke𫭜6Ma\u000f>􇾭\r,b^`:􅍍Un󱸪𤎙㒿}h4揩􎫇H-\n0P{𥜲\u000c􏾥\u000c7\u000ce﮶𧘲B/V0􂖺)쩹\u0014,v𧇊U\u0014i摩_>\u000e@8?D󻑞=\n𬝟\u0010o􏊙\u0010􁝗𣵧2\u0013);K\u0000o\u001b\u0012,\u0018XX]9𧨏6K'b󱤻/𨛪󱠂葶7F06􈬤b(L\u001d􀘖3{[􎭘.N\u000b􎱨\nGb>X"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_4.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_4.json
index 246434d9caf..f23326b5962 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_4.json
@@ -1,3 +1,3 @@
 {
     "password": "L2\"Vᩡr3厈F󵉄\u0017?\u001f󹥆孼@󼧾4\nzp\"\u0003\u0018󹎮\u000fz􀷞J⾅󺝲)\u0002a4沤󴘄jᡴ𦣭􅏢1G7𗪞\u001fO􏌞\u0001욑枱2@,.io􆧯0檃9?;5M;n􌊿\u0004S\u0002LNQ\\\u0016\"Z/z\u001a[Dw𬊢ŕ𛈋7󶞷X肫􋮠I\u0007^\tT|\u0011k\u0012x5⣠𩤄\u001b[s'35HCޞN𤕞F󻖬􂤦u\u0013\u001bh0\u0015VY@\u0012\u0014󰢇\u00133\u0011'vA\u0016.*2llS𗬆J6􌆁P(􅈂􁳴칥wg\u0008{𦌌s+J🧅􄡈󳲱_𠪟\u0014{\u0003\u0005Rx7v󼓼iS\u000b\u001dYv|󵫗mY숫\u0014A\u0005`XJ\u0011TM󽲢\u0018i\u0002_ే!\u0014>UW\"_I\u000c\u001c󳭢,w𡗹󺃘<󲕄if\u0003\u0001\u0001#X_\u0011\u0018g?󹵽2󶨀\u0014𢄪2\u0004𣤿I󿭄P\u0006𨈚愪e\u0005𗪘𪫥*里'3\u0011\u0011vㆌ3\n,>m\u0001w?zqp\u0002QoGf\t[g󴧦\u001b􃖭r$\u0004{D󻛤0`𮁖𢘈􍄂\u0004U󰹬𢑺a\u0018o𪝾k@5s􏱁o􁱓싀+S\u0002n@I.%𤍊\n􌴤\u0014 􁿡p'🞨YcN\u000el@󼽻9?ꕧA\u0000at􎱓\u00199􏷡\u000c#d\u0002PP ^6&?⫸_\u0005*M#躕R撕p\u000f𥨶K<}t:P󰓫\u0005\n=󼶲\"v=@H_\u000f(\u0011PV[{0𢑨\u0007\"K\u000bXD𣋀𐋷LRB{+┠:l􍉎r`􏺊4Zh:\u0019🗚?􂘖*􊇣Y|]𪟎\u0019󼾵\u0001𬰼#󴗇󼺖5Vz\u001a\u0016'ZX!1ꯚ1yc\u0013p 0􄼼􈾪[o,2􊚌IVq\u0005󰂯\u0016+,\u000cTqx2|jc\u000c\u0008*.C\u00029c+ṙ剟\u0019V𧎻􏄕強p@𣔳􋱖𡕝]u\u001e7M\u0017\u0001u6𦀛r!X𐙬\u0004\nx\u0005t\u0006􅮄\u0006EG\u000e\u001fb\u0013⠆7.g!c[y\u000f􆽄Q󲜟%\u0003(𠿴AX\u0002lH<xX\u0015\u0017\u001c[2\u0005'GtP\u001bM\u0016\u0017-V%_𐲖mOe%L\u0011ozF\u0016􆉨\nD^⇴十\u00175/\u000f/p󸀸B^:<􈃶R𢵦\tf<\u0010&=*AD\"UU_\u0016p󴊭-𥯧lOC𣘀\u0000🅄𡝧\u0018sq.⠵𨟽=:\u0006\\𣷪ⵒ\u0019􍫉t!\n*<󴃾𫭎oi\u0012\u001a𨟐\u0013\u001fg\u001fA󺷔G]\u0014\u0006O\u0000椂f\u0019𥂖*s[􏥺9\u001d􃆍\u0006N*y\u0000%󻠲𔕾=wp<Q󷟽hY\u0010􊞷,?pM􅄳\u0001\u0007f􅦥r2\u0015>P@Yf\u0014\u0015zjs\u000f\u000b\u000e􉇁\u0015♌L(/]k􀭑b}󸠼?𫱿􆩘}W\u001fG~💋N_2攽q?*^MQNL\\\u001b\u001c 𧹉I,􏊋\u0012i聎􍸜[\u0003𫎌cOam󶡈\u0008D욲𛄘\r\u001e \tr󰪳𑅚&t􀖹P#1@N󾂺_󾞐􍅨􈻲馭\u000b\u001e%\t^󲤑\u001a{\u001d5!NP\nC诰\u001a􄧠􀡝s41𬖼F𠳽VObHV\u0007j('5hkr􋚻L𤼉N􋇂5𪆞\u0000\u0013󶀟𧛨U1󰂤nS3\u0014jf󻤸ꠝi䋂􇶃&A󵕋\r\u0010D*GJ^eH瞽􌾅(_~v\u0008􉈂\u001f\u0012\n𬡑A O\u0014#H\u0007𔕦mx𒍤Hq\t\n<1n\\>U~gcqCErC@#𠋋HyEr\nHF\u0004N𨚲qR\u00126u􀻤bn\u0012%G\u000b\u00081𗤉6g\u0019p𩭷i羕0*hL8\u000f\n𬆰Mpms"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_5.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_5.json
index 96e61452d25..9406276f5fa 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_5.json
@@ -1,3 +1,3 @@
 {
     "password": "\t𪌹ꜽC\u0018\u001d𧟈\u0007' h\u001bN$\u0008E\u0014*F/[\rᬌy\u001b\u001d􂋎\u000bF!<bh𔒪Lmk\u000c󻭜$eW𣒓-f\u0015\u0008;󼘫}q\u001eK䰻ZJ\u0008󰲰G1\r\u001d粓M8#ꨬ𪂍_鞫臭,K𢦎𗚡ki\u001d[\u0002􅘗􄫩zuM\u001d.\u001c𑁔YZUs\u00113𭫞\t𡾚,|8pp\u0007~\u0005\u001c\u001a9󷬝󸥵&W􉁜𮛊\u0006$dN@~􃣙t9r!\u0011Z\u0015-󶞨𢄭𭠙M󹣫!\u0002󵔴\"c_LmT'􎴻BO}eI={\u0018\u000f\u0011\u001c󽖲ld\u0005Y6𫌪󲣷󵕕)=0)𦞶󿩳UqzKiQ>r]\"✤r$􈙻-􎠹\u0006𩃄p\u000fc󷘃\u00198\u0014\u0000q=\u0015`U/\u001e{e)\u0014\u0013𒍥𭨱U\u0017􉫝J\u001b\u000ch󲄇K5`s(<:\u0019\u000c\u0005SE􍫨8A􈡘Kmh\u0019\\󽈣B\u0015􌞧K柭󱙑lBp'J_%🜽븹􁞂G\u0012n;pt\u000f\u001a+i1\u0004_𢳲󵒺aR{􀇛\u0018\u000bV祽jmy8\u0002'𢏶5i@+u􉎺󵓖󳋓\u0004-􅖷𧵰A],J(L\u0003𨜍r5鰽F凫gN\r\u001d􋲛\u0017~\u000boX\u0015\u0010􂆟N$\"2 %xsk\u0013󳣬𢛛+cmN\u0016r󰇃\u0015\u0017\u0016\u0010\u0017Ct󽄘􇶯\u0005o:𞋌LL/\u0003\u0008JGqv4\\推MAt`>G wFML6d=𣶊\u0004}|\u001d1\u0010\u0004i\u0014\n\r𡷞n𑴏i[Z5d\u0002x<x𝒫!\u0011LQ󻌟Ap>]\u001d><綸𓇴bx[\"p,xeLS󽛾𮞪\u0010d\u000bxote𩇏,𭰷\u000c䟫>B\u0012󽃯\u0018굉k\u000fG([w,􍋝#P3.7!3Wr\u000b\rM2;g>%웫Q󿑠`uy=*􇽕\u0003yo\u0016]𮥸wJd]/d𥁴*`􈮒DZ󺼧}H=5\u0015G%K"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_6.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_6.json
index 0851419b175..1f86fe5688b 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_6.json
@@ -1,3 +1,3 @@
 {
     "password": "🕸EhL|Lu孓􇲣H_~Kᾂ*\tX󼸘\u0002\u0011]z);.\u000fG\u0006BV􍄻􈒥 𝓏:0𦟽𧫙]\u001bu(\u000b󷪊󹽆󷎱w㩸~U\"\u0019f𨩲q]l-)BSsx䦅H0𣦖g\u000b] 󿉀\n\u0000A󳩆𠎿$倢&e\u0014\u0012c*s𤥜󿓹緘9+􅵺-奠𭥤q<\u0004@󿧕𗙮\u001d\u0001w⨐C\t\u0014R󷴢|󷡪󱐑z#]9.􊉴*ˠ\u00076󰢎g\u0013*\u0001\u0001r\u0003`󲑉t5-R뙤o袠mWC\u0015s}.%W\u0016'GA\u0015\u0013]-Jj=,V𭤘s􆪥𡞜g閷D󺜬⟃H7𐰠\u0014\"𤬚ST.襐󲫠\u0018𡂰\u0007\u0013\u000c􄣗@\u0018J0\u000b\t\u000eK`?𗙮쒔P|\u001d\u0018rE󲑺la􈘛GWLq\u0003mc􈆁sM@R0h\u0003B󼻰\u0001]'𦪟\u0011*N􇺍T󳯨𖬜\u0012d󽨷\u001e𭽡􃀨󲠩󾹷5Z\u0002$e􍟥O)0/객~\u0013\u0013Hd󳲹Yt6Wo94󼾠𤆏A\u001f%&𐫏\u001c􁂀􈄬_|w)􎲔\u001e𧫅\u0000$?AHR䯜\u000c\u0008Pl\u0013픣\u0014胺*𭠍\u0001\u0000f\u0013v73W􎠜𔑋󿕔N.\u001b=𬉟Ptu\u001a#(f;Wm᳷\\0d􋚏\u00041a'O[𑗕z8|;S\u0002PI%z/`𬦨PF<=x!@\u0001\u0004\u0014\u0008Y\u000b_/\u0007@Y fLE/aC_w󸤐\u001a\u0018f𠾐`I\u0001􁥮A\tt𠗦槐GO\u001cl+\u0013󶹮r\u001d᧠%mbT흢\u0005G &j􂐳\td{𧔧Z􁦇D[1𗤒=n𩗌b仐󳳖{\u001e󵠡\"馮󺲥?DV\u000b(P􋺤\u000e𬌣氋僸pR/􇍗j𗡚y킁𨍾\r3\u0003駘j왇k\u0013󾄵/􍦭\u000f\u0015x꽋^𫙩􇫲2Sk&evu𘫄𭭆^N)@H\u001d􇧌\u0008A\u0013W󷞆\u0019󾍉T7D𗔷^\\6\u0000\u001aw􂎽b󸅼*󾸇󷨚a\u001e󷄭p\u0001d\u0015[&􍗱T𗽀\"Q莊\u001c$\u001f~\u000f(􆅍Ko\u001e 󷐏\u0019F]V𩬀CF\u000cP<bHv𭎁\u0012\u0010\u001b\u001b\u0004Ds1wdW􃢏\u001b\\=𫟁󹎐XF𘈧\u0015_h5>\u0001Q\u0000!\u0010H􉥵\u0016#\u0004q^󲥄𤺟󽧒.󱚵E?B9\u001b\u000c\u0006KF𧥜𨈁\u0001𣷖"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_7.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_7.json
index 8183ff340a9..8c25d6e5f42 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_7.json
@@ -1,3 +1,3 @@
 {
     "password": "𡜗\u001b<Rm'23hO`\n󱂺􋁆xpmV\u000e?􊰏䣾A\u0015<:\u0019Xdz􎱮\u0011\"?#`M4.跰\n𫢯3,C푹\u0014afb䱡𩲍@c,ro$Ci\u000fk\"󻡧80v=c*@콝𨼗tT6𮮾𩘠|s \u000fy󰢎):)洠Q𐛅􈩽k\u0003W𩤢􃐁􁹠=81K哏\u000b?bzd=1{󿂧\u001a,\u0015V\u000bG𑇫􉳖𩡢,aIlYNu\u0000\"폘}c\u0010𢘰5}W\u0003\u0005\u0002~RP\u0008\u000b􎹮𝤅5\u001b\td􎏱\u0017A)v~#􁾰󸜵\u0014W\u001e\u001bM\u001c󿚲🙣<Q󿮹ʐ'􃅼􄂕\u0007?𥷒8p#\u0007󱢢𥮘Z𢌯꡷𬫻b󵠿f󵎉\u0017ᛝ:󸒷C\u0004\u0006\u0007ꔢ#'󴛪𨚬L\u001d䲟YM@4N𐦯6:]?x%?𤛯􍱧7j鹣𢬱X𨔮颱\u0013\u0015G>QE󻶑\u0011m\u0012\u0001@I#\u000cnJ\u0003頂^􏹁󸩨􈌓N󹭌𬡐\u0011TPq.!8𩖢FqJzQf-.⢰鳀9sﭱGCꮉt󻠹\u0001㻰􌈀6𠬟)\u000ec䋪󰢁\u0001UF㻂\u001boZB\u001276Tw>UJ\n\u001cn:0𣋻\u0006Y'*e-􌒔Bj𤱾SX\u0012\u000b\u001cK\u000elXY-􏱂P\u0016󼊸x􋽼qf뱶w}\rc𨛱im4)󻸋0T`/󿠹'󾑍\u0008`\u001bP􊖎#\u000bN\\\u0010Z$D6U3f'輄󰫞+󿨉\u0012\u0016\n𗅻\u0007tI<edqNb+󹗭mv0⮆𨨥󽏸jUu󵡌𤭨􋚭St4\u0011裸xc\u0010\u0005Od󳌊+\rF\u0001Z􈂁D\u000b돯X/4B𭄕}\u0001n𑁫\u0008\u0018p2􁧮@ve󶑣𗌯󵦶zn𭎴fh3UL\u001cᩚ𗵨\u001c<y\u0003+􂌭\u0004NpBW%Pz8D1Q\u0004\u000b󺰖ne󾧫LU8󸰗4\u001eM褚K\tO\u000b\u001b\\󶳗\u0014􎲹\u0016\u001f\u0001.u󺋆B􅶚𪪅(x𡔞31YQ:sF:Q󻑙\u000eIi)S嫃\u001c󵷙B!\u00020\u001e\u0018j"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_8.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_8.json
index d42949ffe5c..a5b1018acf9 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_8.json
@@ -1,3 +1,3 @@
 {
     "password": "􅮍\u0011\u0012a\u0003扰oiZu\u0015􆑺{wUD~􂢭y5%𣄆𠦴𦫰V}O3T2\u0007\u0017@)\u00013q􍕀e$𫴴hQ3D\u000f\u0013^>c󹷵cr\u0015纭l\r𬦀󺭧\u0011'\u000e9T.\u001b~𒍄𨛑ⷂM䥉㘎쬧`𗧢)L𦥡a彅󶺾\u0011{얻垩wu\u001d:\u0013xhp-\u0016𧔔d\u0000\u0013@4􌵣\"@0􇟐\u001dr\\􏖤\u0013殨K={Ae&uQy;u􂩒z~􌮫x2Y,{􆏟\u001doF?o􈊤𑚖Sr󲥐GꞯR\u001c0?􅋓^)\u001a􊖈𑠗\r\u001d\u001b󳭰\u0005\u0007\u000by󹔵\u001c\\Pl?aM\u0016_3\t[󱊭9IKG2kc^𘌑g\"i􈺡𦹡\t𬘄a􁏉y&\u000eE7\u00146>>𭪸戸~\ty"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteService_provider_9.json b/libs/wire-api/test/golden/testObject_DeleteService_provider_9.json
index 47c0bd6d0f3..ee6749bb66e 100644
--- a/libs/wire-api/test/golden/testObject_DeleteService_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_DeleteService_provider_9.json
@@ -1,3 +1,3 @@
 {
     "password": "[\r=󶳰\u001b\u0015Pq􊢠_璢\u000c𥕠(ó􊆡\n􉕝[\u000e(\u00126𩴳\u0001R6􅑯􂨟T,𡰒,\"𪷓FJ􃣺3A\u00198󵂯=C-􀂎7招\u0015𣖲2y]𬠮\u0014C^1&H􀰨5DG􌣱hB󰼑􇜺\u0018E_.󾒜\"\u0005􀔗\u000b(\u0019\u0019󿝨LROmrW\u0018N+\u0016󹹼.WoZ\u001f\u000eC$b孌\u0010🤈A/x(j􎦣tO𪣥K4SP㱄\u0015\u001b􃽫[I\u0000C🅈􇽧[U\u0019<&눿烹樮B\u001e_l&౩&$/$F𤉽\u0010Uq+`𥚵*i"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_1.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_1.json
index b38dd1cf467..b7c911c2112 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_1.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_1.json
@@ -1,3 +1,3 @@
 {
     "password": ",{⪦\u0013+N󱳜vR@\u001c9!胂􋤟𠚇󻹩r왠𨠤\u0004I\"\u0013ᓜBⱩ𨽶c`|\\y\n\u0017\u0013\u000e쀤<𨣨/􈟾<\u0000\u0000Kb먓|}gR􍨈{Co\u0004\rs\u000c\n*􊴫Z贅랓\t'\u0005*󶋴#\u000e􈊂9𗵤󺢋}Y󽣳󵀶E𗫚􁣫𦞺R𦤦􇈊􍠫2誒\u001fPz󱟡𘣢dJ湋p$𬗞𤂃\u0006CK>e󺑅.V\u0016Z󷄠$󲋩_\\32\u000e󺅯<􈿮9𬁔Ⓤ\u0010뀠ꬌ0\u0001lɄ%𖺅R繁P􍜹쌯󼝘s􀰳𤉛#v'稔\u0008.O4+q􉼎\u00014\\꽻􂅈:䮇􎧢h􂘶𤘴j􅄻:𩦺S\u000e嗹&?|k\u000c󹮓𛄅􂱰?B閭,\u0005`\n澧$A!􎅝𐝔󷼭􈯣hP󳆊g.\u001aT%㶗\u0005 􀇐􎚊\u0016𠾗[\u00083m\u0015x󽟝R镒􊵗;o\u0015\u001d1/\u0013'\u001fkJ\u0007j\u0004􁃘p\u0019s0N%\u001fE󴺹g.􀔒􅜫\u0016􆗝Nh\u0013z@STxV\u0008㫒\u001b􈅵nn􈳬Jo𨣴󹲜󽼭𬰮N6W􍖕{O%\u0007B􊏺\u0014\u0000\u0016U:=Ju6x+c\u001a󱶓\u0001q4=𠕨󾖌󳖩𮪳Q\u0018\u0003JPZ傋\u0005,yhT󰸙O󷬸𗹪 aa􍒉]\u001cbyꬶ\u001e\u0016􆚦􊥣3+fF𫠺\u0019/\u0007ro.A􂞷􌈦\u001e\u000et~湈1􃓅6\"\u0003 :\u0013􂡠\u0015]䬀/3𬀅Eh󰱚[^\r􀭈>饧\u0004앚:)\u0012(\u000f3\u0017 &I\u00191􇸧􃱅􏂹}n􊒣􊿱>\u0013I\u0010\u0012T氹ΎᨤOC\\.cO◊𤴦L)`3𤢿펹㔓7a긺6IZP\u000c=xb:{\u0014V􌨪\u001c\u0017-\u0005[晆#~u\u0004􃨸\u000f\u001ay\u0010ꤝa@Vt⦋\u000e揃H7􊜕𔔴󸑃._𡏀\u0004󴌽2R\u000cM^\u0008𗝿S𥠴\u0008\u001a)'\u0016\u001cT\u001b>\u0004\r!곒F 𨨬{I\u001du~􂶼o󹸬\u0018\u001cm􊶋\u0019󿖣d􉞎󲦆⪈p\u0013\u0015#\u00102𦍘H뺞𩵕R󷐶\u000e\u0010&\r짣V폸\u0011𠟔bv^\u0016䗓[\u001cR𑩇2)+<U~FX\u000b2\u001cA\u0007\u000fV\u0002􆄂\u001bNK\u0014$oT~l\r\\HH#𖡴.>5'|ra=z䢁󾑳It%\u000eU󻩛ݫ󹷖\n{\u0014\u0006&\u0010㱏=q􃧫𥂠H𑁀AcdG\u0013$u󸌅䠩'\u000cb\u0005狲I􈋱#L.\tU󷂡𡸫`?0\u0007󱿎\u0008?􉿪yUi\tF􀘳􁺐􋤾𭞝\u001b𨣓S󰎏ofMG󻵚n\u0018煾{h-􋵁 Y\\\u0011k5LV/␍a1𪅚hp/.\u0005=蟁\u0011#\u0019!􏇛\u001c4rle􊵠㘤t+DR%bt臍\u0007#:퍯<~c\u000bG\u0008􆸩7\u000f􀹵>\u001aO󽀠󷲪􀵃Q2MvZh􉤑e 󹖼􅘮@r?󹰊<!𤡭=􄝶-􏤄\u0007yY\u0005F2􏜉𢁊u󼞺齞󳐢._􅉷\u0018m.2[\t􆱆l􎭋#^𣁵3󶠩􍯴p^tt󳧧凯Mt*r]ꢄ󲤲^00袞C1\u0012d𪤑\u0005aG1\u001dd󼪋􃊏\u0001Yz\u0012Z𒐜멕V􂠐{Cy𫞝\u0017􅄷\ri\u001fO+Eof𫟤.󿢐\u0012{<\u001fv\u0010\u0012𐤠􀻔B𓁋𤝒u􊛡\u00136􁇕!Ew4\u001dTW`㧲􁴼𧷂F\u0010nYj\u001cW\u0013Gn \u000cd󿠣t\u001a\u0002󽑣0A\u0000􊱷𦼖\re3Z+e\u001d\u0002𠕎􁽳'q4o󶵶A\"\u0006\u001aL\u0014{\u0006\u0007\u0011􇋾r9|fG\u001e\u0008𡖙\u0008\u000bQ{\u0003_=n󿸫v!Zp\u001bPJ몠l𘍾i-󵝨󱴄n\u001ct􌝶U𐀃"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_10.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_10.json
index 002d8bb2567..4fe5aa5c13b 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_10.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_10.json
@@ -1,3 +1,3 @@
 {
     "password": "DEf󳉱\u0010O􏥃IF󸰈W\"\u000b\\\u0008;]zM􅤑婘 3w㠜y\u0000𨢬r䏛𦶰\u0017[$瑈)(\u001f\u0001𗫜v~6;z%1𬭢\u0019VDq2D\r}d㼞b\u0015p\u000c+󰑫 \u00041o\u001b仯@x\u0004𨼖!⬇]E󶋼J\u001bEq|^B🨎􅵄󰂰.􉌥7Dc🤝Z􁹞]U8𥀿-,\u0018w堝\u0004|T\u0016𢒒Ci\u000e𦓲\u0015\u0007;\n󼀫f)9LAZ𥿤𗟚q\t洱𖬅𩅟󽠓J<=x\u0015k3<󸉻=)a𬰘o儿7\u0019{E𭋻V2m\u0000\u000f)𒆕<󶥸mi𡂲e~b\u00034;d􋫥𗛂+l𡲵~󺐚)묏􇻱Kf\t~\u001f嬫Y@.􃲴/fj숬\u000e画u󸱧3󿑩c􁚙빗\u0003\"N\u00002^\u0017\u0018\\/𘜼y93🔅[\u0018􈖓x)\u000b\u0017B^𝝓䀨1>x 6󿢘KaR𬼡𭫪z;󳵱tM쐘I𛀖󶞘JGg􉹹𭶀cV\u000c\u001a,_䐨}^\t󷷙!.\u0002􁂫n􃵘KX쪆󷂴\u0015W𠂟B<%\u000c󹶔iS󿑉\u0014fnxrDb.`~\u001a^O(6uQ+䃻\u0006k`𮦺\u0006􅯹O+9h\re􍁑󶣗ctL\u00062Bo<p\u0003𢉬\u0016𩓨\u0010A𘏄\u000c\nD\u0014/𡖄QI𪘭:\u0015\u0001\u0016'⇇Q2\u0004󷔷\u0012>􋔴ꒀop󻴥퇙𨦴󴷩彜/E|ᮀ\u0016𛁞𗮰󰬼􍪛'\u001b𭍇}\u001b\u0010𘋗v5~󼛯I\u0013\u0014b\u0017iP\tqT &𠛌\u0010m㚲\u0018t)%W􆶻\u0002𫦹󼴌Fl\u001d5#\u000b\u001ej\u001c􊦸\u0012B?Wp[G 𝣺#\n􈪟\u0015aUjX􉘨ڝjj\u0013􏋁M𤏗\u0014a𫟻\u001b\u0003*taY\u001b󺲨f\u0014󵶉􆄒\u0012:PE3.􉤪􁀡\u001b㜄􊭜AP\u0007u𪚉W#\u0019OQQu\u0000F|GaQb𐔘쫾\u0017&󵮎𤫸\u0001HcHY53(Vle\u0004{昛qCI􇝁$O\u0002𠈠𒔤𝈼𗝭Z~3󷃖𞡜\n5\u0012𣕯𦍞'N\u001e1d𤉣쮥\u0006%iK4G󺮚:􌃩!\u0016`(MB\u0002𩖱-#􊷬\u0002渕VYN`3\u001fH뇺q0CwG㛢d𛇮\u001bY<𫃪&􍁧J\u001d巔C\r.^y􈦤B\u0006p𩽏|좷Y\u0014X怄WJ\"􍎊~\u0012\u000e/V\u0014\u0002g\u001d끊𒒎G􁻧gc^P5󰵏󻯗Gm[\\G\u0018J\u00036~=\u0005jjv<󲇿m􏑥|LP􀉤𐼝禭A'CԾV􁆜𣷚1x\u0011\u001d\u0011J󳎮󳑜\u0019D2𨛏􍩆(?a)AQ|@􍁞\u0002*\u001fS皊)}😧3i#\u0004(%x瀛ᚰ<󾆢\"\u0006Qt󷶎 ~\u0008kN𮧋\u0006v(\u0011ꇈ𐦠󱅠\u0014𩁝'󼷕q2!􋸿󳸷\u0013\u001c👟􍐏jﰨC\rY?{*𥹏f孠\u0018󵥢0>\u0003\u0016\u001aT)~I.ٝ𭘔3􈜧\u0014{􄳬%[P𣳒|TXL\u0008\u0005[\\\u00039\"\n\t󰚗󹙬ᤋ{C𗮵\u001aI\t䃼\u001d熳𩻿^c1`prF穇hQ`e􀒰\u000f\u0000WB\u0000\u0002A\u0016𦎘􍝄)\u0005x[;\u001cV\u0001\u00144p@sTVt$2􄦉'IS=Ft?󲩱􏋺R𪏅~𫶌𐅸[5󰂩\"\u0008\u0002Vu󹊉&먵"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_11.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_11.json
index 09e9abd673c..add5c0f84da 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_11.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_11.json
@@ -1,3 +1,3 @@
 {
     "password": "𧅝JIT+Rij𗄩f𦟍\u0011\u0012{\u0000H#X3􅸠楔i梅)D􅍣Ld;IBx!;c𧪂󿠖5 y9\u0003j󾝠t󳀻J`s}\u0003<􆕄~I91\u0004Y~D@\u0019󷅛늎𭡚𩸝</\u0005𫨥N􌀛\u001am\u0019\u00142t𗿥]醛𘂀nL\u0017\u0003\u000b|靮\u0012\u0006q퓝~@츀$E\u0017O\u0011Z𪬔i|Uꁐ􀙴🦏V\u0017+*\u0018䴵H_rU􍔻􎦜z\u0008nV:慀\u0011l󿔃r𬓟6r\u0003B𠷗멅^Tt𩃱TD*\u0014󽍖󹳷˰Vc𬊧􆁳/𣞊󲚜@!6z\u0019\u001f酢a🡅\u0007\u000c󸈋󷍹p󸔊C9\u0019yl'󳄍|<_D\u0008?n\u0000(\teK\u001e\u00124\u0004C\u0016PbdBG3􄲲`^G𧏏+RT\t\u0003j3$\u001a?𠘾\u000b6풩ᅧ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_12.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_12.json
index 4d100430d91..32831b9d30d 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_12.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_12.json
@@ -1,3 +1,3 @@
 {
     "password": "𦷸𢟏\u000f1jvG璟󽃗\u000f擾?)𠨷T\u0007𓎅\u0005Nf5\u0016𪔢:𧮔#F𪅛O?\":iN􌃵󿕮i󶈃+\u0019W~F󶭿*9'𗅣j3󶤟I♦,􂌈A\u0019[󺺄𩹵J\u0015󶱺\u0006'󽽛\u0019繘hs\u0008 \n/􏜜탖\u0013菚󾿘𡷁/&\u001f󶲖𡇼UxI~󴤜q𠖥𣞩𦘸-㬉\u0011e/\u0004BOS^𭂪HO𭯬~\u0017fgu$Y*󸩛􎓭􌒈💟\u0010*\u001a\np\u0006\u0003􇂥b\u0012U𗊚_b\u0017Gxuc􍽩𡼅􉃇{􌵝􅸶\\_\\󺹗􎽑\n󲡸2𬋾\u000c)󾔓XN\u0013r;N󿞈Y\u0007釘Sp𢻾8𨰑\u000fP"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_13.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_13.json
index 8a04c5d44de..e4a7de4e712 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_13.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_13.json
@@ -1,3 +1,3 @@
 {
     "password": "󷼰\u001cᵺ7`S􈑳\u0010\u001ek8\rtx\u0015\u0013$𣁧ET\u0005㏺󴷤2Q$]􊃭_\u001e~oL겚\u0005䮁\u0005M7𑄤)K􍲔\u0016ps\u0004􌘥wq\u0008\u0018h\u000f`T\u001ai𝒀\u000e󰻨􊏣)kDx7\u000b.탞𦰗\u0012B󷪇 6H-\u001bg􈨁𩆴L\u0006\u000exY󹋇茹n􀝏T􋴮`J而;=𡡏>]~𠯒󲳿:\u001fe𩻊!+\u0013𣫱u\u0001\u0008Esr􃤈o?{1f􏛬Hg9>􉏳C𗌢\u001bU4𝌤6ັLma]\u0000*\\\u0000rlx\tu𮆌r)蚶Z~|\r𩃙\u001e\""
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_14.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_14.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_14.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_14.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_15.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_15.json
index 7f5b1ca732d..43acfe4059e 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_15.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_15.json
@@ -1,3 +1,3 @@
 {
     "password": "`~􈽴𒊍\u0002\u0015;6􏄌𣍞iG㣰1i􋸳퇛\u000cK२𢷌t\u0008U赀]V\u0003\u0006ZL\u001bꢋ󲥿U;\u0000􊑠Y􋞥 V8Q/\u0005B\u0006W7ຌ󵍩Jy𨀂'\u0010g\u000b󺥔FV\u0011􎈐𩆕-􂤅t\u0011o띚BfB\u001b\t\u001by\u001b󴺛e􉝉\r!+C3󺚯􂜼􅉎㡙B𪫄i\u0010\u000f􏺞󺼍\u000b\u001fhr𤿺󼼪H\u0011\u0016Bq\"𨔎QV\u001e9w\u0019\u000cv%ak\u0008$1n~Rd\u001cZ󳿣/grxh*}􀠺J\"\u0017e硐@E캄wz\u0000󺌻nB:ul󰛌K/􎬻]\u0005c/󺣼\u001e*𡴸𩑥wMe}Vu\u0003\u000b7j􊕸d\u0013􊚩?𣮽\u0008N#A\u001c%=aVy/\u0017𡆔􃌦\u0001􅅻𫈧V􏈔Z)𢎛xz ~ia<<)]􊲦8D\u001amJ1𢿖rP/cxb\u0012\u0006B\u000bF1􂄷𘦷/Dwx𤞃𮐛~U󽏫.r𥸋\u0001\u0006uC'\u000f{󻽀W󹻪X 荎\u001b퍙S6\u000f\u0016\u0003~󰰦Ꭲ\n􄃚-Jq󽞑\tj7rI AfuG\u000c\u0004+󰑘7w𞤍𣳯O𐃉ZsK?󾗃e>|>Q󷀔B讆LL󰱠6v\r媾H􇩁\u0015\u001aS~\u0003%&KH\u001a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_16.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_16.json
index 8a053e3acf0..a7eea6483b4 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_16.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_16.json
@@ -1,3 +1,3 @@
 {
     "password": "Dzqパs\u0013𫅘\nUA\u000eu\u000cO神4X_"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_17.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_17.json
index 56709aec312..77d0fb24915 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_17.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_17.json
@@ -1,3 +1,3 @@
 {
     "password": "]𮖹0;喑8􍈉\u0005􅱫\u0004󻮇𦈕qG]𮎗75綡5􆴕mtr\u000e󳤐i󷷓,4𑑅#5-q\u001a􂰽m 𪘬k󽸖S~F}/s`\u0006\u0011^i1R\u0006󰑈\u0000&􎕓\u0001𬁼𦆝􉥂􈭚𡪑5,n(󻪊`Dl!􆙆\u0000\u000c-􉯦[𢑴zr\"=\"}㛤\u0008㈠☞|ﭱ𡼫{Z)^8\u0010\u0018\u0001𧬇\u0019􍂳T𑨨M𪌯k~A@PW􆺠\u0002\u0001^2y{\u0004\u000b\u00123hG\u0007q\u0016Y\u001cH1\u001f􄴦&.湶W?`6\u0012J}\u0006Cv7㩘J\u0002E~R\u0007:\u001c\u0008I\u001aimv\u001b𫇾x_-S𨄝\";G%\u001f􉹝𡦿\u001d\u0017,D풤鵓4隑\u001f1F\u0011kgo/簄#\u0011ﰌ𑴪x𪲬퉇o'pxg&d\u0008􌟲𬎂zk󲱛-\u000c\u001f\u000f\u000c𢨓󷔐哝3:󿵡y𥦹g\u0000𩨡pR|𡎨\u0007oH\u0017놣#\u0002a7\u0008aQZ󹫝\u000f\u0002>TQQ,z<Q􃠫\u0008𧉦A섪\u0013=(+cN\u000eT\u000c녨𧔳@\"*3\u0014T\tviUꪡ󻮈N\u000eq󶻘=_}𤝙1\"N#󱒗}\u0000o\u001e?8Jlsx\u001fFK𪜂\u001a􄪐𤂚󳈄􍦊\u0012\u000b\u0002󴣅a/􏳒C\u001b霈􋬾+W𬷿N沭󺭻~𣫑hQX𠫫豌y􊢷𨅂\u0001\u0017\"Q=𖨞𪫭Cv􁀠ᇀ𨯠䫳}𞀄?jk􄅚I\u0008\u0004􋇌\u0002冋󳕍𭩯{A\u0011\u000b\u001f\u0000짖PYU\u0007􆋛T:R&󶇥􍈝`6y\u0003ﰡbcosV$拮􍥺(E\u000b󸊍8󰧁\u0004\u0013Vb89\u000b 䎶&󷿙\u0000􏷨𭥵XO\u0001\u001e0^@\u001aY&􅛍􄟕KN𦣪\u0013yB\u0002:m#𫨢d􇪴𥾺!ic\u0004\u0017⛞􎐠z]􁰗\\\u0002􅅖Y󹻖\u001bn􊧩T}𒔖j+\rs"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_18.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_18.json
index 4312221d9c7..23827eba261 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_18.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_18.json
@@ -1,3 +1,3 @@
 {
     "password": "/~\u001d\nꐀo*e6oF}v1%OVn)㗄KZ%\u0010%MPU:Rr\u0004\u0013𥬼sq\u0017^3X󵘽<0o\u000f&BT𥡼_􆪐𪧯lx\u0008󰏣z㮦P\u000f\u0012'댇[Z\u000cSte􄏝_Y󾣍ex𠕷_wt𢑘DJ\u0017h\u001d\u0017 FF!pT䆁󻿺(\u001a妸鄼hr􋼮z󻪑2'd5\u000f\u0007𥷬r\u000f𢄔tv𠰙?\"􄁹𐄏\\q\"'~􍞛*|.􉿟\u001eOA1Y]􍿉x\u0011^𛆽^𩬓l󿺥s\u0004\u0002d\u000c󵂖z^󷇹[𣉧L\u000eVl5􅸿\u0012xW𡉧󵋥_\u0007v\u0007H𠶪1d􅍲,(61\u0001_iQ􍂩?=j\u0011􆺑狳됙\u0003K𧽲c𥵎󺗏/\u0007T󶺑\u00035=䶥7x`L󲥴㶅+U𪶸􊦰\u0006D䌢\u0012VU\u000eciU⪾\u001aZꭳ)!羶\u0016HD摜󴉒󸷇+󽎦Wla󱰺󰂄岰p\u001d\u001f􈺦\u001e􏠸\u001f\u00182􅋜^C5\r:L|C𗧞\r𬅼\u001eva󷓞C⑧*󶢞MvꜺwu𤒸󾷘/sP5􂈭F@%󺲹Lc~z`|d󰂋\u0005𦰺6\u0000䀠6𪫢K哽A&R3/웵dS\u0002\rZC\u0015Vz!𧮋;g\u001c\u001a)d𝑃𩕐􆪐覿#Oc􈈢b\"솵\u0017#1󴙦𐊐r\u0006R\u0006rPJgEꗺ\u0017+󻚇CDH>􎙋2/\u0016\u0005#'lS\u0000\u000c\u0007C9W蕨\u000c\t\u0016\u0007r裳O7)\u001c[E𩕇X[𥲅[\u0008umB\u000ff\u0016G\t󱻱[nkl\u001d󿿷>o𩺐昆󻅰󾫗J㱒x0􌬕󳨇\u0010󽣗x󿔫d:Id4\n\u0006JⴸY󻨯𗠗cR\u001br\tmv\u0015%h;FZ0皘>4\u000f,𨢌𫸻+Sa\u00185\u001d\u000eG󵉽󸧔kC\n\u0017rV\u00151:󵗝𮇋Q𪏮􍃃\u0002𨭰ḮJ\u000c\u0004Dd􊑩i󳳳\u0019VAv􄡋N\\F􃩀eR㬢kOj𢌆e🟕︅\u001f-\u001e@𨛕􂎚C\"\u001d\\󴒟󳢩􇞉)Hs<=􁤌O𡋾澅d\u0015Y\n=|&Rz^#\u0011\u0019Y+?E2#\u0014\u00055\u001c\u0016#\u0003󲡭\u0006\rj9%\u001bv.\u001bK6K\u0000T󼚪wToLS鳱(\u0000󾹅|癷\u0018J覓#Ṡ~󴗜\u0002d-z6󷔖ᝬG𩺘\u0014J\rQ𩳡B^?A.@󱋴"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_19.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_19.json
index 154221ebf0c..66e739b345b 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_19.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_19.json
@@ -1,3 +1,3 @@
 {
     "password": "\u001cHAC#-gZ\u0018)3\u0005襡dM\u0015Z\u0006Mt妶%5􂮾l)R_󹕿Z@𡝡}\u000cV􆀟Pvy\u001f=i\\󵫱\u0019\u0011\"pe鯷^:\u0007\u001f\u0004h𮝯􌀣\u001d]Y&\u0017wZW\n!m2S<IXj|Z2Hg\\齡eBM󾤎\u0004E\"ߔJ'􄯝\u0014/z1YWN𐧎\u00158H\u0015\u000bmk􆝪,\u0004\u0019\u0006i\u0012\u001d󷷤\u0013\u0013捨D󾞢􎘕\u001e\r[d\u0008\u000f0<쾣cR\u0017F渹𮜅>Yb𨘂OCW\rq+𘝪h)㻮袓p_~2p桅킐\u0008𖢌\u000b{9Wn폵{\u00007/Qn啽^K\u0013\u0017CP!+󵶭!PfV~HT􈍴GNﵜⱡ^<U􂫌L瀶nkx\u0011`\u0004\u0002࠰E\u000e皭\u000eM􈟋;\u00005gi]􄠺T\u0003􌕸u]6t\u001a/\u0011;HO󿾐X󽱰\u001dNo2f\u0004@L<]󸽩$󻃐[𭩽>sSR𪉰)瘩 󶳆⟡XlA􋴵p􂦿𬙷L\u000c魊)3!R\u001bH-nD\u000e}KT88P\u000e\u0006\u001eE\u00188\u0006%]𑪅𦳆󻱢G斴\u0016𥿏𢯤􅧠\u0004)\u0011􂃣KyP\u0017F\u001c{;)(\u001a𒅳iml\\G󰞐;:󸾉\u0015𑚋aku\u0008t\u0001挆e󼴪X2!~𨾈_*􋁠T\n𭗳쇛\u001f\u0002=󷖣%썊Ui\u001e{󶬺⡈󰰂)󱋨\u0018\u001c猕p𞀆󰒇ae;;S䣂OIumd!o\u0011衔󾽳䓸𣆕\u0018;𣽦B]􉑖r\r􊗚ේFM\u0003vl&7\u0006:~^\u0010\u0007􍱌u󶰩\u001f􀂡g5􎸇蟩\u001fR|\u000f󸩽Z\u000bN0$W􀢕+qN?\u000f𨍜 s󾖣n􊠻>x\u0012鿦EA(CL]XZ2G6𩋬𑠃󴕝|9>{\u0017D󳒺􎵫炾:ꇉ\n𬎪4𫣇jon\u000b􈥤󵵤\u0008\u0007\u000e􅑘e𦚓by-7􌗾\u0013\u0002뒉-%󽐩\u0018L\\브A\u0014E\u000e$r皋ajn_㣄Hn{n𤃫􊢍\u0018P\u000c\u0007􂋦􋄿ԔVH@v󴖎*\u0017\u0019bB𐤟N\u000cf}G\u0018_𮚆bt\u000b\u0000\u001aHZkT^s9ᙽ钞$Ai{o\u0000󻸞?󹂝R􅰸\r`⧔𬁃'$)c0;\u001f𮟫Q𫌓5hI緸\u0014q\ta𡆕􁜡fᐍ󿯼\u000bIc1+X\u0019-b%z㍚\ru체7h\u0003vc읛}a􅉥8\u001e$YXL잜憏G􀗠\u0012n\u001c󱌀V􂜄\u0016\u000cEF\u0006,g#K\u0003\u0011\u0000~2\u0008􇱚3𪎇\n>D𘘝E\u001e#󺊰􄀇`xj\u0017M\u0011ꄙB\u001cQ(\u000c\u000bW \u0015𬂹i\u000e\u0018s󰝄(/mjS􅚫W(􃊱{a\u0012󸢰b/t􎝔*miP{=@ྙ.o7𠗆\u0010vO􄓨\u0014\u0015ᶣ/H9^.Sof=듭𠼺3i꣥'\nVI>1y\u001e㳶𬞡/ie%Yb쿢{9\u0012P\u0014W\u0007u\"A󸴡~-􊕲􋵵Z􄗬𗩊󵟔c鸢g󶛀%𣫂k󺹃wL𢱙J+(m4I`Z$n󾲳/rm\u0003`@`6|\u0004eH\u0008􍥄𤁃4\u00004􀘬RG\u000cl3󲓿􏠬{1)_m\u001e󽋿j>5\u0004{vm>FM󲍽􄔈N󲎳􋡽\n\u0012t\u0001\u001fk𫟟?ZM\u000b퀁g7A\u0003􌁊\u0008󾾍\u0012\u0017𝦰􏖝􃷌琚C\u0013h􋔔\u0014ag^#𩉟󳆑iE泘\t\u0010>er\u001f/C􉍎x\u0011󷷌}\u0019\u0005dk𥒨Cv󽒽󻄍󽃄\u0015\u0005S!S?7󹍄𨶜\u0017𢳛􊒰]5􃼢\u0001!\u0017@\u001au4I𣮔X🨹K𭊕&ࢩOa'\u000c鏞沠筐p\u0000.{E\u001aO\u001dNW𩋗쾦 󴠣0Ị\u000e+*\u0019/󶺧\u0001]6"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_2.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_2.json
index 4f8b2251fcb..8bb3d817935 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_2.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_2.json
@@ -1,3 +1,3 @@
 {
     "password": "8􊋦=􆛤𮢿?\u0005\u001cbf\u0018Mr\u0019hFbWGm`𨻮\u0014D3􈎳S\u00031'=+󽩭\u0002`\n<𩿉􀿆\u001a󷿍W􅡝󹧌\u0016.E`~N#Le􋝻$,E#@\u0010(Q<𬴵􂅨Ꚇ貽𮌲㲊X51ZW􌶴d󸚚𨁐v躈\u0019󵂒{zf󿳳r𥺠*\"빆HCbj&󺸫𩪚\u001a^8&\u001b\nGG\u0016@󺥽𗑏UqM5\r迪\u001d𐡀\rꉟ㯮$V84)\u001b􇿖Z\u0001-g1\\1C(\u0008b\u000ed\r,A􌸻,eRO꒾26$􌘎P􋆖􇦂Vq\u0005(\n\u000f\u0006a󲡏\u0008\u001f\\Ob􍜫􉍅oV:\u0005yq^󳡦N􆻄X\u000e𨗬,$/;\u001ep#🡥-06\u001e4=0h\u0017\u001d0𑣊1\n𥵁\u000e\t𝨆(𝛌󰜫6kpaL\u0003B0^𡆣眊𗭎\u0016\u0013󷖣󸱛\u0010􁜴\u001dᤵ\u000fVN\u001d9z즵𭊝I~\u0011\u000b뵄\u0005cCO*c0'\n􀑌rV󵝐\u0007\u001ar8\u001e*W󻣜xx𘕧\u0003WuI%𫎭So@@\u001b\u001c𑈗< 8\\􉷿1\"1?\u0008\u0014􉎶𢹬\u0006\u0013\u0011gz摶\u0007>畖\u000eb\u0017D\u0001tz[𩻟󵎪𥀫􍺟􀉕>욝\u001cdIw\u001bVNNHC𬉛𦧑󹮋\n\u001c\u0006Sg\u000bYl4O\u0001/lh\u000e󶆳𭰅s}􋈺cBj.6(}I\u000b\u0008󴺚\u0012U+*􋍴𒑴kN\u001a\u0008c\u0014u6y/􍝈\u001a5fb@|\u001cB$F\tB\u0017\u000bKT󺅏\nK\n[)I􉨭􄄯ජN:Q3N㦾5􊭘󾥧ㇼg\u001e0P􊫐\u001ceJI𡢢󴽣 h\u001c𦪴􂿗\u0011|:3L<!+\u001c𮅇2B~JS\u0010*\u001fhwP𥐢N$𔑈ྐྵ󸈱lJ𗘲\u001d󵘧\r\u0001q\u00045??W󵊲z𦿼\u0001䨛􈙈E'r\u0002\u001e\u0014\u000c𦒇󽎣GZpzCu</,􈬽䄲\u0014\u0015\u0007>=𝂸\u0006`t?\u000e[\u0014g~󵱆vDt\u001a樛:\u0019􄆞𤗸Kb&\u0014\u0006\u001cW]K\\4\u0000bh􍧦|\u0000D󰷸b?\u000e\u0018\u000bs𠍧%>/\u0002[d󱊁M󼐅bN6.􎸲m\u001f𥚷|?yp="
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_20.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_20.json
index a24689565f9..a0b5dbd6421 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_20.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_20.json
@@ -1,3 +1,3 @@
 {
     "password": "4i&\u001a\n𪜬,𩿙󽯶󺩼\"󱮀\r)􈻦X^`Xv𮥈\u0002󲇅UN\n󹾬tQ󾜺h䄗4\u0005\u001a\u0008j󶮜Y\u0011\u001d\u0019ﳧ\u001dX(m膥𪻔cXz\u000cEx*M\u0016L6;*󴧟𭻞􉠨\u001eD}󻹯YwkÒV(jsn􄕺KS󵓏\"烪릟𮙷\\\r󲗔\u0013v뗥C\u0012l)BxF𤋾􊚟\u0016!>x?􇑎􀁨ajᘁX󻠟t𠚳𦊠C+iz\t􏼡I\\󺤮O{\u0005󶊋􅜕&㾛sYx󼌕\u0011𬟄m\u001bzg𒀴l卆:\u0007?xav\u0003󴷌~\u000f\u000bs􃀔󼟜V\u0010:\u0002ࡥd\u0017oJa㤾􋝡􇝵2󺧽-\u001a쪝੯J\u0003\u001c\u0004i\u0014lo]`\\\u000c\u000f8[dK􈦺4z󴿣󺄷􄨧篭󹅵𬌋𫴒\u0017\u0013\\o󻾌\u001a\u0014.𤽩oTs􃃚n\u001f\\缡\\z󴑘Dl㏁︮q%iW􉎈(#ÁEoypfS벯󺸀踛S𭊘b9$􇭌\\\u000c%\u0010Vc\u000b]q!SSQm\u0000C\u0017\u0019}\u0001[uN?𤶱#\u001a󻠍o)]VqA\u000f􈜟\u000cBtO}t􈝆vꅸX>\u0015󺩳P𬂁d󹋗#𗱢\u001ff𠌴𢟀C{H&]󱢅#5exl􈛗&n?\u0001\n>&T}4劣#L\u001dr%o\u0001/󶣄2ID8\u0011'kog\\mw\u000fe\u0017􄀡\u0003\u0014^O𪾨~t0\u0004&<\u0014#ym3𮁟;\u0000?r\u0014*\u0002E􉹗󳁕<󽡤7M%*-ekKjyQq (z􃾀\u0017\u0015g󿂢K\"\u001cvu\u001b`\t]C􋎻"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_3.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_3.json
index 0d362704d3f..232dd265a92 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_3.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_3.json
@@ -1,3 +1,3 @@
 {
     "password": "x\u0011M\u0004*Jļ𢷒otr\u000e=󽺫p\u00049\u0018l,KZV􄢆t\u0010󷏩@X\u00151mO\u0014\n秸\u0019h~rȑ|𘍙Rw\u0019Z(ox2_r􀓜\u000c.􇢈􀖁/-m󲾷󰊃\u0016L\u0019󶷰\u0006󻄕A𣀧8H󵈑J\u0016N.\u0015k$𫺴셈uX 󼾐\u0011'󽖞?a\u000e8\tHWh=+~\u001a\u0001>𦅵(\u001c\u0008𣐇%&\u0003:)𝩢\n𧾐\u001f8"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_4.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_4.json
index 4ec3ea9f587..557ce53eb14 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_4.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_4.json
@@ -1,3 +1,3 @@
 {
     "password": "湡>\\\u0004\u0017\t\u001aG\u000eu\u000fRc\u000e󼂌􅉠`fx\u0008\\WS%u𭅷\u001bq\u0016\u0017{󾬀u𠒃2J+󱿖wPx^,:@\u0012􏕨; @qtte/\u001aㅲxK-PebR3Z@xm핗S󽵋󾀁15\r𠀻沆4|𐲫~\u0015\u000fCdK𑩢w\u0003Ek󺍪𑁞󹕿\u0010Ce<\u00073tJ\")󹰿DFS\u001bVz梎RrC悛>M?&98\t\u0010/sd곭\t􏼅􀺀T􈍼@$\u0008(\u0011􃬷nQ􀆷_s\u0010􋠆1,\u0007%cQs\t\u000bjv𤜡!\u0001)󱟸ySU5\u001aZ\u0014즍6C\t󸊞\u0000\u001a𣄋,:\u0008n<嫖__%𣴧\u000b~󵇕\u0019p\\L-𩃓󾣿P,薸\u000f6\r6g\u0011𢂚'M􄓋\u0010!􏺼ꁋ𧵱\u0002u\u001a\u00021뇻\u0011g\u0011C🞨X\"\u0010𨴠􃦤e7ስ\r㼰&ID󲚨YiI𪁙}X1)\u0001>􍲻\u0015O;-崱,L\u0007H\u001f(46󿅽=\u0006m<ꛁ{\u0008ꨠ\u001cj뷅\u001eRO\u0019|7\u0011z󼉧󹪧MPuVS􆬂VjHL 𘘺^𮪢\u0007vJV󶕰\u000c6\u0003q𡈗⺆?\u0015󷨻a\u000f􊈨C: A􎶾7PC\u0012󻚪|\u001f𥏦#B\u0019\u000ecx󷊨CDbe\u0016\u001f{\u001e\u0001&q\u0004o\u0001\u0014F2𮞬!\u001d2yw􋾩\\)\tI󴿧(\u0016 gC󳘨O\t@_8\u0012󼷻𭳱C-\u00011|􆶏켢𮒸*𓋱\u0010󾫓u𐢓\u0018㶋𘡼{r\u001a/O𨸏侬w*뱬s据~e𪡊\u0011\u001aZ\u0011\tLq䵯󾗼V\u0012xp$C9\u0013o𝢱捾Re@ay󺑜{I|fB\r\u0010\u0003wp.􉫆1\ngꧦO\u0004 AgX;Ĥ𫋤󱃧𫬺4\"󿢳-DCk]>\u001f󲁮󳰚=&\u0005雉I\rj*h~5}UO􃿄]A𨽧콲v`bG\u0008𬞤'S=󾞮\u0008s䈒j𧩛!%𬋢甭0𫕴F󸜔\u0005🅗H衡\u0008𧺍z\u000f􋗕𑑐EF󶬩Iwi릚\u001f~oyMX󵚈\u0010𪆟^`j𝟙𐃅/𩋄󰗴+OEOOR𠭞𦝠9𥋛5\u001av鏤Hk|ƌTPlgJ9\u001a𗮝P\\b𩃈\u001f􎟦N4ᩯC]g\u0014􁟴6gcrJu􇞮z\u0016_\u001e[𑻱8i*D0\u0011g_𔕿8H󼳆J\u001c󴠙DK`󼮑iФ0㣕Ee\u0003I\u0004h󰰖\u0010D/󼌲BuBXU_𗐔􀏥\u00053q\u000e\u000eC/𐑱󵊡\u0013j󿯭'o𦥸𩜖🄼燬\u001cd65𦿛5@􅾨\u0015Y𩆪\u0007􀉦^D\u0018Bqb𥒠qiAn@\u001a󺥳$\t(\"\u0005\\ )/Ox\u000b󾅐^@<𥕝\u0010𨧤Tf󱡯B䥮𪄢L[\u0004鰷\u001bp\t2wk淞<󵰡􅴋䠡\\\tIIS1\u0019? x󶴂n\r/VH⹇-ss\u0014hJt^\u0002$𪦁ZW󾠗𗌄\u0015\u0007𢛣\u0003)\u0012&5&𪯠iR𢹫\\\u0013L𨪘KQ].􂤝\u001f椼\u0005𦊛Xs㡙<\u0018"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_5.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_5.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_5.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_5.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_6.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_6.json
index cb5315af7f4..b43f98ed92c 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_6.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_6.json
@@ -1,3 +1,3 @@
 {
     "password": "J𨏒\u000b\u001c\u0001𭇬\u000b𠬖𭳗\u000fXs`𠔛\"𥞷>\u000e𭻔\u0002=𔓥\u001c\u0012\u001b3=>$o ^磍w#Z\t􋣹D𦃌󴫷'\u001f榀󳆬죪$􇍇)X8\r;\u0013㉮\u00181/\"􄨀\u0016f\u001f&g𝓀\u000292\u001c~a|@b$\"\tནO:iL'𠇠副,y,:@줂\u0003Z:p𦢿un\u001f\rWL{TE鐶𧏛􊗸v\u00084=􍈹\u0018\u00067Qt5<DJUNQ𡮡dd\u0001A𛇛~6\u0012Rz\u0004!7\u001cx&􊫔e\r%󴈹􍈅𨖁\u0017\u0002t𡎦rn𒒟\r:􋣚y*S󽓼󺄠𩮝\u001d挏d󴜥8SI\tm呡Q\u0019󹲊󵽮𫄒x􇉣󿘚\u001anL\u0008👑49[󿔩궩\u0018c([qL\u0006U󺱁􏏲fv󶵡\\\u001e󾸖󵬍5𘧗+􍩶􍹾Y]\u001cH\u0001~G80󺷮h~s[𝕣􏭅𥖵\u000fE􄋓\u001a𩲩󼉔ܓ\u0003NW󾪀9\u0010𫐽V\u0001^\u0012on=\u0003󵴺X[-\u0007uￜ󻇧\u0007a􍡗󽳸􌥢WQ ;󷟈n$*]\u0002m*|\u001e𗕙𮮤𨻨ykB𪳇Z,\u0015p^~󻹚􃥾V\u001a\t\u001bQ󴦇I\u0015󾊖MIbFc\u0005|🆠\\M)\"\u0019ZJ\u000c󹎇9vY\u0014aB=󻯎ชh\u0010o%\u0003XfN9🤺 \u0000󵀉^󷾽HD#A\u000f㗹󸷦볹~e𤝌􁍬\u000e𘟟R𧤯C3.󶸊\u0005j\u0019\u0014넅(𣿍\u0005K[(*\u0016󶨶\u0002q𬗂wZ󷁾kNR'f棬𛇶y\u0008_\u0007U~%\u0015I󸥁CF\u001aS楬C)^󿽯\u0002\u001b(𮐈\u0003+󻈟*+w\"p\u0015\u0017𨉃N\u0019\u0016╄$\u0012𢏙6qyQwy󱕼\u0014v\u0008@-61棓?[\u0017m/Y\u001d믇𥖍,\u0019IP@Q\u0007e|\u000f\u000b⇥A𫬵9󽔶Woᖦ\u0011w\u0010g􊔶m`\u0007)𛃜BO𧱮𤏟𠣕{,bq翧Hk3\u00060 Pom)g𤕅q($A;缂\u0017\u001e𡴔]<|e􎮼$􃦤遟\u000b;=;󳗧ho\u0014,\u0018}騪&X㧻>^䑂\u0012𔔐>炌]xX\u0001]𗯘,󻾪W\u000b󻳩𪯓\u0013\u000f\ryV*S\u001f0n\u0017a洀𮧞m󸏕$􅷮k\u000e2\u0001𩌽>酞\u00004_KFpk𢵀\nW\u001a2鯲𪋹-v:<[庇x􃏘󳖂\u000f\u0014z\u000f\u000b犳wG\u0001\u001dK,U+'5#};o㒀⟰B\u001aG'𭪽W􍯪$I2>􎍐𧐛𡊱O􀣰󲊦\u0007\u0018\u0003빵O9/U맰t󵏆jQci#􉏣i󸚨\nirLiE>W􊝥=ri![\t\u000edMq𡇓Eg\u00076󱟟\u0005ᠼW𭊜~樽\u0016[𠆔\u0015/&A掇\u001co\tSh}j𗾽u]\u001d\\%\n􄖢󴙝𗱣\u000cYZ$1'mf한J󹳒v\u0008􃧠Dｅ]~\u000e9\u001b0\u001f!G\u0014+\u0018nⰳ<nI6𗲃\u0007>􈎢>Ap_𗗷Zq_v Y􄯘\u0005x|\u000f𤽛􊞠`G\u0006nA<&K|?z𩚞\u0004ᇑGs􂫬𫹨\u00145wY\u00080^󾻩\u0015𭾶f뺖\u0017\u0003^$\u000fR岘|G\u0010*/󾊢%G󰎦IEN󴩙YB\u001fL=\u00189􁼃\u0019k8K9_(IGM\u0010揖􉱫{r\u0004𥓛𭊲󳠞8\u0004\u0003'X𠧆\u001e\u0011&/:\u000ct\u001c\r\u000f󶡁$ᤤUx\u0010B𪮫㘯@󽄲/#Y𞄰N𮮦!𮝣6\u000c\u000f!_#P*C?􍁺o%T\u0005\u0019􁲢󹥡4%.\u0003(66Pl쀇\u0004g\u000eb\u001b􅢝;󳩚{\u001c\u001exz1@KQzs\u000736;,麇fi늀Z9𘖋\u0000"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_7.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_7.json
index a4318546bac..9c976c921f1 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_7.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_7.json
@@ -1,3 +1,3 @@
 {
     "password": "-Y#\u001b≀𘦀\u0011\u0016-􈏓\u001bF􉱨2B\u0010𪱘S󸝿oHa!󳯛 gO𠒺\u000b*{顼*𣎸'\u0011V[wm\u001evcAc\u0017j\u00077󴁜􄏏\u0018r,d/\\8󵛻1C𠚶\u0004\u0006侮)\u000e)O[f􂎜0&r3𫢸a󻿛:|diTt5􎬘~[\u0007O[{\u001bng󻡀􉕤珎^Z\u0002!Beh􊆮p?\u0007])\u001f\u001au󰴔\u0015󶢣􇥬v\u0017􄸏a\u0006N_{$𭦓샠F︉p𮭠A\\􍤧F;)e1E<󳞅e󼣁K󾠚󳔪x\n\u000bꉬZS9\u0018󽝯%􋀴i }𩞽VJF<\u001b𫠜􋷂3Y?$|W􇏔>싲󱲧􄇰b\u000bT􍐷40􈵅⨤QA\u0001E\u000b/\u0015󽵍𦍌\u001fc𦆧\u001b-㉚>`\u000f+r𖡝&\u0016l\u0007MZU);+\t󵡋𦥝<􆾴<e𨠦𞋢_eS\u0003ZJ󻙃TfO𦲵𑊏`D󰓝􏩷W{nQ𝧖\u0004􃖥\u000b_aZGK\u000e},0s@6^\n\nf8\u0011\\\u0010B{~3p^2Ln𩖾伬p\u0003q괰\\O>y]Q󸼺J\u000ehkⅫ\u001a\n\u0010󳒡鑧9\u001e0~]ÉD\u001bP<􁥥𡅰\u0019n\u0017󳞅zR\u000b􃼲.-\u001f󿏫\u0005/\u001a𝒚\u0013󶔂[╍+􇭿OS󱢥\u0019\n\u0014\u0017𞄊T*\u0016􅯨\n㹘Yr\u001a_\u001c\u001eG{]Rg廍𥌎綎E\u001a\u0010󳏁󻌺󷦆|'\u0002\u0005-X0\u001cqTS),𡇝殜\u0018.2󸇅󰶢䳎Rz\u0010tV{⻌胋J󵼊d_OgT𨻙>C(𓊺𡌅𬚳Xr5\u0007K\u0001𗋠𒃣,땨􏁱T\u0014A󴶀1󵙐\u0008􇑑\u0018𮇴􀚆U\u0002#cz.\u001a㞲𣰟\u000b󸄘鴔\u0012OcดiO\u00073B􀻣􈏅𨊜9󽆵r\u001a<r:pJ$\u001c\u0014󻩝Cq\u001bW*`;\u000b\u001f𦼭2𭬝4\u000f2\u000fQp1\u0007s)\u0014aQ\u000f\rƁ\tt\u0011\u001f𤍱R􊃡i􏦺6)YhLopGP􂤜𤃶s]/󻆖sv5S#n\u001e($\u0001mrI\u0002 \u0007\u0017j<'X\u001f>[\u00151\u0011{󽃱J7􀡣\u0017􃻝󹿈\u0013\u0003𧹣*v즂􋔆\u000b𮧇&N󽵿⽟󲌿B%2/\u0019㭕7𤘍\u0001]𬀍Z󹸋IMq\u0013y%󶁑𩸏}\u0001ds`\u001c(\u0017\u000fOX3C?\u0006\u0000㳀]\u000c󽝁LsTu\u0010)\u0002U\u0012a缋𠜋/\r |𡆽NB\u0002|jW\u001a\nAx8/%L󸋣󾊐a󼱃f\u0000m寞\u0019\u001d'\u000f􈖛2y|6\u0006;\u0019\u001dO\u0008\u000fAq㲇\u0001=􇪗􄺺𠖅q3_z<m'􊣩摲&D𠁆𬐼ளQ`P邹dt􉅦=󵖊o+<5c\t*j\u0010.𥁧z\n\u0006^v󰾦\n,y\u0007jt_v_Q]􍝲\r벵&󰺒J􇆋􎡔U=nx_\u001c'乎􈦐-VNK\u001c𫼙l\u0017ꩄU \u000b\u0014\u000fK\u0017k\u0016c$𢛸𮁃Guh-_\u0006𨛠\\4𫘏\n􍳀􍝚􉃓9Lsab󷿀!樊S\u001c\u0000qD􆏚\u0001S\u0010󵃼S􁣕\u0010㻽􍯯\rv\u00173󳞺`\u001b\\Z[#𦚍?cT𓆾󻶼\u001c渕O\u0001[I✌ 1|6𩫮楺dB𪓤E[PG-\u001f􉼕\u0006:->\u001c\u0018N󷯿𣊎z栔7(s\u0010@󻬂epd𧑻[\u0018U\u0002鯩\u0016B𪴗/􊱀\u0012l폸[m!\u0010>U\u001e𤐎䠥~󴒻\u001b~I\r)𧊪𪳚W奼쮰!gSፀ7\u0012''𑒜fg[]\u000c9$󿬞\u000b(\u0008\u0008~_􈔦v&\tA(𛰷[H𪏐!󱊉@H(2i=`&Np𡜩N쁔u큯\u0013󾲶\u0011\roGt𠴦\u0013P("
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_8.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_8.json
index 412f7a2fda9..a54be5a96b5 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_8.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_8.json
@@ -1,3 +1,3 @@
 {
     "password": "\"斋n\nt\u000636>w-,38BR\u0018\\tApY頝\u0004#蔙\u000c\u0004Iy1􊬄c􎼀𐳰󽻝􁷪􀜄\u000b󴀖\u001bF䳜󴪉x𠪐𧩊\u0001#󶰸RQ\u0011❩\u001b;eb\u0004Tk,𥯱\"hN\u0017󹂎㹿_𪁢s󼪆\u001d􅆆$\u0006󳌁56􅁼󹲆=pFL󳕕\u00041󳹳𮐊q'\u001ao0\u0015kYJ`oC(j\n\u000e􆨺<\u001bCd􏥲K􈁬膥odp笹4!HblpH|g􈳻$󷕦+#𗰿sU󲄐J󲸪𣷮<󲬉󹊗\u0015X`=U􅄠;@\u000e\u0018::\u0014\u0006HᇪNU􂋏0<\\󶇷F^!p|ṛW\u001eh\u001c5i􁭏GT󶆓F4􉿓/𩲱\u000cxu􅕗\u0019􇢆cHB\u0011yB\u0018%I󷚼<􎯛􉨙y􄸂*p^\u0005i\u0007𗙮\u0018s&W<􀤋eTS􆭲𫁂S\u0012􆥡\u0013谂6𫉮|𫬿\u0012󶇒󽅱xUt:𮭥􁔨6Cf/\u001c\u000e\u0017ꌴ{3uu*yU\u000f]Ja\r9󲘵\u0007잜?𠦢2\u0002 \u0007Z\u0012\u001c%o=􇵙D\\oK<Nh\u0006H\u0016>R}䱜%l2\u001c􊒌\u000f$u4T\u001e/\u0013𭹑𑱗~\rI󽐁󳗞O\r\u0019)\u0000,BBa<󴋾󲱏yS/2[𠹀󹿰\u001cc\u001a+=A 閯􏨑\u001a\u0005𝩓}^㳈c*e4𬱖\u001bH𑅘|mIqg󼛑𗛌ka􄯱𠑀\u0018dVIb\u0002"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeleteUser_user_9.json b/libs/wire-api/test/golden/testObject_DeleteUser_user_9.json
index 4df8ee3f33e..f7449ea8080 100644
--- a/libs/wire-api/test/golden/testObject_DeleteUser_user_9.json
+++ b/libs/wire-api/test/golden/testObject_DeleteUser_user_9.json
@@ -1,3 +1,3 @@
 {
     "password": "RWx,BvC󳁔RH?􅭖':1:!\tef-Z􅐮&3|\u000f𣼦J󴩷\u001bn`\u001a+\u000ck8<2.p𡊛B𓉛an\u001b􏂚o𥊞7_󴩚󼞧x\u0000𢇄\u0015\u001c\u0013S$ \u0013󺪟mv:tA}\u000f\u000b\u00155YＺ\r튝\u001e𠪍E@N􅖤𭻣S𢂤𥶝r󿢫􌸡O\u0003\r<\u0003 \u000b\u001d􆝮󸨿X\u0007@Uz\u000bm􎤠\u0000ਙ􋃘􁏵QM𘤛\u0008󾨄f🩇y+𭮫f􈊤X𠐃N󺁁7=(H[𒊽#9j󶊑Tx\r󱁀􆟡b𢤿c+LT:\u0010pXTce\u0018􏋱h#\u0013\u0012󾆃\t(65\u0012핰{Gudp:{xrBR𮚸Gx𣅃hIt=$;nI\u0002}eR!\u000e-S\u0006Uxc0\u0016Aྜྷg󵼠ᏠF\u0002\u0002rr􆃁􊀱\u0000Z𪙜\u0019𡠸?t𮙜􃅩7㺎Ji𠍀1\u0001\u0010t\thf4\u001be(\u0013\u001em4\u0012ji𐩕󺙟e\u001c96\u000b7|𭦿𧨤􍻍!仯2❟󺕍:s8{􇤎c0\u0003\u0013}\u0015DR쫙sXh􃋫\n(Q𭃺y=\u001c1cW𥥐M)}]rd\u0002⡟182\u0013\u0015\\wtjm!󿋫\u0011󳄅\u0007󵤦|W\u0000p𦯩􁪏\u001a\u0004z&𬰈ZhHC\\\u000e􁋛\r𤬤\u000fg4\u0018\u0000L󹄒4􀯊LZjpCm\u0005􉎗\u0002\u000c\\埥5#𠘻.uC\u0001\u0000G韄.*u沂\u0004􈋎@\t󱑆𣓝a鼿T\u000c\u0002𠯣@\u0003m􅛊\u0000󴞀a\r]염2󴤟\u0013Y0~bnꜢ\u001dM\u0018\u000f\u0007\u0008Q#w\u0004g𤅪\u0000 삜\u0014\\.[P\u001c󾀈\u0018R/\u001e\\A5\n+\u0016N㡫1\u0013\u001b𡘳𡁟\u000ck㰻~M𬱑􂃿d|*𥽦#籕&K\u000f:3sS/3\u0004\u0010􄋭\u001b􄹡𠊼\u000f\u000eZBX\u0001H􍃲嚙\u001b𥹱b􉈝hxnD\u001bh~ql-㝝f𤮘#1Cu󻭗󺪔r\u0000䏡󿧘u􅲗3\u0015N\u0003\u0011𩿍;U9,ꤒ怠\u001cF󲿧D\u0007𩇮䕞v\u0012㖶#\u0011x'􅱶𣧇p\u0019Ih󼝣eu\nM\u0005b􉥢L\u00031󷫓\u001f\u0006\u000f]􊌌\u0018𥖘\u001ez\u0003\u0008lq90L\u0015'􏱢)\u000b􋰕䇖𝤧獷󹆟􃊵'󹭉\u0001%𝢪􇮙\"􏺠e骻d\u0010𔘤}(%H/2괈A)𭳽 er!\u0010f{l\n𗰺&\u001bsvY󽹪f=􎘲ErdT󰑪8._󰼿\u0006\"h>Z<\\qe6D(\u0014-+\u0006!𣼑j,U\u0017RCg𧧩J􀏅\u0003>4𭆢\u00001|;\u0000􋐳󼲚𡁷\"􋝽E|)=#w<TS\u001cI󵹓􊹅Vh>􂌓\u0017F\u001f󹭈\u0000󷘠T_v|n\u00120굆a󳒩yt_\u0006u!@𛊒􃯗6\u0014\u0012𣿚0:\u0011Ltr\u001bVI􄛳\u0014\u001dkNtg󽰪q𬍊Mp耯\u0011\u001f𠈴󾤬6\u0016Z ;W󶋡\u0000W𠵦𦤟\u001f\u001bw\u001c\u001f\u001f$􇥀\u0017BmYR\u000b󷱟\u000f𤥾􌶨\u0001wxd\u0019𤫃(\u0011f𧊄)h@)􄵏􀮳r\u0013Y\u0017.􃰈𬣌cW4󹆅^'寿x\u00059蔥s8nkWn􅊪!􊝚󾼄𠐳3M🦅e2h\u000f\u0013%lDg󻈿􆭜󺯜M\u0019{􁉍-)%f[*\\\u0013\u0008𥃏$\u000eY \u0007\u001fM'*󷔠\u000c\t\u0013\u001a\u0014J𗶱􊍇V\u001b4𢴾e󽢰\u000ew|:x𪵶\u000c\th:!󺴗,C𦓛Ky𗷼𡧾󳊬]pIy4􇟻𦠼@\u0010r􉮮|\u001bu[᩷\u0010mu)~"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_1.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_1.json
index 09913310002..41e160482e7 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_1.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_1.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 24
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_10.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_10.json
index 942173a2b86..7820a8ab7d0 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_10.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_10.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 23
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_11.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_11.json
index 678f250b9a2..ef11f5184fe 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_11.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_11.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 28
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_12.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_12.json
index 24b472311f8..3ca28f156b4 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_12.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_12.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 9
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_13.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_13.json
index 248ce4e1481..d87db194df6 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_13.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_13.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 21
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_14.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_14.json
index 5274be652af..734626c38b9 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_14.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_14.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 22
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_15.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_15.json
index c905b2a5387..79477609a2c 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_15.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_15.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 14
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_16.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_16.json
index 0422d3a0d74..4cafb50ad51 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_16.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_16.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -19
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_17.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_17.json
index 93922a6df04..e6482a85c4f 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_17.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_17.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -12
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_18.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_18.json
index 089f4da26d7..7d4d4e2eb4a 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_18.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_18.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -27
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_19.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_19.json
index 36de8873d70..e54ed549573 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_19.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_19.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -17
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_2.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_2.json
index f48d7e8b55d..86121b370fe 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_2.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_2.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 12
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_20.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_20.json
index efbe3ecd81d..b800912da25 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_20.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_20.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -3
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_3.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_3.json
index 96764a799cf..21dc5c61be7 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_3.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_3.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 1
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_4.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_4.json
index 7044100b545..e0a129920a5 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_4.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_4.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -4
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_5.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_5.json
index 4a8b72a178f..7202182ca9d 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_5.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_5.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 2
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_6.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_6.json
index 36de8873d70..e54ed549573 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_6.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_6.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -17
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_7.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_7.json
index 93922a6df04..e6482a85c4f 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_7.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_7.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -12
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_8.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_8.json
index 54b56df30ea..815cb3ef8f3 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_8.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_8.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -21
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_9.json b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_9.json
index 1055ff7f1c9..c6e0177758d 100644
--- a/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_9.json
+++ b/libs/wire-api/test/golden/testObject_DeletionCodeTimeout_user_9.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -16
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_1.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_1.json
index cb125c06f23..f92f68b0c8f 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_1.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_1.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0010!u𪧭􉖙b5\"􍵃𤖚+Fs1𭲡\u0010𩫥nvK}f󱖾s\u0013\u00024\u0007\u001eimc𗉾󰠨^㐊󶚋t\u001aVj\u000c󰺙m􇑯\u000b\u001c_􀁏󳛛$f𖨑i9û<\u000fur􊂀rOXm􃘲].x\u0012_-n\u000b=\u0016屔y𐭬q;#U\u001c^󵒢A쎰zCRM\u000b󴻬U\u0006\u0003p\u0002\u0013@𢪋^\u0017\u00172w􇖹\u0000&zzV匎󻋑J]'𗢑A&Q\u001e󾾹^M$[\u0010𔓘\u0014t𭷅󸢪\u0008_@𭧡V\r\r𗯢粣󴂬;\u0012d_L嘻jc\\/v􂷝)K􈒃A&ꥦ:{􁹁(z􁚊E􃌌^nT\u0001%sY7F6􀟰s=\u0010𧑬(\u0016Kᤒ(􋯤󳿍􍿱!\u001akCg𭖕\u001c\n\u000b\"𪷢\u001a(er깟-kNꏂ)𧮥_𔖽𢫡􇖡i\r\u001c3\u0001H􎸸S겼?\u001aLjJ󱸇󿞓VK졮\u0011-\u001ai9\u001d\u0010Yv𩖩x~􌉷A􃯻8ogom\u000b4b󸱄\r6(p7󻖼p\u0003%\u0016\u000e澒􈼍𗇢8ROt靰󿉭\u0011;]󾵎󴎥􅮮\"𩷹𢴭㔍My!\u001cI𗋅 \u0012~Ep\u00187RWv'zE\u0019!입*\u0007𨑈𮀤_󽿌d󴢏\u0001꜃霑z\u0012&S󾲤e暞n`\u0017Z8袃`SL+󽡆!-X>􋁔\u001c;󴳂\u001b\u0002%󹷏\u0001=\u0015\u0004fySG󶐺􎐽FC󺤑j󶆉\u000em-q\u0005􈠄\u0016+욭􆙏\u001b􊧈􀳈𫔈m{OEPX&I􋗇c\u0017<\u0018}.𬉰\u0006`>>􆕪{\u0007fV\u0001󰟶&X\u001a>E\u000b\u0017_󿌁Q.D"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_10.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_10.json
index 04e0c10cae8..0ccebeecc6d 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_10.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_10.json
@@ -1,3 +1,3 @@
 {
     "password": "\\4;􇍜/􍓶#\u001adsMNM$k~Z􅨪@9􌺆\u0010\u0000\u0003L\u0015\u0014\u0007$炒\u000f:}L􊥒􊃽N&󲋊bbi\u000f𫎵Z󷹁=)>􌶈I:nS:j\\㱃\u000f\u0010~W\u0018R)\u0018:\u0013y\u0005cRMR6􆬁􋖴\u001b-E󿩦B󴛑􌞘𢵗󽮅\u000fIK𘜠c0􌦳|;b*^Cu\u001a􈈂-6􍕽H\"灧󱗋祳hi\u000b\u0008}􎅍!%Q(,7_亩􃘨Q󱖛\u0002𘫐UM𥩗\u000c󵊙\u0007\n\u0002,oy5\"\u0000)8􆾷􀍃𨒰󠆰xE>\u0005r㕌\u001d𦢑\u0008簾>vg^qq􆗹\u0005}W􏍺䝄\u001e􁯝\u0017\u0007\"\u000f물\u0003H~N𥈬\u001a𥗷剢􂏛\u0008;🆄}𗑝\u0007諧M􎨴2ѐ嘨l)0𝛳\"\u0011KksK9!琖\u0007𥜪H\u0010𥋪9?𑀛F\u0002\u0016HbN+C𝆓W󴖜rqὬ) 펨ikgd𪽭􅿇`\\\u001f8#/\u0006\rqżX6𤑔\u0011􊛷󷹋\t3\u001e/r\u000b/\u000e밆\u001e𤻝𥫝`m\u000eg𣅟<x6Z􂞣󹫝\u0008z\u001a𑦶\u0006\\/}K𭜫\u0004L\u000clu\u0018𫢰J'"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_11.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_11.json
index ebbe34f7b6c..85fe83e7062 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_11.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_11.json
@@ -1,3 +1,3 @@
 {
     "password": "`G頠뢛\"\u0010xK]40\u0016R/8/󴣨\u001eJGR慢{nb𪷹1n\u0016􁏃vF𦊕o-p𣜎𧆍\u0016󸳎3\u00126󽠑\u0017\u001dK51\u001aW\u00019;R!\u001f\u0007\u000eH\u0018𡱏>`\u0002蠮@sM𣽝\u0019𤺱aꀽ~Q6V𩉠聹<\u0015\tmꯞ\tD\u001d\u0002ag􆙉f\u0005𐰚𞡙<\n𣩩\u0014;􃃚𔗨\u0000n\t􋺖LsR>e󱙹𡂧 ~\u000e󻤞v\u0015𫞧OtG)\u001cG$S(L􌭖RG<I:poY1\u0016zn􃉁 >o\u0000CpS𤫿k󿏰󸾵\u000e4JQ𮢆`E\u0014\"UhU0^󺚱\u000e\u0016X󲹛DL\u001d3\u001f~>\u0003ua𣒳BE<GM􌂑l6 pM􊦚/\u0002􀔝J/57h\u000cF0ꚞx􌋡K朶𐊖\u000fI{󾦮궑𗣜惉aS\u0011𭔪c.4𧟊𗊽𐲣\u001f\u000fPo#\u0005GP>\u0008\u000f󴝐$ p\u001e划\u000c𘚞􃘝en+K%\\0hj\u0015n𡯅l.\u0018 H#(󹤕e \t*c\u000e🏽\u0002􌈝S\u000c\t@K$􇑑􆭳X􂀢my\u0016-S!;GD🀹7mR􍪭􌋺W󾃖VO9\r\u0013W󽊫dUy\u00127\u001c 3􉝠~\u0004󸰒\u0018쿷v𗌭_홢4\u000eV(󱃐\r_~c󵛅􏺌U󰪚>\u0016ZI@뷷\u000b=󰬮w\u000e󶢮\\r𡔾TB\\O\u001ff󰵽.\u001e􌪟F󵥯8󽋵c󺐘@𖩔re𢑶`RWT4󱛎=(𗽷\u0015􏌰6/B󿒢xBṘ\u001aAn\u000b􏖻䴹𥔸\u000b\u00120x\u0016a󾀂qn)A\u001a|.􄻯J熦6=F/%\u0005l\u0014\u001b\u0013J谈\u0005^󹪢7􏲫\u0004\u001bv􂌖\u0010􍭰#𗋩Y།Q󾿬\n>𦐐\u00119􂯱X\u0015M\u001b󲠹\u000e?|& Hc\u0010\u0002\u001fAAo9􎵿󿗗`𦒐𢋲[􏩀\nF:H\u0002'𓌘d4yil􋒅𭘈Y'_젖𪤯y7BE􏙡q&F􇲎𩑜\u001bk\u00111X+󼄿n󲠔M󽢧D*&C\u000bU;^􆻂\u000c\u000c\u0003榷O\\kjc􎙨T_tly􎈃P\u0016pvy󵣴\u0002,􍹗GNJ\u000c-SZ[𧱀\u001e\u0015󾠌Q󱶊🂦敮9+]𐚄厠'\u000bl9N🠰rፑy\n\u0017遪󻣬)v\u0008􈴸b.𢊜'-ed O/ﴓ𢾉\u0000\u001di7\t@Z􂿔􇐿󶰱q\u0017$谰Mቫ;𤓆<r\u001e\u0016z[!:𮚡Eu\u0010)CuEy9󹨬F;\u0010蕷6\u001b0􆭬𠫍Ba𡹽x"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_12.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_12.json
index 8d5b1cc7ffe..fdfba20304c 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_12.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_12.json
@@ -1,3 +1,3 @@
 {
     "password": "_|pjw􊻁\u0004WQY\tA\u0010m\u0002U󷨿sM\u0003Q暉V𡹦.􆲋𗮣\u0010a\u001a~-r\u001a\u001d\u000fI_e\u0017WhCG𣾱Y\n|3󵮊􎼙󾳕F\u000eⶣ=A惜\u0015d:\u00075c}𭢜𥖢R\u0008\u001d\u0015C鈖𗽂t@=2뛲3󰋼_=9wj󶞝I'O`_\u0002\u0001𣔬􀪥𓆲a󹹮𤲧\nf󶵁.F塸q\u0004􄏧&+\u0003𮓳L󲀤-𫹆5>\u0003\u00020/𒊀/\ty߁L􎏘ꋃ#K6 󴋈\u001e󴶈b.󺑬kR󲆅d\u000f𡢷𬈂\u0011􊠔\"~\u0007\u000f4fF"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_13.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_13.json
index 144538526f5..af02e902d1a 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_13.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_13.json
@@ -1,3 +1,3 @@
 {
     "password": "8\u0002􅵃􄽧\rX\"ckM\u0008nF&r\nHyH8\u0015\u001euCX\u000c􌒔Th𫁾W=\u0019\tr몢J2\u0019耩􄞴d\u000f~`<<𡐷\u0010@h`iC\u0004𦂓B󿯂|C􏰕l55q\u0005垽\\h\n+cA~\u0011Pm!\u0013\u0016\u001e󵈁7𡼈\u0019󷙣}xp;󲧦|􈯶s41J<\u0008n𡦅\u0010a\u0011v\u000cr􃩫\r\u0011PmvcY􆜩X󲊘(󾐿Q`;\\ye}>󾸃p)_z\u0007\u0002@D+詞`􍊛Z􍆐,\"M𒂨𮂡AU,\u001b\u0019\u000c󿇣𒄀k􁇒8P䌤\u0008\u0003+\u001cb|}:먎╂2'iI]\u0004M𦬶ﳻ~󹒹0F\u0001󶸇;\u0019\u000c\u001dfU>\u001fL\u0013>POLEgRw[,c\u000b\u0017\u0010;􉸥Z䨊󳚻CS󱢛_|ꀉ𦆮R𭚍꯸\r󳲼v3\u0006Z\u0011w6j0隒\u0019<\u001e\u001alf\u000f\u000b\u001a󸗗䉴\u0003,>\u0006zkR𗞩\u0000\u0005􊇯\u0000\u0013쀷9S􋣬3nMf􂐡X|\u0014W\u000e&R𡡛\u00051􍀎#𠯢\u0007`V/\u0001zcAG@\u0017𧤔^u󰠔\u001c\u0002~\u0001\u001d\u0005󼶀BF\u0018X\u0005J\u0014莜\u000c\u0010\u0005\"𤞐(􊎃𨩽\u0004dYVr𠦎酓iwV 󱒉~\u000bF\"v.BEs:5O\u0008쭣5.b\"+l󺼾=@󻒜 촁eEM)S􂅓u\u0018z\u0004\u0018\u001e2#\u000f󲤼Y3\u001b󻏈\"a>V𪁜A\u000b􅙩鱥<^뵀\u0018,㯌n(􏠰\u001aㅯUi𘣮\u001e󽈗NY_e]b\u001e{]\u0006%x*\u0017\u0015𘍇\u000ei/e\"󻆀!􄊒󾎊𡸷\u00103𣡄js󿨘0\rf\u0015)\teჿ|iyx&S𡘾\u0016#󾓷Ew憂\u0012\u0002%\u0004\u001f/凒hhl\tJ]EQRat󲂈\u00117\u0011\u000f\u0016󾔥r⸖,"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_14.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_14.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_14.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_14.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_15.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_15.json
index e8447903cef..4446cb8a3c0 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_15.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_15.json
@@ -1,3 +1,3 @@
 {
     "password": "2<\u001a􃎐#l\u0016谕GSU+\u000eHC8􃱰\u001eA󻯎\u000c)C𤜣Rv𐴣;]\tsXg|\u0013\u0012~Zh􇺷]𨸓 ,,\u000c\u0004t<E𡜳L\u00053[Bg*1{𝆠t|,\u0010m𮢼,󻞈}􎐹GeR􇆛\u0004Z𬼛5QgLQ􌨁$X[@<\u0017\u0006\u001b<+\u0014𤠮5󳽾f\tB+󿚼\u0005EYEBI\u0011FY𤀓~y󻩮󽉜H9'\u0015+5􆈙\u000ep쒕o]\u00168'p\u001ff\u000c]퓟A3o]Gyddipt\"5\u001c4Qk\u001f-*\t3M'\u0007󻜾􅖲\u0013\u001cXB\u0008\u001en(\u0003\u0015\r\u0003\\)E𣒘rQz𥕥􋇯*d\u000e\u0014|㋞cjjpG\u0007/\u0003󼩛/󹹳핐G􋵴m%On㈣?𒓋b;:𦿎\u000c\u0018\u0014fR\u0015\u0019l\u0002P y􇥺􆁵󰸂3[\u0017*\u0008􏬡꼶𠇋R{'O#𘪛\u000eN󲉊~iav󹂯쌳\u0016ySO6$`󲹊1Q􂫛n𠂾|B\u0002🈣\u000f\u0018\u001eiLA\u0003赖sg\u001dsdP(\u0002C\u0015􎯻>3D􍥹\u0001$\u000eb󿲷/V\u0001p𣇜\\\u0018𦋾1㻖󱬑q.bi󾯯􎁐8𤍄[􏦠`I4\rClvXoVMa 􉛢p\u0002 𩿘t=\u000c>sⅆAU\u0018*秿\u0012\u0008aF󴼐𤮊3M󱮂󱇽\u0011\u001d$T}c,􎔷X)<f\u00178󹤛􏘮jXO\u0010?􄘗\u0006Hy:'k|󴜊'\u000e\u0003𑖏􁋞𬕁폃\u0008\u001aq忾]?qභH𠳁o󻽙𝂛RA𮗳{𪆟\u0014𦠒\"𤕐\u0012\u000b~}Rpjm2#𡳐󲗀/􇉪\u0008\u001dNGW𗠝j*𬹟󿡌6\u0015m\u0017􎭯B𓏯@=멫@\u0014𢲈\u00129􈩁􄚱sg\u0018􇟋\u0001{𪿊󽰐0󴾠\u0006𡂃\rIW./I\\e/2!.\u000c􊵣[]Dh쇐𬚷}K\\5\u0006M\u001egf,@\u001b鲀?*\ryV𗩖𡈸B^%^$Fv󵷇i}cDK󲖺^𗢆vv􉚄\u0016b^3y\u0005?\u000e~k\u0013x\u001c( MD/\u0003s󰰇𗙠5/󴩟ot/ㄼ𑿿\u0013\u0001󴃩>\u000f􄋜\u0018:ᛵr􇿽b+𦰶\u000e\u0006pC珁􉂢dN\u0004X1V.v,5$􂤮𧒃AHL\n`𗦻<=K\u0014L󾭋?H`Y\u0014n􄚣`[[󹧍xꦥE󷱌U\u0014N?fa@\u00114\u001dw𓃄\u001dlT#Z󷩼{x􃵎y\\"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_16.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_16.json
index 787296309b9..4304465a2af 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_16.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_16.json
@@ -1,3 +1,3 @@
 {
     "password": "5mts\u001eeJD𘪙G󺉢\n\u0000;'\u001ck蓮\u001a|#\u000f\u001d#qX\u0006\u0004\u0000\u0010\u0015󶷟\u0010[󶺲궓\\󹏬𥕊􆗭G\u000f0\u001a󾑹\u0000𨩱aa^l\u0006溡􆱀􍿘\u001c\u0004􁽫pw\u0018𪝞􍊗󱮺x\u0010u_\n\u0006􅤛8k\\G]\u0003\u000bVt,\u0016_\u0017𘂝^w<o􆖖𖠤fc􂅨􌟩&+z󵇧^(󱓒\u0017𩗧Pj𠇦ECq𡋜忳qFZ\u001e􋉮\u0012⠷\u0019󴮝Y[\u001c{D\u0018\u001e幽\u000e\u001as$1𮤃A𣖥Bw\u001e{\u0012#椵|\u001f𧜇󳳛 \u0017􌈳A<T(\u001csw쫡󲺌㾠\u001d#ሪx0e;\u0019\tXR󹥡QxZ<V/𨲧)\u001d􇚏Hx\u0017!\u000e(\u000e\u0008\r􉕣!\u000c𮫆ｉ󱈻&󸟶𓁬\\lZWqW\u0002j,SK\\\u000eb쒒𫑣\u001d{󿷛󠀯𩖽+𦬦3<T\u001d𗘭5$Cn󽘲襑𠵾𬥚Eob@\u001d\u0010(􅒝鮶~𓃪\u000c\n\u0007\u001f\u0013xqxHm\u0019p6R\u0000󳫶\u001e􋨌0🥴)I\u0002n𭳍𫹠𨡿p\"X~\u0000󱘁\u001dZ>fT󳩛,􏄛\u0005􇬮󾬼h!-𗫞\"\u000e㋜L`󼨾\u0004\u00189L]8+􎖵0\u0012>sCt+E=G\u001f䉱\u000cyl󲒀z􊼥9𡋝Ej=aWY\u0008窪󻐠\u0014\u001d\te|𤞳㰊S\u000e􋩆\u0003]24枧艺\u001b'Qht짍\u000fnn𭷃∴􁠗󾣛%$`Z-{\u0001ཫ\u0015\"p\u0016\u0011w󾁦9󸲠 􋔄V焻\u0016?MR\u0006|􎝓Sg\u0013Ow)6\u0008\u0004󹯣𮎤:_=䴧𞡿_q\t6䷣\u0003.=􄰘IG󸞀u\rD\u00134\r𮬞􎔝2󶅩l>\u0010󵭏\u0003\u001f􏿨B\u000f|\u001d􁩦T\u000bc\u0004革O𮦐X2\u000c\\/⚈Q\u0001x\u000e􌀺6\u0014;U\u0010>6Okl󸕙󾰋/𗧾#uJ}W􇎴<h7fC\u0002K衔\u0013\tlU⸨[MC鳒KMp\u001f\u001ef\u001c79'Q]n>𤷬j𪒞N-2󼊔}𫢻t\u001cN􏱆w􁮎\u0003L\u0014 􃬢𛃪qᓴ\u001d𫺝.󷇱f\u00159\u000e\u0000᪻.[􌭗P[,𧩡C󸇠\u001d^a󹙝\u0000rV!𫈵J󺯡㖼\\L@􅒳𑵀Q`󺃻(~5\u0017톡􄇨\u0017G)l􅿦%a5􆞠\u0015A􀥴}\u000fO𧆠\r袠{Y4𑖆E罶x}{v\u0018𖬣k$TD/FGz􏹸-Jn\u001el󻚯nR􄻞ibM\u001c\u0001𘓸\u0016:0\\󴢮}𢳚z\u0012j𑜶􍀬!}R^R,\u0007\u0002(𣲏\n~\\\nq𠥄u\u0008\u000c\u001f\u0017v!MY/077TuVp􎐹>,\u0007=晄,傦^P=h\u0010\u0016Dk􀲦𫞌<s𣵊𒓺󾐗녘j\u000cv[𢓸hv\u00145칁\\W\u0014xB𮧹󸟊\u0002E􀪈g\u000cv󾊎>VV\u001c𪸮󾢭K\u000e\u0016{󷂱=\u000cJC\u0013bz𬷽\u001d󹬪Oic+.k󿝇􂽡%`nJ𤻌\u000b8\u001d\u0012,\r𭷅􉣱󾕶v\u000c𝄲V\u0003]󵧢\u001e44q] ?),\u0006\u000b󲸅\u00007󾥳U\u000c>w*mp] 5XZ\t􊶄(ⵃ𪬯􅬽`󠆟E􏺕󿞐𛁙𮣧i\u001ciqq𐴥\u0016󳱊𩮧UO\u0005\u0013|prf\u0019x\u0019my\u000c𡵷1Rh\u0019𦪣5)𔖍*%󾽙\u0000𭯘l𦚦􀌺~Bq7𭓛[󺊆𪨉\u001d􇿮W􄣒􌣋&++𤕛ds\u0016R\u0008q`>\u0013Wi3ꩩ%a\u0005\u0013󵮥\u0014G𨭶􏩕\u0008I𪏤p3𗍬S:KMF𮩦\u0017㶗|\u001a$Ԯe~n,\u001f\u0006\u0010󵈡wUA\u0017AV9P􉥢𗰺\u0015T𠿆nFu\u0004-󴉸1\u001c\u0005EZm𘧛f􁮄)P𐰅UI􆐩)i@󸩃\\\u001e􆫼(睕z98쌂"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_17.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_17.json
index bc2c29bcb37..85419d90976 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_17.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_17.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0004\u0006:^\u001d㼑줠kx\u000b𡐩w1b-&a󾕧^\u001fu󻮧\u001b8&A\u0004\u001c~-\u00119x\u0017􄷞{\u00163{h􍚷󵺑\u0006{p!>\u001b=􁚝􋕍z􂳍S􇜗𭅟\u0018󷋞|鵱\u0016\"@밖\u0007\u0006,l{龐\u001ep\u0016\u001d\u0005󷊨o􅃕&\u001d0M3\u000c\u001ed_<\u0015q𤗅WX\u0007.W'Q𣩼\u0003Qha+\n7f\u0005\u0017Jz纋\u0019\u0015\u001e}\\𧃑󶚫㪨\u0017󽮀w<B{K𩶵hsZ𭋬mMpt􈓡\u0001az󲦻) 󱆡놣\u001aARN*p\u0005ww)\u0017B%i'꽒g胟\u0006󸄎E\"𦝋3󸅬􃩬0蜱8)膉|\"\u0017N\"\u0001\"󾯥H􆤯\u00168h\u000cOd\u0017d􇁚󽢕\u0006x\u000e􄔁􇁁\u0003tg􄴕\u001aH󺳳|v\u0004wUSR\u0011M\u000eQv􋊄1\u0019\u0006𘫩􆝄\u0003\u0011𗆰Ut$󸓡\u0004.C`󲻻\u0000\u0002u\u0007󶐷<~🀴Wu\u001e􅩕'A\u001a𢗙5fJ=Z􃓒\u001d󰭖<\t<m{\u000c\u0015\u000e\u0013v\u0017o􀺇\u000c\u0017𡼩\u000f󸨰𨋡􃪒>,q2+\u000e*󾂱C鏉\u0012PZ\\\u0016𣐎퓀>𭻓)\u0008tf󲂳\u0007\u0005c\u000cSﮊ[𘨵R󵟈4G8􊧡𗡻<n=Ifkq􁇅Ab󽞼f@󼦲\\\u001e\u0010厧\u000c󹨾Me \u001e\n쩾x\u001c⨽6=@//\u0016􃧗t:T1Z沊,8W􊰟o}\u001dX\u0003\u000e$\n伾\u001c𬆠zF􇤛\u0018􄑁_\u0011#􅊬6妦+\u001ciS7󳊞Z\u0008狄\u0006\u000bqB\\,s锚\n'􎅍?𠳛\u00035󺸪\t\nuf粘𬖫􊇟qm\u001d쫝𔔤\u0013{蓟?>\\\u001ei𪉈󲓌V\u0006𡒲|𪎄~󹭙\u000cN*􋵭\"f\u0016J󳥿󻺔n𭀏\u0015\u000fb󰟺!\u001f\u0007􎖈9O'q>\u000cicm\rx\u001c'\"⍠)N) 􉩘2P\u001f|z=\u001e@)Lcq\u0003Ch9Zu᜔𞢦𫐙🢘􌚑𫂲\\8\u0007\u001d􈞿󻘳X󰘏%\u0018\u0010%,|\r\r|hڣ~\u0013juh\u0013`\u001b\u0000춼䱗F𧆜𘈃􌝭􎚭V\u0013\u0017v\u0015􆍃2S%\u001a󾼂)𨤘g𝃱NR\u0019󻘃!\u000c$􃯯5\u0004J\u001b𥥺@\u0012\u0002o􊓯K5&\u0013'[1rq얺i\u001a\u000c\n(璃\u0012􉂡c󰷛>y\t\u0000mz^🅓Z}<`󺦰Y\u000b􏤂1S/𤁊=9󲶣(󲜰&󰏢6\u000b𫊢𛇑&\u0018r}􀒸\u0003FR\u0005兂\u001c3(Oa\u000f'𡺲󿛖\u0016\tpv􏓒I\u0003|#/R􁡦𢺁\u001b􄃎\u0017嗯3K\n𢽬,\u0002S{󸿆󴏊2𣛒8mP|n@x\u00008v룁wz􁧱k\u0019U0qX,kh1\t5*W󻺡2𘁖\r&\u0001\u0016\u001e\u0011\u0017v$󲉐􉳸\u0017"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_18.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_18.json
index 0f11301ec78..118791605e0 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_18.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_18.json
@@ -1,3 +1,3 @@
 {
     "password": "𪏈-~[xoqL󾆿\u0011b+'\u0002q눍hq\u0018:}M^󻛥\u0003,K\u0003o\u001fF?Nr𤫺o䵕\u000b\u0012\u001b\u0010-\t5`^aT;L𝚟B흩\u001d􇵐\u000c\u0010\u0000\u001c󠁺ꪏp\u001d\u001d<%\u0006\u00056j脒𖡔'&l\u0002􈴏\reRXT􁨾Gh2X/󽟄T*\u000f𒄴\u0018\u0003=;􎠧?3,1\u000b󴂬𓂲\u0007F2s𨪎Q𫲪\u0012y湶TP欕󾝛B\u0012b=4\u000e𩯰L􉀼􋥩\u0008\\F\u0002;\u000f \u0015|󽌦\u0010W􋑐,A\u0019A6~xu\u001bb\u0007\u0001VCNAK@\n俒\u0007󼧃V\u0016I\u000f2373a:p\u0012x󴶄3R$L\u000f$At󶵟櫲㉉弶knA\u0019M4\u0010v'L􅒓>d𡄔$󼙒\u000e\u0019󷍴\u001b8}󱉉V BSkE(1\u000e(㇁B􇃰𡎙􉒯󻅶)􊩉p{q!􄋐v冇]D6}\t1\u0001.^⒚\\JK𝁤(@𖤔􈟱韴Al0cR􈗢􋜾9\u0019𞀑\u000eHX;(\u0015㲣4!6\u0005\u001f-:$D𠮞\u001d􎙒􌚟~\u0005b8\\$P󲒚3w8𩻑Bke􈄉Q􂵮L\u001buvh𐴣#𫻙HAFLm𤵦𪇡\\𘠿𤘰?e籠5𒌢%|D\nj0\u0012􂅛i#%\"c𐂂]F^則}Q鑧𣄢𣨳cZ.Z􄈔%􋐜\u0011p\r3V􊀲\u0006\u0007􈹽X􃂫󱪺󹘐\u0002\u001d,7W2U\u0019\u0017꭛\u0004󳧌㎠g"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_19.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_19.json
index 478cc23c715..3b486d51125 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_19.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_19.json
@@ -1,3 +1,3 @@
 {
     "password": "tW>N\u0006\u0005𦎉P𘊭\u0015o\u0014\u0014Ǡ\u0017G𩠵@FO\n𭩠𨆤3邴}JI`y􂮟󾿑`L\\𗇼\u00112b❦𦑃S􏭂^㱚:\u0019\u001c*\u0015xG󶉳𨨯E]󶨾M*\u0002K󳐬󰆼\u0016Q󻑙\u0018𫦸\u0015;\u000eN\u0005\u000bQj=F\u0006\u0016憈􄸨\u0017$󺽕􆓮=耍`􂰼gm.b(UoA\u001ej\u0010𡇿j􉙼訌䆏\u0010+p󰝗-\u0015󺢂􌱒W󽿷𤿭󴂲\u0003>\u001f{aXZ)u6m98\u001b􍓖q"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_2.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_2.json
index 78ce7a5d5b7..08a485aa7c2 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_2.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_2.json
@@ -1,3 +1,3 @@
 {
     "password": "!=\u001d'Qt"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_20.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_20.json
index 8b4e18065d5..0a052cab7d3 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_20.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_20.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0001􊍫󱉇󠀪N@\u0002eE󶚨\u0012阗QX\t\u0004𬶻𗹟\u0003\u00138󲚰:i;q\\{#E\\y\u0000􋻴i|\n\u000fQ\\𥙂來? B𘂦\u0002*\u00179g󶿢-o𩾌\u000e𬿎d븏G􄪋,\\9A𦸙z4B􂽈l`ᒂ丽)𡥝h\u0011\u001e\u001e\u0012A󺱊*󳲋H𥢕󷕅󵿈yYn𒐊.\u0005󴉴E󷏳G\u0006$T􄳳퀀󳖣\u0012Ps'M󴻬\u0018P:􊆮󷅦󶺳^~􈀰:tY𥸀􏱺𢔾􄬞b\u0017i𭋎'(l/2㋛􏌇ឲAU\u001e}󸆔𪯅>𤪭cOh\u001f󾑰)\u000f𫠝C=\u0014󳒌\u0011\u000c\\EUTr!qiDn\u0013ᦠH^z]󾲝sU'􃵩*􊴜𡀐\u0016􊫬\\?r4N8𤳦𣣄/Rm{i𧙴\u001b𤎧2f☙\u0004\u001f󴫾v┌ᤸ\u0007􀬔󴕑/S𭛉,𧺙{8U>䯽􅃄n[B􉗇􆢝#\u001e􆌰)T.\u0008L8\nLwe,5.㴰[!𢭮􂤄Fj\u0008\u001eZB0󿳎mA@\u001f*𤼼.󷙌ug7PhnV𠡣M\u001bI$=p}󷅕U𓍝𭏧^a@\u0004+􋏑H`\u0016𡧦졟oT\u0012ٔ𪜶F􉴜mFIK𣈵XY\r\u000f􏋷\u000f􅓯1f𩫿L\t0/􃺵]6. 􆭣=}􋩥\u0017󽫂8K yc\n敳vB􅎭\u00049/So)a􇪜\u000f\u0005󵧽󻞍\u001f(|𑲯𥙫𓁤􍎈:\r%$1􍖷)󲾐SV\u001f2\u0000&}?𦈁4\u001b󲩓\u0011往{&V𪲒&j𪟏|h\u0007>(\u001ap󴄾{a|-\nI뷞!F􄃶Z𭎜󴵢\u0003p^S;􏳼\u0011.t!\u0008k(P󹒡1􄿿􏂐u.\u0016\u0016\u000f2+4GY0o\u0008𫋫􅑥\u000fY􌆙|􃃺[l\u000b𤺟􏮾#pI\u001bh󱛟b\u0001\u000e\u0015𦹛8LSZ*1j\u0003\u0002H[󽨳U┙E4 韦\u0005O3󷠉㍬3偵\u0016\u0019\u001a\u0017DWx\u001c\u000e􀞲\u0012l6zyh`􎘼<󲿗Ꮈ\u0010󻠟jnVnp􈱒<󴈾R􉉶󾌂󵇕Qx륐fh𡷙pT\u00132`~f^𬣋\u0012\u000b\u0007.󶬳󿸕F*,n\u0012\u0010X<\u001e6􊹤!𒑋H4\u001a\u001e󼑃P7呃\u001a>}@ӭ=Y\u0002􇉉󲍘5\u000cQN@\u0004\u001b𝀓\u0004.N􈛾GRnrUjL\u0006_~󳨬P􆧮\u0007󳝒\u001beu\u0003𨕗􆑝wU1\u001a𫀡𑖣𗢳<\u0015\u0004ꂙ\u0005UI\u0016􏕄\u0007\u0005M\u0019/\u0010g󼋝h%avVk*rO\u0012V𬚦󾳻䢏70\\\u0006z󹻘C\u001b낼\u0017.ua=󺣑#h𠫱mQM<􊬊,f2O*M⦪L\u00155^7O\u001d\u000f!􋭀L2hN󻽏9\u0015􈇷/\u0018𗸾t𠽫􁼲鿠\u0012;C\u0014\u0004\td*󶉋WaX8fA𖹻𪭥\nv/Rq\u0000\u0019}\u0005\\\u0006?L\u0005󺭅?"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_3.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_3.json
index 7de6015ccba..26e2cb8fe08 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_3.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_3.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0005\u001eeCX~IR_F氺I\u0000\u0014똎V𭽓𠐥\u0000汒q\u000c𬱱Z?\"!re𘑉,\t2!yH\u0003𦋎􉹡\u001e󲢫j8yo*\u0002o\u001dZ8✧󻉧󺯀ꔾe𨜁bdM󼽫󷑋ZL\u001c\u0008I.\u0004o\u0012􂌄s󳾘$hR𗠉UU꼖+𫣧$CMlQ/# 貆'rr^\n2>9\u0003􎙐T𭏯`\u0010\u001c⧠N\"摷y!苎8i0d𭸉\u0017U\u0019\u001aCpu𗓞\u000e7:ꍦIl󶍖􏷖𘧐O⨲V7Cx*󽽰꿴z\u0003믰,q􅚔+𗤌󻓫*)4Y⅐x/\u0012PO\u000bP!\u001a3Cr9􏀫倢b9\u0013k\u0005:rg\u0004!t/𩛗ฺH󻫣J𐁌A󾛗빴$fO8a􇐚R􂗣\"qP􌿪𣩓gB󶄀c\u0015\u0017^7}2\u001a꠨\u001c?􇘥\u0013M\u000c􅚋6T\u0003aiO#\u0010𡎝\u000f:𢉟j'(}\u0002\u000fZnkY^\u0015=f᱗\u0000󻨇z󹕨h펃3􊗕\"0P뜽s󻲂.G\u0018\u001b𬳑𢖝~\u0018􅅢=󼘊􉏭Ho􈢵3\u0010@tSWBH􀧱PKv󹽚,f𮖥f\u001c􇩅𣕧'"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_4.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_4.json
index ce1706d86ca..9d57e19e7a2 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_4.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_4.json
@@ -1,3 +1,3 @@
 {
     "password": "TALD1A棯Cp({Fx𓃞1\u000e𡐈𐌗gx䵘B𫪙\u001b|yg􈏀s𢗋\"溿e=N6a󷊧ꐼ?􃪇Ge\u001f썩Tp/ꕂ󿠁x􀿔.\u001f􆳑𝔎󼥮󶁠[⦸b\u0014􆹾e+eE𢿽W|𡅙T𨺕n\n\"4KI`􋬿k\u0000𡒙𩎙󶮣𢡓0U^H󾫨\u000f낚􎛡󵺐 0꘍*\r<*u_qU\u001f󻡄o\u000b/\t띳65B󽶘\u0002𒌞ODY\tx𗞎a􌽆\u0004/g4~D\u000f󽂘#H🧉\u00159\u0003\u0012}:\u0011꼻j\u0011C.\u001a$敥󷆳|O;􆑍r/𡙄'\u0005-y\u001b(gぱ\u000c4C𐜠豭\u0000\u001c[4\u001b\u0002ᔨ\u0016𢼠𣠶􆑈m\u0010𣷖>P\u0008􁶠1y󿽂󿫍r2\u0007𤡎\u0016R\u001e􆄛􇄍W\u0014\u000b<b\u0007띦􊏧[萇\r\u00170{c+C𓇥a𩢊TJ􊐬\u0008&􇀯\u0018KT𧳓􅲷𓆼f\u0018\u0003鳧]^镣iuOLcg𩞝s+􅪲5]\tHI\u0005tCZe󾜓6꼅u~[\u0005u𫬉\"%􂃌*/\u0012󵇢]\u0003𢕺􃃨\u0003𡜹\\󰷡/\u001eTZ+.#󾣬AX􍯸\u000e\u0006<6k,fs􌀗􆫯\u0000b\u0007X&󵧛Ut\u000cJ(Va\u001d\u000c\u000fe\r󼔴\u0008\u0000,W8j3,}k\t2\u001b宊]e\"󽡵𪻈q𨤤𩷒\u0017\u0000\u0000b󰬪󿦂k3\u0003\u0011)􉹿\u0007p𗥒\\􂜸\ryImG󻰞󱧘\u000f\rUy<z,)\u001c4b􃫙08@\u0013\u0007 \tࡉ\u001c󶟮?󳲋𭻭eK\u0006\u0012𒐀!V`횡\u0005v\u0010(𩬔>\u0013矪\u0012^iU4𔔒p`🠻s𣰴󳘛5ുN\u000b4k\u0007\u0001\u001cT󾮌󸄪a\u0015_Kt󼱊\u0003󲞎#0^\r}a􈀜\u0015Q]]\u0015\u0016O'󳜕Z󰛸𩁻=\u0013_+o\u0001\u001e|,\u001d{2eA𬍆\u001c_\u001ed􎗳7\t􂒡\"Xt𫑅\u0019=\u0006\u0012/\u001a𮒅W䯉󻪐󲇑rW1㼂𘢆𡝪\u0006\u0015h㠭욤)\u0001󼀷Loq(󾋧/\u0004l\u0000a𢔏3m6/hm\u0006\u0000KB\u001fT')uhM]\u000ev^􉌣P\u0017'FEje𦘖'T\u0000\u0003\u0018h󷏑0󵇪1\r􃭽$\u0015󲕲bz#QwC\"󴎘󹑲\u0001oe\u001a)^r?h\u0004\u0017ryb􀰟7Hr`+􍎋\u00186\n\u0002Xh9\r6{}󾛸譪CSEX𥇎(𥨎\u000fE\u001e}\u0007\u0018󺞡\u0017\u0005c \u00027\u0000a.H\t᱖Y\n#I𮧵\u000ek儕契H󵞍-/4\u0006qu\u000f󹅸(Vu%/aOk\u0012)r\u0014&v覛n$P#XsN𭪒JJ\u001289a\u000cE\u001a)c5􆳻 ^S[Xy\u000c\u0010O𬸖\u0002-󰊙零\u0012E3􊚀x.58CF0􊬖\nW篁𣾧恘󽸇\u00087G\u0013jt𨷎􉻜;fH\u0003=􎶱\u0017󵠥\u0019d&S𑇲4Zo!Of%\u001b𡞥󱔝\u001bQ󹁐\u000b\u0001󿽻tq*\u0017Z\u000b􃛺8\u0011\u0008􆓵7d\u0015ye卐𨥦GT蜐仌UGZ7\u0016w㘌󴕶p𢃿N\u0015􏤣\u0011S𭾨\u0018B𮗩hnp\u001d[(\u00089𘦁*\"𭂪K)=\u0012*N󴨯cxO |\u0003 r󿧷>잳R*󺲠󰱣}OB\u000b\u001f쥎Z,𫥃f>o\u0005u󶚼n\u0015􂟣󷗉]O0Z{\u0006PPr\u0002|F`󱡳􄡣"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_5.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_5.json
index 850656ce71d..bd9e9ce4618 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_5.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_5.json
@@ -1,3 +1,3 @@
 {
     "password": "𡟄,F2W茲\u0003􁯿\u000c\u001c􍖺e;􅗌|R󶏸_vuS\u0018肊􃙌}\t\u0014\u000bx e?L\u001cN|]󾶕\r𪕼jU{i􏦗p󻚤𗢴\u00002#:F𧙁Q\n-󴱠\u001f$ro𪩝􇞻􀚹\"+࿘4D𦏏(ቔ묘[𑻧.P/k5L-Z\u001c\u0003𩗾\u0003􎲠0󱯷v󰽔󹓀u헁o787U!𝌁\u0007azr7X8\u0018,\u0008\u001d\u0014Y3\u0002\u0001]T\n󹝋4瑟.)\u0006彳\t\u0006~󾿄dh!Gr􋩏􌚁􄂆@􈏅\u001c\u0007=𫘮EG𢈮\\Gb%\u0004󻾴t󱎣/􂄴蘖=Q~睁*!5􆁶\u0011N%i\u001d[𮔞탓\u000e\u0001m𠢙a6덿\u0019#e!cy,\u001f𧊩\u0004\u0001}𥪎L|1\u0005􋅍􄵲V󸡌󲭽I𢿊\u0018𡈅w\u001eG2R:􅪭\u0002=s,b=$􋅓\u0018C@旨𮔋[K*\u0007􀳧핗@\u001a\u001f𪲴𮪆$\u0006\u0007󳐝𗈁흄󺿓oKNX\u0000􈋪hwB􈈖Ⳣ\t󴔙<􅀨5􍳋\u001ca𢥂 G𝨈􅈯VuJ𝤯c\u001d:,\u001bZ󴚵:4ᑼvA\u0001\u0019𗶾\u0014﮽\u0014󻟲􊴔o\nY\u0001~<𝑐\n󳽆}k2󺡂\u0003eBs󲮱𫲿𑓀\u0012渆\u0010J\u0011\u0016/A􅏹Y9m\u0012jh\u000c\t*pbP\u000c#hIO$>4NW)m\u0013!\u001b\nu8_󴺵n\u001a~\u001ew'tv@\u0010󾡹+𩌿(e\u001beC\u0000t]ㆱx\u0002\u000ft\u001e^2󰈟􂢁鸷,x\u001d􇷘\u0014\u000f\u0007(𨫫\u0011JPH􀒿\u000ba!$9󼽰uvi;yI)􉳤!𤞠𣖵\u001d\u001a۷\n]}\u0015,Sc[y\u0012cKWe퇪d\u001a\u00061<j;i_\u0013TuNTﾱ6Lz\u0004󰄁\tF\u0016􂊘\u0012𦦍\t󸇥\u000bq\u001aᾆ􈀜􏭙CcYrE셐􃃗\u001f=􅽄1fⰠ\u0012󾡤姶^I🞤nᗑ\u0007󸘘t2ZG􍂤r,Z_\u0000(󳬠p\u001aWi󱂘z\u0019\u0002􅟋􌌡󸰵S𐌄\\𨎘\u0004]i)𠱦;*􆚷\u000b@𥢖j\n\u0013s-멠󰋧~_􌺎𗷼ilT\u0012 |\u00104QR󶂛g豌r}􄍶\u001aW\u000eGp\r𨱍􅃨􏈑=fgCi\u0017Qn=𭔥G\u0004<\u0001K9w6󴇇(슽wjLK[𪃬zc𤥻M\u000ez\u0016PB^c􆗽𦉀\\P\u0015𫮾󾩭-\u0016u\r}𤖅}􉣈H_k󹠸|&􎷉89𛰊\u0015Ylz\u00052}g0hN薻Kd喭󳶕􎽶􊒑\u0006\u0010㛷x𢮒#🄋\"*-𪪝ⒿE4\"􊌏}NSᄀ\u0016돶3MAwa􁱅T𩵨\u000c]{\t𑊶2:哎0􊋙>󺅪\u0008r{𐬎􃙛󷏢0|L􏤫\u0005 \u0012􄽅𥃨}\u000e\u001d𬉅yn+E𡶸E?$JdA\u000c\u000c𘙫lc}n\u001dീx]~K\u0010\u0015𝜤h\u0000𧜧}z!\u000fkgꎌ󴏂a\u001e7=󺴮𮇾Rf:󱄍t\u000c󷡵N\u0012/9\u0014^m[T,6􂻓\u0015M􆗇𮝕󿅤􀈹E0䌰6𤴙Y􌒂PGW𫵙aQ\u000f&\u0015aJxFJI,fkq𢣺\u001f󽬰gE^ݚ󻍟L.Yc븇\n𐬠1b? 5zqm\u0018dQ󲒫\u001f'.x􃆍󻉔⳰"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_6.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_6.json
index fabe84d21e0..f65064c9021 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_6.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_6.json
@@ -1,3 +1,3 @@
 {
     "password": "R\u0013\u0007{避􏺭\u0008+Y:7s\u0010뺕\u0015{\u001e\u0013K􌕔R>\u00106蛨ꪆ@􄊡\u0006t*𥖠?&u\u0015D󿋁V𦺶VT\u001d^:M룙oP$j!_􀉁w\u0002\u000b1G\u0018=𭳐q\u001bl<󸿨E𨯁󳔤\u0012\u0007(\u0018_𭎳T3􃗃􆫝\u0019J𠖈9佲uW\u000bE\r\u001am\u000b&rHX𤍼􎊅\u0015\t\u0000r\u0011qi\u0014X𨬧\u0005w-\n𐢨)\"\u000e\u0017{'m\u001c􈞿*\u0002I􋅇\n9m[󳽈\rXHM6\u001dlb𖨨=C𝘹󾥾_A`Q\u001aXZ%󴴁ip膟\u000e𧼡z@\u000bu>I𮆟M W\n$q㕾"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_7.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_7.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_7.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_7.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_8.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_8.json
index 5ba8179cdb6..48680d35fba 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_8.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_8.json
@@ -1,3 +1,3 @@
 {
     "password": "\u001e3(X*M􆔩R1\u001c\\􇙦\n􀆑 \nS􉜧\u0017n&􀿻􎼝>\u0003}\u0008+𡁱󼰫\u001b\u001e𧯸𠲩]u\u001a󷴓GRc􂙇\u001c\u000e+(L󹻘䯡V𥆁\u000bc.\u0004nc􁬩𪜦􆢏R\u0003GwH6G􈰶M^Z\u000cPb\u0012>\u001e!1D󿏜S] 𧆗J\u0011H0\u000b􇑹䱐\u0007󶕕\u0002U)V&\u0017g\"Z)i;𘃢𨨰𫛙hr\u0015㲦m\r/S\u00010󺞌;𓆫X\u0016𑴞g\n]Z𩊶\u0016*[B𧮶\u0006\u001fCK]\u001d\u0019n:t?Y\u000fTAHP>𦪌𛱁\u000f \u0010yy󲺩*\u000cH^u\u0003fLdT*􉉒uL㦌;􎑞G\u0004뗧\u0008owOh\u0019\u0015J\u0015&\u000b\u00144j􌄂󼞐d'_𨼓󺪎胊!7h滑B󳈉꺍~Ui\u001c<GAr󷟣X\u0000@XT%<\u0012\u001e󳢽S\u0011%牜\u0019f8#DT𨵕0U8i涅QvzJ~󰂰􍱨􄌰\u0000CSWmQ􎅩𮌄ㅍ\u0013>K󱘱Y󲕏\u001fu\u001e6lN\u0002S􆤰𞋁9?V\u0012\u000c\u0008K疲􁸅䱑🥭\u001583\rG\u0017\td󹝷-unxx&;$qE󿛧>\"􁈦󵷪<)8󴱧􁽡>\u000c䨝S]𐌝⯑ZﰿGj傉\u0014C4_󽏘] i^侤-\u0000󰸩s󴾽\u0014mBQ􂙠🕫锖𧠫4V6󴃰8󽣘\u001dh􍷻𦔎宾檛{5𧷳\u001fK\u0014&~\u001a\u0003}\"|T􎥬R|𩌶c􃱱.\r@􎱼♄\u0015􅺇8O:\u001c\u0007𦲧󳃚r\u001c󹳜!,k\r𥌃󲗙y𞸚A.𡦣_Q\u0013F\u0012&=𨷥u󿅠𠺀\u0006G𧞺𣰪\u0013ra𑒇L\u0002\u0010􇵅ꖊ/鑼.,𑌷@\u0014𦯽n\"BJ騚\u0006x󿨌im󼛍\nZZE6P*(d\u0008\u0018􎔐bd\tY➦R𥑔\u001a6V \u0006p𓍘㨘Do\u00131\u001f◊Tm\u0012\\D󲭏%j蘔@ya\u0008\u0015&󻂶\u0016\u0014𥈬󺝝B'@d\u001fW\u001a=m\rbW1菬Y𭍘얽i'UUp/􅪷lce꼢^ᘿ]Z\u000bW|ki^\u0017𓈼ao~B;\u0018\u0012v%9eK얋v)􄵬3&凁Vlᓩ,m\u0019趜r\u0001􁭚z/\u001bU\u0018􅫆o\u0006fv\u001d\u0002+𝀄虱􇋊'\u000c𛀬|m^\u0006𢎖󱕝ꮉ\u0014|=\u0006\u001eIo\u0000\u0015:v~'$F\u0000AN\u0001s \u00186\u0017dU俢𗴠\u00101o\u001aƟvLZX-v\u0008dL\u000e\u0017󶈠\u001f?\u0003>.靡𗷉\u0003G]\u0007\\\u0015𩭿j#g0􉓠󶪑Q-J𦌁\u0008'썺\u001d󱯍F󸎉j5\u0014\u0004\u0005\u0006\u0002\u0002𣅥\u0019󵏕󳩑}屡𑩥\u001cgb6W#ま\u0002dN\u0003鏈Z(\u001c\u000f{l󶔣𡑶N\u0013􅫛\u0016-\u0010L-IN􀪝㐸W󻏈\u001c􌈜Ztu[􎜖D􏾸\u001e􇝬]g\u0017f𓊇𨴌[􇪉@􌐿:6P\u0007NZ5Z𝆖3Mh^\u000e􋽷\u000eBK𝣧鳻:M\n<9Kl􇢥r󼭘q|𞤃d$3\r\u00124oYn\n|1\u0014\u001a𗰣𗹓흯\u000c툀5\u001a𧑷h9Fw2A33M𣫚\u0000?i螓x\u0012􎌳󴁂\u0019N\u000c𩰧\u0014`KKW<𘖐r)"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_9.json b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_9.json
index 6029ea01e7a..aff1ce6f767 100644
--- a/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_9.json
+++ b/libs/wire-api/test/golden/testObject_DisableLegalHoldForUserRequest_team_9.json
@@ -1,3 +1,3 @@
 {
     "password": "􂃑29C{tq3M\u0007l\u000bI􀠘~\u0008􏌝\u000cX􁓷󲛒z2󵚊[aN𣋲𠕀\u0007\\$Dt蒅󽷄\u000c[.\u0017;뾕5|H󿱛\u00082󿭯2\u0005nj6\u0015𠼞Ll􂸅𠛽w*􋍦\u0006\nz@\u000bxKY*k酨b>f󾚼\u0014\u0000,\u0001\u0016=kLke\u000e󵿼𨹅𒋓\rT􌱕v󹄈/|􁹄􊮖\\\u0007𐐆K\n{_\u0011\u0014N󿲖}\u0005]\t􃖋㲧I\u0018/%𩦮Nn𤕞\u0014𡯛󼒴𗨍􌠾\u0015\u001a(\u0016k󾍳󷏕􌖏V-/Y+=F6\u000b~𘆤(\nkᇈ<\u000e\u0005􈶚R0~\u0000ca?u]􊃱)\"\u0019ikt𔗟$>􇷙9TWfRW9𗨪\u000c=󹋍ﾲ𦒗􏫀Fj3%#dITe=/hJpn\u0010mm  \u0011-첻:\u001f􌐏~ 𝅗𝅥;𪂩y\u0002\u001b-Sbzm@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_1.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_1.json
index 41d88394413..ced6ffcdc2c 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_1.json
@@ -1,3 +1,3 @@
 {
     "email": "sL𘇍@%"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_10.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_10.json
index ee061200712..a9f3b4b7b7f 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_10.json
@@ -1,3 +1,3 @@
 {
     "email": "󱬌g鯪Ns&N6r옂U^􊌕􅏔O=;\u0006~g@C3󱸇od𢹓󵏌𦷂P𬿣=𭴟\u0013\u001a󵯰"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_11.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_11.json
index 820379736fa..731d7437a1f 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_11.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0019h𬨑V.JAq-󹣮𬆱46媅=􏛄󸏇@}=􈒽Y\u000c_O}:M\"󸻿"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_12.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_12.json
index 258ffa2a319..4d7e1d26c35 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_12.json
@@ -1,3 +1,3 @@
 {
     "email": "匣\u0005矹B{󼆎􁭱~@<E󲿰Fh%fa,澦\u0006\u0005pg\u001a\u0012\u0013 dx"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_13.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_13.json
index 3796297361a..bf4b98adea0 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_13.json
@@ -1,3 +1,3 @@
 {
     "email": "AGg𨇂w,}#_\u001e\u0001 \u0007@𩌠𩐖亶e􂍤껿"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_14.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_14.json
index 4cdbc1cf268..7e2b9441530 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_14.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0016S\u00044\u0019􋤙􋼩𘒭}0`碦􈘂d+@W"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_15.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_15.json
index c05266ba06e..104e96cd964 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_15.json
@@ -1,3 +1,3 @@
 {
     "email": "r\r|g󳢾?􃸹h󸩀\u000cy[<]L@𪹿B\u00141𑣑\u0011|0ADH䁼W\u0017"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_16.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_16.json
index 8eb9b246643..e7030ea7a58 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_16.json
@@ -1,3 +1,3 @@
 {
     "email": "]po帓\u001e\"\u0004\u001b[&tS\u0015\u000e􅏦|o@v[j"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_17.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_17.json
index 36f43b38ab3..9a0d18a4c77 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_17.json
@@ -1,3 +1,3 @@
 {
     "email": "Z\u000e:Sm\u0018\u001a󷡲OrE[-𝨘~㝈@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_18.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_18.json
index 7cb8cfb0d75..3c587c1c381 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_18.json
@@ -1,3 +1,3 @@
 {
     "email": "RD@𩨪m[b⺪\u001d6Z"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_19.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_19.json
index c0d2add6b6e..a55bb4d5d22 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_19.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0014S𘥆󶧟𗘕􉶳a\u000fw\\𨌂뗃@󳬸N󰽕􈰩嗏D\u0000\"5jB\u0013𣻲=uQ>󳖼𨾪\u001d 􅟮"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_2.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_2.json
index 4a45d373557..fc2647a9e4f 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_2.json
@@ -1,3 +1,3 @@
 {
     "email": "7𧒽>t劭\u0006𐿳n9\u0008\u001fskT.\"􎏸\r\u0014`@^/>1Rp<\u0019􏃵􉡁\u0002#\u0007[E\u0003#碑𧧙ീeJ "
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_20.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_20.json
index 8ced2bc85f4..9fa5fe447dd 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_20.json
@@ -1,3 +1,3 @@
 {
     "email": "o\u0001󴪚\u0007LL$\u000eￒ􌡷l*p󰘟\u001a@q矛\u0013ㄭ󴠅󸂢q󴮢𣠈􁻠&^𫋐Z"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_3.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_3.json
index eeaf3e5cff7..c62559456ee 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_3.json
@@ -1,3 +1,3 @@
 {
     "email": "1[Z𐲪\r语3􉝰|u<U7`#bq𠎟z#ViP\u0017쮢_&Yn@􄥡\u0013sLt.bq􀌨\u001e\u000c𨢇$+:󱠡%\u0019ch`zx𧕑\u0017E\u0000#𡅑"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_4.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_4.json
index ceb5bc96d2a..068a07e0f1b 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_4.json
@@ -1,3 +1,3 @@
 {
     "email": "|𫀅W㾜b𐢎洢X@􁛐\u000c\u0016\u001f\t􅊬I􄏕_󱇰\u001b\u000c0󳽪𩆠\u0015(\u000f9\u001f󿥾\u0018\u0012K9"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_5.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_5.json
index 552bd792b8c..4884489cc22 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_5.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0014{6􅔔&\u0012𞡎4\u0007\u001br{rM&􁶋\u0000+R󳚽+XV𗑟\u000cK@HB􂩿럯\u0015Sr\u0010\u001cot\u0010\u0018t\u0011铑zt"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_6.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_6.json
index 90586baaf4d..0168e4cc9d4 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_6.json
@@ -1,3 +1,3 @@
 {
     "email": "G􍊝=A\u0000\n,OtT(j\u001d@d\u00166"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_7.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_7.json
index 68b592d82b5..744ff167b36 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_7.json
@@ -1,3 +1,3 @@
 {
     "email": "󼢷R^k󶕪&'@5O𡼳\u0005"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_8.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_8.json
index 4ac29897d1e..34ecaba6c7d 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_8.json
@@ -1,3 +1,3 @@
 {
     "email": "riX@ "
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_9.json b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_9.json
index a9885c47866..a3e0ad1f75e 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_provider_9.json
@@ -1,3 +1,3 @@
 {
     "email": "%󻻎@􆰼􁚽8R􊟯NS"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_1.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_1.json
index 3ffd71910f7..3a37251a02d 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "email": "<&aW1q|0.n\u0019@p􎞙󹠘l_R𢨬l=;􀎳7u\"\u00101}wm{\u0018}"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_10.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_10.json
index 5b302b3bbec..212327f0c81 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_10.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_10.json
@@ -1,3 +1,3 @@
 {
     "email": "r)𦬵\u000f\u0017\u0002􅻙\u0014*$@氠􏗠h󹮭氬󷯶|=Bb𫓹X"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_11.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_11.json
index b7ea29eb372..b56921f71fd 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_11.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_11.json
@@ -1,3 +1,3 @@
 {
     "email": ".@i4N󵴐f'\u001dh𠓜𮏛獪x54밷h"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_12.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_12.json
index 67ad5166b1c..f35dcaf10ab 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_12.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_12.json
@@ -1,3 +1,3 @@
 {
     "email": "􄔂\u0005o`\u0005ebt*𝃞!@𥕹𩚜Fk\u0013\u0011Dq\u0016|0 c\u000cY􉨃󱗈"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_13.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_13.json
index afee190630a..352e7161900 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_13.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_13.json
@@ -1,3 +1,3 @@
 {
     "email": "5􎱝SV'᭯𩘏fR\u0001a:L𭁼\u0001`\u0018Y@Yt3l5𣛭􁢤j􉜸􍒭&"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_14.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_14.json
index 865a9b27fad..a322d3f3ce5 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_14.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_14.json
@@ -1,3 +1,3 @@
 {
     "email": "𢙰󲟯r.@\u0019푳𫋐q\u0018T:`]a$J\u0013'𫺦󶭹"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_15.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_15.json
index ad26a1c5806..f4e3f33f21c 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_15.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_15.json
@@ -1,3 +1,3 @@
 {
     "email": "8aoᑑQ@8T𛄛\u001c󴣇􍣡\u0000\u0003ᘇ\u0005􇎘HZ𭘹[rr27󽋋ᘹ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_16.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_16.json
index 142e98bf2c0..9ca5141f82c 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_16.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_16.json
@@ -1,3 +1,3 @@
 {
     "email": "\u000f冽\"\u0012\rn\u001d􈖇J(?]\u001f󴰖$7𡘭7J󸾟p\u0019i@Q`6_\u0016\u0013􁨘5hv崿\n\u000f𩰾)ﯲ\u0008\u0005\nA֪T𗀂"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_17.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_17.json
index d71db3dc77e..69ff7d3bfdd 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_17.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_17.json
@@ -1,3 +1,3 @@
 {
     "email": "64A󳽉\u001d\u0011\u0010ᳬ\u001dj@𡚫=𦇚\u000c\u0005r\u0012Ga撓\u0003/흆G\u0000k=\u0015q􆄣R}Ts\u0003\u000c󺻃􉭏2"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_18.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_18.json
index c1fb243c4ea..bc75b231879 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_18.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_18.json
@@ -1,3 +1,3 @@
 {
     "email": "9L\u001b\u0013緸/F𥯬O􃐹>\u0008x;2𤔴0\u001f@ {\"_\u000b􊧁󾘨􄜓􉴁\u0019J%󵛃yy\u001a󾁧t>xoC"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_19.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_19.json
index 8fc9dc1c4c8..0a0c16440de 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_19.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_19.json
@@ -1,3 +1,3 @@
 {
     "email": "𫬝󽻼E\u001c\u001a𞴇\u0015C%󱏱\u0006\u001f\u0011a8\rﵷE󱺣%𫧚𭖕;|\u001d@1+,𡂌83"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_2.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_2.json
index a7aa9a4b1fb..94a61ed1025 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_2.json
@@ -1,3 +1,3 @@
 {
     "email": "C𓌇|g󼹸(4@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_20.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_20.json
index bb1ed19800f..4a3b7ef96db 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_20.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_20.json
@@ -1,3 +1,3 @@
 {
     "email": "e\u0015V\u0008D\u000188Kh\u001c𩙝D4􊇉軀zg\u001e@:𪤬D\u0005y+\u0014k>]\u0017\u001cr󶥱aWSw\u0007ជ6\u001e𘑑f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_3.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_3.json
index f8704d2c3aa..76ae2d73222 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_3.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_3.json
@@ -1,3 +1,3 @@
 {
     "email": "uA76􂎥c𡖝\u0013𤋺\u0001U0]Ds$L@/㺚 u􏠐\u0013Pq\u001dev懪󻛣㺈"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_4.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_4.json
index 4e328931c49..b22ad68e944 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_4.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_4.json
@@ -1,3 +1,3 @@
 {
     "email": ":|𪀧WYA\u0007`OS\u0013\u0015􂴠􎶋u\u000b-\u0013F2B󶡙'z\u0005}4[@6𣾷C𥠃󸆝V􊙮8\"\u0001M𩌻l"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_5.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_5.json
index 1ce2c760ae6..35da92953a9 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_5.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_5.json
@@ -1,3 +1,3 @@
 {
     "email": "0a⪨\u0012n\u001c!a;*l흣Z\u0008\u0019\u0000\u0000􂻂\u001ej\\𗖸_;\u0002@I︳j󷥽byd𥼛K🡴𒍟􌎍mwP"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_6.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_6.json
index 5b8964f0e5b..ea0097da53d 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_6.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_6.json
@@ -1,3 +1,3 @@
 {
     "email": "com0$p얊/\u001c󿂈󷶆\u000fN􅮊,@\u001d󵖩𥶾,ꆶ/qeT&𥑏\u0007댯}\u0017뉴􏵹󴫸#𬰮0冗9),4F"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_7.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_7.json
index 5af30cdd91c..fbdd4873e81 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_7.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_7.json
@@ -1,3 +1,3 @@
 {
     "email": "-튄@\u0007$㇠Be􅱑\u000cS7.〢\u0000ହ\r+k>Z:E\u0003hX$?"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_8.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_8.json
index 5a1a8174bcb..74c30a84d4a 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_8.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_8.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0019f\\\u000edD9#XfnL!󲻀\u0006\u001cZ퀆U@)蟍󸩤x9~t)Dd;P\u001b󺅩.M(p􀜛pCz􍜾󴝄\u000f\u0005\u0006{󸋛􌴰"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_EmailUpdate_user_9.json b/libs/wire-api/test/golden/testObject_EmailUpdate_user_9.json
index eb7f18483e0..43ab8e01e93 100644
--- a/libs/wire-api/test/golden/testObject_EmailUpdate_user_9.json
+++ b/libs/wire-api/test/golden/testObject_EmailUpdate_user_9.json
@@ -1,3 +1,3 @@
 {
     "email": "\u001c\u000f,n}㑉@x8\u001d"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Email_user_1.json b/libs/wire-api/test/golden/testObject_Email_user_1.json
index cdfff801ec9..a4a7b273859 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_1.json
@@ -1 +1 @@
-"𥆯fa섒\u00012\u000b.\u001c<\u001b\u0017#\t-􍴢`2@\u0004\"殭\u0010n\u001d]\u0007hDzP\u0018p㫾T𠤰\u0014d"
\ No newline at end of file
+"𥆯fa섒\u00012\u000b.\u001c<\u001b\u0017#\t-􍴢`2@\u0004\"殭\u0010n\u001d]\u0007hDzP\u0018p㫾T𠤰\u0014d"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_10.json b/libs/wire-api/test/golden/testObject_Email_user_10.json
index 54e199d4867..d30c881dd46 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_10.json
@@ -1 +1 @@
-"\"K􃘌􅒈$s󱐔􇕿V389V\u0007\u0017\u001cH􁮉)滱Dg\u0017@􏺑􂊪k\u000ci\n󿞆𢈬{\u001dl㠃YPbV-ZZ􂶖LK跓􁒥Y"
\ No newline at end of file
+"\"K􃘌􅒈$s󱐔􇕿V389V\u0007\u0017\u001cH􁮉)滱Dg\u0017@􏺑􂊪k\u000ci\n󿞆𢈬{\u001dl㠃YPbV-ZZ􂶖LK跓􁒥Y"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_11.json b/libs/wire-api/test/golden/testObject_Email_user_11.json
index 1b01b7af248..b66ec316746 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_11.json
@@ -1 +1 @@
-"@+zGJ\u0008_t/N\u00003S􃂕M𣮑􆰠z􌚏􎊆SJD"
\ No newline at end of file
+"@+zGJ\u0008_t/N\u00003S􃂕M𣮑􆰠z􌚏􎊆SJD"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_12.json b/libs/wire-api/test/golden/testObject_Email_user_12.json
index 927874cf71f..074eda1c716 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_12.json
@@ -1 +1 @@
-"\u00041[G󷭮󰄵9􉐛:uJ𣒰\u001cMF𞄝󰫽𭸓\u001f6|󳘏\u0015􆧐@𗧟_􃱰"
\ No newline at end of file
+"\u00041[G󷭮󰄵9􉐛:uJ𣒰\u001cMF𞄝󰫽𭸓\u001f6|󳘏\u0015􆧐@𗧟_􃱰"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_13.json b/libs/wire-api/test/golden/testObject_Email_user_13.json
index d8a5e3668d8..4c62fda0c06 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_13.json
@@ -1 +1 @@
-"\u0005\rt\u001cA#}\u001en𫊈OA\u0016\u000e󽼭\t2q\u0013n𧙛𭍩\u000c+@]牭𦷮na[\u001f'h𠴗\u0012󵹌𤅣􏂫"
\ No newline at end of file
+"\u0005\rt\u001cA#}\u001en𫊈OA\u0016\u000e󽼭\t2q\u0013n𧙛𭍩\u000c+@]牭𦷮na[\u001f'h𠴗\u0012󵹌𤅣􏂫"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_14.json b/libs/wire-api/test/golden/testObject_Email_user_14.json
index af750e0b107..00afac0771b 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_14.json
@@ -1 +1 @@
-"X\u0010E\u0014󷘞󿒐􎒂YMU[\n}󲈖\r7󶨐\u0018\\@𨓫󼽯M\u001d!𢶞T%F]"
\ No newline at end of file
+"X\u0010E\u0014󷘞󿒐􎒂YMU[\n}󲈖\r7󶨐\u0018\\@𨓫󼽯M\u001d!𢶞T%F]"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_15.json b/libs/wire-api/test/golden/testObject_Email_user_15.json
index 0f1f06abc1e..ac14ced80d4 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_15.json
@@ -1 +1 @@
-"{C𪮆󾞐eU\u0014w@`\u0013>"
\ No newline at end of file
+"{C𪮆󾞐eU\u0014w@`\u0013>"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_16.json b/libs/wire-api/test/golden/testObject_Email_user_16.json
index 86d560c5dde..d47fad630cb 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_16.json
@@ -1 +1 @@
-"IO\u00192>􁍸+~@\u000e"
\ No newline at end of file
+"IO\u00192>􁍸+~@\u000e"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_17.json b/libs/wire-api/test/golden/testObject_Email_user_17.json
index f32e123bbe4..4dc0b271fc6 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_17.json
@@ -1 +1 @@
-"\u001e􋺥\u0016\u0001>줂V7C-asF􁩬IfrYTM;󷲆􂧽*l(d@.53Q􋻗26bfw𪷁𒂅~𨚃𠌬m\u001d\u0015\u000e}𥕟~􀩻R"
\ No newline at end of file
+"\u001e􋺥\u0016\u0001>줂V7C-asF􁩬IfrYTM;󷲆􂧽*l(d@.53Q􋻗26bfw𪷁𒂅~𨚃𠌬m\u001d\u0015\u000e}𥕟~􀩻R"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_18.json b/libs/wire-api/test/golden/testObject_Email_user_18.json
index fce981dd996..ebc1ece9160 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_18.json
@@ -1 +1 @@
-"𬒂|\u0000\u00023\u0012􌝘,:\u0017JuF\u0010*㶮\u0011\"\u0016kU!󱩝8T\u00192@T\"q\u0011𑣤}\u0013Z~🖟)"
\ No newline at end of file
+"𬒂|\u0000\u00023\u0012􌝘,:\u0017JuF\u0010*㶮\u0011\"\u0016kU!󱩝8T\u00192@T\"q\u0011𑣤}\u0013Z~🖟)"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_19.json b/libs/wire-api/test/golden/testObject_Email_user_19.json
index 3cb78598f84..33346b6153c 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_19.json
@@ -1 +1 @@
-"\t\u0006N~\u001eWy5'\u0018q:_K󹫜\"+WM瑳S.\u0012D`\u0018@DG𡏝AE=W􆫔"
\ No newline at end of file
+"\t\u0006N~\u001eWy5'\u0018q:_K󹫜\"+WM瑳S.\u0012D`\u0018@DG𡏝AE=W􆫔"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_2.json b/libs/wire-api/test/golden/testObject_Email_user_2.json
index 9d03297b97e..070584c3307 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_2.json
@@ -1 +1 @@
-"󰨊\u0013F𭟍􈶇n:@8􅻻ಏ\u0016s"
\ No newline at end of file
+"󰨊\u0013F𭟍􈶇n:@8􅻻ಏ\u0016s"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_20.json b/libs/wire-api/test/golden/testObject_Email_user_20.json
index b126e40e0b1..232b97cdc8e 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_20.json
@@ -1 +1 @@
-"/𡯐ZF󵃹󺲛@𭵥I􎾁~FN󸋄\u00053PH\u0014k󽃿𠉚{󿙾\u0017H󹇢\u0012IR"
\ No newline at end of file
+"/𡯐ZF󵃹󺲛@𭵥I􎾁~FN󸋄\u00053PH\u0014k󽃿𠉚{󿙾\u0017H󹇢\u0012IR"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_3.json b/libs/wire-api/test/golden/testObject_Email_user_3.json
index cd0b544e5b2..1c831e16e3a 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_3.json
@@ -1 +1 @@
-"􎟘o #𩃰GῩ%/]\u001ck􁻪t􍜮)\u0013\u0015*\u001bE}>\u001a\u0001En==8@昸\u0018N\u0007;_l$*䇱P\u0002\u0008K"
\ No newline at end of file
+"􎟘o #𩃰GῩ%/]\u001ck􁻪t􍜮)\u0013\u0015*\u001bE}>\u001a\u0001En==8@昸\u0018N\u0007;_l$*䇱P\u0002\u0008K"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_4.json b/libs/wire-api/test/golden/testObject_Email_user_4.json
index a41d887253b..ceb8c7e0a35 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_4.json
@@ -1 +1 @@
-"!𢢼\u000f&\u0007o88i󱨨(\u001al1_􇐬-\u000c\t&\u001c9􊉳@ef&󻣵𬋾W(󳻠cS\u0016\u0004𗴯GLi"
\ No newline at end of file
+"!𢢼\u000f&\u0007o88i󱨨(\u001al1_􇐬-\u000c\t&\u001c9􊉳@ef&󻣵𬋾W(󳻠cS\u0016\u0004𗴯GLi"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_5.json b/libs/wire-api/test/golden/testObject_Email_user_5.json
index 0950ba0dd5f..2e5781ed517 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_5.json
@@ -1 +1 @@
-"@洸\u0011􉼗󺳩jh󷾴o\u001dH0bW7^䗕B"
\ No newline at end of file
+"@洸\u0011􉼗󺳩jh󷾴o\u001dH0bW7^䗕B"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_6.json b/libs/wire-api/test/golden/testObject_Email_user_6.json
index b7ac58037ff..918f37c1212 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_6.json
@@ -1 +1 @@
-"eM'5\u0008r>𖥝󳔈4𠟐r\t@󳗧[n\u0005 )&D=󹆉\u0006\u0008"
\ No newline at end of file
+"eM'5\u0008r>𖥝󳔈4𠟐r\t@󳗧[n\u0005 )&D=󹆉\u0006\u0008"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_7.json b/libs/wire-api/test/golden/testObject_Email_user_7.json
index 0c14e6caf55..65b5478a87a 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_7.json
@@ -1 +1 @@
-"􎦮𩔛a\u0003'𗅼L\u0016醍󲂢Q󴝊󳸯Fc􋒕T𮮲\u000eTD@𫌐?1􌰨DT"
\ No newline at end of file
+"􎦮𩔛a\u0003'𗅼L\u0016醍󲂢Q󴝊󳸯Fc􋒕T𮮲\u000eTD@𫌐?1􌰨DT"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_8.json b/libs/wire-api/test/golden/testObject_Email_user_8.json
index 15a49f741e4..26f013774c1 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_8.json
@@ -1 +1 @@
-" \u001b{􎎍EZ_\t+E\u000bE@h𖡚%펽g㤣Lu\u0012𫥦J} Aq\"#f\u001b \u0004O\u0012"
\ No newline at end of file
+" \u001b{􎎍EZ_\t+E\u000bE@h𖡚%펽g㤣Lu\u0012𫥦J} Aq\"#f\u001b \u0004O\u0012"
diff --git a/libs/wire-api/test/golden/testObject_Email_user_9.json b/libs/wire-api/test/golden/testObject_Email_user_9.json
index 0dde904d290..327f67fd21c 100644
--- a/libs/wire-api/test/golden/testObject_Email_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Email_user_9.json
@@ -1 +1 @@
-"󶤾󼉱5M6d*~-\u0013\u0017?罆@g𛆟R􊸢|󰸌󻥤"
\ No newline at end of file
+"󶤾󼉱5M6d*~-\u0013\u0017?罆@g𛆟R􊸢|󰸌󻥤"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_1.json b/libs/wire-api/test/golden/testObject_EventType_team_1.json
index da7d7ed2b6a..7c12d43d872 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_1.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_1.json
@@ -1 +1 @@
-"team.conversation-delete"
\ No newline at end of file
+"team.conversation-delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_10.json b/libs/wire-api/test/golden/testObject_EventType_team_10.json
index da7d7ed2b6a..7c12d43d872 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_10.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_10.json
@@ -1 +1 @@
-"team.conversation-delete"
\ No newline at end of file
+"team.conversation-delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_11.json b/libs/wire-api/test/golden/testObject_EventType_team_11.json
index da7d7ed2b6a..7c12d43d872 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_11.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_11.json
@@ -1 +1 @@
-"team.conversation-delete"
\ No newline at end of file
+"team.conversation-delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_12.json b/libs/wire-api/test/golden/testObject_EventType_team_12.json
index cdd0bf81902..6a04a0f8d99 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_12.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_12.json
@@ -1 +1 @@
-"team.create"
\ No newline at end of file
+"team.create"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_13.json b/libs/wire-api/test/golden/testObject_EventType_team_13.json
index a60d69e2ed6..b4f988046bd 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_13.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_13.json
@@ -1 +1 @@
-"team.conversation-create"
\ No newline at end of file
+"team.conversation-create"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_14.json b/libs/wire-api/test/golden/testObject_EventType_team_14.json
index da7d7ed2b6a..7c12d43d872 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_14.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_14.json
@@ -1 +1 @@
-"team.conversation-delete"
\ No newline at end of file
+"team.conversation-delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_15.json b/libs/wire-api/test/golden/testObject_EventType_team_15.json
index da7d7ed2b6a..7c12d43d872 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_15.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_15.json
@@ -1 +1 @@
-"team.conversation-delete"
\ No newline at end of file
+"team.conversation-delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_16.json b/libs/wire-api/test/golden/testObject_EventType_team_16.json
index a60d69e2ed6..b4f988046bd 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_16.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_16.json
@@ -1 +1 @@
-"team.conversation-create"
\ No newline at end of file
+"team.conversation-create"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_17.json b/libs/wire-api/test/golden/testObject_EventType_team_17.json
index da7d7ed2b6a..7c12d43d872 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_17.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_17.json
@@ -1 +1 @@
-"team.conversation-delete"
\ No newline at end of file
+"team.conversation-delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_18.json b/libs/wire-api/test/golden/testObject_EventType_team_18.json
index 1b1b530a62e..1fd870802c0 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_18.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_18.json
@@ -1 +1 @@
-"team.member-update"
\ No newline at end of file
+"team.member-update"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_19.json b/libs/wire-api/test/golden/testObject_EventType_team_19.json
index 7a6bf3b0176..9944fe1df47 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_19.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_19.json
@@ -1 +1 @@
-"team.delete"
\ No newline at end of file
+"team.delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_2.json b/libs/wire-api/test/golden/testObject_EventType_team_2.json
index a60d69e2ed6..b4f988046bd 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_2.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_2.json
@@ -1 +1 @@
-"team.conversation-create"
\ No newline at end of file
+"team.conversation-create"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_20.json b/libs/wire-api/test/golden/testObject_EventType_team_20.json
index a60d69e2ed6..b4f988046bd 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_20.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_20.json
@@ -1 +1 @@
-"team.conversation-create"
\ No newline at end of file
+"team.conversation-create"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_3.json b/libs/wire-api/test/golden/testObject_EventType_team_3.json
index c3cb7a56950..adc6e7c855f 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_3.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_3.json
@@ -1 +1 @@
-"team.member-leave"
\ No newline at end of file
+"team.member-leave"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_4.json b/libs/wire-api/test/golden/testObject_EventType_team_4.json
index 7daadfe4af8..aa770463e91 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_4.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_4.json
@@ -1 +1 @@
-"team.member-join"
\ No newline at end of file
+"team.member-join"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_5.json b/libs/wire-api/test/golden/testObject_EventType_team_5.json
index 4bd675fa41e..18ed102c959 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_5.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_5.json
@@ -1 +1 @@
-"team.update"
\ No newline at end of file
+"team.update"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_6.json b/libs/wire-api/test/golden/testObject_EventType_team_6.json
index cdd0bf81902..6a04a0f8d99 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_6.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_6.json
@@ -1 +1 @@
-"team.create"
\ No newline at end of file
+"team.create"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_7.json b/libs/wire-api/test/golden/testObject_EventType_team_7.json
index 7daadfe4af8..aa770463e91 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_7.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_7.json
@@ -1 +1 @@
-"team.member-join"
\ No newline at end of file
+"team.member-join"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_8.json b/libs/wire-api/test/golden/testObject_EventType_team_8.json
index a60d69e2ed6..b4f988046bd 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_8.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_8.json
@@ -1 +1 @@
-"team.conversation-create"
\ No newline at end of file
+"team.conversation-create"
diff --git a/libs/wire-api/test/golden/testObject_EventType_team_9.json b/libs/wire-api/test/golden/testObject_EventType_team_9.json
index 7daadfe4af8..aa770463e91 100644
--- a/libs/wire-api/test/golden/testObject_EventType_team_9.json
+++ b/libs/wire-api/test/golden/testObject_EventType_team_9.json
@@ -1 +1 @@
-"team.member-join"
\ No newline at end of file
+"team.member-join"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_1.json b/libs/wire-api/test/golden/testObject_EventType_user_1.json
index 31ca85e6224..916e1d55821 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_1.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_1.json
@@ -1 +1 @@
-"conversation.typing"
\ No newline at end of file
+"conversation.member-join"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_10.json b/libs/wire-api/test/golden/testObject_EventType_user_10.json
index 71556b64685..334506927ba 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_10.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_10.json
@@ -1 +1 @@
-"conversation.access-update"
\ No newline at end of file
+"conversation.connect-request"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_11.json b/libs/wire-api/test/golden/testObject_EventType_user_11.json
index 894a13a8eb9..b92e4840906 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_11.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_11.json
@@ -1 +1 @@
-"conversation.code-delete"
\ No newline at end of file
+"conversation.delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_12.json b/libs/wire-api/test/golden/testObject_EventType_user_12.json
index c455713f3ff..59082d7aa3b 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_12.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_12.json
@@ -1 +1 @@
-"conversation.member-join"
\ No newline at end of file
+"conversation.receipt-mode-update"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_13.json b/libs/wire-api/test/golden/testObject_EventType_user_13.json
index 31ca85e6224..66f2ac427a1 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_13.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_13.json
@@ -1 +1 @@
-"conversation.typing"
\ No newline at end of file
+"conversation.otr-message-add"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_14.json b/libs/wire-api/test/golden/testObject_EventType_user_14.json
index 71556b64685..6a63dd75f27 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_14.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_14.json
@@ -1 +1 @@
-"conversation.access-update"
\ No newline at end of file
+"conversation.typing"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_15.json b/libs/wire-api/test/golden/testObject_EventType_user_15.json
deleted file mode 100644
index e05f935da20..00000000000
--- a/libs/wire-api/test/golden/testObject_EventType_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"conversation.otr-message-add"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_16.json b/libs/wire-api/test/golden/testObject_EventType_user_16.json
deleted file mode 100644
index 12e4414ab8d..00000000000
--- a/libs/wire-api/test/golden/testObject_EventType_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"conversation.code-update"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_17.json b/libs/wire-api/test/golden/testObject_EventType_user_17.json
deleted file mode 100644
index 58946919f2c..00000000000
--- a/libs/wire-api/test/golden/testObject_EventType_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"conversation.connect-request"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_18.json b/libs/wire-api/test/golden/testObject_EventType_user_18.json
deleted file mode 100644
index 34e2bc587b2..00000000000
--- a/libs/wire-api/test/golden/testObject_EventType_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"conversation.message-timer-update"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_19.json b/libs/wire-api/test/golden/testObject_EventType_user_19.json
deleted file mode 100644
index e05f935da20..00000000000
--- a/libs/wire-api/test/golden/testObject_EventType_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"conversation.otr-message-add"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_2.json b/libs/wire-api/test/golden/testObject_EventType_user_2.json
index 894a13a8eb9..5764b42da6f 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_2.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_2.json
@@ -1 +1 @@
-"conversation.code-delete"
\ No newline at end of file
+"conversation.member-leave"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_20.json b/libs/wire-api/test/golden/testObject_EventType_user_20.json
deleted file mode 100644
index 3aeff5fb55e..00000000000
--- a/libs/wire-api/test/golden/testObject_EventType_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"conversation.member-leave"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_3.json b/libs/wire-api/test/golden/testObject_EventType_user_3.json
index 6d2db41473e..429c351ba52 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_3.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_3.json
@@ -1 +1 @@
-"conversation.create"
\ No newline at end of file
+"conversation.member-update"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_4.json b/libs/wire-api/test/golden/testObject_EventType_user_4.json
index 3aeff5fb55e..91d56133055 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_4.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_4.json
@@ -1 +1 @@
-"conversation.member-leave"
\ No newline at end of file
+"conversation.rename"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_5.json b/libs/wire-api/test/golden/testObject_EventType_user_5.json
index 31ca85e6224..ef499c298ae 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_5.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_5.json
@@ -1 +1 @@
-"conversation.typing"
\ No newline at end of file
+"conversation.access-update"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_6.json b/libs/wire-api/test/golden/testObject_EventType_user_6.json
index 31ca85e6224..00653abc861 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_6.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_6.json
@@ -1 +1 @@
-"conversation.typing"
\ No newline at end of file
+"conversation.message-timer-update"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_7.json b/libs/wire-api/test/golden/testObject_EventType_user_7.json
index 51bf25016bf..1c4c325a0a8 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_7.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_7.json
@@ -1 +1 @@
-"conversation.delete"
\ No newline at end of file
+"conversation.code-update"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_8.json b/libs/wire-api/test/golden/testObject_EventType_user_8.json
index 31ca85e6224..d8a876fd7f4 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_8.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_8.json
@@ -1 +1 @@
-"conversation.typing"
\ No newline at end of file
+"conversation.code-delete"
diff --git a/libs/wire-api/test/golden/testObject_EventType_user_9.json b/libs/wire-api/test/golden/testObject_EventType_user_9.json
index c455713f3ff..562627483c1 100644
--- a/libs/wire-api/test/golden/testObject_EventType_user_9.json
+++ b/libs/wire-api/test/golden/testObject_EventType_user_9.json
@@ -1 +1 @@
-"conversation.member-join"
\ No newline at end of file
+"conversation.create"
diff --git a/libs/wire-api/test/golden/testObject_Event_team_1.json b/libs/wire-api/test/golden/testObject_Event_team_1.json
index 33f775950ab..8cbbc5ac0ef 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_1.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_1.json
@@ -1,12 +1,12 @@
 {
-    "time": "1864-05-15T23:16:24.423381912958Z",
     "data": {
+        "binding": true,
         "creator": "00000003-0000-0001-0000-000300000002",
         "icon": "#𖺗匞(󳡭",
-        "name": "\u0004X󳒌h",
         "id": "00000003-0000-0004-0000-000000000001",
-        "binding": true
+        "name": "\u0004X󳒌h"
     },
     "team": "0000103e-0000-62d6-0000-7840000079b9",
+    "time": "1864-05-15T23:16:24.423381912958Z",
     "type": "team.create"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_10.json b/libs/wire-api/test/golden/testObject_Event_team_10.json
index ac80aabecc2..6833652149e 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_10.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_10.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-06-08T20:37:32.993020874753Z",
     "data": {
         "user": "00004649-0000-6535-0000-5d2b00005924"
     },
     "team": "00000efc-0000-67f3-0000-33bd00000cc1",
+    "time": "1864-06-08T20:37:32.993020874753Z",
     "type": "team.member-leave"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_11.json b/libs/wire-api/test/golden/testObject_Event_team_11.json
index a08b635410c..fb1cd24d9e0 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_11.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_11.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-06-07T21:49:06.242261128063Z",
     "data": {
         "conv": "0000572e-0000-2452-0000-2a8300006d6b"
     },
     "team": "00005156-0000-0690-0000-531500001b8f",
+    "time": "1864-06-07T21:49:06.242261128063Z",
     "type": "team.conversation-delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_12.json b/libs/wire-api/test/golden/testObject_Event_team_12.json
index 4b57428ebd5..c45acc1859b 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_12.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_12.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-04-11T07:04:35.939055292667Z",
     "data": {
         "conv": "000041d3-0000-6993-0000-080100000fa8"
     },
     "team": "00006c75-0000-7a03-0000-2c52000004f3",
+    "time": "1864-04-11T07:04:35.939055292667Z",
     "type": "team.conversation-delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_13.json b/libs/wire-api/test/golden/testObject_Event_team_13.json
index a78c804c8ff..587d5713db3 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_13.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_13.json
@@ -1,13 +1,13 @@
 {
-    "time": "1864-04-14T05:25:05.00980826325Z",
     "data": {
+        "binding": false,
         "creator": "00000000-0000-0002-0000-000400000000",
         "icon": "\u0008􆿱",
-        "name": "\u0008h0󺴴",
-        "id": "00000002-0000-0003-0000-000200000001",
         "icon_key": ",7\u0007S",
-        "binding": false
+        "id": "00000002-0000-0003-0000-000200000001",
+        "name": "\u0008h0󺴴"
     },
     "team": "000000a2-0000-56a4-0000-1a9f0000402b",
+    "time": "1864-04-14T05:25:05.00980826325Z",
     "type": "team.create"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_14.json b/libs/wire-api/test/golden/testObject_Event_team_14.json
index 25ab3b6cd14..f6e61b937b9 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_14.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_14.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-05-02T18:02:02.563349061703Z",
     "data": {
         "conv": "000071e4-0000-24dd-0000-41dd000013e5"
     },
     "team": "00006c11-0000-76d2-0000-09da000047d8",
+    "time": "1864-05-02T18:02:02.563349061703Z",
     "type": "team.conversation-delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_15.json b/libs/wire-api/test/golden/testObject_Event_team_15.json
index 607a12e1a8b..053908a4c18 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_15.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_15.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-06-04T00:19:07.663093674023Z",
     "data": {
         "conv": "000074e6-0000-1d53-0000-7d6400001363"
     },
     "team": "00007fe4-0000-5f5d-0000-140500001c24",
+    "time": "1864-06-04T00:19:07.663093674023Z",
     "type": "team.conversation-delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_16.json b/libs/wire-api/test/golden/testObject_Event_team_16.json
index 798d7868c7b..216b3fa119b 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_16.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_16.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-04-23T09:55:44.855155072596Z",
     "data": {
         "conv": "00007c20-0000-6564-0000-046c00004725"
     },
     "team": "00000ea7-0000-0ab2-0000-36120000290d",
+    "time": "1864-04-23T09:55:44.855155072596Z",
     "type": "team.conversation-delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_17.json b/libs/wire-api/test/golden/testObject_Event_team_17.json
index 745f4b489a4..8720d283717 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_17.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_17.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-05-26T12:52:34.967254218092Z",
     "data": {
         "conv": "0000713e-0000-6f9d-0000-40e2000036e7"
     },
     "team": "00006611-0000-7382-0000-5ca500006e9f",
+    "time": "1864-05-26T12:52:34.967254218092Z",
     "type": "team.conversation-create"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_18.json b/libs/wire-api/test/golden/testObject_Event_team_18.json
index 3bda6d1ace5..6f44acafb39 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_18.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_18.json
@@ -1,12 +1,12 @@
 {
-    "time": "1864-05-05T05:53:46.446463823554Z",
     "data": {
-        "user": "00007783-0000-7d60-0000-00d30000396e",
         "permissions": {
             "copy": 6783,
             "self": 8191
-        }
+        },
+        "user": "00007783-0000-7d60-0000-00d30000396e"
     },
     "team": "00001705-0000-202b-0000-578a000056d0",
+    "time": "1864-05-05T05:53:46.446463823554Z",
     "type": "team.member-update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_19.json b/libs/wire-api/test/golden/testObject_Event_team_19.json
index dbe8bacb5c4..5045e62e0fd 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_19.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_19.json
@@ -1,12 +1,12 @@
 {
-    "time": "1864-05-28T17:18:44.856809552438Z",
     "data": {
-        "user": "0000382c-0000-1ce7-0000-568b00001fe9",
         "permissions": {
             "copy": 1754,
             "self": 1786
-        }
+        },
+        "user": "0000382c-0000-1ce7-0000-568b00001fe9"
     },
     "team": "00004e8a-0000-7afa-0000-61ad00000f71",
+    "time": "1864-05-28T17:18:44.856809552438Z",
     "type": "team.member-update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_2.json b/libs/wire-api/test/golden/testObject_Event_team_2.json
index 549692c174a..65da16e3f30 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_2.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_2.json
@@ -1,10 +1,10 @@
 {
-    "time": "1864-05-06T06:03:20.68447167825Z",
     "data": {
         "icon": "G*~􌍈\u0004\u001c贕%s\u0013|􊪚ZS󱤵jf𝒾-w􏳓{]R\u0007NwI\u0007󵻽?Z󹀡x𐂧*\t\u000f33􊟪3-j\u0012𩧈\u0002p,n.)*􅿽e=𘩢n􃧫𦺊aK\u000cfeF\u0017x𤛢\u001dX_󹱼R􍎨K𑒜gK􀜛2J\u0016M𘑑-+􁧰uW^Xwjlt\u000cGy;&󰝉\u001b󼏒\u0012^\u00178⌲wtq􈝊⿎󰆄n1~k\u0008k61R!󸤲􈱪􆟲􆙾w𬸔x\u0014􋾪蝚􇗫M05\u0005ZY#𖫡\u001e(ܘ􅓛{'W\u0014\u001a􃿾?n\u0004AhT-\u0018a;󷠟CV\"",
-        "name": "i5\u0004󴱏􌃵􄑵1u􍸖1ꍰU*/*󳺾󴢾\u0013󲭷d􋱾4uG𪜿\u000cUh09\\󻇞\u000bPy\t𩯻\u000f\u001d0bV\u0018]䊙𗢔㭢\u001e\u0016X\u001b3[\u0018f\u0015",
-        "icon_key": "𠄛Pp􄤣󱇓\u0005S壵S\u0006\u0015mM䪌0䬹突$rL,XvJ"
+        "icon_key": "𠄛Pp􄤣󱇓\u0005S壵S\u0006\u0015mM䪌0䬹突$rL,XvJ",
+        "name": "i5\u0004󴱏􌃵􄑵1u􍸖1ꍰU*/*󳺾󴢾\u0013󲭷d􋱾4uG𪜿\u000cUh09\\󻇞\u000bPy\t𩯻\u000f\u001d0bV\u0018]䊙𗢔㭢\u001e\u0016X\u001b3[\u0018f\u0015"
     },
     "team": "000019fb-0000-03a5-0000-009c00006067",
+    "time": "1864-05-06T06:03:20.68447167825Z",
     "type": "team.update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_20.json b/libs/wire-api/test/golden/testObject_Event_team_20.json
index b67e794acd6..241e71e4513 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_20.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_20.json
@@ -1,6 +1,6 @@
 {
-    "time": "1864-06-02T05:36:57.222646120353Z",
     "data": null,
     "team": "00001872-0000-568f-0000-2ad400004faf",
+    "time": "1864-06-02T05:36:57.222646120353Z",
     "type": "team.delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_3.json b/libs/wire-api/test/golden/testObject_Event_team_3.json
index d931749a72f..9057862b20e 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_3.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_3.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-04-20T19:30:43.065358805164Z",
     "data": {
         "user": "000030c1-0000-1c28-0000-71af000036f3"
     },
     "team": "00000bfa-0000-53cd-0000-2f8e00004e38",
+    "time": "1864-04-20T19:30:43.065358805164Z",
     "type": "team.member-join"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_4.json b/libs/wire-api/test/golden/testObject_Event_team_4.json
index 8f0d4dd20e2..b33b92e363a 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_4.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_4.json
@@ -1,10 +1,10 @@
 {
-    "time": "1864-06-07T17:44:20.841616476784Z",
     "data": {
         "icon": "S&\u0007V2b𣜖L\u0017𤭽z=w􇢇᩿𗰨\u0004\u0014<^󻓭A\u0001󿅰}\t󾴣𝑙F􀢦h\u0004xZZ\u001dg\u00155W6󳸱hn\rx4+<Nz𭵏5Q\u001c\u0008)|*3\u000c캿_d:vꤨ:9릪p𢵥\u0018z􆗊oG󻓉<󸴭\u001cW4󶓲+􍟎\"\u0002\\\u0019󿫪\t?;`\u0011'>\u0019󵌟=\u0013􋣭@o󸒏\u0015kR󹨮l^W)W=󺥎麴\u0016rrN𣕗󺤾S\u000f^,\u00175Q&z8D[㶏\u0017bas\u001aY\u001eR2𢗺󷑡G+'Q+󳚆",
-        "name": "d\u000f𪁤@o󱙾s&na𡐨􊖈𤟯|𔘯󸑴/󱞫v\u0015u\u0012f􋀈󷃠KC룪􄟵􂨺9_\u000b_^󿎖K𥽇\u000e Y*T\u0018􉒆<􂀆>𩾃ፁ\rt󽝓􅯾w2E🆆hS>\u0006_PQN,Vk\u0016􈩂=90\u00192e󰗦\u001fVA!\u0019\u001c\u0004e;𮕔1<H\u0002𮈉-\u00178{0󵏄\r\u0017\u000b~􂻬\u0004!Jg8\u001f,L􏋟􆫾􊺤\u000f\u000fkU𣁬􀶛\u0013𑠟TM{Hzq\r󰄠^\u0006'\rUD1etTd4qcW]𥰪J|s#(󴸯.􈢨f⢃\u0012\u0002)Th\u0018\u0007I)QvQ􌽵󸠋𧊖t'󳆙5\u0015𣣁􂅠e@nS:vB/𡂃𪕈/𗉄\r􍑱*n\u001e󠆅􂣰𬫂lvv53S󱴲j\u0014𗤜/.!6󾺗.\u001fg&\u0000O,upd$Zz'Y!\"e0\u001d荄\u0007",
-        "icon_key": "\u000fL\u0016~\u0011'](W\u0018뇂\u0004x􊧞Z\u0001봸\"\u001c=𨇚%捿x$󶵉􄂝Y@􃡊ཥ꒛7􂏉󸚑|rI󶳴𨙌[\u001e\tz\u0013r1g𗵊~嵙􄁝1\r𘕺p㥊𮪕i3$󽉏#󴝭f'\"㮐TK\u0017J\u0003o𩽴􇠐𐙨󷵸\u000epij𮐋󼉔?`𬢃oR􉔋~vi欕3Mc|\u0007^\"㠼kK𮖳c􉭜𡄕oiL􉌩~\u001b*𦏱\u000f{*,=𪖞𠄝g\u0013G=\u0019|\u0016A~􂇰qZ!𦸧\u0017M.kZBV󻷵\u0014𡽐\u000bI{𘘕q\u001e7𢲕B[e📹x<98{󵲨I?󼹊𠽴𣦓A\u0017,"
+        "icon_key": "\u000fL\u0016~\u0011'](W\u0018뇂\u0004x􊧞Z\u0001봸\"\u001c=𨇚%捿x$󶵉􄂝Y@􃡊ཥ꒛7􂏉󸚑|rI󶳴𨙌[\u001e\tz\u0013r1g𗵊~嵙􄁝1\r𘕺p㥊𮪕i3$󽉏#󴝭f'\"㮐TK\u0017J\u0003o𩽴􇠐𐙨󷵸\u000epij𮐋󼉔?`𬢃oR􉔋~vi欕3Mc|\u0007^\"㠼kK𮖳c􉭜𡄕oiL􉌩~\u001b*𦏱\u000f{*,=𪖞𠄝g\u0013G=\u0019|\u0016A~􂇰qZ!𦸧\u0017M.kZBV󻷵\u0014𡽐\u000bI{𘘕q\u001e7𢲕B[e📹x<98{󵲨I?󼹊𠽴𣦓A\u0017,",
+        "name": "d\u000f𪁤@o󱙾s&na𡐨􊖈𤟯|𔘯󸑴/󱞫v\u0015u\u0012f􋀈󷃠KC룪􄟵􂨺9_\u000b_^󿎖K𥽇\u000e Y*T\u0018􉒆<􂀆>𩾃ፁ\rt󽝓􅯾w2E🆆hS>\u0006_PQN,Vk\u0016􈩂=90\u00192e󰗦\u001fVA!\u0019\u001c\u0004e;𮕔1<H\u0002𮈉-\u00178{0󵏄\r\u0017\u000b~􂻬\u0004!Jg8\u001f,L􏋟􆫾􊺤\u000f\u000fkU𣁬􀶛\u0013𑠟TM{Hzq\r󰄠^\u0006'\rUD1etTd4qcW]𥰪J|s#(󴸯.􈢨f⢃\u0012\u0002)Th\u0018\u0007I)QvQ􌽵󸠋𧊖t'󳆙5\u0015𣣁􂅠e@nS:vB/𡂃𪕈/𗉄\r􍑱*n\u001e󠆅􂣰𬫂lvv53S󱴲j\u0014𗤜/.!6󾺗.\u001fg&\u0000O,upd$Zz'Y!\"e0\u001d荄\u0007"
     },
     "team": "000060cd-0000-2fae-0000-3620000011d4",
+    "time": "1864-06-07T17:44:20.841616476784Z",
     "type": "team.update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_5.json b/libs/wire-api/test/golden/testObject_Event_team_5.json
index d9cd1b795f3..3c8ba86488e 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_5.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_5.json
@@ -1,6 +1,6 @@
 {
-    "time": "1864-05-09T21:15:29.037488409172Z",
     "data": null,
     "team": "00004a61-0000-6721-0000-393c0000557b",
+    "time": "1864-05-09T21:15:29.037488409172Z",
     "type": "team.delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_6.json b/libs/wire-api/test/golden/testObject_Event_team_6.json
index ad6aa2c680f..5d3a5e0ec9f 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_6.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_6.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-05-16T06:23:02.245944146361Z",
     "data": {
         "user": "00005828-0000-7c47-0000-28ca00002f72"
     },
     "team": "00001122-0000-75f2-0000-199f000005de",
+    "time": "1864-05-16T06:23:02.245944146361Z",
     "type": "team.member-leave"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_7.json b/libs/wire-api/test/golden/testObject_Event_team_7.json
index 6233dbbc9cc..25061ecf6c5 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_7.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_7.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-05-12T13:33:11.712478663779Z",
     "data": {
         "conv": "00006249-0000-4204-0000-559700001694"
     },
     "team": "00005ca1-0000-57cd-0000-657100003904",
+    "time": "1864-05-12T13:33:11.712478663779Z",
     "type": "team.conversation-delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_8.json b/libs/wire-api/test/golden/testObject_Event_team_8.json
index 529b94134ca..e77d7a58585 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_8.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_8.json
@@ -1,8 +1,8 @@
 {
-    "time": "1864-04-19T01:15:18.509437360517Z",
     "data": {
         "icon_key": "t\u0000{1w{\\;󿻳6𓂞t?H\u0012쑞+,𨩙󹅾􊔹ⶉp'S􁏒Hv_Q\u0013\u001c𡲖W\u0016\u000er\u00153:\u0017􍩐X𢹲ﺸ\u0005y垳l\u000f􅷂1Lnu􎴽M𡋏,j\u0007-ᣛ\u0011D\u001cL\u0017𑀟{I,#\t\u001e\r𩵖ᔁiN\u0011\u001dV󷒚\u0000𫘼􊍜􆡣\u000b[N\u001c\u001a"
     },
     "team": "00003eac-0000-0c8d-0000-4c9400002023",
+    "time": "1864-04-19T01:15:18.509437360517Z",
     "type": "team.update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_team_9.json b/libs/wire-api/test/golden/testObject_Event_team_9.json
index e3f63b09fe2..699f2f7159e 100644
--- a/libs/wire-api/test/golden/testObject_Event_team_9.json
+++ b/libs/wire-api/test/golden/testObject_Event_team_9.json
@@ -1,6 +1,6 @@
 {
-    "time": "1864-05-05T12:42:00.165920284853Z",
     "data": null,
     "team": "000007e2-0000-025d-0000-4e57000052ad",
+    "time": "1864-05-05T12:42:00.165920284853Z",
     "type": "team.delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_1.json b/libs/wire-api/test/golden/testObject_Event_user_1.json
index 3f0251e28bc..13e5d72104d 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_1.json
@@ -1,15 +1,15 @@
 {
+    "conversation": "00005d81-0000-0d71-0000-1d8f00007d32",
+    "data": null,
+    "from": "00003b8b-0000-3395-0000-076a00007830",
     "qualified_conversation": {
         "domain": "faraway.example.com",
         "id": "00005d81-0000-0d71-0000-1d8f00007d32"
     },
-    "conversation": "00005d81-0000-0d71-0000-1d8f00007d32",
-    "time": "1864-05-22T09:51:07.104Z",
-    "data": null,
-    "from": "00003b8b-0000-3395-0000-076a00007830",
     "qualified_from": {
         "domain": "faraway.example.com",
         "id": "00003b8b-0000-3395-0000-076a00007830"
     },
+    "time": "1864-05-22T09:51:07.104Z",
     "type": "conversation.delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_10.json b/libs/wire-api/test/golden/testObject_Event_user_10.json
index 161e16c240b..3ec9ea0854c 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_10.json
@@ -1,109 +1,20 @@
 {
+    "conversation": "00005e43-0000-3b56-0000-7c270000538c",
+    "data": {
+        "email": "󲛚",
+        "message": "L",
+        "name": "fq",
+        "recipient": "00000008-0000-0000-0000-000600000001"
+    },
+    "from": "00007f28-0000-40b1-0000-56ab0000748d",
     "qualified_conversation": {
         "domain": "faraway.example.com",
-        "id": "000019e1-0000-1dc6-0000-68de0000246d"
-    },
-    "conversation": "000019e1-0000-1dc6-0000-68de0000246d",
-    "time": "1864-05-29T19:31:31.226Z",
-    "data": {
-        "access": [
-            "invite",
-            "private",
-            "link",
-            "invite",
-            "invite",
-            "invite",
-            "link"
-        ],
-        "creator": "00000000-0000-0000-0000-000200000001",
-        "access_role": "non_activated",
-        "members": {
-            "self": {
-                "hidden_ref": "",
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000000000001",
-                    "provider": "00000000-0000-0000-0000-000100000001"
-                },
-                "otr_muted_ref": "",
-                "conversation_role": "kf_7rcnb2oilvdmd9nelmwf52gikr4aqkhktyn5vjzg7lq1dnzym812q1innmegmx9a",
-                "status_time": "1970-01-01T00:00:00.000Z",
-                "hidden": true,
-                "status_ref": "0.0",
-                "id": "00000001-0000-0000-0000-000000000001",
-                "otr_archived": true,
-                "otr_muted_status": 0,
-                "otr_muted": false,
-                "otr_archived_ref": ""
-            },
-            "others": [
-                {
-                    "status": 0,
-                    "conversation_role": "4190csbyn6n7ooa8w4d7y9na9_a4m5hgvvmfnowu9zib_29nepamxsxl0gvq2hrfzp7obu_mtj43j0rd38jyd9r5j7xvf2ujge7s0pnt43g9cyal_ak2alwyf8uda",
-                    "qualified_id": {
-                        "domain": "golden.example.com",
-                        "id": "00000000-0000-0001-0000-000100000001"
-                    },
-                    "id": "00000000-0000-0001-0000-000100000001"
-                },
-                {
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0000-0000-000000000001",
-                        "provider": "00000000-0000-0001-0000-000000000000"
-                    },
-                    "conversation_role": "yv7zy3tkxrvz7aj3vvdv3e57pdi8euyuiatpvj48yl8ecw2xskacp737wl269wnts4rgbn1f93zbrkxs5oltt61e099wwzgztqpat4laqk6rqafvb_9aku2w",
-                    "qualified_id": {
-                        "domain": "golden.example.com",
-                        "id": "00000000-0000-0000-0000-000100000001"
-                    },
-                    "id": "00000000-0000-0000-0000-000100000001"
-                },
-                {
-                    "status": 0,
-                    "service": {
-                        "id": "00000000-0000-0001-0000-000000000001",
-                        "provider": "00000000-0000-0000-0000-000100000001"
-                    },
-                    "conversation_role": "zsltc_f04kycbem134adefbzjuyd7",
-                    "qualified_id": {
-                        "domain": "golden.example.com",
-                        "id": "00000001-0000-0001-0000-000100000001"
-                    },
-                    "id": "00000001-0000-0001-0000-000100000001"
-                },
-                {
-                    "status": 0,
-                    "service": {
-                        "id": "00000001-0000-0001-0000-000100000000",
-                        "provider": "00000001-0000-0000-0000-000000000001"
-                    },
-                    "conversation_role": "nm1gzd7dfqwcf_u3zfq991ylfmjavcs0s0gm6kjq532pjjflua6u5f_xk8dxm1t1g4s3mc2piv631phv19qvtix62s4q6_rc4xj5dh3wmoer_",
-                    "qualified_id": {
-                        "domain": "golden.example.com",
-                        "id": "00000001-0000-0001-0000-000000000001"
-                    },
-                    "id": "00000001-0000-0001-0000-000000000001"
-                }
-            ]
-        },
-        "name": "\u0007\u000e\r",
-        "team": "00000000-0000-0002-0000-000100000001",
-        "qualified_id": {
-            "domain": "golden.example.com",
-            "id": "00000000-0000-0000-0000-000100000001"
-        },
-        "id": "00000000-0000-0000-0000-000100000001",
-        "type": 0,
-        "receipt_mode": -1,
-        "last_event_time": "1970-01-01T00:00:00.000Z",
-        "message_timer": 283898987885780,
-        "last_event": "0.0"
+        "id": "00005e43-0000-3b56-0000-7c270000538c"
     },
-    "from": "00000457-0000-0689-0000-77a00000021c",
     "qualified_from": {
         "domain": "faraway.example.com",
-        "id": "00000457-0000-0689-0000-77a00000021c"
+        "id": "00007f28-0000-40b1-0000-56ab0000748d"
     },
-    "type": "conversation.create"
+    "time": "1864-05-25T01:31:49.802Z",
+    "type": "conversation.connect-request"
 }
diff --git a/libs/wire-api/test/golden/testObject_Event_user_11.json b/libs/wire-api/test/golden/testObject_Event_user_11.json
index 76ec1445449..8acfbce8fae 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_11.json
@@ -1,24 +1,30 @@
 {
+    "conversation": "0000303b-0000-23a9-0000-25de00002f80",
+    "data": {
+        "qualified_user_ids": [
+            {
+                "domain": "faraway.example.com",
+                "id": "00003fab-0000-40b8-0000-3b0c000014ef"
+            },
+            {
+                "domain": "faraway.example.com",
+                "id": "00001c48-0000-29ae-0000-62fc00001479"
+            }
+        ],
+        "user_ids": [
+            "00003fab-0000-40b8-0000-3b0c000014ef",
+            "00001c48-0000-29ae-0000-62fc00001479"
+        ]
+    },
+    "from": "000043a6-0000-1627-0000-490300002017",
     "qualified_conversation": {
         "domain": "faraway.example.com",
-        "id": "000031c2-0000-108c-0000-10a500000882"
-    },
-    "conversation": "000031c2-0000-108c-0000-10a500000882",
-    "time": "1864-05-03T06:49:41.178Z",
-    "data": {
-        "hidden_ref": "D",
-        "otr_muted_ref": "v󼡲",
-        "conversation_role": "spkf0ayk4c4obgc_l2lj54cljtj25ph",
-        "hidden": false,
-        "otr_archived": true,
-        "otr_muted_status": 0,
-        "otr_archived_ref": "v6",
-        "target": "00000001-0000-0002-0000-000100000000"
+        "id": "0000303b-0000-23a9-0000-25de00002f80"
     },
-    "from": "00005335-0000-2983-0000-46460000082f",
     "qualified_from": {
         "domain": "faraway.example.com",
-        "id": "00005335-0000-2983-0000-46460000082f"
+        "id": "000043a6-0000-1627-0000-490300002017"
     },
-    "type": "conversation.member-update"
-}
\ No newline at end of file
+    "time": "1864-04-12T01:28:25.705Z",
+    "type": "conversation.member-leave"
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_12.json b/libs/wire-api/test/golden/testObject_Event_user_12.json
index 67289f83ca6..ed2c38fb7c8 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_12.json
@@ -1,15 +1,38 @@
 {
+    "conversation": "00000838-0000-1bc6-0000-686d00003565",
+    "data": {
+        "user_ids": [
+            "00000055-0000-004d-0000-005100000037",
+            "00000001-0000-001f-0000-001500000009"
+        ],
+        "users": [
+            {
+                "conversation_role": "dlkagbmicz0f95d",
+                "id": "00000055-0000-004d-0000-005100000037",
+                "qualified_id": {
+                    "domain": "faraway.example.com",
+                    "id": "00000055-0000-004d-0000-005100000037"
+                }
+            },
+            {
+                "conversation_role": "2e",
+                "id": "00000001-0000-001f-0000-001500000009",
+                "qualified_id": {
+                    "domain": "faraway.example.com",
+                    "id": "00000001-0000-001f-0000-001500000009"
+                }
+            }
+        ]
+    },
+    "from": "0000114a-0000-7da8-0000-40cb00007fcf",
     "qualified_conversation": {
         "domain": "faraway.example.com",
-        "id": "00007474-0000-2a7b-0000-125900006ac9"
+        "id": "00000838-0000-1bc6-0000-686d00003565"
     },
-    "conversation": "00007474-0000-2a7b-0000-125900006ac9",
-    "time": "1864-05-23T17:16:29.326Z",
-    "data": null,
-    "from": "00000795-0000-709d-0000-11270000007a",
     "qualified_from": {
         "domain": "faraway.example.com",
-        "id": "00000795-0000-709d-0000-11270000007a"
+        "id": "0000114a-0000-7da8-0000-40cb00007fcf"
     },
-    "type": "conversation.delete"
-}
\ No newline at end of file
+    "time": "1864-05-12T20:29:47.483Z",
+    "type": "conversation.member-join"
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_13.json b/libs/wire-api/test/golden/testObject_Event_user_13.json
index aa4f5553bfe..73e10b007c6 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_13.json
@@ -1,20 +1,17 @@
 {
+    "conversation": "00000838-0000-1bc6-0000-686d00003565",
+    "data": {
+        "name": "New conversation name"
+    },
+    "from": "0000114a-0000-7da8-0000-40cb00007fcf",
     "qualified_conversation": {
         "domain": "faraway.example.com",
-        "id": "00006355-0000-5f6e-0000-592c0000680c"
-    },
-    "conversation": "00006355-0000-5f6e-0000-592c0000680c",
-    "time": "1864-05-21T03:22:42.926Z",
-    "data": {
-        "text": "󸈟\u001c!kO5",
-        "data": "sz",
-        "sender": "1f",
-        "recipient": "4"
+        "id": "00000838-0000-1bc6-0000-686d00003565"
     },
-    "from": "000029eb-0000-06f8-0000-514100000a84",
     "qualified_from": {
         "domain": "faraway.example.com",
-        "id": "000029eb-0000-06f8-0000-514100000a84"
+        "id": "0000114a-0000-7da8-0000-40cb00007fcf"
     },
-    "type": "conversation.otr-message-add"
-}
\ No newline at end of file
+    "time": "1864-05-12T20:29:47.483Z",
+    "type": "conversation.rename"
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_14.json b/libs/wire-api/test/golden/testObject_Event_user_14.json
index 4130d1084d8..2f32d7fdb37 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_14.json
@@ -1,17 +1,18 @@
 {
+    "conversation": "00000838-0000-1bc6-0000-686d00003565",
+    "data": {
+        "code": "lLz-9vR8ENum0kI-xWJs",
+        "key": "NEN=eLUWHXclTp=_2Nap"
+    },
+    "from": "0000114a-0000-7da8-0000-40cb00007fcf",
     "qualified_conversation": {
         "domain": "faraway.example.com",
-        "id": "00000b98-0000-618d-0000-19e200004651"
-    },
-    "conversation": "00000b98-0000-618d-0000-19e200004651",
-    "time": "1864-05-01T11:57:35.123Z",
-    "data": {
-        "receipt_mode": -10505
+        "id": "00000838-0000-1bc6-0000-686d00003565"
     },
-    "from": "00004bee-0000-45a0-0000-2c0300005726",
     "qualified_from": {
         "domain": "faraway.example.com",
-        "id": "00004bee-0000-45a0-0000-2c0300005726"
+        "id": "0000114a-0000-7da8-0000-40cb00007fcf"
     },
-    "type": "conversation.receipt-mode-update"
-}
\ No newline at end of file
+    "time": "1864-05-12T20:29:47.483Z",
+    "type": "conversation.code-update"
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_15.json b/libs/wire-api/test/golden/testObject_Event_user_15.json
deleted file mode 100644
index dec62fe4423..00000000000
--- a/libs/wire-api/test/golden/testObject_Event_user_15.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00005e43-0000-3b56-0000-7c270000538c"
-    },
-    "conversation": "00005e43-0000-3b56-0000-7c270000538c",
-    "time": "1864-05-25T01:31:49.802Z",
-    "data": {
-        "email": "󲛚",
-        "name": "fq",
-        "message": "L",
-        "recipient": "00000008-0000-0000-0000-000600000001"
-    },
-    "from": "00007f28-0000-40b1-0000-56ab0000748d",
-    "qualified_from": {
-        "domain": "faraway.example.com",
-        "id": "00007f28-0000-40b1-0000-56ab0000748d"
-    },
-    "type": "conversation.connect-request"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Event_user_16.json b/libs/wire-api/test/golden/testObject_Event_user_16.json
deleted file mode 100644
index e334d264c8d..00000000000
--- a/libs/wire-api/test/golden/testObject_Event_user_16.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00004b59-0000-55d6-0000-5aad00007373"
-    },
-    "conversation": "00004b59-0000-55d6-0000-5aad00007373",
-    "time": "1864-05-24T00:49:37.413Z",
-    "data": {
-        "access": [],
-        "access_role": "activated"
-    },
-    "from": "0000211e-0000-0b37-0000-563100003a5d",
-    "qualified_from": {
-        "domain": "faraway.example.com",
-        "id": "0000211e-0000-0b37-0000-563100003a5d"
-    },
-    "type": "conversation.access-update"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Event_user_17.json b/libs/wire-api/test/golden/testObject_Event_user_17.json
deleted file mode 100644
index cc17cded498..00000000000
--- a/libs/wire-api/test/golden/testObject_Event_user_17.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00006ac8-0000-1342-0000-76880000021d"
-    },
-    "conversation": "00006ac8-0000-1342-0000-76880000021d",
-    "time": "1864-04-17T07:39:54.846Z",
-    "data": {
-        "status": "stopped"
-    },
-    "from": "0000145f-0000-2ce0-0000-4ca800006c72",
-    "qualified_from": {
-        "domain": "faraway.example.com",
-        "id": "0000145f-0000-2ce0-0000-4ca800006c72"
-    },
-    "type": "conversation.typing"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Event_user_18.json b/libs/wire-api/test/golden/testObject_Event_user_18.json
deleted file mode 100644
index cc9cba5d5a9..00000000000
--- a/libs/wire-api/test/golden/testObject_Event_user_18.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "0000303b-0000-23a9-0000-25de00002f80"
-    },
-    "conversation": "0000303b-0000-23a9-0000-25de00002f80",
-    "time": "1864-04-12T01:28:25.705Z",
-    "data": {
-        "user_ids": [
-            "00003fab-0000-40b8-0000-3b0c000014ef",
-            "00001c48-0000-29ae-0000-62fc00001479",
-            "00003254-0000-4f74-0000-6fc400003a01",
-            "000051f3-0000-077d-0000-1b3d00003745",
-            "000073a6-0000-7dec-0000-673c00005911",
-            "0000535c-0000-3949-0000-14aa000076cb",
-            "0000095f-0000-696f-0000-5ee200000ace",
-            "00003861-0000-132e-0000-502500005207",
-            "00007be5-0000-251a-0000-469400006f8d",
-            "000078f6-0000-7e08-0000-56d10000390e",
-            "0000517f-0000-26ef-0000-24c100002ae0",
-            "000001c6-0000-16c9-0000-58ea00005d5e",
-            "0000485b-0000-208e-0000-272200005214",
-            "00004d24-0000-439c-0000-618c00001e77",
-            "000077b4-0000-74a4-0000-26570000353e",
-            "0000332a-0000-430c-0000-5fbc00001ca8",
-            "000059c9-0000-6597-0000-667a00005744",
-            "00005777-0000-7a37-0000-6e22000052d2",
-            "0000430d-0000-4970-0000-0a9c00007b88",
-            "0000530a-0000-305f-0000-71a0000035d4",
-            "000005b8-0000-2691-0000-3a6000007dfb",
-            "00003c9c-0000-0780-0000-7ad500001db8",
-            "0000679a-0000-59cf-0000-279100003e58",
-            "00005aba-0000-14f5-0000-5c2e0000642f",
-            "000016b2-0000-56e8-0000-584600006914"
-        ],
-        "qualified_user_ids": [
-            {
-                "domain": "faraway.example.com",
-                "id": "00003fab-0000-40b8-0000-3b0c000014ef"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00001c48-0000-29ae-0000-62fc00001479"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00003254-0000-4f74-0000-6fc400003a01"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000051f3-0000-077d-0000-1b3d00003745"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000073a6-0000-7dec-0000-673c00005911"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000535c-0000-3949-0000-14aa000076cb"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000095f-0000-696f-0000-5ee200000ace"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00003861-0000-132e-0000-502500005207"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00007be5-0000-251a-0000-469400006f8d"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000078f6-0000-7e08-0000-56d10000390e"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000517f-0000-26ef-0000-24c100002ae0"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000001c6-0000-16c9-0000-58ea00005d5e"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000485b-0000-208e-0000-272200005214"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00004d24-0000-439c-0000-618c00001e77"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000077b4-0000-74a4-0000-26570000353e"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000332a-0000-430c-0000-5fbc00001ca8"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000059c9-0000-6597-0000-667a00005744"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00005777-0000-7a37-0000-6e22000052d2"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000430d-0000-4970-0000-0a9c00007b88"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000530a-0000-305f-0000-71a0000035d4"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000005b8-0000-2691-0000-3a6000007dfb"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00003c9c-0000-0780-0000-7ad500001db8"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000679a-0000-59cf-0000-279100003e58"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00005aba-0000-14f5-0000-5c2e0000642f"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000016b2-0000-56e8-0000-584600006914"
-            }
-        ]
-    },
-    "from": "000043a6-0000-1627-0000-490300002017",
-    "qualified_from": {
-        "domain": "faraway.example.com",
-        "id": "000043a6-0000-1627-0000-490300002017"
-    },
-    "type": "conversation.member-leave"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Event_user_19.json b/libs/wire-api/test/golden/testObject_Event_user_19.json
deleted file mode 100644
index 4cee704eddf..00000000000
--- a/libs/wire-api/test/golden/testObject_Event_user_19.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00000838-0000-1bc6-0000-686d00003565"
-    },
-    "conversation": "00000838-0000-1bc6-0000-686d00003565",
-    "time": "1864-05-12T20:29:47.483Z",
-    "data": {
-        "users": [
-            {
-                "conversation_role": "dlkagbmicz0f95d",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000055-0000-004d-0000-005100000037"
-                },
-                "id": "00000055-0000-004d-0000-005100000037"
-            },
-            {
-                "conversation_role": "1me2in15nttjib_zx_qqx_c_mw4rw9bys2w4y78e6qhziu_85wj8vbnk6igkzld9unfvnl0oosp25i4btj6yehlq7q9em_mxsxodvq7nj_f5hqx",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "0000004c-0000-0051-0000-00220000005c"
-                },
-                "id": "0000004c-0000-0051-0000-00220000005c"
-            },
-            {
-                "conversation_role": "31664ffg5sx2690yu2059f7hij_m5vmb80kig21u4h3fe8uwfbshhgkdydiv_nwjm3mo4fprgxkizazcvax0vvxwcvdax",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000014-0000-0027-0000-003400000023"
-                },
-                "id": "00000014-0000-0027-0000-003400000023"
-            },
-            {
-                "conversation_role": "2e",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000001-0000-001f-0000-001500000009"
-                },
-                "id": "00000001-0000-001f-0000-001500000009"
-            },
-            {
-                "conversation_role": "f3nxp18px4kup3nrarx5wsp1o_eh69",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "0000005d-0000-0064-0000-00590000007d"
-                },
-                "id": "0000005d-0000-0064-0000-00590000007d"
-            },
-            {
-                "conversation_role": "fixso00nq4580z4ax9zs0sk3rej11c09rcj2ikbvnrg_io84n0eamqvwlz2icdo2u5jzzovta5j64kp0vg7e_21vs4r0hzv9",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000068-0000-007a-0000-005a0000006c"
-                },
-                "id": "00000068-0000-007a-0000-005a0000006c"
-            },
-            {
-                "conversation_role": "f9i5d2wd01ijp53en5bq8lch__jlnu8_v2xsgkctpin98byh1009f_v63",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000074-0000-0036-0000-00780000007d"
-                },
-                "id": "00000074-0000-0036-0000-00780000007d"
-            },
-            {
-                "conversation_role": "o_oqigzovv9oc2uxckvk5eofmc",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "0000001c-0000-000a-0000-004800000063"
-                },
-                "id": "0000001c-0000-000a-0000-004800000063"
-            },
-            {
-                "conversation_role": "5snj8s5t7nicihwspcp4sg4ny1pa1yb2s6601vjyxhksbciotoi_rvivybk1iviuz8buw",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000056-0000-0028-0000-004f00000079"
-                },
-                "id": "00000056-0000-0028-0000-004f00000079"
-            },
-            {
-                "conversation_role": "73e9u2hpffjb5ids29tbtcceg0i9v2",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "0000001e-0000-0054-0000-002300000053"
-                },
-                "id": "0000001e-0000-0054-0000-002300000053"
-            },
-            {
-                "conversation_role": "d2s4mc_qt1cc2rox8c9gak_qivlha7q259lsz7y5bz6dxsv8igx9r",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "0000004d-0000-0027-0000-007500000042"
-                },
-                "id": "0000004d-0000-0027-0000-007500000042"
-            },
-            {
-                "conversation_role": "7d84htzo4bc9250rer4r8p47ykbesgatuz8wwkoe1m2xnfljpwoi01025ti548frbvdmtykqq4pn1qsoc3s",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000050-0000-006e-0000-007000000057"
-                },
-                "id": "00000050-0000-006e-0000-007000000057"
-            },
-            {
-                "conversation_role": "v7ldb8mov4an62t6",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "0000007a-0000-003c-0000-005300000013"
-                },
-                "id": "0000007a-0000-003c-0000-005300000013"
-            },
-            {
-                "conversation_role": "k7uigpk1wwfc0mffoafjqf3dejctneh21zilaup19435zntvwu8kqd3l0k7s938ex2hf_n7_7dld5z604_if5z88f3u2w28qarfdcw5rkczk4jb4n",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000001-0000-0064-0000-005e00000072"
-                },
-                "id": "00000001-0000-0064-0000-005e00000072"
-            },
-            {
-                "conversation_role": "s6creybsl300lqkhu0wv_ikgattm3bd1r",
-                "qualified_id": {
-                    "domain": "faraway.example.com",
-                    "id": "00000020-0000-0012-0000-000500000036"
-                },
-                "id": "00000020-0000-0012-0000-000500000036"
-            }
-        ],
-        "user_ids": [
-            "00000055-0000-004d-0000-005100000037",
-            "0000004c-0000-0051-0000-00220000005c",
-            "00000014-0000-0027-0000-003400000023",
-            "00000001-0000-001f-0000-001500000009",
-            "0000005d-0000-0064-0000-00590000007d",
-            "00000068-0000-007a-0000-005a0000006c",
-            "00000074-0000-0036-0000-00780000007d",
-            "0000001c-0000-000a-0000-004800000063",
-            "00000056-0000-0028-0000-004f00000079",
-            "0000001e-0000-0054-0000-002300000053",
-            "0000004d-0000-0027-0000-007500000042",
-            "00000050-0000-006e-0000-007000000057",
-            "0000007a-0000-003c-0000-005300000013",
-            "00000001-0000-0064-0000-005e00000072",
-            "00000020-0000-0012-0000-000500000036"
-        ]
-    },
-    "from": "0000114a-0000-7da8-0000-40cb00007fcf",
-    "qualified_from": {
-        "domain": "faraway.example.com",
-        "id": "0000114a-0000-7da8-0000-40cb00007fcf"
-    },
-    "type": "conversation.member-join"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Event_user_2.json b/libs/wire-api/test/golden/testObject_Event_user_2.json
index 7232d9989ff..d59c7a6c87a 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_2.json
@@ -1,10 +1,5 @@
 {
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "0000064d-0000-7a7f-0000-5749000029e1"
-    },
     "conversation": "0000064d-0000-7a7f-0000-5749000029e1",
-    "time": "1864-06-05T23:01:18.769Z",
     "data": {
         "access": [
             "invite",
@@ -16,9 +11,14 @@
         "access_role": "activated"
     },
     "from": "00006a88-0000-2acb-0000-6aa0000061b2",
+    "qualified_conversation": {
+        "domain": "faraway.example.com",
+        "id": "0000064d-0000-7a7f-0000-5749000029e1"
+    },
     "qualified_from": {
         "domain": "faraway.example.com",
         "id": "00006a88-0000-2acb-0000-6aa0000061b2"
     },
+    "time": "1864-06-05T23:01:18.769Z",
     "type": "conversation.access-update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_20.json b/libs/wire-api/test/golden/testObject_Event_user_20.json
deleted file mode 100644
index 8b10ea681c6..00000000000
--- a/libs/wire-api/test/golden/testObject_Event_user_20.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00000c88-0000-433f-0000-669100006374"
-    },
-    "conversation": "00000c88-0000-433f-0000-669100006374",
-    "time": "1864-04-21T23:40:54.462Z",
-    "data": {
-        "user_ids": [
-            "00002e78-0000-23d9-0000-1cba00005025",
-            "00003293-0000-6991-0000-533700000e73",
-            "000075b1-0000-2e89-0000-6262000067a9",
-            "00007f94-0000-39fc-0000-28c5000028ed",
-            "000041f3-0000-3886-0000-735900007499",
-            "00004014-0000-675c-0000-688600003ed7",
-            "00002e75-0000-74cd-0000-529a000008c7",
-            "00000cea-0000-4b67-0000-4a2600007dae",
-            "00006b72-0000-1fae-0000-6647000025d0",
-            "00003c64-0000-4b1f-0000-7bc900001c31",
-            "00002cd3-0000-4520-0000-0d8c00004a16",
-            "00003e8f-0000-66a2-0000-067600002d8f",
-            "00004544-0000-0ce2-0000-1c2300007fbc",
-            "000071ef-0000-44f4-0000-7dc500002e5f",
-            "00007e40-0000-7f3a-0000-45a300002aee",
-            "00006eec-0000-4bb0-0000-271000001e9f",
-            "00001893-0000-272e-0000-5ccc0000561f",
-            "00004d81-0000-2d5f-0000-43ec00005771",
-            "00002521-0000-1a18-0000-3bc200005ce2",
-            "000005f2-0000-3b01-0000-070000005296",
-            "0000411b-0000-224b-0000-32650000061a",
-            "00004880-0000-3a0b-0000-56b10000398a",
-            "00002d6b-0000-4f28-0000-11110000309a",
-            "0000357d-0000-2963-0000-7bb000002734",
-            "00000f40-0000-657c-0000-7d25000019df",
-            "00006350-0000-630b-0000-5f560000503e"
-        ],
-        "qualified_user_ids": [
-            {
-                "domain": "faraway.example.com",
-                "id": "00002e78-0000-23d9-0000-1cba00005025"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00003293-0000-6991-0000-533700000e73"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000075b1-0000-2e89-0000-6262000067a9"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00007f94-0000-39fc-0000-28c5000028ed"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000041f3-0000-3886-0000-735900007499"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00004014-0000-675c-0000-688600003ed7"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00002e75-0000-74cd-0000-529a000008c7"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00000cea-0000-4b67-0000-4a2600007dae"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00006b72-0000-1fae-0000-6647000025d0"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00003c64-0000-4b1f-0000-7bc900001c31"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00002cd3-0000-4520-0000-0d8c00004a16"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00003e8f-0000-66a2-0000-067600002d8f"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00004544-0000-0ce2-0000-1c2300007fbc"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000071ef-0000-44f4-0000-7dc500002e5f"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00007e40-0000-7f3a-0000-45a300002aee"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00006eec-0000-4bb0-0000-271000001e9f"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00001893-0000-272e-0000-5ccc0000561f"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00004d81-0000-2d5f-0000-43ec00005771"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00002521-0000-1a18-0000-3bc200005ce2"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "000005f2-0000-3b01-0000-070000005296"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000411b-0000-224b-0000-32650000061a"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00004880-0000-3a0b-0000-56b10000398a"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00002d6b-0000-4f28-0000-11110000309a"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "0000357d-0000-2963-0000-7bb000002734"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00000f40-0000-657c-0000-7d25000019df"
-            },
-            {
-                "domain": "faraway.example.com",
-                "id": "00006350-0000-630b-0000-5f560000503e"
-            }
-        ]
-    },
-    "from": "00007547-0000-26d8-0000-52280000157c",
-    "qualified_from": {
-        "domain": "faraway.example.com",
-        "id": "00007547-0000-26d8-0000-52280000157c"
-    },
-    "type": "conversation.member-leave"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Event_user_3.json b/libs/wire-api/test/golden/testObject_Event_user_3.json
index 477819a2684..75a8c01dbf8 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_3.json
@@ -1,20 +1,20 @@
 {
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00006f8c-0000-00d6-0000-1568000001e9"
-    },
     "conversation": "00006f8c-0000-00d6-0000-1568000001e9",
-    "time": "1864-04-27T15:44:23.844Z",
     "data": {
-        "text": "",
         "data": ">脈\u000f睸",
+        "recipient": "f",
         "sender": "c",
-        "recipient": "f"
+        "text": ""
     },
     "from": "00004b11-0000-5504-0000-55d800002188",
+    "qualified_conversation": {
+        "domain": "faraway.example.com",
+        "id": "00006f8c-0000-00d6-0000-1568000001e9"
+    },
     "qualified_from": {
         "domain": "faraway.example.com",
         "id": "00004b11-0000-5504-0000-55d800002188"
     },
+    "time": "1864-04-27T15:44:23.844Z",
     "type": "conversation.otr-message-add"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_4.json b/libs/wire-api/test/golden/testObject_Event_user_4.json
index 7aea91abb15..6f36b4f5bff 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_4.json
@@ -1,15 +1,15 @@
 {
+    "conversation": "00004f04-0000-3939-0000-472d0000316b",
+    "data": null,
+    "from": "00007c90-0000-766a-0000-01b700002ab7",
     "qualified_conversation": {
         "domain": "faraway.example.com",
         "id": "00004f04-0000-3939-0000-472d0000316b"
     },
-    "conversation": "00004f04-0000-3939-0000-472d0000316b",
-    "time": "1864-05-12T00:59:09.200Z",
-    "data": null,
-    "from": "00007c90-0000-766a-0000-01b700002ab7",
     "qualified_from": {
         "domain": "faraway.example.com",
         "id": "00007c90-0000-766a-0000-01b700002ab7"
     },
+    "time": "1864-05-12T00:59:09.200Z",
     "type": "conversation.code-delete"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_5.json b/libs/wire-api/test/golden/testObject_Event_user_5.json
index 383635ba15a..75ee1c2d97d 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_5.json
@@ -1,22 +1,22 @@
 {
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00003c8c-0000-6394-0000-294b0000098b"
-    },
     "conversation": "00003c8c-0000-6394-0000-294b0000098b",
-    "time": "1864-04-12T03:04:00.298Z",
     "data": {
-        "hidden_ref": "\u0008\t\u0018",
-        "otr_muted_ref": "𗋭",
         "conversation_role": "_smrwzjjyq92t3t9u1pettcfiga699uz98rpzdt4lviu8x9iv1di4uiebz2gmrxor2_g0mfzzsfonqvc",
+        "hidden_ref": "\u0008\t\u0018",
         "otr_archived": false,
+        "otr_archived_ref": "\u0001J",
         "otr_muted": false,
-        "otr_archived_ref": "\u0001J"
+        "otr_muted_ref": "𗋭"
     },
     "from": "00002a12-0000-73e1-0000-71f700002ec9",
+    "qualified_conversation": {
+        "domain": "faraway.example.com",
+        "id": "00003c8c-0000-6394-0000-294b0000098b"
+    },
     "qualified_from": {
         "domain": "faraway.example.com",
         "id": "00002a12-0000-73e1-0000-71f700002ec9"
     },
+    "time": "1864-04-12T03:04:00.298Z",
     "type": "conversation.member-update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_6.json b/libs/wire-api/test/golden/testObject_Event_user_6.json
index aff5c1fa549..a37ab33ba73 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_6.json
@@ -1,17 +1,17 @@
 {
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00001fdb-0000-3127-0000-23ef00007183"
-    },
     "conversation": "00001fdb-0000-3127-0000-23ef00007183",
-    "time": "1864-05-09T05:44:41.382Z",
     "data": {
         "message_timer": 5029817038083912
     },
     "from": "0000705a-0000-0b62-0000-425c000049c8",
+    "qualified_conversation": {
+        "domain": "faraway.example.com",
+        "id": "00001fdb-0000-3127-0000-23ef00007183"
+    },
     "qualified_from": {
         "domain": "faraway.example.com",
         "id": "0000705a-0000-0b62-0000-425c000049c8"
     },
+    "time": "1864-05-09T05:44:41.382Z",
     "type": "conversation.message-timer-update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_7.json b/libs/wire-api/test/golden/testObject_Event_user_7.json
index a22dea6898d..f2986124dd4 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_7.json
@@ -1,17 +1,17 @@
 {
-    "qualified_conversation": {
-        "domain": "faraway.example.com",
-        "id": "00006ac1-0000-543e-0000-7c8f00000be7"
-    },
     "conversation": "00006ac1-0000-543e-0000-7c8f00000be7",
-    "time": "1864-04-18T05:01:13.761Z",
     "data": {
         "status": "stopped"
     },
     "from": "0000355a-0000-2979-0000-083000002d5e",
+    "qualified_conversation": {
+        "domain": "faraway.example.com",
+        "id": "00006ac1-0000-543e-0000-7c8f00000be7"
+    },
     "qualified_from": {
         "domain": "faraway.example.com",
         "id": "0000355a-0000-2979-0000-083000002d5e"
     },
+    "time": "1864-04-18T05:01:13.761Z",
     "type": "conversation.typing"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_8.json b/libs/wire-api/test/golden/testObject_Event_user_8.json
index 6ef386c6d8a..ea54d696e4a 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_8.json
@@ -1,15 +1,70 @@
 {
+    "conversation": "000019e1-0000-1dc6-0000-68de0000246d",
+    "data": {
+        "access": [
+            "invite",
+            "private",
+            "link",
+            "invite",
+            "invite",
+            "invite",
+            "link"
+        ],
+        "access_role": "non_activated",
+        "creator": "00000000-0000-0000-0000-000200000001",
+        "id": "00000000-0000-0000-0000-000100000001",
+        "last_event": "0.0",
+        "last_event_time": "1970-01-01T00:00:00.000Z",
+        "members": {
+            "others": [
+                {
+                    "conversation_role": "4190csbyn6n7ooa8w4d7y9na9_a4m5hgvvmfnowu9zib_29nepamxsxl0gvq2hrfzp7obu_mtj43j0rd38jyd9r5j7xvf2ujge7s0pnt43g9cyal_ak2alwyf8uda",
+                    "id": "00000000-0000-0001-0000-000100000001",
+                    "qualified_id": {
+                        "domain": "golden.example.com",
+                        "id": "00000000-0000-0001-0000-000100000001"
+                    },
+                    "status": 0
+                }
+            ],
+            "self": {
+                "conversation_role": "kf_7rcnb2oilvdmd9nelmwf52gikr4aqkhktyn5vjzg7lq1dnzym812q1innmegmx9a",
+                "hidden": true,
+                "hidden_ref": "",
+                "id": "00000001-0000-0000-0000-000000000001",
+                "otr_archived": true,
+                "otr_archived_ref": "",
+                "otr_muted": false,
+                "otr_muted_ref": "",
+                "otr_muted_status": 0,
+                "service": {
+                    "id": "00000001-0000-0000-0000-000000000001",
+                    "provider": "00000000-0000-0000-0000-000100000001"
+                },
+                "status": 0,
+                "status_ref": "0.0",
+                "status_time": "1970-01-01T00:00:00.000Z"
+            }
+        },
+        "message_timer": 283898987885780,
+        "name": "\u0007\u000e\r",
+        "qualified_id": {
+            "domain": "golden.example.com",
+            "id": "00000000-0000-0000-0000-000100000001"
+        },
+        "receipt_mode": -1,
+        "team": "00000000-0000-0002-0000-000100000001",
+        "type": 0
+    },
+    "from": "00000457-0000-0689-0000-77a00000021c",
     "qualified_conversation": {
         "domain": "faraway.example.com",
-        "id": "00000892-0000-53c7-0000-0c870000027a"
+        "id": "000019e1-0000-1dc6-0000-68de0000246d"
     },
-    "conversation": "00000892-0000-53c7-0000-0c870000027a",
-    "time": "1864-06-08T15:19:01.916Z",
-    "data": null,
-    "from": "000008e8-0000-43fa-0000-4dd1000034cc",
     "qualified_from": {
         "domain": "faraway.example.com",
-        "id": "000008e8-0000-43fa-0000-4dd1000034cc"
+        "id": "00000457-0000-0689-0000-77a00000021c"
     },
-    "type": "conversation.code-delete"
-}
\ No newline at end of file
+    "time": "1864-05-29T19:31:31.226Z",
+    "type": "conversation.create"
+}
diff --git a/libs/wire-api/test/golden/testObject_Event_user_9.json b/libs/wire-api/test/golden/testObject_Event_user_9.json
index b3ce97a8c3a..0a3d4d640af 100644
--- a/libs/wire-api/test/golden/testObject_Event_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Event_user_9.json
@@ -1,26 +1,17 @@
 {
+    "conversation": "00000b98-0000-618d-0000-19e200004651",
+    "data": {
+        "receipt_mode": -10505
+    },
+    "from": "00004bee-0000-45a0-0000-2c0300005726",
     "qualified_conversation": {
         "domain": "faraway.example.com",
-        "id": "00004847-0000-1eb9-0000-2973000039ca"
-    },
-    "conversation": "00004847-0000-1eb9-0000-2973000039ca",
-    "time": "1864-05-21T16:22:14.886Z",
-    "data": {
-        "access": [
-            "private",
-            "private",
-            "private",
-            "link",
-            "invite",
-            "link",
-            "code"
-        ],
-        "access_role": "non_activated"
+        "id": "00000b98-0000-618d-0000-19e200004651"
     },
-    "from": "000044e3-0000-1c36-0000-42fd00006e01",
     "qualified_from": {
         "domain": "faraway.example.com",
-        "id": "000044e3-0000-1c36-0000-42fd00006e01"
+        "id": "00004bee-0000-45a0-0000-2c0300005726"
     },
-    "type": "conversation.access-update"
-}
\ No newline at end of file
+    "time": "1864-05-01T11:57:35.123Z",
+    "type": "conversation.receipt-mode-update"
+}
diff --git a/libs/wire-api/test/golden/testObject_FeatureConfigEvent_1.json b/libs/wire-api/test/golden/testObject_FeatureConfigEvent_1.json
index ce5cbb0efd9..ab643fe798e 100644
--- a/libs/wire-api/test/golden/testObject_FeatureConfigEvent_1.json
+++ b/libs/wire-api/test/golden/testObject_FeatureConfigEvent_1.json
@@ -4,4 +4,4 @@
     },
     "name": "fileSharing",
     "type": "feature-config.update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_FeatureConfigEvent_2.json b/libs/wire-api/test/golden/testObject_FeatureConfigEvent_2.json
index a031e4ef19a..a89478db31e 100644
--- a/libs/wire-api/test/golden/testObject_FeatureConfigEvent_2.json
+++ b/libs/wire-api/test/golden/testObject_FeatureConfigEvent_2.json
@@ -4,4 +4,4 @@
     },
     "name": "sso",
     "type": "feature-config.update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_FeatureConfigEvent_3.json b/libs/wire-api/test/golden/testObject_FeatureConfigEvent_3.json
index 6f816b38c3f..2a7c5fdfe0b 100644
--- a/libs/wire-api/test/golden/testObject_FeatureConfigEvent_3.json
+++ b/libs/wire-api/test/golden/testObject_FeatureConfigEvent_3.json
@@ -1,11 +1,11 @@
 {
     "data": {
-        "status": "disabled",
         "config": {
             "enforceAppLock": true,
             "inactivityTimeoutSecs": 300
-        }
+        },
+        "status": "disabled"
     },
     "name": "appLock",
     "type": "feature-config.update"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_1.json b/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_1.json
index 57dfcf1da08..a1bcedd6637 100644
--- a/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_1.json
+++ b/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_1.json
@@ -1,3 +1,3 @@
 {
     "size": 50
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_2.json b/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_2.json
index 5de0d4bea98..156958234e3 100644
--- a/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_2.json
+++ b/libs/wire-api/test/golden/testObject_GetPaginatedConversationIds_2.json
@@ -1,4 +1,4 @@
 {
-    "size": 1000,
-    "paging_state": "AA=="
-}
\ No newline at end of file
+    "paging_state": "AA==",
+    "size": 1000
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_1.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_1.json
index afb4f0e354b..b1002540cf1 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "handle": ")QH)SN"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_10.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_10.json
index 793b04a78bb..889848340f2 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_10.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_10.json
@@ -1,3 +1,3 @@
 {
     "handle": "@𠤤􈉚!5f\u0000;jSES"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_11.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_11.json
index c29f0119a5a..66eddf511ce 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_11.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_11.json
@@ -1,3 +1,3 @@
 {
     "handle": "󶕾\u001e/f7w"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_12.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_12.json
index 98b0cde01a5..7a176ab3461 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_12.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_12.json
@@ -1,3 +1,3 @@
 {
     "handle": "\u00042|\u0000#낏_\u0011=\u0010\u001e8`🤥%0/\u0007%+\u0010󶱬8􀽯@'󶜾"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_13.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_13.json
index 5633f18fdae..41fe7997139 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_13.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_13.json
@@ -1,3 +1,3 @@
 {
     "handle": "\u001e󳎙0\u001c\u0012󾥔iD\u0012\u0019q𡟈L􁰓󴦻-yYL#q⫱*"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_14.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_14.json
index 9d2e4affbe8..1019f912d86 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_14.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_14.json
@@ -1,3 +1,3 @@
 {
     "handle": "!H\u000b_\u0015\u0012儕"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_15.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_15.json
index 1b56afe9c81..d26d0cb8ef4 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_15.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_15.json
@@ -1,3 +1,3 @@
 {
     "handle": "\u0003\u001fb󼕏{\u0005𤤍Z~5󵽂6\u0017a=󴥻󸚙𢛉`\u0012"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_16.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_16.json
index 19caa88d006..eb0be8471bf 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_16.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_16.json
@@ -1,3 +1,3 @@
 {
     "handle": ")\u001fqpn𤆞벻6xO("
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_17.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_17.json
index 752adb4d93d..526fbdb5538 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_17.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_17.json
@@ -1,3 +1,3 @@
 {
     "handle": "VA/`󰋔\u001eF\u0017q\u0015rx𒊛"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_18.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_18.json
index 7d746d821f3..27bb92ea820 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_18.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_18.json
@@ -1,3 +1,3 @@
 {
     "handle": "f֯𦰟\u001b\u001cm𦰹"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_19.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_19.json
index 4e6f1433bb1..6fa5b97388a 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_19.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_19.json
@@ -1,3 +1,3 @@
 {
     "handle": "􅎳󵯲]U\u000e󸦈\n𨚽𪮱B𣖀 p𧐂\u0010\u0010󰊧|CJAq"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_2.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_2.json
index 9437967159d..50edd8440c9 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_2.json
@@ -1,3 +1,3 @@
 {
     "handle": "쪆󶌺\\\u0002X<O:Y=\u0018𪃌􌒐pA\n,\u000c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_20.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_20.json
index 98bb8b17332..b62dc621720 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_20.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_20.json
@@ -1,3 +1,3 @@
 {
     "handle": "􃿲󼐋i\u0014?􂵃󺨡4X\u001c\n\u0014"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_3.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_3.json
index e588f9aea96..1d01a494988 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_3.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_3.json
@@ -1,3 +1,3 @@
 {
     "handle": "\u001a2\u001a󽈀\u000f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_4.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_4.json
index d2cd8710ce7..dbbeb4ab397 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_4.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_4.json
@@ -1,3 +1,3 @@
 {
     "handle": "I?𥑙\u0013\u001eꔗ􌋋􉶦"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_5.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_5.json
index b3845212a64..3c9c4b39b7d 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_5.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_5.json
@@ -1,3 +1,3 @@
 {
     "handle": "\u001a0󱎓㓪𛆙𨅹\u0001\u0006Ὣ𬁐e􌒢c\u0001I"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_6.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_6.json
index 08d06b68d06..4dcc4ab6178 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_6.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_6.json
@@ -1,3 +1,3 @@
 {
     "handle": "ao\u0001=\u000b\u001bD\nK𭁎𨗹𭶾z(LD\u0018􅃊𧫯𓎋n\"UM\u0005\u000f*"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_7.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_7.json
index ecc13d284d2..00f3655f477 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_7.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_7.json
@@ -1,3 +1,3 @@
 {
     "handle": "2H\u0010%O2U𖾇\u0014\u0005H*\\𡴓𣡌Lhp"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_8.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_8.json
index 32bdc5fa8e8..d110343c7b4 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_8.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_8.json
@@ -1,3 +1,3 @@
 {
     "handle": "@\u000f􀽖\u0005]T(𑄏\u0001󳩾H9%%l8􉥘󱻤\u001d\u0006|\u0005&ps\\\u001e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_HandleUpdate_user_9.json b/libs/wire-api/test/golden/testObject_HandleUpdate_user_9.json
index 1caf3e47dc3..8c2e051e0ee 100644
--- a/libs/wire-api/test/golden/testObject_HandleUpdate_user_9.json
+++ b/libs/wire-api/test/golden/testObject_HandleUpdate_user_9.json
@@ -1,3 +1,3 @@
 {
     "handle": "꜋*|􋫕P\u000f(\u000f󴚬(􍺔Q<?\n{\u0017 w#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_1.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_1.json
index 82be2b496a5..fbe6adc54e9 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_1.json
@@ -1 +1 @@
-"RUne0vse27qsm5jxGmL0xQaeuEOqcqr65rU="
\ No newline at end of file
+"RUne0vse27qsm5jxGmL0xQaeuEOqcqr65rU="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_10.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_10.json
index e6fd72a680e..7faac4c5ae3 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_10.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_10.json
@@ -1 +1 @@
-"Ts_qqqR28DY45TFogbSj_r6zucCScCei"
\ No newline at end of file
+"Ts_qqqR28DY45TFogbSj_r6zucCScCei"
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_11.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_11.json
index cb69cc306cd..45749f24f42 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_11.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_11.json
@@ -1 +1 @@
-"OBrWOSrGo9kzEiYcLa3APM6WwDEC"
\ No newline at end of file
+"OBrWOSrGo9kzEiYcLa3APM6WwDEC"
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_12.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_12.json
index 26e85e59e30..c39d31cb94e 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_12.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_12.json
@@ -1 +1 @@
-"K1SuIMYMcZvuRSCazOsbQyv6-AD1GqQ="
\ No newline at end of file
+"K1SuIMYMcZvuRSCazOsbQyv6-AD1GqQ="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_13.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_13.json
index 2e664766d12..ed9c56fc0d3 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_13.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_13.json
@@ -1 +1 @@
-"fDBjTyGqA80aVYoxz6beTfpxVn7KPFA="
\ No newline at end of file
+"fDBjTyGqA80aVYoxz6beTfpxVn7KPFA="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_14.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_14.json
index 9382c3ffc84..98064d1d9d2 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_14.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_14.json
@@ -1 +1 @@
-"f-s="
\ No newline at end of file
+"f-s="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_15.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_15.json
index 3cc762b5501..e16c76dff88 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_15.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_15.json
@@ -1 +1 @@
-""
\ No newline at end of file
+""
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_16.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_16.json
index 5705302576a..e3b5fc780e4 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_16.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_16.json
@@ -1 +1 @@
-"JYFRObZQLGag5fvn-w=="
\ No newline at end of file
+"JYFRObZQLGag5fvn-w=="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_17.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_17.json
index 1840bd39e52..aedd5f6a0fb 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_17.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_17.json
@@ -1 +1 @@
-"bH0uavRmmjBrnJoygpAPeQ=="
\ No newline at end of file
+"bH0uavRmmjBrnJoygpAPeQ=="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_18.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_18.json
index a994a6f445a..914a30b4ff9 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_18.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_18.json
@@ -1 +1 @@
-"YwE="
\ No newline at end of file
+"YwE="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_19.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_19.json
index ac0af02359d..f27a72f0112 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_19.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_19.json
@@ -1 +1 @@
-"_ZpeIeHxSAVQ_4g904i-jpm9ygqKeg=="
\ No newline at end of file
+"_ZpeIeHxSAVQ_4g904i-jpm9ygqKeg=="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_2.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_2.json
index d4b3143773d..95e668f8e5e 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_2.json
@@ -1 +1 @@
-"4Zxb50Taj6g2Cdhdpo6TE18L"
\ No newline at end of file
+"4Zxb50Taj6g2Cdhdpo6TE18L"
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_20.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_20.json
index 372ddc09cd8..2fbc5c02726 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_20.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_20.json
@@ -1 +1 @@
-"wBibAg=="
\ No newline at end of file
+"wBibAg=="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_3.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_3.json
index 4820a8c1c27..049a26cea9e 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_3.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_3.json
@@ -1 +1 @@
-"j-G82ks0MYiz_gOEUvVpWa3V6bpuP5UcUhc7"
\ No newline at end of file
+"j-G82ks0MYiz_gOEUvVpWa3V6bpuP5UcUhc7"
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_4.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_4.json
index 5f73081d77a..403d6a20298 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_4.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_4.json
@@ -1 +1 @@
-"sLBqu6Bs8L_augCOf-UQ"
\ No newline at end of file
+"sLBqu6Bs8L_augCOf-UQ"
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_5.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_5.json
index 3cc762b5501..e16c76dff88 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_5.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_5.json
@@ -1 +1 @@
-""
\ No newline at end of file
+""
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_6.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_6.json
index c2574274156..96cb0a93caf 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_6.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_6.json
@@ -1 +1 @@
-"0y-7KQ=="
\ No newline at end of file
+"0y-7KQ=="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_7.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_7.json
index 8984925a0a0..6c7173b355e 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_7.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_7.json
@@ -1 +1 @@
-"C8hR7dkwQ8V9Rryx-EeAnHA="
\ No newline at end of file
+"C8hR7dkwQ8V9Rryx-EeAnHA="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_8.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_8.json
index fc2d3415c71..b75948c31a1 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_8.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_8.json
@@ -1 +1 @@
-"-Oj_2VAtOI_kSg=="
\ No newline at end of file
+"-Oj_2VAtOI_kSg=="
diff --git a/libs/wire-api/test/golden/testObject_InvitationCode_user_9.json b/libs/wire-api/test/golden/testObject_InvitationCode_user_9.json
index 7996233ed67..7a03c2419b6 100644
--- a/libs/wire-api/test/golden/testObject_InvitationCode_user_9.json
+++ b/libs/wire-api/test/golden/testObject_InvitationCode_user_9.json
@@ -1 +1 @@
-"KguCogw-Yw=="
\ No newline at end of file
+"KguCogw-Yw=="
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_1.json b/libs/wire-api/test/golden/testObject_InvitationList_team_1.json
index dd0c055a64c..40d772b4df6 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_1.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_1.json
@@ -1,4 +1,4 @@
 {
-    "invitations": [],
-    "has_more": false
-}
\ No newline at end of file
+    "has_more": false,
+    "invitations": []
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_10.json b/libs/wire-api/test/golden/testObject_InvitationList_team_10.json
index 70aa057e857..f5a607418e0 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_10.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_10.json
@@ -1,15 +1,15 @@
 {
+    "has_more": true,
     "invitations": [
         {
+            "created_at": "1864-05-08T17:28:36.896Z",
+            "created_by": "00000001-0000-0001-0000-000000000000",
             "email": "}@",
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "P𥖧\u0006'e\u0010\u001d\"\u0011K󽗨Fcvm[\"Sc}U𑊒􂌨󿔟~!E􀖇\u000bV",
             "phone": null,
             "role": "member",
-            "created_by": "00000001-0000-0001-0000-000000000000",
-            "name": "P𥖧\u0006'e\u0010\u001d\"\u0011K󽗨Fcvm[\"Sc}U𑊒􂌨󿔟~!E􀖇\u000bV",
-            "created_at": "1864-05-08T17:28:36.896Z",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000000-0000-0000-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000100000000"
         }
-    ],
-    "has_more": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_11.json b/libs/wire-api/test/golden/testObject_InvitationList_team_11.json
index b90823ae08b..621efe7906c 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_11.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_11.json
@@ -1,15 +1,15 @@
 {
+    "has_more": true,
     "invitations": [
         {
+            "created_at": "1864-05-08T01:33:08.374Z",
+            "created_by": "00000001-0000-0000-0000-000000000000",
             "email": "@Z",
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "G\\,\u0000=ෝI-w󠀹}𠉭抳-92\u0013@\u0006\u001f\\F\u001a\"-r꒫6\u000fඬ\u001f*}c󼘹\u001f\u0007T8m@旅M\u0012#MIq\r4nW􍦐y\u0005Ud룫#𫶒5\n\u0002V]𨡀\"<OI~e扚M~𬞧\u001f{/|T𦽊y$\u0004\u001d 􍠁}~[!𧳸j0󳈒~𗌡",
             "phone": "+5208043225346",
             "role": "admin",
-            "created_by": "00000001-0000-0000-0000-000000000000",
-            "name": "G\\,\u0000=ෝI-w󠀹}𠉭抳-92\u0013@\u0006\u001f\\F\u001a\"-r꒫6\u000fඬ\u001f*}c󼘹\u001f\u0007T8m@旅M\u0012#MIq\r4nW􍦐y\u0005Ud룫#𫶒5\n\u0002V]𨡀\"<OI~e扚M~𬞧\u001f{/|T𦽊y$\u0004\u001d 􍠁}~[!𧳸j0󳈒~𗌡",
-            "created_at": "1864-05-08T01:33:08.374Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000000000001"
+            "team": "00000000-0000-0001-0000-000100000001"
         }
-    ],
-    "has_more": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_12.json b/libs/wire-api/test/golden/testObject_InvitationList_team_12.json
index dd0c055a64c..40d772b4df6 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_12.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_12.json
@@ -1,4 +1,4 @@
 {
-    "invitations": [],
-    "has_more": false
-}
\ No newline at end of file
+    "has_more": false,
+    "invitations": []
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_13.json b/libs/wire-api/test/golden/testObject_InvitationList_team_13.json
index dad80ba5a75..698a980c035 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_13.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_13.json
@@ -1,75 +1,75 @@
 {
+    "has_more": false,
     "invitations": [
         {
+            "created_at": "1864-05-09T04:37:12.563Z",
+            "created_by": "00000001-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": null,
             "phone": "+62353188857",
             "role": "partner",
-            "created_by": "00000001-0000-0000-0000-000000000001",
-            "name": null,
-            "created_at": "1864-05-09T04:37:12.563Z",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "id": "00000001-0000-0001-0000-000100000000"
+            "team": "00000001-0000-0000-0000-000000000000"
         },
         {
+            "created_at": "1864-05-09T05:36:38.967Z",
+            "created_by": "00000000-0000-0000-0000-000100000000",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "󲳮\u0015w/􀾖.f󵹮-󻢋\u0011N\t쀧\\XM\u0017{i쉿𭄌𣌄\u0007𘨀\tyz􉩊#s􊩴{<𪴋\u00143-𦢸􍽲:e\u001c􅈵}\u001a!􏡾bc\u000bq{㞢)󾍣[\u0003BSQC",
             "phone": "+999942131912804",
             "role": "owner",
-            "created_by": "00000000-0000-0000-0000-000100000000",
-            "name": "󲳮\u0015w/􀾖.f󵹮-󻢋\u0011N\t쀧\\XM\u0017{i쉿𭄌𣌄\u0007𘨀\tyz􉩊#s􊩴{<𪴋\u00143-𦢸􍽲:e\u001c􅈵}\u001a!􏡾bc\u000bq{㞢)󾍣[\u0003BSQC",
-            "created_at": "1864-05-09T05:36:38.967Z",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T17:31:07.346Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "􍆄𩕊􎈃𘢭eG\u0002󵹍\r𪚵⣉/槡<ࣞ '〪\u001d\t.\u0004_o_\u0002\u000fH\u0000\n\u000b\u0000n 􋇵\u001e",
             "phone": "+07115371093",
             "role": "partner",
-            "created_by": null,
-            "name": "􍆄𩕊􎈃𘢭eG\u0002󵹍\r𪚵⣉/槡<ࣞ '〪\u001d\t.\u0004_o_\u0002\u000fH\u0000\n\u000b\u0000n 􋇵\u001e",
-            "created_at": "1864-05-09T17:31:07.346Z",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000001-0000-0000-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T17:18:26.847Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "𢩼;e壘\u0001Qz\u0004\u0007􍎽w(h!𩸕\u0010x𪒢.]􂅴 fs*𫦑{nazI\u0005󰶦`굗?拃\u0011,W\n\u000fI\u0011I韞\u0015l8􃙦*&😡?􍬓/􎉴7Zp\u0015􅎭?WC\u000bZ󵨻IBxk𤐶\u0005􅙲 15􁔻\u000f#2\u0019G^w`\u0015觽􈣺􃤹:|M\u0008𮐽J&",
             "phone": "+13664001",
             "role": "partner",
-            "created_by": null,
-            "name": "𢩼;e壘\u0001Qz\u0004\u0007􍎽w(h!𩸕\u0010x𪒢.]􂅴 fs*𫦑{nazI\u0005󰶦`굗?拃\u0011,W\n\u000fI\u0011I韞\u0015l8􃙦*&😡?􍬓/􎉴7Zp\u0015􅎭?WC\u000bZ󵨻IBxk𤐶\u0005􅙲 15􁔻\u000f#2\u0019G^w`\u0015觽􈣺􃤹:|M\u0008𮐽J&",
-            "created_at": "1864-05-09T17:18:26.847Z",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000000000001"
+            "team": "00000000-0000-0000-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T12:43:17.559Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "\u001d􎞡\\PM\u000b\u0010U􋼕\u001c\u001aF(\u001c$w􁣓\u0015\u0006󼓻畾gk\u0019\u000ee𝂝\u001ev\\\u0002𠩮\u0002J糣R\u00043󸋉jx􎮚K􍌵𮛞􃦃\u000fපQ􎾂x,\u0000,\u0005􍈃Cg\u0001\u0008󲝾旬XZ:\u0006C󾚈^􌙿O\u0007xZ\u000f\u001a5𢷗\t",
             "phone": "+6119051205",
             "role": "partner",
-            "created_by": null,
-            "name": "\u001d􎞡\\PM\u000b\u0010U􋼕\u001c\u001aF(\u001c$w􁣓\u0015\u0006󼓻畾gk\u0019\u000ee𝂝\u001ev\\\u0002𠩮\u0002J糣R\u00043󸋉jx􎮚K􍌵𮛞􃦃\u000fපQ􎾂x,\u0000,\u0005􍈃Cg\u0001\u0008󲝾旬XZ:\u0006C󾚈^􌙿O\u0007xZ\u000f\u001a5𢷗\t",
-            "created_at": "1864-05-09T12:43:17.559Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "created_at": "1864-05-09T14:24:17.699Z",
+            "created_by": "00000000-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "\u001f󽯁@p(#􍜘潩0􈩋\n[q~2\u000c􂓉P\u0018\u0006",
             "phone": "+39377671045038",
             "role": "admin",
-            "created_by": "00000000-0000-0000-0000-000000000001",
-            "name": "\u001f󽯁@p(#􍜘潩0􈩋\n[q~2\u000c􂓉P\u0018\u0006",
-            "created_at": "1864-05-09T14:24:17.699Z",
-            "team": "00000001-0000-0001-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000100000000"
+            "team": "00000001-0000-0001-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T16:30:09.682Z",
+            "created_by": "00000000-0000-0001-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": "C$\u00130\u0014Y𫖗J\rK󽎡2g#.H2PmT󱁜t󼞐鲸\u0001HI|a:?P􍷃%K[E󼈻ig-K󾀋+Ul\u001c\\ ;_h\u001e\u0007LOz󶯖/\u0003V)a@𪭢󳻜\"\u001d􁢊/󾼏2䒁\u0004󻿬",
             "phone": "+35687997289",
             "role": "member",
-            "created_by": "00000000-0000-0001-0000-000000000001",
-            "name": "C$\u00130\u0014Y𫖗J\rK󽎡2g#.H2PmT󱁜t󼞐鲸\u0001HI|a:?P􍷃%K[E󼈻ig-K󾀋+Ul\u001c\\ ;_h\u001e\u0007LOz󶯖/\u0003V)a@𪭢󳻜\"\u001d􁢊/󾼏2䒁\u0004󻿬",
-            "created_at": "1864-05-09T16:30:09.682Z",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0001-0000-000000000001"
+            "team": "00000001-0000-0000-0000-000000000001"
         }
-    ],
-    "has_more": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_14.json b/libs/wire-api/test/golden/testObject_InvitationList_team_14.json
index 545a4936779..af68bb0922c 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_14.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_14.json
@@ -1,4 +1,4 @@
 {
-    "invitations": [],
-    "has_more": true
-}
\ No newline at end of file
+    "has_more": true,
+    "invitations": []
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_15.json b/libs/wire-api/test/golden/testObject_InvitationList_team_15.json
index 3569ac664bf..021cf22d3c4 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_15.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_15.json
@@ -1,55 +1,55 @@
 {
+    "has_more": false,
     "invitations": [
         {
+            "created_at": "1864-05-09T15:54:11.332Z",
+            "created_by": "00000000-0000-0001-0000-000000000000",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000100000000",
+            "name": "\u0019OX^Gr𨠊)󷄆\u0011U\\􀄐㒙㳏1N윔M􈷯ᲔNj<\u0004\u0008R\\v𭆕􏑐\u001ar\u0000𬥷A􋧹IK󰰇\u0015f搈N\u001e􁴫e𢃬f@N𪬢%VY\u000eHz\u001aO\u0008L}B\u0010\nolk?󸓩`\tak{$~Pd󾢈rm*q7\u001bi^𖽐󳤂Yvo;𩔌xq+Ṭud>󶂃𩫘0:ﲼ𮭩+\u0001\u000bP󹎷X镟􅔧.\u0019N\"𬋻",
             "phone": "+872574694",
             "role": "admin",
-            "created_by": "00000000-0000-0001-0000-000000000000",
-            "name": "\u0019OX^Gr𨠊)󷄆\u0011U\\􀄐㒙㳏1N윔M􈷯ᲔNj<\u0004\u0008R\\v𭆕􏑐\u001ar\u0000𬥷A􋧹IK󰰇\u0015f搈N\u001e􁴫e𢃬f@N𪬢%VY\u000eHz\u001aO\u0008L}B\u0010\nolk?󸓩`\tak{$~Pd󾢈rm*q7\u001bi^𖽐󳤂Yvo;𩔌xq+Ṭud>󶂃𩫘0:ﲼ𮭩+\u0001\u000bP󹎷X镟􅔧.\u0019N\"𬋻",
-            "created_at": "1864-05-09T15:54:11.332Z",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T23:06:13.648Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "叕5q}B\u0001𦌜`ｲw\\X@󼶝𢼈7Mw,*z{𠚷&~",
             "phone": "+143031479742",
             "role": "partner",
-            "created_by": null,
-            "name": "叕5q}B\u0001𦌜`ｲw\\X@󼶝𢼈7Mw,*z{𠚷&~",
-            "created_at": "1864-05-09T23:06:13.648Z",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T10:37:03.809Z",
+            "created_by": "00000001-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "V􈫮\u0010qYﾋCU\u000e􄕀fQJ\u0005ਓq+\u0007\u0016󱊸\u0011@𤠼`坟qh+𬾬A7𦄡Y \u0011Tㅎ1_􈩇#B<􂡁;a6o=",
             "phone": "+236346166386230",
             "role": "partner",
-            "created_by": "00000001-0000-0000-0000-000000000001",
-            "name": "V􈫮\u0010qYﾋCU\u000e􄕀fQJ\u0005ਓq+\u0007\u0016󱊸\u0011@𤠼`坟qh+𬾬A7𦄡Y \u0011Tㅎ1_􈩇#B<􂡁;a6o=",
-            "created_at": "1864-05-09T10:37:03.809Z",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "id": "00000000-0000-0001-0000-000000000000"
+            "team": "00000001-0000-0000-0000-000000000000"
         },
         {
+            "created_at": "1864-05-09T04:46:03.504Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": ",􃠾{ս\u000c𬕻Uh죙\t\u001b\u0004\u0001O@\u001a_\u0002D􎰥𦀛\u0016g}",
             "phone": "+80162248",
             "role": "admin",
-            "created_by": null,
-            "name": ",􃠾{ս\u000c𬕻Uh죙\t\u001b\u0004\u0001O@\u001a_\u0002D􎰥𦀛\u0016g}",
-            "created_at": "1864-05-09T04:46:03.504Z",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0001-0000-000100000000"
+            "team": "00000001-0000-0001-0000-000100000001"
         },
         {
+            "created_at": "1864-05-09T12:53:52.047Z",
+            "created_by": "00000000-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": null,
             "phone": null,
             "role": "owner",
-            "created_by": "00000000-0000-0000-0000-000000000001",
-            "name": null,
-            "created_at": "1864-05-09T12:53:52.047Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000000-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         }
-    ],
-    "has_more": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_16.json b/libs/wire-api/test/golden/testObject_InvitationList_team_16.json
index c33074c95d1..fc14ac96bf2 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_16.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_16.json
@@ -1,15 +1,15 @@
 {
+    "has_more": false,
     "invitations": [
         {
+            "created_at": "1864-05-09T15:25:30.297Z",
+            "created_by": "00000001-0000-0001-0000-000000000000",
             "email": "\u000f@",
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "E𝘆YM<󾪤j􆢆\r􇳗O󴟴MCU\u001eI󳊃m𔒷hG\u0012|:P􅛽Vj\u001c\u0000ffgG)K{􁇏7x5󱟰𪔘\n\u000clT􆊞",
             "phone": "+36515555",
             "role": "owner",
-            "created_by": "00000001-0000-0001-0000-000000000000",
-            "name": "E𝘆YM<󾪤j􆢆\r􇳗O󴟴MCU\u001eI󳊃m𔒷hG\u0012|:P􅛽Vj\u001c\u0000ffgG)K{􁇏7x5󱟰𪔘\n\u000clT􆊞",
-            "created_at": "1864-05-09T15:25:30.297Z",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000100000001"
+            "team": "00000001-0000-0001-0000-000100000001"
         }
-    ],
-    "has_more": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_17.json b/libs/wire-api/test/golden/testObject_InvitationList_team_17.json
index 379bc7448e5..c2c9ba044af 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_17.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_17.json
@@ -1,15 +1,15 @@
 {
+    "has_more": false,
     "invitations": [
         {
+            "created_at": "1864-05-08T10:54:19.942Z",
+            "created_by": "00000001-0000-0001-0000-000100000000",
             "email": "&@𫳦",
+            "id": "00000001-0000-0001-0000-000000000001",
+            "name": null,
             "phone": null,
             "role": "partner",
-            "created_by": "00000001-0000-0001-0000-000100000000",
-            "name": null,
-            "created_at": "1864-05-08T10:54:19.942Z",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000000000001"
+            "team": "00000001-0000-0000-0000-000100000000"
         }
-    ],
-    "has_more": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_18.json b/libs/wire-api/test/golden/testObject_InvitationList_team_18.json
index 545a4936779..af68bb0922c 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_18.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_18.json
@@ -1,4 +1,4 @@
 {
-    "invitations": [],
-    "has_more": true
-}
\ No newline at end of file
+    "has_more": true,
+    "invitations": []
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_19.json b/libs/wire-api/test/golden/testObject_InvitationList_team_19.json
index dd0c055a64c..40d772b4df6 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_19.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_19.json
@@ -1,4 +1,4 @@
 {
-    "invitations": [],
-    "has_more": false
-}
\ No newline at end of file
+    "has_more": false,
+    "invitations": []
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_2.json b/libs/wire-api/test/golden/testObject_InvitationList_team_2.json
index 3f0473faa91..e2f2601fb1f 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_2.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_2.json
@@ -1,15 +1,15 @@
 {
+    "has_more": true,
     "invitations": [
         {
+            "created_at": "1864-05-08T09:28:36.729Z",
+            "created_by": "00000001-0000-0001-0000-000000000000",
             "email": "𥝢@w",
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": "fuC9p􌌅A𧻢\u000c\u0005\u000e刣N룞_?oCX.U\r𧾠W腈󽥝\u0013\t[錣\u0016/⃘A𣚁𪔍\u0014H𠽙\u0002𨯠\u0004𨒤o\u0013",
             "phone": "+851333011",
             "role": "owner",
-            "created_by": "00000001-0000-0001-0000-000000000000",
-            "name": "fuC9p􌌅A𧻢\u000c\u0005\u000e刣N룞_?oCX.U\r𧾠W腈󽥝\u0013\t[錣\u0016/⃘A𣚁𪔍\u0014H𠽙\u0002𨯠\u0004𨒤o\u0013",
-            "created_at": "1864-05-08T09:28:36.729Z",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000000000000"
+            "team": "00000000-0000-0000-0000-000000000001"
         }
-    ],
-    "has_more": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_20.json b/libs/wire-api/test/golden/testObject_InvitationList_team_20.json
index b3a43d734e1..1b50ca8071e 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_20.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_20.json
@@ -1,25 +1,25 @@
 {
+    "has_more": false,
     "invitations": [
         {
+            "created_at": "1864-05-09T07:22:02.426Z",
+            "created_by": "00000001-0000-0001-0000-000100000001",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000100000000",
+            "name": null,
             "phone": "+745177056001783",
             "role": "partner",
-            "created_by": "00000001-0000-0001-0000-000100000001",
-            "name": null,
-            "created_at": "1864-05-09T07:22:02.426Z",
-            "team": "00000001-0000-0001-0000-000000000000",
-            "id": "00000001-0000-0000-0000-000100000000"
+            "team": "00000001-0000-0001-0000-000000000000"
         },
         {
+            "created_at": "1864-05-09T18:56:29.712Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": "YPf╞:\u0005Ỉ&\u0018\u0011󽧛%ꦡk𪯋􅥏:Q\u0005F+\u0008b8Jh􌎓K\u0007\u001dY\u0004􃏡\u000f󽝰\u0016 􁗠6>I󾉩B$z?𤢾wECB\u001e𥼬덄\"W𗤞󲴂@\u001eg)\u0001m!-U􇧦󵜰o\u0006a\u0004𭂢;R􂪧kgT􍆈f\u0004\u001e\rp𓎎󿉊X/􄂲)\u00025.Ym󵳬n싟N\u0013𫅄]?'𠴺a4\"󳟾!i5\u001e\u001dC14",
             "phone": null,
             "role": "owner",
-            "created_by": null,
-            "name": "YPf╞:\u0005Ỉ&\u0018\u0011󽧛%ꦡk𪯋􅥏:Q\u0005F+\u0008b8Jh􌎓K\u0007\u001dY\u0004􃏡\u000f󽝰\u0016 􁗠6>I󾉩B$z?𤢾wECB\u001e𥼬덄\"W𗤞󲴂@\u001eg)\u0001m!-U􇧦󵜰o\u0006a\u0004𭂢;R􂪧kgT􍆈f\u0004\u001e\rp𓎎󿉊X/􄂲)\u00025.Ym󵳬n싟N\u0013𫅄]?'𠴺a4\"󳟾!i5\u001e\u001dC14",
-            "created_at": "1864-05-09T18:56:29.712Z",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000000000000"
+            "team": "00000001-0000-0000-0000-000100000000"
         }
-    ],
-    "has_more": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_3.json b/libs/wire-api/test/golden/testObject_InvitationList_team_3.json
index dd0c055a64c..40d772b4df6 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_3.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_3.json
@@ -1,4 +1,4 @@
 {
-    "invitations": [],
-    "has_more": false
-}
\ No newline at end of file
+    "has_more": false,
+    "invitations": []
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_4.json b/libs/wire-api/test/golden/testObject_InvitationList_team_4.json
index 67339c36a04..e41e76da520 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_4.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_4.json
@@ -1,85 +1,85 @@
 {
+    "has_more": false,
     "invitations": [
         {
+            "created_at": "1864-05-09T19:46:50.121Z",
+            "created_by": "00000001-0000-0001-0000-000000000000",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "R6𠥄𠮥VQ𭴢\u001a\u0001𬄺0C􉶍\u001bR𭗈𞡊@韉Z?\u0002𩖫􄭦e}\u0001\u0017\u0004m𭉂\u001f]󰺞𮉗􂨮󰶌\u0008\u0011zfw-5𝝖\u0018􃸂 \u0019e\u0014|㡚Vo{􆳗\u0013#\u001fS꿻&zz𧏏9𢱋,\u000f\u000c\u0001p󺜰\u0010𧵪􂸑.&󳢨kZ쓿u\u0008왌􎴟n:􍝋D$.Q",
             "phone": "+60506387292",
             "role": "admin",
-            "created_by": "00000001-0000-0001-0000-000000000000",
-            "name": "R6𠥄𠮥VQ𭴢\u001a\u0001𬄺0C􉶍\u001bR𭗈𞡊@韉Z?\u0002𩖫􄭦e}\u0001\u0017\u0004m𭉂\u001f]󰺞𮉗􂨮󰶌\u0008\u0011zfw-5𝝖\u0018􃸂 \u0019e\u0014|㡚Vo{􆳗\u0013#\u001fS꿻&zz𧏏9𢱋,\u000f\u000c\u0001p󺜰\u0010𧵪􂸑.&󳢨kZ쓿u\u0008왌􎴟n:􍝋D$.Q",
-            "created_at": "1864-05-09T19:46:50.121Z",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "id": "00000001-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000000000000"
         },
         {
+            "created_at": "1864-05-09T09:00:02.901Z",
+            "created_by": "00000000-0000-0001-0000-000000000000",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000100000000",
+            "name": "\u0012}q\u0018=SA\u0003x\t\u0003\\\u000b[\u0008)(\u001b]𡋃Y\u000b@pꈫl뀉𦛌\u0000\t􌤢\u00011\u0011\u0005󹝃\"i猔\u0019\u0008\u0006\u000f\u0012v\u0006",
             "phone": "+913945015",
             "role": "admin",
-            "created_by": "00000000-0000-0001-0000-000000000000",
-            "name": "\u0012}q\u0018=SA\u0003x\t\u0003\\\u000b[\u0008)(\u001b]𡋃Y\u000b@pꈫl뀉𦛌\u0000\t􌤢\u00011\u0011\u0005󹝃\"i猔\u0019\u0008\u0006\u000f\u0012v\u0006",
-            "created_at": "1864-05-09T09:00:02.901Z",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T11:10:31.203Z",
+            "created_by": "00000001-0000-0001-0000-000000000000",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "&􂧽Ec\u0000㼓}k󼾘l𪍯\u001fJ\u00190^.+F\u0000\u000c$'`!\u0017[p󾓉}>E0y𗢸#4I\u0007𐐡jc\u001bgt埉􊹘P\u0014!􋣥E93'Y$YL뜦b\r:,𬘞\u000e𥚟y\u0003;􃺹􌛖z4z-D􋰳a𡽜6𨏝r󼖨󱌂J\u0010밆",
             "phone": "+17046334",
             "role": "member",
-            "created_by": "00000001-0000-0001-0000-000000000000",
-            "name": "&􂧽Ec\u0000㼓}k󼾘l𪍯\u001fJ\u00190^.+F\u0000\u000c$'`!\u0017[p󾓉}>E0y𗢸#4I\u0007𐐡jc\u001bgt埉􊹘P\u0014!􋣥E93'Y$YL뜦b\r:,𬘞\u000e𥚟y\u0003;􃺹􌛖z4z-D􋰳a𡽜6𨏝r󼖨󱌂J\u0010밆",
-            "created_at": "1864-05-09T11:10:31.203Z",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T23:41:34.529Z",
+            "created_by": "00000001-0000-0001-0000-000100000000",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "Ft*O1\u0008&\u000e\u0018<𑨛􊰋m\n\u0014\u0012; \u0003󱚥\u0011􂬫\"k.T󹴑[[\u001c\u0004{j`\u001d󳟞c􄖫{\u001a\u001dQY𬨕\t\u0015y\t𠓳j󼿁W ",
             "phone": null,
             "role": "owner",
-            "created_by": "00000001-0000-0001-0000-000100000000",
-            "name": "Ft*O1\u0008&\u000e\u0018<𑨛􊰋m\n\u0014\u0012; \u0003󱚥\u0011􂬫\"k.T󹴑[[\u001c\u0004{j`\u001d󳟞c􄖫{\u001a\u001dQY𬨕\t\u0015y\t𠓳j󼿁W ",
-            "created_at": "1864-05-09T23:41:34.529Z",
-            "team": "00000000-0000-0000-0000-000000000000",
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": "00000000-0000-0000-0000-000000000000"
         },
         {
+            "created_at": "1864-05-09T00:29:17.658Z",
+            "created_by": "00000000-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": null,
             "phone": "+918848647685283",
             "role": "admin",
-            "created_by": "00000000-0000-0000-0000-000000000001",
-            "name": null,
-            "created_at": "1864-05-09T00:29:17.658Z",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": "00000001-0000-0000-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T13:34:37.117Z",
+            "created_by": "00000000-0000-0000-0000-000100000001",
             "email": "@",
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "Lo\r􎒩<D/􇵦󿩟|`5-j𛰸{[qI\u0017Y𡚟C\u0005ㇾ]􌊯#\u0010E𨿽8S.䘙{[\u001d\u0007E𧃗E\u0005S",
             "phone": "+965119366001",
             "role": "owner",
-            "created_by": "00000000-0000-0000-0000-000100000001",
-            "name": "Lo\r􎒩<D/􇵦󿩟|`5-j𛰸{[qI\u0017Y𡚟C\u0005ㇾ]􌊯#\u0010E𨿽8S.䘙{[\u001d\u0007E𧃗E\u0005S",
-            "created_at": "1864-05-09T13:34:37.117Z",
-            "team": "00000001-0000-0000-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000100000001"
+            "team": "00000001-0000-0000-0000-000100000001"
         },
         {
+            "created_at": "1864-05-09T18:05:30.889Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "\u0002𩖉t\u0008𩐽\u000b\u0011)[Y3\u0006\u00054'K\u0007􌧑󹞕NSR(㎑Mm󻰲0`yCบ컊M~􌷩jBO \u0016\u000ei/􆋋\u0003\u0000uiu\u000bdP􌵴M3Nᇈh3F\u0003!䓟cm􅏵󲟶𗴷𐜘\u001f9󵡙\u0003􄼷2kFl\u0004\u0012r 􃋰𦧙\u0013c",
             "phone": null,
             "role": "partner",
-            "created_by": null,
-            "name": "\u0002𩖉t\u0008𩐽\u000b\u0011)[Y3\u0006\u00054'K\u0007􌧑󹞕NSR(㎑Mm󻰲0`yCบ컊M~􌷩jBO \u0016\u000ei/􆋋\u0003\u0000uiu\u000bdP􌵴M3Nᇈh3F\u0003!䓟cm􅏵󲟶𗴷𐜘\u001f9󵡙\u0003􄼷2kFl\u0004\u0012r 􃋰𦧙\u0013c",
-            "created_at": "1864-05-09T18:05:30.889Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "created_at": "1864-05-09T15:21:05.519Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": "K󹌘􃯢𩲆\u0003\u0012M􉞖\u0016󴬘捼􊶸\u0017a~ZD\u000f}+>B𗚰_v󰔢􆍶󻀬􊽦9\u0002vyQ🖰&W󻟑𠸘􇹬'􁔫:𤟗𡶘􏹠}-o󿜊le8Zp󺩐􋾙)nK\u00140⛟0DE\u0015K$io\u001e|Ip2ClnU𬖍",
             "phone": "+2239859474784",
             "role": "owner",
-            "created_by": null,
-            "name": "K󹌘􃯢𩲆\u0003\u0012M􉞖\u0016󴬘捼􊶸\u0017a~ZD\u000f}+>B𗚰_v󰔢􆍶󻀬􊽦9\u0002vyQ🖰&W󻟑𠸘􇹬'􁔫:𤟗𡶘􏹠}-o󿜊le8Zp󺩐􋾙)nK\u00140⛟0DE\u0015K$io\u001e|Ip2ClnU𬖍",
-            "created_at": "1864-05-09T15:21:05.519Z",
-            "team": "00000001-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000000000000"
+            "team": "00000001-0000-0001-0000-000100000000"
         }
-    ],
-    "has_more": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_5.json b/libs/wire-api/test/golden/testObject_InvitationList_team_5.json
index dd0c055a64c..40d772b4df6 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_5.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_5.json
@@ -1,4 +1,4 @@
 {
-    "invitations": [],
-    "has_more": false
-}
\ No newline at end of file
+    "has_more": false,
+    "invitations": []
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_6.json b/libs/wire-api/test/golden/testObject_InvitationList_team_6.json
index 705212ff9dc..2285c8dc7ab 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_6.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_6.json
@@ -1,155 +1,155 @@
 {
+    "has_more": false,
     "invitations": [
         {
+            "created_at": "1864-05-09T06:42:29.677Z",
+            "created_by": "00000000-0000-0000-0000-000100000001",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": null,
             "phone": null,
             "role": "admin",
-            "created_by": "00000000-0000-0000-0000-000100000001",
-            "name": null,
-            "created_at": "1864-05-09T06:42:29.677Z",
-            "team": "00000001-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": "00000001-0000-0001-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T11:26:36.672Z",
+            "created_by": "00000001-0000-0000-0000-000000000000",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": null,
             "phone": "+85999765",
             "role": "admin",
-            "created_by": "00000001-0000-0000-0000-000000000000",
-            "name": null,
-            "created_at": "1864-05-09T11:26:36.672Z",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000000000000"
+            "team": "00000000-0000-0000-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T00:31:56.241Z",
+            "created_by": "00000001-0000-0001-0000-000100000001",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": null,
             "phone": "+150835819626453",
             "role": "owner",
-            "created_by": "00000001-0000-0001-0000-000100000001",
-            "name": null,
-            "created_at": "1864-05-09T00:31:56.241Z",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000000000001"
+            "team": "00000001-0000-0000-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T21:10:47.237Z",
+            "created_by": "00000001-0000-0000-0000-000100000001",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000100000000",
+            "name": "YBc\r웶8{\\\n􋸓+\u0008\u0016'<\u0004􈄿Z\u0007nOb􋨴􌸖𩮤}2<u\u0005lS𡭗A\u0011𫽃\u0002(󼆝􃣝/\r즽NG󱈚媀k6^M􉢞𠽀\u000bl􃽡󵃳/#T|\u0014󼂃􊟥\u0003|_󸋬\u000eM\"m(\u001a\u0008\u0006mg凞+\u0012\u001a32y",
             "phone": "+7567676773326",
             "role": "admin",
-            "created_by": "00000001-0000-0000-0000-000100000001",
-            "name": "YBc\r웶8{\\\n􋸓+\u0008\u0016'<\u0004􈄿Z\u0007nOb􋨴􌸖𩮤}2<u\u0005lS𡭗A\u0011𫽃\u0002(󼆝􃣝/\r즽NG󱈚媀k6^M􉢞𠽀\u000bl􃽡󵃳/#T|\u0014󼂃􊟥\u0003|_󸋬\u000eM\"m(\u001a\u0008\u0006mg凞+\u0012\u001a32y",
-            "created_at": "1864-05-09T21:10:47.237Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "created_at": "1864-05-09T15:43:22.250Z",
+            "created_by": "00000000-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": null,
             "phone": null,
             "role": "owner",
-            "created_by": "00000000-0000-0000-0000-000000000001",
-            "name": null,
-            "created_at": "1864-05-09T15:43:22.250Z",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000100000001"
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T20:44:34.056Z",
+            "created_by": "00000001-0000-0000-0000-000100000001",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "􌯝v𮨮UcU+_娃!?e Pr麬=x-z5N􂪲",
             "phone": "+158732240",
             "role": "admin",
-            "created_by": "00000001-0000-0000-0000-000100000001",
-            "name": "􌯝v𮨮UcU+_娃!?e Pr麬=x-z5N􂪲",
-            "created_at": "1864-05-09T20:44:34.056Z",
-            "team": "00000001-0000-0001-0000-000000000001",
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": "00000001-0000-0001-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T11:23:55.061Z",
+            "created_by": "00000000-0000-0000-0000-000100000001",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": null,
             "phone": null,
             "role": "admin",
-            "created_by": "00000000-0000-0000-0000-000100000001",
-            "name": null,
-            "created_at": "1864-05-09T11:23:55.061Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0001-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "created_at": "1864-05-09T10:06:43.943Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": null,
             "phone": "+296657605447",
             "role": "owner",
-            "created_by": null,
-            "name": null,
-            "created_at": "1864-05-09T10:06:43.943Z",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T19:42:31.295Z",
+            "created_by": "00000000-0000-0001-0000-000100000000",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "󱏅l췺u-@'\nn!'CK\u00138\r8𠢇𑃵𡮓,;r􄋘S􎽌\u000e\r^hH𫞪󳔍\"圗u󴪠?A􊾛O1𪏷6𦁁\u0007W+\u0012C[c􍯏25-V􊦑\u0012󸘓m󼺅𮕲d􈣵a􆥗+51󴀋\u0015]󿫎偍o*0\u0015Cසn\u000by\u0017ᢌ+\u0006􀔞",
             "phone": null,
             "role": "owner",
-            "created_by": "00000000-0000-0001-0000-000100000000",
-            "name": "󱏅l췺u-@'\nn!'CK\u00138\r8𠢇𑃵𡮓,;r􄋘S􎽌\u000e\r^hH𫞪󳔍\"圗u󴪠?A􊾛O1𪏷6𦁁\u0007W+\u0012C[c􍯏25-V􊦑\u0012󸘓m󼺅𮕲d􈣵a􆥗+51󴀋\u0015]󿫎偍o*0\u0015Cසn\u000by\u0017ᢌ+\u0006􀔞",
-            "created_at": "1864-05-09T19:42:31.295Z",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T06:58:18.517Z",
+            "created_by": "00000001-0000-0001-0000-000000000000",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": null,
             "phone": "+22915271921199",
             "role": "admin",
-            "created_by": "00000001-0000-0001-0000-000000000000",
-            "name": null,
-            "created_at": "1864-05-09T06:58:18.517Z",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0000-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T00:40:39.103Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": "')焱mD𑗒?\u000b\"Q&_8\u0014a",
             "phone": "+5593066131958",
             "role": "partner",
-            "created_by": null,
-            "name": "')焱mD𑗒?\u000b\"Q&_8\u0014a",
-            "created_at": "1864-05-09T00:40:39.103Z",
-            "team": "00000001-0000-0001-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000000000000"
+            "team": "00000001-0000-0001-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T21:44:30.848Z",
+            "created_by": "00000001-0000-0001-0000-000100000001",
             "email": "@",
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": null,
             "phone": "+36312513329045",
             "role": "owner",
-            "created_by": "00000001-0000-0001-0000-000100000001",
-            "name": null,
-            "created_at": "1864-05-09T21:44:30.848Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "created_at": "1864-05-09T14:27:46.655Z",
+            "created_by": "00000000-0000-0001-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "0󼉊F󴜩䱆/\u00101ﲂdx󹙋󱮁\u000eE\u0008􈻗𐀆󹰲,kn\u0004㰑j[𭒜\u0006\u001f{󼇓󷍔]b\u000c$i7,攗{v\\uYI􉋸𭝾􄼾|:w\u0011v􌃩Y􄠤\"N",
             "phone": "+310054067321354",
             "role": "admin",
-            "created_by": "00000000-0000-0001-0000-000000000001",
-            "name": "0󼉊F󴜩䱆/\u00101ﲂdx󹙋󱮁\u000eE\u0008􈻗𐀆󹰲,kn\u0004㰑j[𭒜\u0006\u001f{󼇓󷍔]b\u000c$i7,攗{v\\uYI􉋸𭝾􄼾|:w\u0011v􌃩Y􄠤\"N",
-            "created_at": "1864-05-09T14:27:46.655Z",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000100000001"
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T03:57:53.185Z",
+            "created_by": "00000000-0000-0001-0000-000100000000",
             "email": "@",
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "\u0019􉈪ᐪ29𖹰\u001d\n\u001ezC`",
             "phone": null,
             "role": "partner",
-            "created_by": "00000000-0000-0001-0000-000100000000",
-            "name": "\u0019􉈪ᐪ29𖹰\u001d\n\u001ezC`",
-            "created_at": "1864-05-09T03:57:53.185Z",
-            "team": "00000001-0000-0001-0000-000100000000",
-            "id": "00000000-0000-0000-0000-000000000001"
+            "team": "00000001-0000-0001-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T14:35:39.474Z",
+            "created_by": null,
             "email": "@",
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": null,
             "phone": null,
             "role": "member",
-            "created_by": null,
-            "name": null,
-            "created_at": "1864-05-09T14:35:39.474Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         }
-    ],
-    "has_more": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_7.json b/libs/wire-api/test/golden/testObject_InvitationList_team_7.json
index 0207c75adf5..bc89de1985d 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_7.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_7.json
@@ -1,35 +1,35 @@
 {
+    "has_more": true,
     "invitations": [
         {
+            "created_at": "1864-05-09T14:44:40.049Z",
+            "created_by": "00000001-0000-0000-0000-000100000000",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": "8J𗮋􄉧5\u0017#y\u0012T\u0016*O9󻦓CmCa)1e\u0001𠋲)2፪_u7\u0017󺞥\u0007\tbȸE\u0011@󸓮R􂮩\u000b\u001b􋾔𮣊s\u0005𛆲1O􅓳Af(㩸)]󽴶\u001b3W𒂡\"ぱ\u0005\u0004\u0001",
             "phone": "+2641695032926",
             "role": "partner",
-            "created_by": "00000001-0000-0000-0000-000100000000",
-            "name": "8J𗮋􄉧5\u0017#y\u0012T\u0016*O9󻦓CmCa)1e\u0001𠋲)2፪_u7\u0017󺞥\u0007\tbȸE\u0011@󸓮R􂮩\u000b\u001b􋾔𮣊s\u0005𛆲1O􅓳Af(㩸)]󽴶\u001b3W𒂡\"ぱ\u0005\u0004\u0001",
-            "created_at": "1864-05-09T14:44:40.049Z",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000000000001"
+            "team": "00000000-0000-0000-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T19:09:35.565Z",
+            "created_by": "00000000-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "􉒁<󼸊cl\u0004;\nB鷩絔&Ur|8\u0003\u0007(UQ𖹠\u0000\u0012𣿉h󰢗|c􃦬?ꔦ\u001e7h󳼻t𠲯\u0000w\r蕨󻛮坞w_)\t󺙉\u0018Uy\u0019#D",
             "phone": "+65473071584964",
             "role": "partner",
-            "created_by": "00000000-0000-0000-0000-000000000001",
-            "name": "􉒁<󼸊cl\u0004;\nB鷩絔&Ur|8\u0003\u0007(UQ𖹠\u0000\u0012𣿉h󰢗|c􃦬?ꔦ\u001e7h󳼻t𠲯\u0000w\r蕨󻛮坞w_)\t󺙉\u0018Uy\u0019#D",
-            "created_at": "1864-05-09T19:09:35.565Z",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000000000000"
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T11:05:26.660Z",
+            "created_by": "00000000-0000-0001-0000-000000000001",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000000000001",
+            "name": "X\u0011􍓴\u000b/\u0007\u0016\u0017E\u0012<O𢟯~b*\u0000\u000c𣿄4𭽟\u0019O󺐽𗠠UNH㮄.󺣱-􇫅\u0015?󾏑󻷈帒JlY󴬹'\\2\u0019",
             "phone": "+5876007323",
             "role": "partner",
-            "created_by": "00000000-0000-0001-0000-000000000001",
-            "name": "X\u0011􍓴\u000b/\u0007\u0016\u0017E\u0012<O𢟯~b*\u0000\u000c𣿄4𭽟\u0019O󺐽𗠠UNH㮄.󺣱-􇫅\u0015?󾏑󻷈帒JlY󴬹'\\2\u0019",
-            "created_at": "1864-05-09T11:05:26.660Z",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "id": "00000001-0000-0001-0000-000000000001"
+            "team": "00000000-0000-0001-0000-000000000000"
         }
-    ],
-    "has_more": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_8.json b/libs/wire-api/test/golden/testObject_InvitationList_team_8.json
index 406ed4eb7da..e9d6068116c 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_8.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_8.json
@@ -1,25 +1,25 @@
 {
+    "has_more": true,
     "invitations": [
         {
+            "created_at": "1864-05-09T13:24:44.890Z",
+            "created_by": "00000001-0000-0001-0000-000100000000",
             "email": "@",
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "I/\u0001\u001e􈴊􅈲U\u0017𫫰􇙳`􉞬TD4KUᔌ?[",
             "phone": null,
             "role": "admin",
-            "created_by": "00000001-0000-0001-0000-000100000000",
-            "name": "I/\u0001\u001e􈴊􅈲U\u0017𫫰􇙳`􉞬TD4KUᔌ?[",
-            "created_at": "1864-05-09T13:24:44.890Z",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000100000000"
         },
         {
+            "created_at": "1864-05-09T15:37:31.278Z",
+            "created_by": "00000001-0000-0000-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": "󾏆rz\u0019|%\u0004[\r󽸬󸕚i􋗌陾\\+𦇯i\u001f\u0008O3M󰐴I/X6Fnn^ 2g{]Z󺿵K}\u0007[a8􂔬f\u001a54b+Ye;t$챓\u0016󴂗𢮇r",
             "phone": null,
             "role": "owner",
-            "created_by": "00000001-0000-0000-0000-000000000001",
-            "name": "󾏆rz\u0019|%\u0004[\r󽸬󸕚i􋗌陾\\+𦇯i\u001f\u0008O3M󰐴I/X6Fnn^ 2g{]Z󺿵K}\u0007[a8􂔬f\u001a54b+Ye;t$챓\u0016󴂗𢮇r",
-            "created_at": "1864-05-09T15:37:31.278Z",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000000000001"
+            "team": "00000000-0000-0000-0000-000100000000"
         }
-    ],
-    "has_more": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationList_team_9.json b/libs/wire-api/test/golden/testObject_InvitationList_team_9.json
index e8d987438b1..0e31706d829 100644
--- a/libs/wire-api/test/golden/testObject_InvitationList_team_9.json
+++ b/libs/wire-api/test/golden/testObject_InvitationList_team_9.json
@@ -1,35 +1,35 @@
 {
+    "has_more": true,
     "invitations": [
         {
+            "created_at": "1864-05-09T12:45:57.694Z",
+            "created_by": "00000001-0000-0001-0000-000000000001",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": null,
             "phone": "+114415926391",
             "role": "owner",
-            "created_by": "00000001-0000-0001-0000-000000000001",
-            "name": null,
-            "created_at": "1864-05-09T12:45:57.694Z",
-            "team": "00000001-0000-0001-0000-000000000000",
-            "id": "00000000-0000-0001-0000-000000000001"
+            "team": "00000001-0000-0001-0000-000000000000"
         },
         {
+            "created_at": "1864-05-09T08:06:09.682Z",
+            "created_by": "00000000-0000-0000-0000-000000000000",
             "email": "@",
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": "`\u0000𠗟󹆿画P𢾷\u0007𑫐\u000738\u0013􏟩QX\u0019gq𧓷.*e鸿#|'f(/G\nh$GHS\u001d(kI`]􁦶x𮙓i\u0002𝃓Ų𧵨o@⮯𥃡Izq𦌊𫲘X􋉟^_\u0018hGjR/z\u0012𬧙􆰉\u0010\u0010\u0002\u0002󻈌DFW𝚺\u0014W\u0014(n𦄢H𭁙&it\u0002<oW\u0017\u0016]",
             "phone": "+0011966022439",
             "role": "admin",
-            "created_by": "00000000-0000-0000-0000-000000000000",
-            "name": "`\u0000𠗟󹆿画P𢾷\u0007𑫐\u000738\u0013􏟩QX\u0019gq𧓷.*e鸿#|'f(/G\nh$GHS\u001d(kI`]􁦶x𮙓i\u0002𝃓Ų𧵨o@⮯𥃡Izq𦌊𫲘X􋉟^_\u0018hGjR/z\u0012𬧙􆰉\u0010\u0010\u0002\u0002󻈌DFW𝚺\u0014W\u0014(n𦄢H𭁙&it\u0002<oW\u0017\u0016]",
-            "created_at": "1864-05-09T08:06:09.682Z",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0001-0000-000100000001"
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "created_at": "1864-05-09T01:04:27.531Z",
+            "created_by": "00000000-0000-0001-0000-000100000001",
             "email": "@",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "\u0005􎀑􈍪X~|𠧚𨕲]󹐱gWMJ6嘸''\u0019%xf􋝘=2\u0007\u0006 \u0012\u0001\u0000󸁨𒓲䧿.􊬬o𭑕v╷~>o@v/",
             "phone": "+787465997389",
             "role": "member",
-            "created_by": "00000000-0000-0001-0000-000100000001",
-            "name": "\u0005􎀑􈍪X~|𠧚𨕲]󹐱gWMJ6嘸''\u0019%xf􋝘=2\u0007\u0006 \u0012\u0001\u0000󸁨𒓲䧿.􊬬o𭑕v╷~>o@v/",
-            "created_at": "1864-05-09T01:04:27.531Z",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000100000000"
         }
-    ],
-    "has_more": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_1.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_1.json
index 92eb702543e..ffd2be10c76 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_1.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_1.json
@@ -1,7 +1,7 @@
 {
     "email": "/Y𨎂\u000b}?@󲚚󾋉𫟰\u000e󽈝",
-    "phone": null,
     "locale": "nn",
-    "role": "owner",
-    "name": null
-}
\ No newline at end of file
+    "name": null,
+    "phone": null,
+    "role": "owner"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_10.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_10.json
index 76bd685fe4f..ec3bbd9af53 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_10.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_10.json
@@ -1,7 +1,7 @@
 {
     "email": "󶩭\u000c\u0006\u0010^s@d",
-    "phone": "+3547398978719",
     "locale": "ny-OM",
-    "role": "member",
-    "name": "H󶌔\u001e댥𖢯uv󿊧\u0012󿕜\u001a 𧆤=a\u001b4H,B\u0018󽲴GpV0󿇇;_\u0000𪔺Z\u0011滘\u00156耐'W9z⻒\tr𤭦􂃸\u0016_ge豍\u0004D𗈌o\u0007n>󲤯"
-}
\ No newline at end of file
+    "name": "H󶌔\u001e댥𖢯uv󿊧\u0012󿕜\u001a 𧆤=a\u001b4H,B\u0018󽲴GpV0󿇇;_\u0000𪔺Z\u0011滘\u00156耐'W9z⻒\tr𤭦􂃸\u0016_ge豍\u0004D𗈌o\u0007n>󲤯",
+    "phone": "+3547398978719",
+    "role": "member"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_11.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_11.json
index 8c8ec15ffc6..165dc4525b6 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_11.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_11.json
@@ -1,7 +1,7 @@
 {
     "email": "\u0001\u0000󸊱nJ@t\u0002.",
-    "phone": "+861174152363",
     "locale": "si",
-    "role": "owner",
-    "name": "𨱜ꇙⴹ𒑐h_5bb2}뛹𨰗P\u0000\u000eT*\u001f`b𩯔\u000f:4\n5\u001a\u001d*T󸅕Bv\u001b\u0003\u001d􀢕𪼏Uu\r_\u0010)y𥦆\u0004\u0008\u001f\u0014\u001c\u0018?􀖫𤣔坾\u0015\u001a4\u000b 5\u0000iꡩo=\tnG鉘\u0017iC\u00139\u000eP󺬘\n\u000b\u0019\u0016UṸ%삶\u0012\u001fF\u001c"
-}
\ No newline at end of file
+    "name": "𨱜ꇙⴹ𒑐h_5bb2}뛹𨰗P\u0000\u000eT*\u001f`b𩯔\u000f:4\n5\u001a\u001d*T󸅕Bv\u001b\u0003\u001d􀢕𪼏Uu\r_\u0010)y𥦆\u0004\u0008\u001f\u0014\u001c\u0018?􀖫𤣔坾\u0015\u001a4\u000b 5\u0000iꡩo=\tnG鉘\u0017iC\u00139\u000eP󺬘\n\u000b\u0019\u0016UṸ%삶\u0012\u001fF\u001c",
+    "phone": "+861174152363",
+    "role": "owner"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_12.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_12.json
index fbe3b274c99..e4109225571 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_12.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_12.json
@@ -1,7 +1,7 @@
 {
     "email": "􎪠􇿸@",
-    "phone": "+498796466910243",
     "locale": "ar-PA",
-    "role": null,
-    "name": "_\u0019@\u001d0춲󾌹󷱿\u001c\u0010􌩶!􈇮\u000ec\u001f\u0000\u0001>􆖳𩈈\u0019𪶲1}!h0\u0010􁈑w\u0004􆈑1aJ6c\u001d󰼊b𠍕{󳔞𠅳\u0007􋊉"
-}
\ No newline at end of file
+    "name": "_\u0019@\u001d0춲󾌹󷱿\u001c\u0010􌩶!􈇮\u000ec\u001f\u0000\u0001>􆖳𩈈\u0019𪶲1}!h0\u0010􁈑w\u0004􆈑1aJ6c\u001d󰼊b𠍕{󳔞𠅳\u0007􋊉",
+    "phone": "+498796466910243",
+    "role": null
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_13.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_13.json
index ee664176c91..70e6af591fc 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_13.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_13.json
@@ -1,7 +1,7 @@
 {
     "email": "\u0000r@c,",
-    "phone": "+82438666720661",
     "locale": null,
-    "role": null,
-    "name": "C󱷈+󼗇\n#s􅺭\u001cpb\u0001󷷁􆂖1\u0017E_\u0018j\u0019V\u001f􃣖㱇􌛎lO8\u0006􁼲\u001c\u0016\u0018\u00106𡪆-beR!s뷈\u0017\u000b􀌟󰏐xt\u000fRf~w󻢹+_𑆞91:,󼜮#cf􁸗ศ৴ᬯB\"􋿺F\t􎾚􅋖/\u0010'󵒫*𩳾7𦈨w􃈢Hx\u00132\u0019t𧽔o6\u0014F%=t󴼼􋹸=\u0000\u0005A􌿋󷃓\u0000\u0004[i󲔇@\u0008\u001c\u000c"
-}
\ No newline at end of file
+    "name": "C󱷈+󼗇\n#s􅺭\u001cpb\u0001󷷁􆂖1\u0017E_\u0018j\u0019V\u001f􃣖㱇􌛎lO8\u0006􁼲\u001c\u0016\u0018\u00106𡪆-beR!s뷈\u0017\u000b􀌟󰏐xt\u000fRf~w󻢹+_𑆞91:,󼜮#cf􁸗ศ৴ᬯB\"􋿺F\t􎾚􅋖/\u0010'󵒫*𩳾7𦈨w􃈢Hx\u00132\u0019t𧽔o6\u0014F%=t󴼼􋹸=\u0000\u0005A􌿋󷃓\u0000\u0004[i󲔇@\u0008\u001c\u000c",
+    "phone": "+82438666720661",
+    "role": null
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_14.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_14.json
index 640cc3d22c2..a53561f331f 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_14.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_14.json
@@ -1,7 +1,7 @@
 {
     "email": "@\u000b",
-    "phone": "+08345603",
     "locale": "dv-LB",
-    "role": "admin",
-    "name": "\u0015wGn󳔃𤠘1}\u0004gY.>=}"
-}
\ No newline at end of file
+    "name": "\u0015wGn󳔃𤠘1}\u0004gY.>=}",
+    "phone": "+08345603",
+    "role": "admin"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_15.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_15.json
index cccdbf2b27a..76b0fcf6745 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_15.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_15.json
@@ -1,7 +1,7 @@
 {
     "email": "U@􈘸",
-    "phone": "+19939600",
     "locale": null,
-    "role": "owner",
-    "name": "y􍭊5󴍽ˆS󸱽\u0014\rH/_\u0013A\u0003𝈯0w\u001d?TQd*1&[?cHW}只󹔖\u0018𬅖Q+\u0003mh󳀫X\u000e\u0005\u0011^g𣐎\u0008qrNV\u000e􋖒WMe\u0007\u0005"
-}
\ No newline at end of file
+    "name": "y􍭊5󴍽ˆS󸱽\u0014\rH/_\u0013A\u0003𝈯0w\u001d?TQd*1&[?cHW}只󹔖\u0018𬅖Q+\u0003mh󳀫X\u000e\u0005\u0011^g𣐎\u0008qrNV\u000e􋖒WMe\u0007\u0005",
+    "phone": "+19939600",
+    "role": "owner"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_16.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_16.json
index 9a814274368..80a2ed29456 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_16.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_16.json
@@ -1,7 +1,7 @@
 {
     "email": "壧@\u0001",
-    "phone": "+3394446441",
     "locale": "om-BJ",
-    "role": "admin",
-    "name": null
-}
\ No newline at end of file
+    "name": null,
+    "phone": "+3394446441",
+    "role": "admin"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_17.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_17.json
index f43f997a3c2..10db3ce14b1 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_17.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_17.json
@@ -1,7 +1,7 @@
 {
     "email": "3\u000cC\u0017\"@\u00010x𝗢",
-    "phone": "+403706662",
     "locale": "kj-TC",
-    "role": "partner",
-    "name": null
-}
\ No newline at end of file
+    "name": null,
+    "phone": "+403706662",
+    "role": "partner"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_18.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_18.json
index 79338fa5999..bebfad27b85 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_18.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_18.json
@@ -1,7 +1,7 @@
 {
     "email": "\u0008\u0006b\n0@UJj&鞱",
-    "phone": "+8522016506548",
     "locale": "ku",
-    "role": "partner",
-    "name": "8VPAp𡧑2L<s\u0006t]􀳵󻋟G/\u000fQb􌙄<B\u0013󲽷kJ&󻅈\u0010\u0007 𐎁\u000e󱉝􌕄$𘐰\"u2g\u0005[<.N;%\u0019smꬅ*󻬭s𭇩DsCowW-􅍈&EF=\\H\u0015,Z\rJ\u0017w-\u0002\u0007hC`􆽅쵓1Ds^7Udh+e\u000cL Ld\u001bh&󴊹􍍾󻉓;𢯩\u0007󰩈Xp旘\u000eP\u0008\t𭮯􃦎.\u001ep"
-}
\ No newline at end of file
+    "name": "8VPAp𡧑2L<s\u0006t]􀳵󻋟G/\u000fQb􌙄<B\u0013󲽷kJ&󻅈\u0010\u0007 𐎁\u000e󱉝􌕄$𘐰\"u2g\u0005[<.N;%\u0019smꬅ*󻬭s𭇩DsCowW-􅍈&EF=\\H\u0015,Z\rJ\u0017w-\u0002\u0007hC`􆽅쵓1Ds^7Udh+e\u000cL Ld\u001bh&󴊹􍍾󻉓;𢯩\u0007󰩈Xp旘\u000eP\u0008\t𭮯􃦎.\u001ep",
+    "phone": "+8522016506548",
+    "role": "partner"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_19.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_19.json
index abf5cfb2e2e..33549517ca2 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_19.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_19.json
@@ -1,7 +1,7 @@
 {
     "email": "{:􈱞ꮫ@q{(>}𫙕",
-    "phone": "+858466407644169",
     "locale": null,
-    "role": "admin",
-    "name": "kl\u0003\u0004\u0016%s7󻼗fX󲹙A\u00087\u0011D\u0004\u0011𨔣sg)dD𦙚Rx[󺭌Tw𐨕\u001e\u001a􀑔z\\\u000f\u0005䊞l􉾾l|oKc\\(𭬥􌵬=脜2VI*􋖛2oTh&#+;o᎙dXA⽇=*􆗾Q󼂨{󲺕󠁑5}\u001d9D𭟸􃿙r􇸖P:<!|󴮫\u000b4Pt1󰌵g\u0008\u0002𥔬\rfY𡂦$_혹\"󼱵8"
-}
\ No newline at end of file
+    "name": "kl\u0003\u0004\u0016%s7󻼗fX󲹙A\u00087\u0011D\u0004\u0011𨔣sg)dD𦙚Rx[󺭌Tw𐨕\u001e\u001a􀑔z\\\u000f\u0005䊞l􉾾l|oKc\\(𭬥􌵬=脜2VI*􋖛2oTh&#+;o᎙dXA⽇=*􆗾Q󼂨{󲺕󠁑5}\u001d9D𭟸􃿙r􇸖P:<!|󴮫\u000b4Pt1󰌵g\u0008\u0002𥔬\rfY𡂦$_혹\"󼱵8",
+    "phone": "+858466407644169",
+    "role": "admin"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_2.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_2.json
index 18997f39e2a..c897523079e 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_2.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_2.json
@@ -1,7 +1,7 @@
 {
     "email": "E@/",
-    "phone": "+68739032374",
     "locale": "af-GH",
-    "role": null,
-    "name": null
-}
\ No newline at end of file
+    "name": null,
+    "phone": "+68739032374",
+    "role": null
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_20.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_20.json
index 57d487ea75c..6b4d6108c4a 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_20.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_20.json
@@ -1,7 +1,7 @@
 {
     "email": "􉋕X|J{@^",
-    "phone": "+07068986589",
     "locale": null,
-    "role": "owner",
-    "name": "N󷲥ఫqE􉔗,􅊹􆴍3-19bY\"Iz|BpQ􏬵\"\u0006dfC􋘕p\u000e󽝶%-Z\u001a􈗦!Z𦏱d\u000ba𪣞\u001b\u0008\u001bgb\u0008󶡫󳄾X}\u0002\\^􊡪9􏽡"
-}
\ No newline at end of file
+    "name": "N󷲥ఫqE􉔗,􅊹􆴍3-19bY\"Iz|BpQ􏬵\"\u0006dfC􋘕p\u000e󽝶%-Z\u001a􈗦!Z𦏱d\u000ba𪣞\u001b\u0008\u001bgb\u0008󶡫󳄾X}\u0002\\^􊡪9􏽡",
+    "phone": "+07068986589",
+    "role": "owner"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_3.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_3.json
index 74b2d149bbc..d3034e8561f 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_3.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_3.json
@@ -1,7 +1,7 @@
 {
     "email": "\u0016@􎟵Z󼠆we􍳁",
-    "phone": "+99763521777551",
     "locale": "lg-TZ",
-    "role": "admin",
-    "name": "樧􉀄\u000b𬜓𣙇G𮊳󾢯\u0003𬅝󿵮\u0003􆥂ZG􉙘\u0002+i뗰Ux\u001c\u001c5\u001b\u0007e⠽赿(3󶛃\\\t\u0004\u000b@\u0005s\r#R𡒰G'N^?\u0015B\u000c\u001c\u0000x󺀩@蓯􍸷􂛷`A]@蠞𠪜*󺔴N;\u0003\u001ch\u0008S\u001f\u001f\u000e`^qU<唫\u0016􋒇\u0003􏠉M\u000f󸷛ላ=zM[𬔐𧖦\n\u000f}\u0005󶆌\u0007aZI䣄\u0006E#G^t𤓍\u0010𦡎LY𬥠6vt\\"
-}
\ No newline at end of file
+    "name": "樧􉀄\u000b𬜓𣙇G𮊳󾢯\u0003𬅝󿵮\u0003􆥂ZG􉙘\u0002+i뗰Ux\u001c\u001c5\u001b\u0007e⠽赿(3󶛃\\\t\u0004\u000b@\u0005s\r#R𡒰G'N^?\u0015B\u000c\u001c\u0000x󺀩@蓯􍸷􂛷`A]@蠞𠪜*󺔴N;\u0003\u001ch\u0008S\u001f\u001f\u000e`^qU<唫\u0016􋒇\u0003􏠉M\u000f󸷛ላ=zM[𬔐𧖦\n\u000f}\u0005󶆌\u0007aZI䣄\u0006E#G^t𤓍\u0010𦡎LY𬥠6vt\\",
+    "phone": "+99763521777551",
+    "role": "admin"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_4.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_4.json
index 1de027247a0..289ed248ef2 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_4.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_4.json
@@ -1,7 +1,7 @@
 {
     "email": "@",
-    "phone": "+2467751810",
     "locale": null,
-    "role": "member",
-    "name": null
-}
\ No newline at end of file
+    "name": null,
+    "phone": "+2467751810",
+    "role": "member"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_5.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_5.json
index 05a1f393a83..05d1e087360 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_5.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_5.json
@@ -1,7 +1,7 @@
 {
     "email": "@㵫",
-    "phone": "+893213675",
     "locale": null,
-    "role": "admin",
-    "name": "𩼘􆹼􍙓\u00188=\n;}𩑞M\u0007o\u000b3+\n"
-}
\ No newline at end of file
+    "name": "𩼘􆹼􍙓\u00188=\n;}𩑞M\u0007o\u000b3+\n",
+    "phone": "+893213675",
+    "role": "admin"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_6.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_6.json
index 46d2a7627b8..46c298ed70f 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_6.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_6.json
@@ -1,7 +1,7 @@
 {
     "email": "ᦟ^\u0004\u0014@.}𫜁",
-    "phone": "+40418736542643",
     "locale": "da-ME",
-    "role": "partner",
-    "name": "\u001eD[alw\u001e\u0006P 󴅐\rO𪶖'8󱬇􈘭g W:8\u000b:-(`+𠇁\u001b_\u0018􍴾꽾(\"&\u0012NZ􈏥\u0006S\u0016LOW|p\u0019型1𪴜"
-}
\ No newline at end of file
+    "name": "\u001eD[alw\u001e\u0006P 󴅐\rO𪶖'8󱬇􈘭g W:8\u000b:-(`+𠇁\u001b_\u0018􍴾꽾(\"&\u0012NZ􈏥\u0006S\u0016LOW|p\u0019型1𪴜",
+    "phone": "+40418736542643",
+    "role": "partner"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_7.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_7.json
index 2daed7797ab..cac383a674d 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_7.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_7.json
@@ -1,7 +1,7 @@
 {
     "email": "g\u0000-J𐃗@\u0003H󼛨eU",
-    "phone": "+570029592986",
     "locale": null,
-    "role": "admin",
-    "name": null
-}
\ No newline at end of file
+    "name": null,
+    "phone": "+570029592986",
+    "role": "admin"
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_8.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_8.json
index dcec7ab0548..ef8d1d534d8 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_8.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_8.json
@@ -1,7 +1,7 @@
 {
     "email": "󻺜\u001ah\u0017b\u000f@",
-    "phone": "+6639325273",
     "locale": "ks-NL",
-    "role": null,
-    "name": "󽈦&f􍱒󹜫j5\u0018v]k󼫐󲝋c[󸵹󿬝\u0004w.uL~/"
-}
\ No newline at end of file
+    "name": "󽈦&f􍱒󹜫j5\u0018v]k󼫐󲝋c[󸵹󿬝\u0004w.uL~/",
+    "phone": "+6639325273",
+    "role": null
+}
diff --git a/libs/wire-api/test/golden/testObject_InvitationRequest_team_9.json b/libs/wire-api/test/golden/testObject_InvitationRequest_team_9.json
index 0c71c0f962d..5860ac99220 100644
--- a/libs/wire-api/test/golden/testObject_InvitationRequest_team_9.json
+++ b/libs/wire-api/test/golden/testObject_InvitationRequest_team_9.json
@@ -1,7 +1,7 @@
 {
     "email": "\\𪲌@",
-    "phone": "+69141326",
     "locale": "kj-FJ",
-    "role": "admin",
-    "name": "|H𬗕/%\u001eu󸻣7V𢪺*G\u0001E󲣻,󷹿WGtY\u0016*Nd𦐗{Pl"
-}
\ No newline at end of file
+    "name": "|H𬗕/%\u001eu󸻣7V𢪺*G\u0001E󲣻,󷹿WGtY\u0016*Nd𦐗{Pl",
+    "phone": "+69141326",
+    "role": "admin"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_1.json b/libs/wire-api/test/golden/testObject_Invitation_team_1.json
index 9398052dee4..9d611aa22e5 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_1.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_1.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-11T20:13:15.856Z",
+    "created_by": "00000002-0000-0000-0000-000100000001",
     "email": "\u001cY@7",
+    "id": "00000002-0000-0001-0000-000200000000",
+    "name": null,
     "phone": "+54687000371",
     "role": "admin",
-    "created_by": "00000002-0000-0000-0000-000100000001",
-    "name": null,
-    "created_at": "1864-05-11T20:13:15.856Z",
-    "team": "00000002-0000-0001-0000-000200000002",
-    "id": "00000002-0000-0001-0000-000200000000"
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_10.json b/libs/wire-api/test/golden/testObject_Invitation_team_10.json
index 303235ac392..447daf009cc 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_10.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_10.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-10T19:57:59.926Z",
+    "created_by": "00000002-0000-0000-0000-000000000002",
     "email": "\u0001@\u001a",
+    "id": "00000001-0000-0001-0000-000200000002",
+    "name": null,
     "phone": "+957591063736",
     "role": "partner",
-    "created_by": "00000002-0000-0000-0000-000000000002",
-    "name": null,
-    "created_at": "1864-05-10T19:57:59.926Z",
-    "team": "00000002-0000-0001-0000-000100000001",
-    "id": "00000001-0000-0001-0000-000200000002"
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_11.json b/libs/wire-api/test/golden/testObject_Invitation_team_11.json
index 008af943b4a..09e6c67ff7c 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_11.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_11.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-10T16:20:51.120Z",
+    "created_by": "00000000-0000-0002-0000-000100000000",
     "email": "6@􌷐N",
+    "id": "00000001-0000-0000-0000-000000000001",
+    "name": "􄘬,􍁨緌sC\nD\u001e󱫂*\u0011𧲍\u0011󲾁a󽌳𗿸{.熿𭒪빝𡨶9/ಇ<;$𭣘𠪹Z\u0005'󺠞!F􎉼󼪟n\"\n8\u001dH󼯢9𐪜z:d\u0010F𧕰y_w\ri轭!>󳓗䏩𝓖\u0008\u001a\u001c\u000fF%<𞢹\u000fh\u001b\u0003\u000f󲶳\u001fO\u0000g_𤻨뢪󺥟\u0004􂔤􊃫z~%IA'R\u0008󶽴Hv^󾲱wrjb\t𨭛\u0003",
     "phone": "+518729615781",
     "role": "admin",
-    "created_by": "00000000-0000-0002-0000-000100000000",
-    "name": "􄘬,􍁨緌sC\nD\u001e󱫂*\u0011𧲍\u0011󲾁a󽌳𗿸{.熿𭒪빝𡨶9/ಇ<;$𭣘𠪹Z\u0005'󺠞!F􎉼󼪟n\"\n8\u001dH󼯢9𐪜z:d\u0010F𧕰y_w\ri轭!>󳓗䏩𝓖\u0008\u001a\u001c\u000fF%<𞢹\u000fh\u001b\u0003\u000f󲶳\u001fO\u0000g_𤻨뢪󺥟\u0004􂔤􊃫z~%IA'R\u0008󶽴Hv^󾲱wrjb\t𨭛\u0003",
-    "created_at": "1864-05-10T16:20:51.120Z",
-    "team": "00000001-0000-0001-0000-000100000000",
-    "id": "00000001-0000-0000-0000-000000000001"
-}
\ No newline at end of file
+    "team": "00000001-0000-0001-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_12.json b/libs/wire-api/test/golden/testObject_Invitation_team_12.json
index 45e6a7811ac..866b59a7897 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_12.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_12.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-12T22:47:35.829Z",
+    "created_by": "00000002-0000-0002-0000-000000000000",
     "email": "󸐞𢜑\u001e@",
+    "id": "00000000-0000-0000-0000-000100000002",
+    "name": "\u0010Z+wd^𐘊􆃨1\u0002YdXt>􇺼LSB7F9\\𠿬\u0005\n󱂟\"🀡|\u0007𦠺'\u001bTygU􎍔R칖􅧠O4󼷁E9\"󸃐\u0012Re\u0005D}􀧨𧢧􍭝\u0008V𫋾%98'\u001e9\u00064yP𔗍㡀ř\u0007w\t􌄦\u000b􇋳xv/Yl󵢬𦯯",
     "phone": "+68945103783764",
     "role": "admin",
-    "created_by": "00000002-0000-0002-0000-000000000000",
-    "name": "\u0010Z+wd^𐘊􆃨1\u0002YdXt>􇺼LSB7F9\\𠿬\u0005\n󱂟\"🀡|\u0007𦠺'\u001bTygU􎍔R칖􅧠O4󼷁E9\"󸃐\u0012Re\u0005D}􀧨𧢧􍭝\u0008V𫋾%98'\u001e9\u00064yP𔗍㡀ř\u0007w\t􌄦\u000b􇋳xv/Yl󵢬𦯯",
-    "created_at": "1864-05-12T22:47:35.829Z",
-    "team": "00000000-0000-0000-0000-000000000002",
-    "id": "00000000-0000-0000-0000-000100000002"
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000000000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_13.json b/libs/wire-api/test/golden/testObject_Invitation_team_13.json
index 3e92f975dbc..789b4a32975 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_13.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_13.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-08T01:18:31.982Z",
+    "created_by": "00000001-0000-0002-0000-000100000002",
     "email": "@r",
+    "id": "00000002-0000-0000-0000-000200000002",
+    "name": "U",
     "phone": "+549940856897515",
     "role": "member",
-    "created_by": "00000001-0000-0002-0000-000100000002",
-    "name": "U",
-    "created_at": "1864-05-08T01:18:31.982Z",
-    "team": "00000002-0000-0001-0000-000000000001",
-    "id": "00000002-0000-0000-0000-000200000002"
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_14.json b/libs/wire-api/test/golden/testObject_Invitation_team_14.json
index eaf4b85a863..1f1ac31cc4d 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_14.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_14.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-12T23:54:25.090Z",
+    "created_by": "00000002-0000-0002-0000-000200000000",
     "email": "EI@{",
+    "id": "00000001-0000-0000-0000-000200000002",
+    "name": null,
     "phone": "+89058877371",
     "role": "owner",
-    "created_by": "00000002-0000-0002-0000-000200000000",
-    "name": null,
-    "created_at": "1864-05-12T23:54:25.090Z",
-    "team": "00000002-0000-0002-0000-000100000000",
-    "id": "00000001-0000-0000-0000-000200000002"
-}
\ No newline at end of file
+    "team": "00000002-0000-0002-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_15.json b/libs/wire-api/test/golden/testObject_Invitation_team_15.json
index 96d8329e5b5..8ec11e965f6 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_15.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_15.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-08T22:22:28.568Z",
+    "created_by": null,
     "email": ".@",
+    "id": "00000001-0000-0001-0000-000200000001",
+    "name": "𑜘\u001f&KIL\u0013􉋏![\n6􏙭HEj4E⽨UL\u001f>2􅝓_\nJ킢Pv\u000e\u000fR碱8\u0008mS뇆mE\u0007g\u0016\u0005%㣑\u000c!\u000b\u001f𝈊\u0005𭇱󿄈\u000e83!j𒁾\u001d􅣣,\u001e\u0018F􃞋􏈇U\u0019Jb\u0011j\u0019Y𖢐O󶃯",
     "phone": "+57741900390998",
     "role": "owner",
-    "created_by": null,
-    "name": "𑜘\u001f&KIL\u0013􉋏![\n6􏙭HEj4E⽨UL\u001f>2􅝓_\nJ킢Pv\u000e\u000fR碱8\u0008mS뇆mE\u0007g\u0016\u0005%㣑\u000c!\u000b\u001f𝈊\u0005𭇱󿄈\u000e83!j𒁾\u001d􅣣,\u001e\u0018F􃞋􏈇U\u0019Jb\u0011j\u0019Y𖢐O󶃯",
-    "created_at": "1864-05-08T22:22:28.568Z",
-    "team": "00000000-0000-0002-0000-000100000001",
-    "id": "00000001-0000-0001-0000-000200000001"
-}
\ No newline at end of file
+    "team": "00000000-0000-0002-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_16.json b/libs/wire-api/test/golden/testObject_Invitation_team_16.json
index fcc220df44b..1ade470dd6b 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_16.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_16.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-09T09:56:33.113Z",
+    "created_by": "00000001-0000-0000-0000-000100000001",
     "email": "\\@\"{",
+    "id": "00000001-0000-0002-0000-000200000001",
+    "name": "\u001d\u0014Q;6/_f*7􋅎\u000f+􊳊ꋢ9",
     "phone": null,
     "role": "partner",
-    "created_by": "00000001-0000-0000-0000-000100000001",
-    "name": "\u001d\u0014Q;6/_f*7􋅎\u000f+􊳊ꋢ9",
-    "created_at": "1864-05-09T09:56:33.113Z",
-    "team": "00000001-0000-0001-0000-000100000002",
-    "id": "00000001-0000-0002-0000-000200000001"
-}
\ No newline at end of file
+    "team": "00000001-0000-0001-0000-000100000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_17.json b/libs/wire-api/test/golden/testObject_Invitation_team_17.json
index 06deaeafa46..ffaa39fdfc5 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_17.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_17.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-08T06:30:23.239Z",
+    "created_by": "00000000-0000-0001-0000-000000000001",
     "email": "@\u0001[𗭟",
+    "id": "00000001-0000-0001-0000-000100000001",
+    "name": "Z\u001b9E\u0015鍌𔗕}(3m𗮙𗷤'􅺒.WY;\u001e8?v<J󴁾I\u001d󽕹=o󹉳5",
     "phone": "+04833096748487",
     "role": "admin",
-    "created_by": "00000000-0000-0001-0000-000000000001",
-    "name": "Z\u001b9E\u0015鍌𔗕}(3m𗮙𗷤'􅺒.WY;\u001e8?v<J󴁾I\u001d󽕹=o󹉳5",
-    "created_at": "1864-05-08T06:30:23.239Z",
-    "team": "00000002-0000-0001-0000-000000000002",
-    "id": "00000001-0000-0001-0000-000100000001"
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000000000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_18.json b/libs/wire-api/test/golden/testObject_Invitation_team_18.json
index 29f0cd3cf81..4d258109c2e 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_18.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_18.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-08T06:07:59.528Z",
+    "created_by": "00000002-0000-0000-0000-000100000001",
     "email": "\u0001@lꚴa",
+    "id": "00000002-0000-0001-0000-000100000002",
+    "name": "9𪨾{\u0002\\𫳍Ea\u0003.\\\u0003󽡧𢭚􁁞M/$\u0013󶗖\u0019\u0002sH𠻔𞄛H-|󶔾=A9#𝖴|j\u0019 \u0010%=o&-+6\tq􌜿`@N\r\u00035bi󾦛SBU\u000cH@\u000er\u00112ೀ\u001c🙹\u001e]]SS􀨾ho\nJ/󾡏#)RV+\u000e4𩛑0􇺹𫰣[q櫒D􁕭\u0019􆮡\"\u0000fl\u0011󶕏j>-􌮰\u0012󸀳",
     "phone": null,
     "role": "admin",
-    "created_by": "00000002-0000-0000-0000-000100000001",
-    "name": "9𪨾{\u0002\\𫳍Ea\u0003.\\\u0003󽡧𢭚􁁞M/$\u0013󶗖\u0019\u0002sH𠻔𞄛H-|󶔾=A9#𝖴|j\u0019 \u0010%=o&-+6\tq􌜿`@N\r\u00035bi󾦛SBU\u000cH@\u000er\u00112ೀ\u001c🙹\u001e]]SS􀨾ho\nJ/󾡏#)RV+\u000e4𩛑0􇺹𫰣[q櫒D􁕭\u0019􆮡\"\u0000fl\u0011󶕏j>-􌮰\u0012󸀳",
-    "created_at": "1864-05-08T06:07:59.528Z",
-    "team": "00000000-0000-0001-0000-000100000000",
-    "id": "00000002-0000-0001-0000-000100000002"
-}
\ No newline at end of file
+    "team": "00000000-0000-0001-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_19.json b/libs/wire-api/test/golden/testObject_Invitation_team_19.json
index 0d96fb8caca..4f087c6be4e 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_19.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_19.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-07T15:08:06.796Z",
+    "created_by": null,
     "email": "󸽎𗜲@(S\u0017",
+    "id": "00000001-0000-0002-0000-000000000001",
+    "name": "靸r𛋕\u0003Qi󴊗􌃗\u0019𩫻𒉓+􄮬Q?H=G-\u001e;􍝧\u000eq^K;a􀹚W\u0019 X𔖸􆂨>Mϔ朓jjbU-&󽼈v\u0000y𬙼\u0007|\u0016UfJCHjP\u000e􏘃浍DNA:~s",
     "phone": "+05787228893",
     "role": "member",
-    "created_by": null,
-    "name": "靸r𛋕\u0003Qi󴊗􌃗\u0019𩫻𒉓+􄮬Q?H=G-\u001e;􍝧\u000eq^K;a􀹚W\u0019 X𔖸􆂨>Mϔ朓jjbU-&󽼈v\u0000y𬙼\u0007|\u0016UfJCHjP\u000e􏘃浍DNA:~s",
-    "created_at": "1864-05-07T15:08:06.796Z",
-    "team": "00000000-0000-0000-0000-000200000000",
-    "id": "00000001-0000-0002-0000-000000000001"
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_2.json b/libs/wire-api/test/golden/testObject_Invitation_team_2.json
index c1a2a6bb689..c5227405c9f 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_2.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_2.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-12T14:47:35.551Z",
+    "created_by": "00000002-0000-0001-0000-000200000001",
     "email": "i@m_:",
+    "id": "00000002-0000-0001-0000-000100000002",
+    "name": "􄭇} 2pGEW+\rT𩹙p𪨳𦘢&𣫡v0\u0008",
     "phone": null,
     "role": "partner",
-    "created_by": "00000002-0000-0001-0000-000200000001",
-    "name": "􄭇} 2pGEW+\rT𩹙p𪨳𦘢&𣫡v0\u0008",
-    "created_at": "1864-05-12T14:47:35.551Z",
-    "team": "00000000-0000-0001-0000-000000000000",
-    "id": "00000002-0000-0001-0000-000100000002"
-}
\ No newline at end of file
+    "team": "00000000-0000-0001-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_20.json b/libs/wire-api/test/golden/testObject_Invitation_team_20.json
index 4a7c895e1c7..8a036b8aff6 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_20.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_20.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-12T08:07:17.747Z",
+    "created_by": "00000000-0000-0001-0000-000100000001",
     "email": "b@u9T",
+    "id": "00000002-0000-0001-0000-000000000001",
+    "name": null,
     "phone": "+27259486019",
     "role": "partner",
-    "created_by": "00000000-0000-0001-0000-000100000001",
-    "name": null,
-    "created_at": "1864-05-12T08:07:17.747Z",
-    "team": "00000001-0000-0000-0000-000000000000",
-    "id": "00000002-0000-0001-0000-000000000001"
-}
\ No newline at end of file
+    "team": "00000001-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_3.json b/libs/wire-api/test/golden/testObject_Invitation_team_3.json
index a42c4ac1139..81115420498 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_3.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_3.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-08T22:07:35.846Z",
+    "created_by": "00000001-0000-0002-0000-000200000001",
     "email": "@秕L",
+    "id": "00000002-0000-0001-0000-000100000002",
+    "name": null,
     "phone": null,
     "role": "partner",
-    "created_by": "00000001-0000-0002-0000-000200000001",
-    "name": null,
-    "created_at": "1864-05-08T22:07:35.846Z",
-    "team": "00000002-0000-0001-0000-000100000001",
-    "id": "00000002-0000-0001-0000-000100000002"
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_4.json b/libs/wire-api/test/golden/testObject_Invitation_team_4.json
index 8bf50c4454c..76282c46540 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_4.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_4.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-09T09:23:58.270Z",
+    "created_by": "00000000-0000-0000-0000-000200000001",
     "email": "^@e",
+    "id": "00000001-0000-0001-0000-000000000001",
+    "name": null,
     "phone": null,
     "role": "admin",
-    "created_by": "00000000-0000-0000-0000-000200000001",
-    "name": null,
-    "created_at": "1864-05-09T09:23:58.270Z",
-    "team": "00000000-0000-0000-0000-000100000000",
-    "id": "00000001-0000-0001-0000-000000000001"
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_5.json b/libs/wire-api/test/golden/testObject_Invitation_team_5.json
index 05eeaee3ef9..44a5cd464dc 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_5.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_5.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-09T03:42:15.266Z",
+    "created_by": null,
     "email": "\u0001V@f􉌩꧆",
+    "id": "00000000-0000-0002-0000-000000000002",
+    "name": "}G_𤃊`X󻋗𠆝󷲞L\"󿶗e6:E쨕󲟇f-$𠬒Z!s2p?#\tF 8𭿰𨕿󹵇\u0004􉢘*󸚄\u0016\u0010%Y𩀄>􏘍󾨶󺶘g\"􁥰\u001a\u001a𬇟ꦛ\u0004v𭽢,𩶐(\u001dQT𤪐;􃨚\u0005\u0017B􎇮H𩣓\\󾃾,Y",
     "phone": "+45207005641274",
     "role": "owner",
-    "created_by": null,
-    "name": "}G_𤃊`X󻋗𠆝󷲞L\"󿶗e6:E쨕󲟇f-$𠬒Z!s2p?#\tF 8𭿰𨕿󹵇\u0004􉢘*󸚄\u0016\u0010%Y𩀄>􏘍󾨶󺶘g\"􁥰\u001a\u001a𬇟ꦛ\u0004v𭽢,𩶐(\u001dQT𤪐;􃨚\u0005\u0017B􎇮H𩣓\\󾃾,Y",
-    "created_at": "1864-05-09T03:42:15.266Z",
-    "team": "00000002-0000-0000-0000-000000000001",
-    "id": "00000000-0000-0002-0000-000000000002"
-}
\ No newline at end of file
+    "team": "00000002-0000-0000-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_6.json b/libs/wire-api/test/golden/testObject_Invitation_team_6.json
index db5d82d9cad..c847dcf4a2e 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_6.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_6.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-09T08:56:40.919Z",
+    "created_by": "00000001-0000-0001-0000-000200000000",
     "email": "@OC",
+    "id": "00000001-0000-0002-0000-000100000000",
+    "name": "O~\u0014U\u001e?V3_𮬰Slh􅱬Q1󶻳j|~M7􊲚􋽼𗆨\u0011K􇍼Afs𫬇lGV􏱇]`o\u0019f蓤InvfDDy\\DI𧾱􊥩\u0017B𦷬F*X\u0001\u001a얔\u0003\u0010<\u0003\u0016c\u0010,p\u000b*󵢘Vn\u000cI𑈹xS\u0002V\u001b$\u0019u󴮖xl>\u0007Z\u00144e\u0014aZ",
     "phone": "+75547625285",
     "role": "admin",
-    "created_by": "00000001-0000-0001-0000-000200000000",
-    "name": "O~\u0014U\u001e?V3_𮬰Slh􅱬Q1󶻳j|~M7􊲚􋽼𗆨\u0011K􇍼Afs𫬇lGV􏱇]`o\u0019f蓤InvfDDy\\DI𧾱􊥩\u0017B𦷬F*X\u0001\u001a얔\u0003\u0010<\u0003\u0016c\u0010,p\u000b*󵢘Vn\u000cI𑈹xS\u0002V\u001b$\u0019u󴮖xl>\u0007Z\u00144e\u0014aZ",
-    "created_at": "1864-05-09T08:56:40.919Z",
-    "team": "00000001-0000-0000-0000-000000000001",
-    "id": "00000001-0000-0002-0000-000100000000"
-}
\ No newline at end of file
+    "team": "00000001-0000-0000-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_7.json b/libs/wire-api/test/golden/testObject_Invitation_team_7.json
index 326a227ed85..d4699fe74de 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_7.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_7.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-07T18:46:22.786Z",
+    "created_by": "00000000-0000-0002-0000-000100000000",
     "email": "oj@",
+    "id": "00000000-0000-0000-0000-000000000002",
+    "name": "\u0018.𛅷􈼞\u0010\u000c\u0010\u0018𤰤o;Yay:yY $\u0003<ͯ%@\u001fre>5L'R\u0013𫝳oy#]c4!𘖝U홊暧󾜸􃕢p_>f\u000e𪲈􇇪󳆗_Vm\u001f}\u0002Pz\r\u0005K\u000e+>󲆠\u0000𥝻?pu?r\u001b\u001a!?𩇕;ᦅS䥅\u0007􅠬\u0008󹹝<jo𘜏$\u0010-NM\u0000뒿􉉟\u0003\u0013lx3_!onＪ%C􀔵.C+\u001d𡉩韕<Dl 攅",
     "phone": "+6985664130",
     "role": "partner",
-    "created_by": "00000000-0000-0002-0000-000100000000",
-    "name": "\u0018.𛅷􈼞\u0010\u000c\u0010\u0018𤰤o;Yay:yY $\u0003<ͯ%@\u001fre>5L'R\u0013𫝳oy#]c4!𘖝U홊暧󾜸􃕢p_>f\u000e𪲈􇇪󳆗_Vm\u001f}\u0002Pz\r\u0005K\u000e+>󲆠\u0000𥝻?pu?r\u001b\u001a!?𩇕;ᦅS䥅\u0007􅠬\u0008󹹝<jo𘜏$\u0010-NM\u0000뒿􉉟\u0003\u0013lx3_!onＪ%C􀔵.C+\u001d𡉩韕<Dl 攅",
-    "created_at": "1864-05-07T18:46:22.786Z",
-    "team": "00000000-0000-0001-0000-000200000001",
-    "id": "00000000-0000-0000-0000-000000000002"
-}
\ No newline at end of file
+    "team": "00000000-0000-0001-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_8.json b/libs/wire-api/test/golden/testObject_Invitation_team_8.json
index 25aaa85b9e8..ecc3efb99c6 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_8.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_8.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-07T12:20:00.738Z",
+    "created_by": "00000002-0000-0000-0000-000100000001",
     "email": "@Y\u000cr",
+    "id": "00000000-0000-0002-0000-000200000000",
+    "name": "𐠈𥵚􍇡lE󱲨\u0016\rjI!@\u001e􋆛",
     "phone": "+7139802723",
     "role": "admin",
-    "created_by": "00000002-0000-0000-0000-000100000001",
-    "name": "𐠈𥵚􍇡lE󱲨\u0016\rjI!@\u001e􋆛",
-    "created_at": "1864-05-07T12:20:00.738Z",
-    "team": "00000000-0000-0000-0000-000200000001",
-    "id": "00000000-0000-0002-0000-000200000000"
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invitation_team_9.json b/libs/wire-api/test/golden/testObject_Invitation_team_9.json
index a5851236674..77549d87d65 100644
--- a/libs/wire-api/test/golden/testObject_Invitation_team_9.json
+++ b/libs/wire-api/test/golden/testObject_Invitation_team_9.json
@@ -1,10 +1,10 @@
 {
+    "created_at": "1864-05-06T13:15:34.606Z",
+    "created_by": "00000000-0000-0000-0000-000200000002",
     "email": "Qi𬺶@𣕏",
+    "id": "00000000-0000-0000-0000-000200000002",
+    "name": null,
     "phone": "+02556485737",
     "role": "admin",
-    "created_by": "00000000-0000-0000-0000-000200000002",
-    "name": null,
-    "created_at": "1864-05-06T13:15:34.606Z",
-    "team": "00000001-0000-0000-0000-000200000000",
-    "id": "00000000-0000-0000-0000-000200000002"
-}
\ No newline at end of file
+    "team": "00000001-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_1.json b/libs/wire-api/test/golden/testObject_Invite_user_1.json
index eaac42c2974..ad36ce865df 100644
--- a/libs/wire-api/test/golden/testObject_Invite_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Invite_user_1.json
@@ -1,14 +1,7 @@
 {
+    "conversation_role": "t0xs1a2pemtt5f133cklsuqsxvrq25q5awgxjbuf5m2hf679oxxjcop794lmnuj2rd3t1sp5qya0tmn4qhpw2wxepd",
     "users": [
         "00000002-0000-0058-0000-003c00000079",
-        "00000001-0000-0000-0000-000000000001",
-        "00000000-0000-0001-0000-000000000001",
-        "00000001-0000-0001-0000-000000000001",
-        "00000000-0000-0000-0000-000100000001",
-        "00000001-0000-0000-0000-000100000001",
-        "00000001-0000-0001-0000-000100000000",
-        "00000000-0000-0001-0000-000100000000",
-        "00000001-0000-0001-0000-000100000001"
-    ],
-    "conversation_role": "t0xs1a2pemtt5f133cklsuqsxvrq25q5awgxjbuf5m2hf679oxxjcop794lmnuj2rd3t1sp5qya0tmn4qhpw2wxepd"
-}
\ No newline at end of file
+        "00000001-0000-0000-0000-000000000001"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_10.json b/libs/wire-api/test/golden/testObject_Invite_user_10.json
deleted file mode 100644
index e7016d22fd9..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_10.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "users": [
-        "0000000d-0000-006e-0000-003c0000002b"
-    ],
-    "conversation_role": "kcir_y3vbqzd21zk8mni9ykpdcvv0lgw7yn8hsn9d10a4buteq0dget5f4spyn2dty21rs91bl27eimkuuysbo803zpoi8ujls2hl96_mazcr6zx2iwcd63jcwf"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_11.json b/libs/wire-api/test/golden/testObject_Invite_user_11.json
deleted file mode 100644
index 8c11b0b9fbe..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_11.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "users": [
-        "00000023-0000-0058-0000-005e00000038",
-        "00000055-0000-0062-0000-006a00000054"
-    ],
-    "conversation_role": "mi2o6aijp5vw63fptcb056791v9b0veom0q072oogofh70yepntd0nihi6bwgle87b1rtzpwrrfpv__"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_12.json b/libs/wire-api/test/golden/testObject_Invite_user_12.json
deleted file mode 100644
index 770a6bf8147..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_12.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "users": [
-        "0000006d-0000-0070-0000-005900000006",
-        "00000078-0000-007d-0000-001c0000007d"
-    ],
-    "conversation_role": "5fjm"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_13.json b/libs/wire-api/test/golden/testObject_Invite_user_13.json
deleted file mode 100644
index 7deebcc40c8..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_13.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "users": [
-        "00000055-0000-002e-0000-00210000000f",
-        "0000003b-0000-0027-0000-000a00000067"
-    ],
-    "conversation_role": "47kpu6zrm055rmo2oacehdtninwcsdrzixki1u3s3xyjvqns1g4qpipguuc8t5ttplttmv8zgjozuyy_z"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_14.json b/libs/wire-api/test/golden/testObject_Invite_user_14.json
deleted file mode 100644
index 1c808c95a1c..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_14.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "users": [
-        "00000064-0000-0050-0000-002b00000006",
-        "00000001-0000-0001-0000-000100000000",
-        "00000001-0000-0000-0000-000000000001",
-        "00000000-0000-0000-0000-000000000000",
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0000-0000-000100000000",
-        "00000001-0000-0000-0000-000000000000",
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0001-0000-000100000001"
-    ],
-    "conversation_role": "dez5nywlp2h2um8aygzz7sa4zs6pid50gry3c29_e6yaz3ssycowlty8sqgq8ng25v3g04lpz3yshfjyv6e0y7gw82h317kkmfvh_hr8sf_kt2s"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_15.json b/libs/wire-api/test/golden/testObject_Invite_user_15.json
deleted file mode 100644
index a0c74f4494a..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_15.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "users": [
-        "00000045-0000-0033-0000-003d0000001d",
-        "00000001-0000-0001-0000-000400000005",
-        "00000003-0000-0006-0000-000100000005"
-    ],
-    "conversation_role": "z41w"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_16.json b/libs/wire-api/test/golden/testObject_Invite_user_16.json
deleted file mode 100644
index db05c502f0e..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_16.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "users": [
-        "00000043-0000-005b-0000-006100000032",
-        "00000074-0000-0002-0000-004800000046"
-    ],
-    "conversation_role": "c3a16_lnrlljruno4q6z3qqx01kz1lmkyvuiif0zxrpf5pk0fyg5hpklnhndvdh05blk60mdwcrpy_5a1ng97rq1_a0ukeke5fhbq"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_17.json b/libs/wire-api/test/golden/testObject_Invite_user_17.json
deleted file mode 100644
index da6234691ea..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_17.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "users": [
-        "0000001c-0000-0067-0000-006400000024",
-        "00000001-0000-0001-0000-000000000000",
-        "00000000-0000-0000-0000-000000000001",
-        "00000000-0000-0000-0000-000000000001",
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0000-0000-000100000001",
-        "00000000-0000-0001-0000-000100000001",
-        "00000000-0000-0001-0000-000000000001",
-        "00000000-0000-0001-0000-000100000000",
-        "00000000-0000-0001-0000-000000000000",
-        "00000001-0000-0000-0000-000000000000",
-        "00000001-0000-0001-0000-000000000000",
-        "00000001-0000-0001-0000-000100000000",
-        "00000001-0000-0000-0000-000000000001",
-        "00000000-0000-0000-0000-000100000000",
-        "00000000-0000-0000-0000-000100000000"
-    ],
-    "conversation_role": "sa3ntyz5lxg170v0ayym1u7lcqye396ecvluh4il1yseihpxa_atjcvkotby82epy3brf71ehgqyazwkkr"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_18.json b/libs/wire-api/test/golden/testObject_Invite_user_18.json
deleted file mode 100644
index 7a85212d7d9..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_18.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "users": [
-        "00000042-0000-0029-0000-005d00000023"
-    ],
-    "conversation_role": "irsnx2fz8pnkdkf8mbgdb7jresq80op5m3956474u_jm_nq8gcab4sq3jw_ucihknqx081s2zx1t784r7fb1"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_19.json b/libs/wire-api/test/golden/testObject_Invite_user_19.json
deleted file mode 100644
index ff78559b280..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_19.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "users": [
-        "00000054-0000-006e-0000-005900000052",
-        "00000034-0000-0050-0000-00220000001a"
-    ],
-    "conversation_role": "bt524if4uaj9czwp_1xl72"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_2.json b/libs/wire-api/test/golden/testObject_Invite_user_2.json
deleted file mode 100644
index 469e751cace..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "users": [
-        "00000003-0000-0038-0000-000000000030"
-    ],
-    "conversation_role": "c8wyxwm1r2tphgh4b9yirte060ts3y5tywdisg_uyon1gpkoyahu0cg6e0n0n1d0799qoozn4gdb5nt3ll1cpe7u_rx8vbs9jgk1z8yuw2voczlfnf8a5"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_20.json b/libs/wire-api/test/golden/testObject_Invite_user_20.json
deleted file mode 100644
index 4b88d0d28e2..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_20.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "users": [
-        "00000025-0000-0034-0000-007900000003",
-        "00000005-0000-0002-0000-000000000000",
-        "00000007-0000-0008-0000-000300000001"
-    ],
-    "conversation_role": "s2tpmghgh0ydx5rb41fjx9imc9p57hcodqazij95qub"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_3.json b/libs/wire-api/test/golden/testObject_Invite_user_3.json
deleted file mode 100644
index 1797d5d0d67..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "users": [
-        "0000001f-0000-005b-0000-00760000005e"
-    ],
-    "conversation_role": "57v38roxp_86gpipmiu"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_4.json b/libs/wire-api/test/golden/testObject_Invite_user_4.json
deleted file mode 100644
index f6e85202372..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "users": [
-        "00000034-0000-0024-0000-004b00000050"
-    ],
-    "conversation_role": "079hquxvhsq317aiqzaqh_xtnlwq2ob5gorilte_6xb7ifqlteayz265glnx4l2nyebn3q41mhd_zaiuqp5v2lg1oel7x1agaten1ejt9smdjbqtzk91bl_ony6m"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_5.json b/libs/wire-api/test/golden/testObject_Invite_user_5.json
deleted file mode 100644
index 698fd966165..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "users": [
-        "00000074-0000-0065-0000-000c00000019"
-    ],
-    "conversation_role": "nepk6pn_rztw8dwdfm"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_6.json b/libs/wire-api/test/golden/testObject_Invite_user_6.json
deleted file mode 100644
index 68924943b48..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_6.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "users": [
-        "0000004f-0000-0003-0000-007200000021",
-        "00000004-0000-0000-0000-000300000003",
-        "00000002-0000-0004-0000-000400000007"
-    ],
-    "conversation_role": "ay8e96nli_o326ctneqxefsl8o06fxn80lsdbfbxceb466ny7tlmq9xk_0eo145ijc0tmazk5ebmpvo91ds1nb5qx_yvecm1eb8prhx2wvic2"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_7.json b/libs/wire-api/test/golden/testObject_Invite_user_7.json
deleted file mode 100644
index 1b91304b45d..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_7.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "users": [
-        "0000000d-0000-003e-0000-007d00000011",
-        "00000004-0000-0004-0000-000400000000",
-        "00000002-0000-0004-0000-000200000004",
-        "00000002-0000-0001-0000-000100000003"
-    ],
-    "conversation_role": "te16fbrbv_frjr7z1cobf_qw3226r09h2ip6"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_8.json b/libs/wire-api/test/golden/testObject_Invite_user_8.json
deleted file mode 100644
index d395c4d1aa9..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_8.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "users": [
-        "00000072-0000-007b-0000-003b00000053",
-        "00000001-0000-0005-0000-000100000002",
-        "00000000-0000-0005-0000-000300000003"
-    ],
-    "conversation_role": "ne1ke5cw8eebnhze97"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Invite_user_9.json b/libs/wire-api/test/golden/testObject_Invite_user_9.json
deleted file mode 100644
index 664d8eec2ea..00000000000
--- a/libs/wire-api/test/golden/testObject_Invite_user_9.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "users": [
-        "0000000a-0000-0059-0000-004500000064",
-        "00000004-0000-0003-0000-000100000007",
-        "00000004-0000-0004-0000-000100000001"
-    ],
-    "conversation_role": "fpi6k1c5xsutublh8en17cdzfeucj3jj0xqydhrniuwh59w9dcousk6qpgmyxfz2yf33nzuvnbfu694jsk6nxo37x7dtmz4jt1qdtpr5ko09seqnrktdh9x2a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_1.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_1.json
index 45c98e17bbc..511f32938fd 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_1.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_1.json
@@ -1,4 +1,4 @@
 {
-    "key": "7",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "7"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_10.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_10.json
index 539c6aa2ade..33628b64861 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_10.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_10.json
@@ -1,4 +1,4 @@
 {
-    "key": "屺⥡Twq\u0014#a􋱽󾨛]\u0005#;\\󷹅ᄂW\u001e󻋶􉗺𥀪\u0016𧳎",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "屺⥡Twq\u0014#a􋱽󾨛]\u0005#;\\󷹅ᄂW\u001e󻋶􉗺𥀪\u0016𧳎"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_11.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_11.json
index a53646413f0..0f53f51760d 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_11.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_11.json
@@ -1,4 +1,4 @@
 {
-    "key": "ꓖ􏶻",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "ꓖ􏶻"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_12.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_12.json
index ff62c455057..2f9fe3721c8 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_12.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_12.json
@@ -1,4 +1,4 @@
 {
-    "key": "\\ኩ^X+rU􃵓0󾅁u{𡢜%rr􌚚ek\u000c\u001f𘜙𮙲mm\u0003pP𭵸",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "\\ኩ^X+rU􃵓0󾅁u{𡢜%rr􌚚ek\u000c\u001f𘜙𮙲mm\u0003pP𭵸"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_13.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_13.json
index 286ee95bda8..64d5bcd4ffe 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_13.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_13.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u000ci\u001e\u0007\u0015ih<]\u000fv0𮟞3鰰(3\u001e䆈",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "\u000ci\u001e\u0007\u0015ih<]\u000fv0𮟞3鰰(3\u001e䆈"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_14.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_14.json
index 6dd9e634449..15bc3cc2cff 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_14.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_14.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0002ᆱKP󹌠󱱏C_A𗢍|f#􊨽s\\!k9X,1",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "\u0002ᆱKP󹌠󱱏C_A𗢍|f#􊨽s\\!k9X,1"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_15.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_15.json
index 842f9608f16..9bac3c670ad 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_15.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_15.json
@@ -1,4 +1,4 @@
 {
-    "key": "󸋅𭪡\"m\u0017\t\u0015'",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "󸋅𭪡\"m\u0017\t\u0015'"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_16.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_16.json
index 2c90ac34133..c500066c97e 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_16.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_16.json
@@ -1,4 +1,4 @@
 {
-    "key": "z󻱭+XPHP:*",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "z󻱭+XPHP:*"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_17.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_17.json
index af2ce531874..0bc9e262f7c 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_17.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_17.json
@@ -1,4 +1,4 @@
 {
-    "key": "GVV墯󿬂",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "GVV墯󿬂"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_18.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_18.json
index ec3608f9c0e..9dacbdf5b6f 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_18.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_18.json
@@ -1,4 +1,4 @@
 {
-    "key": "j󵓢rﶈ=𢓦(𘚋kjnf0`\\",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "j󵓢rﶈ=𢓦(𘚋kjnf0`\\"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_19.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_19.json
index d65f6f73d96..a80e986b5c9 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_19.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_19.json
@@ -1,4 +1,4 @@
 {
-    "key": "􊑼0n\u0006^ \u0018􍪑NX𧓬\u0015􎵣,m󹷵",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "􊑼0n\u0006^ \u0018􍪑NX𧓬\u0015􎵣,m󹷵"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_2.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_2.json
index a95fba92da9..7447e973dd7 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_2.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_2.json
@@ -1,4 +1,4 @@
 {
-    "key": "󰋄𦆀􁷛\n􌠜?􏺻DMV쾻!K\u0011",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "󰋄𦆀􁷛\n􌠜?􏺻DMV쾻!K\u0011"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_20.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_20.json
index cea89a2dfe6..0c2cb976678 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_20.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_20.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0010􅠕~{T`󳦾􌎿z𢨡!Kf^󶴩LZ\"N5",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "\u0010􅠕~{T`󳦾􌎿z𢨡!Kf^󶴩LZ\"N5"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_3.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_3.json
index ed5cfeb2ea2..b1e35cd9150 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_3.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_3.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u001b󲗢\u0014\u0019󴸙􃚝\u000c\n\u001e􊣓\u001d@#C𓉽^3d\u001aa𨹨\u000b]l\u001c\tU󿩃4Ꙑ",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "\u001b󲗢\u0014\u0019󴸙􃚝\u000c\n\u001e􊣓\u001d@#C𓉽^3d\u001aa𨹨\u000b]l\u001c\tU󿩃4Ꙑ"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_4.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_4.json
index bdc93a1313b..09c9a3b2264 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_4.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_4.json
@@ -1,4 +1,4 @@
 {
-    "key": "",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_5.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_5.json
index 1b3454b1203..8e175c128e0 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_5.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_5.json
@@ -1,4 +1,4 @@
 {
-    "key": "폈",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "폈"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_6.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_6.json
index b53df525050..3b94fc0c494 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_6.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_6.json
@@ -1,4 +1,4 @@
 {
-    "key": "𩍫&]y󶣓𠪜l:^\u000c\u0012󻦻+ℂ)𧋹/􃬆",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "𩍫&]y󶣓𠪜l:^\u000c\u0012󻦻+ℂ)𧋹/􃬆"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_7.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_7.json
index bdc93a1313b..09c9a3b2264 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_7.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_7.json
@@ -1,4 +1,4 @@
 {
-    "key": "",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_8.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_8.json
index f4b0127cd8f..0950a4c923b 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_8.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_8.json
@@ -1,4 +1,4 @@
 {
-    "key": "𬮂x\u0011k%r󴷭pa󺦅3ꄭ𥺞\tA~v",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "𬮂x\u0011k%r󴷭pa󺦅3ꄭ𥺞\tA~v"
+}
diff --git a/libs/wire-api/test/golden/testObject_LastPrekey_user_9.json b/libs/wire-api/test/golden/testObject_LastPrekey_user_9.json
index e2d32225ee7..46615301b73 100644
--- a/libs/wire-api/test/golden/testObject_LastPrekey_user_9.json
+++ b/libs/wire-api/test/golden/testObject_LastPrekey_user_9.json
@@ -1,4 +1,4 @@
 {
-    "key": "x󰫁-Z\u001c\n:~\u0019𡷦\u0013KZ\u0004Ry(%z罤/|.EB𗲬",
-    "id": 65535
-}
\ No newline at end of file
+    "id": 65535,
+    "key": "x󰫁-Z\u001c\n:~\u0019𡷦\u0013KZ\u0004Ry(%z罤/|.EB𗲬"
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_1.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_1.json
index 55a6319f4a1..fdaebfe23a5 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_1.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_1.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000007-0000-0000-0000-000600000005",
     "client_id": "1d",
     "refresh_token": "i>\u0006O",
+    "team_id": "00000007-0000-0000-0000-000600000005",
     "user_id": "00000003-0000-0004-0000-000100000000"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_10.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_10.json
index e64a73e330c..0db069bd046 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_10.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_10.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000001-0000-0005-0000-000700000001",
     "client_id": "20",
     "refresh_token": "",
+    "team_id": "00000001-0000-0005-0000-000700000001",
     "user_id": "00000006-0000-0005-0000-000500000006"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_11.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_11.json
index 40e242b46ff..4b0fa0f0f41 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_11.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_11.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000002-0000-0005-0000-000400000007",
     "client_id": "0",
     "refresh_token": "𥟟@-c\u0005",
+    "team_id": "00000002-0000-0005-0000-000400000007",
     "user_id": "00000006-0000-0002-0000-000700000007"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_12.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_12.json
index c4c1cd30837..672cc4cae73 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_12.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_12.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000007-0000-0008-0000-000600000006",
     "client_id": "0",
     "refresh_token": "",
+    "team_id": "00000007-0000-0008-0000-000600000006",
     "user_id": "00000005-0000-0006-0000-000500000004"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_13.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_13.json
index 2ee76784dd2..9130ffaaa1e 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_13.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_13.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000004-0000-0000-0000-000100000007",
     "client_id": "c",
     "refresh_token": "DXD[",
+    "team_id": "00000004-0000-0000-0000-000100000007",
     "user_id": "00000002-0000-0005-0000-000600000005"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_14.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_14.json
index f87f786339e..7423e75fbcc 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_14.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_14.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000004-0000-0001-0000-000400000003",
     "client_id": "2",
     "refresh_token": "T􄳀\u0013𫙻\u0002",
+    "team_id": "00000004-0000-0001-0000-000400000003",
     "user_id": "00000007-0000-0003-0000-000200000003"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_15.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_15.json
index e142db51e9a..1085765f45f 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_15.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_15.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000004-0000-0003-0000-000100000004",
     "client_id": "1a",
     "refresh_token": "\n' \u001c~𡢇)",
+    "team_id": "00000004-0000-0003-0000-000100000004",
     "user_id": "00000005-0000-0005-0000-000300000007"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_16.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_16.json
index 91d14b08102..0e1faaefeb5 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_16.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_16.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000002-0000-0001-0000-000300000000",
     "client_id": "e",
     "refresh_token": "𐅻𧵈\n",
+    "team_id": "00000002-0000-0001-0000-000300000000",
     "user_id": "00000003-0000-0002-0000-000000000000"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_17.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_17.json
index 97fa33d4627..3dafa3dea0a 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_17.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_17.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000002-0000-0000-0000-000400000008",
     "client_id": "e",
     "refresh_token": "",
+    "team_id": "00000002-0000-0000-0000-000400000008",
     "user_id": "00000002-0000-0001-0000-000600000004"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_18.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_18.json
index 0d8775f2ecc..131733c04f9 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_18.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_18.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000006-0000-0003-0000-000100000005",
     "client_id": "11",
     "refresh_token": "Y󻒎",
+    "team_id": "00000006-0000-0003-0000-000100000005",
     "user_id": "00000006-0000-0000-0000-000800000004"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_19.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_19.json
index cf6a36f8358..6f4b9be7a24 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_19.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_19.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000001-0000-0003-0000-000600000000",
     "client_id": "1c",
     "refresh_token": "[",
+    "team_id": "00000001-0000-0003-0000-000600000000",
     "user_id": "00000003-0000-0006-0000-000700000002"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_2.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_2.json
index 90bac3144a5..04e8d21059a 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_2.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_2.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000007-0000-0004-0000-000600000002",
     "client_id": "15",
     "refresh_token": "\\i",
+    "team_id": "00000007-0000-0004-0000-000600000002",
     "user_id": "00000002-0000-0008-0000-000200000007"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_20.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_20.json
index 75673932558..154b8783add 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_20.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_20.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000006-0000-0001-0000-000500000008",
     "client_id": "1",
     "refresh_token": "i\u001c",
+    "team_id": "00000006-0000-0001-0000-000500000008",
     "user_id": "00000001-0000-0004-0000-000600000005"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_3.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_3.json
index 02997cebfc7..d8fe0054b34 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_3.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_3.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000003-0000-0005-0000-000100000001",
     "client_id": "4",
     "refresh_token": ")",
+    "team_id": "00000003-0000-0005-0000-000100000001",
     "user_id": "00000001-0000-0004-0000-000600000005"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_4.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_4.json
index 1230ed59492..96f2d5c2980 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_4.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_4.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000004-0000-0008-0000-000300000004",
     "client_id": "1b",
     "refresh_token": "W",
+    "team_id": "00000004-0000-0008-0000-000300000004",
     "user_id": "00000008-0000-0002-0000-000300000001"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_5.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_5.json
index 694190b5179..94aec8f7721 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_5.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_5.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000002-0000-0008-0000-000400000007",
     "client_id": "12",
     "refresh_token": "󹟔hL􍂭崰𫾇",
+    "team_id": "00000002-0000-0008-0000-000400000007",
     "user_id": "00000000-0000-0005-0000-000300000006"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_6.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_6.json
index 31cf033ca77..4674ca57a65 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_6.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_6.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000004-0000-0008-0000-000200000006",
     "client_id": "1",
     "refresh_token": "􊅝󰇡b",
+    "team_id": "00000004-0000-0008-0000-000200000006",
     "user_id": "00000005-0000-0002-0000-000300000003"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_7.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_7.json
index 04800877100..2fd9f36310b 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_7.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_7.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000006-0000-0004-0000-000500000003",
     "client_id": "1c",
     "refresh_token": "􀃬[\u0017u\r",
+    "team_id": "00000006-0000-0004-0000-000500000003",
     "user_id": "00000005-0000-0001-0000-000600000001"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_8.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_8.json
index 22516d3bf47..c2c75b63951 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_8.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_8.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000004-0000-0004-0000-000500000004",
     "client_id": "1f",
     "refresh_token": "ZU󱲛;\u001f\u001b",
+    "team_id": "00000004-0000-0004-0000-000500000004",
     "user_id": "00000003-0000-0008-0000-000200000001"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_9.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_9.json
index 23ff65f72ba..659092595c6 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_9.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceConfirm_team_9.json
@@ -1,6 +1,6 @@
 {
-    "team_id": "00000008-0000-0006-0000-000000000006",
     "client_id": "3",
     "refresh_token": "Y􉲾",
+    "team_id": "00000008-0000-0006-0000-000000000006",
     "user_id": "00000003-0000-0008-0000-000100000003"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_1.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_1.json
index 2f3598f46d8..0486a9283bb 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_1.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_1.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000001e-0000-000f-0000-007100000079",
     "user_id": "00000034-0000-0016-0000-003c00000024"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_10.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_10.json
index 744c52ba098..03bdfa92961 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_10.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_10.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000000d-0000-0013-0000-007100000063",
     "user_id": "00000077-0000-0003-0000-001b00000033"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_11.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_11.json
index e16b16adf18..d0e2464f10a 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_11.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_11.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000009-0000-007b-0000-00050000004b",
     "user_id": "00000062-0000-0018-0000-007b0000002e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_12.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_12.json
index 9606c58ee43..8c99f2a8e65 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_12.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_12.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000023-0000-0000-0000-004100000061",
     "user_id": "00000017-0000-0030-0000-002d0000002b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_13.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_13.json
index 844c62bf18a..67e2140a274 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_13.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_13.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000055-0000-0050-0000-000600000019",
     "user_id": "00000055-0000-005d-0000-00140000001a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_14.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_14.json
index 62d0e149ae4..388c2e9a932 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_14.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_14.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000001b-0000-005f-0000-006b00000040",
     "user_id": "00000015-0000-0061-0000-003e00000067"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_15.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_15.json
index 7ca5f0c0b80..79591c3552d 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_15.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_15.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000004e-0000-0066-0000-002c00000021",
     "user_id": "0000006a-0000-005d-0000-005d00000072"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_16.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_16.json
index fa6525c4ad0..6a71c6ec5c6 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_16.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_16.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000000d-0000-0001-0000-000500000049",
     "user_id": "0000005c-0000-0064-0000-00120000002a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_17.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_17.json
index d2cc0992846..130cc163be3 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_17.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_17.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000019-0000-002e-0000-005c00000010",
     "user_id": "00000068-0000-001b-0000-006a0000005a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_18.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_18.json
index f402f28794b..17ba095a31d 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_18.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_18.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000019-0000-003f-0000-007000000071",
     "user_id": "0000007d-0000-0044-0000-004d00000004"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_19.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_19.json
index abd18afe390..fb62a066aaa 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_19.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_19.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000014-0000-0022-0000-005a00000075",
     "user_id": "00000040-0000-0053-0000-00060000001b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_2.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_2.json
index 26063ba5c2c..68cf570501e 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_2.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_2.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000050-0000-0059-0000-004d00000067",
     "user_id": "0000004f-0000-0076-0000-001f00000019"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_20.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_20.json
index a960fd441ed..ba02dfea16f 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_20.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_20.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000006d-0000-006f-0000-007c0000006e",
     "user_id": "00000012-0000-005d-0000-00790000003e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_3.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_3.json
index 85c8e87086a..059084d01ed 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_3.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_3.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000006c-0000-005c-0000-002100000019",
     "user_id": "0000001a-0000-0072-0000-003e00000008"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_4.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_4.json
index 7ec04a154a9..84c9f3ee38f 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_4.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_4.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000007c-0000-0060-0000-007400000077",
     "user_id": "0000003c-0000-0013-0000-003b00000001"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_5.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_5.json
index e13503c9349..e7fe336fae4 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_5.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_5.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000003f-0000-002e-0000-003900000032",
     "user_id": "00000000-0000-005e-0000-00680000007c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_6.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_6.json
index 51d6f09f59e..1a4931a609c 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_6.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_6.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000005d-0000-0053-0000-005f00000044",
     "user_id": "0000004b-0000-0014-0000-007e00000010"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_7.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_7.json
index 3e346146864..3f58bdb6099 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_7.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_7.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000002d-0000-002b-0000-005c0000003c",
     "user_id": "0000002c-0000-0020-0000-003900000073"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_8.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_8.json
index be300abcf48..4d8757d78e7 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_8.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_8.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000060-0000-007d-0000-002c00000059",
     "user_id": "0000003a-0000-0066-0000-001a0000001e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_9.json b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_9.json
index a0c35d6043c..af27be7b6d1 100644
--- a/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_9.json
+++ b/libs/wire-api/test/golden/testObject_LegalHoldServiceRemove_team_9.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000006e-0000-0072-0000-00260000000a",
     "user_id": "00000037-0000-0024-0000-005e00000067"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_1.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_1.json
index 2265671d414..63f3733f538 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_1.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_1.json
@@ -53,4 +53,4 @@
             "id": "00007189-0000-04f6-0000-318500001872"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_10.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_10.json
index 546810c0daa..38c727a0480 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_10.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_10.json
@@ -61,4 +61,4 @@
             "id": "00003993-0000-0d94-0000-167f00006327"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_11.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_11.json
index 8ef631633ca..27e572e47b4 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_11.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_11.json
@@ -37,4 +37,4 @@
             "id": "000062a9-0000-147b-0000-0aa6000034ce"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_12.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_12.json
index c35b70f7399..038ac7ee718 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_12.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_12.json
@@ -53,4 +53,4 @@
             "id": "00004ec6-0000-429d-0000-5d5000005a14"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_13.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_13.json
index 098d8422e92..7bc72e714ba 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_13.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_13.json
@@ -65,4 +65,4 @@
             "id": "00000430-0000-2075-0000-4cd500004b77"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_14.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_14.json
index 2e5360f879a..f5bc7f05b95 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_14.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_14.json
@@ -49,4 +49,4 @@
             "id": "000005d7-0000-446c-0000-412000003819"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_15.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_15.json
index a95042e93a4..7adad4f4c85 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_15.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_15.json
@@ -65,4 +65,4 @@
             "id": "00005238-0000-7ca4-0000-4139000066a8"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_16.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_16.json
index b530c04c38c..0b7acce67a2 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_16.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_16.json
@@ -45,4 +45,4 @@
             "id": "00002eb2-0000-74bc-0000-028000006a15"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_17.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_17.json
index 0e4aa7168a5..e4e6bb5fa1f 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_17.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_17.json
@@ -77,4 +77,4 @@
             "id": "00000bdf-0000-6e75-0000-44dd00001d49"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_18.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_18.json
index fff9fd8b3c1..991ca118ded 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_18.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_18.json
@@ -61,4 +61,4 @@
             "id": "00006f73-0000-7cac-0000-247f00001533"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_19.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_19.json
index cf54cb5b451..0f4b0c4a1e3 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_19.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_19.json
@@ -81,4 +81,4 @@
             "id": "000024b2-0000-05a6-0000-0ed200007cdc"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_2.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_2.json
index 07db83fe462..61718b92d90 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_2.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_2.json
@@ -57,4 +57,4 @@
             "id": "00000c73-0000-44b8-0000-5712000045fc"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_20.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_20.json
index ad77febd5fa..c33bb858048 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_20.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_20.json
@@ -81,4 +81,4 @@
             "id": "00002e84-0000-3519-0000-3b410000306f"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_3.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_3.json
index 9bed4fe1438..e8fbf6e6bd8 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_3.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_3.json
@@ -81,4 +81,4 @@
             "id": "00005639-0000-6968-0000-5e500000794f"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_4.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_4.json
index e1a1cfbb990..a6c32dea3a4 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_4.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_4.json
@@ -65,4 +65,4 @@
             "id": "000037c4-0000-1e74-0000-531800003136"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_5.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_5.json
index 52c01da472c..a7d81c37056 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_5.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_5.json
@@ -9,4 +9,4 @@
             "id": "00003c26-0000-2af0-0000-517700000473"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_6.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_6.json
index 5642453a33a..58ad0617332 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_6.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_6.json
@@ -13,4 +13,4 @@
             "id": "00004bf5-0000-065d-0000-6d9900002a46"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_7.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_7.json
index e829f5ac948..9a8ee8a1d04 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_7.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_7.json
@@ -65,4 +65,4 @@
             "id": "00007e01-0000-208b-0000-5bde00007e98"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_8.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_8.json
index 769834a9c56..d66c321119e 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_8.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_8.json
@@ -25,4 +25,4 @@
             "id": "0000169c-0000-0d25-0000-3fbf00007bb7"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_9.json b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_9.json
index 1fef3e4df45..1c7bb5e9c74 100644
--- a/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_9.json
+++ b/libs/wire-api/test/golden/testObject_LimitedQualifiedUserIdList_2020_user_9.json
@@ -73,4 +73,4 @@
             "id": "00000e79-0000-4ab3-0000-57bb00007ca8"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ListConversationsV2_1.json b/libs/wire-api/test/golden/testObject_ListConversationsV2_1.json
new file mode 100644
index 00000000000..512485e00a5
--- /dev/null
+++ b/libs/wire-api/test/golden/testObject_ListConversationsV2_1.json
@@ -0,0 +1,12 @@
+{
+    "qualified_ids": [
+        {
+            "domain": "domain.example.com",
+            "id": "00000018-0000-0020-0000-000e00000002"
+        },
+        {
+            "domain": "domain2.example.com",
+            "id": "00000018-0000-0020-0000-111111111112"
+        }
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_1.json b/libs/wire-api/test/golden/testObject_ListType_team_1.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_1.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_1.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_10.json b/libs/wire-api/test/golden/testObject_ListType_team_10.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_10.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_10.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_11.json b/libs/wire-api/test/golden/testObject_ListType_team_11.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_11.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_11.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_12.json b/libs/wire-api/test/golden/testObject_ListType_team_12.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_12.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_12.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_13.json b/libs/wire-api/test/golden/testObject_ListType_team_13.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_13.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_13.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_14.json b/libs/wire-api/test/golden/testObject_ListType_team_14.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_14.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_14.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_15.json b/libs/wire-api/test/golden/testObject_ListType_team_15.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_15.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_15.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_16.json b/libs/wire-api/test/golden/testObject_ListType_team_16.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_16.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_16.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_17.json b/libs/wire-api/test/golden/testObject_ListType_team_17.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_17.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_17.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_18.json b/libs/wire-api/test/golden/testObject_ListType_team_18.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_18.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_18.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_19.json b/libs/wire-api/test/golden/testObject_ListType_team_19.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_19.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_19.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_2.json b/libs/wire-api/test/golden/testObject_ListType_team_2.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_2.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_2.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_20.json b/libs/wire-api/test/golden/testObject_ListType_team_20.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_20.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_20.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_3.json b/libs/wire-api/test/golden/testObject_ListType_team_3.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_3.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_3.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_4.json b/libs/wire-api/test/golden/testObject_ListType_team_4.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_4.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_4.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_5.json b/libs/wire-api/test/golden/testObject_ListType_team_5.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_5.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_5.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_6.json b/libs/wire-api/test/golden/testObject_ListType_team_6.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_6.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_6.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_7.json b/libs/wire-api/test/golden/testObject_ListType_team_7.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_7.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_7.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_8.json b/libs/wire-api/test/golden/testObject_ListType_team_8.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_8.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_8.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_ListType_team_9.json b/libs/wire-api/test/golden/testObject_ListType_team_9.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_ListType_team_9.json
+++ b/libs/wire-api/test/golden/testObject_ListType_team_9.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_1.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_1.json
index fff0ffc10e7..c0ac903a1c4 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "locale": "bo-DK"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_10.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_10.json
index 6eacde0ebf6..6bec5ec687f 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_10.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_10.json
@@ -1,3 +1,3 @@
 {
     "locale": "mi-SC"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_11.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_11.json
index 620cbd0f653..3519c8c2e70 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_11.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_11.json
@@ -1,3 +1,3 @@
 {
     "locale": "ts-NU"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_12.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_12.json
index efdc0d8c5b9..4deb88650e8 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_12.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_12.json
@@ -1,3 +1,3 @@
 {
     "locale": "ku"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_13.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_13.json
index 75856372120..d8874189b72 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_13.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_13.json
@@ -1,3 +1,3 @@
 {
     "locale": "ee-CH"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_14.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_14.json
index d141c84f934..67cf03e6e74 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_14.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_14.json
@@ -1,3 +1,3 @@
 {
     "locale": "kv-MT"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_15.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_15.json
index b0521b65d32..60e9e115025 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_15.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_15.json
@@ -1,3 +1,3 @@
 {
     "locale": "sa-CI"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_16.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_16.json
index 63317a40cd8..21c020d3718 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_16.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_16.json
@@ -1,3 +1,3 @@
 {
     "locale": "fa-MC"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_17.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_17.json
index 5e6cec50bfc..bd98ea081a1 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_17.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_17.json
@@ -1,3 +1,3 @@
 {
     "locale": "os-MD"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_18.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_18.json
index a3b30d363e3..e8929c14677 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_18.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_18.json
@@ -1,3 +1,3 @@
 {
     "locale": "hi-PG"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_19.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_19.json
index 93f9ba3885f..2baa5a37c53 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_19.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_19.json
@@ -1,3 +1,3 @@
 {
     "locale": "tn-SZ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_2.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_2.json
index 046b148243e..70a40a19b2d 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_2.json
@@ -1,3 +1,3 @@
 {
     "locale": "ii"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_20.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_20.json
index e0bfdef501d..1c972a1e127 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_20.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_20.json
@@ -1,3 +1,3 @@
 {
     "locale": "mi-ML"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_3.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_3.json
index 19715434608..96eeffb131f 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_3.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_3.json
@@ -1,3 +1,3 @@
 {
     "locale": "ik-BZ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_4.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_4.json
index e862cf3474d..947a4af33e0 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_4.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_4.json
@@ -1,3 +1,3 @@
 {
     "locale": "ve-AE"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_5.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_5.json
index f4ac60e5256..76473723125 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_5.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_5.json
@@ -1,3 +1,3 @@
 {
     "locale": "to-SY"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_6.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_6.json
index b10bbb9e673..6138a414def 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_6.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_6.json
@@ -1,3 +1,3 @@
 {
     "locale": "rw-AG"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_7.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_7.json
index 9fabb762214..94db2a1b356 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_7.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_7.json
@@ -1,3 +1,3 @@
 {
     "locale": "gu"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_8.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_8.json
index 62d02342928..43d2f29f522 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_8.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_8.json
@@ -1,3 +1,3 @@
 {
     "locale": "kv"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_9.json b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_9.json
index a5c49df7a75..a3ae1fb858c 100644
--- a/libs/wire-api/test/golden/testObject_LocaleUpdate_user_9.json
+++ b/libs/wire-api/test/golden/testObject_LocaleUpdate_user_9.json
@@ -1,3 +1,3 @@
 {
     "locale": "fy"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_1.json b/libs/wire-api/test/golden/testObject_Locale_user_1.json
index d87708d768d..d822ad0a129 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_1.json
@@ -1 +1 @@
-"bn"
\ No newline at end of file
+"bn"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_10.json b/libs/wire-api/test/golden/testObject_Locale_user_10.json
index 8021be67800..27920e8c2e6 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_10.json
@@ -1 +1 @@
-"bn-HT"
\ No newline at end of file
+"bn-HT"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_11.json b/libs/wire-api/test/golden/testObject_Locale_user_11.json
index 15735c260c6..666775a1bfe 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_11.json
@@ -1 +1 @@
-"es-IN"
\ No newline at end of file
+"es-IN"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_12.json b/libs/wire-api/test/golden/testObject_Locale_user_12.json
index 661e5625f67..dc4af1c71f1 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_12.json
@@ -1 +1 @@
-"es-LK"
\ No newline at end of file
+"es-LK"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_13.json b/libs/wire-api/test/golden/testObject_Locale_user_13.json
index 10f00fbf15c..6600af11a55 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_13.json
@@ -1 +1 @@
-"cv"
\ No newline at end of file
+"cv"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_14.json b/libs/wire-api/test/golden/testObject_Locale_user_14.json
index a919432b950..45a5b58729c 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_14.json
@@ -1 +1 @@
-"yo-PS"
\ No newline at end of file
+"yo-PS"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_15.json b/libs/wire-api/test/golden/testObject_Locale_user_15.json
index fbe5fed7f27..bd877f43775 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_15.json
@@ -1 +1 @@
-"da"
\ No newline at end of file
+"da"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_16.json b/libs/wire-api/test/golden/testObject_Locale_user_16.json
index 4a5b011f33e..4505f78c59b 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_16.json
@@ -1 +1 @@
-"af-DO"
\ No newline at end of file
+"af-DO"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_17.json b/libs/wire-api/test/golden/testObject_Locale_user_17.json
index 026d71068f0..f807ca9cfb9 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_17.json
@@ -1 +1 @@
-"ms"
\ No newline at end of file
+"ms"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_18.json b/libs/wire-api/test/golden/testObject_Locale_user_18.json
index bc897fceb20..2602f7ac2e5 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_18.json
@@ -1 +1 @@
-"oc"
\ No newline at end of file
+"oc"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_19.json b/libs/wire-api/test/golden/testObject_Locale_user_19.json
index bc897fceb20..2602f7ac2e5 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_19.json
@@ -1 +1 @@
-"oc"
\ No newline at end of file
+"oc"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_2.json b/libs/wire-api/test/golden/testObject_Locale_user_2.json
index b9bcac4e50c..1b446746385 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_2.json
@@ -1 +1 @@
-"mn-MA"
\ No newline at end of file
+"mn-MA"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_20.json b/libs/wire-api/test/golden/testObject_Locale_user_20.json
index daa7bd3138e..4eb5b179fe3 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_20.json
@@ -1 +1 @@
-"pt-LS"
\ No newline at end of file
+"pt-LS"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_3.json b/libs/wire-api/test/golden/testObject_Locale_user_3.json
index c314baafa58..14fe0ffddb7 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_3.json
@@ -1 +1 @@
-"sq"
\ No newline at end of file
+"sq"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_4.json b/libs/wire-api/test/golden/testObject_Locale_user_4.json
index f9bf20e74cd..783c7056d73 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_4.json
@@ -1 +1 @@
-"bg-VI"
\ No newline at end of file
+"bg-VI"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_5.json b/libs/wire-api/test/golden/testObject_Locale_user_5.json
index 8ec333e7687..05eca8a9905 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_5.json
@@ -1 +1 @@
-"mt"
\ No newline at end of file
+"mt"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_6.json b/libs/wire-api/test/golden/testObject_Locale_user_6.json
index 6d9dd03d3fd..dc514b23a4d 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_6.json
@@ -1 +1 @@
-"io-TL"
\ No newline at end of file
+"io-TL"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_7.json b/libs/wire-api/test/golden/testObject_Locale_user_7.json
index 23971e9484e..d5427f6e2c7 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_7.json
@@ -1 +1 @@
-"bn-IN"
\ No newline at end of file
+"bn-IN"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_8.json b/libs/wire-api/test/golden/testObject_Locale_user_8.json
index d7372c958e1..c9b65a43727 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_8.json
@@ -1 +1 @@
-"rm-EG"
\ No newline at end of file
+"rm-EG"
diff --git a/libs/wire-api/test/golden/testObject_Locale_user_9.json b/libs/wire-api/test/golden/testObject_Locale_user_9.json
index 2afce04f50b..1cfc21500cb 100644
--- a/libs/wire-api/test/golden/testObject_Locale_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Locale_user_9.json
@@ -1 +1 @@
-"os-CR"
\ No newline at end of file
+"os-CR"
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_1.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_1.json
index ca65dd2b749..a15cabd6319 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_1.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_1.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -25
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_10.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_10.json
index efbe3ecd81d..b800912da25 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_10.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_10.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -3
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_11.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_11.json
index cec82d83620..afe6ea9317c 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_11.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_11.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -1
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_12.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_12.json
index 9be5df72e7a..738f753aec3 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_12.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_12.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -2
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_13.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_13.json
index 735a96e7321..59f4b0f4294 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_13.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_13.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -30
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_14.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_14.json
index 7f2e2464fb9..e7b7d5a98ba 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_14.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_14.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -24
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_15.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_15.json
index 900c351375d..5fef770d2fa 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_15.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_15.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 6
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_16.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_16.json
index 942173a2b86..7820a8ab7d0 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_16.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_16.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 23
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_17.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_17.json
index b85b79dfd55..b7d252ba9ad 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_17.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_17.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 29
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_18.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_18.json
index 5274be652af..734626c38b9 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_18.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_18.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 22
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_19.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_19.json
index b8c2790fa68..56cb4122f57 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_19.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_19.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 7
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_2.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_2.json
index 10a68b6d398..97675ac25f0 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_2.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_2.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 20
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_20.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_20.json
index c7853655a2e..aa38c12d8d8 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_20.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_20.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -5
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_3.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_3.json
index b548425c56e..3f045158b6f 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_3.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_3.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 3
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_4.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_4.json
index 3c5cf0ece1e..e46d18ccab2 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_4.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_4.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -15
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_5.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_5.json
index 7f2e2464fb9..e7b7d5a98ba 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_5.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_5.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -24
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_6.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_6.json
index 10b9238d5fc..c8bfbd420e7 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_6.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_6.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -14
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_7.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_7.json
index 089f4da26d7..7d4d4e2eb4a 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_7.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_7.json
@@ -1,3 +1,3 @@
 {
     "expires_in": -27
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_8.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_8.json
index f48d7e8b55d..86121b370fe 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_8.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_8.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 12
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_9.json b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_9.json
index 248ce4e1481..d87db194df6 100644
--- a/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_9.json
+++ b/libs/wire-api/test/golden/testObject_LoginCodeTimeout_user_9.json
@@ -1,3 +1,3 @@
 {
     "expires_in": 21
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_1.json b/libs/wire-api/test/golden/testObject_LoginCode_user_1.json
index 5cfc39a2cbe..4b1e59f5eb5 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_1.json
@@ -1 +1 @@
-"\u0010~0j"
\ No newline at end of file
+"\u0010~0j"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_10.json b/libs/wire-api/test/golden/testObject_LoginCode_user_10.json
index 5515cca4a56..3f9a8745dd8 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_10.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_10.json
@@ -1 +1 @@
-"W\u001b\u0014u"
\ No newline at end of file
+"W\u001b\u0014u"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_11.json b/libs/wire-api/test/golden/testObject_LoginCode_user_11.json
index 76553f275f0..8a13a8efe15 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_11.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_11.json
@@ -1 +1 @@
-".Z\u000c󽧤Ux𣥼\u0002㻶\u0000\u0016S􊲝\u0013P󵄊\u0003|h󱇯"
\ No newline at end of file
+".Z\u000c󽧤Ux𣥼\u0002㻶\u0000\u0016S􊲝\u0013P󵄊\u0003|h󱇯"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_12.json b/libs/wire-api/test/golden/testObject_LoginCode_user_12.json
index 20c3504fa3f..d4f14ea6646 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_12.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_12.json
@@ -1 +1 @@
-"S!i5\u001a{󾚶!]\u0018ꍬ􇜐l"
\ No newline at end of file
+"S!i5\u001a{󾚶!]\u0018ꍬ􇜐l"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_13.json b/libs/wire-api/test/golden/testObject_LoginCode_user_13.json
index f4455a67b12..976aa4cbee9 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_13.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_13.json
@@ -1 +1 @@
-"}\u000fQ:阬⻲H􏜈\u0012T"
\ No newline at end of file
+"}\u000fQ:阬⻲H􏜈\u0012T"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_14.json b/libs/wire-api/test/golden/testObject_LoginCode_user_14.json
index 7a320c61ec3..6f65aa42664 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_14.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_14.json
@@ -1 +1 @@
-"7V𝃥𒅡/?O􈹍D\u0011"
\ No newline at end of file
+"7V𝃥𒅡/?O􈹍D\u0011"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_15.json b/libs/wire-api/test/golden/testObject_LoginCode_user_15.json
index 9eb8c9446a4..a9751fc8b96 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_15.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_15.json
@@ -1 +1 @@
-"r⮚L[눲c3e]􅺟N\u001a"
\ No newline at end of file
+"r⮚L[눲c3e]􅺟N\u001a"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_16.json b/libs/wire-api/test/golden/testObject_LoginCode_user_16.json
index f204faa46bb..a709f2e58e8 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_16.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_16.json
@@ -1 +1 @@
-"s􍃯"
\ No newline at end of file
+"s􍃯"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_17.json b/libs/wire-api/test/golden/testObject_LoginCode_user_17.json
index 2b0d6c88294..46b2fb806ec 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_17.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_17.json
@@ -1 +1 @@
-"A,gVB.Nf‿5󳿘[󾣊@􌬧="
\ No newline at end of file
+"A,gVB.Nf‿5󳿘[󾣊@􌬧="
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_18.json b/libs/wire-api/test/golden/testObject_LoginCode_user_18.json
index 1eecc60ba1c..f067a6d56e4 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_18.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_18.json
@@ -1 +1 @@
-"E􀐄_b^V\u0004\u001a>%芰B/g"
\ No newline at end of file
+"E􀐄_b^V\u0004\u001a>%芰B/g"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_19.json b/libs/wire-api/test/golden/testObject_LoginCode_user_19.json
index c05465df708..a66361856b9 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_19.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_19.json
@@ -1 +1 @@
-"z!@hZF\u001cj\u000b𡞊✚"
\ No newline at end of file
+"z!@hZF\u001cj\u000b𡞊✚"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_2.json b/libs/wire-api/test/golden/testObject_LoginCode_user_2.json
index 2d49e47d3c8..96e16361edc 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_2.json
@@ -1 +1 @@
-"A[jh<o󿅥?^s㧱u9\u0013\u000fOUC2?X𧍥㱱 \u0001`\r"
\ No newline at end of file
+"A[jh<o󿅥?^s㧱u9\u0013\u000fOUC2?X𧍥㱱 \u0001`\r"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_20.json b/libs/wire-api/test/golden/testObject_LoginCode_user_20.json
index 03d6a8146dd..132be98b2bf 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_20.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_20.json
@@ -1 +1 @@
-"\n&%3s:q󺨔󷴁cu\u001e\u0014p4.N􁔝T"
\ No newline at end of file
+"\n&%3s:q󺨔󷴁cu\u001e\u0014p4.N􁔝T"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_3.json b/libs/wire-api/test/golden/testObject_LoginCode_user_3.json
index 6a66e613b6d..1a048ef6d3f 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_3.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_3.json
@@ -1 +1 @@
-"=ul^鋃b𨐏􄻀h6"
\ No newline at end of file
+"=ul^鋃b𨐏􄻀h6"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_4.json b/libs/wire-api/test/golden/testObject_LoginCode_user_4.json
index 5bbfb1a4e7d..3d3bb244db0 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_4.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_4.json
@@ -1 +1 @@
-"."
\ No newline at end of file
+"."
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_5.json b/libs/wire-api/test/golden/testObject_LoginCode_user_5.json
index 4979d66a0fc..a71fa8a10cb 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_5.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_5.json
@@ -1 +1 @@
-"𪍚U8\\\u0016g\u0014􂝡󷙠\u0004:\u001fq\u001eV~_\u0000x"
\ No newline at end of file
+"𪍚U8\\\u0016g\u0014􂝡󷙠\u0004:\u001fq\u001eV~_\u0000x"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_6.json b/libs/wire-api/test/golden/testObject_LoginCode_user_6.json
index 593f12cb243..c82daaa4c22 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_6.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_6.json
@@ -1 +1 @@
-"M@\u0010*"
\ No newline at end of file
+"M@\u0010*"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_7.json b/libs/wire-api/test/golden/testObject_LoginCode_user_7.json
index 6bf22e1992d..87039f5bc71 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_7.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_7.json
@@ -1 +1 @@
-"\t󷜊B\u0004󵬑\u0004􏹟\r󺖴"
\ No newline at end of file
+"\t󷜊B\u0004󵬑\u0004􏹟\r󺖴"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_8.json b/libs/wire-api/test/golden/testObject_LoginCode_user_8.json
index a39dbe66f65..d2cfda4b563 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_8.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_8.json
@@ -1 +1 @@
-"⦾fd_]􊅡>\u000e姅\u0005la􋳥\u0018-\u001c\u0013}e"
\ No newline at end of file
+"⦾fd_]􊅡>\u000e姅\u0005la􋳥\u0018-\u001c\u0013}e"
diff --git a/libs/wire-api/test/golden/testObject_LoginCode_user_9.json b/libs/wire-api/test/golden/testObject_LoginCode_user_9.json
index cd7925eed7e..160d1d90b6c 100644
--- a/libs/wire-api/test/golden/testObject_LoginCode_user_9.json
+++ b/libs/wire-api/test/golden/testObject_LoginCode_user_9.json
@@ -1 +1 @@
-"f`j󴱼K\u001fm􎬧딅>\u0017%O"
\ No newline at end of file
+"f`j󴱼K\u001fm􎬧딅>\u0017%O"
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_1.json b/libs/wire-api/test/golden/testObject_LoginId_user_1.json
index 89876a8dc63..6da1b3e82f8 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_1.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_1.json
@@ -1,3 +1,3 @@
 {
     "email": "~]z^?j\u0015􉮏􏫮X{)􉙴t\u000c@􏯕\n\u000bL$\u0005Y\u0000Uj?H%"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_10.json b/libs/wire-api/test/golden/testObject_LoginId_user_10.json
index 11106940d37..59286829b46 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_10.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_10.json
@@ -1,3 +1,3 @@
 {
     "handle": "z58-6fbjhtx11d8t6oplyijpkc2.fp_lf3kpk3_.qle4iecjun2xd0tpcordlg2bwv636v3cthpgwah3undqmuofgzp8ry6gc6g-n-kxnj7sl6771hxou7-t_ps_lu_t3.4ukz6dh6fkjq2i3aggtkbpzbd1162.qv.rbtb6e.90-xpayg65z9t9lk2aur452zcs9a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_11.json b/libs/wire-api/test/golden/testObject_LoginId_user_11.json
index 0600e5163ca..8c7cad3cfab 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_11.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_11.json
@@ -1,3 +1,3 @@
 {
     "email": "𥦴𢒵A󻵨ovP Ig𖦢t';ᠷ\u0001C爄𦟀{\n%􊑂\u000b2\u001d𬅍􏫣&@m𫼩U{f&.3༆1?Ew短G-"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_12.json b/libs/wire-api/test/golden/testObject_LoginId_user_12.json
index 4e4d50fb004..ee43cc24642 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_12.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_12.json
@@ -1,3 +1,3 @@
 {
     "email": "@䜸\u0019+h\u0005(D\u000e灕󲤉 \u0007\r1"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_13.json b/libs/wire-api/test/golden/testObject_LoginId_user_13.json
index b9d3b24f9a6..8761ea668a0 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_13.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_13.json
@@ -1,3 +1,3 @@
 {
     "email": "5-h􋆢󶵘&$og􈰰晲󱣇<%ଧ\u000cGF-yJ\u000c*cK@*g\u0019𝞶7$L\u0018\tV􍇺D\u0007\\yK􊍌T"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_14.json b/libs/wire-api/test/golden/testObject_LoginId_user_14.json
index fad5d0d62d5..e2ef145546e 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_14.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_14.json
@@ -1,3 +1,3 @@
 {
     "phone": "+8668821360611"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_15.json b/libs/wire-api/test/golden/testObject_LoginId_user_15.json
index 3b28d100c2b..1ce0be5c9f2 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_15.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_15.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0006\u0005X\u0006&𗊭8󿃅7E`Y'\u0011TV\u0006\u0010@\u001d\u001bj󳼗,j󲺅󾭍#a1)}\u0013Vk\u0001Q7&;"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_16.json b/libs/wire-api/test/golden/testObject_LoginId_user_16.json
index 22ea4828355..010d203dde6 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_16.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_16.json
@@ -1,3 +1,3 @@
 {
     "email": "󷔯1@\u000b`\u0019순v􈔿;F䢺0ျSgu%>􆺅y\u000b󸣠\u0015𠢼\u001f󺘓\u0006s\u000f\u0007\u001f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_17.json b/libs/wire-api/test/golden/testObject_LoginId_user_17.json
index c6b2372c6fc..4c307e4295a 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_17.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_17.json
@@ -1,3 +1,3 @@
 {
     "handle": "e3iusdy"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_18.json b/libs/wire-api/test/golden/testObject_LoginId_user_18.json
index 3a47fde89e4..5d067be0f3e 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_18.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_18.json
@@ -1,3 +1,3 @@
 {
     "handle": "8vpices3usz1dfs4u2lf_e3jendod_szl1z111_eoj4b7k7ajj-xo.qzbw4espf3smnz_"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_19.json b/libs/wire-api/test/golden/testObject_LoginId_user_19.json
index cf3bf401152..adb91ee9260 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_19.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_19.json
@@ -1,3 +1,3 @@
 {
     "handle": "3jzpp2bo8"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_2.json b/libs/wire-api/test/golden/testObject_LoginId_user_2.json
index fc4c49f3d9b..104b2810dc6 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_2.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_2.json
@@ -1,3 +1,3 @@
 {
     "phone": "+178807168"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_20.json b/libs/wire-api/test/golden/testObject_LoginId_user_20.json
index e5418305a30..a361b16adfa 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_20.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_20.json
@@ -1,3 +1,3 @@
 {
     "email": "@𦃻"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_3.json b/libs/wire-api/test/golden/testObject_LoginId_user_3.json
index 95f17a76c38..7f8f368af3c 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_3.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_3.json
@@ -1,3 +1,3 @@
 {
     "email": "0􉵟^󴊽𣎋\u0000)|𬱓:@q6e/$󼐅Zb􀖑)󱿷05i乭~q􅨬🙈y"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_4.json b/libs/wire-api/test/golden/testObject_LoginId_user_4.json
index d60ed94e5c1..809acaf04c8 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_4.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_4.json
@@ -1,3 +1,3 @@
 {
     "handle": "7a8gg3v98"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_5.json b/libs/wire-api/test/golden/testObject_LoginId_user_5.json
index 93658c27fa1..ee5aa511ee7 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_5.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_5.json
@@ -1,3 +1,3 @@
 {
     "phone": "+041157889572"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_6.json b/libs/wire-api/test/golden/testObject_LoginId_user_6.json
index 44cc6a0e0be..0af8c1681cc 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_6.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_6.json
@@ -1,3 +1,3 @@
 {
     "phone": "+2351341820189"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_7.json b/libs/wire-api/test/golden/testObject_LoginId_user_7.json
index e66c971d00f..a0990b9f33e 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_7.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_7.json
@@ -1,3 +1,3 @@
 {
     "handle": "lb"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_8.json b/libs/wire-api/test/golden/testObject_LoginId_user_8.json
index 018c8059843..984511ad78b 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_8.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_8.json
@@ -1,3 +1,3 @@
 {
     "phone": "+2831673805093"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_LoginId_user_9.json b/libs/wire-api/test/golden/testObject_LoginId_user_9.json
index 6631244ae83..9d3fe372cee 100644
--- a/libs/wire-api/test/golden/testObject_LoginId_user_9.json
+++ b/libs/wire-api/test/golden/testObject_LoginId_user_9.json
@@ -1,3 +1,3 @@
 {
     "phone": "+1091378734554"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_1.json b/libs/wire-api/test/golden/testObject_Login_user_1.json
index cefa4ae181f..5bcec3392d3 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_1.json
@@ -1,5 +1,5 @@
 {
     "email": "4􅄛\u000bEaP@\u0005\n\u001c\u001b󳟬i03!",
-    "password": "\u00085Ta𤱷𭥜fa&󿳄o!ov\u000f􌥥i\u0014\u0003Y\u000eR󲁛􉋏Ta^s\u0017\u000f[𮊌󱛣枌\u00186\u0002p􅆖-9󰌏&\u0015􀶤]^㋴;>-Z$Z\u0015\r􌻮a\u001e%\u0000:𮄱먺𦝬?e]\u0003 𢴐 C\u0001\u000fS%8m􊦓V𣺻[󵪶6𩹚󶸓𨌰SX\n%􃆋*>\t+𠕋Y󱥶󲡂\u001dU􄨕6TU!*鲲90􁬜\u001eV𧪳N\t*\u0004{I<􈭶\u0001𬭌!c\\\n􎘭𬭪\u0011,-xX\u0019V?\t𩋈􁘟\u00121\u0001u\u0001콅\u000e+h\u0006::\u001e卬_g,\u000e*\u000b\u0014􋁎HFF𮇶􇻳fF\u001b2\u0001T\u0011)\u000cc豁l􃊫\u000c#~\u0002]󼭎/Or)kY󻳿\u0001NCk􄮲5􈡎x=H\u0000峐􂝖􌕙E/$pbi𡤲\u001cKi㴼󸤖\t7\"OL폀ᵜ5꧊\u0000(󻫄𨩲\u0001𤝟󲸓掩C==\u001dTV3l6󳹞.Z)$䅓|𪊼􊋿J;O\u001dbw\u000bI􌳠I\u0016\u0012^𤡾\u00023%i\u0019W𡵶\u0014􏸓tsL5𣺏W𗦼(_,􊙫*󾎇rckx\u0001\u000fs\u0001Jd𢔞\u0016ev.\u0014\u0010𘌊.􎍡󳚀𣁘\u001f_\u0017f\u0002\u000e\u0013󾴤6O\u0011Q\u0001'\u001d,|]W\u000fa𤸖.\u000b\u0007H&-L\u0012+𣻫􋝤\u0004m)䷕𬎛𬱈!𭎇𢹢m\u0014\u0013󼠪m\u001d𭒥>>\"NDw􆺍hY󼙧sFKz^ 􎣛5Qec\u0015}|􎣢.Q𪐺imb󺲔 p;􉸺\u0016􄌔kF􍐆r8o\u0011",
-    "label": "r"
-}
\ No newline at end of file
+    "label": "r",
+    "password": "\u00085Ta𤱷𭥜fa&󿳄o!ov\u000f􌥥i\u0014\u0003Y\u000eR󲁛􉋏Ta^s\u0017\u000f[𮊌󱛣枌\u00186\u0002p􅆖-9󰌏&\u0015􀶤]^㋴;>-Z$Z\u0015\r􌻮a\u001e%\u0000:𮄱먺𦝬?e]\u0003 𢴐 C\u0001\u000fS%8m􊦓V𣺻[󵪶6𩹚󶸓𨌰SX\n%􃆋*>\t+𠕋Y󱥶󲡂\u001dU􄨕6TU!*鲲90􁬜\u001eV𧪳N\t*\u0004{I<􈭶\u0001𬭌!c\\\n􎘭𬭪\u0011,-xX\u0019V?\t𩋈􁘟\u00121\u0001u\u0001콅\u000e+h\u0006::\u001e卬_g,\u000e*\u000b\u0014􋁎HFF𮇶􇻳fF\u001b2\u0001T\u0011)\u000cc豁l􃊫\u000c#~\u0002]󼭎/Or)kY󻳿\u0001NCk􄮲5􈡎x=H\u0000峐􂝖􌕙E/$pbi𡤲\u001cKi㴼󸤖\t7\"OL폀ᵜ5꧊\u0000(󻫄𨩲\u0001𤝟󲸓掩C==\u001dTV3l6󳹞.Z)$䅓|𪊼􊋿J;O\u001dbw\u000bI􌳠I\u0016\u0012^𤡾\u00023%i\u0019W𡵶\u0014􏸓tsL5𣺏W𗦼(_,􊙫*󾎇rckx\u0001\u000fs\u0001Jd𢔞\u0016ev.\u0014\u0010𘌊.􎍡󳚀𣁘\u001f_\u0017f\u0002\u000e\u0013󾴤6O\u0011Q\u0001'\u001d,|]W\u000fa𤸖.\u000b\u0007H&-L\u0012+𣻫􋝤\u0004m)䷕𬎛𬱈!𭎇𢹢m\u0014\u0013󼠪m\u001d𭒥>>\"NDw􆺍hY󼙧sFKz^ 􎣛5Qec\u0015}|􎣢.Q𪐺imb󺲔 p;􉸺\u0016􄌔kF􍐆r8o\u0011"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_10.json b/libs/wire-api/test/golden/testObject_Login_user_10.json
index 2de23690b1d..4c70905e87c 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_10.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+4211134144507",
     "code": "㑃𡃨!\u0017i􀖿",
-    "label": ""
-}
\ No newline at end of file
+    "label": "",
+    "phone": "+4211134144507"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_11.json b/libs/wire-api/test/golden/testObject_Login_user_11.json
index 76a890027bd..00eae0e5a33 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_11.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+338932197597737",
     "code": "􅅣+W\u00193",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "phone": "+338932197597737"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_12.json b/libs/wire-api/test/golden/testObject_Login_user_12.json
index 8a8fab4ad1b..8a64a9fb2f7 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_12.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+153353668",
+    "label": "\u000f🜓-𞡌:𡍁鮸\u0006\u000e",
     "password": "n􋜩Q𩗀\u001b󵅀&Q/\rdꠚ\u001f\u0004w2C\u0006􁹬𫝔\u0004\u0004v󶥜\u0008f,b\u0002󷜰'𪹐C]G듡󸓯𮤾4\u0000Y.𪘲\u000e3sI菌F􈲾5剑rG/:\"󷣦X띟6\u001c:\u0018\u0007eYwWT􈦚𡛑Msbm\u0015@󰗜󷜉\u0004^\u001c𣹘\u0015@\u0005>\u000c\u001eUc\u0004V9&cල\u0007󰱴a'PPG𘡝𫶶>[ൽ2ﷄXc𠃪[0󴲖\u0008𘕄B\u0011[󻑵\u001d䰻\u001f\u0019s-u\u0017s􄡽󵗐𧝿n􅳀?󿒋ck\u00148XC𪣑\u001eI2ମ\u0002\u0010M\u001b\n?<\\\u0013E𑨛\u001d\n$cyS𡐆!,\u000b9\u0017/\u0011?P\u0017ꌞ\u0012󴁱~􂟉W-W4K8.\u00127\u0019L􇌡h\u000f}t+H\u001a\u001bX𝛋s\u0004t𫘧taa\u001d\u000c𥌭(v󺈨M\u001bvg3P1󼊃]gཝ4T\u0015$镄);\\8􎲭\nK\u0015}D'^fJ'𢽥e𪟤骭!\u0019.\u0012{\\CEp󿎈\u0017k_􈨀䟝𨄪􃨬]MG$𭴂[E􏠾\u0008􆅏{b엚\u001b^b@W\u0015$\u001c<󹾗&𦅘R\u0006J\u000f􊷴􌳱ꇞn󵸞8]𤍀\u0005}|k\u0002\u0018Q\u001fI\u0007\u0018DZ􃟝\u0000쐕rb䨃3G%\u001c𧤡\u0004\u00154YB0-i󸣑IM􆋴[􏘂:Cr$𘔴)L𡚅W鿁.x;ꇵ󻨷󳃅\u001fkb\u0018Y9)\u00164\u000f􍙥Av.\r\u000c􃏥9{\u000e\u0017P\u000c茂u\r-9cB4󸄛G\u001e夡󷯔r📷HcsPms𝢛!|J<\u00108\u001c[\u0015WYAK𒔃^󰾪c3󾜀\u0007C\u0003\u0017􁐫Y\u0014f\u0006􃁑!󼀑:RlQ!BX\u000c=􅙦f𤽂𛰿O\u0003\\\"퀛B<\u001eLV4g%3􌅏\u0006`\u0015>\n깒kp󰯶𩷗H冘lyJ\u0012)􁦭(󺰛A\u001ch\u0004j観\u0014M\u001bP-q\u0008n\u0018𢿎~\u001d\u0019\"o合%*e2𨛝L󹼿sy𥕑2m\u001d􀇖{EG]\u00116B+{󰉆IYa󶈙5,<\u001bX\u000c\u000f𭣵𥢐E𠴇󶶐L<\u0019dUO\u0017\u001aZYm\u0006􉍰R\u001a󲋒\u0013^s\u000cu_g\u0019?i~}V2𤓉R\u001c\u00043j댑m؆􌱔\n7S\u000fT5j𩮢\u000f󷵝𢤓h𬣐Q𣲺\u0015ZM􏈮02f🤼l!*\u0001󺯙\u0001􅔰􋑷\t𑱥\u001ba:q UKEN\u001e-\n\u0003H坝a􆘓\u0008鉶\"󼳴𤢿󼎳R4\u0003\u0010\u001c\u0002󵓎%\"@󶛙6=/x\u0000P\u0004𪬗/𮙙\u000c\u000c󵙚?<T9\u000cI,瘋\u0014l#𡕝⣞_𛇋\u0001\u0017K?\u0003Q\u001dh􁤴C\r\u001f<}陏a?4^\u0014X\"w!􀨈 N'\u0019,=\u00145p􀆤Ur𨃁󴛗𝈁y󿜏 𓎀8\u001b\u0002 木KbY-\u0013\u0017{c\u0010y\tl\u0001>*\u000cIcKWQ\"󴣾P*􋢩6=d\n𦟰\u001e􉧚\u0004\u0012I릍U\u0008=Pc\u0010",
-    "label": "\u000f🜓-𞡌:𡍁鮸\u0006\u000e"
-}
\ No newline at end of file
+    "phone": "+153353668"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_13.json b/libs/wire-api/test/golden/testObject_Login_user_13.json
index a8241d96d59..5b2504ef693 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_13.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+626804710",
     "code": "&󾂂y",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "phone": "+626804710"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_14.json b/libs/wire-api/test/golden/testObject_Login_user_14.json
index 2c1e387fc5e..779e05afdc9 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_14.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+5693913858477",
     "code": "",
-    "label": "𗘼搊"
-}
\ No newline at end of file
+    "label": "𗘼搊",
+    "phone": "+5693913858477"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_15.json b/libs/wire-api/test/golden/testObject_Login_user_15.json
index fcb8307ed7f..b0b8cce642e 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_15.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+56208262",
     "code": "",
-    "label": "q\u0017(􉓔𭯸>8𢢂\n6"
-}
\ No newline at end of file
+    "label": "q\u0017(􉓔𭯸>8𢢂\n6",
+    "phone": "+56208262"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_16.json b/libs/wire-api/test/golden/testObject_Login_user_16.json
index 9fe71f1d7d7..778e9add165 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_16.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+588058222975",
     "code": "_􏊊󵇀􎨕-_\u0017",
-    "label": "\u000eL􇜨󶔫􂰈@\u001c\u0010$"
-}
\ No newline at end of file
+    "label": "\u000eL􇜨󶔫􂰈@\u001c\u0010$",
+    "phone": "+588058222975"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_17.json b/libs/wire-api/test/golden/testObject_Login_user_17.json
index d73030d577b..a211d02d3a9 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_17.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+3649176551364",
     "code": "\u00171󴷦n\u0010dV󻦊d\u0001",
-    "label": "􏣙{/p𘝶"
-}
\ No newline at end of file
+    "label": "􏣙{/p𘝶",
+    "phone": "+3649176551364"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_18.json b/libs/wire-api/test/golden/testObject_Login_user_18.json
index dd785b3e5b1..25726fe2df5 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_18.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+478931600",
     "code": ",𢆡㖮,",
-    "label": "5"
-}
\ No newline at end of file
+    "label": "5",
+    "phone": "+478931600"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_19.json b/libs/wire-api/test/golden/testObject_Login_user_19.json
index 91f9f80fe06..4fb0e32cbc2 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_19.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+92676996582869",
     "code": "x橷<",
-    "label": "w;U\u001bx:"
-}
\ No newline at end of file
+    "label": "w;U\u001bx:",
+    "phone": "+92676996582869"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_2.json b/libs/wire-api/test/golden/testObject_Login_user_2.json
index ae03e1f9ec3..ccab54a54bc 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_2.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+956057641851",
     "code": "\nG􆶪8\u0008",
-    "label": "G"
-}
\ No newline at end of file
+    "label": "G",
+    "phone": "+956057641851"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_20.json b/libs/wire-api/test/golden/testObject_Login_user_20.json
index fd6e1425b66..6e65bd2e8e5 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_20.json
@@ -1,5 +1,5 @@
 {
     "email": "[%@,",
-    "password": "ryzP\u00139⬓-1A)<r\r􂀼\u0005+R䚽]rwWyPauᬤ􃟏8S\u0017\n𫫧g\u0006:\u000f\u001c%nm1]\u0000􀚵\u0017岂):x𗏒䄆𮛍\u0010󺬑'\u001f\u001b󴀌Ag󲺨;l>\u0008,u℉j~0􊐔󼘏\u000cI𩤎er\u0014V|}'kzG%A;3H\u0007mD\u0002U1\u0000^󾴴\u0010O&5u\u0004\u001a𨲆0A󳍿X\u0012\u001c7fEt𗱖rPvytT𡛓!𘥩$Q|BI+EM5\u0015\tRKrE\u0010\u001f\r?.\u0002|@1v^\u000bycpu\n$\u0012𭤳𠊆-Q𤸩\n\r󼛽𐬝O\u0005*𐰴Z\u001fo\u0004n𮂕%&\u0013Me*\u0002;\u0010034\nv\u0015𢑮(􆤦󱮺n@􎥹|봥d\n*\u000f\u0000}\u0015A!󿕺󽃯Hx\u00173\u0002{#T|5|GC􉸮z.\u001fN􇸓圴\u000bu\u0016~LP𤁿CV\u000e q𥆐\u0012e8h\u001fg󸷞;\u000c󳌋􎫐At󹦊)\u001fG\u0013𨪍馩|󾙻\u000f𠮹\u0004c~6\u0010:u𨘑##^\nn{d\u0018\ng㽭\u001b\u001f\u001f~A8};T\u001e\u0015)&\u0008\u0006􎁼\u001d(\u0013u;􋐛;=e􀨚\"黝vCt)o󰽾mꮈ𓄈l1+󼿼[\u0002FLx􇹤:󻼥󲗰71/kE𖹛p\u0014Ij\u0017蓳&\u001a^\u001cl1\u0006󸺜\u0003W,+3🐺𗖷\u001077rG'􇚂JC9M􁑬\u0016\u0012괾>~󸇴Y􃒫=i-\u000cS𪆘𦍨K2-@\u0005\u000c􎭳_1D-&🖂lR𭭰/󲫄$:窷:찫Dg󷷋O󶧽𩢅\u000e𫹟2z\u0015q𢣫c\u001cliJ{􁲵􂳦'BL𩋞;\u0002󿤼䠋B\u0000ẟb􅶹:w􎠰Ad\u001a6\u0015oퟯ\nsPWM{\u0003fW󸨅JT󹖱$󱞍핐𮝮𪓋u4􍖶\t蓥󽱢\"𥚰UM􈫴􋛮蔹􍶭\t\nIn'􅗄剩㻛\u0019\u0011<\u000b\u0008W\u000f}𢧯\u0008􅳓󼰓\u001d`􋍃x\u0000󰼹K\u001cj􇟷\u0011\u000f𩐠d󲆄k4\u001a󶣔쌗^􀾃󸐫i2=$:[f􃺃\u0012n\u0015J<=߬\u000f!z􍷔\u000eN\u0015\u0019𬈌V󺍬CQ_G\nY#ky𠚫k\u0013\u0005}OC𗤶}~M\u0019p\u0003\u001ex\u0008𬺚􅽰\u00088/\u0014?􈄶B󺝎\u0004\u000eU󹏩\u001b=%읶J𩎗\u0017󲕑󱱨󰡢\to􌳬X_@@뀷ꮰ$",
-    "label": "􁫀\r9󳰔`\u0015x"
-}
\ No newline at end of file
+    "label": "􁫀\r9󳰔`\u0015x",
+    "password": "ryzP\u00139⬓-1A)<r\r􂀼\u0005+R䚽]rwWyPauᬤ􃟏8S\u0017\n𫫧g\u0006:\u000f\u001c%nm1]\u0000􀚵\u0017岂):x𗏒䄆𮛍\u0010󺬑'\u001f\u001b󴀌Ag󲺨;l>\u0008,u℉j~0􊐔󼘏\u000cI𩤎er\u0014V|}'kzG%A;3H\u0007mD\u0002U1\u0000^󾴴\u0010O&5u\u0004\u001a𨲆0A󳍿X\u0012\u001c7fEt𗱖rPvytT𡛓!𘥩$Q|BI+EM5\u0015\tRKrE\u0010\u001f\r?.\u0002|@1v^\u000bycpu\n$\u0012𭤳𠊆-Q𤸩\n\r󼛽𐬝O\u0005*𐰴Z\u001fo\u0004n𮂕%&\u0013Me*\u0002;\u0010034\nv\u0015𢑮(􆤦󱮺n@􎥹|봥d\n*\u000f\u0000}\u0015A!󿕺󽃯Hx\u00173\u0002{#T|5|GC􉸮z.\u001fN􇸓圴\u000bu\u0016~LP𤁿CV\u000e q𥆐\u0012e8h\u001fg󸷞;\u000c󳌋􎫐At󹦊)\u001fG\u0013𨪍馩|󾙻\u000f𠮹\u0004c~6\u0010:u𨘑##^\nn{d\u0018\ng㽭\u001b\u001f\u001f~A8};T\u001e\u0015)&\u0008\u0006􎁼\u001d(\u0013u;􋐛;=e􀨚\"黝vCt)o󰽾mꮈ𓄈l1+󼿼[\u0002FLx􇹤:󻼥󲗰71/kE𖹛p\u0014Ij\u0017蓳&\u001a^\u001cl1\u0006󸺜\u0003W,+3🐺𗖷\u001077rG'􇚂JC9M􁑬\u0016\u0012괾>~󸇴Y􃒫=i-\u000cS𪆘𦍨K2-@\u0005\u000c􎭳_1D-&🖂lR𭭰/󲫄$:窷:찫Dg󷷋O󶧽𩢅\u000e𫹟2z\u0015q𢣫c\u001cliJ{􁲵􂳦'BL𩋞;\u0002󿤼䠋B\u0000ẟb􅶹:w􎠰Ad\u001a6\u0015oퟯ\nsPWM{\u0003fW󸨅JT󹖱$󱞍핐𮝮𪓋u4􍖶\t蓥󽱢\"𥚰UM􈫴􋛮蔹􍶭\t\nIn'􅗄剩㻛\u0019\u0011<\u000b\u0008W\u000f}𢧯\u0008􅳓󼰓\u001d`􋍃x\u0000󰼹K\u001cj􇟷\u0011\u000f𩐠d󲆄k4\u001a󶣔쌗^􀾃󸐫i2=$:[f􃺃\u0012n\u0015J<=߬\u000f!z􍷔\u000eN\u0015\u0019𬈌V󺍬CQ_G\nY#ky𠚫k\u0013\u0005}OC𗤶}~M\u0019p\u0003\u001ex\u0008𬺚􅽰\u00088/\u0014?􈄶B󺝎\u0004\u000eU󹏩\u001b=%읶J𩎗\u0017󲕑󱱨󰡢\to􌳬X_@@뀷ꮰ$"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_3.json b/libs/wire-api/test/golden/testObject_Login_user_3.json
index e9aebe6ad7d..2bf69d1d46d 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_3.json
@@ -1,5 +1,5 @@
 {
     "handle": "c2wp.7s5.",
-    "password": "&\u001e\u0014􍢴ZⲚn\u000e𦯣󶳚/🄕<X\u001f𩿛\u001aa\u0007\u0003\u0010P󸭙\u00154B\u0007ꉍ𬬋9(\u001d쐘󱑼\u0005\u0001🚍Lll\nU\u001eS󵺾r-X<󵴥􁅷Y𡈐 @9󽆮Sl꜡􄉃V\u0015C:e\u0019𤷑\u001a1i\u0004M\u001dW󺩖\u001a1\n󱰅3T0v\u0012'󶏒𬦌I\u000f\u0003\u0010􇺰o>'􃡾m󶪩\"☬𡷝\u001e(&󳓮\u000ef1Wf'I\u000f𘞾󿫦󼛩\u0011Jq􀠱Y\\Bedu@󷭷c󵇒D쿛􀟶S𣐞\u0003\u0003W>󵜮\u0014\rSO8FXy𨮱a\u0019𩠡\u001aNF𦧁L\u001e$5\u0000k\u001ez*s𤔬𦤜\u000b𪴹\"SY\u0002󲶃􍚚ub5q\u0005󷨛\u000bN.\t𬳰:l􍷴\u001e󺺉\u0007𩁁\u000e\u000bt􌏐W\u0016󾟜􎿛\u0007'v\u0017䀘\u0015\u0002 \u0015\u0002숔,􏙎x󿱴^􄡷櫦I;\u0015b􊧑o𧯋_𮡒MME󹩀\u000f􋨼H;\u000e\u0017s\u000e􄏑{Knlrd;讦\u0014\u000f􆝀TO􊏡󴃗U뺓􌢗t􄺈^y䍴u$\u0011Jp􁙤𨐩𨉞\u0002\"􋛧*\u000e󵌎綦󱻌X􌑜\u0003sK}\u0008𣈮\u00000󱘴12𩱬\tM052𮑯\u00040\u001e󰰚􈴐{ji\u001b󹎀橻&t \u000f\u001by\u0007L𡎯𠇦󲫫\r􁡥ga,\u0014do,tx[I&\u0014h\u0010\u0003\u0010Bpm󴬴-\u0007]/ZI󼎝q]w3n뜿e岌kYo5􊔜'K􊄜}v𣵇;󸮨\\=ꄰ8g\u0010g*has걿󵨦\u0013\u001fYg?I䰆\u0015aW2𤮏m\t}h𥸙RbU\u0002\u0017lz2!\u0013JW5\u001b󺡬U\u000eg,rpOᛡ]0\u001bǟ󵞃F\u000f󿗪\u001e\u000e⺄rl􍦲~\u0006+Mn{5󲧸a\u00192\u000b{jM\u0017T􂔹$\u0011􌣆\u001dj_~Z󵸥P\u0001\u0004o@TJhk\u0004\u0017k:-𗥇[p\u0010\u0011\u001e'\r\u0002Q,,󸐢?H\rh瘑\rj𤈎\u0012\\(u\u001bu𥱑󴳈o\u0014󱕌􍙩􀶂\u0011q\u001d-\u0008齧\u0011qW>\u000cysῂ,'𧃒<",
-    "label": "􈏺𐌺>XC"
-}
\ No newline at end of file
+    "label": "􈏺𐌺>XC",
+    "password": "&\u001e\u0014􍢴ZⲚn\u000e𦯣󶳚/🄕<X\u001f𩿛\u001aa\u0007\u0003\u0010P󸭙\u00154B\u0007ꉍ𬬋9(\u001d쐘󱑼\u0005\u0001🚍Lll\nU\u001eS󵺾r-X<󵴥􁅷Y𡈐 @9󽆮Sl꜡􄉃V\u0015C:e\u0019𤷑\u001a1i\u0004M\u001dW󺩖\u001a1\n󱰅3T0v\u0012'󶏒𬦌I\u000f\u0003\u0010􇺰o>'􃡾m󶪩\"☬𡷝\u001e(&󳓮\u000ef1Wf'I\u000f𘞾󿫦󼛩\u0011Jq􀠱Y\\Bedu@󷭷c󵇒D쿛􀟶S𣐞\u0003\u0003W>󵜮\u0014\rSO8FXy𨮱a\u0019𩠡\u001aNF𦧁L\u001e$5\u0000k\u001ez*s𤔬𦤜\u000b𪴹\"SY\u0002󲶃􍚚ub5q\u0005󷨛\u000bN.\t𬳰:l􍷴\u001e󺺉\u0007𩁁\u000e\u000bt􌏐W\u0016󾟜􎿛\u0007'v\u0017䀘\u0015\u0002 \u0015\u0002숔,􏙎x󿱴^􄡷櫦I;\u0015b􊧑o𧯋_𮡒MME󹩀\u000f􋨼H;\u000e\u0017s\u000e􄏑{Knlrd;讦\u0014\u000f􆝀TO􊏡󴃗U뺓􌢗t􄺈^y䍴u$\u0011Jp􁙤𨐩𨉞\u0002\"􋛧*\u000e󵌎綦󱻌X􌑜\u0003sK}\u0008𣈮\u00000󱘴12𩱬\tM052𮑯\u00040\u001e󰰚􈴐{ji\u001b󹎀橻&t \u000f\u001by\u0007L𡎯𠇦󲫫\r􁡥ga,\u0014do,tx[I&\u0014h\u0010\u0003\u0010Bpm󴬴-\u0007]/ZI󼎝q]w3n뜿e岌kYo5􊔜'K􊄜}v𣵇;󸮨\\=ꄰ8g\u0010g*has걿󵨦\u0013\u001fYg?I䰆\u0015aW2𤮏m\t}h𥸙RbU\u0002\u0017lz2!\u0013JW5\u001b󺡬U\u000eg,rpOᛡ]0\u001bǟ󵞃F\u000f󿗪\u001e\u000e⺄rl􍦲~\u0006+Mn{5󲧸a\u00192\u000b{jM\u0017T􂔹$\u0011􌣆\u001dj_~Z󵸥P\u0001\u0004o@TJhk\u0004\u0017k:-𗥇[p\u0010\u0011\u001e'\r\u0002Q,,󸐢?H\rh瘑\rj𤈎\u0012\\(u\u001bu𥱑󴳈o\u0014󱕌􍙩􀶂\u0011q\u001d-\u0008齧\u0011qW>\u000cysῂ,'𧃒<"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_4.json b/libs/wire-api/test/golden/testObject_Login_user_4.json
index 30504279909..472dbd71aa8 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_4.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+04332691687649",
     "code": "𗈲m",
-    "label": ":"
-}
\ No newline at end of file
+    "label": ":",
+    "phone": "+04332691687649"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_5.json b/libs/wire-api/test/golden/testObject_Login_user_5.json
index c486f2473d0..13b2f46ee04 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_5.json
@@ -1,5 +1,5 @@
 {
     "handle": "c372iaa_v5onjcck67rlzq4dn5_oxhtx7dpx7v82lp1rhx0e97i26--8r3c6k773bxtlzmkjc20-11_047ydua_o9_5u4sll_fl3ng_0sa.",
-    "password": "𝘛𭆴DU󼸸hp󵱻t~\u0012\u0001\u0002*􁈚y1􇑮H𪒧{e\\S\u000e?c_7\t\u0014X𡀓6𪊲E𘝈j\u001a\t\u0016􉯿>HO]60󱭓\u0003\"+w,t􄐸\u0007k(b%u𤺝`>b󻂰e\u0006c𤽡􎠜)し7􈑠`𭟉yO+v%󼗀\rc<𐃤2>8u􋉲􇵝􏸗𒔙a𫯹\u0015=\u0004􆼝8R&j󾣆\u001b\t4sj-󲉛鷔n𡘽􃲙N\u001d\\󺡋𑩠5\r𗫬(P!爳棧\u0008􄫼Mr~﹣\u0019jt>Z\u001d~𢖼A󻲾\u000e\\>\u00116\">%댤􈵏I@u5𭷳\u000brY\r;7􅟌#􇒇󸇞\u0018'󾏵\u0019_I_zY󱂤𤟁\u0019d󽷤cd􃑯𡒆Cp3曕\u001dXj\n듡jy값\t-䩹ꥈd󿠓L\u001aYF\u0006POL헮\u0012\u0011\u0011\u0012*\r<X]󰯣𗬹\u0018P\u0018I3r𩅼\u000ec`.𠲝'4\u0004緛餓裸􉱝>H\u0010(?\u0013F擜\u0010\r]􅆋j𩣁 @\u0005T􌮍s\u001cF2\u0015]8\u0007\u0013!\u0015W𫅕􏌲K󺐢􏢞_%󴥚􏯭'􌆥𑋘(#\u0001ky\t\u0017!䒢\u0015\u0014\u001b{𝈕U2LS'",
-    "label": "LGz%𝒍j\u000c\u001e/\u0001"
-}
\ No newline at end of file
+    "label": "LGz%𝒍j\u000c\u001e/\u0001",
+    "password": "𝘛𭆴DU󼸸hp󵱻t~\u0012\u0001\u0002*􁈚y1􇑮H𪒧{e\\S\u000e?c_7\t\u0014X𡀓6𪊲E𘝈j\u001a\t\u0016􉯿>HO]60󱭓\u0003\"+w,t􄐸\u0007k(b%u𤺝`>b󻂰e\u0006c𤽡􎠜)し7􈑠`𭟉yO+v%󼗀\rc<𐃤2>8u􋉲􇵝􏸗𒔙a𫯹\u0015=\u0004􆼝8R&j󾣆\u001b\t4sj-󲉛鷔n𡘽􃲙N\u001d\\󺡋𑩠5\r𗫬(P!爳棧\u0008􄫼Mr~﹣\u0019jt>Z\u001d~𢖼A󻲾\u000e\\>\u00116\">%댤􈵏I@u5𭷳\u000brY\r;7􅟌#􇒇󸇞\u0018'󾏵\u0019_I_zY󱂤𤟁\u0019d󽷤cd􃑯𡒆Cp3曕\u001dXj\n듡jy값\t-䩹ꥈd󿠓L\u001aYF\u0006POL헮\u0012\u0011\u0011\u0012*\r<X]󰯣𗬹\u0018P\u0018I3r𩅼\u000ec`.𠲝'4\u0004緛餓裸􉱝>H\u0010(?\u0013F擜\u0010\r]􅆋j𩣁 @\u0005T􌮍s\u001cF2\u0015]8\u0007\u0013!\u0015W𫅕􏌲K󺐢􏢞_%󴥚􏯭'􌆥𑋘(#\u0001ky\t\u0017!䒢\u0015\u0014\u001b{𝈕U2LS'"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_6.json b/libs/wire-api/test/golden/testObject_Login_user_6.json
index b872944cfbe..27db0bca02d 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_6.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+930266260693371",
+    "label": "󷭄'󳩽KW\\\u0000\u0014",
     "password": "K?)V𤊊}_𭏷􃁘\u000cJ3!󰷕􃕍즟𨪷􅟘\u0007󷽻\u00017\\#z9𠥿􇽋󰩚󾏒\u0019\u0013𦈎'\r)~Ke9+𪷶𪺢󲭎M􌔩\"h\u0001Th\u0004`;\u0006􊶠\u0005󺦪'e{\u001cv鼵\u001f𢿻*㽬􆺦츟:E]:R􋂿K}l􏙠Y집􀋦S~\u0004#T󻓄1hIWn\u000b`놏Kb~\u001b\u0010dT\u001c\u000f􊨭f\u0017Y7\u001e𠋜\t󳸻㑦뱲\u001dG\u0013BH#\\RAd𨣓g􅳤􁙼\u000fk&\u0002E囉\u001c\u001c\u001c$t󴧥:O􌐑q}_󽯀.\u0001\u0014\u0002𦙎c`L>􀡸l􉔂m'BtB5󴼐,t\"􄕤9(#\u00054\u000fIy>󻯶􌫾\u001dbf\"i\u0017㠟a􉊡C@􇘼􊨩纟\u0015󳻹嬰*N\u0016\u001b:iXibA𡚓𩘤q􀁗]:9r𒁉\u0000􀢋\u001fCN\u001f𤃾􀁹󸐝eR\u001eZbD5!8N\u001bVᲰ\u0006𪐈\u001auz􁓾𭾔~\u001b\u000f%{3I/F抐/DMS\u001f>o𭬿Z􎬞\u001d[K𭇡𗇅􉭱󳀒\u001bO-4\u0018\u001f\u001cZp",
-    "label": "󷭄'󳩽KW\\\u0000\u0014"
-}
\ No newline at end of file
+    "phone": "+930266260693371"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_7.json b/libs/wire-api/test/golden/testObject_Login_user_7.json
index 758cd8c4c99..08463885c07 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_7.json
@@ -1,5 +1,5 @@
 {
     "email": "BG@⽩c\u000b}\u000fL$_",
-    "password": "&󲉊󹴌𔖘\u0002J<-~\u0002>\u000b𒇴𥄿5QN틐𨤨ql\u0015𒈲3}{\u0013𪒺S壓;\t7𬺖_F~D*f􀕔)􄥂-9僛7GK= %\u001e@kOF#𫻩􋌁𞡂8_ꕅ\u001dL鍂\u0003󿶊0Wl1A`LYz\u001fy僸\u001ao\u001b[\u0014\u0008t𐑐a\u0003s~\u001fF𪰤G`$\u000bG\u0011󾿅🙣/󷪺C>\u000f",
-    "label": "\u000e\u0015eC/"
-}
\ No newline at end of file
+    "label": "\u000e\u0015eC/",
+    "password": "&󲉊󹴌𔖘\u0002J<-~\u0002>\u000b𒇴𥄿5QN틐𨤨ql\u0015𒈲3}{\u0013𪒺S壓;\t7𬺖_F~D*f􀕔)􄥂-9僛7GK= %\u001e@kOF#𫻩􋌁𞡂8_ꕅ\u001dL鍂\u0003󿶊0Wl1A`LYz\u001fy僸\u001ao\u001b[\u0014\u0008t𐑐a\u0003s~\u001fF𪰤G`$\u000bG\u0011󾿅🙣/󷪺C>\u000f"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_8.json b/libs/wire-api/test/golden/testObject_Login_user_8.json
index 4ae51097dbd..5ac8f6d0b56 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_8.json
@@ -1,5 +1,5 @@
 {
     "email": "@~^G􆪐\\",
-    "password": "z>􉰃󺎇/𡞯􊳌\u0008%$󽖨𣄄:}\t\u0018􂜙󾺽)㊝󵙼s󵪾\u0018}鱢\u0019[ꅾ\u000bX#VG,df4𢢵8m5딝OTK𣑌鋎꺯◆Z\"ZS\u001bms|[Q%􉲡\u0005W\\󴖙C𭌈+􅕺ဒ䖡v𬁡ꎞ){󻆡𣃒f𭬔}:X-\u00082N\u0019\u001fl🎢쇈Y􅤡󷐛r2.1싸\u0004+𡥙\u0013𣡈]'󻂳s󳤴ꜵ.}𭋣o󲍶X𠜥⬅\r\u001aNq6󸻕'\u000cd\u001e㢧􋾜,:%\t𥅬𒃣QD􉖠\u001b(q4KDQ2zcI\u0010>\u00195󲤼1\u000cBkd\u0013\u0006:F:\u0004𘨥ⶂO N\u001c,N􁚶󴌷[h9ᜬ:xZ=\u000c􈾀\u0013u\u001e\u000ce#\u001a^$lkx耤 \rr\u001aJ󷝦󸓡\u001cR][_5\u0015ⷤ诃5惵􁮵󳗴鉅K!􁁠eRR%絬+h~1󲞮谟lTzS$\u0010􂶳\"*􉕷pmRE\u0013(\u001f^ὯJc➑􅫇i\n+G$|󲫉𦉻g\u001c\u000cgU3Y𝄜\u0006f)􊾺\u0016𓈄􌭞/\u0000Piꩦ{󿸟j􈞅\u001c9𠚽󺊬翉w$눟𞴦)Si𨴄牿FX􂋒j{`궤`󳿗𧁁4u%􅔪P*􂉻捎C\u001eR\u0016-잚󶽕g𐰺:S>c㮢𠝌\u0010Y􄝏~a)YW_J􃢤P\u0007+ U􈷓j\u0019k\u0001􋴘\u0011䣷e𪋘𪳠,ᐏg@\u0012\u001dHXl.\u0017𥣁2\u0013mY􁢫\tv?L8L􆍼N𠦽\nb1j󾸸𤋵xfQ=\\\u0005e󳇪󹽶U\u0012p{\u000e􌚌jd^@U󲯝tP.\u0012Y%R`a\r𧍮7}HnUf𠛸m^7:\u0015=챼>l𗑑hwp27𤦾jE\u000cx=!.\u0013]Ar\tw\u0014&\u001ak㒞s󾦄ᆒI𣪗􂼥dsY\u0010𬚢dX.𣭷i]𤹉󻃀\rWS\u001fU􌏬\u001a시􈨂\u0010\u0002N~-\u000e6𮙏􏄲\\O𭍍Jc􀻇􅢮\u0000HSo\u0010-W\u00136𩥑I􄺨)𘗘={𘗔h洹M󹩪FwJQ􏞨ck\u001a\u0018|UV-\u0015\u0001|\u0014;\u000c𦓫𣦃\u0005S\u0015.B\"D𧲿#o*𞹱胜m\u001e􀓪B3Gg;\u0011\\𬆳􌒮\u0005 B^\u000f𥐶$e餴𩠵>fMgC𭮌,o🗨\\?󼛣~/s\u0001?MMc;D18Ne\u0004\u0018)*\u0002\u001d㾌<r1IWrG雃𣨒◽32\u0008l4􇟪𮤼3'𥞌-8d\"\u001ee曁|n*a\u0011\u001d\u0006Q𮪵\nKu4k'󴗱􂀳NokNg\u001eZu􂽈9𢠠{JoE󹄭󼉋J5ln괄C1`7\u0019#3􄑁oh𧐭?nN󳋩vZPR7g􀂕;lF|wC𢢐RR85\u000bVC\u0019y%\u0003LjT𪽬\u000f@X𥏾䉘_6𡪹𛀌i쌦𣫠󺴲$@y𑙑t\u001c\u000eyZ\u0019A4뵭l0\u0010\u0016r4\u001d-\u0015~\u000e]=g.\u000e𭑸𑩝󵱿􄜕\u0012\u0000𬿼\u0002-n\u0001m𨓻_;𩿢􎼏ꥆ􌨬W\u0001r\u0016XGC󵓹\u000bF\u000f🡵\u001a\u0000~^~9e󷀩gv\u001e\u0018􆋋W[VJ(\\醄Tp3\u001bz\u0008\u0011h5󶐰𝡓@kL?Gh!\u0008uMH*m\u0001<𭶉\n!X?eV\u001emMt\u001a쏢􇂮V\u001d\r*{o<\u0002u󰚑\u0001.5\u001f\u0010󲧋\u0012􈎜􄤯%80'𔖩HJU",
-    "label": null
-}
\ No newline at end of file
+    "label": null,
+    "password": "z>􉰃󺎇/𡞯􊳌\u0008%$󽖨𣄄:}\t\u0018􂜙󾺽)㊝󵙼s󵪾\u0018}鱢\u0019[ꅾ\u000bX#VG,df4𢢵8m5딝OTK𣑌鋎꺯◆Z\"ZS\u001bms|[Q%􉲡\u0005W\\󴖙C𭌈+􅕺ဒ䖡v𬁡ꎞ){󻆡𣃒f𭬔}:X-\u00082N\u0019\u001fl🎢쇈Y􅤡󷐛r2.1싸\u0004+𡥙\u0013𣡈]'󻂳s󳤴ꜵ.}𭋣o󲍶X𠜥⬅\r\u001aNq6󸻕'\u000cd\u001e㢧􋾜,:%\t𥅬𒃣QD􉖠\u001b(q4KDQ2zcI\u0010>\u00195󲤼1\u000cBkd\u0013\u0006:F:\u0004𘨥ⶂO N\u001c,N􁚶󴌷[h9ᜬ:xZ=\u000c􈾀\u0013u\u001e\u000ce#\u001a^$lkx耤 \rr\u001aJ󷝦󸓡\u001cR][_5\u0015ⷤ诃5惵􁮵󳗴鉅K!􁁠eRR%絬+h~1󲞮谟lTzS$\u0010􂶳\"*􉕷pmRE\u0013(\u001f^ὯJc➑􅫇i\n+G$|󲫉𦉻g\u001c\u000cgU3Y𝄜\u0006f)􊾺\u0016𓈄􌭞/\u0000Piꩦ{󿸟j􈞅\u001c9𠚽󺊬翉w$눟𞴦)Si𨴄牿FX􂋒j{`궤`󳿗𧁁4u%􅔪P*􂉻捎C\u001eR\u0016-잚󶽕g𐰺:S>c㮢𠝌\u0010Y􄝏~a)YW_J􃢤P\u0007+ U􈷓j\u0019k\u0001􋴘\u0011䣷e𪋘𪳠,ᐏg@\u0012\u001dHXl.\u0017𥣁2\u0013mY􁢫\tv?L8L􆍼N𠦽\nb1j󾸸𤋵xfQ=\\\u0005e󳇪󹽶U\u0012p{\u000e􌚌jd^@U󲯝tP.\u0012Y%R`a\r𧍮7}HnUf𠛸m^7:\u0015=챼>l𗑑hwp27𤦾jE\u000cx=!.\u0013]Ar\tw\u0014&\u001ak㒞s󾦄ᆒI𣪗􂼥dsY\u0010𬚢dX.𣭷i]𤹉󻃀\rWS\u001fU􌏬\u001a시􈨂\u0010\u0002N~-\u000e6𮙏􏄲\\O𭍍Jc􀻇􅢮\u0000HSo\u0010-W\u00136𩥑I􄺨)𘗘={𘗔h洹M󹩪FwJQ􏞨ck\u001a\u0018|UV-\u0015\u0001|\u0014;\u000c𦓫𣦃\u0005S\u0015.B\"D𧲿#o*𞹱胜m\u001e􀓪B3Gg;\u0011\\𬆳􌒮\u0005 B^\u000f𥐶$e餴𩠵>fMgC𭮌,o🗨\\?󼛣~/s\u0001?MMc;D18Ne\u0004\u0018)*\u0002\u001d㾌<r1IWrG雃𣨒◽32\u0008l4􇟪𮤼3'𥞌-8d\"\u001ee曁|n*a\u0011\u001d\u0006Q𮪵\nKu4k'󴗱􂀳NokNg\u001eZu􂽈9𢠠{JoE󹄭󼉋J5ln괄C1`7\u0019#3􄑁oh𧐭?nN󳋩vZPR7g􀂕;lF|wC𢢐RR85\u000bVC\u0019y%\u0003LjT𪽬\u000f@X𥏾䉘_6𡪹𛀌i쌦𣫠󺴲$@y𑙑t\u001c\u000eyZ\u0019A4뵭l0\u0010\u0016r4\u001d-\u0015~\u000e]=g.\u000e𭑸𑩝󵱿􄜕\u0012\u0000𬿼\u0002-n\u0001m𨓻_;𩿢􎼏ꥆ􌨬W\u0001r\u0016XGC󵓹\u000bF\u000f🡵\u001a\u0000~^~9e󷀩gv\u001e\u0018􆋋W[VJ(\\醄Tp3\u001bz\u0008\u0011h5󶐰𝡓@kL?Gh!\u0008uMH*m\u0001<𭶉\n!X?eV\u001emMt\u001a쏢􇂮V\u001d\r*{o<\u0002u󰚑\u0001.5\u001f\u0010󲧋\u0012􈎜􄤯%80'𔖩HJU"
+}
diff --git a/libs/wire-api/test/golden/testObject_Login_user_9.json b/libs/wire-api/test/golden/testObject_Login_user_9.json
index a48c5f9dfe6..ad13cfbe0ec 100644
--- a/libs/wire-api/test/golden/testObject_Login_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Login_user_9.json
@@ -1,5 +1,5 @@
 {
     "handle": "6bolp",
-    "password": ">1/\t\u0015 󶫒󷘿z苐Bv􎲋(=<\u000eq􍪬?L᪽􄗻ஜc󳤌<&!􍚌󴆏j~O3U<tW𫩅󲑼𮩆yz𦢟􆹔\n\u0012\u000cf\rㅏ𥞰𢽳O㮋)󷤣D\u000c\\\\:\t𠦬\u0018\u000f􊹰4&V淫ۢB􀅦𛆙􄂋\u0003\u0012\u000b󲧠\rK)􈁒\u001a\u0010셗\u000fv󴤲~!YS|㻫41Je+󰻈􍚍󲈑AMa7%1􅾖󴩶\u0017l\u0018\u0012'󾦏/j\u000e\u001cp𫪻n:Ⴊ\u001eI\u0005\u0004ﴎWU`倯\\䩊𧡑\u001f>Sw\u0012\u0003\u0007\u0017+󺀡Ny粰(/Sco\u0002{3\u000fEh\u0016󼆏󹫐气-\u001c.'\u0005X𘉸𤮓Ti3􀩲\"%\u0016\u0008𮀜+\u0004\u0002^􎧯)2bR\u0006\u000fJB[󿊻&O9{w{aV\u0005gZ?3z􄈭8፳𦔖󱴵`􃥔\"PE)uKq|w\u00160\u001b. \u0003𑻠sxW𧉥󴚗m\u00057e)𓁘󶑼:s\u0018Yj⚎㿤\u0006\u001flTu􏄥I.􉙜O#kQ\u001e!g􃔗\u0018Q\u001f𪍃\u0016\u0006|\"M\"P\u001f\u0003@ZPq󸌖gY𤒍=\u0007􂍭l8󾌀3󲻄󹪢CN<𤆤gJ󽡢]𗋔mX~\u0006w3\u0010𫸴8\u00076\u0004}\u0010i\u0013L5󼂐PY^|!Vz\u001b4走!iLa⼻\u0014􂭺𩀜\u001d:󾟿𤢈h\\dLx􉣕\u0019𥚚\u001a𠷫R%ps7𗏀s􆓓fg\nIf􄢿\u0011l\u001a󹮗-n_ឱUY?4d]|c\\[T\u0007jS䦖휆鄐aK󺖖􏩠\u0003\u001cx+",
-    "label": ""
-}
\ No newline at end of file
+    "label": "",
+    "password": ">1/\t\u0015 󶫒󷘿z苐Bv􎲋(=<\u000eq􍪬?L᪽􄗻ஜc󳤌<&!􍚌󴆏j~O3U<tW𫩅󲑼𮩆yz𦢟􆹔\n\u0012\u000cf\rㅏ𥞰𢽳O㮋)󷤣D\u000c\\\\:\t𠦬\u0018\u000f􊹰4&V淫ۢB􀅦𛆙􄂋\u0003\u0012\u000b󲧠\rK)􈁒\u001a\u0010셗\u000fv󴤲~!YS|㻫41Je+󰻈􍚍󲈑AMa7%1􅾖󴩶\u0017l\u0018\u0012'󾦏/j\u000e\u001cp𫪻n:Ⴊ\u001eI\u0005\u0004ﴎWU`倯\\䩊𧡑\u001f>Sw\u0012\u0003\u0007\u0017+󺀡Ny粰(/Sco\u0002{3\u000fEh\u0016󼆏󹫐气-\u001c.'\u0005X𘉸𤮓Ti3􀩲\"%\u0016\u0008𮀜+\u0004\u0002^􎧯)2bR\u0006\u000fJB[󿊻&O9{w{aV\u0005gZ?3z􄈭8፳𦔖󱴵`􃥔\"PE)uKq|w\u00160\u001b. \u0003𑻠sxW𧉥󴚗m\u00057e)𓁘󶑼:s\u0018Yj⚎㿤\u0006\u001flTu􏄥I.􉙜O#kQ\u001e!g􃔗\u0018Q\u001f𪍃\u0016\u0006|\"M\"P\u001f\u0003@ZPq󸌖gY𤒍=\u0007􂍭l8󾌀3󲻄󹪢CN<𤆤gJ󽡢]𗋔mX~\u0006w3\u0010𫸴8\u00076\u0004}\u0010i\u0013L5󼂐PY^|!Vz\u001b4走!iLa⼻\u0014􂭺𩀜\u001d:󾟿𤢈h\\dLx􉣕\u0019𥚚\u001a𠷫R%ps7𗏀s􆓓fg\nIf􄢿\u0011l\u001a󹮗-n_ឱUY?4d]|c\\[T\u0007jS䦖휆鄐aK󺖖􏩠\u0003\u001cx+"
+}
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_1.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_1.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_1.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_10.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_10.json
index f7af6902332..a605000c9f6 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_10.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_10.json
@@ -1 +1 @@
-"scim"
\ No newline at end of file
+"scim"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_11.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_11.json
index f7af6902332..a605000c9f6 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_11.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_11.json
@@ -1 +1 @@
-"scim"
\ No newline at end of file
+"scim"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_12.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_12.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_12.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_12.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_13.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_13.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_13.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_13.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_14.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_14.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_14.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_14.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_15.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_15.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_15.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_15.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_16.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_16.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_16.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_16.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_17.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_17.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_17.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_18.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_18.json
index f7af6902332..a605000c9f6 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_18.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_18.json
@@ -1 +1 @@
-"scim"
\ No newline at end of file
+"scim"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_19.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_19.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_19.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_19.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_2.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_2.json
index f7af6902332..a605000c9f6 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_2.json
@@ -1 +1 @@
-"scim"
\ No newline at end of file
+"scim"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_20.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_20.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_20.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_20.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_3.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_3.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_3.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_3.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_4.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_4.json
index f7af6902332..a605000c9f6 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_4.json
@@ -1 +1 @@
-"scim"
\ No newline at end of file
+"scim"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_5.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_5.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_5.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_6.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_6.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_6.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_6.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_7.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_7.json
index f7af6902332..a605000c9f6 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_7.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_7.json
@@ -1 +1 @@
-"scim"
\ No newline at end of file
+"scim"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_8.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_8.json
index a103e471320..c06f8ac5c33 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_8.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_8.json
@@ -1 +1 @@
-"wire"
\ No newline at end of file
+"wire"
diff --git a/libs/wire-api/test/golden/testObject_ManagedBy_user_9.json b/libs/wire-api/test/golden/testObject_ManagedBy_user_9.json
index f7af6902332..a605000c9f6 100644
--- a/libs/wire-api/test/golden/testObject_ManagedBy_user_9.json
+++ b/libs/wire-api/test/golden/testObject_ManagedBy_user_9.json
@@ -1 +1 @@
-"scim"
\ No newline at end of file
+"scim"
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_1.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_1.json
index f44b5da6406..9c844111a28 100644
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_1.json
+++ b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_1.json
@@ -1,10 +1,11 @@
 {
-    "hidden_ref": "1",
-    "otr_muted_ref": "#M𗗐",
+    "conversation_role": "3fwjaofhryb7nd1hp3nwukjiyxxhgimw8ddzx5s_8ek5nnctkzkic6w51hqugeh6l50hg87dez8pw974dbuywd83njuytv0euf9619s",
     "hidden": true,
+    "hidden_ref": "1",
     "otr_archived": false,
-    "otr_muted_status": -1,
-    "otr_muted": false,
     "otr_archived_ref": "a",
+    "otr_muted": false,
+    "otr_muted_ref": "#M𗗐",
+    "otr_muted_status": -1,
     "target": "00000000-0000-0002-0000-000100000001"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_10.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_10.json
deleted file mode 100644
index ca0e83b42ec..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_10.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "otr_muted_ref": "n􍢩䇕",
-    "conversation_role": "ffeb0qucf7nfaerti39parabwgbbuwe2mel5h5skepdriy7",
-    "hidden": true,
-    "otr_archived": true,
-    "otr_muted_status": 1,
-    "otr_archived_ref": "",
-    "target": "00000000-0000-0001-0000-000200000001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_11.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_11.json
deleted file mode 100644
index 347d3fa9974..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_11.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "hidden_ref": "V",
-    "otr_muted_ref": "p賑",
-    "conversation_role": "kkdmdyqvaafi1taaxkd2n_75cd6edzu52vhzkw2lgmiwe_ghtxdx0yfuiow5w245cazi6b6__kxcw7nc7lveke1dpv2v8hcv4p3p07tcfrhsxe0br0w2yives34t",
-    "hidden": false,
-    "otr_archived": true,
-    "otr_muted_status": -2,
-    "otr_muted": true,
-    "otr_archived_ref": "`",
-    "target": "00000002-0000-0000-0000-000000000001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_12.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_12.json
deleted file mode 100644
index f223b602b76..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_12.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "hidden_ref": "𫗢",
-    "otr_archived": true,
-    "otr_muted_status": -2,
-    "otr_archived_ref": "\u0014&",
-    "target": "00000001-0000-0001-0000-000200000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_13.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_13.json
deleted file mode 100644
index 2de5aa8546f..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_13.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "hidden_ref": "",
-    "otr_muted_ref": "v",
-    "conversation_role": "uu19t9u0ff3w5kv8spa5zyc7fs6fhx42l0mgyrulb1fno5uo81vaj0i2474ag7dfq8sja4abkuhg00fhwquxkztuvqai",
-    "hidden": true,
-    "otr_muted_status": 1,
-    "otr_muted": false,
-    "otr_archived_ref": "N󲩛o",
-    "target": "00000000-0000-0002-0000-000100000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_14.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_14.json
deleted file mode 100644
index 3f5dc9cfc6d..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_14.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "hidden_ref": "&\u0004",
-    "otr_muted_ref": "𬱜~q",
-    "conversation_role": "myz97junegyxat7oqglk92gtatzh189p4rq6aqmyjdd0bj41rg5qhvvpmi7a7ezofimw_x2vw70",
-    "hidden": false,
-    "otr_archived": false,
-    "otr_muted_status": 0,
-    "otr_muted": true,
-    "otr_archived_ref": "",
-    "target": "00000000-0000-0000-0000-000200000002"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_15.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_15.json
deleted file mode 100644
index 943e5d9182f..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_15.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "hidden_ref": "",
-    "otr_muted_ref": "\u0005󷑻j",
-    "hidden": false,
-    "otr_muted": true,
-    "otr_archived_ref": ">浮d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_16.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_16.json
deleted file mode 100644
index a5bba741a5b..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_16.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "+8􂜣",
-    "otr_muted_ref": "",
-    "conversation_role": "bod0gqeaes81c9qddjcdyqfi5fyzqalv3ppu5e11wx7hs8phvtccawwc7up7rvxylznt9jxtobt8y4oiww3mojghwp_v9twnatquv1mr",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_muted": false,
-    "otr_archived_ref": "]"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_17.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_17.json
deleted file mode 100644
index db5348e261e..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_17.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "hidden_ref": "\u0006􁮊",
-    "otr_muted_ref": "\u000b",
-    "otr_archived": false,
-    "otr_muted_status": -2,
-    "target": "00000002-0000-0002-0000-000000000002"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_18.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_18.json
deleted file mode 100644
index 777b0fcb439..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_18.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "􇍑b",
-    "conversation_role": "c8gq33xy3yowglzoq9rk_x5hul1y8e4d9ceu90jhj3m6u236t7bmw1sss_l4dw_rksd5x7zhyhoji5gh4t5fo49h9lwm3xrlv3ntkmtjusfv0mzcy_c63jkf8oku0",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_muted": true,
-    "otr_archived_ref": "",
-    "target": "00000001-0000-0000-0000-000100000002"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_19.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_19.json
deleted file mode 100644
index 16e168d130a..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_19.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "egpq8z5jbd3gqk0e0i4w5wul5vuwgo49jks0q3_n4gow",
-    "hidden": true,
-    "otr_archived": true,
-    "otr_muted_status": -1,
-    "otr_archived_ref": "I|󱭳",
-    "target": "00000001-0000-0001-0000-000100000002"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_2.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_2.json
index 66b5250dc8d..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_2.json
+++ b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_2.json
@@ -1,9 +1 @@
-{
-    "hidden_ref": "x\u001b􏨛",
-    "otr_muted_ref": "L\r󶓬",
-    "conversation_role": "3fwjaofhryb7nd1hp3nwukjiyxxhgimw8ddzx5s_8ek5nnctkzkic6w51hqugeh6l50hg87dez8pw974dbuywd83njuytv0euf9619s",
-    "otr_archived": true,
-    "otr_muted": false,
-    "otr_archived_ref": "\u000b\u0014",
-    "target": "00000001-0000-0002-0000-000200000001"
-}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_20.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_20.json
deleted file mode 100644
index cc262aa2c94..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_20.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "",
-    "otr_muted_ref": "􉞉속p",
-    "conversation_role": "towhht2x6vbbej8ez996qoed_txxn7errr31wnzli7zrq2zsd0mm2saxn4_u_7p1hr53o6t4bsojbpb3_kr4ygseuz0f9kklmyjvs3_n5e5yw0mp2y6ve",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_muted_status": -2,
-    "target": "00000000-0000-0002-0000-000100000001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_3.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_3.json
deleted file mode 100644
index ff29d8bdd56..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "hidden_ref": "𭐭",
-    "otr_muted_ref": "",
-    "conversation_role": "o2pxqmm_oqv3otnujuy0kpz6g1ag2uifcvoifldu9o3712w2tjzgkq0wujb5kgs9ckw3wl1k6bw7g5ar8w5xcbr917engs11a7448nl7zn1aq00b3dd0vx",
-    "otr_muted_status": -1,
-    "otr_muted": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_4.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_4.json
deleted file mode 100644
index 1cd077be310..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_4.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "otr_muted_ref": "f󱰗\u0012",
-    "conversation_role": "t2hf3xe1ifhpvvoslunyqz2nx_lsufmw5zbh42i5j0ivfvo",
-    "otr_archived": true,
-    "otr_muted_status": -2,
-    "otr_muted": true,
-    "otr_archived_ref": "",
-    "target": "00000001-0000-0002-0000-000000000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_5.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_5.json
deleted file mode 100644
index 0feafd1c74d..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_5.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "!",
-    "otr_muted_ref": "",
-    "conversation_role": "_p1ctmxajl8_xxe9_5vzwv4g7gcw_efe75x55n5qv5mokpe10ddg9cfkdjv0tx1fwg9w3ppw9jtpyj8_da5ptc",
-    "hidden": false,
-    "otr_archived": true,
-    "otr_muted_status": 1,
-    "otr_muted": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_6.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_6.json
deleted file mode 100644
index 0cb282a9bda..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_6.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "conversation_role": "ydqensdr39dvnxk4fcelt2zijpvt_txux15xfo2z2tka925gia97prtrss2zv3bnwpsjsb13tj3x0wg9mbbj2oo4kboh_033za30b4fme5x2m_l85n_",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_muted_status": -2,
-    "otr_archived_ref": "Q\u0013燋"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_7.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_7.json
deleted file mode 100644
index c7d34a2dcdc..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_7.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "hidden_ref": "!\u0007𧿩",
-    "otr_muted_ref": "$\u0006N",
-    "conversation_role": "kgb4ma4yj4k07f1x20fyw3c72hquskp01_d0z3as7ebm29puw728ej132sdoha1m88ex8yo_kv646b54vw_v6llj07zq8qzfsrgh56",
-    "hidden": false,
-    "otr_archived": true,
-    "otr_muted_status": 2,
-    "otr_muted": false,
-    "otr_archived_ref": "",
-    "target": "00000002-0000-0000-0000-000100000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_8.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_8.json
deleted file mode 100644
index 436e395c4d2..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_8.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "hidden_ref": "\u0013\u001e",
-    "otr_muted_ref": "s~",
-    "conversation_role": "d0dg0qiu97eat9qbd6ziqu19jagfp89n",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_muted_status": 1,
-    "otr_muted": false,
-    "otr_archived_ref": "\u0006P\u000b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_9.json b/libs/wire-api/test/golden/testObject_MemberUpdateData_user_9.json
deleted file mode 100644
index 3c7ed949f8d..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdateData_user_9.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "5cbfwwdai0h6bctmk9it8j38j91esopfi3xfi1n1fmwv4ieayi8gzdtay451y8h37veezkrystz4g49wgsv7ab12",
-    "hidden": false,
-    "otr_archived": true,
-    "otr_muted_status": -1,
-    "otr_archived_ref": "",
-    "target": "00000000-0000-0000-0000-000000000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_1.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_1.json
index 93b2134b7e0..68c0e105c0d 100644
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_MemberUpdate_user_1.json
@@ -1,7 +1,10 @@
 {
-    "hidden_ref": "",
-    "otr_muted_ref": "h컮N",
     "conversation_role": "nn8oubrrivojp29q65krhyfzzgvzt3yb18z_39zct19xff_7_wm4xk0ixmzaep5oj3cdajj36vwbc89pgajtmzo1rbwc40ulc837b1aknib6cj03k64ovt4p0h",
     "hidden": false,
-    "otr_muted": false
-}
\ No newline at end of file
+    "hidden_ref": "",
+    "otr_archived": true,
+    "otr_archived_ref": "ref",
+    "otr_muted": false,
+    "otr_muted_ref": "h컮N",
+    "otr_muted_status": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_10.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_10.json
deleted file mode 100644
index c8bc3962502..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_10.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "hidden_ref": "",
-    "otr_muted_ref": "",
-    "conversation_role": "r6pd3cc",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_archived_ref": "\u0001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_11.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_11.json
deleted file mode 100644
index 0ade3f846b2..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_11.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "%nc",
-    "otr_muted_ref": "",
-    "conversation_role": "d1pquul8mcpzzyd",
-    "otr_archived": false,
-    "otr_muted": false,
-    "otr_archived_ref": "",
-    "otr_muted_status": -909
-}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_12.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_12.json
deleted file mode 100644
index c9d4c11a6f3..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_12.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "otr_muted_ref": "N",
-    "conversation_role": "uwira8",
-    "hidden": true,
-    "otr_archived": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_13.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_13.json
deleted file mode 100644
index 1dc71e3a0be..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_13.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "hidden_ref": " 𘆵",
-    "otr_muted_ref": ",𡏾x",
-    "conversation_role": "8_gp4dnllqkywu8ynwrefdulehdg2tj5a_tuug8pzdbxjmwbzrj4hbmzv74626xwgnvan",
-    "otr_muted": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_14.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_14.json
deleted file mode 100644
index 0eecc755c97..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_14.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "otr_archived": true,
-    "otr_archived_ref": ""
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_15.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_15.json
deleted file mode 100644
index 6f2b8c33459..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_15.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "4\u0003􃂸",
-    "otr_muted_ref": "팥f𥌤",
-    "conversation_role": "u19bhfqrug1dc7e98hjpfv3d0",
-    "hidden": true,
-    "otr_archived": true,
-    "otr_muted": false,
-    "otr_archived_ref": "󳲦"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_16.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_16.json
deleted file mode 100644
index ec48a44f256..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_16.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "",
-    "otr_muted_ref": "pa/",
-    "conversation_role": "8emml6p8nqqdn61rankt2i2_5mhk3y3baf_bon8v50q",
-    "hidden": false,
-    "otr_archived": false,
-    "otr_muted": false,
-    "otr_archived_ref": ""
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_17.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_17.json
deleted file mode 100644
index 23e5a17ca1a..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_17.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "hidden_ref": "5击[",
-    "conversation_role": "lvnn0dbt1o_5lp7f",
-    "hidden": false,
-    "otr_archived": true,
-    "otr_muted": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_18.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_18.json
deleted file mode 100644
index 5ff985bda84..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_18.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "hidden": true,
-    "otr_archived_ref": ""
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_19.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_19.json
deleted file mode 100644
index 9c15ebcadc6..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_19.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "otr_muted_ref": "\u0014]\u0005",
-    "conversation_role": "kpe3j2ccnryh3awf1gx2sqyxzrihjb4nikgfdmphg9r5gxdl97l1q6a4b5c",
-    "hidden": false,
-    "otr_archived": true,
-    "otr_muted": false,
-    "otr_archived_ref": "(\u00032"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_2.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_2.json
index 3f528384be6..1f763fc54a7 100644
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_MemberUpdate_user_2.json
@@ -1,7 +1,3 @@
 {
-    "otr_muted_ref": ",K",
-    "conversation_role": "imbwyhqhtf8jub3el8j0ztn2gzsyfs6zdv3__86bpts_eksydln4jzjv11evylw748ug5knf7h5lnckj6dq8lfpwgdvapxx60xvpky_1t",
-    "otr_archived": false,
-    "otr_muted": true,
-    "otr_archived_ref": "\n"
-}
\ No newline at end of file
+    "hidden": false
+}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_20.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_20.json
deleted file mode 100644
index 05694466d95..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_20.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "otr_muted_ref": "",
-    "conversation_role": "9v_lqtkfm4ohgvnqdj5qyua7hn8l7gcwy05",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_archived_ref": "Z(􊦝"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_3.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_3.json
deleted file mode 100644
index bb7c8768653..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_3.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "hidden_ref": "",
-    "otr_muted_ref": "/L",
-    "conversation_role": "29pgeoc1x6764fsdwtticdvz1bvso_q95d5673zo7s076hshdzoa7ufh55os_8eedfy3r8e",
-    "hidden": true,
-    "otr_muted": true,
-    "otr_muted_status":3
-}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_4.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_4.json
deleted file mode 100644
index a511f3ab033..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_4.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "hidden_ref": "I'",
-    "conversation_role": "y3f2wfk4s6odkp67ngv2dqsymq12ru1f6yiar17kpyoi0ng0yu7bqzr4_1c8jsr6zdaw24xs47bdq5um3vc501nr3s89kn0dhe9c5k52pzfzfws3",
-    "hidden": false,
-    "otr_archived": false,
-    "otr_muted": true,
-    "otr_archived_ref": "0T",
-    "otr_muted_status":7182
-}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_5.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_5.json
deleted file mode 100644
index 7505bb7095b..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "hidden_ref": "\\",
-    "hidden": false,
-    "otr_archived": false,
-    "otr_archived_ref": "\u0004鉾"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_6.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_6.json
deleted file mode 100644
index c165499c4a2..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_6.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "hidden_ref": "𛁎ࢼ*",
-    "conversation_role": "_loalxj_i6vbh4aebdkbyr59_hawtw3fzjeffcw8llqvhdjx9k6cq3fzsk78zpejqy2om6",
-    "otr_archived": true,
-    "otr_muted": true,
-    "otr_archived_ref": ""
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_7.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_7.json
deleted file mode 100644
index 176825bd35a..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_7.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "conversation_role": "5la_7_6jn396azj61gyopd1z6dkqfkd56kerwmng27x1",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_archived_ref": "(拜t",
-    "otr_muted_status":0
-}
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_8.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_8.json
deleted file mode 100644
index e465a322d2d..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_8.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "hidden_ref": "ᐯ",
-    "otr_muted_ref": "m",
-    "hidden": true,
-    "otr_archived": true,
-    "otr_muted": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MemberUpdate_user_9.json b/libs/wire-api/test/golden/testObject_MemberUpdate_user_9.json
deleted file mode 100644
index 9ee63b95d95..00000000000
--- a/libs/wire-api/test/golden/testObject_MemberUpdate_user_9.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "hidden_ref": "\u0018an",
-    "otr_muted_ref": "8㽫Q",
-    "conversation_role": "_sg5ujt7r_74lesoq1b__dsmy_ewiryj0ak_6y1mlwf5okqxx7hx9sr7q2hqq0g9xj6bx1144z4mk7",
-    "hidden": true,
-    "otr_archived": false,
-    "otr_muted": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_1.json b/libs/wire-api/test/golden/testObject_Member_user_1.json
index 2a13d1feca8..9e99cb4bf0a 100644
--- a/libs/wire-api/test/golden/testObject_Member_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Member_user_1.json
@@ -1,18 +1,18 @@
 {
+    "conversation_role": "q4g4_8r4m6hz7hx5ob32nexko2ntb3dmv5vogdmm8dhbwzei6rv45b_90kzg11gw6zsq",
+    "hidden": true,
     "hidden_ref": "󼈮",
-    "status": 0,
+    "id": "00000002-0000-0001-0000-000100000000",
+    "otr_archived": false,
+    "otr_archived_ref": "𢖖",
+    "otr_muted": false,
+    "otr_muted_ref": "ref",
+    "otr_muted_status": -2,
     "service": {
         "id": "00000000-0000-0000-0000-000000000001",
         "provider": "00000000-0000-0001-0000-000000000001"
     },
-    "otr_muted_ref": null,
-    "conversation_role": "q4g4_8r4m6hz7hx5ob32nexko2ntb3dmv5vogdmm8dhbwzei6rv45b_90kzg11gw6zsq",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
+    "status": 0,
     "status_ref": "0.0",
-    "id": "00000002-0000-0001-0000-000100000000",
-    "otr_archived": false,
-    "otr_muted_status": -2,
-    "otr_muted": false,
-    "otr_archived_ref": "𢖖"
-}
\ No newline at end of file
+    "status_time": "1970-01-01T00:00:00.000Z"
+}
diff --git a/libs/wire-api/test/golden/testObject_Member_user_10.json b/libs/wire-api/test/golden/testObject_Member_user_10.json
deleted file mode 100644
index 995b62ea326..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_10.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": null,
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0000-0000-000100000001",
-        "provider": "00000001-0000-0001-0000-000100000001"
-    },
-    "otr_muted_ref": "􆧜z",
-    "conversation_role": "8_k_cle199r7m2w7mvtc3tu55ycm5qnnxjs7buzjjyaydrhi",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0002-0000-000000000000",
-    "otr_archived": true,
-    "otr_muted_status": 1,
-    "otr_muted": true,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_11.json b/libs/wire-api/test/golden/testObject_Member_user_11.json
deleted file mode 100644
index dca0d38af69..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_11.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "-]𦳕",
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000001",
-        "provider": "00000001-0000-0000-0000-000000000001"
-    },
-    "otr_muted_ref": "",
-    "conversation_role": "gsg85grqngzal1y4ptw9qjadg67sv4uileboe_gle521hybeht",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000002-0000-0000-0000-000000000001",
-    "otr_archived": false,
-    "otr_muted_status": null,
-    "otr_muted": true,
-    "otr_archived_ref": "𨟦\u0004"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_12.json b/libs/wire-api/test/golden/testObject_Member_user_12.json
deleted file mode 100644
index e71d3203fa3..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_12.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "hidden_ref": null,
-    "status": 0,
-    "service": null,
-    "otr_muted_ref": "R",
-    "conversation_role": "1bgt0uzs1sao2otf76egq864wn0sj0wxlj_bdak6a6adkpfiphoihxs3q55ao66w0_07yavk5kfxiazxbo2caba6pzuqfl2ce_dhgj3dc0nkcyasw0weid__v1ycd",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0001-0000-000200000000",
-    "otr_archived": false,
-    "otr_muted_status": null,
-    "otr_muted": false,
-    "otr_archived_ref": "\u0012\tn"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_13.json b/libs/wire-api/test/golden/testObject_Member_user_13.json
deleted file mode 100644
index f961bc3498e..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_13.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "hidden_ref": "",
-    "status": 0,
-    "service": null,
-    "otr_muted_ref": null,
-    "conversation_role": "i_tncpnct2bq0zc2588w6rp_nzcc9bdp4y9o47b6nix_lxv9bnqqms308ta2_edqnmgkk8o3wgs44s47q9g5nv2u9122pl675lljzpxx65",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0000-0000-000100000000",
-    "otr_archived": false,
-    "otr_muted_status": -1,
-    "otr_muted": true,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_14.json b/libs/wire-api/test/golden/testObject_Member_user_14.json
deleted file mode 100644
index fdb108156e9..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_14.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "\"",
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000001",
-        "provider": "00000001-0000-0001-0000-000000000000"
-    },
-    "otr_muted_ref": "*&",
-    "conversation_role": "uuttutvr4y5qhlbn1u94e0u74zei_zilbp9bk5is3cvkqywo1cmmb6heqodku7poq2_y",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0000-0000-000000000001",
-    "otr_archived": false,
-    "otr_muted_status": null,
-    "otr_muted": true,
-    "otr_archived_ref": "Iv"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_15.json b/libs/wire-api/test/golden/testObject_Member_user_15.json
deleted file mode 100644
index 5db75a13412..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_15.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "hidden_ref": "\u0000^",
-    "status": 0,
-    "service": null,
-    "otr_muted_ref": null,
-    "conversation_role": "480poa1dpixu9xztve6ybatlhmevixphxvay9cw",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000000-0000-0002-0000-000200000002",
-    "otr_archived": true,
-    "otr_muted_status": null,
-    "otr_muted": true,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_16.json b/libs/wire-api/test/golden/testObject_Member_user_16.json
deleted file mode 100644
index fe5a17527a4..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_16.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "hidden_ref": null,
-    "status": 0,
-    "service": null,
-    "otr_muted_ref": null,
-    "conversation_role": "n_ka0q5qzafpovvvcrpmjctgwp45pfampamwcyry615ffkldjfzdf_jhuf7m0vb2n9mk90r3krdcqkeutj21_89wqelz0mx7o63cf195cjtqaoi",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0002-0000-000100000001",
-    "otr_archived": true,
-    "otr_muted_status": 1,
-    "otr_muted": true,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_17.json b/libs/wire-api/test/golden/testObject_Member_user_17.json
deleted file mode 100644
index a66df6e68a3..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_17.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "/+\u0011",
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0001-0000-000000000001",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
-    "otr_muted_ref": "x懓",
-    "conversation_role": "2sknhz0oe74sqrgglg5d",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0000-0000-000200000001",
-    "otr_archived": false,
-    "otr_muted_status": 0,
-    "otr_muted": true,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_18.json b/libs/wire-api/test/golden/testObject_Member_user_18.json
deleted file mode 100644
index ca6dcc8095a..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_18.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "hidden_ref": "",
-    "status": 0,
-    "service": null,
-    "otr_muted_ref": "-`",
-    "conversation_role": "yx997merbgjglzysg93xqhhz6jxs9god5a",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000000-0000-0000-0000-000200000001",
-    "otr_archived": false,
-    "otr_muted_status": -1,
-    "otr_muted": false,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_19.json b/libs/wire-api/test/golden/testObject_Member_user_19.json
deleted file mode 100644
index 1635d24be3d..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_19.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "",
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
-    "otr_muted_ref": "@c",
-    "conversation_role": "chucv55xke4fmjd9hsptz_5_5_z17ted3ugpzobp986y6won8kmmdublh",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000000-0000-0000-0000-000200000002",
-    "otr_archived": true,
-    "otr_muted_status": -2,
-    "otr_muted": true,
-    "otr_archived_ref": "~}"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_2.json b/libs/wire-api/test/golden/testObject_Member_user_2.json
index 071d41e20e5..c0c85f3ba00 100644
--- a/libs/wire-api/test/golden/testObject_Member_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Member_user_2.json
@@ -1,18 +1,15 @@
 {
-    "hidden_ref": null,
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000001",
-        "provider": "00000000-0000-0000-0000-000100000001"
-    },
-    "otr_muted_ref": "",
     "conversation_role": "cxrqwei1me7ftnrql1p2ew9aj1c5um89xip09ymj6wyj5cqfc4s903yxpv9e5j1j_8744acstc_a",
-    "status_time": "1970-01-01T00:00:00.000Z",
     "hidden": true,
-    "status_ref": "0.0",
+    "hidden_ref": null,
     "id": "00000000-0000-0001-0000-000100000002",
     "otr_archived": true,
-    "otr_muted_status": -2,
+    "otr_archived_ref": null,
     "otr_muted": false,
-    "otr_archived_ref": "#𪑚"
-}
\ No newline at end of file
+    "otr_muted_ref": null,
+    "otr_muted_status": null,
+    "service": null,
+    "status": 0,
+    "status_ref": "0.0",
+    "status_time": "1970-01-01T00:00:00.000Z"
+}
diff --git a/libs/wire-api/test/golden/testObject_Member_user_20.json b/libs/wire-api/test/golden/testObject_Member_user_20.json
deleted file mode 100644
index 8474152216f..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_20.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "q",
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0000-0000-000100000001",
-        "provider": "00000000-0000-0000-0000-000100000001"
-    },
-    "otr_muted_ref": ",𐚜",
-    "conversation_role": "s8egh5lk5tru_qwecadtn4frf9lhgpv1yqj4ptdrbfgt6fhc4f6h54nheqialc",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0002-0000-000200000000",
-    "otr_archived": false,
-    "otr_muted_status": -2,
-    "otr_muted": true,
-    "otr_archived_ref": "'"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_3.json b/libs/wire-api/test/golden/testObject_Member_user_3.json
deleted file mode 100644
index 8e7a89665ce..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_3.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": null,
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0001-0000-000100000000"
-    },
-    "otr_muted_ref": null,
-    "conversation_role": "m1h8210wgo2f5tg2jgqqmvb4_p6b8m6ycix5d8ci438oulya_al0mxbks6vhzu777afc5uagd5",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0002-0000-000200000002",
-    "otr_archived": false,
-    "otr_muted_status": -1,
-    "otr_muted": true,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_4.json b/libs/wire-api/test/golden/testObject_Member_user_4.json
deleted file mode 100644
index a046f1aec6c..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_4.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "{",
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
-    "otr_muted_ref": null,
-    "conversation_role": "tg09zlo0p6ubotujq",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0001-0000-000200000002",
-    "otr_archived": false,
-    "otr_muted_status": -2,
-    "otr_muted": true,
-    "otr_archived_ref": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_5.json b/libs/wire-api/test/golden/testObject_Member_user_5.json
deleted file mode 100644
index 6816f270d41..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_5.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "󻮜+\u0018",
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000000",
-        "provider": "00000001-0000-0000-0000-000100000001"
-    },
-    "otr_muted_ref": "",
-    "conversation_role": "7y0wbix6igwheorpywk1nm22ox2lr1_p4bna_v31w4gx8vrnlu87j13_z8u7w5x971b3aurv0s_ump5eahxvciig6s1n7x7h2dtnr8vsqd81zarrvbl53litl3_",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000002-0000-0002-0000-000000000001",
-    "otr_archived": true,
-    "otr_muted_status": -2,
-    "otr_muted": true,
-    "otr_archived_ref": ""
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_6.json b/libs/wire-api/test/golden/testObject_Member_user_6.json
deleted file mode 100644
index 68541fbc092..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_6.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "𡘰",
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0001-0000-000000000001",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
-    "otr_muted_ref": null,
-    "conversation_role": "7txy4uu2tmqtn9h79uyilsvkl932ofr2rr3d9mhy8_kpzctem3qyrqnyjwq1veuijjn3o1z4n5neix0c4ns7pxpyulwz3waxig0nci0d9dy02ed7_guomtgxajx",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0000-0000-000200000001",
-    "otr_archived": false,
-    "otr_muted_status": null,
-    "otr_muted": true,
-    "otr_archived_ref": "u?f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_7.json b/libs/wire-api/test/golden/testObject_Member_user_7.json
deleted file mode 100644
index 0667b01c9eb..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_7.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": null,
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000100000000"
-    },
-    "otr_muted_ref": "",
-    "conversation_role": "pv2oqq4__gmhtskkv9e4digue3d2is3wf1cp1sd4",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000000-0000-0001-0000-000000000001",
-    "otr_archived": false,
-    "otr_muted_status": 1,
-    "otr_muted": false,
-    "otr_archived_ref": ""
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_8.json b/libs/wire-api/test/golden/testObject_Member_user_8.json
deleted file mode 100644
index 52f92ba4f94..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_8.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": null,
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000001-0000-0001-0000-000000000000"
-    },
-    "otr_muted_ref": null,
-    "conversation_role": "633hv48jp9a2x4803m3wfv4mv1z7r688eo5kg6uh12hqwks5ewl0mvbvzeucg_831oxr0eggar6gp7k6441c5qlrfik",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": false,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0001-0000-000000000000",
-    "otr_archived": true,
-    "otr_muted_status": null,
-    "otr_muted": true,
-    "otr_archived_ref": "󳮚,𪀰"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Member_user_9.json b/libs/wire-api/test/golden/testObject_Member_user_9.json
deleted file mode 100644
index 5d3dc3ee41b..00000000000
--- a/libs/wire-api/test/golden/testObject_Member_user_9.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "hidden_ref": "",
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0000-0000-000100000000",
-        "provider": "00000000-0000-0001-0000-000000000001"
-    },
-    "otr_muted_ref": "\\?",
-    "conversation_role": "88txfajsznilzfsvr3a6lax5v2o_4f9q0utm29al2x45271loig1gyhcbzrm5hwx0w8lqhc2l4ql4enji8dx7f56zmotyn0rgyabkqd6yhxqjd5up2y",
-    "status_time": "1970-01-01T00:00:00.000Z",
-    "hidden": true,
-    "status_ref": "0.0",
-    "id": "00000001-0000-0002-0000-000100000000",
-    "otr_archived": true,
-    "otr_muted_status": 1,
-    "otr_muted": true,
-    "otr_archived_ref": "."
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_1.json b/libs/wire-api/test/golden/testObject_Message_user_1.json
index f019424a2d4..2a7eade9b65 100644
--- a/libs/wire-api/test/golden/testObject_Message_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Message_user_1.json
@@ -1 +1 @@
-"@<U\u0004{KjS\u0018$pw\u0015𮝬+;𬂜􍷙裝넝7vb\"rg􂳾<yJ𫯯\u0006ciO𘢝%楗0D󺀃􀵟L\u000cZn𩒅\u0014vm%oR𥇛\u0004H\u0006nx𦨅ub#\tR;W\u0015\u0003-􈑥󻕒􀚤􍔤𬒠+PE\u001eha\u0001%+C𨘯^M{\u001fs𗻩;$\u001e\u000e𢮞\u0007𗍝.)(􀨃\u001aIAD:𝧮|F6\\lsp\\󰇧9􏬜`YX*\u000bQ􌱭J\u000bK󸳎X.󶵾.y𬚂{wu7^4\u001e`􆤍(\u0010u6󿂼UT𠮡\u0014S$죸Hk◹TT\u0014`^\u0018a\u0008\tS󹈸\u001b󰲿⑽t𒌚{8W)\u0015.5x\u0005\u0016H􅓠󲢠P󻛓𨓖?YI󱫺dU7\u0008O/\u000c.\u001cQQ􌢶\\#ང*"
\ No newline at end of file
+"@<U\u0004{KjS\u0018$pw\u0015𮝬+;𬂜􍷙裝넝7vb\"rg􂳾<yJ𫯯\u0006ciO𘢝%楗0D󺀃􀵟L\u000cZn𩒅\u0014vm%oR𥇛\u0004H\u0006nx𦨅ub#\tR;W\u0015\u0003-􈑥󻕒􀚤􍔤𬒠+PE\u001eha\u0001%+C𨘯^M{\u001fs𗻩;$\u001e\u000e𢮞\u0007𗍝.)(􀨃\u001aIAD:𝧮|F6\\lsp\\󰇧9􏬜`YX*\u000bQ􌱭J\u000bK󸳎X.󶵾.y𬚂{wu7^4\u001e`􆤍(\u0010u6󿂼UT𠮡\u0014S$죸Hk◹TT\u0014`^\u0018a\u0008\tS󹈸\u001b󰲿⑽t𒌚{8W)\u0015.5x\u0005\u0016H􅓠󲢠P󻛓𨓖?YI󱫺dU7\u0008O/\u000c.\u001cQQ􌢶\\#ང*"
diff --git a/libs/wire-api/test/golden/testObject_Message_user_10.json b/libs/wire-api/test/golden/testObject_Message_user_10.json
deleted file mode 100644
index aa56ccf3fbd..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"#IoH\u0013aAiKYB[􇚛XY-4'M5\r\n\u000fTkn\u000e􎰃󾪫🦳𘅤t󶈊|_XG\u0018b\u0002!󼉱-􊪵󸇔F𓁦v{.󴶍w6/c묷I!zS\u0011󻪺8S󴕤􋬣86􏊺ly󴣜hKP`r+*􂔃󸆷O88$󳃾􄫋󶳝_\u0017처byR\r\u0012C[U\u001c\u001f㣡fvvF=􂣣iH\u0001`rk𤡩(􏣚𫊸󿷎+㷡\t㨷z}\u001fo𘇟@􋘾\u001f[𬴘{@z濶\t󠅠`"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_11.json b/libs/wire-api/test/golden/testObject_Message_user_11.json
deleted file mode 100644
index ea42edbdb1b..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"\u000fw\u0004b\u0002A8􄗛P􏏢\u0018,𢆵+𗥍qs9&\t,vv\u001a\u001cE𗃫@􉰔e\u001f\u001au𬤨w4\tws𔖸U/1nm_9𓍩kO\u0004\u000eqx󳌂aqH}e𭗜my\u001fIfJ𠕫oK\u000cw󵇵\u0004\u001ft"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_12.json b/libs/wire-api/test/golden/testObject_Message_user_12.json
deleted file mode 100644
index 89fd9d6a32c..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"󿷍AC8\u001f\rQ\u0008󰬸󺾝0\t􊾡𗓨e8\u0011\u0014u􂇎XE#󺛙􂚨\u001d𡇏􀤶Ec_\u001d𫺼I2q\u0019\u001e\u001f\u0014$\u0002#𦙎h\u0005~\u001d𦛪ီ􆛨:`Y󽍃퓴|㨡󹢴􀈅𭼯)b􅩽\u0012x\u0013I\u0003\u0014\u001a䀁󾿽O=\u0008\u0000𭱰􊄚\u0019K7𗻱cં󲍙\u0013b\u0007螝𢣋X(-$󶲀2FP𨡼\u0006\u0008z´𩂒83蕲glG𬴱T~3-`O󼹡\u000cX辥8𢡞Rf2𦞳􂏵"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_13.json b/libs/wire-api/test/golden/testObject_Message_user_13.json
deleted file mode 100644
index 2604e0aced3..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"𤝈z<𔘒P:Q^󱾎6V󺞭󰝋q'm|\u0000k\u00021,󴮎e\u0007`)%ꕮzKfq\u001b`'\u0002\u0001Q0󷯿\u0003h\u0017𠰵󾈮&>jizg󰯹󳬯\u001bZTX𩓟y"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_14.json b/libs/wire-api/test/golden/testObject_Message_user_14.json
deleted file mode 100644
index af5242607a2..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"󷻟\u0015Adc\"\u0005f`!GtF\"l7m\u0012 sCo⣀)𢤦w\txk')y/7=󷸩\u0017}\u0002𪠒𣒐Z\u0006\u000boR\u001fs[/>k1􂩐=\\􂍔𡈞AB\u0000\u0004𦔍\u0001|U&M^\u0013"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_15.json b/libs/wire-api/test/golden/testObject_Message_user_15.json
deleted file mode 100644
index ec85cd1f97d..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"Dq#[𐦨\u000e\u0017锷꘠o\u0018Gl󱹏;.90|\u0015\u001b.AG7|䨩\t\u0017𫔉w"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_16.json b/libs/wire-api/test/golden/testObject_Message_user_16.json
deleted file mode 100644
index 3cec4c5e007..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"\u000e%C3⸢#P\u000e𤤉TV𐬽󻈦R-m\u00155Yꨛh\u0003L󺛟𥠯F\u0007ULA\u001bᩂ$󳴂+_]2􃒠吚qs\u001f\u001c]Ey^#"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_17.json b/libs/wire-api/test/golden/testObject_Message_user_17.json
deleted file mode 100644
index a7144871057..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"{[\u001d𭬈\u0011ÇW듆'\u0008󹥲y j\u0006:K&L',\n􄉵1n7􏗸x𝠑$\u0003op\u0010@u\u0007l`\u001e᧘3k-𬛢\u0003M􈔬\u001dꖓ\u0002aqVwTdD\u0016l\u0006>5}\u0016w󼠟\n0\u0007󺋗\u0004_쏙7\u0012ug􆩇$􄡇}𧠌tư0\u0003&IO?"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_18.json b/libs/wire-api/test/golden/testObject_Message_user_18.json
deleted file mode 100644
index 6b75e017b64..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"?3\u0003K8R􊬰󱧿w 4\nyB\u0005\u001adqx\u00089B\u0016n\u0000E􁗶SJI'.v\u0000`m&1;\rE/􇜪'xAOos0㋺FiB􆇑s\u0000􎵉\u001971\u0001#\"QC8^B󱋬D6󲔕\u0007\u0006?\u0007\u0006Q,^륳󻙥⊀%𮃊a\u0004l|𧨰ZT\u0013][\u0019\\T\u0013\u001dzE\u0007􏔻\u0001芕-G篤􌤁t\u000b\u0003xWX_`ᱞ\r􄅾SZ𧐠o1m淢,롐4lU𧙊.7QTj\u000e:lYdQ\u001eW8\u0001𑖖%JB\u0005t𘂐5󳝞C\u000c􌚑o􃇡𧲼D𨨘\u0012c@𦹄󺵪\u0002&􆱀 0\u0005o8+%\u000c󳷳\u0008-\u0002u\t􈃋\u001e\u001b\u001b#\u0007}~RᵈsfA\u0011wYV"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_19.json b/libs/wire-api/test/golden/testObject_Message_user_19.json
deleted file mode 100644
index 7b0534300ce..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"𬡔_樲+<膯h,z뎬a}􀚏?e\u0004􊋹2_\u000e"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_2.json b/libs/wire-api/test/golden/testObject_Message_user_2.json
index e4c095a417f..5b7aacf0cde 100644
--- a/libs/wire-api/test/golden/testObject_Message_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Message_user_2.json
@@ -1 +1 @@
-"䟹cc󸍲G\u001akd^\u0013&\u000f􅼸$渿~􂴟[\u0004U<\u0013K􃼕𗫙r\u0016G𝪁C~*"
\ No newline at end of file
+"䟹cc󸍲G\u001akd^\u0013&\u000f􅼸$渿~􂴟[\u0004U<\u0013K􃼕𗫙r\u0016G𝪁C~*"
diff --git a/libs/wire-api/test/golden/testObject_Message_user_20.json b/libs/wire-api/test/golden/testObject_Message_user_20.json
deleted file mode 100644
index 45ccbc93ed2..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"m𗃙󿽄􍐃h쬶A@􆩼𭕦6\u0003MI𔖳󽅩6􆗡z𤊆𢻚􆙀<\u001fZ\u0015lG\u0013󻇹L逅Hဃ\u001dV))\u0008\u000b|fJ鱅蠫껣\\𭋢𢯟dC𫧩~\"+X􇎂cH\u001c󻽭嬜𩍶K5刪9\u0007P8o/\u000f𧎂u󰧡pL󵂖8𝔞ᬜ2t]맋i ~\u00104\u000c𨴛􂞵d \u0012x[XI'𪶻D􊈬m&\u0011\u0019\u000c<􃦮𒇇\u0005􇌚x7\u001c􌉙s\u0017󶝲U>\u0005\u0003\u0014g􁘂4󹓋􅗦Z𝅥𧣣"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_3.json b/libs/wire-api/test/golden/testObject_Message_user_3.json
index 659982cf06e..9885dc842cb 100644
--- a/libs/wire-api/test/golden/testObject_Message_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Message_user_3.json
@@ -1 +1 @@
-"\u001eq}\u0015󹌄b:w0_\u0000\u0011𐏁n􅖍n䳠󴝥\u0008s[𬁬j󰲻=H?3Ws󴬥_\u001a𨽾MFlri\u0013\u0015T\u0013%'E\u0005𠲆7'K\u00176<4C\u0016zw􁝯u􀸒\u0000󿯼95􋘱𢆢j􆯯䚾EZ霏𧱃\u000b:\u000f1t-鱇\u0019k\u0017_𨖿󴇳16Fl\rI\u001ej󲄷\u0002n󾘯\u001ec𝡼\u0007􀻅\u0003\u000b妇𓍏V鰔-V𮩖\u0010T\u00105!󸈌=?D3u&RU锢C󽖄\u0019 &SD𨭖𠐷#󿬤\u0002\u000eFl\u0013[Y\u0012Bf􋸹𠄬\u000f걵Z􉻬tD!y3䞌𮣦;>󽰧n󰟨𫴗l`d\u00087󲯙ﻘ럢,8\u0004~\u001eA𧎨󸹼𣝦\u0008]\u0003f𡡛3n\u0014펹.99􋢷5\n9OqXR[`𐨯𦂙󲹹舽k\u0018􂐣1PK"
\ No newline at end of file
+"\u001eq}\u0015󹌄b:w0_\u0000\u0011𐏁n􅖍n䳠󴝥\u0008s[𬁬j󰲻=H?3Ws󴬥_\u001a𨽾MFlri\u0013\u0015T\u0013%'E\u0005𠲆7'K\u00176<4C\u0016zw􁝯u􀸒\u0000󿯼95􋘱𢆢j􆯯䚾EZ霏𧱃\u000b:\u000f1t-鱇\u0019k\u0017_𨖿󴇳16Fl\rI\u001ej󲄷\u0002n󾘯\u001ec𝡼\u0007􀻅\u0003\u000b妇𓍏V鰔-V𮩖\u0010T\u00105!󸈌=?D3u&RU锢C󽖄\u0019 &SD𨭖𠐷#󿬤\u0002\u000eFl\u0013[Y\u0012Bf􋸹𠄬\u000f걵Z􉻬tD!y3䞌𮣦;>󽰧n󰟨𫴗l`d\u00087󲯙ﻘ럢,8\u0004~\u001eA𧎨󸹼𣝦\u0008]\u0003f𡡛3n\u0014펹.99􋢷5\n9OqXR[`𐨯𦂙󲹹舽k\u0018􂐣1PK"
diff --git a/libs/wire-api/test/golden/testObject_Message_user_4.json b/libs/wire-api/test/golden/testObject_Message_user_4.json
deleted file mode 100644
index b6382e7cb79..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"\u00079'ﵗo[䐦\u0004𗻄I幛󻝵󸢔\u0004􃿮bBl􄵎AR6R􋥮\u0017\u0001\u0001M\r􃒩\u001f~𬐍`哋"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_5.json b/libs/wire-api/test/golden/testObject_Message_user_5.json
deleted file mode 100644
index 8faa4586dd6..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"𧬃]\u001dY𪗪\t꺄v)\u0001\u0019'{{U"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_6.json b/libs/wire-api/test/golden/testObject_Message_user_6.json
deleted file mode 100644
index ce979b4b84d..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-":\u0006\u0006\u0006􌽹([/𒐫𠾹󹴤vHH\n2:=Bp{!)\\\nw𝝙R\r6x,ʳ𠇅􇭮"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_7.json b/libs/wire-api/test/golden/testObject_Message_user_7.json
deleted file mode 100644
index 1015dbf49c1..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"sd`ٛٽph\\z󸎀􄢟\u0013󺪶J\u0004\u0018卌Ghc&􉹬4`[|\u00143\u001242R􃂫U\u0019ズ􉡀󽄘P𝪆%\u001b#𫝷󽦲󹏟dnFv6􊷏􉦰<@\u0006𡚴1\r𥊟씱}5\"𗲆[~^a􏓘\\#夦󾦸YB𪒘VT;a.\u000b2􋝹C󽆩#\u0018ϸRRRb󰳈J𧔈󳲪\u001e􁀿󽝓Y􆉌uG󺦷Y\u0003;拽v󴾴󰺨1󾦌􀼱K𑄮*\u000b󽣂\u0001P􅜂􎚁𨳣w𣀸'Z\u001c1V󶅪n5J\u00113IT\u0016𗀸猏\u0013{r8~\u0015vA\u0008\u0003>w\tU𠉘\u000f􈝙|\u0011\r\\\u0010LD|W\r󹠣Ai9\u001f\u0003$M\u0019\u001e通D𝠻J󳕇Ds󶦝"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_8.json b/libs/wire-api/test/golden/testObject_Message_user_8.json
deleted file mode 100644
index 5e35f40c7d0..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"ﵰ\u0005MO)\r2\u001f􀘥\u0012󵯟-8:<\u0002Agzo[\t\u0018i;\u0017&y\u0015k6/􏔩^􎕇%h^􀴶􋼥􂁝󲭺𡈘@WZ􀰘0dnA5\u0018\u0006\u0018󺊦𘇎\u000b󹋗\u001c𢿀M]g􀞅q@𭄸~𛀁:16_2𩢯I\u000c𤒟⛣\u0007B𣼉𝘤􏷴R𬂂)󹼾;S`6𨆚x|kQ)𗗈?ᙞK\u0018v󺄸-6b7D\u000b3?sH\u0014`/};\u0007󼳁RaktᢨM-)\u0010\u0016N\u0017X\u0007\u001cy8L!󹯚K?oW\u0002􂽴\rᑉ(J𫪴R?\tF>𝕢\u000ctjtYU\r37=L6B􅑈O𮙗\u0005x𐊴z{\nB8䁌f\u0001@S\u0008L𒑀𭭃𬧢𧙄x𡘈𫍻)\u001d{c\u0011,\u000e𐹧v1QAv\u0010"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Message_user_9.json b/libs/wire-api/test/golden/testObject_Message_user_9.json
deleted file mode 100644
index c50d3200dc9..00000000000
--- a/libs/wire-api/test/golden/testObject_Message_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"/\rgPb[󴧍P\u0016X5|\u0007\u0013J𠁿v\u000e\u0017㭵{ky𨢬寺􎭡@H[;T󷎇\nt`U𧸜󸒄󷮗\u001d8讍si3𬂵'\u000e\u000f쉳Ho/T0Kr/3竸􋯰Jj􎃱V \u0001N_X𨈟󽁾iN\u0004ꐦ\u0018􄗅𥻩\"𬼭u.VT􆑉m;k갈􅝻{iz]bGO}3\u0003𖧲,T􈷃\u0003\u0011$^\u0003,@J\u000c󸨗ᒘ=R󹳥􏁞𧖻􃘖\u0019<:z(\u0010=\u0019E: `%oM㮓Qy!󲔱\u001f=󷌻%&\u0019~2&[\u0006+\u0007盁\n\u0002o\u0012⁠s𗗟\rEj\u001b\u001c<h𩚎p\u000e\u0000\u0003Mj撙'<Z橀􄅡hoU\\9n\r𡂲"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_1.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_1.json
index b0a0271f9c7..6c4b54876bd 100644
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_1.json
+++ b/libs/wire-api/test/golden/testObject_MutedStatus_user_1.json
@@ -1 +1 @@
-1253
\ No newline at end of file
+1253
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_10.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_10.json
deleted file mode 100644
index ff94f9e723b..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-28180
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_11.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_11.json
deleted file mode 100644
index 0102e52efe4..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
--6911
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_12.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_12.json
deleted file mode 100644
index 9f9ab44e650..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-2429
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_13.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_13.json
deleted file mode 100644
index 633e239f50c..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-17666
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_14.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_14.json
deleted file mode 100644
index 280f1a0985e..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-1746
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_15.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_15.json
deleted file mode 100644
index 2580126d611..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
--20368
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_16.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_16.json
deleted file mode 100644
index 86d8852d829..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
--10239
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_17.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_17.json
deleted file mode 100644
index ac2fdeb31e7..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
--15731
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_18.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_18.json
deleted file mode 100644
index ca9c451d342..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-12196
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_19.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_19.json
deleted file mode 100644
index 815d6ea2399..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
--25051
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_2.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_2.json
deleted file mode 100644
index 5ed45be0b7d..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-9035
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_20.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_20.json
deleted file mode 100644
index 29faf3a1c90..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-15169
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_3.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_3.json
deleted file mode 100644
index cd70e86aad9..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
--24612
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_4.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_4.json
deleted file mode 100644
index a3ab5426bd0..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-6636
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_5.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_5.json
deleted file mode 100644
index b429e44e2a0..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
--12374
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_6.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_6.json
deleted file mode 100644
index d87f1a8cdf4..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-25260
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_7.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_7.json
deleted file mode 100644
index 10d7778ea7c..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-6794
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_8.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_8.json
deleted file mode 100644
index 370d029c452..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
--19696
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_MutedStatus_user_9.json b/libs/wire-api/test/golden/testObject_MutedStatus_user_9.json
deleted file mode 100644
index 11fd8a5fb7c..00000000000
--- a/libs/wire-api/test/golden/testObject_MutedStatus_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-12687
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_1.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_1.json
index 2d7bdc81f62..a4d551d4808 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "name": "Q\u000e\u0012s󻯈S\r"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_10.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_10.json
index a3f4be19864..0ca20c62469 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_10.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_10.json
@@ -1,3 +1,3 @@
 {
     "name": "}󱑶􅬖6G"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_11.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_11.json
index 7281d6e2a1b..e0adc7e150a 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_11.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_11.json
@@ -1,3 +1,3 @@
 {
     "name": "󰅊CVbPfdR󼃁r*'󴦛31m9狚eB"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_12.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_12.json
index d0a3d8933f4..2879764312f 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_12.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_12.json
@@ -1,3 +1,3 @@
 {
     "name": "2矛\u001dJw96\ti𩉸汓3K\u0011s^"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_13.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_13.json
index d371da545b0..7a2c49414e8 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_13.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_13.json
@@ -1,3 +1,3 @@
 {
     "name": "N􌞲𭔙\u001e2󴝗𤊕E􁍧\u0008$T`5*@􈹸𨐜UK"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_14.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_14.json
index ac1e46c59e6..f8b9c5e0311 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_14.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_14.json
@@ -1,3 +1,3 @@
 {
     "name": "𫈰\u0003u\u0007Qtw􆛒.\u0005We"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_15.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_15.json
index 16b97e303ac..71be7bbe7b6 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_15.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_15.json
@@ -1,3 +1,3 @@
 {
     "name": "\u0003"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_16.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_16.json
index 35a69d60101..061e0101820 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_16.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_16.json
@@ -1,3 +1,3 @@
 {
     "name": "􃽃y􃉍C󷣏󹸐􆱵ࢻ>|􈾯?"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_17.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_17.json
index 4a78c47c623..343b7c83828 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_17.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_17.json
@@ -1,3 +1,3 @@
 {
     "name": "ࠚ6\u0012\u0001\u001b􇞪󵳐$ .FCG󿱠𓏹巤<8W"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_18.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_18.json
index 590a6664d76..998897f1633 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_18.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_18.json
@@ -1,3 +1,3 @@
 {
     "name": "뉦\u0001[.𬢁D􆚱f𧰥.錋a􈊦𢱡ⱃB𠒜RK\t]􆬛m𩡲"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_19.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_19.json
index 8a8e0bab91c..9258c14e3c2 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_19.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_19.json
@@ -1,3 +1,3 @@
 {
     "name": "𡀞CO7`O⧯[p"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_2.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_2.json
index 7793bd9acdb..89d9964a8a0 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_2.json
@@ -1,3 +1,3 @@
 {
     "name": "<uI<0<"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_20.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_20.json
index 0a46e33fdfc..e503e230e9a 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_20.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_20.json
@@ -1,3 +1,3 @@
 {
     "name": "~XM􆒥d𡆈L󶆅\u0005v􋙿"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_3.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_3.json
index dabb4250080..dbc3f215b4b 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_3.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_3.json
@@ -1,3 +1,3 @@
 {
     "name": "\u0007"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_4.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_4.json
index f73f16c0d76..3f4f1fa5363 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_4.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_4.json
@@ -1,3 +1,3 @@
 {
     "name": "k(O\u0001B\u000cD逿r􂣘𝆮'𗾌x\u0000\u0007🂽uSA]㷈HH"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_5.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_5.json
index ba271c2486d..cda32e87f03 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_5.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_5.json
@@ -1,3 +1,3 @@
 {
     "name": "󺳊,􏩧=M􆩌<&=⥦\u000e\u0004\u0012\u000f\u0004"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_6.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_6.json
index 1e32ea3e5c6..7ff95f5201f 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_6.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_6.json
@@ -1,3 +1,3 @@
 {
     "name": "𫛯m;\u0017c𭫻\u0002-(𑅢$,^1m󾴂]􂰶HF?\u0004\"~3􍉿\u0011\u0003􏉃\u0016"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_7.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_7.json
index e6caaf1cd1b..6ff17e57d64 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_7.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_7.json
@@ -1,3 +1,3 @@
 {
     "name": "joB/M/􍹕\u00136\u0010\u001a`n:et"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_8.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_8.json
index 542039574c9..b7e2258f230 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_8.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_8.json
@@ -1,3 +1,3 @@
 {
     "name": "𧊈\u00182&󲝭\u0006\u0008\r􀛐"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NameUpdate_user_9.json b/libs/wire-api/test/golden/testObject_NameUpdate_user_9.json
index 0d05add0d3f..9ce8a6fa266 100644
--- a/libs/wire-api/test/golden/testObject_NameUpdate_user_9.json
+++ b/libs/wire-api/test/golden/testObject_NameUpdate_user_9.json
@@ -1,3 +1,3 @@
 {
     "name": "M􏒽m|\u001a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Name_user_1.json b/libs/wire-api/test/golden/testObject_Name_user_1.json
index 55d2fec02ec..7b79f762e5a 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_1.json
@@ -1 +1 @@
-"'?\n(􆂹e𬡫6濫5'\u0016%\n;mq󶥧𨙱M𨖇0!~+􉨬\u0002#%􀃕\u0013nW\u0014\u0000􁟗\u0004L𬺎󹲛j\u001fbX\u0013so\u001c\t\u000e\u0011𘀇ꧬ𒀴i􎭞eJ];*􄚣(\u000bm\u00009Z􎜸\u0002㾵\u0008\\&\u001az\u0010\u001d\u0006󺳔\u0002I30\u001c\u0007QN?󰦮oyk༧\r󲰮A%\u001eZ𞱶;U𗂢𨉩\"𦲍T󼯼\u0014m\u000b!.􂓞1;\u0000"
\ No newline at end of file
+"'?\n(􆂹e𬡫6濫5'\u0016%\n;mq󶥧𨙱M𨖇0!~+􉨬\u0002#%􀃕\u0013nW\u0014\u0000􁟗\u0004L𬺎󹲛j\u001fbX\u0013so\u001c\t\u000e\u0011𘀇ꧬ𒀴i􎭞eJ];*􄚣(\u000bm\u00009Z􎜸\u0002㾵\u0008\\&\u001az\u0010\u001d\u0006󺳔\u0002I30\u001c\u0007QN?󰦮oyk༧\r󲰮A%\u001eZ𞱶;U𗂢𨉩\"𦲍T󼯼\u0014m\u000b!.􂓞1;\u0000"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_10.json b/libs/wire-api/test/golden/testObject_Name_user_10.json
index f16e8a96260..0b7132c8147 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_10.json
@@ -1 +1 @@
-"𥁫5Hi􏭂9tj%3\u001b\r\u001d󼪰\u0008<+'sP󱎽𧆉58\r\u001e"
\ No newline at end of file
+"𥁫5Hi􏭂9tj%3\u001b\r\u001d󼪰\u0008<+'sP󱎽𧆉58\r\u001e"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_11.json b/libs/wire-api/test/golden/testObject_Name_user_11.json
index 39118134fc6..33279366153 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_11.json
@@ -1 +1 @@
-"<󰫷,(@kw\u001aJ3x\u0006+_xa󺞹cv\n=\u001b􋺓\u0017\\\\U[A􄡏𭗲괔\u000b𮣡􁇧𤧧(\rl.􆧿V^𑫱=6갤[fFZrT"
\ No newline at end of file
+"<󰫷,(@kw\u001aJ3x\u0006+_xa󺞹cv\n=\u001b􋺓\u0017\\\\U[A􄡏𭗲괔\u000b𮣡􁇧𤧧(\rl.􆧿V^𑫱=6갤[fFZrT"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_12.json b/libs/wire-api/test/golden/testObject_Name_user_12.json
index 8248cb74cb9..9a1d0335473 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_12.json
@@ -1 +1 @@
-"_𠻙@\u001d/􂗯\u0006*鰖\u0003fq|v\u001b𪷱\u00113L솩\u001f|\u001dx\u0003􌏱𐑣WQ󱃌`SᶎYD\u0006h𨯯H\u00001𧟣j@􆤛𠠲줕~nUB𝙉^󾮤n\u0010L􁑵n\r\u0006{󲶪_\u0000 𦀳"
\ No newline at end of file
+"_𠻙@\u001d/􂗯\u0006*鰖\u0003fq|v\u001b𪷱\u00113L솩\u001f|\u001dx\u0003􌏱𐑣WQ󱃌`SᶎYD\u0006h𨯯H\u00001𧟣j@􆤛𠠲줕~nUB𝙉^󾮤n\u0010L􁑵n\r\u0006{󲶪_\u0000 𦀳"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_13.json b/libs/wire-api/test/golden/testObject_Name_user_13.json
index afa078b7815..4b4d4dee0b1 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_13.json
@@ -1 +1 @@
-"e󸮦\u000co䢼sG𨎿젲Z󹄺M\u0012왅ꎋ\u001c"
\ No newline at end of file
+"e󸮦\u000co䢼sG𨎿젲Z󹄺M\u0012왅ꎋ\u001c"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_14.json b/libs/wire-api/test/golden/testObject_Name_user_14.json
index a90ceda1107..4121912a0ef 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_14.json
@@ -1 +1 @@
-"s,^쩌O\r󽅠sx<󺨑\u0018𡨖SQ\u001am䯜=u\u0007[󳫾𮋪\t𧲭"
\ No newline at end of file
+"s,^쩌O\r󽅠sx<󺨑\u0018𡨖SQ\u001am䯜=u\u0007[󳫾𮋪\t𧲭"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_15.json b/libs/wire-api/test/golden/testObject_Name_user_15.json
index dbcea86b922..8ac6df5ad51 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_15.json
@@ -1 +1 @@
-"\u0016Dl\tNmnya\u001f𧧀 􏋄I󾨎𑖥|𨂳3K&kxl,\u0000QD.\u0005󴽹\u0006(􈗮𔖔\\_G炐󱠉J0󿗤𠚌쐱`;9\u0016Iu#PTN\u001e65󲂂􂝪L}􆕜_tA\t\u001f\u001c^\t;\u0007Bbj2􃹓BAj𖣺w\u0016􄛪4\raꩬ!W\"𑇄𠙲3\u0019\u0018\u0008\r-`\u0005\u0000􀩿=bWG\u000ff\u001eM\u0017X$bnr"
\ No newline at end of file
+"\u0016Dl\tNmnya\u001f𧧀 􏋄I󾨎𑖥|𨂳3K&kxl,\u0000QD.\u0005󴽹\u0006(􈗮𔖔\\_G炐󱠉J0󿗤𠚌쐱`;9\u0016Iu#PTN\u001e65󲂂􂝪L}􆕜_tA\t\u001f\u001c^\t;\u0007Bbj2􃹓BAj𖣺w\u0016􄛪4\raꩬ!W\"𑇄𠙲3\u0019\u0018\u0008\r-`\u0005\u0000􀩿=bWG\u000ff\u001eM\u0017X$bnr"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_16.json b/libs/wire-api/test/golden/testObject_Name_user_16.json
index 51bf4cff74d..21cad6495c9 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_16.json
@@ -1 +1 @@
-"Vt}\u001c"
\ No newline at end of file
+"Vt}\u001c"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_17.json b/libs/wire-api/test/golden/testObject_Name_user_17.json
index 47bfc1f5c14..40ce94cc3e6 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_17.json
@@ -1 +1 @@
-"\"H𪟡#M9a\u0018'S\u000f~\u0007m􁷔􀉺V\"\u0001폅G\u0013i6󳗭󼑲%\u0013`􈓪j\u0000dH!7P\u0013\u0005\u00141𑈟5d\u00194W􊸙&AA\u0016􀺕\\<~d*q1\u000e84􆾚𩟕\u0011􅹲𠜽𗾅𫼀󶿕 ᭵'U<\u0001锌"
\ No newline at end of file
+"\"H𪟡#M9a\u0018'S\u000f~\u0007m􁷔􀉺V\"\u0001폅G\u0013i6󳗭󼑲%\u0013`􈓪j\u0000dH!7P\u0013\u0005\u00141𑈟5d\u00194W􊸙&AA\u0016􀺕\\<~d*q1\u000e84􆾚𩟕\u0011􅹲𠜽𗾅𫼀󶿕 ᭵'U<\u0001锌"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_18.json b/libs/wire-api/test/golden/testObject_Name_user_18.json
index 9d4247b91ed..20c9dd0fa66 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_18.json
@@ -1 +1 @@
-"aDZ\t󷤎-F.N?[HPxaui1龥\u0015SA7k!^(Fr"
\ No newline at end of file
+"aDZ\t󷤎-F.N?[HPxaui1龥\u0015SA7k!^(Fr"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_19.json b/libs/wire-api/test/golden/testObject_Name_user_19.json
index d8974cdbb4f..39e99bcdf73 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_19.json
@@ -1 +1 @@
-"𨎥,\u000fခlKYF\u0011f'~H󾬟糋RI󳮡VI鰧󱐷wA'N"
\ No newline at end of file
+"𨎥,\u000fခlKYF\u0011f'~H󾬟糋RI󳮡VI鰧󱐷wA'N"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_2.json b/libs/wire-api/test/golden/testObject_Name_user_2.json
index d4b5bba9c82..a55be75a560 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_2.json
@@ -1 +1 @@
-"oW㊙H󰬕sᄨ\u001a\"\u000e侔󴛧::􋋫󰊨󸧬L>\u0006\u0013\n\u0011m0󺫵􍛰󴭏\tVdSq𑇙\u0019Kb󷨒\r慪ᣱ󾝎\u001d\"W5Lc\"󸩺\u0018h󹅉W\u001aWI܉𦉧#􃀐󹏚𔔐U\u001bJ\u0014󻞸R|_>2^}dcJ6<𭉉\u0019D\u001cuak*\u0007d\u0008S\u0004=NG]GX@S􉰾mzZ󺎪E9Dn󷊻7+7\u001dE\u001dzs팾*);\u001fN"
\ No newline at end of file
+"oW㊙H󰬕sᄨ\u001a\"\u000e侔󴛧::􋋫󰊨󸧬L>\u0006\u0013\n\u0011m0󺫵􍛰󴭏\tVdSq𑇙\u0019Kb󷨒\r慪ᣱ󾝎\u001d\"W5Lc\"󸩺\u0018h󹅉W\u001aWI܉𦉧#􃀐󹏚𔔐U\u001bJ\u0014󻞸R|_>2^}dcJ6<𭉉\u0019D\u001cuak*\u0007d\u0008S\u0004=NG]GX@S􉰾mzZ󺎪E9Dn󷊻7+7\u001dE\u001dzs팾*);\u001fN"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_20.json b/libs/wire-api/test/golden/testObject_Name_user_20.json
index d6f561152be..5acbc636326 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_20.json
@@ -1 +1 @@
-"AO&4l\t\u0012g󸬟𢩵;󽶸𠥼f\\W𣝕\u0004,𤁭\u0000륁􍿭j\r5o𗱠"
\ No newline at end of file
+"AO&4l\t\u0012g󸬟𢩵;󽶸𠥼f\\W𣝕\u0004,𤁭\u0000륁􍿭j\r5o𗱠"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_3.json b/libs/wire-api/test/golden/testObject_Name_user_3.json
index 4000cf300d1..01617dc59d7 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_3.json
@@ -1 +1 @@
-"=\\𮛯𞋔LKC􄖬)u`\u000fm􇻂\u0018'"
\ No newline at end of file
+"=\\𮛯𞋔LKC􄖬)u`\u000fm􇻂\u0018'"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_4.json b/libs/wire-api/test/golden/testObject_Name_user_4.json
index 2b76e53ecdd..15074ca044f 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_4.json
@@ -1 +1 @@
-"􌱽󽎅廻h\u000bK𫘼*􅘮\u0017􌐈􏎵7z@煋#􀋺h%󷴇\u001f4m\\O\\\u0015O\u0011I<\u0004\u000f0ꂻe\u0015!\u00056EsV粇酨J))\u0005𫱔𢒧.N𣊯^9A􂏀lA岍f!q󵄈󶓖f"
\ No newline at end of file
+"􌱽󽎅廻h\u000bK𫘼*􅘮\u0017􌐈􏎵7z@煋#􀋺h%󷴇\u001f4m\\O\\\u0015O\u0011I<\u0004\u000f0ꂻe\u0015!\u00056EsV粇酨J))\u0005𫱔𢒧.N𣊯^9A􂏀lA岍f!q󵄈󶓖f"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_5.json b/libs/wire-api/test/golden/testObject_Name_user_5.json
index 30183b850e1..2e59e7a049d 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_5.json
@@ -1 +1 @@
-"IY&3#􂫪P>\\\u0014h𩋌.{\u001f󽝨U𗻇_n2\u0004\u0013{􉗓5E@𝙳E휲wr\u001b*K􃌪󹏶\u001d\t:𐿧𩻇󳂮󿒰Oy🖵qq𥦟U{kI깮􁙿Zᰡ\u00061ᐕ+􍣶?󸎌%\"q\u001bjD)\u0018VB\u0005S𝚑g\u0006j?\u000e󸎣}󴸢\u001a\u0012"
\ No newline at end of file
+"IY&3#􂫪P>\\\u0014h𩋌.{\u001f󽝨U𗻇_n2\u0004\u0013{􉗓5E@𝙳E휲wr\u001b*K􃌪󹏶\u001d\t:𐿧𩻇󳂮󿒰Oy🖵qq𥦟U{kI깮􁙿Zᰡ\u00061ᐕ+􍣶?󸎌%\"q\u001bjD)\u0018VB\u0005S𝚑g\u0006j?\u000e󸎣}󴸢\u001a\u0012"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_6.json b/libs/wire-api/test/golden/testObject_Name_user_6.json
index d5e01d73587..122b234a3d6 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_6.json
@@ -1 +1 @@
-"\u000f\u000fDk󵷶􃗒MU𢲀𧼍N)囹k\u0011-󷥕3\u0004J(I8濆R ~\u0003y)𨍘%\u001bd󹁔\u001c􊇣.0\u0015\u0018U\u0014\u0003\u0002+\u001f\u001aL􇹸I㨵\u001aO>(\u0011YS,0_C4\u0019{Zs𪸨\u0016W􂄎~G{"
\ No newline at end of file
+"\u000f\u000fDk󵷶􃗒MU𢲀𧼍N)囹k\u0011-󷥕3\u0004J(I8濆R ~\u0003y)𨍘%\u001bd󹁔\u001c􊇣.0\u0015\u0018U\u0014\u0003\u0002+\u001f\u001aL􇹸I㨵\u001aO>(\u0011YS,0_C4\u0019{Zs𪸨\u0016W􂄎~G{"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_7.json b/libs/wire-api/test/golden/testObject_Name_user_7.json
index 47660cd0754..9f6c8577f60 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_7.json
@@ -1 +1 @@
-"9h\\\u0002qSFc"
\ No newline at end of file
+"9h\\\u0002qSFc"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_8.json b/libs/wire-api/test/golden/testObject_Name_user_8.json
index 45732c6ba24..930d5cfcc6e 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_8.json
@@ -1 +1 @@
-"t􈞆\u0000SO)  \u0000b󾪘8!􂍕ul􋜜a󱉄9􁭮[w𦳻󹱪eK;Q1\"*􃥲.(􊤙\u0007𡑮uk?8\r\\Jo6깽󺱏𣨆󲠤!\u001fU󼱗1\u0008%@􅃪A𥻺c𗿚Nxf\u000e\r\u0008`"
\ No newline at end of file
+"t􈞆\u0000SO)  \u0000b󾪘8!􂍕ul􋜜a󱉄9􁭮[w𦳻󹱪eK;Q1\"*􃥲.(􊤙\u0007𡑮uk?8\r\\Jo6깽󺱏𣨆󲠤!\u001fU󼱗1\u0008%@􅃪A𥻺c𗿚Nxf\u000e\r\u0008`"
diff --git a/libs/wire-api/test/golden/testObject_Name_user_9.json b/libs/wire-api/test/golden/testObject_Name_user_9.json
index 19b62108f12..3dc046ddabb 100644
--- a/libs/wire-api/test/golden/testObject_Name_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Name_user_9.json
@@ -1 +1 @@
-"j􈐄5[bx>󸷋N🍼䜑%X󱉐1]'@\u001av􆽴11􄾋-!\u001e+)\u000fJ6𫰹又+\u0014𩥉𩹾51*6\u001dT~Z􊶣_x𨡳\u000f'G\u001b\u0007x#p 𥥠󶔓𨥦\n\u0012}\u000f\u0007F/\u0017P󷌹)󱊶\t&3\u0010G𫔇\u001f\u0011/8󾄩\u001a2nw>e\u001f/󷰓淯S8w薙0}󰧾-𨌧활\u001d\u0006Z\u0006J􈶓?e\u00127a\u000fd=𣵘󽁳g"
\ No newline at end of file
+"j􈐄5[bx>󸷋N🍼䜑%X󱉐1]'@\u001av􆽴11􄾋-!\u001e+)\u000fJ6𫰹又+\u0014𩥉𩹾51*6\u001dT~Z􊶣_x𨡳\u000f'G\u001b\u0007x#p 𥥠󶔓𨥦\n\u0012}\u000f\u0007F/\u0017P󷌹)󱊶\t&3\u0010G𫔇\u001f\u0011/8󾄩\u001a2nw>e\u001f/󷰓淯S8w薙0}󰧾-𨌧활\u001d\u0006Z\u0006J􈶓?e\u00127a\u000fd=𣵘󽁳g"
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_1.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_1.json
deleted file mode 100644
index 634716fd800..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_1.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "UA=="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_10.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_10.json
deleted file mode 100644
index badd8080543..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_10.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "cLivtzwlgaeVDAj1aacBxYDSYLLh"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_11.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_11.json
deleted file mode 100644
index c72e21e7089..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_11.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "iFdUY8N-N59PLQOhnkn5U60uXSn2AA=="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_12.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_12.json
deleted file mode 100644
index ad043f0db30..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_12.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "5FtPMSqyrYPSOq7N7NjRV2EG4uyHsEW9umY="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_13.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_13.json
deleted file mode 100644
index d757759ee74..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "_VEzujt5aPMEg0zSuyr3Pw9EL0M="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_14.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_14.json
deleted file mode 100644
index 09e7e5506d8..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_14.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "Njs="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_15.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_15.json
deleted file mode 100644
index ff58d664590..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_15.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "6fzGVyvWLV0431_2a24-mq4="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_16.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_16.json
deleted file mode 100644
index e4663d0de20..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_16.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "a52glGETB5abd7w="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_17.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_17.json
deleted file mode 100644
index 6d5d8f5346c..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "kMuOGA=="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_18.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_18.json
deleted file mode 100644
index 1cba34bfaa7..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_18.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "TwwN62QO_1fMjhOtigvXdEM="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_19.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_19.json
deleted file mode 100644
index b2d70859150..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "zRA="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_2.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_2.json
deleted file mode 100644
index 8dafcb70c23..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "wuuPeUF7oYEUKw=="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_20.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_20.json
deleted file mode 100644
index c975a338064..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_20.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "agX_DLjnHLYM3WC4iVQ="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_3.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_3.json
index d0301c97ae7..18391bb34c2 100644
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_3.json
+++ b/libs/wire-api/test/golden/testObject_NewAssetToken_user_3.json
@@ -1,3 +1,3 @@
 {
     "token": "v6nnEvDMoXZfLJMZyS_Bg9daSGCLnG9Tgw=="
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_4.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_4.json
deleted file mode 100644
index 719718e5c91..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "ky_0rWp9LyUWLpEv6w=="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_5.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_5.json
deleted file mode 100644
index 33dfb72b0d4..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "lj_qxU25"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_6.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_6.json
index 6e723d90074..5c4eed02b25 100644
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_6.json
+++ b/libs/wire-api/test/golden/testObject_NewAssetToken_user_6.json
@@ -1,3 +1,3 @@
 {
     "token": "jtgylSRb-AxTo1u8M5kEKPJ7RbzGf3c="
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_7.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_7.json
deleted file mode 100644
index d47e5285fc1..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_7.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "SA-0KrUJ4vTU_2unt4Were4="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_8.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_8.json
deleted file mode 100644
index e094c9de274..00000000000
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_8.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "token": "ngRLg3A="
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewAssetToken_user_9.json b/libs/wire-api/test/golden/testObject_NewAssetToken_user_9.json
index 2841490e73c..0a0969d9ff4 100644
--- a/libs/wire-api/test/golden/testObject_NewAssetToken_user_9.json
+++ b/libs/wire-api/test/golden/testObject_NewAssetToken_user_9.json
@@ -1,3 +1,3 @@
 {
     "token": "i4dAbdQ3A9zQE5txWTo3q-nYIhZ1"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_1.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_1.json
index 622ca80c8a6..2e705ebd029 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_1.json
@@ -1,50 +1,50 @@
 {
-    "origin": {
-        "handle": null,
-        "accent_id": 0,
-        "name": "\u0001t𖠊𭭬7@}\u001d+\u001e8o<&𦪺P⓴v姸\u001c\u001a=ᎄ\u000cla𬎧\u000f))\u0001𫔓HX󷦖}𩩪C9\r% Quy.𛈨𘊔\u000cp1S}R𗎰]y'\u0015A𨣭A𠗗BI\u001d􊲽󹭘V蝱e^\u000e5b#􂳊$u#b+f􈨘s𩫇[󰥜}𭐡K\u0008B'Ux/.𗬄𢆸x𫴩3)𥌧\u0013r4dl",
-        "team": "00000000-0000-0000-0000-000000000001",
-        "id": "00000001-0000-0001-0000-000100000000"
-    },
+    "client": "c",
     "conversation": {
+        "id": "00000000-0000-0000-0000-000000000001",
         "members": [
             {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "provider": "00000000-0000-0001-0000-000100000000"
-                },
                 "conversation_role": "nnu9fdovdb35gac26w1tou0uax_3b9l8y5sgh795f4d7yr1gzuewqfj8hx4",
+                "id": "00000001-0000-0001-0000-000100000000",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000001-0000-0001-0000-000100000000"
                 },
-                "id": "00000001-0000-0001-0000-000100000000"
+                "service": {
+                    "id": "00000001-0000-0000-0000-000000000000",
+                    "provider": "00000000-0000-0001-0000-000100000000"
+                },
+                "status": 0
             },
             {
-                "status": 0,
                 "conversation_role": "3m_oredfy0jqp1jvrociab2vq4z1rzklzs6_bpd04ht0",
+                "id": "00000000-0000-0000-0000-000100000000",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0000-0000-000100000000"
                 },
-                "id": "00000000-0000-0000-0000-000100000000"
+                "status": 0
             },
             {
-                "status": 0,
                 "conversation_role": "0ns0gbsu3sk2cj6qsbs8bkmmculfhcbp_wntqaciff2f3j0zwf24p2ga7lxkzd13c626ruj7evj1lyqn0u7m2q5su",
+                "id": "00000000-0000-0001-0000-000100000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0001-0000-000100000001"
                 },
-                "id": "00000000-0000-0001-0000-000100000001"
+                "status": 0
             }
         ],
-        "name": "",
-        "id": "00000000-0000-0000-0000-000000000001"
+        "name": ""
     },
-    "locale": "ta-CV",
-    "token": "&",
     "id": "00000004-0000-0003-0000-000000000000",
-    "client": "c"
-}
\ No newline at end of file
+    "locale": "ta-CV",
+    "origin": {
+        "accent_id": 0,
+        "handle": null,
+        "id": "00000001-0000-0001-0000-000100000000",
+        "name": "\u0001t𖠊𭭬7@}\u001d+\u001e8o<&𦪺P⓴v姸\u001c\u001a=ᎄ\u000cla𬎧\u000f))\u0001𫔓HX󷦖}𩩪C9\r% Quy.𛈨𘊔\u000cp1S}R𗎰]y'\u0015A𨣭A𠗗BI\u001d􊲽󹭘V蝱e^\u000e5b#􂳊$u#b+f􈨘s𩫇[󰥜}𭐡K\u0008B'Ux/.𗬄𢆸x𫴩3)𥌧\u0013r4dl",
+        "team": "00000000-0000-0000-0000-000000000001"
+    },
+    "token": "&"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_10.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_10.json
index 60bbc0704fb..434bf486d90 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_10.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": "hy4dc",
-        "accent_id": 1,
-        "name": "瀪+w􁁗*KHRC\u0013\u0012𑁆0󾪜u1vT\u0006𗇼\u001a}﹨\"P􁛱3\u000cb_\u0018\u0004𠨑B55t\u001a熍8呮􊝪I𨤋𡆐獙􈶮\u001af􇃪\u001a⎃𥅯3\u001d?U𣣱\u000f0󿝬󳙑1\u001b\u00028똿g𣮃􄰍?|\u001dn\u0007+8|𨪏#H|+􁣦|􈓩􅔰86o𗏆",
-        "team": null,
-        "id": "00000000-0000-0000-0000-000000000001"
-    },
+    "client": "c",
     "conversation": {
+        "id": "00000000-0000-0001-0000-000000000001",
         "members": [],
-        "name": "\u0005",
-        "id": "00000000-0000-0001-0000-000000000001"
+        "name": "\u0005"
     },
-    "locale": "rw",
-    "token": "䢖h",
     "id": "00000001-0000-0004-0000-000000000004",
-    "client": "c"
-}
\ No newline at end of file
+    "locale": "rw",
+    "origin": {
+        "accent_id": 1,
+        "handle": "hy4dc",
+        "id": "00000000-0000-0000-0000-000000000001",
+        "name": "瀪+w􁁗*KHRC\u0013\u0012𑁆0󾪜u1vT\u0006𗇼\u001a}﹨\"P􁛱3\u000cb_\u0018\u0004𠨑B55t\u001a熍8呮􊝪I𨤋𡆐獙􈶮\u001af􇃪\u001a⎃𥅯3\u001d?U𣣱\u000f0󿝬󳙑1\u001b\u00028똿g𣮃􄰍?|\u001dn\u0007+8|𨪏#H|+􁣦|􈓩􅔰86o𗏆",
+        "team": null
+    },
+    "token": "䢖h"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_11.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_11.json
index 3cfea24b2b9..c982384b4f0 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_11.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": "pt-g.o",
-        "accent_id": -1,
-        "name": "󼩩\u0005<\u0017􄢧`pv6$?U1\u000cХ΄6GB\u001a𥭫󽳞{W@󷢢􎇠w󾄛Z\trO􂝻e𐕟斂x*YUj\nf쿳lg\u001bs_󿢒S2[\u0012e􌽕󵕄=\u0018軭,#󼸣􍸞\u0012{2>\u0013*\u0019嫃%\u0008fn𬈌9<\u0017c𬓻𑄱Qr𣳺\n",
-        "team": "00000001-0000-0000-0000-000000000001",
-        "id": "00000000-0000-0000-0000-000100000000"
-    },
+    "client": "8",
     "conversation": {
+        "id": "00000001-0000-0001-0000-000000000001",
         "members": [],
-        "name": "",
-        "id": "00000001-0000-0001-0000-000000000001"
+        "name": ""
     },
-    "locale": "cv",
-    "token": "a",
     "id": "00000003-0000-0003-0000-000100000000",
-    "client": "8"
-}
\ No newline at end of file
+    "locale": "cv",
+    "origin": {
+        "accent_id": -1,
+        "handle": "pt-g.o",
+        "id": "00000000-0000-0000-0000-000100000000",
+        "name": "󼩩\u0005<\u0017􄢧`pv6$?U1\u000cХ΄6GB\u001a𥭫󽳞{W@󷢢􎇠w󾄛Z\trO􂝻e𐕟斂x*YUj\nf쿳lg\u001bs_󿢒S2[\u0012e􌽕󵕄=\u0018軭,#󼸣􍸞\u0012{2>\u0013*\u0019嫃%\u0008fn𬈌9<\u0017c𬓻𑄱Qr𣳺\n",
+        "team": "00000001-0000-0000-0000-000000000001"
+    },
+    "token": "a"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_12.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_12.json
index ad360cdcb4c..c49b644521a 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_12.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": "2mbu57j9i5av3tl5qq3defu9ydjatm7y-bgi4nznqyvcbmdn66pma5ice6famcazb892aqtzz2_zclckldrjh6nq69sz_2p0qx99p6t2ogt9ewzzq2olgge32jyt6kmwgmzvdbeti-iygnitchblkicol8m83a8n-a2ip-yy27z2llzu7",
-        "accent_id": 0,
-        "name": "F􌠧ar-'(K矸\u001fOEED\u00102(\u001b[\u0017\u00042]&W\u000b콣󳂚8󴻃Hxl𭇵\u000c",
-        "team": "00000001-0000-0001-0000-000000000000",
-        "id": "00000001-0000-0001-0000-000000000001"
-    },
+    "client": "c",
     "conversation": {
+        "id": "00000000-0000-0001-0000-000000000000",
         "members": [],
-        "name": "",
-        "id": "00000000-0000-0001-0000-000000000000"
+        "name": ""
     },
-    "locale": "sm-MO",
-    "token": "숚\u001e~\u0001'",
     "id": "00000004-0000-0003-0000-000100000003",
-    "client": "c"
-}
\ No newline at end of file
+    "locale": "sm-MO",
+    "origin": {
+        "accent_id": 0,
+        "handle": "2mbu57j9i5av3tl5qq3defu9ydjatm7y-bgi4nznqyvcbmdn66pma5ice6famcazb892aqtzz2_zclckldrjh6nq69sz_2p0qx99p6t2ogt9ewzzq2olgge32jyt6kmwgmzvdbeti-iygnitchblkicol8m83a8n-a2ip-yy27z2llzu7",
+        "id": "00000001-0000-0001-0000-000000000001",
+        "name": "F􌠧ar-'(K矸\u001fOEED\u00102(\u001b[\u0017\u00042]&W\u000b콣󳂚8󴻃Hxl𭇵\u000c",
+        "team": "00000001-0000-0001-0000-000000000000"
+    },
+    "token": "숚\u001e~\u0001'"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_13.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_13.json
index 3ade5b33903..d47050b06ba 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_13.json
@@ -1,32 +1,32 @@
 {
-    "origin": {
-        "handle": "7g_a0on27rzpz7cfzl3hle6v7dwv.db.to.ief5xzr3eu.vr5jb57_z5t3ahmggm9oddsd-quxc1uv4xkr7ncg9ff9zicgsjenafoxe4jbtrzjagqy84xrvt7iv_dcpe7_iiyg3tpeg8fh2osxf7dv01ueygahrdokoa-2ya37r6g0b0u3j416qnnk.404lffdz",
-        "accent_id": 0,
-        "name": "6`k)?𮊘V",
-        "team": "00000000-0000-0001-0000-000100000001",
-        "id": "00000001-0000-0000-0000-000100000001"
-    },
+    "client": "e",
     "conversation": {
+        "id": "00000001-0000-0001-0000-000100000000",
         "members": [
             {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0001-0000-000000000000",
-                    "provider": "00000000-0000-0001-0000-000000000000"
-                },
                 "conversation_role": "f5kideyd0z_wa8k_u0o3wcgbx1iea5yqmkrz3vv86ehs77akep4ttw6eznzo7tefijy5zqxnzq8u4mghhp3m2pg9kqtxnaxukzw1cn",
+                "id": "00000000-0000-0000-0000-000000000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0000-0000-000000000001"
                 },
-                "id": "00000000-0000-0000-0000-000000000001"
+                "service": {
+                    "id": "00000001-0000-0001-0000-000000000000",
+                    "provider": "00000000-0000-0001-0000-000000000000"
+                },
+                "status": 0
             }
         ],
-        "name": "",
-        "id": "00000001-0000-0001-0000-000100000000"
+        "name": ""
     },
-    "locale": "mi-FI",
-    "token": "",
     "id": "00000004-0000-0003-0000-000400000001",
-    "client": "e"
-}
\ No newline at end of file
+    "locale": "mi-FI",
+    "origin": {
+        "accent_id": 0,
+        "handle": "7g_a0on27rzpz7cfzl3hle6v7dwv.db.to.ief5xzr3eu.vr5jb57_z5t3ahmggm9oddsd-quxc1uv4xkr7ncg9ff9zicgsjenafoxe4jbtrzjagqy84xrvt7iv_dcpe7_iiyg3tpeg8fh2osxf7dv01ueygahrdokoa-2ya37r6g0b0u3j416qnnk.404lffdz",
+        "id": "00000001-0000-0000-0000-000100000001",
+        "name": "6`k)?𮊘V",
+        "team": "00000000-0000-0001-0000-000100000001"
+    },
+    "token": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_14.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_14.json
index 6ffd92fecf8..3a1a1233a0c 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_14.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": "ho",
-        "accent_id": -1,
-        "name": "\"𧓰Z9\u0008<l󳶸g󼲍\u001e\\\u000b%>𗄘蛣yX\u0016󱧕/\u001a\u001a/B􉸱B\u0019?\n𝃵zz􃮤􇞗T\u000e]󿒎󹊕d\u0008[𬴰3谝\u001f􆕷󰟊BVTBC8&\t􉄳𡈵aRR􅤰e <(]\u0015",
-        "team": "00000000-0000-0001-0000-000000000000",
-        "id": "00000001-0000-0000-0000-000000000000"
-    },
+    "client": "a",
     "conversation": {
+        "id": "00000001-0000-0000-0000-000000000001",
         "members": [],
-        "name": "𪳛",
-        "id": "00000001-0000-0000-0000-000000000001"
+        "name": "𪳛"
     },
-    "locale": "nr-AT",
-    "token": "uC\u001aY",
     "id": "00000003-0000-0001-0000-000300000004",
-    "client": "a"
-}
\ No newline at end of file
+    "locale": "nr-AT",
+    "origin": {
+        "accent_id": -1,
+        "handle": "ho",
+        "id": "00000001-0000-0000-0000-000000000000",
+        "name": "\"𧓰Z9\u0008<l󳶸g󼲍\u001e\\\u000b%>𗄘蛣yX\u0016󱧕/\u001a\u001a/B􉸱B\u0019?\n𝃵zz􃮤􇞗T\u000e]󿒎󹊕d\u0008[𬴰3谝\u001f􆕷󰟊BVTBC8&\t􉄳𡈵aRR􅤰e <(]\u0015",
+        "team": "00000000-0000-0001-0000-000000000000"
+    },
+    "token": "uC\u001aY"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_15.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_15.json
index eaff82afcda..98143300d3e 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_15.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": null,
-        "accent_id": 1,
-        "name": "s9FA\u001a+x\u001cg\u0004󶃅i룪\u000b x\u001e􁘹󹫚\u001e􅵫d5Ｃq\u000e!\u001a16쌕/)lY*{{\u0000􏰹킬Y6i8l;󺞈\u001d7\u0005i\u0018􇵏l\u0004𗂹XH=􊆢\u0013𣚌C􊩚wƔ%Q2\u001f]r􄻅FL𞋇*F󶉉l\u001e󰟌\u000ef\u000cK𘕏\u0013*6뮢{􊏤\u0013\u0011M􆜲oE𖢶\u0017r^n*\u000e/\u0010􄂤\u0013\u000c<u^s\\󲏐[􆘉]􉪏\u000f頒\u0017𘌁\u0011",
-        "team": null,
-        "id": "00000000-0000-0001-0000-000000000000"
-    },
+    "client": "7",
     "conversation": {
+        "id": "00000001-0000-0000-0000-000100000000",
         "members": [],
-        "name": "󿘵",
-        "id": "00000001-0000-0000-0000-000100000000"
+        "name": "󿘵"
     },
-    "locale": "co-KH",
-    "token": "",
     "id": "00000003-0000-0002-0000-000000000004",
-    "client": "7"
-}
\ No newline at end of file
+    "locale": "co-KH",
+    "origin": {
+        "accent_id": 1,
+        "handle": null,
+        "id": "00000000-0000-0001-0000-000000000000",
+        "name": "s9FA\u001a+x\u001cg\u0004󶃅i룪\u000b x\u001e􁘹󹫚\u001e􅵫d5Ｃq\u000e!\u001a16쌕/)lY*{{\u0000􏰹킬Y6i8l;󺞈\u001d7\u0005i\u0018􇵏l\u0004𗂹XH=􊆢\u0013𣚌C􊩚wƔ%Q2\u001f]r􄻅FL𞋇*F󶉉l\u001e󰟌\u000ef\u000cK𘕏\u0013*6뮢{􊏤\u0013\u0011M􆜲oE𖢶\u0017r^n*\u000e/\u0010􄂤\u0013\u000c<u^s\\󲏐[􆘉]􉪏\u000f頒\u0017𘌁\u0011",
+        "team": null
+    },
+    "token": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_16.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_16.json
index 163cf84268f..ff7c24c79c3 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_16.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": "o8opul3h",
-        "accent_id": 1,
-        "name": "N\u001bE`W:\"9\"㧸\u0012g_\"<󿶉􃞷GGQ/g핶*󵣷|Sh)-\u0013&e-Y&&:𣽵􁐰TWo\u0003󶧱󶡈@\u000f>q\u0017ⵦc􄺜|k\u0001􊎺 Dqwr\u000f r硔𧢳󷭤?u󹕅AHﴱA\u0001𬔚􀷟\u0001F󳧮V\u0006kY󳜳-􈇋󳳌]'",
-        "team": "00000000-0000-0000-0000-000100000001",
-        "id": "00000000-0000-0000-0000-000000000000"
-    },
+    "client": "9",
     "conversation": {
+        "id": "00000001-0000-0000-0000-000000000001",
         "members": [],
-        "name": "",
-        "id": "00000001-0000-0000-0000-000000000001"
+        "name": ""
     },
-    "locale": "hi-TD",
-    "token": "=𠉱𧺭e𔖇",
     "id": "00000003-0000-0004-0000-000200000003",
-    "client": "9"
-}
\ No newline at end of file
+    "locale": "hi-TD",
+    "origin": {
+        "accent_id": 1,
+        "handle": "o8opul3h",
+        "id": "00000000-0000-0000-0000-000000000000",
+        "name": "N\u001bE`W:\"9\"㧸\u0012g_\"<󿶉􃞷GGQ/g핶*󵣷|Sh)-\u0013&e-Y&&:𣽵􁐰TWo\u0003󶧱󶡈@\u000f>q\u0017ⵦc􄺜|k\u0001􊎺 Dqwr\u000f r硔𧢳󷭤?u󹕅AHﴱA\u0001𬔚􀷟\u0001F󳧮V\u0006kY󳜳-􈇋󳳌]'",
+        "team": "00000000-0000-0000-0000-000100000001"
+    },
+    "token": "=𠉱𧺭e𔖇"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_17.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_17.json
index e1f6fefaf19..4bce44cf547 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_17.json
@@ -1,45 +1,45 @@
 {
-    "origin": {
-        "handle": null,
-        "accent_id": 0,
-        "name": "j>\u001cO鷴󶔇(.R􌍟􂑼O",
-        "team": "00000000-0000-0001-0000-000100000000",
-        "id": "00000000-0000-0001-0000-000100000000"
-    },
+    "client": "1",
     "conversation": {
+        "id": "00000000-0000-0001-0000-000000000000",
         "members": [
             {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000100000000",
-                    "provider": "00000000-0000-0000-0000-000100000000"
-                },
                 "conversation_role": "zi6nsx7hjs04d_1nxiaasqcb",
+                "id": "00000000-0000-0000-0000-000100000000",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0000-0000-000100000000"
                 },
-                "id": "00000000-0000-0000-0000-000100000000"
-            },
-            {
-                "status": 0,
                 "service": {
                     "id": "00000001-0000-0000-0000-000100000000",
-                    "provider": "00000000-0000-0001-0000-000000000001"
+                    "provider": "00000000-0000-0000-0000-000100000000"
                 },
+                "status": 0
+            },
+            {
                 "conversation_role": "c67nu5cxj9cru8018oquz_74mazgewq5fa6mwgwzktvep_7ftdtitzlwewqe",
+                "id": "00000000-0000-0000-0000-000100000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0000-0000-000100000001"
                 },
-                "id": "00000000-0000-0000-0000-000100000001"
+                "service": {
+                    "id": "00000001-0000-0000-0000-000100000000",
+                    "provider": "00000000-0000-0001-0000-000000000001"
+                },
+                "status": 0
             }
         ],
-        "name": "",
-        "id": "00000000-0000-0001-0000-000000000000"
+        "name": ""
     },
-    "locale": "ny-NP",
-    "token": "&))",
     "id": "00000002-0000-0001-0000-000100000000",
-    "client": "1"
-}
\ No newline at end of file
+    "locale": "ny-NP",
+    "origin": {
+        "accent_id": 0,
+        "handle": null,
+        "id": "00000000-0000-0001-0000-000100000000",
+        "name": "j>\u001cO鷴󶔇(.R􌍟􂑼O",
+        "team": "00000000-0000-0001-0000-000100000000"
+    },
+    "token": "&))"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_18.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_18.json
index 227376e0d57..5ad3eab2200 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_18.json
@@ -1,45 +1,45 @@
 {
-    "origin": {
-        "handle": "gcmc3fjd3ire.maquq87awi",
-        "accent_id": 0,
-        "name": "󽣄\u0019z\u001a%𢆌__DO}햹쎅\u0018뢪Z㙚w8<󶙝󴧷𬼶\u001b綤{|\u00063_)\u0013]f$􏩊;Pj0\u0017\u0007\u0012k\nG\u001ar𣧯2}\u0013.\u0004B\u0001\u0018𧨈\u0004𣤛\u0017􉣱).ꄨ\tNwq󹨼􉮳",
-        "team": null,
-        "id": "00000000-0000-0000-0000-000100000000"
-    },
+    "client": "4",
     "conversation": {
+        "id": "00000001-0000-0001-0000-000100000000",
         "members": [
             {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0000-0000-000000000000",
-                    "provider": "00000001-0000-0001-0000-000000000000"
-                },
                 "conversation_role": "a8r6vcnbte4ouwljafu5fid9r_",
+                "id": "00000001-0000-0000-0000-000100000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000001-0000-0000-0000-000100000001"
                 },
-                "id": "00000001-0000-0000-0000-000100000001"
-            },
-            {
-                "status": 0,
                 "service": {
-                    "id": "00000000-0000-0000-0000-000100000001",
-                    "provider": "00000000-0000-0000-0000-000000000000"
+                    "id": "00000000-0000-0000-0000-000000000000",
+                    "provider": "00000001-0000-0001-0000-000000000000"
                 },
+                "status": 0
+            },
+            {
                 "conversation_role": "05bh82wu2bogl1wfzvdrt6l37s_1awtp4rbb5qyk9f2fezt8gq0u_f2eoa7qjloopp4yh0dg5h0ad",
+                "id": "00000001-0000-0000-0000-000100000000",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000001-0000-0000-0000-000100000000"
                 },
-                "id": "00000001-0000-0000-0000-000100000000"
+                "service": {
+                    "id": "00000000-0000-0000-0000-000100000001",
+                    "provider": "00000000-0000-0000-0000-000000000000"
+                },
+                "status": 0
             }
         ],
-        "name": "\u0012",
-        "id": "00000001-0000-0001-0000-000100000000"
+        "name": "\u0012"
     },
-    "locale": "gu-SY",
-    "token": "𪵮􇚆Nr􁺰",
     "id": "00000000-0000-0002-0000-000000000001",
-    "client": "4"
-}
\ No newline at end of file
+    "locale": "gu-SY",
+    "origin": {
+        "accent_id": 0,
+        "handle": "gcmc3fjd3ire.maquq87awi",
+        "id": "00000000-0000-0000-0000-000100000000",
+        "name": "󽣄\u0019z\u001a%𢆌__DO}햹쎅\u0018뢪Z㙚w8<󶙝󴧷𬼶\u001b綤{|\u00063_)\u0013]f$􏩊;Pj0\u0017\u0007\u0012k\nG\u001ar𣧯2}\u0013.\u0004B\u0001\u0018𧨈\u0004𣤛\u0017􉣱).ꄨ\tNwq󹨼􉮳",
+        "team": null
+    },
+    "token": "𪵮􇚆Nr􁺰"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_19.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_19.json
index 22033345051..4bbe2e23457 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_19.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": null,
-        "accent_id": -1,
-        "name": "𪆔\u001aM\u0000z󽊋Wh>k󷞫{n몦\u000c媿;OG'ꭞl8,􄁻5󷕏+P\nᥲitP\u0013={?仰z𗅆핆zᶻz 􂏗V;􅮩]o3󺽟id]\u001f􉏈𪌶x󵑙=󵹵􍺔\u0012\u00132~;",
-        "team": "00000000-0000-0000-0000-000100000000",
-        "id": "00000001-0000-0000-0000-000100000000"
-    },
+    "client": "6",
     "conversation": {
+        "id": "00000000-0000-0000-0000-000100000001",
         "members": [],
-        "name": "w",
-        "id": "00000000-0000-0000-0000-000100000001"
+        "name": "w"
     },
-    "locale": "zu-AO",
-    "token": "",
     "id": "00000000-0000-0001-0000-000000000000",
-    "client": "6"
-}
\ No newline at end of file
+    "locale": "zu-AO",
+    "origin": {
+        "accent_id": -1,
+        "handle": null,
+        "id": "00000001-0000-0000-0000-000100000000",
+        "name": "𪆔\u001aM\u0000z󽊋Wh>k󷞫{n몦\u000c媿;OG'ꭞl8,􄁻5󷕏+P\nᥲitP\u0013={?仰z𗅆핆zᶻz 􂏗V;􅮩]o3󺽟id]\u001f􉏈𪌶x󵑙=󵹵􍺔\u0012\u00132~;",
+        "team": "00000000-0000-0000-0000-000100000000"
+    },
+    "token": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_2.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_2.json
index 8202a96b4f3..2b0a378f19d 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_2.json
@@ -1,17 +1,17 @@
 {
+    "client": "4",
+    "conversation": {
+        "id": "00000000-0000-0000-0000-000000000001",
+        "members": []
+    },
+    "id": "00000000-0000-0003-0000-000100000003",
+    "locale": "si-JM",
     "origin": {
-        "handle": "mwt6",
         "accent_id": 1,
+        "handle": "mwt6",
+        "id": "00000000-0000-0000-0000-000100000000",
         "name": "}\u0010&:\u0008p\u0017.+H \u001e\u0016q􄻄醿",
-        "team": null,
-        "id": "00000000-0000-0000-0000-000100000000"
-    },
-    "conversation": {
-        "members": [],
-        "id": "00000000-0000-0000-0000-000000000001"
+        "team": null
     },
-    "locale": "si-JM",
-    "token": "f\u0006",
-    "id": "00000000-0000-0003-0000-000100000003",
-    "client": "4"
-}
\ No newline at end of file
+    "token": "f\u0006"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_20.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_20.json
index 04b7bdb857e..59e6cc55a02 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_20.json
@@ -1,17 +1,17 @@
 {
+    "client": "5",
+    "conversation": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "members": []
+    },
+    "id": "00000003-0000-0001-0000-000000000002",
+    "locale": "ny-KN",
     "origin": {
-        "handle": "th4n3ndvnpp49es-gz55m5nnya_d.mcna7zg2t-t.xhcz6xbh17cg0.trdfgmo8whrtkl9fqdi8jg7d3nlh03p.bpumzn-.89h4.i75x6gx.x7kos0x4hqc.31hy78ckr6502kun7u7_b1a.8mw3oo3ylv.k29_zei793az7xlfaes1wa2gvu4tad52v5-w8rz9o-ivftxq5-nz87uhlm",
         "accent_id": 0,
+        "handle": "th4n3ndvnpp49es-gz55m5nnya_d.mcna7zg2t-t.xhcz6xbh17cg0.trdfgmo8whrtkl9fqdi8jg7d3nlh03p.bpumzn-.89h4.i75x6gx.x7kos0x4hqc.31hy78ckr6502kun7u7_b1a.8mw3oo3ylv.k29_zei793az7xlfaes1wa2gvu4tad52v5-w8rz9o-ivftxq5-nz87uhlm",
+        "id": "00000000-0000-0000-0000-000100000001",
         "name": "Oo\u000c7缾$\u0015\u0011^\u0013\u00142󵢰\u0017wRy@!𥵅\u00191r\u001cw\u0007'Gd?\u001e􋚂L{K걓-?-䪵}l𦲳𩯍\u0006𮥥Zk𧵘XD",
-        "team": "00000000-0000-0001-0000-000000000001",
-        "id": "00000000-0000-0000-0000-000100000001"
-    },
-    "conversation": {
-        "members": [],
-        "id": "00000000-0000-0001-0000-000000000000"
+        "team": "00000000-0000-0001-0000-000000000001"
     },
-    "locale": "ny-KN",
-    "token": "\\`\u0006,<",
-    "id": "00000003-0000-0001-0000-000000000002",
-    "client": "5"
-}
\ No newline at end of file
+    "token": "\\`\u0006,<"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_3.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_3.json
index 868b58361fd..2438ac6043d 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_3.json
@@ -1,31 +1,31 @@
 {
-    "origin": {
-        "handle": "h.cn77ac0vrssl3li_xktkmwmps_8s6y-ntsnv5e6i6pc4tihqh6t9paxuyxopod76mgse-4pyop9v.n6uhz5",
-        "accent_id": 1,
-        "name": "T𣬥nw)󻘁8-CL󹹧^Xu􌎩𤢅\u0019q7\u000b\u00011\u0019\u0018𗑹3棠\"\u0006(𥦅\u001f`/\u001e\u0008󵄢\\,𭮮\u000fV͇kg൛/􇠫iZ􅯜;",
-        "team": "00000000-0000-0001-0000-000100000001",
-        "id": "00000001-0000-0000-0000-000100000000"
-    },
+    "client": "7",
     "conversation": {
+        "id": "00000000-0000-0000-0000-000100000001",
         "members": [
             {
-                "status": 0,
-                "service": {
-                    "id": "00000001-0000-0000-0000-000100000001",
-                    "provider": "00000000-0000-0001-0000-000000000001"
-                },
                 "conversation_role": "xawj0wsxkoiigr6hjuhzkt2qdrnx2hc3auf74uyekse8rrmrtv05sysqlhs9c2bq87h_pz5di6rjr8_bapds",
+                "id": "00000000-0000-0001-0000-000000000000",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0001-0000-000000000000"
                 },
-                "id": "00000000-0000-0001-0000-000000000000"
+                "service": {
+                    "id": "00000001-0000-0000-0000-000100000001",
+                    "provider": "00000000-0000-0001-0000-000000000001"
+                },
+                "status": 0
             }
-        ],
-        "id": "00000000-0000-0000-0000-000100000001"
+        ]
     },
-    "locale": "ab-IO",
-    "token": "0~",
     "id": "00000003-0000-0004-0000-000000000001",
-    "client": "7"
-}
\ No newline at end of file
+    "locale": "ab-IO",
+    "origin": {
+        "accent_id": 1,
+        "handle": "h.cn77ac0vrssl3li_xktkmwmps_8s6y-ntsnv5e6i6pc4tihqh6t9paxuyxopod76mgse-4pyop9v.n6uhz5",
+        "id": "00000001-0000-0000-0000-000100000000",
+        "name": "T𣬥nw)󻘁8-CL󹹧^Xu􌎩𤢅\u0019q7\u000b\u00011\u0019\u0018𗑹3棠\"\u0006(𥦅\u001f`/\u001e\u0008󵄢\\,𭮮\u000fV͇kg൛/􇠫iZ􅯜;",
+        "team": "00000000-0000-0001-0000-000100000001"
+    },
+    "token": "0~"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_4.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_4.json
index 96338e04a16..6777e325efb 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_4.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": null,
-        "accent_id": -1,
-        "name": "/3󺵑s𨬮𤳿Hf\r.Z+l\u0006Ⲑj\u0017\\𘃲@;`\u000bC􇜢.tt~󶅐4~d~fI\u001a*𫵔",
-        "team": "00000000-0000-0000-0000-000100000001",
-        "id": "00000001-0000-0000-0000-000100000001"
-    },
+    "client": "f",
     "conversation": {
+        "id": "00000001-0000-0000-0000-000100000000",
         "members": [],
-        "name": "",
-        "id": "00000001-0000-0000-0000-000100000000"
+        "name": ""
     },
-    "locale": "dz-MD",
-    "token": "R",
     "id": "00000000-0000-0004-0000-000300000000",
-    "client": "f"
-}
\ No newline at end of file
+    "locale": "dz-MD",
+    "origin": {
+        "accent_id": -1,
+        "handle": null,
+        "id": "00000001-0000-0000-0000-000100000001",
+        "name": "/3󺵑s𨬮𤳿Hf\r.Z+l\u0006Ⲑj\u0017\\𘃲@;`\u000bC􇜢.tt~󶅐4~d~fI\u001a*𫵔",
+        "team": "00000000-0000-0000-0000-000100000001"
+    },
+    "token": "R"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_5.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_5.json
index 162333a9480..754fda192fa 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_5.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": "dcd5u---q-5liar3qaixbwwjjrg-79a2k413z74whfyc-k_8jvle63fhs3v.mdncia29",
-        "accent_id": -1,
-        "name": "\u0003V\u0019/S􁂃vc\u0018\u000fk/!𫤁sEL鞬粰\u0018𢁝ꎫ3􂀧JWo\u001b=0YZHAl+􃴳\u0018)𞡯W",
-        "team": "00000000-0000-0001-0000-000000000000",
-        "id": "00000001-0000-0001-0000-000000000000"
-    },
+    "client": "4",
     "conversation": {
+        "id": "00000000-0000-0001-0000-000000000000",
         "members": [],
-        "name": "}",
-        "id": "00000000-0000-0001-0000-000000000000"
+        "name": "}"
     },
-    "locale": "ng",
-    "token": "\u001b\u001d\u000f",
     "id": "00000001-0000-0002-0000-000300000003",
-    "client": "4"
-}
\ No newline at end of file
+    "locale": "ng",
+    "origin": {
+        "accent_id": -1,
+        "handle": "dcd5u---q-5liar3qaixbwwjjrg-79a2k413z74whfyc-k_8jvle63fhs3v.mdncia29",
+        "id": "00000001-0000-0001-0000-000000000000",
+        "name": "\u0003V\u0019/S􁂃vc\u0018\u000fk/!𫤁sEL鞬粰\u0018𢁝ꎫ3􂀧JWo\u001b=0YZHAl+􃴳\u0018)𞡯W",
+        "team": "00000000-0000-0001-0000-000000000000"
+    },
+    "token": "\u001b\u001d\u000f"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_6.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_6.json
index a9b677f4f19..79810b4d0b8 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_6.json
@@ -1,57 +1,57 @@
 {
-    "origin": {
-        "handle": "chuc8zlscl1gioct",
-        "accent_id": 1,
-        "name": "vK!_\u0010:\u001bI0𩊚U𣌲\u0008\u0000*𑐗%\u001avf77󹦻잮\u0000Qn􌐜_􁄃]FIF\u0000󲱪m?a\u0011𠮒+\u001f󸐑[U􁷅v\rU$:󰱎\u000em[󱋇󵷘\u0011H\u0005$_^e8e􉄙E')y莆\u0019R\u000b[Z\u000c)\u000f\u0014𝄛𡠼󽬸c;'𩯩􃶓잲\u001eꨂ\u0005jᾮ􌊵\\𠨬PL|n\u0017󰓾󽟋",
-        "team": "00000000-0000-0001-0000-000000000001",
-        "id": "00000000-0000-0001-0000-000000000001"
-    },
+    "client": "2",
     "conversation": {
+        "id": "00000001-0000-0001-0000-000100000000",
         "members": [
             {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "provider": "00000000-0000-0000-0000-000000000000"
-                },
                 "conversation_role": "zv9nb4emt5hh_59ezmb7gy7vex5csr4hizv2bzuj67mjuwx2wc4zf_8valch1hkjc",
+                "id": "00000000-0000-0001-0000-000100000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0001-0000-000100000001"
                 },
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            {
-                "status": 0,
                 "service": {
-                    "id": "00000001-0000-0000-0000-000000000000",
-                    "provider": "00000000-0000-0000-0000-000100000000"
+                    "id": "00000000-0000-0001-0000-000100000000",
+                    "provider": "00000000-0000-0000-0000-000000000000"
                 },
+                "status": 0
+            },
+            {
                 "conversation_role": "pnj4jsurytr8p6wkxo1_1c8frkgjemx0y48aribcevovmbpeh2us5exkz_fkyfciz88zqw4z4f56orrphp2d5owojj7vxuus0db0eud_bci52125vmt",
+                "id": "00000000-0000-0001-0000-000100000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0001-0000-000100000001"
                 },
-                "id": "00000000-0000-0001-0000-000100000001"
-            },
-            {
-                "status": 0,
                 "service": {
-                    "id": "00000001-0000-0000-0000-000000000001",
-                    "provider": "00000000-0000-0001-0000-000100000001"
+                    "id": "00000001-0000-0000-0000-000000000000",
+                    "provider": "00000000-0000-0000-0000-000100000000"
                 },
+                "status": 0
+            },
+            {
                 "conversation_role": "3cwtdmxs2zcpv4k55pxg6354ab_2oqoz_jtetp3_u8rjfzac7jiq14oq24axxupapg08njxccrvix5b9q2r3ezmdsni5yx0oq55am8jeqv57815l5td3groa6vjm408",
+                "id": "00000000-0000-0000-0000-000100000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0000-0000-000100000001"
                 },
-                "id": "00000000-0000-0000-0000-000100000001"
+                "service": {
+                    "id": "00000001-0000-0000-0000-000000000001",
+                    "provider": "00000000-0000-0001-0000-000100000001"
+                },
+                "status": 0
             }
-        ],
-        "id": "00000001-0000-0001-0000-000100000000"
+        ]
     },
-    "locale": "sk-ML",
-    "token": "\u001f",
     "id": "00000000-0000-0004-0000-000400000003",
-    "client": "2"
-}
\ No newline at end of file
+    "locale": "sk-ML",
+    "origin": {
+        "accent_id": 1,
+        "handle": "chuc8zlscl1gioct",
+        "id": "00000000-0000-0001-0000-000000000001",
+        "name": "vK!_\u0010:\u001bI0𩊚U𣌲\u0008\u0000*𑐗%\u001avf77󹦻잮\u0000Qn􌐜_􁄃]FIF\u0000󲱪m?a\u0011𠮒+\u001f󸐑[U􁷅v\rU$:󰱎\u000em[󱋇󵷘\u0011H\u0005$_^e8e􉄙E')y莆\u0019R\u000b[Z\u000c)\u000f\u0014𝄛𡠼󽬸c;'𩯩􃶓잲\u001eꨂ\u0005jᾮ􌊵\\𠨬PL|n\u0017󰓾󽟋",
+        "team": "00000000-0000-0001-0000-000000000001"
+    },
+    "token": "\u001f"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_7.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_7.json
index cc6dfd17636..6361da16b60 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_7.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": "kfgs",
-        "accent_id": 1,
-        "name": "]𗼪\u000e\u001dq{9𢻈j𠾈",
-        "team": "00000000-0000-0001-0000-000000000000",
-        "id": "00000000-0000-0000-0000-000100000000"
-    },
+    "client": "9",
     "conversation": {
+        "id": "00000001-0000-0001-0000-000100000000",
         "members": [],
-        "name": "慖",
-        "id": "00000001-0000-0001-0000-000100000000"
+        "name": "慖"
     },
-    "locale": "ln-GR",
-    "token": "\u0014Y&;",
     "id": "00000002-0000-0002-0000-000200000000",
-    "client": "9"
-}
\ No newline at end of file
+    "locale": "ln-GR",
+    "origin": {
+        "accent_id": 1,
+        "handle": "kfgs",
+        "id": "00000000-0000-0000-0000-000100000000",
+        "name": "]𗼪\u000e\u001dq{9𢻈j𠾈",
+        "team": "00000000-0000-0001-0000-000000000000"
+    },
+    "token": "\u0014Y&;"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_8.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_8.json
index e84511f1883..aa77d8ccf1d 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_8.json
@@ -1,18 +1,18 @@
 {
-    "origin": {
-        "handle": ".x1v4",
-        "accent_id": 1,
-        "name": "0H𨂧􋆄\u0018􃥙\u000b1􃷡􄳤(r",
-        "team": null,
-        "id": "00000000-0000-0001-0000-000000000001"
-    },
+    "client": "3",
     "conversation": {
+        "id": "00000000-0000-0000-0000-000100000000",
         "members": [],
-        "name": "",
-        "id": "00000000-0000-0000-0000-000100000000"
+        "name": ""
     },
-    "locale": "te-AR",
-    "token": "",
     "id": "00000004-0000-0004-0000-000100000003",
-    "client": "3"
-}
\ No newline at end of file
+    "locale": "te-AR",
+    "origin": {
+        "accent_id": 1,
+        "handle": ".x1v4",
+        "id": "00000000-0000-0001-0000-000000000001",
+        "name": "0H𨂧􋆄\u0018􃥙\u000b1􃷡􄳤(r",
+        "team": null
+    },
+    "token": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_9.json b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_9.json
index 275ada65395..f3f0c5df467 100644
--- a/libs/wire-api/test/golden/testObject_NewBotRequest_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_NewBotRequest_provider_9.json
@@ -1,44 +1,44 @@
 {
-    "origin": {
-        "handle": null,
-        "accent_id": 1,
-        "name": "𑈛C:`🁟\u0002uO]\u0017𬽨𝁀𡄯,)􄲾\u000cOy f\u0015\u0001!MhT􇫵zM\\W#\n𤻙\u001ah\\쐤􀳣{'ok𮛖0𣙿𪺜\u0019)􈒀-𩑽ZC\u0011\u000e'\u000eYﺵ\u001e\u0015m\\J:{䣮\u001c,􇖲oNy$9DXX\u0003,#+\u0015\u0014𦨾Q.+\u0018C4",
-        "team": "00000000-0000-0001-0000-000100000001",
-        "id": "00000000-0000-0001-0000-000100000001"
-    },
+    "client": "2",
     "conversation": {
+        "id": "00000000-0000-0000-0000-000100000001",
         "members": [
             {
-                "status": 0,
-                "service": {
-                    "id": "00000000-0000-0001-0000-000100000000",
-                    "provider": "00000001-0000-0001-0000-000000000001"
-                },
                 "conversation_role": "18dmoaegl2lj3k9vvtivedw5umrfl3frcwsiv2f9wyhe66qgaeuzbxh_q5ja4sebpu9ofj826ufgeozzz5_0mt2kbnrl9fqxl9nfmgtbklecosycpw6fupemw7vj",
+                "id": "00000001-0000-0001-0000-000000000000",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000001-0000-0001-0000-000000000000"
                 },
-                "id": "00000001-0000-0001-0000-000000000000"
-            },
-            {
-                "status": 0,
                 "service": {
-                    "id": "00000000-0000-0000-0000-000100000000",
-                    "provider": "00000001-0000-0000-0000-000000000000"
+                    "id": "00000000-0000-0001-0000-000100000000",
+                    "provider": "00000001-0000-0001-0000-000000000001"
                 },
+                "status": 0
+            },
+            {
                 "conversation_role": "9vzqc64t8n6lfdea9ryucq_xu4x_v8mgjkv0jf8d5r34wxgac7yhqtnqnxivdzyhgotkpum07frl",
+                "id": "00000000-0000-0000-0000-000000000001",
                 "qualified_id": {
                     "domain": "golden.example.com",
                     "id": "00000000-0000-0000-0000-000000000001"
                 },
-                "id": "00000000-0000-0000-0000-000000000001"
+                "service": {
+                    "id": "00000000-0000-0000-0000-000100000000",
+                    "provider": "00000001-0000-0000-0000-000000000000"
+                },
+                "status": 0
             }
-        ],
-        "id": "00000000-0000-0000-0000-000100000001"
+        ]
     },
-    "locale": "ha-MW",
-    "token": "󹆶X",
     "id": "00000004-0000-0002-0000-000200000003",
-    "client": "2"
-}
\ No newline at end of file
+    "locale": "ha-MW",
+    "origin": {
+        "accent_id": 1,
+        "handle": null,
+        "id": "00000000-0000-0001-0000-000100000001",
+        "name": "𑈛C:`🁟\u0002uO]\u0017𬽨𝁀𡄯,)􄲾\u000cOy f\u0015\u0001!MhT􇫵zM\\W#\n𤻙\u001ah\\쐤􀳣{'ok𮛖0𣙿𪺜\u0019)􈒀-𩑽ZC\u0011\u000e'\u000eYﺵ\u001e\u0015m\\J:{䣮\u001c,􇖲oNy$9DXX\u0003,#+\u0015\u0014𦨾Q.+\u0018C4",
+        "team": "00000000-0000-0001-0000-000100000001"
+    },
+    "token": "󹆶X"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_1.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_1.json
index 09d01caa10e..f420df5b17d 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_1.json
@@ -1,18 +1,18 @@
 {
+    "accent_id": 0,
     "last_prekey": {
-        "key": "+󼰂\u0005",
-        "id": 65535
+        "id": 65535,
+        "key": "+󼰂\u0005"
     },
-    "accent_id": 0,
     "name": "s\u000bw` 𦳩\"􍽚􅇇Z𪟴\u0013`| \u00018𩕸c+F3G𝍯􍈮𭹤TC㜺(hrV\u001cqe^v&𝔯Cs𭣤󾥰F}a>|.#A󽚤𓉔\u0003鈰󶈢T",
     "prekeys": [
         {
-            "key": "􇞚",
-            "id": 0
+            "id": 0,
+            "key": "􇞚"
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_10.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_10.json
index b747a1fca30..8c206d3e0e5 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_10.json
@@ -1,35 +1,35 @@
 {
+    "accent_id": -5,
+    "assets": [
+        {
+            "key": "",
+            "type": "image"
+        }
+    ],
     "last_prekey": {
-        "key": "R𨙙",
-        "id": 65535
+        "id": 65535,
+        "key": "R𨙙"
     },
-    "accent_id": -5,
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
-        }
-    ],
-    "assets": [
-        {
-            "key": "",
-            "type": "image"
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_11.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_11.json
index eb9929d6b86..14e14dea69d 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_11.json
@@ -1,16 +1,16 @@
 {
     "last_prekey": {
-        "key": "U\u0002\u0017􏩂x",
-        "id": 65535
+        "id": 65535,
+        "key": "U\u0002\u0017􏩂x"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "8",
-            "id": 1
+            "id": 1,
+            "key": "8"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_12.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_12.json
index a78ed218648..866eab16904 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_12.json
@@ -1,7 +1,7 @@
 {
     "last_prekey": {
-        "key": "\u0019\u001c",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0019\u001c"
     },
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_13.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_13.json
index 3382ceae3b6..10c2c3e593b 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_13.json
@@ -1,20 +1,9 @@
 {
-    "last_prekey": {
-        "key": "󴏳eP'X",
-        "id": 65535
-    },
     "accent_id": -6,
-    "name": "Pcf\u0010j\u0006􋺶\u0007\u001a_V}*p󱨃!O\r\u0014u㗏􁪑J\u0015l\u000c\u0004E󵸴&\"D:ly|",
-    "prekeys": [
-        {
-            "key": "h𠄨I",
-            "id": 1
-        }
-    ],
     "assets": [
         {
-            "size": "preview",
             "key": "\u0010k",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -22,8 +11,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -31,14 +20,25 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "呬𮀉",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000c􇀊E",
+            "size": "preview",
             "type": "image"
         }
+    ],
+    "last_prekey": {
+        "id": 65535,
+        "key": "󴏳eP'X"
+    },
+    "name": "Pcf\u0010j\u0006􋺶\u0007\u001a_V}*p󱨃!O\r\u0014u㗏􁪑J\u0015l\u000c\u0004E󵸴&\"D:ly|",
+    "prekeys": [
+        {
+            "id": 1,
+            "key": "h𠄨I"
+        }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_14.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_14.json
index afd0d9d2c88..00e798bb03e 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_14.json
@@ -1,42 +1,42 @@
 {
+    "accent_id": -4,
     "last_prekey": {
-        "key": "Q󷏶顷U",
-        "id": 65535
+        "id": 65535,
+        "key": "Q󷏶顷U"
     },
-    "accent_id": -4,
     "name": "pVuv􍞂AD;\u0006𤜹=󳨬fie5R󹀚㸎 𪯅S𠞴㒊\u0004E[\u0010𤷶4ZN+Vj\u00106\u0012𡊄D􆝝jda𠝮8H)􁎣k즼`(\u000ep@H\u000c0M䖘􂔯J}\u0012|􍃒􀎻O\u0012\u0000\u00175o\u000b",
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_15.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_15.json
index 313df99ecce..e3f262a1bba 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_15.json
@@ -1,45 +1,45 @@
 {
     "last_prekey": {
-        "key": "KuA𪉺􈳙",
-        "id": 65535
+        "id": 65535,
+        "key": "KuA𪉺􈳙"
     },
     "name": "B0J4V\u0005#1𤒘𗼯􆹘?;\u0007\"\u001bd:>b\tJ𦖕\u0006姘F7⫬q􂕅\u0011k:U􁚲𑃗𦵈:h𨈃G_\u0010},<󰑪𨶝zQ\u0015W?-x;Iq?U𐰢\u0004/x𫱈\u0007",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_16.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_16.json
index 02a47eaf73c..490d5905858 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_16.json
@@ -1,42 +1,42 @@
 {
-    "last_prekey": {
-        "key": "e!D*j",
-        "id": 65535
-    },
     "accent_id": -5,
-    "name": "𪥎4?rvqg%\u0012𨳦\u0011t\u0018\u000f_𖡿F",
-    "prekeys": [
+    "assets": [
         {
-            "key": "",
-            "id": 1
+            "key": "\"吝󿳖",
+            "size": "complete",
+            "type": "image"
         },
         {
             "key": "",
-            "id": 0
-        },
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "last_prekey": {
+        "id": 65535,
+        "key": "e!D*j"
+    },
+    "name": "𪥎4?rvqg%\u0012𨳦\u0011t\u0018\u000f_𖡿F",
+    "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
-        }
-    ],
-    "assets": [
+            "id": 0,
+            "key": ""
+        },
         {
-            "size": "complete",
-            "key": "\"吝󿳖",
-            "type": "image"
+            "id": 0,
+            "key": ""
         },
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_17.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_17.json
index 004fd6600a3..fa4074b6414 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_17.json
@@ -1,19 +1,19 @@
 {
+    "accent_id": 1,
+    "assets": [],
     "last_prekey": {
-        "key": "􃷞\u000c󺇄⽉",
-        "id": 65535
+        "id": 65535,
+        "key": "􃷞\u000c󺇄⽉"
     },
-    "accent_id": 1,
     "name": "g숋B{\u0013Cq\u0018mbD5Q\u0014>i\u0014\u000f[󹡴|K괉|𪮦",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "b",
-            "id": 1
+            "id": 1,
+            "key": "b"
         }
-    ],
-    "assets": []
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_18.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_18.json
index b067acb868c..e2c845c07f1 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_18.json
@@ -1,25 +1,25 @@
 {
-    "last_prekey": {
-        "key": "剡N|.\u001d",
-        "id": 65535
-    },
     "accent_id": 8,
-    "prekeys": [],
     "assets": [
         {
-            "size": "complete",
             "key": "\u001c",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𖫳󰑑",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "last_prekey": {
+        "id": 65535,
+        "key": "剡N|.\u001d"
+    },
+    "prekeys": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_19.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_19.json
index 28c562081b7..779f6e45c78 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_19.json
@@ -1,60 +1,60 @@
 {
-    "last_prekey": {
-        "key": "u=\u0015",
-        "id": 65535
-    },
-    "name": "FvrT0g\\𩞩",
-    "prekeys": [
-        {
-            "key": "",
-            "id": 0
-        },
+    "assets": [
         {
-            "key": "",
-            "id": 1
+            "key": "𦳝\u0011",
+            "size": "complete",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 0
+            "key": "\t",
+            "size": "preview",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 1
+            "key": "V#",
+            "size": "complete",
+            "type": "image"
         },
         {
             "key": "",
-            "id": 1
+            "size": "preview",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 0
+            "key": "(\u0003",
+            "size": "complete",
+            "type": "image"
         }
     ],
-    "assets": [
+    "last_prekey": {
+        "id": 65535,
+        "key": "u=\u0015"
+    },
+    "name": "FvrT0g\\𩞩",
+    "prekeys": [
         {
-            "size": "complete",
-            "key": "𦳝\u0011",
-            "type": "image"
+            "id": 0,
+            "key": ""
         },
         {
-            "size": "preview",
-            "key": "\t",
-            "type": "image"
+            "id": 1,
+            "key": ""
         },
         {
-            "size": "complete",
-            "key": "V#",
-            "type": "image"
+            "id": 0,
+            "key": ""
         },
         {
-            "size": "preview",
-            "key": "",
-            "type": "image"
+            "id": 1,
+            "key": ""
         },
         {
-            "size": "complete",
-            "key": "(\u0003",
-            "type": "image"
+            "id": 1,
+            "key": ""
+        },
+        {
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_2.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_2.json
index 99c23117c7d..8da98068cc8 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_2.json
@@ -1,83 +1,83 @@
 {
-    "last_prekey": {
-        "key": "𦨴S󷟄󼌫󳛼",
-        "id": 65535
-    },
-    "name": "𭓐}nqW\t𫲡7f",
-    "prekeys": [
+    "assets": [
         {
-            "key": "",
-            "id": 1
+            "key": "C#􁹦",
+            "size": "complete",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 1
+            "key": "\u0014\n",
+            "size": "complete",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 1
+            "key": "V",
+            "size": "complete",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 1
-        },
+            "key": "Y+_",
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "last_prekey": {
+        "id": 65535,
+        "key": "𦨴S󷟄󼌫󳛼"
+    },
+    "name": "𭓐}nqW\t𫲡7f",
+    "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
-        }
-    ],
-    "assets": [
+            "id": 0,
+            "key": ""
+        },
         {
-            "size": "complete",
-            "key": "C#􁹦",
-            "type": "image"
+            "id": 0,
+            "key": ""
         },
         {
-            "size": "complete",
-            "key": "\u0014\n",
-            "type": "image"
+            "id": 0,
+            "key": ""
         },
         {
-            "size": "complete",
-            "key": "V",
-            "type": "image"
+            "id": 1,
+            "key": ""
         },
         {
-            "size": "complete",
-            "key": "Y+_",
-            "type": "image"
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_20.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_20.json
index 4bab4655f8b..aa68bf97097 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_20.json
@@ -1,37 +1,37 @@
 {
-    "last_prekey": {
-        "key": "`|𣎜^\u001f",
-        "id": 65535
-    },
-    "prekeys": [
-        {
-            "key": "+",
-            "id": 0
-        },
-        {
-            "key": "쬹",
-            "id": 0
-        },
-        {
-            "key": "",
-            "id": 0
-        }
-    ],
     "assets": [
         {
-            "size": "preview",
             "key": "\"",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􆵛d",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "8",
+            "size": "complete",
             "type": "image"
         }
+    ],
+    "last_prekey": {
+        "id": 65535,
+        "key": "`|𣎜^\u001f"
+    },
+    "prekeys": [
+        {
+            "id": 0,
+            "key": "+"
+        },
+        {
+            "id": 0,
+            "key": "쬹"
+        },
+        {
+            "id": 0,
+            "key": ""
+        }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_3.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_3.json
index 5801340addd..e7dc04b5481 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_3.json
@@ -1,46 +1,46 @@
 {
-    "last_prekey": {
-        "key": "I",
-        "id": 65535
-    },
     "accent_id": 0,
-    "name": "\"𦛸7󲹗璴𫚞\u0015bXB_0􎮾5익gU󼤽/b:꒨􍾬Rr󷖈󰍛𘁊u𝢰V\u000c䇜?f\\\u0004x\u0010x~菽xi􂃞S2MSKK\u0016cpb[\u0007󷨧8𡐧\u001cx믵U𝘳X\u0006}𗋺󲽸6B􇾝,oZ\u0016l\u000f\u0016f櫾8M26𨝛󴳮\u0000se,4`\u00022𭡁Lk\u001bMc",
-    "prekeys": [
+    "assets": [
         {
-            "key": "",
-            "id": 1
+            "key": "'\u0012",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 1
+            "key": "`",
+            "size": "preview",
+            "type": "image"
         },
         {
-            "key": "",
-            "id": 1
-        },
+            "key": "?􈯅\u001b",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "last_prekey": {
+        "id": 65535,
+        "key": "I"
+    },
+    "name": "\"𦛸7󲹗璴𫚞\u0015bXB_0􎮾5익gU󼤽/b:꒨􍾬Rr󷖈󰍛𘁊u𝢰V\u000c䇜?f\\\u0004x\u0010x~菽xi􂃞S2MSKK\u0016cpb[\u0007󷨧8𡐧\u001cx믵U𝘳X\u0006}𗋺󲽸6B􇾝,oZ\u0016l\u000f\u0016f櫾8M26𨝛󴳮\u0000se,4`\u00022𭡁Lk\u001bMc",
+    "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
-        }
-    ],
-    "assets": [
+            "id": 1,
+            "key": ""
+        },
         {
-            "key": "'\u0012",
-            "type": "image"
+            "id": 1,
+            "key": ""
         },
         {
-            "size": "preview",
-            "key": "`",
-            "type": "image"
+            "id": 1,
+            "key": ""
         },
         {
-            "size": "preview",
-            "key": "?􈯅\u001b",
-            "type": "image"
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_4.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_4.json
index e4e87953d0a..9b062b9c6c9 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_4.json
@@ -1,9 +1,9 @@
 {
+    "accent_id": 8,
     "last_prekey": {
-        "key": "\u0014G)K􂯫\\",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0014G)K􂯫\\"
     },
-    "accent_id": 8,
     "name": "WmX!󻌧 B7\u0006𢍟󷉒C\u001a󽚤F󾫇i\u0010\u000c$\u0007􌩴\u001b9\u0010D",
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_5.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_5.json
index e19c290ff1d..4337635b647 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_5.json
@@ -1,18 +1,18 @@
 {
+    "accent_id": 7,
+    "assets": [],
     "last_prekey": {
-        "key": "\u000cC\u0000L\\\u0004",
-        "id": 65535
+        "id": 65535,
+        "key": "\u000cC\u0000L\\\u0004"
     },
-    "accent_id": 7,
     "prekeys": [
         {
-            "key": "U",
-            "id": 1
+            "id": 1,
+            "key": "U"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
-    ],
-    "assets": []
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_6.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_6.json
index b9d65494679..e2d2c739a62 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_6.json
@@ -1,21 +1,21 @@
 {
     "last_prekey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "name": "qo𤊞\u00066x\u0013\u0004]\u0008􋕍hdg]떘$𮋹􉣀\u0017\u0000\"b𠌷𤱢𞲑\u0001gf(w󵐕𘘩<\u001fu썽\u0010#噞\u0006􇖖\u0013\u0002􉍒xvyCN󼲫𒇗󸵥\u0014󳏑6Z,I>駾\u0006.\u000e>仏~S\u001d󵎀\t𗨃􉽴󾴴%%8ᮭ\u0005X\u000fpLk\u000b􊑝K",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "璣",
-            "id": 0
+            "id": 0,
+            "key": "璣"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_7.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_7.json
index 3d6ad054446..839c2ad2ea6 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_7.json
@@ -1,8 +1,8 @@
 {
     "last_prekey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "name": "hce錄𣣷8 grK𖣯\u001b)𢨟EQj{\u0002𠖑\u0014!^誦}𩂅\u001d󲪛\u0012z󲙊𩷈\"\u001a <\u0001{ov(\u0013𡆥V@H\u0014𠈉𬦻1􎒨`Y𖥈_🚘vaxL\u0007T\u001b%m{\u000429A𨪚𭹼𘨁b􄦟H0𬲋J\u0014􍸴W󸖀_\u00055[%Zc'X<w#\tD\u0004Ḟ2𩊸JP",
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_8.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_8.json
index 04dbb99df91..161483bf34e 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_8.json
@@ -1,19 +1,13 @@
 {
-    "last_prekey": {
-        "key": "F!i㦢󱀌",
-        "id": 65535
-    },
-    "name": "o#o󴏪l\u0006𭲻k\u0007owꑒ\u001di >󿭋*Am䨥\u0015d󲺸1\u0012o\nRo/󸡈L\u001f:h󴐊󲙌M\r28r\n3𢐅\u0003\u000b􊸢􁲤3󻹐\u001ce\r􃂤U\u0017𬓈󶂞b죴\u0004yMtg\u0015F\u0008󺨡2𨆐#&װ\u0005r󺑟Dx",
-    "prekeys": [],
     "assets": [
         {
-            "size": "preview",
             "key": "ᘻ~",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "i𗳫",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -21,9 +15,15 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "%o",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "last_prekey": {
+        "id": 65535,
+        "key": "F!i㦢󱀌"
+    },
+    "name": "o#o󴏪l\u0006𭲻k\u0007owꑒ\u001di >󿭋*Am䨥\u0015d󲺸1\u0012o\nRo/󸡈L\u001f:h󴐊󲙌M\r28r\n3𢐅\u0003\u000b􊸢􁲤3󻹐\u001ce\r􃂤U\u0017𬓈󶂞b죴\u0004yMtg\u0015F\u0008󺨡2𨆐#&װ\u0005r󺑟Dx",
+    "prekeys": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_9.json b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_9.json
index 74d6301f0ca..808bff59b2a 100644
--- a/libs/wire-api/test/golden/testObject_NewBotResponse_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_NewBotResponse_provider_9.json
@@ -1,23 +1,23 @@
 {
+    "accent_id": -5,
+    "assets": [],
     "last_prekey": {
-        "key": "]4𐭅8\\",
-        "id": 65535
+        "id": 65535,
+        "key": "]4𐭅8\\"
     },
-    "accent_id": -5,
     "name": "\"H􀲃犘󿚳a􍭑n\u0019rC\u0005H쏨.=󼢿D?(󴌽Ve𬨝􄷭Z\n@􁐱X*A􀜌\\\u001fT󲤒[~$Je",
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "\u0015",
-            "id": 1
+            "id": 1,
+            "key": "\u0015"
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
-    ],
-    "assets": []
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_1.json b/libs/wire-api/test/golden/testObject_NewClient_user_1.json
index 9e5f005eb28..496b6ef8b3e 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_1.json
@@ -1,16 +1,16 @@
 {
+    "label": "",
     "lastkey": {
-        "key": "\u0019",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0019"
     },
-    "password": "]?S`bO,%\u000coV􂗉\\+􈻒1𮈑Hc\u0007\u0002蛊\u000bH\u0002<^e􅃖(\u001c(UsaJ𒓨\u0004\u0003J\u0000~K𪧝킥􍌺\u0018B喆wP\u001eb?^𥋾!\u0006󱪦z\u0004D\u0010V󷲲nᖡ/W𖮅\"\u001b겸mnq_t\u001bCR􌡔\u000fCq󼉺􏰲\u0013\u0007\u0018\n㤔𫕱\u001dr'\tA􍵌\u0012󶌖󷶽灿VW\u0017K&#~\u0016>\u0011J\u000e;UFO\u0006d\u0014\u001b\u000e󲕒턘\u0006\u000f`𦆱RxHJVQ]:s\u0007𭿛IY팡~H6,80􃐎󻬹\u0016wx_蕠𗭹q\u0005:N𤨾􌿓􎢒𦚶\u0000F\u0003As𦑥󲢲bf\t𤿵|\u0006󺷹\u0012{\"\u0010⏅󿝕>𭪌,i.L\u0001𣳴>𠆃g翘󺻚𭻽􁪅6󰇵\t+𨩰8\u000ev\u000c\u0000\u0008\u001ev)閈\u0011J\n\u0002􆶢趝\u0014&R\u001b:~𖭃\nO鄹5\u001d!3V􇹑𣺜,􅁍n\u0018󰷄󿋽^ͱ\u0018䔧\u001d!\u001a砂𪆾󷣣;8{\ttB[A\u001dH􊭖\nv巇󵯣z|\u0018S^.@\u001c𢚛#P􎬗V6:%7|\u0012o𘏆􂴇)V𧓲H郘e\u0015ꮍ/􈸢\u0007Sv𝦺?\u0018W7\u0017IOc~E􃪉󻂪b\u0017𥽝𖡶?曻󽲪e\u0019.|DXlNA-􈉈𫥃E\u001b+󾓐SZ𗺉󱢵hRm/^{社􊍂󽅥=*)􉡿􇬈󸧎HjR󸀝㢿Vg󾓤!g𩒿𣻀𝣍\u0013PY[=<z\u0013倬+6DDO\u0002z󽃝􄊱i\u0015W7dO!$\"\u0002󵛯\u0010튕q\"a7Q#D;𫷗'Z|ﶥ\u0014\u0010\u0016苄,4;/SX᜶H󳿚󴛺n􀝩󲭍J􈫮j&\u001eGlY𧂲1mt󻱐4EP^􁠔F\u0007_.E)㑈\u0018\u0004L\u0015\u0019v𑶨W𧢆\u001ch\u0016>2\u0012!0󵙕\u0016\"􏴭󹘏-<2]`6:󿁤'&8\u0003\"LL𗮝*^:\u0005\u0019󿳞 T󽃙e[8%J#~u􍧖绿j=hX66)+\u0016\u0007U\u000e\u0001􅔲j􈻌􊌈𨰪Td^􇘌󰄶\u001b:\u001d𘀲􆣃@􌰛X\u0013\u000e싧\u0019%`鞇􎪘ﺛ􉉻\u0002\u0007-\u0019+_𧻨:H4o\u0013HS6`\u0005𬍇M\u0017V?.>󵷍CO-𬞹󼤊bf}🀥ZM󼦨\rNp􋚖󽀘𪂡%\u0006/WNZt髑HnO􇕓=xm􋗭그@$Z󾊘dEZ_1\u0000\u000cw󰃔\u0011Iq\u0019a&􍸆􊭟\u001be\u0012:􍦾#\u0002e\u0002󲥷1S􈗢v=A󲹁\u0000.ཙ􎑙<1 𡊟𠑊$>M6岤􋭲󵋞&t_6\u0019𡵱q\u0015걾ZTX\\\u0013􀬭䩾a:ip\\]𣨊y𡃁耪:b\u0012炧\txB;!󽁥􋋩HmV\u0017v𗓷v\u00016(/ph𭡷.䞩\u0017\u0000C𢍑􃥳)R5􎖴a\u0010%^􈇗X𨎤$D9i􅃐\u00126wM󿍘\u000eI%x􌵀+YT𣨤𩪱𢶋H𭕗L\rU3\u000b.+<\rT󶞜󳋐_v𗁙]H(\"\u0000J勢C\ru\u0011-􋮾Q\u0019\"\"𩖨r\u00047P𨌠 \u001c􁕟R󻾗􁍎𠠢dz󸿥􃐗D𤈻Z\u0017󿗆폇Sb7𥐋CL\\",
     "model": "",
-    "type": "temporary",
+    "password": "]?S`bO,%\u000coV􂗉\\+􈻒1𮈑Hc\u0007\u0002蛊\u000bH\u0002<^e􅃖(\u001c(UsaJ𒓨\u0004\u0003J\u0000~K𪧝킥􍌺\u0018B喆wP\u001eb?^𥋾!\u0006󱪦z\u0004D\u0010V󷲲nᖡ/W𖮅\"\u001b겸mnq_t\u001bCR􌡔\u000fCq󼉺􏰲\u0013\u0007\u0018\n㤔𫕱\u001dr'\tA􍵌\u0012󶌖󷶽灿VW\u0017K&#~\u0016>\u0011J\u000e;UFO\u0006d\u0014\u001b\u000e󲕒턘\u0006\u000f`𦆱RxHJVQ]:s\u0007𭿛IY팡~H6,80􃐎󻬹\u0016wx_蕠𗭹q\u0005:N𤨾􌿓􎢒𦚶\u0000F\u0003As𦑥󲢲bf\t𤿵|\u0006󺷹\u0012{\"\u0010⏅󿝕>𭪌,i.L\u0001𣳴>𠆃g翘󺻚𭻽􁪅6󰇵\t+𨩰8\u000ev\u000c\u0000\u0008\u001ev)閈\u0011J\n\u0002􆶢趝\u0014&R\u001b:~𖭃\nO鄹5\u001d!3V􇹑𣺜,􅁍n\u0018󰷄󿋽^ͱ\u0018䔧\u001d!\u001a砂𪆾󷣣;8{\ttB[A\u001dH􊭖\nv巇󵯣z|\u0018S^.@\u001c𢚛#P􎬗V6:%7|\u0012o𘏆􂴇)V𧓲H郘e\u0015ꮍ/􈸢\u0007Sv𝦺?\u0018W7\u0017IOc~E􃪉󻂪b\u0017𥽝𖡶?曻󽲪e\u0019.|DXlNA-􈉈𫥃E\u001b+󾓐SZ𗺉󱢵hRm/^{社􊍂󽅥=*)􉡿􇬈󸧎HjR󸀝㢿Vg󾓤!g𩒿𣻀𝣍\u0013PY[=<z\u0013倬+6DDO\u0002z󽃝􄊱i\u0015W7dO!$\"\u0002󵛯\u0010튕q\"a7Q#D;𫷗'Z|ﶥ\u0014\u0010\u0016苄,4;/SX᜶H󳿚󴛺n􀝩󲭍J􈫮j&\u001eGlY𧂲1mt󻱐4EP^􁠔F\u0007_.E)㑈\u0018\u0004L\u0015\u0019v𑶨W𧢆\u001ch\u0016>2\u0012!0󵙕\u0016\"􏴭󹘏-<2]`6:󿁤'&8\u0003\"LL𗮝*^:\u0005\u0019󿳞 T󽃙e[8%J#~u􍧖绿j=hX66)+\u0016\u0007U\u000e\u0001􅔲j􈻌􊌈𨰪Td^􇘌󰄶\u001b:\u001d𘀲􆣃@􌰛X\u0013\u000e싧\u0019%`鞇􎪘ﺛ􉉻\u0002\u0007-\u0019+_𧻨:H4o\u0013HS6`\u0005𬍇M\u0017V?.>󵷍CO-𬞹󼤊bf}🀥ZM󼦨\rNp􋚖󽀘𪂡%\u0006/WNZt髑HnO􇕓=xm􋗭그@$Z󾊘dEZ_1\u0000\u000cw󰃔\u0011Iq\u0019a&􍸆􊭟\u001be\u0012:􍦾#\u0002e\u0002󲥷1S􈗢v=A󲹁\u0000.ཙ􎑙<1 𡊟𠑊$>M6岤􋭲󵋞&t_6\u0019𡵱q\u0015걾ZTX\\\u0013􀬭䩾a:ip\\]𣨊y𡃁耪:b\u0012炧\txB;!󽁥􋋩HmV\u0017v𗓷v\u00016(/ph𭡷.䞩\u0017\u0000C𢍑􃥳)R5􎖴a\u0010%^􈇗X𨎤$D9i􅃐\u00126wM󿍘\u000eI%x􌵀+YT𣨤𩪱𢶋H𭕗L\rU3\u000b.+<\rT󶞜󳋐_v𗁙]H(\"\u0000J勢C\ru\u0011-􋮾Q\u0019\"\"𩖨r\u00047P𨌠 \u001c􁕟R󻾗􁍎𠠢dz󸿥􃐗D𤈻Z\u0017󿗆폇Sb7𥐋CL\\",
     "prekeys": [
         {
-            "key": "\r",
-            "id": 0
+            "id": 0,
+            "key": "\r"
         }
     ],
-    "label": ""
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_10.json b/libs/wire-api/test/golden/testObject_NewClient_user_10.json
index 117ee934c29..7b4b182e7ee 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_10.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_10.json
@@ -1,17 +1,17 @@
 {
+    "class": "legalhold",
+    "label": ";*",
     "lastkey": {
-        "key": "\u0002",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0002"
     },
-    "password": "\u000fxXs\u0002􀎩2􍅘헴퀰X\u000b􊊮\u0004Ik𫇌E?ZQ𠒴O3X󲘱!#B_𥓛}􈴖y􁚨PM\u0005{\u0013𦙆Ln\u0006F\u0012\u0000⬁6g贎󲊰摳$S\u0014\u000f󵈁4'?z􇿙0鬨A唍\u001e\u0010:pg\u0017,_V蟯殨󾉧U=S^$󾔆u:X漏~/*앴2\u0005d7pJ-^\u0000\u0007𐠗6a𦳟:%􃟐$􇀱69R\u001a/G?C\u0007b\u0001l$/K\u0003\u0013𢹢g 4J3\u0000#筞󰹡\u00102\u0017𪴯vV2\u00196𗧪\u000b贁W헞𫈱+4tk!+Y𥐬􍧉\u0015Q󹴾􍽓GHQU\u0008x;c_\u001a^蜢]S7\ru]\r󼝦!􄧍𤨬2\u001bMg􆙳QE\u0000m\u0000\u0002\u0011P𥶫\u000b(H󷁮󻵩|g􈒎\u0016b\u001c\u001b?=f󸮋헢\u0013\u0000\u0006g\u001f6𪄔Q첃q\t\"𮚲b\u0012𡹽3K𡶤9IxGW(\t:\u000c$9𒇇\u000fU?(𫎵\u000cgI;4\u0019𤄕\u0005\"RGbgCf9海Io􍲫쩷8wb(]\u001f􃍙!􃄞􇐁u)t\u0010kO\u0000_\u0014\u0017-\u001e 4\u0007,\u000c䴷Qgd􇚰姍􃒺\u0013;󰳯~􊮫Ui\u001cH󿱐\\󽻞\u0012vmU󰄽D𠹱\u0019󰘟\u00172D几鲯\u0006\u001aJ\u000eI,􉃫TgXb\u0001\u001c􋋨\u0003􋥝C2🌥7󼅅P \u001a\u0018(8htD\u0011码𧰅􄩒WzoM\u001d8\u000b.[zIG`T𨈊<$s􆱡𨠖\u00160=f(\u0005?v^?_ẊX>7呱|EQz󽲮q3\tr􇳂nq$yq𡩝5󱌝i􋮇h3\u0005􇠤䫙Ac󴺫s𥻅蜣X,\u0019􊅶>몠2\u0005}\\M\nd<lX\u0006O𑌙W:\u0004\nHVP\u000b*\u0012\u0003\u001e罛𤾂w\u0000x󿯓骧𡘘!2+RF􎂔8𢉜5BV}󴊮<w􄝷[ڤ5􀔦y[]a􁅞;u68𬤜F醳{g߽N9河\u001d󳈮e_􍈟>3%`>慕?\rv􁒕裡d>\twE𭹿G󻯖7󹷞\u001b{G􉁳\u000e\u000fv􁤜,cP􂽨󸾦\"4\u0010M\u0016𫦛󹘥8u􇒘n\u000ew\u0003V\u001f\u0010\u0012\u000cXf,󼿺b􌳷\">&0xFqd]^\u0012\u00054@9\u0000𗄝B𒂲}L\u000b\n9S\u0004\u00015im\u0012-𗖍}\u001a'𘈅#,󼠢c\u0006\u0003P$xc𡝉tB\u0013\u0017詞\u00160\u001bu\\􀄳b婫\"\u0004󵵃bwE:\u0008\u0014􄁯vp8󹪞\u0001\u001178$E\u0012JE>{?ចI\u0015J*7sI\u001beu􇆩⢵1a\u0015)R𭌸|PJ􏓗at\u001a)\u0007i2󶢝mY듕~gdde>󶭍yG5bʍ 𠗠󴙇zJ󰛞\u0015T?i\u000c􃴄F,]9\u001d돓%hB🖭h蟲9𩎚=K\u0015rFVWO\u0018Vcｒ􄐅􊲎\u0015󹠆\u001783\u001b4\"󼲎\u0012R􆀞𛰭1UD􁤣Fi􂯕8\u0019?j5j󳴛\u0001W)􂊇fJ*m􆖉d🃓l\u00142􉖙\"Xgp𗘸v\"\u00176U噳w\u000e2*𪩢厱vl\u00180\u0006;jh༟IC\u000e󺣖L;55\u0018󻲍\u0006`m3*. C)𑊌𦋴x>y<􍧪+>*\u001b\u000bs\u0001􉴺NSChj9쁓\"#M`?헚i\u0005\u001f\u0002\u001dlcS󿲞\u0019C\u0005\u0001_/u?/钷󳛦g𐚿𪲁*\u0002_v􂺝\u0012C\u0013\u0017𪡖J~637\u0010\t\u0011P\u0010y𐔔'Wz\u00168󶔘j4՞d^7图JF&,\u001a렫",
     "model": "9FO",
-    "type": "temporary",
+    "password": "\u000fxXs\u0002􀎩2􍅘헴퀰X\u000b􊊮\u0004Ik𫇌E?ZQ𠒴O3X󲘱!#B_𥓛}􈴖y􁚨PM\u0005{\u0013𦙆Ln\u0006F\u0012\u0000⬁6g贎󲊰摳$S\u0014\u000f󵈁4'?z􇿙0鬨A唍\u001e\u0010:pg\u0017,_V蟯殨󾉧U=S^$󾔆u:X漏~/*앴2\u0005d7pJ-^\u0000\u0007𐠗6a𦳟:%􃟐$􇀱69R\u001a/G?C\u0007b\u0001l$/K\u0003\u0013𢹢g 4J3\u0000#筞󰹡\u00102\u0017𪴯vV2\u00196𗧪\u000b贁W헞𫈱+4tk!+Y𥐬􍧉\u0015Q󹴾􍽓GHQU\u0008x;c_\u001a^蜢]S7\ru]\r󼝦!􄧍𤨬2\u001bMg􆙳QE\u0000m\u0000\u0002\u0011P𥶫\u000b(H󷁮󻵩|g􈒎\u0016b\u001c\u001b?=f󸮋헢\u0013\u0000\u0006g\u001f6𪄔Q첃q\t\"𮚲b\u0012𡹽3K𡶤9IxGW(\t:\u000c$9𒇇\u000fU?(𫎵\u000cgI;4\u0019𤄕\u0005\"RGbgCf9海Io􍲫쩷8wb(]\u001f􃍙!􃄞􇐁u)t\u0010kO\u0000_\u0014\u0017-\u001e 4\u0007,\u000c䴷Qgd􇚰姍􃒺\u0013;󰳯~􊮫Ui\u001cH󿱐\\󽻞\u0012vmU󰄽D𠹱\u0019󰘟\u00172D几鲯\u0006\u001aJ\u000eI,􉃫TgXb\u0001\u001c􋋨\u0003􋥝C2🌥7󼅅P \u001a\u0018(8htD\u0011码𧰅􄩒WzoM\u001d8\u000b.[zIG`T𨈊<$s􆱡𨠖\u00160=f(\u0005?v^?_ẊX>7呱|EQz󽲮q3\tr􇳂nq$yq𡩝5󱌝i􋮇h3\u0005􇠤䫙Ac󴺫s𥻅蜣X,\u0019􊅶>몠2\u0005}\\M\nd<lX\u0006O𑌙W:\u0004\nHVP\u000b*\u0012\u0003\u001e罛𤾂w\u0000x󿯓骧𡘘!2+RF􎂔8𢉜5BV}󴊮<w􄝷[ڤ5􀔦y[]a􁅞;u68𬤜F醳{g߽N9河\u001d󳈮e_􍈟>3%`>慕?\rv􁒕裡d>\twE𭹿G󻯖7󹷞\u001b{G􉁳\u000e\u000fv􁤜,cP􂽨󸾦\"4\u0010M\u0016𫦛󹘥8u􇒘n\u000ew\u0003V\u001f\u0010\u0012\u000cXf,󼿺b􌳷\">&0xFqd]^\u0012\u00054@9\u0000𗄝B𒂲}L\u000b\n9S\u0004\u00015im\u0012-𗖍}\u001a'𘈅#,󼠢c\u0006\u0003P$xc𡝉tB\u0013\u0017詞\u00160\u001bu\\􀄳b婫\"\u0004󵵃bwE:\u0008\u0014􄁯vp8󹪞\u0001\u001178$E\u0012JE>{?ចI\u0015J*7sI\u001beu􇆩⢵1a\u0015)R𭌸|PJ􏓗at\u001a)\u0007i2󶢝mY듕~gdde>󶭍yG5bʍ 𠗠󴙇zJ󰛞\u0015T?i\u000c􃴄F,]9\u001d돓%hB🖭h蟲9𩎚=K\u0015rFVWO\u0018Vcｒ􄐅􊲎\u0015󹠆\u001783\u001b4\"󼲎\u0012R􆀞𛰭1UD􁤣Fi􂯕8\u0019?j5j󳴛\u0001W)􂊇fJ*m􆖉d🃓l\u00142􉖙\"Xgp𗘸v\"\u00176U噳w\u000e2*𪩢厱vl\u00180\u0006;jh༟IC\u000e󺣖L;55\u0018󻲍\u0006`m3*. C)𑊌𦋴x>y<􍧪+>*\u001b\u000bs\u0001􉴺NSChj9쁓\"#M`?헚i\u0005\u001f\u0002\u001dlcS󿲞\u0019C\u0005\u0001_/u?/钷󳛦g𐚿𪲁*\u0002_v􂺝\u0012C\u0013\u0017𪡖J~637\u0010\t\u0011P\u0010y𐔔'Wz\u00168󶔘j4՞d^7图JF&,\u001a렫",
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ],
-    "class": "legalhold",
-    "label": ";*"
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_11.json b/libs/wire-api/test/golden/testObject_NewClient_user_11.json
index 2a8481563ff..a5c9eb103e3 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_11.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_11.json
@@ -1,25 +1,25 @@
 {
+    "class": "phone",
     "cookie": "oq[",
+    "label": "",
     "lastkey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "password": "\u0005WU#*\u0008𩙰\u0003pภ\u0014c󶠚e랽m􍋧\r\t󷑴Ậ\u0015z7\u0005\r?I~􁜼;>$]I\u000eꓛ\u0011𨋙T􏨢밎\u0006\u001c𫭩y71,h㇛{祪`\n\r𪝰+N􋬀\u001dlqmi􌠃\u0001\u0019=T#%󹨨\u0006\u000cZ_UCe\u000fk\"\n'%􆬷I\u001f\u001eZR.n%\u0000'`u5NI\u0017x\u0006+𐄏j𩤃(x\u0011;𬒖zyUe\u000c𮬥邒\u0012ow󿄺?-Wz󲍲Z+\u0001\n􈜗\u001bly󿨓6l\u000fNn<f󴳵\u0016\u001f ye󷃻K^}!+RyZX􋗊}\u0006FEGl󰦫f䛗7q;0W^w\u001eꤧ'\u0013Ms+\u0012o󹤪𗎂󻋳\u001a$Prr󹪢<\u0015_Q􊠯\u001a\u0000\u0014R8\u000e/Mmw𢁩cS>\u000fT\u001b\u0019*􈥣8&E.\u0008𤒌􅛖\u0019_\n{𮅰\u001e𦰛\u000e`󸻦땍󱵚^1𢀱=3X\u0011K\u0015\u001ec\u0001B􇙒B\u001dm1$\u001cDve𢭆g\u000f􉧢D<\u001aKo~X\u0001􋐫􍷀-3􂙓\"▭魼e6G\u0017󶹬􏖽텟3eM\u001931[L\u000e\u0014@𠗝F\u001f,bÇ󳿵\u000b\u0002󰱓D\u0012V\u000bX\u000f~􋸞 nS/𩞟RTD7cMd\u0011\u0004Ow󲷨yO[8􈗬𘤷[𭔫>𘗓\nA<=PE]'\u0012󰵾7I Q􅅠䐌E=\u0016\u0003;v\u0018\u001a𧿡!ek\u0012B4\u0002\u0004􌨾𫤆㑐b\t@{0􀻖𬔱𥀹\"\u0003\u00039/R\u000b𠤶n󻀄\u0006A\u0013\n:𞹒됤넪𮓨%Z\u001f\r<K\rwHW3bF\u0016F𮑊\u0008MuPn\rMc,㲳\u000f$ \u001eY3.>[EYo0N\u001e\u0005KR󼎹􌡱~c?\u0019J?`\u0011󺄿𘐄\t󽕦h.n|\u001a2󱃺{'𣙂􇺬/^ut𘢀𠶸--􁠅\u000f쵽󼤶T?󴎸𫘜󶀛?\u0010􄊲1𫷡*6\u000eti6𠶹_Z7\u0010\u0015\u001b\u001a\u0007/M,\r󷟞毶􀊌lg\u001djH.uC$옊^1h)\u0008,\u0017𨪥a􊭦R/󼰊_\u000f.tx\u0003 >齍󰞔%B\u0017󶚨㥷5\u0002𥟕\u000c𝦧𡚴}-j\u001byO\u0018뤶^􀯫F쥳J\u0019\u001aE}&9w𓌹u\r䮁nYűq䗹*3\u0008\u001c𢍚􀱀~Rx\u000f\n\u0006\na?S3揥\u0008n\"gf􏺜F&㻺V\u0017󺇔W󸀯\u0016N\u0006\u0016|r,;.w$\u001c\u0008.ro[V󱆦󷾛&\u000e䊭+䈙=\u0006\\M\u0019YpXZ|Jnnr􀶀\\󵍴寥A}H𨆗\u0017:_\u0013[\u00012%\rh\u001c\u001b]𖣔\u0013𮤲;\u000c􍵵#\r*0𖤧Z𢟓𥡻󻷜􈴔2𤊓\\ 7摭𫌌\u0015삙鐐𫱲p􌗫]P𖭯q\u000b\u001ei\u00153FX𒆒8\u001a胵J\u0013i夹#ïK󽓇%5j𫹑6鴆𪷅􏲉𔐤]B\u001f󿈤3󺀙-o;9>󶘾A3~\u0006\u001cRꏷ𢕘\u0001a\u000ciFV󴨵e\u0008󼴁𗩜n*󶇳\u0005𤡨\u0003\u001dnp\u0014m,\r􂛀hb\u0013􅂼蕠,&d",
-    "type": "legalhold",
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "class": "phone",
-    "label": ""
-}
\ No newline at end of file
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_12.json b/libs/wire-api/test/golden/testObject_NewClient_user_12.json
index 5a0533d9f5b..8773c45498d 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_12.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_12.json
@@ -1,36 +1,36 @@
 {
+    "class": "phone",
+    "label": "\u0017",
     "lastkey": {
-        "key": "\u0005",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0005"
     },
     "password": "T𨦷fqdA䛒k3􍳱[\rK\n\u000c^􊔥0𗼯\u0011\u0003'𗰒M+\u0003\u0007\u0017\nw\u0001܅K𧘱⮨z~qp𥞅\u0017\u001dW4m@CYG(썎ob:\u0018P~My\u001b𪸩\u000b𡋏\"蔛&𑘩X􅝀r\u0011𠍜󹪗v-p+))\u0005\u00029i {&p𨊜[\r\u001f&;b>N\u001b~bu\u0013\u000b:W:S9\u00101L|\\S+b0Q\u0002粍rs~;\u001fG;󰸼o󶏭್%\u0002m\u00125UTR\n\u0013X\u0017􂙲~\u001e\u0010;\u000e/\u001f-\\mPc<:.HmK𪰯o\u000c\u0001􋇋&B2\u0007R惛51\u001d&-𫷨c𬹸󱚺t~rT𪳔H?6𥽸~J􏝰q,\u0002\u001e#􉃹W.=첵L􆆤-􆿂\u0006𪑆𥇌75*Oq!芙{x\u0010t􇃥󲤴X(w.\u0004\r􏝁<g􄪄,𞸶󾨅󿠿W\u001eHF𫗸\u0006Vያah\u000bV􊼈\u0012󼷾\u001a~+\u0016N)T(%v\u0003\u0007v𘖓&PB!\u001fv\u000en-􅊱\u00068Y\u0015\t\u0008]ꄲ\u000f\u0013d-u\nln\u000f\u0012􊽎@s=󺨿􆜙9{􃋎󴿛\u000b(dyw$􏸛cZ𖡇\u0002𨋝􋺨𢱢\u0019􇏝!𪩆3JR𢿀\u0016𧠙GWD𤍶tUॼX]ꀁ󳯅?0􌰁-\u0001u\u0014ᑴcx@󲶫[Y󱬲\\\u0018皑Ed.\u000ca\u000fv=􇕴\u000fGBs􈚭􀢁J󹱚o忇W\nJ𤤴s}2𧞐𑨱􄋸~\u000e{\u0005}ᗌ&M俣好􂴻\u000e/%𩲗r􁚝Z𭛹\u001d7\u0006U\u000b`􋓲볠𥼧.𝩑󼳩M𠹹󽊔\t]薯\u0016L\u000c^I󲏆|\u0000󶈮\u001f@𩖥G8󶘬,S\u001f5󹑈圽鯲X\r󲷒\u001diM𠊺\u001a\u0010\u000c\\^ᕟyD⺽yU,j󳽤𢀺󰦃􂩩궾岅|o􇦔\r黹\u0016\u0000S]𘣶d|\u0001\u0006Cp\u001c\nYH\u001c􌙝/ixF \u0018[m<r𡇺 `􆞰Ks-v<a􋍾u𠭲챽𒆣z􃚸P\u001e~=\u0012'h<힀𐰅\u0011W𐅞uZ𑐃Z忱\u0012C\u0012\u0017WVb}]Po76鬌󳶞5y:\u001b􇩷󷖒󼇉\u0003u\u00140􆳉>}kp/\th,z\\檩\u0006n+=屸jL~F\u0015縟7\u0007깴 ,0ȅb\u001b\u0011\u001foA/\u0006\u000b󵛜\u0004[o(z+c\u0001貅s譞C篧\\W6\u0015'\u0002􄉲6Xb~TO􎎦􇔠U<Z\u0005𦐻᳠2퍱H-沉\u000f㋲/*Hy𢍟R􋐟?􈻝z\"\u001fCZg􌂥\u0018%p\u0004uIp𥇻㰛ᩄ𐅦􌴹!\u0010.􃵣(ී*󵾬=ꀙf\u001c]k沄\u0013ky􃱚Y^󲸁\u0001uI]G\u0011蝱vk􄧵\u001fe\u00083Ym=$M0BD(䯎󶫄mb\u000b󵗂=:#Q􀞒cE𠱶g𨮶\u001dp+^6\u0003󾌅C\u0000A\u001cջl\u0008Q1H:W[~+3t\u000b󾩓x𪙟'tg<󱐰\u0012󲫳󳠟\u0017𤩦hྩY&9􀽗􍚊!\u001fPh􅸬\u00147􈾃E\u0011\n)􎀗\u0013YD.n9&\u001a6󲩩𝝫\u0002􄬊󾶃􆴭]􉮕A\u0000u󹏖\u0018PB\rf}\u001f㍼􅤀O\u000bn%𫩉𓍻d\u0004왧\u0002𪀂xI勹vn.k􅨵 \u00143T s|4Hzyந􁿇l%td\u001dg\u0010𣭅=MY\u0013*M4𢿊\u0014奄5$.𦱯Zqw7c󿎭h*'󷛠7\u000e*s󰐦\"UOI󰤞m􃑠}\u0003􇆺䪏\u000f\u0012,\u0017#\u0018\u0010𧬸󷑍dQ􋱻\u0002z𑚔yDm􉎪䠓\u001c\u0001\u00143N\u0008S胣垲􊈼\n\u0011\r8bF)N𮉤𒁠Cd\u001a\u000eJy7󼙞\u0001'\u000b𬠼;VrZ𮞘",
-    "type": "permanent",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "class": "phone",
-    "label": "\u0017"
-}
\ No newline at end of file
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_13.json b/libs/wire-api/test/golden/testObject_NewClient_user_13.json
index e3fafdce0fa..f029fb7f009 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_13.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_13.json
@@ -1,40 +1,40 @@
 {
     "cookie": "",
+    "label": "",
     "lastkey": {
-        "key": "\u0011\u0013",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0011\u0013"
     },
     "password": "\u0010F󼞐7󻷏&L廓𤋌𡟼%𤟜7\u000c􇵼/􌹸I'-A󳭱B薎􇜷h𧍣Vq󱙰󻺠\u001e\u0018暿S\u0007\u0018AG󾎯🈺􆵀GE􇺕\u0015\u0008+v1^𥱸󰷢9n𨃹Krr<\n􍂈E]󴊯􄂨\u000bE\u001b$Vi~o=󱰬\u0000Y+*\r󹔽󶂏0\u0014\"lxU\u000fʅ𩜔%4.R[\u0006𡕐\\\u001f91b\u0002\u0002JFHcoRp굝BvB\u0005𣄣@jA󵧓dF􃍈 0Sw`=Hh忴𧇄s)𧽆󵱿EBK\u0012󱘵󲞈fr\u0015\u001e\tN;ym󴐀\nF􃑟D\u0005\u001c􂫚𭬒\u000f󷣈Z5X\u001b'%A𬰁\tᛘ(yQKތ{\taL鷎󳿘}j!F􌉷\u0003󸙁0P|⦸+圅tI՛\u0003𫙵\u0014󷯴󿕧\u001a\u0011\u0016C[4v\u001d}_9b\"n\u0013` _􂵢\u0004(E􀋟6𫥨V𡡫\u0004\u0014?j쬚\u0010M\u001eL𦩿@:j𦧿r8𔑌\u001b􏭉\u0007\u001fY\n\u0018𖤝+75\u0004k\n\".󱺘𘐿\u000c<DD<q􇽭%2\\pZd-<Z㯻􃡜󹂳{勩-`󿁚8G𣯧󰫌 <i>辤\u0001\"H2􅡜\u0011􏖲􅛑O#\u000fu\u000f𑒔ÆB,4󠆳􍜝L􌏟Mt>I)U?p\u000frQ󲋧󺅼7𩪍􂚶\u0014\u001b\nภ\n$󸻟\u0007bhXT\u0013w蹽 xᶶ\u001b?p\u0008\u0006󸼬N󿶆=j<𦎰=)\n6懘ZF=*`(\u0013\u000f􈱴\u001b\u001c𪀲\u0003yR},􉯶r\u001d\u001f hY_􂣖􁍵糝eHsWj􄅙N쟛H6dd\u0011%g󹊧6𨦍=KX:V5l󶽏0\r6K6?󻴁\u0018󸑕:,x󲫻_{rgc\u0008I\u001a｢􋊺`\\\u0019l/`\t\u001f\u0010`r󻟠+Eૃ𖭪L󲃻\u0019ਰd􀊏𥤤O\u0016􋜝.\u001dom濯v􉐇𥪧d@􆹱.O,*𤾡K\u0000[)H|Y\u0007pe\u0007x\\P𓁲 N󷉩􈧈|\u000c󺩚c\u001a\n\\+\u0001\u001aWCk\u0001e\u0003G.B\u0000&g@L\u0003?B\u000eC󼮠\u001b.\r\u001dv(uz)\u0019䶰󺽴Y?/R\u0010`]g1o1\u0015:\u001f5󸤦󺺹\u0016KS\u0018?𛀫􄿰󳸚􆃕#bf\u001b󿨳mc퓜Q",
-    "type": "legalhold",
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "label": ""
-}
\ No newline at end of file
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_14.json b/libs/wire-api/test/golden/testObject_NewClient_user_14.json
index 426db55ba97..c4efe34df63 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_14.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_14.json
@@ -1,12 +1,12 @@
 {
+    "class": "phone",
     "cookie": "𭔙 ",
+    "label": "\u000e􁖂󰫋",
     "lastkey": {
-        "key": "译믳",
-        "id": 65535
+        "id": 65535,
+        "key": "译믳"
     },
     "model": "􎮏",
-    "type": "legalhold",
     "prekeys": [],
-    "class": "phone",
-    "label": "\u000e􁖂󰫋"
-}
\ No newline at end of file
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_15.json b/libs/wire-api/test/golden/testObject_NewClient_user_15.json
index a877da0a822..da74da74b09 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_15.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_15.json
@@ -1,33 +1,33 @@
 {
+    "class": "desktop",
     "cookie": "􋕥𫋭",
+    "label": "",
     "lastkey": {
-        "key": "𘡁𛰫",
-        "id": 65535
+        "id": 65535,
+        "key": "𘡁𛰫"
     },
     "password": "0\u0019M~K𧥪꿍𨇑󵍽𪃸y󵆎*𪧒󾦒\rE\u0011(􉷗󵦐+𫅋\u0011󶅐\u0012􇚣\n:󼄴Ig\u001a𒎏l\u0019ꤟp\u0004x􋌖#\u0008󾵜~󴸦f\u000e𩂅L㜹5􅯂x[#&\u00131qH𠖳eA\u0008贕󴐽􏬄U\tb'𞤷0\u0014􌘢땾iELNQ\u0008a\u001eb\u000b=ᶀG}s\u001dN󺗌$L\u0011\u0017\\􈗒𘆬𥁌\"󳩺4\u0018\u0011H\u001at􍽦|\u001c6𡟓\u000fqu/k/b󴫟e4/\u001cD􈮂\u000b󿮄R雎tL)󸪀6Q\u001ed뗎𣸂qzqbC\u000c\u0004pS\u0010Y/󱱪􎧘T󾽎参,tw~)k6\u0008\u001fZc󴓧\u0017􁑶<Y-]W3/&y/:]q\u0018+f姒𤥽^𡥯8䂭\u001b􍱱𤵜={'􉤧\u0019𤰨\u0011\"L𝌌󿾐'K𭯧%L\r\u0018\r󻱒s\u000e\u0003!J󰕸-\u0016Zw𢙆7\u0008􉎝sS􊟔\tRN\u000b\u0011e\u000f􅊮&舣_hJ?\u0013󸙝\u001ct<[\u0004\u000e/󼻎𣇎a\u0015h􇟴蓰*\\\u0017\u0003SW𨊧\rCUH\u000c󸍹=)󻶪鑆\u0003wKwP𥐡?\u0005sUF|􇾛-K\u0011>\u001c𢬒Z;6'⛳\u0014e8)4YT􀇷7gm@AD𫞅\u0008{𪷅\u001a'x5\u001f\n\nv𡷵􎎂L[譨띘NϓN 逻O썼8󹻫蒙\u0011\u001d\u0019\u0002󶸊\u0008𬆩󱻠yX)𢊪WmBo\t\u0003Fj=5n􉲶\u001f𩡵*\u0000WuDo7\u000bLt]󾏝ff첎O􎾅\u00104%SqD𡗊][v \u0010\u0015\u001a\u000f􎛗𩲼\r.Z\u001e폵\u001f\u001c󻿒",
-    "type": "temporary",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "class": "desktop",
-    "label": ""
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_16.json b/libs/wire-api/test/golden/testObject_NewClient_user_16.json
index 493a978920f..d1bc996d9d2 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_16.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_16.json
@@ -1,12 +1,12 @@
 {
+    "class": "legalhold",
     "cookie": "q꣢𭘜",
+    "label": "]\u001c",
     "lastkey": {
-        "key": "􇎺釹",
-        "id": 65535
+        "id": 65535,
+        "key": "􇎺釹"
     },
     "model": "\u0006;𢿘",
-    "type": "legalhold",
     "prekeys": [],
-    "class": "legalhold",
-    "label": "]\u001c"
-}
\ No newline at end of file
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_17.json b/libs/wire-api/test/golden/testObject_NewClient_user_17.json
index 65809433405..07c8bd30bfc 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_17.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_17.json
@@ -1,28 +1,28 @@
 {
+    "class": "phone",
     "cookie": "k",
     "lastkey": {
-        "key": "𡰦",
-        "id": 65535
+        "id": 65535,
+        "key": "𡰦"
     },
     "model": "\u001b㰳c",
-    "type": "temporary",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "class": "phone"
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_18.json b/libs/wire-api/test/golden/testObject_NewClient_user_18.json
index d5a67cf3045..4e296c9e992 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_18.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_18.json
@@ -1,13 +1,13 @@
 {
+    "class": "desktop",
     "cookie": "",
+    "label": "Q,",
     "lastkey": {
-        "key": "z𫝭",
-        "id": 65535
+        "id": 65535,
+        "key": "z𫝭"
     },
-    "password": "\"5\u001e𧇡␔􏫾Y󻯃]\u0010qDD󿍚g7G󲛖𒔧<o\u0005T ul𩢃󷢩􉌥\t\t􇻎a󺕖\u0016a􍇥=u\\W\u000f[𥉔L\"\u0005u2I\u001cQ\u001bt#:D\u0002쨭􆭴\u0001c\u0012b{\u0005𣛌r耹X b𤋱-2B󵍅)\u0010𤝓𠞵\rJ>騒𠬱ceE𮒕 Nx}𪉄\tF吻a\u0006N\u000c\u0010󽽂)U󹠘v\"\u000e#􃦹Cb/Dc`;k:qA\u001fQcsw[uG~犁2i\u0017𦖡RB\t􇓾\r(\u000c❶􂶢&\u0001d􍳁𥽿f>e2~󴂁u=􂦊➘/슨􌡺QﺁqT􊰒𤊊Sa@k#(\u0017\u0007>!m=5vN~_#􂵍B𭃜N\u0007𗃾蘒.K4𥐏s𦓩zT𪆙vv7/\u0019\"#1*'q| 𦘋\u0012R`\u0006O>P𥐻Ga \rQ\u0011s􈚨nh+q𤵗 N\u001d\u0018\u001e􁝗\\;〔\u000bMyY\\w\u0017+8bJ&2?D􅍂Y󶋞#x𧪖6A􎂢85着𬰯\u0015𣥻Chh嚜VJ^R\u0018'F𧉳[\u0006\n:%􉡶~}\u001bEAS@Wn5@􋲭&a2􉭹`𝜊℘5\u0018^\u00045W\u0019\u001a\u0011R\u0011D\u001eL2m5XofV?Y𦀁\u0001\u0013󸷈g\u0005q;󴙜㇂oP\u0016,\u0011􅽩󲷰>㧏Ქ𨙕􀱺W&lHVm󶈣B\u000bl@%󽬚U#\u0000􊼅$XbM%q󿌏\u001c0z􉷔\u0003r%.􆂛繕\u0016Z0\u000cB+_@\u0011tcO𭖘􋃮|𭧮&~𡏷N낈v𥷉𡩴`궭1󷫓􎥣􊾮☉vf\u0016EJb󰒟\u0013\nG}\u001a#_$D􄞭󹎼/\u001e\u000bf\u0011𧇑\u0013 \u000b8'GP\rb\u0014뱀󰓖由?r 𡋧􌭆\n𧐍d\u0008VStN\"\u0016[Gز\u001b\u001f󶼈g𡉀_\u0001Y1?\u001fdu􂩊𒓇󳁿=􆑖})J􅸪$X]Y\u0013􃈄h\u0011H0\u0002𐔎󺯕䵧\u0008⳯C\u0014\u0007􆑗󺇰\u001e|oTc!eU󲖁Pr𡶮\u0015\u001e4𭚄DG𡘱x󳂗FG0P윪/F\u001e\u0002\u0003𩼃*\u0017\u0016䖧Gw]󷽏􇴰􅋎􃏆m}tg6𨣶\u000f*𪒮\\Wi\u0019Oa'\u001c􃢈󴒀sh􎝾𢻐lE+&\ng`󵖑3kY\u001dY=\u00114`􃙞l\u001e􉊟!r交\u0000w𝘎􇄍?\u0017\u0002􈗉I\u0016\ngWcrN_)7f+#\u001b𫫲􆵶jt\u0010𑣒hAx\\-{𖥋^4rf\u0010𮋐6MJb__벶`n𑌫4oZA꧄𖥵H.-Y {\u0007\u001c\u001fu[4@6󿗮𗂢අ\u0016\u0012/|,]\u0015󷋆E!\u0010\rZ𫤓Q𬎗􊊐8.X\u000cwZ\u0014-{KWit튏 >𪶝L_Y5\u001d\u0016aE鲖0Bf'M\u0014󷷢詸\u001b󶝧2tF)􊪙&xf9|>K\u0019%z\u0007󷶯\u000cH𝠴\u001e\u0008􃤘\u000bJCmoJ\t$\r鶩S0𠶄k\u0017󳆅z󹽮\u00087\u0012ACx􊲍p늷-e🚇\u001d&? \u0001St}S'󺷒qm􊭔푬\u0019\\c\u001b齌;󵑇积Y8mz3\u0002ROJbY\\ᤖ􄭖w𤇂 in\u000f\u0015nm𮏴r􄒄\"󵓦%*U𐐫\u0011C􎁢h\u0007\u0011MIQWC𪄢{%\u000f𝂿퓰<_$\\d=\u0001)-4~x𫮚Ov\u0000\u0014𭘪p􀻁幡c󳾾,崑o\u000f󺲐N\u0002󽖞𦳋B'd󵯤`􃆔W%􄥮􎈌@hx\u0016.\u001d𨈨cJ⫛M󼐢󰆚,I\u0012\u001d\u0006!䡷𨂈ȴ\u0004\u0014:\t\u0014\u000b\\􎺥]􆝽𡾢r\u0018𥺲%\u0002\u000fp𗤺rຮR\u001c3X\u000csW岧]L𥽮1`J\u001b\u000f䩫9gM",
     "model": "􇃙􁴠S",
-    "type": "temporary",
+    "password": "\"5\u001e𧇡␔􏫾Y󻯃]\u0010qDD󿍚g7G󲛖𒔧<o\u0005T ul𩢃󷢩􉌥\t\t􇻎a󺕖\u0016a􍇥=u\\W\u000f[𥉔L\"\u0005u2I\u001cQ\u001bt#:D\u0002쨭􆭴\u0001c\u0012b{\u0005𣛌r耹X b𤋱-2B󵍅)\u0010𤝓𠞵\rJ>騒𠬱ceE𮒕 Nx}𪉄\tF吻a\u0006N\u000c\u0010󽽂)U󹠘v\"\u000e#􃦹Cb/Dc`;k:qA\u001fQcsw[uG~犁2i\u0017𦖡RB\t􇓾\r(\u000c❶􂶢&\u0001d􍳁𥽿f>e2~󴂁u=􂦊➘/슨􌡺QﺁqT􊰒𤊊Sa@k#(\u0017\u0007>!m=5vN~_#􂵍B𭃜N\u0007𗃾蘒.K4𥐏s𦓩zT𪆙vv7/\u0019\"#1*'q| 𦘋\u0012R`\u0006O>P𥐻Ga \rQ\u0011s􈚨nh+q𤵗 N\u001d\u0018\u001e􁝗\\;〔\u000bMyY\\w\u0017+8bJ&2?D􅍂Y󶋞#x𧪖6A􎂢85着𬰯\u0015𣥻Chh嚜VJ^R\u0018'F𧉳[\u0006\n:%􉡶~}\u001bEAS@Wn5@􋲭&a2􉭹`𝜊℘5\u0018^\u00045W\u0019\u001a\u0011R\u0011D\u001eL2m5XofV?Y𦀁\u0001\u0013󸷈g\u0005q;󴙜㇂oP\u0016,\u0011􅽩󲷰>㧏Ქ𨙕􀱺W&lHVm󶈣B\u000bl@%󽬚U#\u0000􊼅$XbM%q󿌏\u001c0z􉷔\u0003r%.􆂛繕\u0016Z0\u000cB+_@\u0011tcO𭖘􋃮|𭧮&~𡏷N낈v𥷉𡩴`궭1󷫓􎥣􊾮☉vf\u0016EJb󰒟\u0013\nG}\u001a#_$D􄞭󹎼/\u001e\u000bf\u0011𧇑\u0013 \u000b8'GP\rb\u0014뱀󰓖由?r 𡋧􌭆\n𧐍d\u0008VStN\"\u0016[Gز\u001b\u001f󶼈g𡉀_\u0001Y1?\u001fdu􂩊𒓇󳁿=􆑖})J􅸪$X]Y\u0013􃈄h\u0011H0\u0002𐔎󺯕䵧\u0008⳯C\u0014\u0007􆑗󺇰\u001e|oTc!eU󲖁Pr𡶮\u0015\u001e4𭚄DG𡘱x󳂗FG0P윪/F\u001e\u0002\u0003𩼃*\u0017\u0016䖧Gw]󷽏􇴰􅋎􃏆m}tg6𨣶\u000f*𪒮\\Wi\u0019Oa'\u001c􃢈󴒀sh􎝾𢻐lE+&\ng`󵖑3kY\u001dY=\u00114`􃙞l\u001e􉊟!r交\u0000w𝘎􇄍?\u0017\u0002􈗉I\u0016\ngWcrN_)7f+#\u001b𫫲􆵶jt\u0010𑣒hAx\\-{𖥋^4rf\u0010𮋐6MJb__벶`n𑌫4oZA꧄𖥵H.-Y {\u0007\u001c\u001fu[4@6󿗮𗂢අ\u0016\u0012/|,]\u0015󷋆E!\u0010\rZ𫤓Q𬎗􊊐8.X\u000cwZ\u0014-{KWit튏 >𪶝L_Y5\u001d\u0016aE鲖0Bf'M\u0014󷷢詸\u001b󶝧2tF)􊪙&xf9|>K\u0019%z\u0007󷶯\u000cH𝠴\u001e\u0008􃤘\u000bJCmoJ\t$\r鶩S0𠶄k\u0017󳆅z󹽮\u00087\u0012ACx􊲍p늷-e🚇\u001d&? \u0001St}S'󺷒qm􊭔푬\u0019\\c\u001b齌;󵑇积Y8mz3\u0002ROJbY\\ᤖ􄭖w𤇂 in\u000f\u0015nm𮏴r􄒄\"󵓦%*U𐐫\u0011C􎁢h\u0007\u0011MIQWC𪄢{%\u000f𝂿퓰<_$\\d=\u0001)-4~x𫮚Ov\u0000\u0014𭘪p􀻁幡c󳾾,崑o\u000f󺲐N\u0002󽖞𦳋B'd󵯤`􃆔W%􄥮􎈌@hx\u0016.\u001d𨈨cJ⫛M󼐢󰆚,I\u0012\u001d\u0006!䡷𨂈ȴ\u0004\u0014:\t\u0014\u000b\\􎺥]􆝽𡾢r\u0018𥺲%\u0002\u000fp𗤺rຮR\u001c3X\u000csW岧]L𥽮1`J\u001b\u000f䩫9gM",
     "prekeys": [],
-    "class": "desktop",
-    "label": "Q,"
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_19.json b/libs/wire-api/test/golden/testObject_NewClient_user_19.json
index 673ec55b186..05bdb42d431 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_19.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_19.json
@@ -1,25 +1,25 @@
 {
+    "class": "tablet",
+    "label": "",
     "lastkey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
-    "password": "#􏵈~\nk􂴧J𮃺POZ\u000c\u001a\u0006JJ\u001e$ⵢ\u0004ꒉlL[\u001c]h,Xf󾞮\u0018d𨒥\u001fﺳ􇠞t\u0003]裞𥻋e鼖e\u00130q겜𮋁[WSGO{\u0008=Hs􉼠;6\u001a䩜\"\u000e𠸩&􏤃]Xmx𣂦\u0001iⓢj\u000b\u0016\u0015󾀇.\u000c\u0017\u000e8E휳i󿀮P`o󼐿i𡩿\u001a\u001b𑘃􍭕}8𣃘󴡈颃𛲈\u001b󸇜,v󺔇\t𩜋^\n𮥅󼂐yOX@F \u000417uqG⤦\u000f\u001d9?8+O(󼨷v4,[k 㝯--Qk𦹩\u0003A\u0019𨑢9𡸰󰗵@䦲􌔌𣾒𠻫Q\u001f4;\u0010\r\u000c0𖡇fz\u0007DC𦝭3󿓝|Sn&i\u0004j􀫮🚿KS7𣫙\u000cAx\n\u0006\u000bx􏞒5🧐MWIp$m􂽗𝁉m󲇷𭐹𝀧m䁤\u0014\u000e9SDb-b\u0007=F𓆓掿\u00147/{􃩲d#X9\u0016걉넋/{=󹇽Z\u0010𨅔xh锠A\t\u0002J\u0007󹰕9Bk_􊣷H^𨥕g[38&\u0006𤮊􈁜74𗤙Dwdu~r𑍬󷙗􅠜&𭁃Z^\rl|\u000c\u0017A\u0002~2r>\u0004sM𩻈iX~`\u0006zK\u0004W􌖍󻇴ezCh6O\u000e%\u001a\u001a=𤧭:􅔷DQ\u0000c`\u000f\u0007DmG)M)Th𮤋\u0000[u\u0017\u0016\"?\u001903𭹮xi{h\u000cy~??)w\u0000y-IaG\u000b\u0000찜𦟐J󿰂g(\n\u0011\u000e\t+p\u0005Sl𓍊􇡉󸩬\"N=Q:/⌯[𧝽\r\u0015𤄛B釔@kA\u001fwi\u0015,p=鸫l6𐌎'𠘟𝠗t\u001eWq󰤻W\u001a\u0002\u0003\r𒋛𦏿C!j\u0010\u000f>\\W󵔇\u0003𥍴q+\"⩘|o󱭌\u001e󻻛𧭨$󼏉ꮡB_\u0000􆹪DV\u0013𫏂W?rH5Xi\u000b\u000e\u0006𭹇N-𨊯PQ2`𪟩r\u0017gaœ\u001chT#ay}^\u001bP􉼌yp{\u0012#^/5X-D\u0000\u0006𩽋\u001e󼓞\"}Z`x{􁬀TT_ Z0亇󽴗皕k\u0013Q.NT2/􋚌O\u0001P^G\u0016/%d.𪅁󰱑P\u000c2iYS@\t\t\u0014.oⴘ'?-0a]𗰉)f9w4𡑗X𬫋𬖸\u0011\u0007=􉙬T𢵇g\u001eb7\u001d@􅎵V/,󻔤K𮓕\u0013MP\n?W󶈍5/z󿣔\u0006u𗿻nKB\u001f赚\u0013U\u0015h\u001fr#􇒗\"􅰽-𢵿(K𬴯\u00166𩯉􌇾+b􉭻s􏒨\u0002k􇊔𤢸􍚐~Rl\u001a\u001e\u000c\"X3𧻻\u0016OQRpJ󽐯\u0001WvE~뱀I5󲠬壕j\u000b=PK𡂙%#\u0017\u000cN2䪰𬓐vz9󷋼nY\u0010\u0016=F\u0002\u0004൘9W㒒\u0012^C)ZX\u0017JN2P󵅁\u000f|\\󵉆h}P1V􏲩7\u001b\u000b\u0010l𬏲\u001cz\u0019\u0012􊾘IM󲠍\u0001/NBiM𩥸~;1x쁀Md\u00191췷㣤e#\"\u001f𗄁eV?i{􏮒􍨄󶩵𥁮&\u001c\u0016൬𥚽#",
     "model": "\u0018󻡎g",
-    "type": "permanent",
+    "password": "#􏵈~\nk􂴧J𮃺POZ\u000c\u001a\u0006JJ\u001e$ⵢ\u0004ꒉlL[\u001c]h,Xf󾞮\u0018d𨒥\u001fﺳ􇠞t\u0003]裞𥻋e鼖e\u00130q겜𮋁[WSGO{\u0008=Hs􉼠;6\u001a䩜\"\u000e𠸩&􏤃]Xmx𣂦\u0001iⓢj\u000b\u0016\u0015󾀇.\u000c\u0017\u000e8E휳i󿀮P`o󼐿i𡩿\u001a\u001b𑘃􍭕}8𣃘󴡈颃𛲈\u001b󸇜,v󺔇\t𩜋^\n𮥅󼂐yOX@F \u000417uqG⤦\u000f\u001d9?8+O(󼨷v4,[k 㝯--Qk𦹩\u0003A\u0019𨑢9𡸰󰗵@䦲􌔌𣾒𠻫Q\u001f4;\u0010\r\u000c0𖡇fz\u0007DC𦝭3󿓝|Sn&i\u0004j􀫮🚿KS7𣫙\u000cAx\n\u0006\u000bx􏞒5🧐MWIp$m􂽗𝁉m󲇷𭐹𝀧m䁤\u0014\u000e9SDb-b\u0007=F𓆓掿\u00147/{􃩲d#X9\u0016걉넋/{=󹇽Z\u0010𨅔xh锠A\t\u0002J\u0007󹰕9Bk_􊣷H^𨥕g[38&\u0006𤮊􈁜74𗤙Dwdu~r𑍬󷙗􅠜&𭁃Z^\rl|\u000c\u0017A\u0002~2r>\u0004sM𩻈iX~`\u0006zK\u0004W􌖍󻇴ezCh6O\u000e%\u001a\u001a=𤧭:􅔷DQ\u0000c`\u000f\u0007DmG)M)Th𮤋\u0000[u\u0017\u0016\"?\u001903𭹮xi{h\u000cy~??)w\u0000y-IaG\u000b\u0000찜𦟐J󿰂g(\n\u0011\u000e\t+p\u0005Sl𓍊􇡉󸩬\"N=Q:/⌯[𧝽\r\u0015𤄛B釔@kA\u001fwi\u0015,p=鸫l6𐌎'𠘟𝠗t\u001eWq󰤻W\u001a\u0002\u0003\r𒋛𦏿C!j\u0010\u000f>\\W󵔇\u0003𥍴q+\"⩘|o󱭌\u001e󻻛𧭨$󼏉ꮡB_\u0000􆹪DV\u0013𫏂W?rH5Xi\u000b\u000e\u0006𭹇N-𨊯PQ2`𪟩r\u0017gaœ\u001chT#ay}^\u001bP􉼌yp{\u0012#^/5X-D\u0000\u0006𩽋\u001e󼓞\"}Z`x{􁬀TT_ Z0亇󽴗皕k\u0013Q.NT2/􋚌O\u0001P^G\u0016/%d.𪅁󰱑P\u000c2iYS@\t\t\u0014.oⴘ'?-0a]𗰉)f9w4𡑗X𬫋𬖸\u0011\u0007=􉙬T𢵇g\u001eb7\u001d@􅎵V/,󻔤K𮓕\u0013MP\n?W󶈍5/z󿣔\u0006u𗿻nKB\u001f赚\u0013U\u0015h\u001fr#􇒗\"􅰽-𢵿(K𬴯\u00166𩯉􌇾+b􉭻s􏒨\u0002k􇊔𤢸􍚐~Rl\u001a\u001e\u000c\"X3𧻻\u0016OQRpJ󽐯\u0001WvE~뱀I5󲠬壕j\u000b=PK𡂙%#\u0017\u000cN2䪰𬓐vz9󷋼nY\u0010\u0016=F\u0002\u0004൘9W㒒\u0012^C)ZX\u0017JN2P󵅁\u000f|\\󵉆h}P1V􏲩7\u001b\u000b\u0010l𬏲\u001cz\u0019\u0012􊾘IM󲠍\u0001/NBiM𩥸~;1x쁀Md\u00191췷㣤e#\"\u001f𗄁eV?i{􏮒􍨄󶩵𥁮&\u001c\u0016൬𥚽#",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "class": "tablet",
-    "label": ""
-}
\ No newline at end of file
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_2.json b/libs/wire-api/test/golden/testObject_NewClient_user_2.json
index 3554082e697..422365d9460 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_2.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_2.json
@@ -1,14 +1,14 @@
 {
+    "capabilities": [
+        "legalhold-implicit-consent"
+    ],
     "cookie": "&h",
     "lastkey": {
-        "key": "\u0011𢮨㙢",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0011𢮨㙢"
     },
-    "password": "I􄇏󳃛oIC\u0008y󿗄1㕛&w>S~z豿\u0007{2Dj\u000b|Z\"\u000c􂼄*[ｍV􉐛kS𣚇A􎁼􁹁(2\u0010뱍\u000ei\u000f(󼅍𩌬f?q\u000e5𣱽d􄾘^nI􍚯_?󸵊H𝄻\u001af󳈙\n󵈿x\u0006dZ􁓹^N\u000ca\u0016\u001ab=􏡷SP😄aTd\u0019𭜏\u0013\u0006\u0017!󷁠𢬯o{uoN\u0018qL\u0015\u001bc=\u000b@o2󾵲\u0004𢲖\u001f􇠦5v\u0002\u001d_k,\u0013mAV>$󻎕􃆜\u001e􊄳\n⌔-ea}G`r? 󵐇\u0001\u001f𠚕9\u0008rl𥶽}u𝢇􇷚􃗸@M6M𥷣𘃸𨺤|E5Ud􀨐tLjQ󹭵ᩎ\u001e\u000b\u0011jE\u0006'~f\u000fR󶰝\u0015d}}􂱸q󻹖\u0011𤺆9𧋕\u001e𘣰\u0003𭦜\r\u001c\u001f迌㟍\u0015/\u001d掶􊓾\u0000(:􁙩n#m9x 􇍝𬲸}􀿎퓖\u001d󲊹\u0008`􉡹G#T\u0012-8\u0015䞆𠷿\tp/!\u00024C\u001a'DP'.\u0007􏁊8<9\u0016\u0015Eq𩁒Ep]\u0007jZ%󺘵၊O製>\u0018\u0006w*f<􍇟\u000ejzpjY\u001f\u001a䪎\u0011\u0011\u0006|\u000e􃸴;𡇑F!f七b%􀂊t9\u0012\u000c𝤒X! 𠡿C\u001e󻎮𧨐C!冻H(/\u001dV)e\u00162\u0000#H$BAJy\u0017𧭞X𡜶\u001c\u001a~\u000c\u001b;\n<\u001df~{\u0008_",
     "model": "om",
-    "type": "permanent",
+    "password": "I􄇏󳃛oIC\u0008y󿗄1㕛&w>S~z豿\u0007{2Dj\u000b|Z\"\u000c􂼄*[ｍV􉐛kS𣚇A􎁼􁹁(2\u0010뱍\u000ei\u000f(󼅍𩌬f?q\u000e5𣱽d􄾘^nI􍚯_?󸵊H𝄻\u001af󳈙\n󵈿x\u0006dZ􁓹^N\u000ca\u0016\u001ab=􏡷SP😄aTd\u0019𭜏\u0013\u0006\u0017!󷁠𢬯o{uoN\u0018qL\u0015\u001bc=\u000b@o2󾵲\u0004𢲖\u001f􇠦5v\u0002\u001d_k,\u0013mAV>$󻎕􃆜\u001e􊄳\n⌔-ea}G`r? 󵐇\u0001\u001f𠚕9\u0008rl𥶽}u𝢇􇷚􃗸@M6M𥷣𘃸𨺤|E5Ud􀨐tLjQ󹭵ᩎ\u001e\u000b\u0011jE\u0006'~f\u000fR󶰝\u0015d}}􂱸q󻹖\u0011𤺆9𧋕\u001e𘣰\u0003𭦜\r\u001c\u001f迌㟍\u0015/\u001d掶􊓾\u0000(:􁙩n#m9x 􇍝𬲸}􀿎퓖\u001d󲊹\u0008`􉡹G#T\u0012-8\u0015䞆𠷿\tp/!\u00024C\u001a'DP'.\u0007􏁊8<9\u0016\u0015Eq𩁒Ep]\u0007jZ%󺘵၊O製>\u0018\u0006w*f<􍇟\u000ejzpjY\u001f\u001a䪎\u0011\u0011\u0006|\u000e􃸴;𡇑F!f七b%􀂊t9\u0012\u000c𝤒X! 𠡿C\u001e󻎮𧨐C!冻H(/\u001dV)e\u00162\u0000#H$BAJy\u0017𧭞X𡜶\u001c\u001a~\u000c\u001b;\n<\u001df~{\u0008_",
     "prekeys": [],
-    "capabilities": [
-        "legalhold-implicit-consent"
-    ]
-}
\ No newline at end of file
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_20.json b/libs/wire-api/test/golden/testObject_NewClient_user_20.json
index 05185c47a8c..3d583210024 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_20.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_20.json
@@ -1,15 +1,15 @@
 {
     "cookie": "",
+    "label": "+\u001c",
     "lastkey": {
-        "key": "<",
-        "id": 65535
+        "id": 65535,
+        "key": "<"
     },
-    "type": "legalhold",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "label": "+\u001c"
-}
\ No newline at end of file
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_3.json b/libs/wire-api/test/golden/testObject_NewClient_user_3.json
index 494a3e1e870..84691caf382 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_3.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_3.json
@@ -1,13 +1,13 @@
 {
+    "class": "tablet",
     "cookie": "\u000cr",
+    "label": "􎜑\u0010",
     "lastkey": {
-        "key": "v7",
-        "id": 65535
+        "id": 65535,
+        "key": "v7"
     },
-    "password": "􀻐󺴮`7􂧳󵷵􏷵ml𢘡\"\u0001\u000e\u0011*\u0013Q\u001e㧕.I\u000c􀓭\u0010XHyy𥻱%\u0015\u0002ygG`H;𗒙\u0001}U𫗚𡠏\u0004cX󽾼X藙!|v@\u000e\u0018\u000cp󳖓🍉d􁚚e𡂶\u000br`c󵸼󹼈𢴓 \u0012h\u0005OS\u001c_X$𬗹\u001d𒆆g􄗤x%\u0008󷹴YzZ􅌽2`^h^R􌹯b􋗱BOyj󾁝!|E \u001f!Bu`5I$\u0019,Jt\u00137𓈣L)𑌻Z\u0016/pl𪌢Xb\u0013\u0007\u0002􊛣\u000e!􇍢\u001a#𩧈G6𧤕m\u0018󻕓RI𭷿󰄦_󳗻󴉤W^\u0006j􅑆𪀋x\u0019󽿠5BV\u0008VU󴤣𢶛\rPt􎯪躛C𓄐\u000c𦯭F>\u000bkqOC\n-_q\u0010c",
     "model": "󸊺\u0013𠮙",
-    "type": "permanent",
+    "password": "􀻐󺴮`7􂧳󵷵􏷵ml𢘡\"\u0001\u000e\u0011*\u0013Q\u001e㧕.I\u000c􀓭\u0010XHyy𥻱%\u0015\u0002ygG`H;𗒙\u0001}U𫗚𡠏\u0004cX󽾼X藙!|v@\u000e\u0018\u000cp󳖓🍉d􁚚e𡂶\u000br`c󵸼󹼈𢴓 \u0012h\u0005OS\u001c_X$𬗹\u001d𒆆g􄗤x%\u0008󷹴YzZ􅌽2`^h^R􌹯b􋗱BOyj󾁝!|E \u001f!Bu`5I$\u0019,Jt\u00137𓈣L)𑌻Z\u0016/pl𪌢Xb\u0013\u0007\u0002􊛣\u000e!􇍢\u001a#𩧈G6𧤕m\u0018󻕓RI𭷿󰄦_󳗻󴉤W^\u0006j􅑆𪀋x\u0019󽿠5BV\u0008VU󴤣𢶛\rPt􎯪躛C𓄐\u000c𦯭F>\u000bkqOC\n-_q\u0010c",
     "prekeys": [],
-    "class": "tablet",
-    "label": "􎜑\u0010"
-}
\ No newline at end of file
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_4.json b/libs/wire-api/test/golden/testObject_NewClient_user_4.json
index 7927b83216e..b02f1c71ac0 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_4.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_4.json
@@ -1,20 +1,20 @@
 {
+    "class": "legalhold",
     "cookie": "\u001c\rz",
     "lastkey": {
-        "key": "i",
-        "id": 65535
+        "id": 65535,
+        "key": "i"
     },
     "password": "󽪩\u0019𮀹SyAf\u001e󸀻Xﱝ~RZ}􃚰6}󾈳ke󽲰v$By𡞔􃫄,\u0002y𡹝~􌛤9sr􅶑\r_􅆾\u0006쑔􇙨󵪒7􌰆l<c󼜳)B1\u0000󿊙W/>􇙯쐤|󶣒𧸜\n􀾝\u0017)u􌳈􍧂%縉\u0017󲇜P)eE:sR􈯉\u0001@󽨅y\u001f冹v𨚀󸓽\u0011[9b|\u0003HNQ|=󻏡3Q7麯􍕩\u0010noh9)J\u001c𭥻P풥cN\u000eVꏼ𧇻O4S\u000e\u001dR\u0001\u001fBn\"D𦆂3c]Npy𗈟𑐽𪤇k𦡛<\u0017􏂯H\t􃊓𨑑\u0011o\u000c/w\u0019>%𝑙\u0001𣘀,𖠎i\u000bZ[I덉\u001aN1mZ狻綀H􂣋Imv#JR/;\u0006K\u0010妁⍌{ZR\u000796G\u0005y𥊭+􆺞𐃮=!\u0019\u000b\u0014\u001d󺷐󾕖<􀣙𓎲𭨓𣬕$󺓺\u0018-;\u00034v\u001e􈲾\r􆪩q􈗒4_C𧌒\u0015U.PD\u0014NYI\u0010v\u0008\r\u001cxH󷞦%mxC󿘝\u001a􀅢\u0018#cE􈬨;j`𡖉I[ABy󶤸f0𡯯t󷪧\u000f𥟾?\u0016~(Z\u000b\u0013E!\u0004󻉉[TW󲝇\u001fn\u000e啞+&\u0002𬫨\u001c+𠋾\u001cv\u001e􅋑D󽌔$<@\u0017\u000cCEb𥌼&󺏔e\u0011\u0018gN\u0012]\u001e\\A:*\u0006tV\u0007jD3􎿃zBA4\u00195\u001a\u0016󲟘\u0018:%󵴟읕\u000e𬽔{\u000bT_~0\u001d\u0012\u0004V0􄘣K7xI/󼢠폋\u0002􂹢\u0019𠎩⃥.m𒔤\u0010<A\u0013𧸥>󹐣a갚|\u001a᧷R\u001br~𮬙\u0004\u0010Frvb𛉝\u0003z\u0008I\\o+'Q\u0004l :?𑚍r\u001f𣳚􉓨o+𩘵Jn󾨫.*𧩣_7:󾟶\u00153T\u0005\t𥽏b/q\u0016@OmA𗮒xZ춦\u0018\u001eh\u001fg\u0007E_K\u000f{􀽳􁆌&􏢲N )𦞈zB\u0017\u000f󿿴F􈕑\"\u0006B𐑙\u0005𬨫S\u001dX檊􂺔yHAi𦍟 \u0013婅F8A/e.8$𘋌\u0010Ou-Mw󶔞4zb𨘊BC􇍱􅔯\u0002Y%Bg\u001e37v~2\u001b\u00188\u0018\u0011\u001cz#q?ADm4\u000bBK&Z\u0018K􏬜f!*/\u0006\u0012iVTs𢢠􂤎􉾊𥫴OQ𥦤-듙[J󾗉䜺󿪵H1K􍃖\u001f𝣈􄀭1\u000fk+EB?󳥵󻨦􏉯y,\u0018\u0000\u001ffT\u0010{\u0015󼅻\u0016討E,\u0001y襔?󻲺$ll%󿚗\u0001`)𒋍􇕮u𥊄􍎧𤓨A\u0016pDoz]L䶢/󸷐􄥌&f`AX=RA\u000b􍓕%,O􀕎\u0015B𝑮@\u0019\u0005󿫄􇿀-󳧟T󳮦l6\u0015'𪈠^􁓒('2AP&?\u001f\u0010\u000f0fߜ\u001b$\u0012籺5v_􀰩\u0005𥗖> [3h)?윷󽯊𡠑m󰍓cBD߫󸒎󷪿\u001a%X\u0000:Pib\\sષt𦉱󵡼{Sz+O\u001d\u0014\u0010\u0013.\u0019;2S\u000fF􍊰\u0014ftF}3G\u0000$wR]\u001fYpY\u000c\u000e𢢘;\u0003e渫陞$\u0013(\u000fw\u0017Bp🗨\u0005\u0010𥰐󾃝\u000b:젽V󰌖.\u0001N<$\tj3쬖\u001f䢖E,$\u0007\n\u0016\u001a%󹩮P󰉆,󼝅k\u0000𠭺E𔐛\u0005'\u0018wrhj?9􊐴󸘡\u0018#𬐁\u0005\u0013I\u000c\"\u0005탩^𣓭}T𨈩<d󺭿\\",
-    "type": "permanent",
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ],
-    "class": "legalhold"
-}
\ No newline at end of file
+    "type": "permanent"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_5.json b/libs/wire-api/test/golden/testObject_NewClient_user_5.json
index f9aa8f66694..eb981452aa7 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_5.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_5.json
@@ -1,16 +1,16 @@
 {
     "cookie": "",
+    "label": "A𩥗)",
     "lastkey": {
-        "key": "?&#",
-        "id": 65535
+        "id": 65535,
+        "key": "?&#"
     },
     "model": "Y5>",
-    "type": "temporary",
     "prekeys": [
         {
-            "key": "􊹣",
-            "id": 0
+            "id": 0,
+            "key": "􊹣"
         }
     ],
-    "label": "A𩥗)"
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_6.json b/libs/wire-api/test/golden/testObject_NewClient_user_6.json
index ddac4040eab..903b1efd9dc 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_6.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_6.json
@@ -1,10 +1,10 @@
 {
     "cookie": "",
+    "label": "{\u0017",
     "lastkey": {
-        "key": "􍠗",
-        "id": 65535
+        "id": 65535,
+        "key": "􍠗"
     },
-    "type": "temporary",
     "prekeys": [],
-    "label": "{\u0017"
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_7.json b/libs/wire-api/test/golden/testObject_NewClient_user_7.json
index 88efb151dc8..d7c5f36a295 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_7.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_7.json
@@ -1,18 +1,18 @@
 {
+    "class": "tablet",
     "cookie": "",
+    "label": "",
     "lastkey": {
-        "key": "%V[",
-        "id": 65535
+        "id": 65535,
+        "key": "%V["
     },
-    "password": "𢂵l󱜣\u001bQ\u00108SH\u000c\u001d\u0017-\u00165\u001cPy􃋷r/=󰻀N3󼶋&N㯔w𐢂X/Q*𤳊㖰X󴐟+9=U󺀔\u0001\u0005\u0002}i\u0008􋻎􅊦\u001a\u0005Z(𩃨󶡬o#Xm\u0018M󹺦3𪍈^PnṐcrQc󰳃\u000ep\tr\\󰰉t}\u0004`𫒁M𐋱\"ቬS\u000f󽎥\u000fQA􎊝\u001eb󹝠𑵤0󱭼𐰡 +~󲆽\u001a8,b𧪯g􇀢%\u0018⫷\u001a\u0005)e\u0001󷼊\u000c9􋐊!yW󼏈${􂮀}􏄟􇎁𣖽+q{\u000c𨆶󻽛|g\u0006\u0001/`L~󿨫􈹅𦦜\u0003!\u00038\n󺒛󰒔p\u001e&\u001e肴􋦽+􀹯uft 󽏉D􁤬𧉸'\u0001󴈑\u0015V\u0016n8x熓\u0010鲶\u0018P~l$fẏ\u0011\u0005󴍑∙\u001eLx<@\u0012\u0019󺸸H𬘅s􅮒18𥎀𡫜\u0017 \u0011I\u000c=\u0018=[V󿗦'\u0001뗣󳉃G`6'\u001a!*;\u0019J􆦇\u0002y\u0011\\\"!\u0007E澌𣲍B󼏂𫟴AL\u001e!\u0005]􀞵?_t/𡤿aﬖO G\u001e􍅍􉞧{=\u0012<<󿘣[o󹕞Lz\u0007\u0006􎬸\n>.\u0005I|hlT;h\u001f\u000eI\u0015\u000e\u0016􍂱󸊬\u0012󽛑\u001c\\P\u001c𩴷\u000b{Y\u0010 ' q!󿏦g󸂑T󸕌^Lg:󾴬)~𬺔&R{􇊰𭽈X\u0017􋭁󷋽zᎥs.8n\n\u0012|\u0016RP&\u0008\u00037\u0005\u0007U󴼵{\u00100%v5 䚀\u000e𗂅EU\u001eഝ8\u001a/ኹW['`J􄥤uv𧳄􃖉\u0013\u0010\u0019􈢆+P7𧝆P_X𘢍󽀺2􂻽54𭄄xB􁙐g𬂟\"\u0011\u0001rC)0^\u0001rQ\u000cpd뗦􎄜䞿B\u0015𧨉ꔩs󵘠6gi6m7𣖮\u0004\u0005L\u000c𘚳f?\u00180$𣟜\u001b]>CV\nVPb:^e6ᵨ\u0005􀍉􋐽$!L􀼴vv\u000e/:\u001a\"􁄽o𩢿\u000ce{:󴬧ᩣ\u0014\u000es\u0007z~%H.xF󾘉𨡤h\u0017󰤰\u001b􃂽E\u001b𩤺7\u0001\u000b8𗭥:PS: 􊩿:󽸇6c0𨻢􉪮$􍏟{)|\u001d􁐽K\u000c\u001ea#GK󿥰\u0003m\u0002br@ᥑ\r'bv\u0008󳑮\u0016󸧑dv󴑦\"\u0015𩹊\u001b󼥥\u0010>𑊡\u0008𨅪⍿S/[􊻼];⟶A$\n5S𦐾_y𮃩\u001bP]e\u0018𬊥􏈙𧈡-\u001d􇙃\u001d􌈁󿷾&P$\u001dT𝝆TLX[셎🧳)\u0017P;닧\u000em􏻾D􃑄󾴋>EI\u0000\u0015I\u0018􂜮\t[AtgxM\u0016󽟕^􌶀\u0008^V𣅒+l)n󻘀\u0000\"􍪵y\u0007.\u0010",
     "model": "𤳘",
-    "type": "temporary",
+    "password": "𢂵l󱜣\u001bQ\u00108SH\u000c\u001d\u0017-\u00165\u001cPy􃋷r/=󰻀N3󼶋&N㯔w𐢂X/Q*𤳊㖰X󴐟+9=U󺀔\u0001\u0005\u0002}i\u0008􋻎􅊦\u001a\u0005Z(𩃨󶡬o#Xm\u0018M󹺦3𪍈^PnṐcrQc󰳃\u000ep\tr\\󰰉t}\u0004`𫒁M𐋱\"ቬS\u000f󽎥\u000fQA􎊝\u001eb󹝠𑵤0󱭼𐰡 +~󲆽\u001a8,b𧪯g􇀢%\u0018⫷\u001a\u0005)e\u0001󷼊\u000c9􋐊!yW󼏈${􂮀}􏄟􇎁𣖽+q{\u000c𨆶󻽛|g\u0006\u0001/`L~󿨫􈹅𦦜\u0003!\u00038\n󺒛󰒔p\u001e&\u001e肴􋦽+􀹯uft 󽏉D􁤬𧉸'\u0001󴈑\u0015V\u0016n8x熓\u0010鲶\u0018P~l$fẏ\u0011\u0005󴍑∙\u001eLx<@\u0012\u0019󺸸H𬘅s􅮒18𥎀𡫜\u0017 \u0011I\u000c=\u0018=[V󿗦'\u0001뗣󳉃G`6'\u001a!*;\u0019J􆦇\u0002y\u0011\\\"!\u0007E澌𣲍B󼏂𫟴AL\u001e!\u0005]􀞵?_t/𡤿aﬖO G\u001e􍅍􉞧{=\u0012<<󿘣[o󹕞Lz\u0007\u0006􎬸\n>.\u0005I|hlT;h\u001f\u000eI\u0015\u000e\u0016􍂱󸊬\u0012󽛑\u001c\\P\u001c𩴷\u000b{Y\u0010 ' q!󿏦g󸂑T󸕌^Lg:󾴬)~𬺔&R{􇊰𭽈X\u0017􋭁󷋽zᎥs.8n\n\u0012|\u0016RP&\u0008\u00037\u0005\u0007U󴼵{\u00100%v5 䚀\u000e𗂅EU\u001eഝ8\u001a/ኹW['`J􄥤uv𧳄􃖉\u0013\u0010\u0019􈢆+P7𧝆P_X𘢍󽀺2􂻽54𭄄xB􁙐g𬂟\"\u0011\u0001rC)0^\u0001rQ\u000cpd뗦􎄜䞿B\u0015𧨉ꔩs󵘠6gi6m7𣖮\u0004\u0005L\u000c𘚳f?\u00180$𣟜\u001b]>CV\nVPb:^e6ᵨ\u0005􀍉􋐽$!L􀼴vv\u000e/:\u001a\"􁄽o𩢿\u000ce{:󴬧ᩣ\u0014\u000es\u0007z~%H.xF󾘉𨡤h\u0017󰤰\u001b􃂽E\u001b𩤺7\u0001\u000b8𗭥:PS: 􊩿:󽸇6c0𨻢􉪮$􍏟{)|\u001d􁐽K\u000c\u001ea#GK󿥰\u0003m\u0002br@ᥑ\r'bv\u0008󳑮\u0016󸧑dv󴑦\"\u0015𩹊\u001b󼥥\u0010>𑊡\u0008𨅪⍿S/[􊻼];⟶A$\n5S𦐾_y𮃩\u001bP]e\u0018𬊥􏈙𧈡-\u001d􇙃\u001d􌈁󿷾&P$\u001dT𝝆TLX[셎🧳)\u0017P;닧\u000em􏻾D􃑄󾴋>EI\u0000\u0015I\u0018􂜮\t[AtgxM\u0016󽟕^􌶀\u0008^V𣅒+l)n󻘀\u0000\"􍪵y\u0007.\u0010",
     "prekeys": [
         {
-            "key": "a",
-            "id": 1
+            "id": 1,
+            "key": "a"
         }
     ],
-    "class": "tablet",
-    "label": ""
-}
\ No newline at end of file
+    "type": "temporary"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_8.json b/libs/wire-api/test/golden/testObject_NewClient_user_8.json
index a8dbe1e2b6e..8d6c83d505d 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_8.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_8.json
@@ -1,13 +1,13 @@
 {
+    "class": "desktop",
     "cookie": "",
+    "label": "d,",
     "lastkey": {
-        "key": "\u0013,\u001f",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0013,\u001f"
     },
-    "password": "\u0008\u001e􈨇F\u000b\"p𭈱𧠩(\u0018\u0002\u001a{1.\u0002Sh1\u0004𢛕J𐨜𦼧첉?䆢\u0014hg^h􂓙&\u0001\u0007^⍤􎳰V𒓣\r~\nHD\"\u0017TC#𥓇\u0011󻘚\u000c◈D\u000f\u0006X\u0018?T\u0002Qa\u000b:}\u0006󾮴\u001cv\u0005\u0004;F{𐼰𩇣P庶SNm9yl\u0006󽵽zm\r\\ym\u001d\u0000VYm&H\u001b*t𬚊p󱗈Sb땶󾎌od𪰷3L󿹛\u000e$3􇜺\u001e\r㉿\u000cy𪙪B]\u0007j\u0013g:\u001d𤀪7\u001b\u00001y79R\u0003𞠨\u0015o󻣥\u001d:C\u0004&3g\u0003PonO#u<Rk􏐸 󰺌^\u001f1\u000cD載H\u000f􂬤Z\u0000묬]}󳰒?뽄箚􃡥$I/0^n*󺑟7U\u00121!VB\u001e𡽮yu\u0011F󵳪􈋤䨪;䫠}\u0012摺b󸲲𦯖𮆬􊆈v𫘚l\u001b\u000b󰷌\u0003M\u001b\u000e\u0017\u0004{^𪅇\u0004\u0001U匽B􁧔 𥶃\u001c\u0011yB<\u001c\u0018𪇍󽪒'(\u0014.Dnv𐦨(ys󹨄𬀲\u0004Vsa􉬉]8D旎𦂼x{Vzv󺫼􁣈\u001e䖼酠\u000b3xNAi眉nPQ􉄤\u0014𫘂󽊦_㕍􆈯\n􌑍󿠫n\u0015a\u0018煅.󾿎󶡺鐤f*2鎾AI𣌓\u001a꠪Ot/􎘃W󻩅yvD𦒁W\u001d􍧌𮤳\u001885|5\u0000 \u0002'\u001c𠉓dY@a-\u001aY𛰳\u0004𠆉𝕯𑪄󼕠􉐱D\u001b'󱻃\u0011􌻤𥴜=𥻬}~'𢡭\u001b=Z\u0014P%@;􀪌F颀wh>\u0014A5=z#7>+R𬚰蓩Qk1ꛨ\u001cF\u00112MY󿓁􁸄oqk\t/\u000cWI+1!]}r\u0013\u001b\u0015K\u0011*M\u0002􅤫\u0001\u0004qe\u0018𠱩1]bj/t🀼,\u0011jk\u0019􋳊\u0014\u001f/󸭘ਂ\u000e3𝐹k\u0013􉿳\u001c~\u00043󸒯{뛶Hf(x\u000f/Q􁁐\nzgdyT􏦢4CE􃍂\u001c\u0008\u000c=v\u0019􁁡+C𢷸ʂf󷅜x8b\u0010/\u0005\u001e\rQ;Ec𬚻󰙊\u0016QM.)\u0019k\u0004^\"&~EQmQ[􎹡GR\u0016z,􏢏kdR\u001a\u0011M\u0004!Nfn)󲲆,oFb~\u0017\u0011#\u0010\\%\u001c\u0004C󳚊󵘩₊.𩷺G􍰯,{\u0004R𪡛=􎨜𡈓􀒰g\u0010𢹉\\r\u0010F~V襳례\u0006P⧎&hC#R#z\u0010_\u0012􇲼􉹙dK𦏿噊2:M󴹯t\u0014𝖭\\󳁁:\u000b\u0005X\\𪬲,\"󸫙:渕l\u001c𣠠X􃃵hv,V$'\u00040zk[",
     "model": "",
-    "type": "legalhold",
+    "password": "\u0008\u001e􈨇F\u000b\"p𭈱𧠩(\u0018\u0002\u001a{1.\u0002Sh1\u0004𢛕J𐨜𦼧첉?䆢\u0014hg^h􂓙&\u0001\u0007^⍤􎳰V𒓣\r~\nHD\"\u0017TC#𥓇\u0011󻘚\u000c◈D\u000f\u0006X\u0018?T\u0002Qa\u000b:}\u0006󾮴\u001cv\u0005\u0004;F{𐼰𩇣P庶SNm9yl\u0006󽵽zm\r\\ym\u001d\u0000VYm&H\u001b*t𬚊p󱗈Sb땶󾎌od𪰷3L󿹛\u000e$3􇜺\u001e\r㉿\u000cy𪙪B]\u0007j\u0013g:\u001d𤀪7\u001b\u00001y79R\u0003𞠨\u0015o󻣥\u001d:C\u0004&3g\u0003PonO#u<Rk􏐸 󰺌^\u001f1\u000cD載H\u000f􂬤Z\u0000묬]}󳰒?뽄箚􃡥$I/0^n*󺑟7U\u00121!VB\u001e𡽮yu\u0011F󵳪􈋤䨪;䫠}\u0012摺b󸲲𦯖𮆬􊆈v𫘚l\u001b\u000b󰷌\u0003M\u001b\u000e\u0017\u0004{^𪅇\u0004\u0001U匽B􁧔 𥶃\u001c\u0011yB<\u001c\u0018𪇍󽪒'(\u0014.Dnv𐦨(ys󹨄𬀲\u0004Vsa􉬉]8D旎𦂼x{Vzv󺫼􁣈\u001e䖼酠\u000b3xNAi眉nPQ􉄤\u0014𫘂󽊦_㕍􆈯\n􌑍󿠫n\u0015a\u0018煅.󾿎󶡺鐤f*2鎾AI𣌓\u001a꠪Ot/􎘃W󻩅yvD𦒁W\u001d􍧌𮤳\u001885|5\u0000 \u0002'\u001c𠉓dY@a-\u001aY𛰳\u0004𠆉𝕯𑪄󼕠􉐱D\u001b'󱻃\u0011􌻤𥴜=𥻬}~'𢡭\u001b=Z\u0014P%@;􀪌F颀wh>\u0014A5=z#7>+R𬚰蓩Qk1ꛨ\u001cF\u00112MY󿓁􁸄oqk\t/\u000cWI+1!]}r\u0013\u001b\u0015K\u0011*M\u0002􅤫\u0001\u0004qe\u0018𠱩1]bj/t🀼,\u0011jk\u0019􋳊\u0014\u001f/󸭘ਂ\u000e3𝐹k\u0013􉿳\u001c~\u00043󸒯{뛶Hf(x\u000f/Q􁁐\nzgdyT􏦢4CE􃍂\u001c\u0008\u000c=v\u0019􁁡+C𢷸ʂf󷅜x8b\u0010/\u0005\u001e\rQ;Ec𬚻󰙊\u0016QM.)\u0019k\u0004^\"&~EQmQ[􎹡GR\u0016z,􏢏kdR\u001a\u0011M\u0004!Nfn)󲲆,oFb~\u0017\u0011#\u0010\\%\u001c\u0004C󳚊󵘩₊.𩷺G􍰯,{\u0004R𪡛=􎨜𡈓􀒰g\u0010𢹉\\r\u0010F~V襳례\u0006P⧎&hC#R#z\u0010_\u0012􇲼􉹙dK𦏿噊2:M󴹯t\u0014𝖭\\󳁁:\u000b\u0005X\\𪬲,\"󸫙:渕l\u001c𣠠X􃃵hv,V$'\u00040zk[",
     "prekeys": [],
-    "class": "desktop",
-    "label": "d,"
-}
\ No newline at end of file
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewClient_user_9.json b/libs/wire-api/test/golden/testObject_NewClient_user_9.json
index 6f8e34b8989..ef434ea610f 100644
--- a/libs/wire-api/test/golden/testObject_NewClient_user_9.json
+++ b/libs/wire-api/test/golden/testObject_NewClient_user_9.json
@@ -1,28 +1,28 @@
 {
     "cookie": "\u001a",
+    "label": "n",
     "lastkey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "model": "m{",
-    "type": "legalhold",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ],
-    "label": "n"
-}
\ No newline at end of file
+    "type": "legalhold"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_1.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_1.json
index 6236cbb2ef1..8c58bba7df4 100644
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NewConvManaged_user_1.json
@@ -1,13 +1,13 @@
 {
     "access": [],
     "access_role": "activated",
-    "users": [],
     "conversation_role": "37q9eeybycp5972td4oo9_r7y16eh6n67z5spda8sffy8qv",
+    "message_timer": 193643728192048,
+    "qualified_users": [],
+    "receipt_mode": 4,
     "team": {
         "managed": true,
         "teamid": "00000001-0000-0001-0000-000200000000"
     },
-    "receipt_mode": 4,
-    "message_timer": 193643728192048,
-    "qualified_users": []
-}
\ No newline at end of file
+    "users": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_10.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_10.json
deleted file mode 100644
index c2daf4e3a7c..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_10.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "access": [
-        "link"
-    ],
-    "users": [
-        "00000001-0000-0001-0000-000100000001"
-    ],
-    "conversation_role": "vakyrex99a9vi36iemc7wj4gu39s4wf30c2r_mqatgyer4y4dzypd_y7x3i9embufwc6e4nfuqvuvu9p72r8xdnmho615wrlkcr1h4e8tnokdio9t",
-    "name": "z􏭅",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0001-0000-000000000001"
-    },
-    "receipt_mode": 1,
-    "message_timer": 8061252799624904,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_11.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_11.json
deleted file mode 100644
index 6c529a22ee9..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_11.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "access": [
-        "invite"
-    ],
-    "access_role": "non_activated",
-    "users": [],
-    "conversation_role": "z5r2jhv40n91iwidhdui7jaa6i",
-    "name": "r",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0000-0000-000200000001"
-    },
-    "receipt_mode": -2,
-    "message_timer": 6292627004994884,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_12.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_12.json
deleted file mode 100644
index 4fcadb414c4..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_12.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "access": [
-        "private",
-        "code"
-    ],
-    "access_role": "team",
-    "users": [
-        "00000001-0000-0000-0000-000000000001",
-        "00000000-0000-0000-0000-000100000000"
-    ],
-    "conversation_role": "4ek91n56al0j6mc3ovtreftmizb2qoh05m_zozgr6ar1vorbh2gdx3b72gm_q65h815zuy_2qehwf9t20l3mabd53813168ccg",
-    "name": "",
-    "team": {
-        "managed": true,
-        "teamid": "00000000-0000-0001-0000-000100000000"
-    },
-    "message_timer": 7043412511612101,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_13.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_13.json
deleted file mode 100644
index c9ef6cba2b8..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_13.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite",
-        "link"
-    ],
-    "access_role": "non_activated",
-    "users": [],
-    "conversation_role": "220zl1nunhfwpvjm85iz_ixp98rq1dlwnqp7s18efvnonl6skfzkqvkxanemogf7ok3q29y5jzd4prt6s6ybl0ko47iu_zux5x7",
-    "name": "\tB",
-    "team": {
-        "managed": true,
-        "teamid": "00000000-0000-0001-0000-000100000001"
-    },
-    "receipt_mode": 0,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_14.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_14.json
deleted file mode 100644
index 7ffb20118c5..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_14.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "access": [
-        "code"
-    ],
-    "users": [
-        "00000001-0000-0000-0000-000000000001",
-        "00000000-0000-0000-0000-000100000000",
-        "00000001-0000-0001-0000-000100000001",
-        "00000001-0000-0001-0000-000100000001",
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0000-0000-000100000000",
-        "00000000-0000-0001-0000-000100000001",
-        "00000001-0000-0000-0000-000000000001",
-        "00000001-0000-0000-0000-000000000000",
-        "00000001-0000-0000-0000-000100000001"
-    ],
-    "conversation_role": "d1t6fg7c_ksqcoe6e308n2xblhwg8m7ahrnia88at1",
-    "name": "",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0001-0000-000000000000"
-    },
-    "message_timer": 8669416711689656,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_15.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_15.json
deleted file mode 100644
index 4897835141b..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_15.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "access": [
-        "private",
-        "code"
-    ],
-    "access_role": "non_activated",
-    "users": [
-        "00000001-0000-0000-0000-000000000000",
-        "00000000-0000-0001-0000-000000000001",
-        "00000000-0000-0001-0000-000100000001",
-        "00000000-0000-0000-0000-000000000001",
-        "00000000-0000-0000-0000-000000000000"
-    ],
-    "conversation_role": "5uxmr3gdwwipozxh",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0001-0000-000000000000"
-    },
-    "receipt_mode": 2,
-    "message_timer": 1166285470102499,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_16.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_16.json
deleted file mode 100644
index 01aeef6c744..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_16.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "access": [
-        "invite",
-        "code"
-    ],
-    "users": [],
-    "conversation_role": "dc5k1w34ghjhorv48fy8f3_ya4n8sq1vrr7oojpht2_tbfviuu9i43aaxgpce744vxs6ikex7q35mv17svnwotre29fm",
-    "name": "",
-    "team": {
-        "managed": true,
-        "teamid": "00000002-0000-0001-0000-000000000001"
-    },
-    "message_timer": 4425819976591162,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_17.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_17.json
deleted file mode 100644
index b8d1bb81cf9..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_17.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "access": [
-        "link"
-    ],
-    "access_role": "team",
-    "users": [
-        "00000001-0000-0000-0000-000000000000",
-        "00000001-0000-0000-0000-000000000001",
-        "00000001-0000-0001-0000-000000000000",
-        "00000000-0000-0000-0000-000000000001",
-        "00000000-0000-0001-0000-000100000000",
-        "00000000-0000-0000-0000-000100000000"
-    ],
-    "conversation_role": "faa_2g09yehf26736w2p59cuw_giwelkq2d_y4q5sj49n9",
-    "name": "",
-    "team": {
-        "managed": true,
-        "teamid": "00000000-0000-0000-0000-000000000000"
-    },
-    "message_timer": 5065871950676797,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_18.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_18.json
deleted file mode 100644
index 862a990ee99..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_18.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "access": [],
-    "access_role": "activated",
-    "users": [],
-    "conversation_role": "e9_exzeqnr163dd14s7van73vd_9lth079onlldtkmk",
-    "name": "踼\tJ",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0000-0000-000100000001"
-    },
-    "receipt_mode": -1,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_19.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_19.json
deleted file mode 100644
index 1f29a6a2939..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_19.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "access": [
-        "private"
-    ],
-    "access_role": "activated",
-    "users": [
-        "00000003-0000-0004-0000-000400000002"
-    ],
-    "conversation_role": "x2g84s2bn8uq_i6yizofg4xx9yvbseuw53u8oafwx5cwn26i5xl2ojio90cwv2kz0pl9p6hfrogrp",
-    "name": "",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0000-0000-000100000001"
-    },
-    "message_timer": 8428756728484885,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_20.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_20.json
deleted file mode 100644
index 7634af079d0..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_20.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite"
-    ],
-    "access_role": "non_activated",
-    "users": [
-        "00000001-0000-0001-0000-000100000001",
-        "00000001-0000-0000-0000-000000000001",
-        "00000001-0000-0001-0000-000100000000"
-    ],
-    "conversation_role": "url0_7h6wig8d_ro8fwdmuqggbynbdkjshlg_ei8qqu",
-    "name": "\u0001?(",
-    "team": {
-        "managed": true,
-        "teamid": "00000000-0000-0000-0000-000000000001"
-    },
-    "message_timer": 6168723896440273,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_3.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_3.json
deleted file mode 100644
index 07019eaaeab..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_3.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "access": [
-        "code"
-    ],
-    "access_role": "team",
-    "users": [
-        "00000001-0000-0001-0000-000100000000",
-        "00000001-0000-0000-0000-000100000001"
-    ],
-    "conversation_role": "kbqqptmp0tna583vobrgtadyismkkpnjdwsef9jlgvezy00yu5u2rds0ng11vppapcn9n7enwrg7tkwxvg1mz_rh7pcoi_btpcyg5akueydofop60j",
-    "name": "NwK",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0001-0000-000000000000"
-    },
-    "receipt_mode": 2,
-    "message_timer": 582808797322573,
-    "qualified_users": [
-        {
-            "domain": "test.example.com",
-            "id": "00000000-0000-0000-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_4.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_4.json
deleted file mode 100644
index 70d83c053d2..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_4.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "access": [
-        "private",
-        "link"
-    ],
-    "access_role": "team",
-    "users": [
-        "00000001-0000-0000-0000-000000000001",
-        "00000001-0000-0000-0000-000100000001",
-        "00000000-0000-0001-0000-000000000000"
-    ],
-    "conversation_role": "pa5z_izggck3l0sn9qc_yx06bwh_k1vf2drs3c8w35wyqwl3tco54d7lvnbh3udjzs8avs0j1dxr7v40ldpqgy4lszpnxx3f0hpy_37ofx30s9oa9t",
-    "name": "k-",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0001-0000-000100000002"
-    },
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_5.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_5.json
deleted file mode 100644
index c54f6a917f6..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_5.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "access": [],
-    "users": [
-        "00000001-0000-0000-0000-000100000000",
-        "00000000-0000-0000-0000-000100000001",
-        "00000000-0000-0000-0000-000100000001",
-        "00000000-0000-0001-0000-000100000000"
-    ],
-    "conversation_role": "mqkbqyi796z05v6jj4ijc7nl5unid6eq1t028pp9awv2_8bc61wq0zl",
-    "name": "v",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0000-0000-000100000000"
-    },
-    "receipt_mode": -1,
-    "message_timer": 1570858821505994,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_6.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_6.json
deleted file mode 100644
index 9663fd804a0..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_6.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "access": [
-        "invite",
-        "code"
-    ],
-    "access_role": "private",
-    "users": [
-        "00000001-0000-0001-0000-000000000001",
-        "00000000-0000-0000-0000-000000000000",
-        "00000001-0000-0000-0000-000000000001"
-    ],
-    "conversation_role": "gf5j3kqv7_6g55q6clu47jn2iq5yy_zvnm2753m2llu04bhb5ct_v53u7kmwdesgs832yylb_v5eddllgbostkjj7qwv7",
-    "name": "P􌑹\r",
-    "team": {
-        "managed": true,
-        "teamid": "00000000-0000-0000-0000-000000000001"
-    },
-    "message_timer": 6614365418177275,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_7.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_7.json
deleted file mode 100644
index 39582d207b7..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_7.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "access": [],
-    "access_role": "activated",
-    "users": [
-        "00000000-0000-0000-0000-000100000000",
-        "00000001-0000-0001-0000-000000000001"
-    ],
-    "conversation_role": "ce4ylezzp_1s9b3xbw7akybntwbaa21p8ijqsk53ymljzx_kubjl4tjvrdwb8jjm21cznytrtaffnemverdd39vqvbfxn_pl_",
-    "name": "\u0018",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0001-0000-000100000000"
-    },
-    "receipt_mode": 0,
-    "message_timer": 7417375067718994,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_8.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_8.json
deleted file mode 100644
index ae8c6078685..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_8.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "access": [],
-    "access_role": "activated",
-    "users": [
-        "00000001-0000-0001-0000-000100000000",
-        "00000001-0000-0001-0000-000000000000"
-    ],
-    "conversation_role": "ms6f79wv82ftbu608wl9jeu8xatyhb1p1ck5t9yht9xqjcldet9kj6gp4b",
-    "name": "&",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0000-0000-000100000001"
-    },
-    "receipt_mode": 2,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvManaged_user_9.json b/libs/wire-api/test/golden/testObject_NewConvManaged_user_9.json
deleted file mode 100644
index 9edd2c8c3d3..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvManaged_user_9.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite",
-        "link"
-    ],
-    "access_role": "non_activated",
-    "users": [],
-    "conversation_role": "yd",
-    "team": {
-        "managed": true,
-        "teamid": "00000001-0000-0000-0000-000000000000"
-    },
-    "receipt_mode": 1,
-    "message_timer": 2550845209410146,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_1.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_1.json
index edf0282f535..e063552c1d3 100644
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_1.json
@@ -4,16 +4,16 @@
         "invite"
     ],
     "access_role": "activated",
-    "users": [
-        "00000001-0000-0000-0000-000000000001",
-        "00000000-0000-0000-0000-000000000000"
-    ],
     "conversation_role": "8tp2gs7b6",
+    "message_timer": 3320987366258987,
+    "qualified_users": [],
+    "receipt_mode": 1,
     "team": {
         "managed": false,
         "teamid": "00000000-0000-0001-0000-000000000000"
     },
-    "receipt_mode": 1,
-    "message_timer": 3320987366258987,
-    "qualified_users": []
-}
\ No newline at end of file
+    "users": [
+        "00000001-0000-0000-0000-000000000001",
+        "00000000-0000-0000-0000-000000000000"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_10.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_10.json
deleted file mode 100644
index e35128c1deb..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_10.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "access": [
-        "private",
-        "code"
-    ],
-    "access_role": "activated",
-    "users": [
-        "00000000-0000-0000-0000-000100000001",
-        "00000000-0000-0001-0000-000000000000"
-    ],
-    "conversation_role": "30mnzwj79jo9ear300qs4k_x2262nyaqxt9qga1_zaqmto43q2935t4dzaan_qnlstgjix7efmqfljkpww2lz",
-    "name": "",
-    "receipt_mode": 2,
-    "message_timer": 5041503034744095,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_11.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_11.json
deleted file mode 100644
index 69680bdfa2e..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_11.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "access": [],
-    "users": [
-        "00000000-0000-0001-0000-000100000000",
-        "00000000-0000-0001-0000-000000000000"
-    ],
-    "conversation_role": "1ewdfj36vw",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0000-0000-000000000000"
-    },
-    "receipt_mode": 1,
-    "message_timer": 6019134025424754,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_12.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_12.json
deleted file mode 100644
index 844cd30e634..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_12.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "access": [],
-    "users": [],
-    "conversation_role": "wqhaeljk9zpp5nmspwl",
-    "name": ">+",
-    "receipt_mode": 1,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_13.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_13.json
deleted file mode 100644
index 04278d46724..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_13.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "access": [],
-    "users": [
-        "00000001-0000-0000-0000-000000000000",
-        "00000001-0000-0001-0000-000000000000",
-        "00000000-0000-0000-0000-000000000001",
-        "00000001-0000-0000-0000-000100000001"
-    ],
-    "conversation_role": "40iudwo9123uutd1ppbq2sd5aybain45r_mdb4caukkc6vvu4xdivyg23jl5vigsbq4q8zm4ua9yly3mxygytnv8wuf9__550amkunox7fpxw03b_y_lm86cahubkq",
-    "name": ".L'",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0000-0000-000000000001"
-    },
-    "receipt_mode": -2,
-    "message_timer": 211460552735402,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_14.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_14.json
deleted file mode 100644
index 6690d68083a..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_14.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "access": [
-        "code"
-    ],
-    "access_role": "non_activated",
-    "users": [
-        "00000001-0000-0001-0000-000100000001",
-        "00000000-0000-0001-0000-000000000000"
-    ],
-    "conversation_role": "fga_hfm9uzn_5z883y6r_kumb",
-    "name": "",
-    "receipt_mode": -2,
-    "message_timer": 854777662274030,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_15.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_15.json
deleted file mode 100644
index 6fda451288c..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_15.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite",
-        "code"
-    ],
-    "users": [
-        "00000002-0000-0003-0000-000300000003"
-    ],
-    "conversation_role": "_wje4g3_kcquzyoms0q4cwzz8",
-    "name": "b󶕜",
-    "team": {
-        "managed": false,
-        "teamid": "00000001-0000-0001-0000-000200000002"
-    },
-    "receipt_mode": 1,
-    "message_timer": 4005602882980532,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_16.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_16.json
deleted file mode 100644
index 4b11912e073..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_16.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "access": [
-        "private",
-        "code"
-    ],
-    "access_role": "private",
-    "users": [],
-    "conversation_role": "04ukg5i2nomsgwiphznmsrk1ou3ukxemisi9g",
-    "name": "!",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0001-0000-000100000000"
-    },
-    "receipt_mode": 1,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_17.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_17.json
deleted file mode 100644
index cfab3503e9b..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_17.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "access": [
-        "private",
-        "link",
-        "code"
-    ],
-    "users": [
-        "00000000-0000-0001-0000-000100000001",
-        "00000001-0000-0001-0000-000100000001",
-        "00000000-0000-0001-0000-000100000001",
-        "00000000-0000-0000-0000-000000000001",
-        "00000001-0000-0000-0000-000000000000",
-        "00000001-0000-0000-0000-000000000001",
-        "00000001-0000-0001-0000-000000000001",
-        "00000001-0000-0001-0000-000000000000",
-        "00000000-0000-0000-0000-000100000000"
-    ],
-    "conversation_role": "88mkdi8ivd_o3150rhc9dc7gyf_246m7xjrqwz7kt9vc7h5sgkuukgorx26y6uo7hj2lfe63pkeyva9tfivn08amsydb_i5vb4xn4870v44y0cwe3uk6sli5kqg",
-    "name": "\u0003B𝈪",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0001-0000-000100000001"
-    },
-    "receipt_mode": 0,
-    "message_timer": 880163555151907,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_18.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_18.json
deleted file mode 100644
index 43f14dfd5af..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_18.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "access": [
-        "private",
-        "code"
-    ],
-    "users": [
-        "00000001-0000-0000-0000-000000000000",
-        "00000000-0000-0000-0000-000000000001",
-        "00000001-0000-0001-0000-000000000001",
-        "00000000-0000-0001-0000-000100000000"
-    ],
-    "conversation_role": "ugehcdyu_ob9_woawlths95ez8cgtb6wjqypp7vbjaooiczerb5zpc6srxszgkrdu8l24ygz_",
-    "name": "sd\u0006",
-    "receipt_mode": -2,
-    "message_timer": 3120553871655858,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_19.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_19.json
deleted file mode 100644
index d9086140b52..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_19.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "access": [
-        "invite",
-        "link"
-    ],
-    "users": [
-        "00000002-0000-0001-0000-000000000002"
-    ],
-    "conversation_role": "xik7vc3wp82gw4r934rad_bhmf2orany3qgu_tx9huwfrlxy8m0id71x20uddebps30zdahe_ffcxxhc",
-    "name": "Cu\u0011",
-    "receipt_mode": -1,
-    "message_timer": 864918593306344,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_20.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_20.json
deleted file mode 100644
index f6acbbccc1d..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_20.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "access": [
-        "private"
-    ],
-    "users": [],
-    "conversation_role": "udhi2sbf7tzyshrh",
-    "name": "\u000f􅚶",
-    "receipt_mode": -1,
-    "message_timer": 3641984282941906,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_3.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_3.json
index b695ab354d0..0ccab7664d5 100644
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_3.json
+++ b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_3.json
@@ -5,14 +5,7 @@
         "code"
     ],
     "access_role": "activated",
-    "users": [],
     "conversation_role": "y3otpiwu615lvvccxsq0315jj75jquw01flhtuf49t6mzfurvwe3_sh51f4s257e2x47zo85rif_xyiyfldpan3g4r6zr35rbwnzm0k",
-    "name": "f",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0001-0000-000000000001"
-    },
-    "receipt_mode": 0,
-    "message_timer": 6764297310186120,
-    "qualified_users": []
-}
\ No newline at end of file
+    "qualified_users": [],
+    "users": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_4.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_4.json
deleted file mode 100644
index 4eb17cc8734..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_4.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "access": [
-        "code"
-    ],
-    "users": [],
-    "conversation_role": "q7sqqur0wu2xui3uemxhzds4w3edw4yin7cuukmu7d7l9v9dw181q7wugi7q87lzzw405pkphgit2g969hqb4n9kcvm0eg0pems55xdfqyhxbe948vhof",
-    "name": "𡂿𑑟z",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0001-0000-000000000000"
-    },
-    "receipt_mode": -2,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_5.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_5.json
deleted file mode 100644
index 8c3300d8268..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_5.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "access": [
-        "invite",
-        "link"
-    ],
-    "users": [
-        "00000001-0000-0001-0000-000100000000",
-        "00000000-0000-0001-0000-000100000001",
-        "00000000-0000-0001-0000-000100000001"
-    ],
-    "conversation_role": "cr2g48i6xjo49qdm04jig5teset_g6kt14u9az9jj5xhxoic55pown5d_rkw_3mrevrm37fosq08fhlsq8l259aio80f6cio",
-    "name": "X9",
-    "team": {
-        "managed": false,
-        "teamid": "00000001-0000-0001-0000-000100000000"
-    },
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_6.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_6.json
deleted file mode 100644
index 9ad3210f5e9..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_6.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "access": [
-        "link"
-    ],
-    "access_role": "team",
-    "users": [],
-    "conversation_role": "5zlsxm_95e5j1lk04d6rka_1svnnk65pov7tqs",
-    "name": "`3",
-    "receipt_mode": 2,
-    "message_timer": 3993332602038581,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_7.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_7.json
deleted file mode 100644
index 7864d68fd0e..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_7.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "access": [],
-    "access_role": "activated",
-    "users": [
-        "00000001-0000-0000-0000-000400000004"
-    ],
-    "conversation_role": "hdvd1wsqebgfamlgxdaoq7or2__7_dg5xg53v3ur9en91guk",
-    "name": "󽦧\u0008􂓅'",
-    "team": {
-        "managed": false,
-        "teamid": "00000001-0000-0002-0000-000200000000"
-    },
-    "receipt_mode": -3,
-    "message_timer": 5300164242243961,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_8.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_8.json
deleted file mode 100644
index adcf1b3067a..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_8.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "access": [
-        "invite"
-    ],
-    "access_role": "activated",
-    "users": [
-        "00000000-0000-0000-0000-000100000000"
-    ],
-    "conversation_role": "eyywm70536valjr5fwpiodgan70f9bw21os6a9q965y_hpww2hirwfm4lbe6220ltzpb8lifi2kd1q2w4qtq5t6bhzctw27b4k09offys",
-    "name": "",
-    "team": {
-        "managed": false,
-        "teamid": "00000000-0000-0001-0000-000100000001"
-    },
-    "receipt_mode": -1,
-    "message_timer": 5317293791913533,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_9.json b/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_9.json
deleted file mode 100644
index 52bf3a61ab4..00000000000
--- a/libs/wire-api/test/golden/testObject_NewConvUnmanaged_user_9.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "access": [
-        "private",
-        "invite",
-        "link"
-    ],
-    "access_role": "activated",
-    "users": [
-        "00000001-0000-0000-0000-000100000001",
-        "00000001-0000-0000-0000-000100000000"
-    ],
-    "conversation_role": "n8cjajmyhnw3hqv8sohb8674nwnpsv7g57i2hjhexg9tww",
-    "name": "L",
-    "message_timer": 7179840365742041,
-    "qualified_users": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_1.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_1.json
index 13fef2282b9..5bd07fd4b78 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_1.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_1.json
@@ -1,7 +1,7 @@
 {
     "last_prekey": {
-        "key": "|)𨔲",
-        "id": 65535
+        "id": 65535,
+        "key": "|)𨔲"
     },
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_10.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_10.json
index 9adbcff855b..9fa259f26ea 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_10.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_10.json
@@ -1,20 +1,20 @@
 {
     "last_prekey": {
-        "key": "I!6<\\\u0010䊲𦪐V\u0013",
-        "id": 65535
+        "id": 65535,
+        "key": "I!6<\\\u0010䊲𦪐V\u0013"
     },
     "prekeys": [
         {
-            "key": "𑵡`",
-            "id": 0
+            "id": 0,
+            "key": "𑵡`"
         },
         {
-            "key": "&",
-            "id": 1
+            "id": 1,
+            "key": "&"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_11.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_11.json
index 1f3abccffc1..65aa030bc18 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_11.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_11.json
@@ -1,7 +1,7 @@
 {
     "last_prekey": {
-        "key": "2􄃧",
-        "id": 65535
+        "id": 65535,
+        "key": "2􄃧"
     },
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_12.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_12.json
index 8554ace4abb..8bcd354baa2 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_12.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_12.json
@@ -1,40 +1,40 @@
 {
     "last_prekey": {
-        "key": "&G\u0014􃊀{􉍼wOPM鐺\u0013wx",
-        "id": 65535
+        "id": 65535,
+        "key": "&G\u0014􃊀{􉍼wOPM鐺\u0013wx"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_13.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_13.json
index 6faa0b60fea..23cb67a8341 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_13.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_13.json
@@ -1,36 +1,36 @@
 {
     "last_prekey": {
-        "key": "!",
-        "id": 65535
+        "id": 65535,
+        "key": "!"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "\u000e",
-            "id": 1
+            "id": 1,
+            "key": "\u000e"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_14.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_14.json
index 1f20c359a6d..9db849d656b 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_14.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_14.json
@@ -1,12 +1,12 @@
 {
     "last_prekey": {
-        "key": "4\u001d􁚔\u0013\u0011#^\u0015\r",
-        "id": 65535
+        "id": 65535,
+        "key": "4\u001d􁚔\u0013\u0011#^\u0015\r"
     },
     "prekeys": [
         {
-            "key": "+4\"'G𐼲S",
-            "id": 0
+            "id": 0,
+            "key": "+4\"'G𐼲S"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_15.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_15.json
index f83e5e6e454..d814e14922c 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_15.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_15.json
@@ -1,40 +1,40 @@
 {
     "last_prekey": {
-        "key": "󵀡mQ\r`",
-        "id": 65535
+        "id": 65535,
+        "key": "󵀡mQ\r`"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_16.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_16.json
index 95d96c0edde..5bc4838c84d 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_16.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_16.json
@@ -1,16 +1,16 @@
 {
     "last_prekey": {
-        "key": "'|\u001f\u0013\u000f/`-\u0014\u0004\u000co\u0007p",
-        "id": 65535
+        "id": 65535,
+        "key": "'|\u001f\u0013\u000f/`-\u0014\u0004\u000co\u0007p"
     },
     "prekeys": [
         {
-            "key": "{-𘘉",
-            "id": 0
+            "id": 0,
+            "key": "{-𘘉"
         },
         {
-            "key": "N",
-            "id": 2
+            "id": 2,
+            "key": "N"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_17.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_17.json
index 4176320291a..0f1afb32066 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_17.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_17.json
@@ -1,24 +1,24 @@
 {
     "last_prekey": {
-        "key": "𨏇p恭4",
-        "id": 65535
+        "id": 65535,
+        "key": "𨏇p恭4"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "𤶵",
-            "id": 1
+            "id": 1,
+            "key": "𤶵"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_18.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_18.json
index e33ff63b42a..be27d4f6a9e 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_18.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_18.json
@@ -1,52 +1,52 @@
 {
     "last_prekey": {
-        "key": "<\u001a𭾬mp󻃀UI\tq~\u001b",
-        "id": 65535
+        "id": 65535,
+        "key": "<\u001a𭾬mp󻃀UI\tq~\u001b"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_19.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_19.json
index 6132c9adf04..d3a699761ee 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_19.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_19.json
@@ -1,32 +1,32 @@
 {
     "last_prekey": {
-        "key": "𗦒􉔺z\u0012\u0004",
-        "id": 65535
+        "id": 65535,
+        "key": "𗦒􉔺z\u0012\u0004"
     },
     "prekeys": [
         {
-            "key": "f",
-            "id": 0
+            "id": 0,
+            "key": "f"
         },
         {
-            "key": "w",
-            "id": 1
+            "id": 1,
+            "key": "w"
         },
         {
-            "key": "H",
-            "id": 1
+            "id": 1,
+            "key": "H"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "_",
-            "id": 0
+            "id": 0,
+            "key": "_"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_2.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_2.json
index 5cc6f5fb661..2f78a8e2baf 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_2.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_2.json
@@ -1,16 +1,16 @@
 {
     "last_prekey": {
-        "key": "􍱑\u0010􄆅ᨋ9,󷾣tft\u001c",
-        "id": 65535
+        "id": 65535,
+        "key": "􍱑\u0010􄆅ᨋ9,󷾣tft\u001c"
     },
     "prekeys": [
         {
-            "key": ",5!",
-            "id": 2
+            "id": 2,
+            "key": ",5!"
         },
         {
-            "key": "0<󻞥",
-            "id": 1
+            "id": 1,
+            "key": "0<󻞥"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_20.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_20.json
index f46cce409c4..3ae069a38f8 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_20.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_20.json
@@ -1,12 +1,12 @@
 {
     "last_prekey": {
-        "key": "\u000c􆨲_~b\u0016yh\\z-<",
-        "id": 65535
+        "id": 65535,
+        "key": "\u000c􆨲_~b\u0016yh\\z-<"
     },
     "prekeys": [
         {
-            "key": "{󲎊􌈰\u0001.f",
-            "id": 6
+            "id": 6,
+            "key": "{󲎊􌈰\u0001.f"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_3.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_3.json
index 74ed62745d3..008c5f3bcf5 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_3.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_3.json
@@ -1,7 +1,7 @@
 {
     "last_prekey": {
-        "key": "󶐏낶b}-ql\u0019LL[鐪U:g",
-        "id": 65535
+        "id": 65535,
+        "key": "󶐏낶b}-ql\u0019LL[鐪U:g"
     },
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_4.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_4.json
index 2071d718986..c5fd2a100d3 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_4.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_4.json
@@ -1,12 +1,12 @@
 {
     "last_prekey": {
-        "key": "u%vZ\u0013􉳅D𪒬\u0005\"𭹡",
-        "id": 65535
+        "id": 65535,
+        "key": "u%vZ\u0013􉳅D𪒬\u0005\"𭹡"
     },
     "prekeys": [
         {
-            "key": "tp",
-            "id": 5
+            "id": 5,
+            "key": "tp"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_5.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_5.json
index 644f5411db4..a3c4667614c 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_5.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_5.json
@@ -1,16 +1,16 @@
 {
     "last_prekey": {
-        "key": "\\󻀮c🕕1𬧐jO\u0018}TD",
-        "id": 65535
+        "id": 65535,
+        "key": "\\󻀮c🕕1𬧐jO\u0018}TD"
     },
     "prekeys": [
         {
-            "key": "Y",
-            "id": 2
+            "id": 2,
+            "key": "Y"
         },
         {
-            "key": "n",
-            "id": 1
+            "id": 1,
+            "key": "n"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_6.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_6.json
index c3c148362ab..757bdfaca3a 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_6.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_6.json
@@ -1,7 +1,7 @@
 {
     "last_prekey": {
-        "key": "n/􇲡b<",
-        "id": 65535
+        "id": 65535,
+        "key": "n/􇲡b<"
     },
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_7.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_7.json
index 30795ec1ffd..658e38a3564 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_7.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_7.json
@@ -1,52 +1,52 @@
 {
     "last_prekey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_8.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_8.json
index 4a6c45815ed..cca887626fe 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_8.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_8.json
@@ -1,7 +1,7 @@
 {
     "last_prekey": {
-        "key": "%\u0004𢋌",
-        "id": 65535
+        "id": 65535,
+        "key": "%\u0004𢋌"
     },
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_9.json b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_9.json
index 552b6cdfb1c..ad954038544 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_9.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldClient_team_9.json
@@ -1,32 +1,32 @@
 {
     "last_prekey": {
-        "key": "y<Q\u0000KE\u0011M𦯫f",
-        "id": 65535
+        "id": 65535,
+        "key": "y<Q\u0000KE\u0011M𦯫f"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "󺵫",
-            "id": 0
+            "id": 0,
+            "key": "󺵫"
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "}",
-            "id": 0
+            "id": 0,
+            "key": "}"
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_1.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_1.json
index 4b83132c736..d3c2d0546bb 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_1.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_1.json
@@ -2,4 +2,4 @@
     "auth_token": "",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_10.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_10.json
index 61d3eb1a7f5..23ba18f0148 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_10.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_10.json
@@ -2,4 +2,4 @@
     "auth_token": "Ckn983B62A==",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_11.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_11.json
index c48f9cbd578..1cdc74448d0 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_11.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_11.json
@@ -2,4 +2,4 @@
     "auth_token": "zZKENRzO",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_12.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_12.json
index 4aec4a4bbcc..64079fe4fe9 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_12.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_12.json
@@ -2,4 +2,4 @@
     "auth_token": "uE7fSSldCrg=",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_13.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_13.json
index 7559384847d..961cce9a4b2 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_13.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_13.json
@@ -2,4 +2,4 @@
     "auth_token": "JyGtSwecCC0=",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_14.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_14.json
index 98d76893dee..74c2c806dc1 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_14.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_14.json
@@ -2,4 +2,4 @@
     "auth_token": "9QSn1j95",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_15.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_15.json
index 72b409d4d1e..a8bbb1bc997 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_15.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_15.json
@@ -2,4 +2,4 @@
     "auth_token": "oxBexKer",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_16.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_16.json
index fe0b8d24693..01487b82bc9 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_16.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_16.json
@@ -2,4 +2,4 @@
     "auth_token": "hQ==",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_17.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_17.json
index b4ad714980a..44549e1bc00 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_17.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_17.json
@@ -2,4 +2,4 @@
     "auth_token": "XukS",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_18.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_18.json
index b33c75201e2..ad92cc1350d 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_18.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_18.json
@@ -2,4 +2,4 @@
     "auth_token": "CjZs8l8RosNB",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_19.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_19.json
index d7e5c3ef17b..59e0b887232 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_19.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_19.json
@@ -2,4 +2,4 @@
     "auth_token": "hR_8Tg==",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_2.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_2.json
index 6b6e6e8a50a..cc9e6e506de 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_2.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_2.json
@@ -2,4 +2,4 @@
     "auth_token": "PikG5xThDw==",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_20.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_20.json
index 85df67fdca4..3b0eca38672 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_20.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_20.json
@@ -2,4 +2,4 @@
     "auth_token": "BnEGJ3V1",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_3.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_3.json
index 1fbd84504ef..81b4262b9e8 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_3.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_3.json
@@ -2,4 +2,4 @@
     "auth_token": "kw2r-cjra-U0",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_4.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_4.json
index 4b83132c736..d3c2d0546bb 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_4.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_4.json
@@ -2,4 +2,4 @@
     "auth_token": "",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_5.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_5.json
index 35c1901a508..a051a4b03d9 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_5.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_5.json
@@ -2,4 +2,4 @@
     "auth_token": "T9f1d6R3gA==",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_6.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_6.json
index 18cbb1a4cdf..c760e91dc7a 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_6.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_6.json
@@ -2,4 +2,4 @@
     "auth_token": "U40hTxpN_1Q=",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_7.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_7.json
index f724a1d5953..f9ed70be389 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_7.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_7.json
@@ -2,4 +2,4 @@
     "auth_token": "vn4=",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_8.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_8.json
index 1f582e71034..76f02de9f9c 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_8.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_8.json
@@ -2,4 +2,4 @@
     "auth_token": "iRi6OJIRXA==",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_9.json b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_9.json
index b04fd61d27a..0f189dc2f2e 100644
--- a/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_9.json
+++ b/libs/wire-api/test/golden/testObject_NewLegalHoldService_team_9.json
@@ -2,4 +2,4 @@
     "auth_token": "lxyPY187BbY=",
     "base_url": "https://example.com",
     "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_1.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_1.json
index 74428fe8760..705466b09d3 100644
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_1.json
@@ -1,8 +1,8 @@
 {
     "native_priority": "high",
-    "report_missing": [],
     "native_push": true,
+    "recipients": {},
+    "report_missing": [],
     "sender": "6",
-    "transient": false,
-    "recipients": {}
+    "transient": false
 }
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_10.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_10.json
deleted file mode 100644
index 5e0549f7dbb..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_10.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "native_priority": "high",
-    "report_missing": [
-        "00000002-0000-0003-0000-000100000003"
-    ],
-    "data": "",
-    "native_push": true,
-    "sender": "0",
-    "transient": true,
-    "recipients": {
-        "00000000-0000-0001-0000-000000000001": {},
-        "00000001-0000-0000-0000-000100000000": {
-            "0": "",
-            "1": ""
-        },
-        "00000000-0000-0001-0000-000100000000": {},
-        "00000001-0000-0000-0000-000100000001": {}
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_11.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_11.json
deleted file mode 100644
index fb3bb50936a..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_11.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "native_priority": "high",
-    "report_missing": [
-        "00000002-0000-0000-0000-000000000002",
-        "00000001-0000-0000-0000-000100000003",
-        "00000002-0000-0004-0000-000400000004",
-        "00000003-0000-0004-0000-000400000004"
-    ],
-    "data": "\u0017a𪒨\u0015",
-    "native_push": false,
-    "sender": "8",
-    "transient": true,
-    "recipients": {
-        "00000003-0000-0004-0000-000000000001": {
-            "3": "\u0015䴭"
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_12.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_12.json
deleted file mode 100644
index cf387d2eb31..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_12.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "native_priority": "low",
-    "data": "",
-    "native_push": false,
-    "sender": "1",
-    "transient": true,
-    "recipients": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_13.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_13.json
deleted file mode 100644
index ba8a3952483..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_13.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "data": "]aY",
-    "native_push": false,
-    "sender": "5",
-    "transient": true,
-    "recipients": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_14.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_14.json
deleted file mode 100644
index f90a198dbfa..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_14.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "native_priority": "high",
-    "report_missing": [
-        "00000001-0000-0004-0000-000000000002",
-        "00000000-0000-0002-0000-000000000001",
-        "00000001-0000-0003-0000-000300000000",
-        "00000001-0000-0000-0000-000000000004"
-    ],
-    "data": "cc",
-    "native_push": true,
-    "sender": "3",
-    "transient": true,
-    "recipients": {
-        "00000001-0000-0000-0000-000000000001": {
-            "0": ""
-        },
-        "00000001-0000-0000-0000-000000000000": {
-            "0": " "
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_15.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_15.json
deleted file mode 100644
index c31224752f9..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_15.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "native_priority": "low",
-    "report_missing": [
-        "00000001-0000-0002-0000-000100000000",
-        "00000003-0000-0004-0000-000100000003",
-        "00000002-0000-0003-0000-000200000004"
-    ],
-    "data": "\u0007",
-    "native_push": true,
-    "sender": "6",
-    "transient": false,
-    "recipients": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_16.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_16.json
deleted file mode 100644
index 0f5969c0fe9..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_16.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "native_priority": "low",
-    "native_push": false,
-    "sender": "7",
-    "transient": true,
-    "recipients": {
-        "00000002-0000-0000-0000-000300000002": {
-            "0": "g2"
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_17.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_17.json
deleted file mode 100644
index 3dfb398b753..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_17.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "native_priority": "high",
-    "data": "",
-    "native_push": false,
-    "sender": "2",
-    "transient": false,
-    "recipients": {
-        "00000000-0000-0001-0000-000000000001": {},
-        "00000001-0000-0000-0000-000100000000": {},
-        "00000001-0000-0001-0000-000100000001": {},
-        "00000000-0000-0000-0000-000000000000": {},
-        "00000001-0000-0001-0000-000000000001": {},
-        "00000000-0000-0001-0000-000000000000": {}
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_18.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_18.json
deleted file mode 100644
index e22bd5d1087..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_18.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "report_missing": [],
-    "data": "",
-    "native_push": true,
-    "sender": "3",
-    "transient": true,
-    "recipients": {
-        "00000001-0000-0001-0000-000000000000": {},
-        "00000001-0000-0000-0000-000000000001": {
-            "0": "",
-            "1": ""
-        },
-        "00000001-0000-0001-0000-000100000000": {
-            "1": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_19.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_19.json
deleted file mode 100644
index 1f60428dba2..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_19.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "native_priority": "high",
-    "report_missing": [
-        "00000002-0000-0002-0000-000300000001",
-        "00000003-0000-0001-0000-000000000000"
-    ],
-    "native_push": false,
-    "sender": "3",
-    "transient": true,
-    "recipients": {
-        "00000001-0000-0001-0000-000000000000": {},
-        "00000001-0000-0000-0000-000000000001": {},
-        "00000001-0000-0000-0000-000100000000": {},
-        "00000000-0000-0001-0000-000100000000": {},
-        "00000000-0000-0000-0000-000100000001": {},
-        "00000000-0000-0000-0000-000000000000": {}
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_2.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_2.json
index fd93aa88cf4..1093fbcafbf 100644
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_2.json
+++ b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_2.json
@@ -1,14 +1,7 @@
 {
-    "native_priority": "low",
-    "data": "97",
-    "native_push": false,
-    "sender": "3",
-    "transient": true,
-    "recipients": {
-        "00000000-0000-0001-0000-000000000001": {
-            "1": ""
-        },
-        "00000001-0000-0000-0000-000100000000": {},
-        "00000000-0000-0001-0000-000000000000": {}
-    }
-}
\ No newline at end of file
+    "data": "data",
+    "native_push": true,
+    "recipients": {},
+    "sender": "6",
+    "transient": false
+}
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_20.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_20.json
deleted file mode 100644
index e05bf057e4d..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_20.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "native_priority": "low",
-    "report_missing": [
-        "00000002-0000-0001-0000-000000000004",
-        "00000003-0000-0004-0000-000000000001"
-    ],
-    "native_push": true,
-    "sender": "2",
-    "transient": true,
-    "recipients": {
-        "00000001-0000-0000-0000-000000000001": {},
-        "00000000-0000-0001-0000-000000000001": {},
-        "00000001-0000-0000-0000-000100000000": {},
-        "00000000-0000-0000-0000-000100000001": {},
-        "00000001-0000-0001-0000-000100000001": {},
-        "00000000-0000-0000-0000-000000000000": {},
-        "00000001-0000-0001-0000-000000000001": {},
-        "00000000-0000-0001-0000-000000000000": {}
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_3.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_3.json
deleted file mode 100644
index 3b80805cccb..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_3.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "native_priority": "high",
-    "report_missing": [],
-    "native_push": true,
-    "sender": "2",
-    "transient": true,
-    "recipients": {
-        "00000002-0000-0000-0000-000200000004": {
-            "0": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_4.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_4.json
deleted file mode 100644
index f2ec16f3634..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_4.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "native_priority": "high",
-    "report_missing": [
-        "00000001-0000-0001-0000-000000000000",
-        "00000004-0000-0001-0000-000100000000"
-    ],
-    "native_push": false,
-    "sender": "5",
-    "transient": true,
-    "recipients": {
-        "00000000-0000-0000-0000-000300000004": {
-            "0": "e",
-            "1": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_5.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_5.json
deleted file mode 100644
index 241f5483c6c..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_5.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "native_priority": "low",
-    "data": "J􁩠",
-    "native_push": false,
-    "sender": "6",
-    "transient": false,
-    "recipients": {
-        "00000004-0000-0002-0000-000100000002": {
-            "2": "Y"
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_6.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_6.json
deleted file mode 100644
index 81306fe8d7f..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_6.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "native_priority": "low",
-    "report_missing": [],
-    "data": "-;󼼕L",
-    "native_push": true,
-    "sender": "8",
-    "transient": false,
-    "recipients": {
-        "00000002-0000-0001-0000-000100000001": {
-            "0": "",
-            "1": ""
-        },
-        "00000000-0000-0002-0000-000100000000": {
-            "0": "&"
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_7.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_7.json
deleted file mode 100644
index dfc945ee011..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_7.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "report_missing": [
-        "00000000-0000-0001-0000-000300000004"
-    ],
-    "data": "",
-    "native_push": true,
-    "sender": "1",
-    "transient": true,
-    "recipients": {
-        "00000000-0000-0001-0000-000200000000": {
-            "0": "",
-            "1": ""
-        },
-        "00000001-0000-0000-0000-000000000002": {
-            "0": "\u0003"
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_8.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_8.json
deleted file mode 100644
index 472f0edc569..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_8.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "native_priority": "low",
-    "report_missing": [],
-    "native_push": false,
-    "sender": "1",
-    "transient": false,
-    "recipients": {
-        "00000002-0000-0000-0000-000200000002": {
-            "0": "",
-            "1": ""
-        },
-        "00000002-0000-0000-0000-000000000001": {
-            "1": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_9.json b/libs/wire-api/test/golden/testObject_NewOtrMessage_user_9.json
deleted file mode 100644
index 503e1188efa..00000000000
--- a/libs/wire-api/test/golden/testObject_NewOtrMessage_user_9.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "native_priority": "high",
-    "data": "(",
-    "native_push": false,
-    "sender": "0",
-    "transient": false,
-    "recipients": {
-        "00000001-0000-0000-0000-000100000000": {
-            "0": "",
-            "1": ""
-        },
-        "00000001-0000-0001-0000-000100000001": {
-            "0": "",
-            "1": ""
-        },
-        "00000000-0000-0000-0000-000000000001": {}
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_1.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_1.json
index 8cff477f8ed..fda243192fe 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_1.json
@@ -1,3 +1,3 @@
 {
     "email": "󵷑b􌓆9#衿\u0010X2oᨅ𩿅t@􇰸\u0011ꎳs\u000c𘂕}\u0018\u000e\n8\u001az𩛗\n𥫨Zdb#\u001a4IM8𐚙+"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_10.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_10.json
index 9fb44374132..152a1896f54 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_10.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_10.json
@@ -1,3 +1,3 @@
 {
     "email": "P􄈗m#\u0008o\n?n𩧑\u001enr\"^c󼔢\\'g톽l@/?䍴􊽠\u001at\u0003v"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_11.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_11.json
index d849adda5df..107ab814813 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_11.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_11.json
@@ -1,3 +1,3 @@
 {
     "phone": "+009509628647"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_12.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_12.json
index 8023afa7d9e..fcd31ea90cb 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_12.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_12.json
@@ -1,3 +1,3 @@
 {
     "email": "9G𣖟@󰲎\u0016󴾢𬠩\u000f\u0002\u001f\u0015gP 󰽹"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_13.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_13.json
index 97642c7fdda..3f76fe2e7d2 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_13.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_13.json
@@ -1,3 +1,3 @@
 {
     "phone": "+33232954574312"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_14.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_14.json
index de3e3471289..6efa3b1c7ed 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_14.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_14.json
@@ -1,3 +1,3 @@
 {
     "phone": "+314850099"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_15.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_15.json
index 8adf2459913..5365ea04b92 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_15.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_15.json
@@ -1,3 +1,3 @@
 {
     "email": "𡿢叮\u0003 9\u001b0!\u0003󶂱\u0003xBxL=DL攦/\rᷣ@$56f!/"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_16.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_16.json
index 99a96fec7a9..523c1e8b58d 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_16.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_16.json
@@ -1,3 +1,3 @@
 {
     "email": "w\u0001spQ(懤\u0004\"\\\u0003rbE\n5𛈶D@ps!\t𫩺"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_17.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_17.json
index f81a793b651..658a71b4a85 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_17.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_17.json
@@ -1,3 +1,3 @@
 {
     "phone": "+560530602858"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_18.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_18.json
index 0141abde868..50822cea0e1 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_18.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_18.json
@@ -1,3 +1,3 @@
 {
     "phone": "+2603603795"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_19.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_19.json
index 9d4237deab4..4625c19bd3c 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_19.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_19.json
@@ -1,3 +1,3 @@
 {
     "phone": "+002938255629"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_2.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_2.json
index bae11fd4d8a..68395a3ba7c 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_2.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_2.json
@@ -1,3 +1,3 @@
 {
     "phone": "+529329682"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_20.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_20.json
index 3d818c03102..4fa88a2f0ed 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_20.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_20.json
@@ -1,3 +1,3 @@
 {
     "phone": "+77098859488192"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_3.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_3.json
index 6880578809d..56f49e6a58f 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_3.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_3.json
@@ -1,3 +1,3 @@
 {
     "phone": "+41719978"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_4.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_4.json
index 7543d0e0c56..174d2ed33e6 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_4.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_4.json
@@ -1,3 +1,3 @@
 {
     "phone": "+607957193"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_5.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_5.json
index 58e5a338aa5..0a8a0a8911b 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_5.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_5.json
@@ -1,3 +1,3 @@
 {
     "phone": "+83279556464710"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_6.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_6.json
index 03e0e9efb37..f62f1d3b713 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_6.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_6.json
@@ -1,3 +1,3 @@
 {
     "email": "𥔴@pkTt󴦄,K􍄊C켭2󼭾􄥓s\n\r􄬳􌈻+ꏉ:\u001d[真MbEC\u0000"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_7.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_7.json
index d51f42ac560..72d7e3149eb 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_7.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_7.json
@@ -1,3 +1,3 @@
 {
     "email": "N𮖽V'}󰢊\u00073@*\u0016jF䞡\"~Zꆆz𡴁bN𠆥⋴)I3\t\u0004󾨥􇂒,\u0014"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_8.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_8.json
index 98eaea6d8bd..d4f4083f802 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_8.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_8.json
@@ -1,3 +1,3 @@
 {
     "email": "(a蕎'CKj\u001b\u0019􀮎@?󰹶D𠾪󷎑7􆯮eh䧖gS􊉜}􆋉n_"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_9.json b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_9.json
index 0ea8120cce3..43051dc8735 100644
--- a/libs/wire-api/test/golden/testObject_NewPasswordReset_user_9.json
+++ b/libs/wire-api/test/golden/testObject_NewPasswordReset_user_9.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0003ji\u0008\u0007󲾆󴙔𝝘'ᾧk\u001e+@\u001c:\u0003\u000c􅡌5塋t𡀠>𪮉IE􄋇M\u0012g\u001aAO𦵕3\"󴕰H푅c🡹꾿6"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_1.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_1.json
index 289944cee3e..3a28b13e006 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_1.json
@@ -1,4 +1,4 @@
 {
-    "password": "𡯤[􈋖\u0011p8pHZ琛M=󾮭(\u000e𠆘`x^艿𭀔𑇍\t䭗p1\u001d8B􂇇nFIuy􄵵t󹟶$扢W\\o𢴿\u001e1􈶜j󼈣𠬹\u0002󾙤h𗢤wi1􅝟7ㅿ􈳲`𞸈T=)-6)%f1Q\u0016󹰣KD&*\u001aJ󰼳󰬠\u0002𧐲𑂥4I;J􃛈,𧃣\u0007nೋ㓦e}𠼩3h\u0010\u0012n6􁝖\u0017\u0017\u0011􇙒\u001e\u0008c\u0019Kt|w_\u000c􊼆𭵥0l󱎃z렜{\u000f8󵟯𫬠xqL\u00122>KVNuWk\\*,C\u0018(𮆞􁛅)󾋰ywK𬼃𨢽􌇕I崉>󻞊/󾬗󾕯\u0010\u0018\u000b:𡑩􂷧5\u001c􄠉\u001cYcK􈬛𢻴T󹦈~kZH碰V􁋖%󺒗R\t󽊓kR7:1\u0014\r~둓;􃱽c𤰗􄔊T䢬􀡵TN𡤁H\u001d:qE\n_䩄\u00127\u0003[M3\u00170󵶩b燜󹼀ZaZ𠤜􆵰\u0013C粛\u000b𭬒y󽫤t-􄨴8VZ\u000b𭝞A}\u0010􎙏\u001fL%J󹠞|\u0005A􁽃OY\u0014\u001c\u001fa𝜱𗠐􍡓1/젦/yV!b:\u000e\u0012\"w𐡳o\u0014虔\u0013\u0012G*􂮏𮬃慐\u0019⤬𣎂􁘽𪼶\u0003\"\u001av􈙌;󱤳y꺗𝍭L󸛂u\u000b,\u0016𧃝t=\u000fR{>\u0000䮕􅗎󳻐;]􁈎󿀚􂇬\u0018P𐜦󴤔coG=\u0018\u001f󷫯\u0007𫽴𧧩\u0017*𫖅\u0019元\u00078\u000cC\u0018𮆀\rG\u0017\"]􎡺󾨆V󷳐\u0010:␗𣐵NC𩸐z\u000cGgD\u0010@\u0006u':\u0006.0􃶞\u0015\u00164􅿷𒐘\r\u0012S|tY鴒􅝱:𘝭\n4𠮂Q 䛋D󱩵B𢹮,󵉨𮠙\u000et|U崰4\u001ds􇱢*A?![􃦽\u0006􇢇>\\q嗉\u0018n𝘕c珤IT\u0000\u0003BN;⛍3췐\u001d\u0013󶋯\u0016d𭥑1t\u0012W\u0012\u0006𭡁Q\u0000=6rẜJ\u0004􇢪@_􉦏󽪅l[xQv\u0015Ib\r>/Td\u001d\u0016:󳯣􋉤\t\u0016\u001fDI_J\u0016󲔵S\u0007Cᕮ\u000b𮑾Z;\u000e嬾m$\u001a4x~8\u0011󹪽\u0007\u0019hhd𭃮juGj!@ML􉮜-/X󾾫(\u0006􁲘X酂\u001a|\u000c}S𧼔!􋃁.DZQ󰒀𤿎Fo:4施B}`q&󻕴􍼤놝m!wS[􇺀*$뉶8󱍃𭃟􄼨餪m&X>􂪤켫􎫧􆪌#\u0015RD~\u001f􊸂7􀵴🏜𬀂෧7'b\n𞢘\u000b=1(􄵑\u000f~􍥓끻\u0002#'a.X]\u0016tOW领'|e談\nG𣺘I\u000c𤴖\u0005_􌱳_\u0005󲼗𧷠\u0013􃀡Nᔏ󹵵4\n퀁\u000b=_􌸉K􊐚b_𩳓+\u0006{\u0015*󾡾m𫤶2aF \u0015$m𐋱[::\u00064\u0001G^\u00019𤑚𭅣BvhE\n􈼽q\u0019\u0014U[􈕳5Um𠋑L폼Ϸ\n1\r\u0014𨘖ఐ2sM𩺫_B`d𠓽\u0017}\to<滕0_l󷘣\u0010'c!$2\u0016𠠞\u0008FX\u0002\u001e殆󷮒􃟸Q1H#F𝤫&󺀺𤁈\u0005%=𡪟_𨧨\u00072LHu\u0006𤢙BX|lT0󲺙\rY7󸘺Q6f󰗲𩌴뷳𭙋*kU\u0019 n!\u0014𗅺\u0014\rY\u000b𪁔O\u0000\"-B󴁲7蝲L𤢁JqB_HFq\u0002\u0006gtf䛈47\u00160\u0006\u0012􇤾(>lOos\u00009A^Mw='\u001e\u0016󵽒9\u000b\u0014𦒍󶞾氦[\u001bE癪\"󿛢\u0012.m7n\u000c\u0006Jv}𡥌LI:Ct\tNO\u000c>\u0003\u0005!\t􏗙|-૨{H[󸇹q~!\u0019\u0018\\or1\u0006_0.󵴫->ธA\u001a敔M1BN~\u0008󼻓Sg\u0008=\u0006􃏊󾅉\u0010\u0011ѷ'6\u001c󼾭.]5=󲼿y􉶙>zw;􀉃衲d嵐𐮄􆆗󵾳􂪿ⳣ'?(1.,\u0016\t",
-    "id": "0000001d-0000-0013-0000-00210000002c"
-}
\ No newline at end of file
+    "id": "0000001d-0000-0013-0000-00210000002c",
+    "password": "𡯤[􈋖\u0011p8pHZ琛M=󾮭(\u000e𠆘`x^艿𭀔𑇍\t䭗p1\u001d8B􂇇nFIuy􄵵t󹟶$扢W\\o𢴿\u001e1􈶜j󼈣𠬹\u0002󾙤h𗢤wi1􅝟7ㅿ􈳲`𞸈T=)-6)%f1Q\u0016󹰣KD&*\u001aJ󰼳󰬠\u0002𧐲𑂥4I;J􃛈,𧃣\u0007nೋ㓦e}𠼩3h\u0010\u0012n6􁝖\u0017\u0017\u0011􇙒\u001e\u0008c\u0019Kt|w_\u000c􊼆𭵥0l󱎃z렜{\u000f8󵟯𫬠xqL\u00122>KVNuWk\\*,C\u0018(𮆞􁛅)󾋰ywK𬼃𨢽􌇕I崉>󻞊/󾬗󾕯\u0010\u0018\u000b:𡑩􂷧5\u001c􄠉\u001cYcK􈬛𢻴T󹦈~kZH碰V􁋖%󺒗R\t󽊓kR7:1\u0014\r~둓;􃱽c𤰗􄔊T䢬􀡵TN𡤁H\u001d:qE\n_䩄\u00127\u0003[M3\u00170󵶩b燜󹼀ZaZ𠤜􆵰\u0013C粛\u000b𭬒y󽫤t-􄨴8VZ\u000b𭝞A}\u0010􎙏\u001fL%J󹠞|\u0005A􁽃OY\u0014\u001c\u001fa𝜱𗠐􍡓1/젦/yV!b:\u000e\u0012\"w𐡳o\u0014虔\u0013\u0012G*􂮏𮬃慐\u0019⤬𣎂􁘽𪼶\u0003\"\u001av􈙌;󱤳y꺗𝍭L󸛂u\u000b,\u0016𧃝t=\u000fR{>\u0000䮕􅗎󳻐;]􁈎󿀚􂇬\u0018P𐜦󴤔coG=\u0018\u001f󷫯\u0007𫽴𧧩\u0017*𫖅\u0019元\u00078\u000cC\u0018𮆀\rG\u0017\"]􎡺󾨆V󷳐\u0010:␗𣐵NC𩸐z\u000cGgD\u0010@\u0006u':\u0006.0􃶞\u0015\u00164􅿷𒐘\r\u0012S|tY鴒􅝱:𘝭\n4𠮂Q 䛋D󱩵B𢹮,󵉨𮠙\u000et|U崰4\u001ds􇱢*A?![􃦽\u0006􇢇>\\q嗉\u0018n𝘕c珤IT\u0000\u0003BN;⛍3췐\u001d\u0013󶋯\u0016d𭥑1t\u0012W\u0012\u0006𭡁Q\u0000=6rẜJ\u0004􇢪@_􉦏󽪅l[xQv\u0015Ib\r>/Td\u001d\u0016:󳯣􋉤\t\u0016\u001fDI_J\u0016󲔵S\u0007Cᕮ\u000b𮑾Z;\u000e嬾m$\u001a4x~8\u0011󹪽\u0007\u0019hhd𭃮juGj!@ML􉮜-/X󾾫(\u0006􁲘X酂\u001a|\u000c}S𧼔!􋃁.DZQ󰒀𤿎Fo:4施B}`q&󻕴􍼤놝m!wS[􇺀*$뉶8󱍃𭃟􄼨餪m&X>􂪤켫􎫧􆪌#\u0015RD~\u001f􊸂7􀵴🏜𬀂෧7'b\n𞢘\u000b=1(􄵑\u000f~􍥓끻\u0002#'a.X]\u0016tOW领'|e談\nG𣺘I\u000c𤴖\u0005_􌱳_\u0005󲼗𧷠\u0013􃀡Nᔏ󹵵4\n퀁\u000b=_􌸉K􊐚b_𩳓+\u0006{\u0015*󾡾m𫤶2aF \u0015$m𐋱[::\u00064\u0001G^\u00019𤑚𭅣BvhE\n􈼽q\u0019\u0014U[􈕳5Um𠋑L폼Ϸ\n1\r\u0014𨘖ఐ2sM𩺫_B`d𠓽\u0017}\to<滕0_l󷘣\u0010'c!$2\u0016𠠞\u0008FX\u0002\u001e殆󷮒􃟸Q1H#F𝤫&󺀺𤁈\u0005%=𡪟_𨧨\u00072LHu\u0006𤢙BX|lT0󲺙\rY7󸘺Q6f󰗲𩌴뷳𭙋*kU\u0019 n!\u0014𗅺\u0014\rY\u000b𪁔O\u0000\"-B󴁲7蝲L𤢁JqB_HFq\u0002\u0006gtf䛈47\u00160\u0006\u0012􇤾(>lOos\u00009A^Mw='\u001e\u0016󵽒9\u000b\u0014𦒍󶞾氦[\u001bE癪\"󿛢\u0012.m7n\u000c\u0006Jv}𡥌LI:Ct\tNO\u000c>\u0003\u0005!\t􏗙|-૨{H[󸇹q~!\u0019\u0018\\or1\u0006_0.󵴫->ธA\u001a敔M1BN~\u0008󼻓Sg\u0008=\u0006􃏊󾅉\u0010\u0011ѷ'6\u001c󼾭.]5=󲼿y􉶙>zw;􀉃衲d嵐𐮄􆆗󵾳􂪿ⳣ'?(1.,\u0016\t"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_10.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_10.json
index 9a42f07a3f9..a4a48e546ba 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_10.json
@@ -1,4 +1,4 @@
 {
-    "password": "􀁽m9\u0015!-=\u000c􃌎𗫀\u0016g]\u0006C\u0014%􆑕f\u0001됹:q󰴝5\r\u0006\u0018웪\u001c\u0001\u0019\u0018\u000f\u0014𤈻⥊\u0013\u0008\u0012V\u001aE􏵹)\\󱅼􏫖􀾺`翆_@9𢜍\u0018\u0006<\nnt\u0018$\u0017&Ty󶢔>􇮴𝆄𡭪𘏡W󷦈%Yw\r䡈\u001e\u0005o\u000e'YiⳫz󾤹=8o\u00163\"'&9Cr\u000e\u0015?dW\u0010'e0m#𖣹\\`4h𡦌\u0011,􇧦󽣞#\u000f,epa􇸳𦰴𗉖::L<l􆛹d6\u0005󾥏\u0005+a\u001e𩒳\u001d𪓝⺓I􉱦dr\u0018Eⓢ*􅑑4I\u001ev}s疊􇨫\u000eO𫅙}󼊅\u000fWK+\u0017􌭾/ବVu\"+󠆥J􍈿󱕽󰧲\u0013\u0013\u000bRy| \u0000q2L􆇶芕wP\u000f􌬷0>&3\u0000󵠓P2,9𥛎\u0019)眊8􎎹\u0017/-\u0011\u0010\u001f󲮷n\u0011蜅􈉳h,Yೂf\u0018xN\u0007J`#u􇫆!p􍫓BPMﭙ󱊝􃣖(I'𣜱󺷍^!]푙\r@yK𭠧󺏻\u001eF􈝮󺴚邹/\u0018\u0000\u0008\u0016\u0008􁈚0󾹆/\u00005>m\\󶀶AV\u001a>'\u001b8z>tzm󽷽\u0013!\u0015\u001a\u000e𢀞𣰅sH_\u000f󻀒\u0010@O\u0018O+𝦷\u0003ʼnF\u001e\u0005\u0012r𮜙鵞~󺷥\u0018\u0013\twej󱉬l\u0001\u0004󿹉i첩Vn𭵛5􅝓􋄪V\u0012\u001f\n􄺕􌈶H7b𠪱{0Gm%Jl\n󲖰𗼴\\g>󻀥E𑜶EG\u000erX󷓹耚-\u001b!9p;\u0019넟H%\u001c\u0013\u0014H󿟪-}\u0004\rm\u0010a\u0006_O:Ch}𫢹󹸊R𡨝􆃙C\"+lN\u0000RC𓋌뭣𡾹>]󻁉+𧾨䝺W\u0004{\u0007\"(J𢍒+􂂼&䏏􊍀b\u0012ዜ𥖈+4gO)CG􊾓󶄍tt\u0007\u0018􅥳oo\r3]􂷔􈩺l\u0006eJI\n\u0012/>\u000e\u001a@锊cOX\u0017q`\n􇀜<^.𩁫v󱁲𢴓di󻅮\u00050-,neX\u0014m𠕂9)\u0007'3𮣖\u000b&䳤@@v􈽜DL󵊳+\\52e\u000b'gK󻓤\u0000玀𝥮󸵟􈬔0⼣s𡋢R\u00049-\u0017{@􎩁B\u0001ꢻʩq𪏭딮\u001a/󶓠Ga'ep啗𑨺𤥛􅅡3\t9\t󲚕*\"s4e1􇱏5u@x\u000f􊮙T\u0007\u001c\u00013\u001ddQ)􁨒;*v􆘫J\u0018q凰􆫪󵖾Pls윸%􀰵L𬧪q喬N󽣟&\u000b\u001cKgzh􋓤5t\u0016󶕮;뱏浔7\u0014,\u0004􏰥\r}gD\u0013􃦶\rg\u00181F\u001f:\u0015[S􇎶\u0019|\u00041nE7jeq𡒬󲚥𢹈％)E\u000c\u0008\u001b󺯠\u000c\u0007\u00029,\u000f\u001f󼆪~Y\u001b󲚑hJ􁹢N{qm=W/+fZ􌀧\u0008𦛇>H𧓝6S>>􊟽lD􈂪󲻔j8\u0016􌆶\u0013M􂧴\u0004\rO󼤔 C9Ȥ-\u001e8𫂡TR\u000cihwWTkCZs\u001bl\u0006[吐\u001bO-婠/@`\n玎\u001a\u0001?󷍌<Y𪨷:􅛢1\u000cn􋊦\r\u0012D\u0000󹬯5󼉟;S0\u0016􎳳fv./󵘋M)k7l5\"󵓴e\u0014$0횦a|􆝗􎖬 𤱕\u0005Q(\u0016𞄜\u001c\u000f|\u000fC󳳟4\u001e(\u000b\u0006r𭷕?+SnM\u00139󲠣El\u001d\\},<}nV􂢢\u001d􌄯Hm\"\u0007nZ\u001c/Ul\r𢂏\\􁍙􆺑l 𗍐󱩼|Dv8H\u001bPwzVXdN_S󹪄볩WQIA3/􈊘n5裥",
-    "id": "00000071-0000-007c-0000-00680000001d"
-}
\ No newline at end of file
+    "id": "00000071-0000-007c-0000-00680000001d",
+    "password": "􀁽m9\u0015!-=\u000c􃌎𗫀\u0016g]\u0006C\u0014%􆑕f\u0001됹:q󰴝5\r\u0006\u0018웪\u001c\u0001\u0019\u0018\u000f\u0014𤈻⥊\u0013\u0008\u0012V\u001aE􏵹)\\󱅼􏫖􀾺`翆_@9𢜍\u0018\u0006<\nnt\u0018$\u0017&Ty󶢔>􇮴𝆄𡭪𘏡W󷦈%Yw\r䡈\u001e\u0005o\u000e'YiⳫz󾤹=8o\u00163\"'&9Cr\u000e\u0015?dW\u0010'e0m#𖣹\\`4h𡦌\u0011,􇧦󽣞#\u000f,epa􇸳𦰴𗉖::L<l􆛹d6\u0005󾥏\u0005+a\u001e𩒳\u001d𪓝⺓I􉱦dr\u0018Eⓢ*􅑑4I\u001ev}s疊􇨫\u000eO𫅙}󼊅\u000fWK+\u0017􌭾/ବVu\"+󠆥J􍈿󱕽󰧲\u0013\u0013\u000bRy| \u0000q2L􆇶芕wP\u000f􌬷0>&3\u0000󵠓P2,9𥛎\u0019)眊8􎎹\u0017/-\u0011\u0010\u001f󲮷n\u0011蜅􈉳h,Yೂf\u0018xN\u0007J`#u􇫆!p􍫓BPMﭙ󱊝􃣖(I'𣜱󺷍^!]푙\r@yK𭠧󺏻\u001eF􈝮󺴚邹/\u0018\u0000\u0008\u0016\u0008􁈚0󾹆/\u00005>m\\󶀶AV\u001a>'\u001b8z>tzm󽷽\u0013!\u0015\u001a\u000e𢀞𣰅sH_\u000f󻀒\u0010@O\u0018O+𝦷\u0003ʼnF\u001e\u0005\u0012r𮜙鵞~󺷥\u0018\u0013\twej󱉬l\u0001\u0004󿹉i첩Vn𭵛5􅝓􋄪V\u0012\u001f\n􄺕􌈶H7b𠪱{0Gm%Jl\n󲖰𗼴\\g>󻀥E𑜶EG\u000erX󷓹耚-\u001b!9p;\u0019넟H%\u001c\u0013\u0014H󿟪-}\u0004\rm\u0010a\u0006_O:Ch}𫢹󹸊R𡨝􆃙C\"+lN\u0000RC𓋌뭣𡾹>]󻁉+𧾨䝺W\u0004{\u0007\"(J𢍒+􂂼&䏏􊍀b\u0012ዜ𥖈+4gO)CG􊾓󶄍tt\u0007\u0018􅥳oo\r3]􂷔􈩺l\u0006eJI\n\u0012/>\u000e\u001a@锊cOX\u0017q`\n􇀜<^.𩁫v󱁲𢴓di󻅮\u00050-,neX\u0014m𠕂9)\u0007'3𮣖\u000b&䳤@@v􈽜DL󵊳+\\52e\u000b'gK󻓤\u0000玀𝥮󸵟􈬔0⼣s𡋢R\u00049-\u0017{@􎩁B\u0001ꢻʩq𪏭딮\u001a/󶓠Ga'ep啗𑨺𤥛􅅡3\t9\t󲚕*\"s4e1􇱏5u@x\u000f􊮙T\u0007\u001c\u00013\u001ddQ)􁨒;*v􆘫J\u0018q凰􆫪󵖾Pls윸%􀰵L𬧪q喬N󽣟&\u000b\u001cKgzh􋓤5t\u0016󶕮;뱏浔7\u0014,\u0004􏰥\r}gD\u0013􃦶\rg\u00181F\u001f:\u0015[S􇎶\u0019|\u00041nE7jeq𡒬󲚥𢹈％)E\u000c\u0008\u001b󺯠\u000c\u0007\u00029,\u000f\u001f󼆪~Y\u001b󲚑hJ􁹢N{qm=W/+fZ􌀧\u0008𦛇>H𧓝6S>>􊟽lD􈂪󲻔j8\u0016􌆶\u0013M􂧴\u0004\rO󼤔 C9Ȥ-\u001e8𫂡TR\u000cihwWTkCZs\u001bl\u0006[吐\u001bO-婠/@`\n玎\u001a\u0001?󷍌<Y𪨷:􅛢1\u000cn􋊦\r\u0012D\u0000󹬯5󼉟;S0\u0016􎳳fv./󵘋M)k7l5\"󵓴e\u0014$0횦a|􆝗􎖬 𤱕\u0005Q(\u0016𞄜\u001c\u000f|\u000fC󳳟4\u001e(\u000b\u0006r𭷕?+SnM\u00139󲠣El\u001d\\},<}nV􂢢\u001d􌄯Hm\"\u0007nZ\u001c/Ul\r𢂏\\􁍙􆺑l 𗍐󱩼|Dv8H\u001bPwzVXdN_S󹪄볩WQIA3/􈊘n5裥"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_11.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_11.json
index c01dd7ad961..74f0782d943 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_11.json
@@ -1,3 +1,3 @@
 {
     "id": "00000050-0000-004f-0000-004000000075"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_12.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_12.json
index 3ac13e6e327..8333577ade9 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_12.json
@@ -1,4 +1,4 @@
 {
-    "password": "𩬓`Amo\u001d+y􀢹􎁃+;\u0017x^1D螃\u0008cXW쫎\u0018􁵢!fZ=𒊌g\t08x􇵃:􈖭E𤊭𤛡󹰠\u0017y5\u0014𬊱\rMXH\u001dF\u0013f𤁾T9^X2,\u0007eS\"\u001b9NMkI<_􇀯󱗾䩯줈to\u0007%𝟛c󺲈繬\u001b󾊢w\u0007􋃡󼕵r𪻎6􍃐Scx\r􅨋*psUU\nao𩾟\u0000𭞛-+3!=?s63琢si\u001c􀟆r􊳔g󾍉!󵃄\u001b\u001f\r󺨔+(\u001b\u001f,{􏳎u𥛣]c𒂔\u0014푤TL\\㽐WEFL\u0007𠯺&I.븃7\n\u0006쒌󳊇F\u000b\u0012\u0004Qjq\u0000PbTu𠼭󱈤c􄿪\u001c🐸.􀜵𡠳\u0011L\u0002󳘄zN㷪.󲂰𣉡-@\u0013'\u0006\u0015ꂼ2\u0001󶟛0d\n􎥔0\u0008녴6𮮠󾒁FeXp6%𘫚MP\u0013􊳩􁾶\u001f󺤡𢑖𤧨\u0005j;𪧠󼐂6𛲇\"u\u001c𨛪0h4L\u001d𒑦m\u001e\u001bc4󸦝B(l\u001c9󵲤Y𡧁0vi\u000fKZ𦳨$A摈m\u0004𢦢o󺋕/쎈𧥨𘇕\u0006p\u0001𡟋᪤y\u0015􇠦𓍾-Y\nો\u001bHb /W\u0003\u0013B>mmPX\u0015􂍖g\u0018\u001a𮦅𭊃5𢷧R󺴋\u001d`5}𪋮\u001c𘔐\u000c\u001c\u0016K\u001dxIt5D2\u001c8Hg\u001e\rW𣱧\u0013俁􆶓Ro뺵\u000eN[GAUQ嘄Q󱐘\"&𪿕􅀹􁩪@\u0001ጤ&OQ(B)𤖎튎NU<*;\u0010\u000c{x𩴽%𡦖u􍌞S\u0017<W&<mg 䉀W𮌥4\u001c+􈙏a,󲾧X@4􉽬\"󻵋􇗯S􄂐\u00043󸖬\u001fxA;:f_%,i\u001d𫓒h𢤽t􆽩,􁇵A𠹰<Qt𦌶u􀬾󱡖,𣃉\u001b*\u0013+m<r􆪯\u0015+>ng+𮐲HU鷻9􌍰+\u000b\u0007\u0007xr,'%\u0004𤁱\r`\u000e\u0015\n!2\u0017k􀊷bWꝹe𓌍􅉧{𤥈 \u0007󷾧u\u0012몥fh􆠃\u0003𗾖\u00006𬢎<MS]$\u000eYA{\u000837`𥓤󾍊ꛎ􁽇󱓦𬃣󴾧􅆹󽮤9\u0008nE;\u00120nភ𗂳𤸳B.\u0013G'C\\\u0019^짡[\rSK⹌Qqn\u0011d\u0017\n󰫉􂅤􇛄J\t􈁦􅳺\u001cDN跚k4\u0015+li𞺌󷅟󴋋􌧢N[8![턍\u0013dj7^mm𫶬S\u0017\u0004\n𨗫\u0004뿉B󻱶LY\u001e\u0003􀦏82L렑\u0019x_꣒`r풚\u0013󻜞􁫧\u000b𭇖\u0003W𡊈e&^g@\u000fFf𫛪􉼔\u001f\u001cyx᱄H\t㠹\u0000\u0008lz'󿗖\u0015g\u001c\u0013\u0000࣢󵰗q\"i􂏶!&a)\u0006gfk𡖳B",
-    "id": "00000079-0000-007b-0000-005b0000003f"
-}
\ No newline at end of file
+    "id": "00000079-0000-007b-0000-005b0000003f",
+    "password": "𩬓`Amo\u001d+y􀢹􎁃+;\u0017x^1D螃\u0008cXW쫎\u0018􁵢!fZ=𒊌g\t08x􇵃:􈖭E𤊭𤛡󹰠\u0017y5\u0014𬊱\rMXH\u001dF\u0013f𤁾T9^X2,\u0007eS\"\u001b9NMkI<_􇀯󱗾䩯줈to\u0007%𝟛c󺲈繬\u001b󾊢w\u0007􋃡󼕵r𪻎6􍃐Scx\r􅨋*psUU\nao𩾟\u0000𭞛-+3!=?s63琢si\u001c􀟆r􊳔g󾍉!󵃄\u001b\u001f\r󺨔+(\u001b\u001f,{􏳎u𥛣]c𒂔\u0014푤TL\\㽐WEFL\u0007𠯺&I.븃7\n\u0006쒌󳊇F\u000b\u0012\u0004Qjq\u0000PbTu𠼭󱈤c􄿪\u001c🐸.􀜵𡠳\u0011L\u0002󳘄zN㷪.󲂰𣉡-@\u0013'\u0006\u0015ꂼ2\u0001󶟛0d\n􎥔0\u0008녴6𮮠󾒁FeXp6%𘫚MP\u0013􊳩􁾶\u001f󺤡𢑖𤧨\u0005j;𪧠󼐂6𛲇\"u\u001c𨛪0h4L\u001d𒑦m\u001e\u001bc4󸦝B(l\u001c9󵲤Y𡧁0vi\u000fKZ𦳨$A摈m\u0004𢦢o󺋕/쎈𧥨𘇕\u0006p\u0001𡟋᪤y\u0015􇠦𓍾-Y\nો\u001bHb /W\u0003\u0013B>mmPX\u0015􂍖g\u0018\u001a𮦅𭊃5𢷧R󺴋\u001d`5}𪋮\u001c𘔐\u000c\u001c\u0016K\u001dxIt5D2\u001c8Hg\u001e\rW𣱧\u0013俁􆶓Ro뺵\u000eN[GAUQ嘄Q󱐘\"&𪿕􅀹􁩪@\u0001ጤ&OQ(B)𤖎튎NU<*;\u0010\u000c{x𩴽%𡦖u􍌞S\u0017<W&<mg 䉀W𮌥4\u001c+􈙏a,󲾧X@4􉽬\"󻵋􇗯S􄂐\u00043󸖬\u001fxA;:f_%,i\u001d𫓒h𢤽t􆽩,􁇵A𠹰<Qt𦌶u􀬾󱡖,𣃉\u001b*\u0013+m<r􆪯\u0015+>ng+𮐲HU鷻9􌍰+\u000b\u0007\u0007xr,'%\u0004𤁱\r`\u000e\u0015\n!2\u0017k􀊷bWꝹe𓌍􅉧{𤥈 \u0007󷾧u\u0012몥fh􆠃\u0003𗾖\u00006𬢎<MS]$\u000eYA{\u000837`𥓤󾍊ꛎ􁽇󱓦𬃣󴾧􅆹󽮤9\u0008nE;\u00120nភ𗂳𤸳B.\u0013G'C\\\u0019^짡[\rSK⹌Qqn\u0011d\u0017\n󰫉􂅤􇛄J\t􈁦􅳺\u001cDN跚k4\u0015+li𞺌󷅟󴋋􌧢N[8![턍\u0013dj7^mm𫶬S\u0017\u0004\n𨗫\u0004뿉B󻱶LY\u001e\u0003􀦏82L렑\u0019x_꣒`r풚\u0013󻜞􁫧\u000b𭇖\u0003W𡊈e&^g@\u000fFf𫛪􉼔\u001f\u001cyx᱄H\t㠹\u0000\u0008lz'󿗖\u0015g\u001c\u0013\u0000࣢󵰗q\"i􂏶!&a)\u0006gfk𡖳B"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_13.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_13.json
index 0d12443cef4..e8492862f89 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_13.json
@@ -1,4 +1,4 @@
 {
-    "password": "䔳\u000f7'􈙶7\u0003.𨤪ᴀ鹙ꩾV)/_\u0016%R\r6J\\봸\u000bA\u0014l\u0016&-𤠃)^\u0000[𩶈􁷩\u00072\u0005\u0002󼛝\u000f]랗i闆=\t󺽣 2筡􎹨K\u0011S\u0010\u000c`c,nJ뀢𩁭.􈠞󶕭}􃔦􂥘BVI󻴈wo󱘡\\)/󶿵1\u0002􌅴\u00071U@󶥗o􋨊猭(<:\u001c]􏺶 B􉘱!F𥫝\u00137LM\u0017TGK\u0002l\u0012a\u0018E)󾑻􋮕E7\n(vs弢\u000b덎]𩮹B~.h(`󾪈K{\u0001􁎐/z􅜁󸪦BAr\u0015L㞩􅪖^\u0001푀󷯞f\u0012\u001350\u001a\u000e7\u001c\u000b}\u000b\u000f;\u001bN\u001bK{q^6$\u0006u𨋇󽁫l<𪫊D\u0002󴄧\u0012r\u0003~&􂒊'Q􈷴4eWZw􆊋\t=\u0018k􎙭=-󺧋뜸c[<e;􄓥\u001c-af\u0018\u0004\u001cq𤬻\n砇𣃡QBp󳁛𢡢𒑣;*>tb􃉝AKkyu\u0015d\u001e𪃼U\u001f\u0007𠜽\u001c󳘻@x,w\u0000]Hv𭒙\n\u0016𢅹􈨡='@L8漉󳞸\u001dTvF\u0015cF\tb\ni룴p󿈈`􁌿K󿧱􄄫zOS/􊙶#^fE?d󻱩.\u001a*0\u001f𝞛𡤹𐂼🈵u􄛒\u0000\u0011\u0018P{8l𪝻@{\u0016􊶁Tx崢X𧘣󻛍屦@>\u001aSf>5K𑫅\"*.ꕾ𠐵\u001a2z\u0010c󽅡P\u0017\u0015\u0017;𣋱J",
-    "id": "00000007-0000-007c-0000-001d00000074"
-}
\ No newline at end of file
+    "id": "00000007-0000-007c-0000-001d00000074",
+    "password": "䔳\u000f7'􈙶7\u0003.𨤪ᴀ鹙ꩾV)/_\u0016%R\r6J\\봸\u000bA\u0014l\u0016&-𤠃)^\u0000[𩶈􁷩\u00072\u0005\u0002󼛝\u000f]랗i闆=\t󺽣 2筡􎹨K\u0011S\u0010\u000c`c,nJ뀢𩁭.􈠞󶕭}􃔦􂥘BVI󻴈wo󱘡\\)/󶿵1\u0002􌅴\u00071U@󶥗o􋨊猭(<:\u001c]􏺶 B􉘱!F𥫝\u00137LM\u0017TGK\u0002l\u0012a\u0018E)󾑻􋮕E7\n(vs弢\u000b덎]𩮹B~.h(`󾪈K{\u0001􁎐/z􅜁󸪦BAr\u0015L㞩􅪖^\u0001푀󷯞f\u0012\u001350\u001a\u000e7\u001c\u000b}\u000b\u000f;\u001bN\u001bK{q^6$\u0006u𨋇󽁫l<𪫊D\u0002󴄧\u0012r\u0003~&􂒊'Q􈷴4eWZw􆊋\t=\u0018k􎙭=-󺧋뜸c[<e;􄓥\u001c-af\u0018\u0004\u001cq𤬻\n砇𣃡QBp󳁛𢡢𒑣;*>tb􃉝AKkyu\u0015d\u001e𪃼U\u001f\u0007𠜽\u001c󳘻@x,w\u0000]Hv𭒙\n\u0016𢅹􈨡='@L8漉󳞸\u001dTvF\u0015cF\tb\ni룴p󿈈`􁌿K󿧱􄄫zOS/􊙶#^fE?d󻱩.\u001a*0\u001f𝞛𡤹𐂼🈵u􄛒\u0000\u0011\u0018P{8l𪝻@{\u0016􊶁Tx崢X𧘣󻛍屦@>\u001aSf>5K𑫅\"*.ꕾ𠐵\u001a2z\u0010c󽅡P\u0017\u0015\u0017;𣋱J"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_14.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_14.json
index c0a742fda03..c9be92129ed 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_14.json
@@ -1,4 +1,4 @@
 {
-    "password": "724=蘀󲔎&f\u000eiez\u000e:󺀻W𠱖d듵𢦞O\u0001𭌑􀟬cs\u0005𐳜dpspp#􌥴_\u0008\u0008Y􀡣&󵉊\u0003\u0002󱤍\u001f󶞧⹀$s\u001e0\u000c󻨳𨸿aV􈮺_(#)\u0012N\u000c𦫏𫩈\u000e&𮌙)l]X;🐥\u0003􌇏縋\u001dA3\u0019\u0007綇_\u0014\u0003aM-\u001d-􂝙𧅱8\u001b쫺}q\\W^𝡨Dm🆆󷕡V3\u0014\u000c$VJ\u001a\r&D;Hb \u0014󶣾I&x\u000f󿝧\u0002料U\u0011xꪬ􉾊\u0010󸛏R𪕁𠤸y𭖌,>􀉒\"\u0000\u0017j)𪟏\u001fFP𧲫X􂙫8!<W\u001c~~?M𧬭V\u0001{:潶k*U\u0011Nx|\u001a\u0015rn􈁛􉏉\u0004\u000f4R󿆺𩺂褈\n􀡭tLv12d䚯\"67𭎩󱯛r􉝓󿗣fSE鱒𤽪𥱷\u000e}G\u000fb󵽙a􊷀𪤟󹢲m\u0000\\椣f󾼈[\u000e\u0010>lQ\u0019}揩I\u001c\u001c",
-    "id": "0000001a-0000-001a-0000-003000000051"
-}
\ No newline at end of file
+    "id": "0000001a-0000-001a-0000-003000000051",
+    "password": "724=蘀󲔎&f\u000eiez\u000e:󺀻W𠱖d듵𢦞O\u0001𭌑􀟬cs\u0005𐳜dpspp#􌥴_\u0008\u0008Y􀡣&󵉊\u0003\u0002󱤍\u001f󶞧⹀$s\u001e0\u000c󻨳𨸿aV􈮺_(#)\u0012N\u000c𦫏𫩈\u000e&𮌙)l]X;🐥\u0003􌇏縋\u001dA3\u0019\u0007綇_\u0014\u0003aM-\u001d-􂝙𧅱8\u001b쫺}q\\W^𝡨Dm🆆󷕡V3\u0014\u000c$VJ\u001a\r&D;Hb \u0014󶣾I&x\u000f󿝧\u0002料U\u0011xꪬ􉾊\u0010󸛏R𪕁𠤸y𭖌,>􀉒\"\u0000\u0017j)𪟏\u001fFP𧲫X􂙫8!<W\u001c~~?M𧬭V\u0001{:潶k*U\u0011Nx|\u001a\u0015rn􈁛􉏉\u0004\u000f4R󿆺𩺂褈\n􀡭tLv12d䚯\"67𭎩󱯛r􉝓󿗣fSE鱒𤽪𥱷\u000e}G\u000fb󵽙a􊷀𪤟󹢲m\u0000\\椣f󾼈[\u000e\u0010>lQ\u0019}揩I\u001c\u001c"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_15.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_15.json
index f7338b66821..9b6b8621e3c 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_15.json
@@ -1,4 +1,4 @@
 {
-    "password": "􊠺om𠓢ry􁴽B1\"\u0012`(Z\u0003k畛W\u0003O􏤴2􈺜\u0016X𗰛L\u0011\u000bt􋭀𘛌1}Q\u0001%oCv᳑]g㍅O0\u000f*K 􆅁󰑰\u0002몚bW𧷲䷉V`1v\u0017𫏾\u000b\t#[HT􌿑~v𢔸-'xVUw􈧶,yR\u000em𖥤M\u0019\u0007YD𪺋K󴅎\u0010&⏑\u0013𝌺=𨌠>􌩢\u000e4|􇺝K=ﰲlD؟>V􉄍oP􄕷A}A𣐥\u001c|􂕎s}}12씆􃣀h2\u0015\u0010\"&sc\u0007n\u0017m\u0003\n\u0015\u00009\u0006\u000fnOuk􆆞Pc󴁵\u0019\u000e{\u001d^-\u001eI{\u0006.pg竟}􇞟\tyU𭽴𪯅\u001e󸅯\u0003\u0013\u001aa􁨘\u0008h5!𬱤5󱣃n􁿁xd𘟓X]𮁒ꗂ󰾖6\u00029n𧪙e1-䯘<u:+M󼱽V봃@hk\u0018_/⣡􆛘wJ􂣝𧯰9􇪤=𪌫𦜐𬵻㡺\u0005🌆󱜢\u0018 LF𣖿􌏑u𭻽D\u000f.uN[)󵋌Hc3B\u0014􊿖l㨷\u0016𢪆죫A\u000b)=􏈳\u0004􎀺63₱$\u0012󹷎~韘U𓆗❼^􍲁.F3a^𬯒𓌷󻲶d蓵v𢄼\n0p^\u001f#ꎧ$\u001d\\Z%7b𢕶uf",
-    "id": "00000010-0000-0058-0000-00560000003f"
-}
\ No newline at end of file
+    "id": "00000010-0000-0058-0000-00560000003f",
+    "password": "􊠺om𠓢ry􁴽B1\"\u0012`(Z\u0003k畛W\u0003O􏤴2􈺜\u0016X𗰛L\u0011\u000bt􋭀𘛌1}Q\u0001%oCv᳑]g㍅O0\u000f*K 􆅁󰑰\u0002몚bW𧷲䷉V`1v\u0017𫏾\u000b\t#[HT􌿑~v𢔸-'xVUw􈧶,yR\u000em𖥤M\u0019\u0007YD𪺋K󴅎\u0010&⏑\u0013𝌺=𨌠>􌩢\u000e4|􇺝K=ﰲlD؟>V􉄍oP􄕷A}A𣐥\u001c|􂕎s}}12씆􃣀h2\u0015\u0010\"&sc\u0007n\u0017m\u0003\n\u0015\u00009\u0006\u000fnOuk􆆞Pc󴁵\u0019\u000e{\u001d^-\u001eI{\u0006.pg竟}􇞟\tyU𭽴𪯅\u001e󸅯\u0003\u0013\u001aa􁨘\u0008h5!𬱤5󱣃n􁿁xd𘟓X]𮁒ꗂ󰾖6\u00029n𧪙e1-䯘<u:+M󼱽V봃@hk\u0018_/⣡􆛘wJ􂣝𧯰9􇪤=𪌫𦜐𬵻㡺\u0005🌆󱜢\u0018 LF𣖿􌏑u𭻽D\u000f.uN[)󵋌Hc3B\u0014􊿖l㨷\u0016𢪆죫A\u000b)=􏈳\u0004􎀺63₱$\u0012󹷎~韘U𓆗❼^􍲁.F3a^𬯒𓌷󻲶d蓵v𢄼\n0p^\u001f#ꎧ$\u001d\\Z%7b𢕶uf"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_16.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_16.json
index e6efed6008d..74095b12b70 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_16.json
@@ -1,4 +1,4 @@
 {
-    "password": "\u0017nU'2鼱镞)\u00119\u0015\u0013\u0012\u0005\u001d}98Ul㭼R\u0016\u0015\u001f2z\n󲳬eY\u0005^}` \u0006􈗂𪚈皉?􎫔_\u000bIjM󵙑uJ3嶶󲴟\u0010f𝐙a\u0000F,f𘄎𣞻b'󰃒H􍂪q󰙍益^A6⁨𩵂[?êC]Il\u0004d\rFC\u000c>溺􊕀>\u00172\u0008b▭\u0013\u0010D\u001d;BM\u0013􋗪`<􉣧\u001e󸫬\u0012𫺄\u0019s𨷔㔻?vn􍱫󶤌#\u0016=\u001f䁀:1-􎟓C\"𪤼JyPB'\u0015muu/󰈢\u0007󿺸9\u0007\u0004&󰈠*'8𠜀Cv=s\tP󶐥F\u000f􅾥y6𮩃󶍙󶎟ٱ𗚊𓃒􅟫󱖄􁟺&𗬵cB\nKh-􋚏🤫1Qҽ􈪦|\u001dpcv󴮾􀫘P𡾹VJ\u0012\u0016􈛚\u0011ᕙ穢𔖙~􍻡𝠦\"_􂞒LQ􊽓\u0016䱔1[\u0008󶬄v3\u000fI&\u001cn\u001f𥰓槎@=𐒅~\u0019(>m)󼥯󲷔\tcS󸰖󶔆FE\u001fc\u0011VPEa\u0006e􂿈􊣾oH\u0008\u0012n.􃖳:􌀮E;\u0000ჭ𤯽P{󲊞󼀜󵭻J>\u0018ꐰN􉛹𭅝d􊋘\u001cPqG\\𩙓\u0004󷓱􁻠!=/3\\𩤄Ot>hF 󶢳􊅛\u0015撶`\u001ew\u001at\u0016a󵚈",
-    "id": "0000007f-0000-0076-0000-005500000044"
-}
\ No newline at end of file
+    "id": "0000007f-0000-0076-0000-005500000044",
+    "password": "\u0017nU'2鼱镞)\u00119\u0015\u0013\u0012\u0005\u001d}98Ul㭼R\u0016\u0015\u001f2z\n󲳬eY\u0005^}` \u0006􈗂𪚈皉?􎫔_\u000bIjM󵙑uJ3嶶󲴟\u0010f𝐙a\u0000F,f𘄎𣞻b'󰃒H􍂪q󰙍益^A6⁨𩵂[?êC]Il\u0004d\rFC\u000c>溺􊕀>\u00172\u0008b▭\u0013\u0010D\u001d;BM\u0013􋗪`<􉣧\u001e󸫬\u0012𫺄\u0019s𨷔㔻?vn􍱫󶤌#\u0016=\u001f䁀:1-􎟓C\"𪤼JyPB'\u0015muu/󰈢\u0007󿺸9\u0007\u0004&󰈠*'8𠜀Cv=s\tP󶐥F\u000f􅾥y6𮩃󶍙󶎟ٱ𗚊𓃒􅟫󱖄􁟺&𗬵cB\nKh-􋚏🤫1Qҽ􈪦|\u001dpcv󴮾􀫘P𡾹VJ\u0012\u0016􈛚\u0011ᕙ穢𔖙~􍻡𝠦\"_􂞒LQ􊽓\u0016䱔1[\u0008󶬄v3\u000fI&\u001cn\u001f𥰓槎@=𐒅~\u0019(>m)󼥯󲷔\tcS󸰖󶔆FE\u001fc\u0011VPEa\u0006e􂿈􊣾oH\u0008\u0012n.􃖳:􌀮E;\u0000ჭ𤯽P{󲊞󼀜󵭻J>\u0018ꐰN􉛹𭅝d􊋘\u001cPqG\\𩙓\u0004󷓱􁻠!=/3\\𩤄Ot>hF 󶢳􊅛\u0015撶`\u001ew\u001at\u0016a󵚈"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_17.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_17.json
index 8380d59c57a..129047f51d3 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_17.json
@@ -1,4 +1,4 @@
 {
-    "password": "`\u0019𛱕󻵍B\u0010􃌌M'󵭸\u0004s\"󲴖AW󺌆󳀠􂉳ማ;|Ua󱘃\u0010\u0017]􁜮녒z\u0002DR󼠮h9-\u0011;\u001dyR)I.1XQ)js`n~󸓃\r1󱧨 $iJ\u001e\u0014묮󾝓{􂯜𠖇􈚙hI\u001a􋗬{𠖰8\u0010g\u001dc\u0000a{|4\u0006m\\%󻽁r\u0003h[(3k􇄽9</@ᮧ󿋀{\u001f䛜ୖ􁷇.B𥕚\u0011㏡\u0002涩y뱖'\nhUh󰚝+􇊫.\\wQ􉴛`\u0012T4sg>􏽦T𗧺5_-T\\_Ⱇ𫰸@\u0007壵x9𪒉M\u001aD𢜵a󼱴]ajO\u0013-m~󾪟\u001c]\n\u0018􍘄7\u0012k\u0008/m\u001f\u0019\u001e&󼧕\u001f-\u001f!E~k􅏤𠧹􎅜wL_By\u0014<#KDn𐼆:d'#)\u001c\u0019􆤒G-\u000b-𠈗\u001d\u0003\u001d𤞡𗢼bH^%5p󱴟𪚼_1;x\u0002\u0005H똋$ZD\u0017󲍧?G!\u0016eoY􊆤a\u000bb󾇻]󱯠\u0018\n􈡝𑇂,𫒏=\nDo\u0018|\u0006",
-    "id": "00000060-0000-004a-0000-001f00000040"
-}
\ No newline at end of file
+    "id": "00000060-0000-004a-0000-001f00000040",
+    "password": "`\u0019𛱕󻵍B\u0010􃌌M'󵭸\u0004s\"󲴖AW󺌆󳀠􂉳ማ;|Ua󱘃\u0010\u0017]􁜮녒z\u0002DR󼠮h9-\u0011;\u001dyR)I.1XQ)js`n~󸓃\r1󱧨 $iJ\u001e\u0014묮󾝓{􂯜𠖇􈚙hI\u001a􋗬{𠖰8\u0010g\u001dc\u0000a{|4\u0006m\\%󻽁r\u0003h[(3k􇄽9</@ᮧ󿋀{\u001f䛜ୖ􁷇.B𥕚\u0011㏡\u0002涩y뱖'\nhUh󰚝+􇊫.\\wQ􉴛`\u0012T4sg>􏽦T𗧺5_-T\\_Ⱇ𫰸@\u0007壵x9𪒉M\u001aD𢜵a󼱴]ajO\u0013-m~󾪟\u001c]\n\u0018􍘄7\u0012k\u0008/m\u001f\u0019\u001e&󼧕\u001f-\u001f!E~k􅏤𠧹􎅜wL_By\u0014<#KDn𐼆:d'#)\u001c\u0019􆤒G-\u000b-𠈗\u001d\u0003\u001d𤞡𗢼bH^%5p󱴟𪚼_1;x\u0002\u0005H똋$ZD\u0017󲍧?G!\u0016eoY􊆤a\u000bb󾇻]󱯠\u0018\n􈡝𑇂,𫒏=\nDo\u0018|\u0006"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_18.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_18.json
index f30c9e25a68..47101c62020 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_18.json
@@ -1,4 +1,4 @@
 {
-    "password": "\u0003\u000f\u000e#刂9F\u0014\u0011\u0008\u001e󽟏\u0015^\u0016>q􃽕r*~\u0018􇘡􊦘_q\u0014\ng ;H(j\u001b\u0008\u001f3*󱬂\u000e\u0000\u0014tez\u0002愱uGQGgh\u0015_j󸔮\u0018-󹆡NT%}v7\u0016YQw-@\u001b7qqVR*\u0010C􆱐[ InEyD5-\u0015W3B􊴪\u0005~􆟼\u0006T*􀹱♮J䙭󻈷@'w\t󽈗\\󵐮J𡑽>c􆞏q\u0004𢍱C󵚜齯A\u000e\u0001 b\t\r_􂟎1g'𪔒􀥇)d 󴲯􎞡PF\u0012k@魿#\u00052\r\n􍝎ή𦄔𫍘R]rIS󲡳姶󴻗q𫱂cR%|\u001fxI#p57 @\u0004R},7DL𠭐a\u00163􂊓\u0017w󿁲􂤆T𮥂V\u0015wq\u0019E6𩙓\u0016􎅋\u0002S~􇅾󽏼𧅒󴻢znW􃳾\u001d䃹u\u000e#\u000b5\u0013n8\u000b]AQ皖𩜶#x󴯒􌜅\t\u001c-a\u000ehxy舒9uAu# !𮔜v8}𗲗𩠎􃱜,<31=5e𐝀Cd𨟣s%(d{';􂍕\u001e岍􄝸󳶽:H^6#/?𦡖b𨫬#\\_󵮧|􃏠\u001fd\u001c#\u000cx哅a𠀎w\u000e\u0008-0v󲈌\u000f\u001e𐍯{l𭖬w^􅷴􅞊𣎻믳e􏽸rҒI\u0016=𭏀\u000e췹\\#8󽲠󳏵=\u0005䭏a\u0003\u000e~㑤\u0000\\%}\\9^c􉆈􌯞𠍭B_􋼟:􅕭{3Zh\u001f𪭤~?_𥰆\u0014-\u0019mX'􇿌𭤛F⮎𡊇;\u0013\u0000􊁉k1I􃫨\u000f\u001d󺒈𗤊~\u00163𧾅]𢊽\"䵠\u0019oJ\u0012󿮘\u0012Lgc𐕔<X#&\u0016\u0001<aﻛ􈫥A눣\u001c􇨄!",
-    "id": "00000025-0000-0042-0000-00710000002e"
-}
\ No newline at end of file
+    "id": "00000025-0000-0042-0000-00710000002e",
+    "password": "\u0003\u000f\u000e#刂9F\u0014\u0011\u0008\u001e󽟏\u0015^\u0016>q􃽕r*~\u0018􇘡􊦘_q\u0014\ng ;H(j\u001b\u0008\u001f3*󱬂\u000e\u0000\u0014tez\u0002愱uGQGgh\u0015_j󸔮\u0018-󹆡NT%}v7\u0016YQw-@\u001b7qqVR*\u0010C􆱐[ InEyD5-\u0015W3B􊴪\u0005~􆟼\u0006T*􀹱♮J䙭󻈷@'w\t󽈗\\󵐮J𡑽>c􆞏q\u0004𢍱C󵚜齯A\u000e\u0001 b\t\r_􂟎1g'𪔒􀥇)d 󴲯􎞡PF\u0012k@魿#\u00052\r\n􍝎ή𦄔𫍘R]rIS󲡳姶󴻗q𫱂cR%|\u001fxI#p57 @\u0004R},7DL𠭐a\u00163􂊓\u0017w󿁲􂤆T𮥂V\u0015wq\u0019E6𩙓\u0016􎅋\u0002S~􇅾󽏼𧅒󴻢znW􃳾\u001d䃹u\u000e#\u000b5\u0013n8\u000b]AQ皖𩜶#x󴯒􌜅\t\u001c-a\u000ehxy舒9uAu# !𮔜v8}𗲗𩠎􃱜,<31=5e𐝀Cd𨟣s%(d{';􂍕\u001e岍􄝸󳶽:H^6#/?𦡖b𨫬#\\_󵮧|􃏠\u001fd\u001c#\u000cx哅a𠀎w\u000e\u0008-0v󲈌\u000f\u001e𐍯{l𭖬w^􅷴􅞊𣎻믳e􏽸rҒI\u0016=𭏀\u000e췹\\#8󽲠󳏵=\u0005䭏a\u0003\u000e~㑤\u0000\\%}\\9^c􉆈􌯞𠍭B_􋼟:􅕭{3Zh\u001f𪭤~?_𥰆\u0014-\u0019mX'􇿌𭤛F⮎𡊇;\u0013\u0000􊁉k1I􃫨\u000f\u001d󺒈𗤊~\u00163𧾅]𢊽\"䵠\u0019oJ\u0012󿮘\u0012Lgc𐕔<X#&\u0016\u0001<aﻛ􈫥A눣\u001c􇨄!"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_19.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_19.json
index 0a92e739192..93ec5591e2a 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_19.json
@@ -1,4 +1,4 @@
 {
-    "password": "\u0001\u0008WG󰺠􌵈\u0019%+F2>NFl􃸮UG𡁇\r鐇𠡶-􆣤\u00080J󾰨\u0015i\n$\u0014ta\u0004>誵B𦢅`􌁊QQ\u0003T\u000c\u0007􊾒􈱇\u000eW\u0004󶌼𠸫e󲓕\u001d𦈴a􀀫|2󴀯>`b\r\u0005$2dGও\u001a96{y󲞓)S7G󺱢2Y?/\t\u0012k\u000f#+\u00044\u0017􌤩􈳱𣸶]􇖩aMVd\u0018\u0003١󼨘^=;ュ\u000c\t\u000e\u0005DFX\n󹇖!\u00120㊤懍[=z\u0002\u0005nY4\u0008LQyH\u0000𗇜o\u000f􃷲[Ro.\u00061\u0006\u0014G𭟜􋻏)T睏𣁘𞱷07Gg~~`#I󶍣R𡑆S.''0\t\n\u0008fq\"󱅣3UE󼌵|\u0012\u001e7\u0008|\u00051#\u0010P;-𢓘wKs\u0003px󳒳𮐗􄛵𦢟j阶dY󱗡trN+d\u0005n%`􀯔􎆚'#\u0006v\u0002<\u0016&x5\u0011\u0018\tg\u0016q𥩈\u0004󻷒𣣺*脁m\u0015JY􅉽n\u0017X\u001f\n􃾊k\u0007-􊽋󸓤\u0007K𝡘𬊨jjm/*J\u0006uHO7s􀬿D\"4ꅏQ\u001c􃥺,.Pi𦿎𫔔􌌈v/\u0003\"3(\u0014󻖁t:(:Mp\u001bb\\;Tyn#1\u0014횸!\u001d\u0012󲈎M煿􈧉A>E\n\u000e\u0014u𤆛U􌢎󺛥b󺴔jeCpD}@\u000eU䕔k\"s𬷇\\FNI1\u0005GH-t\u0018焵\u001b􄱫\r7<\u001biL󴿻\u001f\u000fL34mꐟBFV^$BjE,8o1M<V\u0008𥇣\u0003NN}`f^\u0001𬲌4!;4/T\u0014F]Iz󹯼󻹨󴅝␔𭇒:K+J 󽹛K1𪕜U􀍉e6\u0007🠪b:^wo쳮\u001fHꛁ幍𡷷\u0016\u001a\u0006<􍽰L\u001fi󼟜\u001d.\u001d\\\u00069[*;𐘽J趱Lx􀭣r󵿣t%w!gU󰸋󺯦󴏃\u000f*m\u0003_󴑨\t\"\u000eO~!X̸C|7MK\u000b\u0001H󺌦\u0012IW\u0019󰪾VWl𭚏N𩏘𤾽B􅅧5􋉴[󺿬g󾅙󱭧;j#1B䏫⣝󿆾􀢥HMb\nA􊏗Vၸ󵯿\u0003Hf𥫁A7\r\u000e}G\"K\\ez\u0006n󸰭n^sZ-wj䙡\u0006r+\u0005\u0005Rk<W􅺍􋺵{6\u0019 /h󴆈󱙂\u0016𩴿d\u000f􋭹\u0002\u0008𠩓uE\u0004>9w*D%Tꏬ\t2𦻡P\u0010\u0005\u0003+W\u0003{\u0008\u0018􌪪𦍉$鹾\u0018;𪰲tD\u0013􈦉颭\u001b\\-l\\9\u0016𝌕\u001e𖦲\u0018\n/\u000e盖\u0003󸻱/2\u0002𓏤z1􇾛頦c\u0008􍇘󾏕T􄭺KZ\u0016V𩱁@䓤媶󿁯󶸟<優JE\u0019`\u0000(XK𦆑\u0019Kv/k;\ru\u000e@VUEd]T\u0002!𘦞I􈵥\u0014&Z: 󹖡0\u0011}𑑃\u0001/d8\u0017𧷆I\u00109𤤗^=:䦽-\u0000\u0017W~n\u0010w\u0019s\u0018B\u0004\u0016nꐼBo㳾\u0014􊆪  1nER`b\u0019bM\u0014\u0008d,< [𧽸_\u000b룪􄰾󱐮8辁g􄽿\u0000B2\u000f4S>);𪼛y7쏲Wbw8C`_J􏾯􋌌._訤\u0016%􁿡𐠥󵇴󽇟f\u0003:𠨥L花R􋮮~T控\u001e󴴯}\u0011J}䜰`|",
-    "id": "00000000-0000-0062-0000-005b00000067"
-}
\ No newline at end of file
+    "id": "00000000-0000-0062-0000-005b00000067",
+    "password": "\u0001\u0008WG󰺠􌵈\u0019%+F2>NFl􃸮UG𡁇\r鐇𠡶-􆣤\u00080J󾰨\u0015i\n$\u0014ta\u0004>誵B𦢅`􌁊QQ\u0003T\u000c\u0007􊾒􈱇\u000eW\u0004󶌼𠸫e󲓕\u001d𦈴a􀀫|2󴀯>`b\r\u0005$2dGও\u001a96{y󲞓)S7G󺱢2Y?/\t\u0012k\u000f#+\u00044\u0017􌤩􈳱𣸶]􇖩aMVd\u0018\u0003١󼨘^=;ュ\u000c\t\u000e\u0005DFX\n󹇖!\u00120㊤懍[=z\u0002\u0005nY4\u0008LQyH\u0000𗇜o\u000f􃷲[Ro.\u00061\u0006\u0014G𭟜􋻏)T睏𣁘𞱷07Gg~~`#I󶍣R𡑆S.''0\t\n\u0008fq\"󱅣3UE󼌵|\u0012\u001e7\u0008|\u00051#\u0010P;-𢓘wKs\u0003px󳒳𮐗􄛵𦢟j阶dY󱗡trN+d\u0005n%`􀯔􎆚'#\u0006v\u0002<\u0016&x5\u0011\u0018\tg\u0016q𥩈\u0004󻷒𣣺*脁m\u0015JY􅉽n\u0017X\u001f\n􃾊k\u0007-􊽋󸓤\u0007K𝡘𬊨jjm/*J\u0006uHO7s􀬿D\"4ꅏQ\u001c􃥺,.Pi𦿎𫔔􌌈v/\u0003\"3(\u0014󻖁t:(:Mp\u001bb\\;Tyn#1\u0014횸!\u001d\u0012󲈎M煿􈧉A>E\n\u000e\u0014u𤆛U􌢎󺛥b󺴔jeCpD}@\u000eU䕔k\"s𬷇\\FNI1\u0005GH-t\u0018焵\u001b􄱫\r7<\u001biL󴿻\u001f\u000fL34mꐟBFV^$BjE,8o1M<V\u0008𥇣\u0003NN}`f^\u0001𬲌4!;4/T\u0014F]Iz󹯼󻹨󴅝␔𭇒:K+J 󽹛K1𪕜U􀍉e6\u0007🠪b:^wo쳮\u001fHꛁ幍𡷷\u0016\u001a\u0006<􍽰L\u001fi󼟜\u001d.\u001d\\\u00069[*;𐘽J趱Lx􀭣r󵿣t%w!gU󰸋󺯦󴏃\u000f*m\u0003_󴑨\t\"\u000eO~!X̸C|7MK\u000b\u0001H󺌦\u0012IW\u0019󰪾VWl𭚏N𩏘𤾽B􅅧5􋉴[󺿬g󾅙󱭧;j#1B䏫⣝󿆾􀢥HMb\nA􊏗Vၸ󵯿\u0003Hf𥫁A7\r\u000e}G\"K\\ez\u0006n󸰭n^sZ-wj䙡\u0006r+\u0005\u0005Rk<W􅺍􋺵{6\u0019 /h󴆈󱙂\u0016𩴿d\u000f􋭹\u0002\u0008𠩓uE\u0004>9w*D%Tꏬ\t2𦻡P\u0010\u0005\u0003+W\u0003{\u0008\u0018􌪪𦍉$鹾\u0018;𪰲tD\u0013􈦉颭\u001b\\-l\\9\u0016𝌕\u001e𖦲\u0018\n/\u000e盖\u0003󸻱/2\u0002𓏤z1􇾛頦c\u0008􍇘󾏕T􄭺KZ\u0016V𩱁@䓤媶󿁯󶸟<優JE\u0019`\u0000(XK𦆑\u0019Kv/k;\ru\u000e@VUEd]T\u0002!𘦞I􈵥\u0014&Z: 󹖡0\u0011}𑑃\u0001/d8\u0017𧷆I\u00109𤤗^=:䦽-\u0000\u0017W~n\u0010w\u0019s\u0018B\u0004\u0016nꐼBo㳾\u0014􊆪  1nER`b\u0019bM\u0014\u0008d,< [𧽸_\u000b룪􄰾󱐮8辁g􄽿\u0000B2\u000f4S>);𪼛y7쏲Wbw8C`_J􏾯􋌌._訤\u0016%􁿡𐠥󵇴󽇟f\u0003:𠨥L花R􋮮~T控\u001e󴴯}\u0011J}䜰`|"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_2.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_2.json
index 2c1197107f9..dcc045682d5 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_2.json
@@ -1,3 +1,3 @@
 {
     "id": "00000060-0000-0001-0000-00660000000a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_20.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_20.json
index e26d84bda69..25aa6b273b9 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_20.json
@@ -1,3 +1,3 @@
 {
     "id": "00000053-0000-0048-0000-001f0000007f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_3.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_3.json
index 9286ba2029e..5db93aba05e 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_3.json
@@ -1,4 +1,4 @@
 {
-    "password": "U\u0013<\u001c:􁱝\u000c\u0000󻤗咸x𭎓𪉘lw.W\\W\u0015\u000e\\Xk\u0004􎋇G􂉺&󸪲d荲w\u0011p9𤋨f󼖠\u0005-]𦕫\u0015𦑑𬠅𤀹Lm􃀒Epp[ꒆfq􋊣𪉆􏭖\u0016M\u0015,!S퐤\u001d􂘹\u00179\r􅏶\u0003? 􉙃:T{춡C󹯘⼜\u0003𨳳\u000cd'v󶩞N5􍖯\u001ae\u000cph7*\u001e󿂞/1Br\u0015_­𠚂K𑵤w<[𗱡v8󼺫wY){􋳒𦹓鑒􆸬󿇗𡗽\u0017< \u0006\u0014Bi𢀄G󴤗\u001c\"𢶖󹿦󶡣m􇣽󸪜􎱚5\u0015\u0005o0C[e;󳥅Xh𠤈あ1󾺭U(I5􅥝󱌖A𢰐V󴿶\u0002#\\Fn3󿵑\u0014\u0006\u00065#/oGCZ>2\";i_𡔈󰍗q\n\u0008we3ⓞ\u001br<󻢥SMx\u000b\r\u0005Yz{\u0014\u000b\u0015k\u0008􍿙􃛖𪰙@gF󸩍󽃿󷀔j|͟W⟍-\u001e􊷧N(\u0001󼍓v{\u000eI\u001bat*\u0019&􉕘ob빖\nI󼟿\t7N䐣\u001aG􏥘'􍮎a4􀑂K?󰘂\u00073k\u001c\u0004𬤛\u0008N:'$Z󽂵h􃐷\u0008􅝪􃾅FCd\u001cy쳏\u0005\u001c𬳀?W\u0010\u0018p7h=x\u0000ęU!𦚣𤄠\t􍏡<Jau3\u0000S\u0015󰋎@\u0016󵓸2=\u0014󱪥Z\u000b𓈚\u0010p𡠣\u001b􊱇u]baX8𨱎󼈑\u0014:U24:㌆",
-    "id": "0000001a-0000-003f-0000-003500000069"
-}
\ No newline at end of file
+    "id": "0000001a-0000-003f-0000-003500000069",
+    "password": "U\u0013<\u001c:􁱝\u000c\u0000󻤗咸x𭎓𪉘lw.W\\W\u0015\u000e\\Xk\u0004􎋇G􂉺&󸪲d荲w\u0011p9𤋨f󼖠\u0005-]𦕫\u0015𦑑𬠅𤀹Lm􃀒Epp[ꒆfq􋊣𪉆􏭖\u0016M\u0015,!S퐤\u001d􂘹\u00179\r􅏶\u0003? 􉙃:T{춡C󹯘⼜\u0003𨳳\u000cd'v󶩞N5􍖯\u001ae\u000cph7*\u001e󿂞/1Br\u0015_­𠚂K𑵤w<[𗱡v8󼺫wY){􋳒𦹓鑒􆸬󿇗𡗽\u0017< \u0006\u0014Bi𢀄G󴤗\u001c\"𢶖󹿦󶡣m􇣽󸪜􎱚5\u0015\u0005o0C[e;󳥅Xh𠤈あ1󾺭U(I5􅥝󱌖A𢰐V󴿶\u0002#\\Fn3󿵑\u0014\u0006\u00065#/oGCZ>2\";i_𡔈󰍗q\n\u0008we3ⓞ\u001br<󻢥SMx\u000b\r\u0005Yz{\u0014\u000b\u0015k\u0008􍿙􃛖𪰙@gF󸩍󽃿󷀔j|͟W⟍-\u001e􊷧N(\u0001󼍓v{\u000eI\u001bat*\u0019&􉕘ob빖\nI󼟿\t7N䐣\u001aG􏥘'􍮎a4􀑂K?󰘂\u00073k\u001c\u0004𬤛\u0008N:'$Z󽂵h􃐷\u0008􅝪􃾅FCd\u001cy쳏\u0005\u001c𬳀?W\u0010\u0018p7h=x\u0000ęU!𦚣𤄠\t􍏡<Jau3\u0000S\u0015󰋎@\u0016󵓸2=\u0014󱪥Z\u000b𓈚\u0010p𡠣\u001b􊱇u]baX8𨱎󼈑\u0014:U24:㌆"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_4.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_4.json
index ef683397581..e8899e61da7 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_4.json
@@ -1,4 +1,4 @@
 {
-    "password": "v^y􈈙􄹔]\u001fp7𗟄4|\u0011\u0019\u0015𣨗-Ds\u0016C𫍛\u0014Zl㻗\u0016uNካRteV7𓂤촳󺕁ޚ\u001a8\u001d|𮨃}^h+W\u0007O抐\t%\t$\u001bWyt𡍅,喧`9\u0003T\u0003X\\\u00120􉫔s𪺖e𦌱\u000cX\u0005\u0016%𣫚6󺏊y\u0006oY\u0016|g齴0􌉒o􊪛M\u0004e􃁄l󶹝􆟎POJL^󹧫󾃣T,\u000f8drM𣭣\r当􋤛|,f:腥w8HtB3bjk\u001b𐓪iGt\u0014B󲎄JD𥑳\u0018\u0017󰯆Q󾦻W𬙷􄾾EKF\u00021雔矲}𭅘L6U*􍈤Q􊊊\u001c\nn?61}\u001ag$g<W𢀑4𭤵\t[I𣜐\u001e𘒈Sw􉌌Ya\u001a\u0006S󼑶\u0013&\u001co-􍕕'Xe`y:m\u000b𘦈ꉝ\u0005\u000eU)D`\u000e𢉔\u0012'skw>",
-    "id": "00000014-0000-001e-0000-004f0000007d"
-}
\ No newline at end of file
+    "id": "00000014-0000-001e-0000-004f0000007d",
+    "password": "v^y􈈙􄹔]\u001fp7𗟄4|\u0011\u0019\u0015𣨗-Ds\u0016C𫍛\u0014Zl㻗\u0016uNካRteV7𓂤촳󺕁ޚ\u001a8\u001d|𮨃}^h+W\u0007O抐\t%\t$\u001bWyt𡍅,喧`9\u0003T\u0003X\\\u00120􉫔s𪺖e𦌱\u000cX\u0005\u0016%𣫚6󺏊y\u0006oY\u0016|g齴0􌉒o􊪛M\u0004e􃁄l󶹝􆟎POJL^󹧫󾃣T,\u000f8drM𣭣\r当􋤛|,f:腥w8HtB3bjk\u001b𐓪iGt\u0014B󲎄JD𥑳\u0018\u0017󰯆Q󾦻W𬙷􄾾EKF\u00021雔矲}𭅘L6U*􍈤Q􊊊\u001c\nn?61}\u001ag$g<W𢀑4𭤵\t[I𣜐\u001e𘒈Sw􉌌Ya\u001a\u0006S󼑶\u0013&\u001co-􍕕'Xe`y:m\u000b𘦈ꉝ\u0005\u000eU)D`\u000e𢉔\u0012'skw>"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_5.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_5.json
index 2534c943b2a..e828db05c6c 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_5.json
@@ -1,4 +1,4 @@
 {
-    "password": "K`I󻾺\u000b\u000b9CR\u000bCB가\n\u0017􇺋-𭉸A\u0013E{嶨􎥇竸>w>s𪥓6F\u0017Ej\u0012􏭚ᙄ埨􀮴\u0016븶~􌎈蒑\u0019]6~󾡉􇬃\u001aG󲗲@𣎙 \";%e\u001f\u0007󰴽𪛖\u0012)r}\u001ez\u0002u:8ߝ\u0017􎅓w􂴣🅖\u0016>\u001a\u001bfLC\t󾥥GO󸙓a\t㬛\u001f'6𑇲閨𬘀)𣉹󳓋Qv琗:$o🔀IN'4绺7忸\u0011\\\u0015\u000c>6􁤫\"6K\u00058䫔38\u0018\u0016J\u0014􄡯􂓧 E\u0014訙hk󵖫\u0003\u001bwꛄed@c󹥲\u0018o#ᢃ􂉂r𥔖Di􃕤󸲅d7䟪\u0010+%􋟇K𓍔Wh}*\u000c𦜟*V/*\u0017cl蛒󰷉䫙k4\u0011D\u0014핵𦼊􉰘T\u001f褺\u000c_]\u0005#\u0008\u001e𨑅𣉬~漂京s\n󽌵BIa3󳞐12h\nZ,~6􀯛N\u0019ເS8\u000b𞸓*Z𥟮WaYm𩝬S\u001bCO휄\"Nr􎤹q9+6􈞵\u000f\u0014x\u000f(<U\r+\u0005󹍐\\g\u000b\u0004\u000cY 3𐦒\u0019𫯔󼱙z.+`Wr$\u000f%k𬆹𝞃|\u000c$o^t7\tPWU\u001ea\u001b􍐏𥦶HXi5𦷽EY!\u001f𬭼󴿲𩽢\u001e4󹖅󶻸.🩸􎯿@査|'@􏍁u+R\u001e􋪩6O󿵊M겂[MF5􄛻W􆘺󿴻(\u0003(3\u0003󱪔\u0013_9h.J&\rKk5󴇣\u0007;J𣁱㥺\u0018C\u001d𣈘(4I󾥡E8􍶦[N𢅻Ξ󵸡#􊢔\u0004#\u0001쀭\u0001gcsa𑍌H\u001a5>&BJ\u0012󷸨􈘴Z\u000f􉍪+􂤚n'\u0005\u001c\u001aC\u001cK`F𣱗<)Rl\u001c\u0001с󱧱a󶍘N\u000eI\u001b`j^\u001e􉭜8lx\u0015\u001aZ\u0011됩1\u000e\u0013\u0012𡟴\u001bs\u001a􋛅􋭦瘔Mu󼿷􂰣󺔑Y\\b_􂡄j𦑺\n󲉤#𫌋BpC`􊎕\u0010\u001ah=2V󻳀I1^Vḹ\u001cw\u001eN\u0015,|?PE\nnS𐎗9􅘫w􍧇Mc{NbuQHTeA 2𢤐]㢘8\u0010~^\u000c>lA\u001d㰍_¥𡷝𥪷D𦩰J󸿥𤐊42􏡶%O\u001ek\u000b.\u0013v􅵸临y@)󱤉󰍟5\tﶩl:B\u0001<󷁨\u0016r'x󶺥8v\u001d\u0015\u000f憅vd{󶂝Z\t𢈼Evah{\\|V\u0000Wh􆣧\u001f)~$𬱊󲛻#\r􏩭ᓂ\u001f\u0010h􅼛쐎\n\u001f󰓁;Y\u001a\u001fc0*z|\u0008U-􃁉pgrepF\u0019+TMCL\u0014!w𤡗\u0011\"q4\u0011r􌟔A\u0000\u001b\u001e\tdP:C\u0011|m󹙢􀱌=\u0002𗧼iMkN/󹛂+x?\u00043N,𢚴7𨽭9\u000f29ch𒃿F,#`q.V&jF\u0012镎|􊗓qAFe􎯚]\u000b⅏𐪗\u0004^_?\u0005]\u0005|y.\u001c󰫖f𫯝\t􉖽\u001a[o7J꼖\u0014\u0007bTt󳮿\u0001\u001f􃊷\u0015vl{\u0004\u001a𫀄󶁹0p𭑭r0\u0008j􇏇~7mFE\"|l_0\u0018Ot􄆷2\t\"h[󻝦\u001e4k\u00023連󹯩;\n\u001cX\u0002[#󳋘\u0016F\u000c@􁿵-3먔􊬿~𧵂1\u0017t2Z4\u0012義>\u0004|/\u0018)\n?<x𭼄R\u0019\u0004<𘛊]gG\u001f􎜪􉱨Ae[/%𥈼)\u001f@)⠠󸲠VR󹚌\\􍐅Te𐊈\u0011Y\"j󺹝􃇔",
-    "id": "00000030-0000-007c-0000-003800000004"
-}
\ No newline at end of file
+    "id": "00000030-0000-007c-0000-003800000004",
+    "password": "K`I󻾺\u000b\u000b9CR\u000bCB가\n\u0017􇺋-𭉸A\u0013E{嶨􎥇竸>w>s𪥓6F\u0017Ej\u0012􏭚ᙄ埨􀮴\u0016븶~􌎈蒑\u0019]6~󾡉􇬃\u001aG󲗲@𣎙 \";%e\u001f\u0007󰴽𪛖\u0012)r}\u001ez\u0002u:8ߝ\u0017􎅓w􂴣🅖\u0016>\u001a\u001bfLC\t󾥥GO󸙓a\t㬛\u001f'6𑇲閨𬘀)𣉹󳓋Qv琗:$o🔀IN'4绺7忸\u0011\\\u0015\u000c>6􁤫\"6K\u00058䫔38\u0018\u0016J\u0014􄡯􂓧 E\u0014訙hk󵖫\u0003\u001bwꛄed@c󹥲\u0018o#ᢃ􂉂r𥔖Di􃕤󸲅d7䟪\u0010+%􋟇K𓍔Wh}*\u000c𦜟*V/*\u0017cl蛒󰷉䫙k4\u0011D\u0014핵𦼊􉰘T\u001f褺\u000c_]\u0005#\u0008\u001e𨑅𣉬~漂京s\n󽌵BIa3󳞐12h\nZ,~6􀯛N\u0019ເS8\u000b𞸓*Z𥟮WaYm𩝬S\u001bCO휄\"Nr􎤹q9+6􈞵\u000f\u0014x\u000f(<U\r+\u0005󹍐\\g\u000b\u0004\u000cY 3𐦒\u0019𫯔󼱙z.+`Wr$\u000f%k𬆹𝞃|\u000c$o^t7\tPWU\u001ea\u001b􍐏𥦶HXi5𦷽EY!\u001f𬭼󴿲𩽢\u001e4󹖅󶻸.🩸􎯿@査|'@􏍁u+R\u001e􋪩6O󿵊M겂[MF5􄛻W􆘺󿴻(\u0003(3\u0003󱪔\u0013_9h.J&\rKk5󴇣\u0007;J𣁱㥺\u0018C\u001d𣈘(4I󾥡E8􍶦[N𢅻Ξ󵸡#􊢔\u0004#\u0001쀭\u0001gcsa𑍌H\u001a5>&BJ\u0012󷸨􈘴Z\u000f􉍪+􂤚n'\u0005\u001c\u001aC\u001cK`F𣱗<)Rl\u001c\u0001с󱧱a󶍘N\u000eI\u001b`j^\u001e􉭜8lx\u0015\u001aZ\u0011됩1\u000e\u0013\u0012𡟴\u001bs\u001a􋛅􋭦瘔Mu󼿷􂰣󺔑Y\\b_􂡄j𦑺\n󲉤#𫌋BpC`􊎕\u0010\u001ah=2V󻳀I1^Vḹ\u001cw\u001eN\u0015,|?PE\nnS𐎗9􅘫w􍧇Mc{NbuQHTeA 2𢤐]㢘8\u0010~^\u000c>lA\u001d㰍_¥𡷝𥪷D𦩰J󸿥𤐊42􏡶%O\u001ek\u000b.\u0013v􅵸临y@)󱤉󰍟5\tﶩl:B\u0001<󷁨\u0016r'x󶺥8v\u001d\u0015\u000f憅vd{󶂝Z\t𢈼Evah{\\|V\u0000Wh􆣧\u001f)~$𬱊󲛻#\r􏩭ᓂ\u001f\u0010h􅼛쐎\n\u001f󰓁;Y\u001a\u001fc0*z|\u0008U-􃁉pgrepF\u0019+TMCL\u0014!w𤡗\u0011\"q4\u0011r􌟔A\u0000\u001b\u001e\tdP:C\u0011|m󹙢􀱌=\u0002𗧼iMkN/󹛂+x?\u00043N,𢚴7𨽭9\u000f29ch𒃿F,#`q.V&jF\u0012镎|􊗓qAFe􎯚]\u000b⅏𐪗\u0004^_?\u0005]\u0005|y.\u001c󰫖f𫯝\t􉖽\u001a[o7J꼖\u0014\u0007bTt󳮿\u0001\u001f􃊷\u0015vl{\u0004\u001a𫀄󶁹0p𭑭r0\u0008j􇏇~7mFE\"|l_0\u0018Ot􄆷2\t\"h[󻝦\u001e4k\u00023連󹯩;\n\u001cX\u0002[#󳋘\u0016F\u000c@􁿵-3먔􊬿~𧵂1\u0017t2Z4\u0012義>\u0004|/\u0018)\n?<x𭼄R\u0019\u0004<𘛊]gG\u001f􎜪􉱨Ae[/%𥈼)\u001f@)⠠󸲠VR󹚌\\􍐅Te𐊈\u0011Y\"j󺹝􃇔"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_6.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_6.json
index eb697aec933..18048225804 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_6.json
@@ -1,4 +1,4 @@
 {
-    "password": ")󰓏偷\u0016s>g>󰛍\u0002B|S\u001c\u0004\u00081N7k\"jg3A/\u0005`|-t\u000c􌇱ZCb锓𗻜􌦲@pN\u0004{\u0016pz\u0002AmAn\u0018x􋒀\u000f\u0019󰠀{JA𦂾𢒡k󶫋o􄝯𣸬ᄳ𣫸󰨝\u0003\u0011w-%\u001f5wg;/󷽅\u001e#dZFHtV+\t9􏣄\u001b꜃C\\e𗥠f\u000bs\u0000𣝬𩚝o󵖿𐰂#*,󿾢\u0005e;먯\u0013\t_𩊎'\u0008<0焃+􂁵􆳄\t􉀴󿧛i*%k\\3m󴄾$b􆡕b\u001f\u0008Hikq𔙄\"+S\u001f%𧸱\u001ac\u001d\u0000.\u0013􌨛\u0003wấEeF/W𭽝\u000b󳪜8꘠(i삂 \u0010L󰌍󾥛] -\u0015\u0005􆗽UK􊻗f\tu_?3\u0006\u000bl􄛜n%𩏠IW𝄿3\u0007e󱖴jZ桪yU1]9\n3%M\\𥏩\u001c󰃦)P(콗\u001f\"󶺃𩻷>󰙘\u000bkJS\u000ev\u0000􅖬󴣞󰏩\u000e\u0011,)\u0013O0!VIJꐨfxRa귨6C5󸋠l䠓|\u0006􀔎\u000f\u0005`\u0008D炯&\u0019󽈀t\u001f?}\u0014𡧞,𧟓쟽UM{j󵠐\u0001Z3𦚛0v\u0011 =s<󶴂b𢤂-V􂁿7𫪢N𧋝,􊛁􀐛\u000e>0dV;Yg倖\u000f_\\JVY1􍬒/|󾺃+9w<O{˝Rn􁸸HrD#󾃿z\u0002뵬J5𠥋M\u0019\u000f\u0013󴽩\u001f樳xX|+𘖕Z?P\u0019\"z\u0010\u001d𢤯E\u0002xK\u001a쏾Ep𣐪\u001c\u0016?L岭\u0015\u00088蘸􋙴󳙱\u0017gW⨞\u0006\u0007C;e􌌀왷8􊉏\u0016UO@∤'荹gg𫬆n󺎕\u0004\u0015\tz8\u001aU\u001d3\u0012,4()y𭯍u\u001f5-\u0002@\\􀴖d5[qq5T\u0000Ivr􃜍\u0018􍲮KOY󳢗􆧵\u001b\u000c)\u001bG_(dT\"𡈯)\u001c\u0018;壂\u001e5\u0007+X\u0002􄵬\u001d󶧠oW󽯘#W𐔓𪜢춿SFK\taUյ\u0011v.󰗎1燶𬘅Q𘘥ba\n*󱛕DNPk􇐩\u000f\u0011N5뭝P󾡚(\"A[^R\u0018~'󰁅h7\u001d󾌻\u00014YUHy󲃑Zq􈢰\u001do7]\u001eQ𡫳󷁫;A*\"z/󰀾,c'\u001bYୋ􀀨|2bO􃳹s\u000e􏙎\u001e6x\u0008󴗋yL\u0012M󹍄,t𧠴xdB\u001f^7l4󾚙};\u0015󠆌\u000ep?\u000f]g􉿡\u0019k}@@d?\u0006\u000f)j\u001bAk㪍􁧽_{PE먟>r\u001a*!EV\"7fuL\u0006f𖼰􀙦:4u\t?\u001f\u0007'dh/\u0002)L",
-    "id": "00000080-0000-0040-0000-003400000011"
-}
\ No newline at end of file
+    "id": "00000080-0000-0040-0000-003400000011",
+    "password": ")󰓏偷\u0016s>g>󰛍\u0002B|S\u001c\u0004\u00081N7k\"jg3A/\u0005`|-t\u000c􌇱ZCb锓𗻜􌦲@pN\u0004{\u0016pz\u0002AmAn\u0018x􋒀\u000f\u0019󰠀{JA𦂾𢒡k󶫋o􄝯𣸬ᄳ𣫸󰨝\u0003\u0011w-%\u001f5wg;/󷽅\u001e#dZFHtV+\t9􏣄\u001b꜃C\\e𗥠f\u000bs\u0000𣝬𩚝o󵖿𐰂#*,󿾢\u0005e;먯\u0013\t_𩊎'\u0008<0焃+􂁵􆳄\t􉀴󿧛i*%k\\3m󴄾$b􆡕b\u001f\u0008Hikq𔙄\"+S\u001f%𧸱\u001ac\u001d\u0000.\u0013􌨛\u0003wấEeF/W𭽝\u000b󳪜8꘠(i삂 \u0010L󰌍󾥛] -\u0015\u0005􆗽UK􊻗f\tu_?3\u0006\u000bl􄛜n%𩏠IW𝄿3\u0007e󱖴jZ桪yU1]9\n3%M\\𥏩\u001c󰃦)P(콗\u001f\"󶺃𩻷>󰙘\u000bkJS\u000ev\u0000􅖬󴣞󰏩\u000e\u0011,)\u0013O0!VIJꐨfxRa귨6C5󸋠l䠓|\u0006􀔎\u000f\u0005`\u0008D炯&\u0019󽈀t\u001f?}\u0014𡧞,𧟓쟽UM{j󵠐\u0001Z3𦚛0v\u0011 =s<󶴂b𢤂-V􂁿7𫪢N𧋝,􊛁􀐛\u000e>0dV;Yg倖\u000f_\\JVY1􍬒/|󾺃+9w<O{˝Rn􁸸HrD#󾃿z\u0002뵬J5𠥋M\u0019\u000f\u0013󴽩\u001f樳xX|+𘖕Z?P\u0019\"z\u0010\u001d𢤯E\u0002xK\u001a쏾Ep𣐪\u001c\u0016?L岭\u0015\u00088蘸􋙴󳙱\u0017gW⨞\u0006\u0007C;e􌌀왷8􊉏\u0016UO@∤'荹gg𫬆n󺎕\u0004\u0015\tz8\u001aU\u001d3\u0012,4()y𭯍u\u001f5-\u0002@\\􀴖d5[qq5T\u0000Ivr􃜍\u0018􍲮KOY󳢗􆧵\u001b\u000c)\u001bG_(dT\"𡈯)\u001c\u0018;壂\u001e5\u0007+X\u0002􄵬\u001d󶧠oW󽯘#W𐔓𪜢춿SFK\taUյ\u0011v.󰗎1燶𬘅Q𘘥ba\n*󱛕DNPk􇐩\u000f\u0011N5뭝P󾡚(\"A[^R\u0018~'󰁅h7\u001d󾌻\u00014YUHy󲃑Zq􈢰\u001do7]\u001eQ𡫳󷁫;A*\"z/󰀾,c'\u001bYୋ􀀨|2bO􃳹s\u000e􏙎\u001e6x\u0008󴗋yL\u0012M󹍄,t𧠴xdB\u001f^7l4󾚙};\u0015󠆌\u000ep?\u000f]g􉿡\u0019k}@@d?\u0006\u000f)j\u001bAk㪍􁧽_{PE먟>r\u001a*!EV\"7fuL\u0006f𖼰􀙦:4u\t?\u001f\u0007'dh/\u0002)L"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_7.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_7.json
index 83a7f620351..b0e59d6420f 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_7.json
@@ -1,4 +1,4 @@
 {
-    "password": "5􊵅o両\u00068U􋢸6f󼥾\u0019@𮎵M'M󵿬𗖥𩹏#H?󲱄D6Md\u001c\u0011%󶲹\u0007\u0014;Y%Hb\u000e-\u000ft\u001b\u0016IX06\r+7Lq=l𗠗M1_?\u000e󴮠\u00015􊈑J􈸆\u0003CS𮝻􋠲z,2\u0004B\u0005,\u001e\u000eEAS_\u000eOs\n0:n쪯.8滟]\\",
-    "id": "00000023-0000-001a-0000-001900000007"
-}
\ No newline at end of file
+    "id": "00000023-0000-001a-0000-001900000007",
+    "password": "5􊵅o両\u00068U􋢸6f󼥾\u0019@𮎵M'M󵿬𗖥𩹏#H?󲱄D6Md\u001c\u0011%󶲹\u0007\u0014;Y%Hb\u000e-\u000ft\u001b\u0016IX06\r+7Lq=l𗠗M1_?\u000e󴮠\u00015􊈑J􈸆\u0003CS𮝻􋠲z,2\u0004B\u0005,\u001e\u000eEAS_\u000eOs\n0:n쪯.8滟]\\"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_8.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_8.json
index 355fa04af0a..ea07de30d71 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_8.json
@@ -1,4 +1,4 @@
 {
-    "password": "w\u00070|bL󾏍>pq㟾a6f쓑cE~\u0006\u0013]u^竘󲓠VE𦁺pCtGC\u001ce'󴊱⇩\u000e\u0000鞴󿜼C$ck􏵃q7\u001e#IK\u0007ݮ􄴋:󽌡Y,\u0010󶩤\u0000\u000e\u000f0U7𧭮\u000e\u0010>c+;r\u0010󷃏]^\n𦄟7cmhg?􁳷f󼙪M03,3#N7F\u001dEC3O9A. \u0018K\u0014k@􌲻!/oKv諨j\u0008寙<2V)轢6𮦄󺓎{u,\u0015>𣜋u㽝%􌛇odLyX􉑀zގ\"\u0013ꠉ𦙣^sjT𫇇R􎺢e8C 1z\u0014\u0007\u001b$`\\5\u0010 K.@𢟾$Vki苚J󲡹\u0002T𦞘iy\u001aF3,\u001f?󼃜,\u0000괊<7𠄢󵾌xY&]}6􌰿NsX8/\u0012m! \u0017\u0003⚁:@>󴣧>-Qc~\u001f\u0010\u001d4+U\u0019􍳄𥢹a󽥦n𤒿\u000e\tU#S\u0004놧𢝅A\u001c:子GCK\u0006e磊|,\u0006􎑨K\u0003UkS",
-    "id": "0000005b-0000-002c-0000-006f00000060"
-}
\ No newline at end of file
+    "id": "0000005b-0000-002c-0000-006f00000060",
+    "password": "w\u00070|bL󾏍>pq㟾a6f쓑cE~\u0006\u0013]u^竘󲓠VE𦁺pCtGC\u001ce'󴊱⇩\u000e\u0000鞴󿜼C$ck􏵃q7\u001e#IK\u0007ݮ􄴋:󽌡Y,\u0010󶩤\u0000\u000e\u000f0U7𧭮\u000e\u0010>c+;r\u0010󷃏]^\n𦄟7cmhg?􁳷f󼙪M03,3#N7F\u001dEC3O9A. \u0018K\u0014k@􌲻!/oKv諨j\u0008寙<2V)轢6𮦄󺓎{u,\u0015>𣜋u㽝%􌛇odLyX􉑀zގ\"\u0013ꠉ𦙣^sjT𫇇R􎺢e8C 1z\u0014\u0007\u001b$`\\5\u0010 K.@𢟾$Vki苚J󲡹\u0002T𦞘iy\u001aF3,\u001f?󼃜,\u0000괊<7𠄢󵾌xY&]}6􌰿NsX8/\u0012m! \u0017\u0003⚁:@>󴣧>-Qc~\u001f\u0010\u001d4+U\u0019􍳄𥢹a󽥦n𤒿\u000e\tU#S\u0004놧𢝅A\u001c:子GCK\u0006e磊|,\u0006􎑨K\u0003UkS"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_9.json b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_9.json
index 63cb30cc3e0..91162da002d 100644
--- a/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_NewProviderResponse_provider_9.json
@@ -1,4 +1,4 @@
 {
-    "password": "󸜗-𩦱I􆋘􇠃:H7𒀩1󶸏P􏚤𮮙\u0010\u001fc𣽥ERN0/󵹶-$Jo|􏶛a*d\u001d럦+􏤎􊉟1*9j􂹖A􋽗\u0015􆛡\u001aMy\u0012cD9󹮨􃪃\u0014^Jjw\u0015vA\u0003\u0000%􅆼\u0015v\u0015u𣀽󼐕/|7\u0005𫃸󽭟􊑿Vm)ˬ*\u0011󽚩-C􋪕x\u0015\u000b\u0002 9?󺶞Hxbh恇2O\u001cRwLw\u001c𢐄\"L𮈙+`䄢㧬+\u0011\u0017b+\u000b󹃏X?􄾦􎫫𨒨\u0006\u001f;f桒j\u0003\u0016泆!;~\\q-􌺻C>\r㋻)\u0004\u0010\u0017VH*󹮝>)=\u0007\u0000p𭯿?_3yA󴋂}Uj8)\u001e\u000f𮡓󴗿\u0018t5 bBI\u00140gs􇪾0,+𫃳\u0000^e`1\u00013\"C`n\u001f󱔈sM􄻦𬙊\u0004i)<`Q3踚|󽇗\u0000,z1𗒢8u\u0008鈔p3鲼ty󱈼屾𦥹􆿉F𬬣s\u0016dnr\u0019~󻭝;𪿹\u0010-\u001f􁽸邴\u0004S)1d\u0011s􇾒=\u0005𢁷댤\\qQ󺓥􃧸󶸩id0􋬢^/\u000e􀉃\u0004\u0002z\u0015Q󲋝}m󼋉u_\u001a#錎'|+fW𢸦2db\u0016􂬎\u0016K\u00075x?𪲎𢛲搥쐑8q鰆j,(𨜺W|,\u0001\u000c`􊥇\u001e􇿾``i;1R􂍆􆧄OkM \u0017<\u0002\u0005􁣧Y1\u000cPPLa+\u0013e*\u001eP\u00197s𐒥P􋘟O𤒓}}󼚿\u001f\u0014e󱎪6󲥄㬍𢣿\u000eT\u000c􄐰&VWrL󷦁vW\u0006W󾶕'4􆒷\u000c8f$󾺝􄇾􅽽?\u0003<\u0014'2VX\u000c󻴝i\u0016A^<4uZvD$RRuz@\u001db/\u0010`Z뺝t'\u000e\u0014K􋘆\u000f􌷓\r}󲬖𣝉\u0002\"\u0017-􄟢?x𪠰TF\u0018\\f𓍄ἲK>'\u0018?5_b",
-    "id": "0000002f-0000-0043-0000-00590000002f"
-}
\ No newline at end of file
+    "id": "0000002f-0000-0043-0000-00590000002f",
+    "password": "󸜗-𩦱I􆋘􇠃:H7𒀩1󶸏P􏚤𮮙\u0010\u001fc𣽥ERN0/󵹶-$Jo|􏶛a*d\u001d럦+􏤎􊉟1*9j􂹖A􋽗\u0015􆛡\u001aMy\u0012cD9󹮨􃪃\u0014^Jjw\u0015vA\u0003\u0000%􅆼\u0015v\u0015u𣀽󼐕/|7\u0005𫃸󽭟􊑿Vm)ˬ*\u0011󽚩-C􋪕x\u0015\u000b\u0002 9?󺶞Hxbh恇2O\u001cRwLw\u001c𢐄\"L𮈙+`䄢㧬+\u0011\u0017b+\u000b󹃏X?􄾦􎫫𨒨\u0006\u001f;f桒j\u0003\u0016泆!;~\\q-􌺻C>\r㋻)\u0004\u0010\u0017VH*󹮝>)=\u0007\u0000p𭯿?_3yA󴋂}Uj8)\u001e\u000f𮡓󴗿\u0018t5 bBI\u00140gs􇪾0,+𫃳\u0000^e`1\u00013\"C`n\u001f󱔈sM􄻦𬙊\u0004i)<`Q3踚|󽇗\u0000,z1𗒢8u\u0008鈔p3鲼ty󱈼屾𦥹􆿉F𬬣s\u0016dnr\u0019~󻭝;𪿹\u0010-\u001f􁽸邴\u0004S)1d\u0011s􇾒=\u0005𢁷댤\\qQ󺓥􃧸󶸩id0􋬢^/\u000e􀉃\u0004\u0002z\u0015Q󲋝}m󼋉u_\u001a#錎'|+fW𢸦2db\u0016􂬎\u0016K\u00075x?𪲎𢛲搥쐑8q鰆j,(𨜺W|,\u0001\u000c`􊥇\u001e􇿾``i;1R􂍆􆧄OkM \u0017<\u0002\u0005􁣧Y1\u000cPPLa+\u0013e*\u001eP\u00197s𐒥P􋘟O𤒓}}󼚿\u001f\u0014e󱎪6󲥄㬍𢣿\u000eT\u000c􄐰&VWrL󷦁vW\u0006W󾶕'4􆒷\u000c8f$󾺝􄇾􅽽?\u0003<\u0014'2VX\u000c󻴝i\u0016A^<4uZvD$RRuz@\u001db/\u0010`Z뺝t'\u000e\u0014K􋘆\u000f􌷓\r}󲬖𣝉\u0002\"\u0017-􄟢?x𪠰TF\u0018\\f𓍄ἲK>'\u0018?5_b"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_1.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_1.json
index 57edee2ca31..fdd2f022571 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_1.json
@@ -1,7 +1,7 @@
 {
+    "description": "eX\u001f\u0008󲾗Ok?🢘\u0006Y\"𣔒\u0010W궙\u000f\u0018!u\\𗬿\u0019.J󲚗Z#A2dEH\n/)󲲹P8\u0001E􃥜􅰦3q虌_🚗e\u001c𦧬\\|7H􁴷됈􂢘󾬷eY􎍻&b豽5\u0017𐰵~Z\u0010􉻘Rkli🞶b\u0001ᯫE\u000cNh𡷦3fFi\t \u001dwdꛄHuDSl-󴊹e4:S,p-\u00034L.$1\u0013\u0017󸔊r􃇢hEr삄yJ#\u0010W\u0018ZY\u0000\u0002$b𡄤\u001c㳯Y?𪄗􍆳\u001d󹃊𠯦𗧒\u0016l􋯻i&k켭CB𫌔ꯗ\n-l姯𩬖Q/\u0001tt𨋝􌽺A􌆋\u001e󽷲j\u0015e􄯫𔗼􎇝\u0015EN楓\u001eǿ﹆\u0017_f𥭦􃒸𐍓{.w󲂢K𫪪<\u0008V\u000fpR/􄚉월\u0004ౌ􈒆A7I􎶔$\\\u0017k\u001c𔐥U󷑖W@8Fċn\u0014R\u0007\u001c𨁱\u001c>\u001c\n\u0002􇹨nI 􁞖V󺪋\u001e𐘏O'`@H띱 m3𤔌+^s\u001fm󵸥葨M𥇪脪\u0002\u001ccP󰸮\u0010𡞰>􀯷F-@V󰠆􊄪\u001b1\u0005w-\u001a,􌣺\u0006􉰡𓅀󵏲Jrl\u0002VX3-􄂗𬜃X4a􏷘V\u001a?=􁋀|𪙜loc\u0001V\u0002n?􂾊)U󴵸􈓴>탔v󴒝8v?⬜l)\u000f\u00073󷓀O𪣭𦪾𣴀U􄹍Dm\u0002.V𭑶𡥷LJ0裒\u001b󾯛\u0007F_􊗰􊾠󾴇0􁛍𦊃𠍞\u0018:OK  !jPv\u0008_$s\u001fSC;\u0006\u0000i퀥\u001c􄖬Ze\u0003󰡗LI^1#𑀳\u0012s\u0016.|a\"􊳀{BD\u0015|󼽗l_􍞄󺄙󸾬\u0018\".󹏪D0\\\u0016.ZR\u0001竉\u0004􌥟+𠤥'B􄚜&7LM🢒𣳮\u001b󶎑\u000e6`>\u001c}C~UE𤄡~A8\u0004B􈜏\u0014b\u001c7=\n'𦿣m^z𐢃8[󽛌20\u0019 󱄺󸙁'\u001eu[\\DI\tz󲒆z\u0017Fz󹑩>)領\u0000O\u0001{\u000e󵬔hh􁬀爌b\u0011밲􄂋𨬶68􆚘&u瘫󽩝\u000c&W𣝕P𦳷Z^%{;\\$jh􃇈\r\rll\u0014jI)\u001c\u001a\\󳘻t꼔\u001d𒐲0\u001f0f\u00130Nmzs\u0018\u000c\u001b`\u0010𧯺𧔮^t\u0012r𬺵.f':􎾮l䑤w𩵒󹦯9㛚5􏁴\u001b󾍕@𗎈aU.􃗹\u000b]郻s𨖏Q\u0014􆬛ᑩ𠴟㫿\u001c6\u0018􃷤Q\n𡧂󷷛􎤪if\u0004\u001cT󷔬鵀k\u0006衦\u001a\u001ab5<D⢟*y\"\u000c\t𪅜𗫬\u0011y󸱢;Mq!ﳜ󺸳ऐ韷x􆳍\u0002>H4~󼴡V𩺒]-󿣢\u0014\u0012`zh􊠎\u0012~􌩰L\u0012h\u0015\u0018𧎽fJ~󴅹^\u001e𢜹{]ms𗟼de{\u0002祫N􇹮H𫶐OP]󹶁𤚷\u0017z󰫈\u0007𨂘4𠏍󰻹\u0017\u001d\"P\u0005𦒍뷕L~Oj\"R50G춂􆾡lhcU􊥔\u001d9𪪵\t{as𣉾\"𐛪v.\u0017\u0001SCD/\u001c\u0013𩐨l􉖹𓈔^𬶮􋅲\u001eo𥏝𡇗$銚T^\u0019\u001d&\u0005Tsl_un󷌗󸧱\u001dMy:pXᜄn<LQ!}:𨷖\u0000V\u0016􍯿󶺳u3o=4(KnN5󴦧*9\u0004󲭊뙀y'[\u0017I\u0012􉓂SAik&~c殀\u001a\u000cO\u0015􂃁tf\u0013",
     "email": "Y@􎸢>\u000f_\u001a0",
-    "url": "https://example.com",
     "name": "󸟵8􌈸:(\u0010󴏏f󵛰\u0007㋗􇷰4KꟄL",
     "password": "u\u000b6\u0006\u0002\u000c\u001e􃲳\u0016\u0001\u0012|2q⤶󺟂f􃤂J\u0003Mo𬞡 D􉌕|-󲣺e|yfd\u0004\u0013\u0006󺮬t\u000e謱\u001a.SftU󰧸\u0000\u0011<􆍤\u0002'\u0008󳬭\u000eU卒\u001aᠨ|blDM0K8𧖸w\u001e=z\u0015[<\u0003\u0011\u0019𪊆􆋘􊼞\"1x*\u0019𑗔𝟃qo󲟢\u0000o􆍒\u0012On69@󰱛\u0015Zꜵ^y\u001en󻯚󼌤`U󳎎o\u000eE3f\u000eM􋉒C*Q=O𭇁\u0014𠫁/o|\r=z(􀱚\u0010\u0011^6셮?C778D􀷸<~+9𘟵hm𧝪f\\\u0001>B@`*J(\r\ry𡼬\u0011⟴i\u0018-S}􍍓\\𒒟Bh􍭍lY\u0005k>`)\u0019𪐖gZ4􃳌\u001eIAJ􁛰WgoA>텶󱅡󾢬Sw􏲏Ṗ8if\\X=\u001f?d(\u000ft꿁摷\u0014KR􉿽󰙊G\u0015C5\u0000􇆦c[7-kp'𦺝\u000e󽎜ꈗF󼍥e'=\u0004\u0007\u0013Z:q\u0008w7󾸡𠋋{]󻳴Ah|!$\u0007uzh\u0010o􅼹\u000e󹝤𥘼G󹵌\u0010剒1p6\u000eUX\u000eၶkY5(\u001cV𭺮\u0013\u0015􅠾󵷯.JJQg,%c'aq\t5f󷍿驹𥰄\u000c.\u001b{\r󿣰>'O롢\u0011\u0003$R\u0003)󳣀$𪕚Hj7}F\u001c%􏀁􈞩󳲘4𗎶\u000e\u0007𫼛Av󱗥\\\u0002Wq9\u0016W\u0003󲋝C%\u0008\u000b\u0016鍮AzG'4Dj𧙎|+S\u000b\u00029|0$tLe>ol\u0014\u0019􉨃\rmBK橺􆽓bX𮀨Pw+\u001a|e碢B󾉾6v\u001e􆏺\\",
-    "description": "eX\u001f\u0008󲾗Ok?🢘\u0006Y\"𣔒\u0010W궙\u000f\u0018!u\\𗬿\u0019.J󲚗Z#A2dEH\n/)󲲹P8\u0001E􃥜􅰦3q虌_🚗e\u001c𦧬\\|7H􁴷됈􂢘󾬷eY􎍻&b豽5\u0017𐰵~Z\u0010􉻘Rkli🞶b\u0001ᯫE\u000cNh𡷦3fFi\t \u001dwdꛄHuDSl-󴊹e4:S,p-\u00034L.$1\u0013\u0017󸔊r􃇢hEr삄yJ#\u0010W\u0018ZY\u0000\u0002$b𡄤\u001c㳯Y?𪄗􍆳\u001d󹃊𠯦𗧒\u0016l􋯻i&k켭CB𫌔ꯗ\n-l姯𩬖Q/\u0001tt𨋝􌽺A􌆋\u001e󽷲j\u0015e􄯫𔗼􎇝\u0015EN楓\u001eǿ﹆\u0017_f𥭦􃒸𐍓{.w󲂢K𫪪<\u0008V\u000fpR/􄚉월\u0004ౌ􈒆A7I􎶔$\\\u0017k\u001c𔐥U󷑖W@8Fċn\u0014R\u0007\u001c𨁱\u001c>\u001c\n\u0002􇹨nI 􁞖V󺪋\u001e𐘏O'`@H띱 m3𤔌+^s\u001fm󵸥葨M𥇪脪\u0002\u001ccP󰸮\u0010𡞰>􀯷F-@V󰠆􊄪\u001b1\u0005w-\u001a,􌣺\u0006􉰡𓅀󵏲Jrl\u0002VX3-􄂗𬜃X4a􏷘V\u001a?=􁋀|𪙜loc\u0001V\u0002n?􂾊)U󴵸􈓴>탔v󴒝8v?⬜l)\u000f\u00073󷓀O𪣭𦪾𣴀U􄹍Dm\u0002.V𭑶𡥷LJ0裒\u001b󾯛\u0007F_􊗰􊾠󾴇0􁛍𦊃𠍞\u0018:OK  !jPv\u0008_$s\u001fSC;\u0006\u0000i퀥\u001c􄖬Ze\u0003󰡗LI^1#𑀳\u0012s\u0016.|a\"􊳀{BD\u0015|󼽗l_􍞄󺄙󸾬\u0018\".󹏪D0\\\u0016.ZR\u0001竉\u0004􌥟+𠤥'B􄚜&7LM🢒𣳮\u001b󶎑\u000e6`>\u001c}C~UE𤄡~A8\u0004B􈜏\u0014b\u001c7=\n'𦿣m^z𐢃8[󽛌20\u0019 󱄺󸙁'\u001eu[\\DI\tz󲒆z\u0017Fz󹑩>)領\u0000O\u0001{\u000e󵬔hh􁬀爌b\u0011밲􄂋𨬶68􆚘&u瘫󽩝\u000c&W𣝕P𦳷Z^%{;\\$jh􃇈\r\rll\u0014jI)\u001c\u001a\\󳘻t꼔\u001d𒐲0\u001f0f\u00130Nmzs\u0018\u000c\u001b`\u0010𧯺𧔮^t\u0012r𬺵.f':􎾮l䑤w𩵒󹦯9㛚5􏁴\u001b󾍕@𗎈aU.􃗹\u000b]郻s𨖏Q\u0014􆬛ᑩ𠴟㫿\u001c6\u0018􃷤Q\n𡧂󷷛􎤪if\u0004\u001cT󷔬鵀k\u0006衦\u001a\u001ab5<D⢟*y\"\u000c\t𪅜𗫬\u0011y󸱢;Mq!ﳜ󺸳ऐ韷x􆳍\u0002>H4~󼴡V𩺒]-󿣢\u0014\u0012`zh􊠎\u0012~􌩰L\u0012h\u0015\u0018𧎽fJ~󴅹^\u001e𢜹{]ms𗟼de{\u0002祫N􇹮H𫶐OP]󹶁𤚷\u0017z󰫈\u0007𨂘4𠏍󰻹\u0017\u001d\"P\u0005𦒍뷕L~Oj\"R50G춂􆾡lhcU􊥔\u001d9𪪵\t{as𣉾\"𐛪v.\u0017\u0001SCD/\u001c\u0013𩐨l􉖹𓈔^𬶮􋅲\u001eo𥏝𡇗$銚T^\u0019\u001d&\u0005Tsl_un󷌗󸧱\u001dMy:pXᜄn<LQ!}:𨷖\u0000V\u0016􍯿󶺳u3o=4(KnN5󴦧*9\u0004󲭊뙀y'[\u0017I\u0012􉓂SAik&~c殀\u001a\u000cO\u0015􂃁tf\u0013"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_10.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_10.json
index f493d7f1529..a0a13e470c4 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_10.json
@@ -1,7 +1,7 @@
 {
+    "description": "-uD|3n󸴉+4+@􊦹Jw~𫤕𢾜Q󳯢𗮃r𦆴맹2,𤭁=i\u0008N#y𩡌/8QhH[𪌎􄢋yl\u000es\u0008\u000fW𛈵󻜹𘧄s?`rr\u0010􏱚\u0002j󳁬äq~d}*\u00117\u0011\u0008+^XL🖦0\u0008G􄉠/*\u0016𡦣-!󷊡w@3\u0018\u0002𥞲z8N \u00186`\nr$B\rgmp餫𗕴G\u000f􀃱䳎w􅶖\"𩄧&􆺓􁫠􋌷ﳐkZMV􋛶\u001e𡖽\u000f􊜶\u0011\u0001􍱟𥑇Q\u0012\u0000}󶒤љ𬟴𩇝􏕃\u0008z;􈢍[\u001a-<\u0006'󱮓󳨭􃈗𧳄\u001f{3\u000f~:X\u0008鍑!.V6rNo#^M\u0006a`W^@/􅲵\u0002KP\u0008AAT_\u0019\u001d\u0007md{Pjw𮤣k􃐣\u0003\u0019랑䏈eꡍz5tp𩅷\"#𥫘 \u0018🈠\u0018󼊘z[ 𠆾\u000eAz\u001c:;᮸\tc􂐨\u0018\u001ew⩗􁢱󵩦)K󷇢\u0013&󾱰r:eE~\u001c\u0019ᖽ;\u0018T􃒙𝄿TH\u0002󷷑b8t󽧞^?24Hb=;G󹽉\u0006\u001cж\u0018XGI:|hBb揔:kj\u0013𗔀:0\t`E3t㲚\u0004\u0016P􅸐-iw1z\u0005A\u0010u䁍󱇼𬉱\r3\u0001􍅝O􅛗F\u000c􃬯輎􈽶\u0011𣚗\u0008ybᏇ]t𭑣i󴌂-JD\u0002𦁝I𖤺\u0010\u000b\u001e3\u000e 􆲡􉿋\nh\u0005)n$1F&1\u0007\t\u0019`󱺆􍊛𗏊a#䦟T󻕮𩕘v*i6\u001e-q*VAcXM𥾉q鏛N󽀼<\u001br\u0005&+\u0012$\u001c\u0010hT쟛􏸞i3笧󶵂􈫵\u0017pl􁠀\u000f\u001aR\u001d",
     "email": "_e_v\u001aL@\u000b4",
-    "url": "https://example.com",
     "name": "?󱶤웛Ykp*V~z8xa\u0003`6^\u000eT􍥅\u001f􍣫𪷋z󳃤P\u0007n/󹘚{/O麿f󲜇-OG{\u0013伱󺗐\u0010z\u0010\u001f󾭿c\u001e𤀶j𝘨A􎷃􂰭2Wc𝜟󸩰P왮m{\u001c'9Hi􃫊hMB􆦾􀣫Nl&됦8}𢠟⚎'\u0003g\u0005󼧊󵭁%Ps)C𫨺\u001f\"G.󼩀I ",
     "password": "po!l𩞋\"\u0004𪤚💮z\"mpt\u000ff/,\u001e^z𖢠􄇌Mb>󽡐s\u000f\u0006𢰆󽆪􏃏\u0002𬩷𣷳\u0012m𫪐\u0008>V?􊞯x\u0002􀬰F󳍧-ZT_5󾂿󱾢'uO\u001f뮬􅖁\u0005J􇢜\u000cM\u0018H􋧬YyF/d-)𗎣jS\u0007\u0018F\u0016*}󹁧f􎑳\u00137{X\u001daD훻\u0000n\u0012H\u0010\u0017uu/e",
-    "description": "-uD|3n󸴉+4+@􊦹Jw~𫤕𢾜Q󳯢𗮃r𦆴맹2,𤭁=i\u0008N#y𩡌/8QhH[𪌎􄢋yl\u000es\u0008\u000fW𛈵󻜹𘧄s?`rr\u0010􏱚\u0002j󳁬äq~d}*\u00117\u0011\u0008+^XL🖦0\u0008G􄉠/*\u0016𡦣-!󷊡w@3\u0018\u0002𥞲z8N \u00186`\nr$B\rgmp餫𗕴G\u000f􀃱䳎w􅶖\"𩄧&􆺓􁫠􋌷ﳐkZMV􋛶\u001e𡖽\u000f􊜶\u0011\u0001􍱟𥑇Q\u0012\u0000}󶒤љ𬟴𩇝􏕃\u0008z;􈢍[\u001a-<\u0006'󱮓󳨭􃈗𧳄\u001f{3\u000f~:X\u0008鍑!.V6rNo#^M\u0006a`W^@/􅲵\u0002KP\u0008AAT_\u0019\u001d\u0007md{Pjw𮤣k􃐣\u0003\u0019랑䏈eꡍz5tp𩅷\"#𥫘 \u0018🈠\u0018󼊘z[ 𠆾\u000eAz\u001c:;᮸\tc􂐨\u0018\u001ew⩗􁢱󵩦)K󷇢\u0013&󾱰r:eE~\u001c\u0019ᖽ;\u0018T􃒙𝄿TH\u0002󷷑b8t󽧞^?24Hb=;G󹽉\u0006\u001cж\u0018XGI:|hBb揔:kj\u0013𗔀:0\t`E3t㲚\u0004\u0016P􅸐-iw1z\u0005A\u0010u䁍󱇼𬉱\r3\u0001􍅝O􅛗F\u000c􃬯輎􈽶\u0011𣚗\u0008ybᏇ]t𭑣i󴌂-JD\u0002𦁝I𖤺\u0010\u000b\u001e3\u000e 􆲡􉿋\nh\u0005)n$1F&1\u0007\t\u0019`󱺆􍊛𗏊a#䦟T󻕮𩕘v*i6\u001e-q*VAcXM𥾉q鏛N󽀼<\u001br\u0005&+\u0012$\u001c\u0010hT쟛􏸞i3笧󶵂􈫵\u0017pl􁠀\u000f\u001aR\u001d"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_11.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_11.json
index 164718fc136..5ab91c4ad00 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_11.json
@@ -1,6 +1,6 @@
 {
+    "description": "VsX|n𬁵Ue;󶿲󻧙,\u0018]\u001aV%*\u001b6x􃯐\u0007D 󲚝􅌘)俻\u00053\u001d<sw\u001f\u000bUbvdvQ\u0013ꂀ%𠀎5x\u0011󺍜󿰹\u0015jqv𩀸𣉔𣰵^%멡vctYK-󷱳XxS𬽸z󼣾5\u0013􃧠\r𬅙d\u0002飞r\u000bJI(\u0000\u0002􋶒nk\u001d\u0004H\tF􇧮Pb\u0019\u0017􊕁\u000f􄿍su\u0011e\u0013xe𫛳󺀑V1\u0000_h𖡬1𮁇󻥌4,K7\u000e󶿬9𮜩\u0011𫞦竱P􀴍kQ邅\u0014m`𑠕󶗚\u0000\u0001(􃝌!灺\t𘜬𩜀e󼉩\u0011󻏔㋜Ah\u0017\u000c/RQ@􅫄RsN\u0014&:E!Y倞󲭧\na/k\te\u0017}#\u001eA𔑞\u001ek\u000f鰓D鎰,n.y𢟾􅩿9\u0014`#O\u0004lazU@??𮢗\u001eW󹡦\u000f󲋢\u000f! ⯮𬷻:_\u0003\u0010𤟲o@E\u001d5\n􈾠6rkd>;I𐌌\u001d􅣂i Y𢌔c􅋸𦁦䝠r􎻤V𫼄*\u0010/|\u0011:􁕾𛋕B\tk\u000b\u0004󹓭𤌪.\u0001GA D^9􆷦󼣑󳆶𗤴젛}}6L󻌞FHWcu>({4I]\u0012\r\u0003&|5(<L􁅩S 􃝪Qq$%c&U\u0006􁕄𫘕\u001b\u0019𬝟\u0006\u0017􍊱\u001a\\`𪔾b\u0006E\u0002#󴲳\u0002LJ\u0008d`\u001b󷹋󽰁\u001d3\"V𡑒\u001e\u001db/n``S5\u0000-􏌅\u001er𭷿sx W󼤞 o\u0000&\\E\u0000ᆯv󷼦@\u000fLF󿽈>KWw넦􍧤󸗠R~󿓘9+F𧮒qG@𧏷X𡜲gn^?$󰡗E嘎𩃄䵜\u0019\u0012 \u0011D󴎣􎰠\u00114O羕#􍴟jC|\u0003^n\r\u001br>Mw󵔂s\u001d祀:󺶿q\u0002e@INe\u0008󼺇􎻄W\u0001𤻑ZU󿐻+틱\u0017\u0016\\\u001a󸷣\u001c𡟜1\u0019䊴􇳚}/7\u000f)`꺵:)%k.u`BJ\u0012\u0001$𨞑\u0018󴼊'9󰆦naҷo六\u001fsC󵺒|󻛮A󹃨𢽣o􃨴#\u0007a􎾗2􈋱󴧁􌨺夹(􁲄|?[\u0001䎲WzQ杺I'𭍉'?𠀟*\"{𞋆\u0014^􆺗Gy㪁qs2z󼖔a<-r\u0013n.<𥐲\u0015F𨊤\u000c\u0014\u000b삎\u0011TR𤟵\r讘",
     "email": "\u0007*\u001e_@6󻞻\u0007\u000c#9",
-    "url": "https://example.com",
     "name": "󰁝󴀗-\u0007%~䵖\u0014v4@yim⼁\u001f37䐗\u0002𠧤#@􍘠a}mE\u0013𪌻Es3CꀀTZaTUy𬝀󰀪u\u000e𦷠n\u0004[\u0003𨃁졉_\u0001d\u001a 𐦌\\#𧐀{@\u0011%8s䭟󲗇,!D<𖨤KM\u00115T\n\u0018@sl\u0000*\u0007\u0016xZ\u0006ᤖ ei:V+y\u0015\u000eA䖹dX󱿹󱼬\r􂏥\u0004􍑡",
-    "description": "VsX|n𬁵Ue;󶿲󻧙,\u0018]\u001aV%*\u001b6x􃯐\u0007D 󲚝􅌘)俻\u00053\u001d<sw\u001f\u000bUbvdvQ\u0013ꂀ%𠀎5x\u0011󺍜󿰹\u0015jqv𩀸𣉔𣰵^%멡vctYK-󷱳XxS𬽸z󼣾5\u0013􃧠\r𬅙d\u0002飞r\u000bJI(\u0000\u0002􋶒nk\u001d\u0004H\tF􇧮Pb\u0019\u0017􊕁\u000f􄿍su\u0011e\u0013xe𫛳󺀑V1\u0000_h𖡬1𮁇󻥌4,K7\u000e󶿬9𮜩\u0011𫞦竱P􀴍kQ邅\u0014m`𑠕󶗚\u0000\u0001(􃝌!灺\t𘜬𩜀e󼉩\u0011󻏔㋜Ah\u0017\u000c/RQ@􅫄RsN\u0014&:E!Y倞󲭧\na/k\te\u0017}#\u001eA𔑞\u001ek\u000f鰓D鎰,n.y𢟾􅩿9\u0014`#O\u0004lazU@??𮢗\u001eW󹡦\u000f󲋢\u000f! ⯮𬷻:_\u0003\u0010𤟲o@E\u001d5\n􈾠6rkd>;I𐌌\u001d􅣂i Y𢌔c􅋸𦁦䝠r􎻤V𫼄*\u0010/|\u0011:􁕾𛋕B\tk\u000b\u0004󹓭𤌪.\u0001GA D^9􆷦󼣑󳆶𗤴젛}}6L󻌞FHWcu>({4I]\u0012\r\u0003&|5(<L􁅩S 􃝪Qq$%c&U\u0006􁕄𫘕\u001b\u0019𬝟\u0006\u0017􍊱\u001a\\`𪔾b\u0006E\u0002#󴲳\u0002LJ\u0008d`\u001b󷹋󽰁\u001d3\"V𡑒\u001e\u001db/n``S5\u0000-􏌅\u001er𭷿sx W󼤞 o\u0000&\\E\u0000ᆯv󷼦@\u000fLF󿽈>KWw넦􍧤󸗠R~󿓘9+F𧮒qG@𧏷X𡜲gn^?$󰡗E嘎𩃄䵜\u0019\u0012 \u0011D󴎣􎰠\u00114O羕#􍴟jC|\u0003^n\r\u001br>Mw󵔂s\u001d祀:󺶿q\u0002e@INe\u0008󼺇􎻄W\u0001𤻑ZU󿐻+틱\u0017\u0016\\\u001a󸷣\u001c𡟜1\u0019䊴􇳚}/7\u000f)`꺵:)%k.u`BJ\u0012\u0001$𨞑\u0018󴼊'9󰆦naҷo六\u001fsC󵺒|󻛮A󹃨𢽣o􃨴#\u0007a􎾗2􈋱󴧁􌨺夹(􁲄|?[\u0001䎲WzQ杺I'𭍉'?𠀟*\"{𞋆\u0014^􆺗Gy㪁qs2z󼖔a<-r\u0013n.<𥐲\u0015F𨊤\u000c\u0014\u000b삎\u0011TR𤟵\r讘"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_12.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_12.json
index 9eabbe44ddf..11c467b239b 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_12.json
@@ -1,6 +1,6 @@
 {
+    "description": "Gt'`-h\u0004\\\u001ci󵣑kꫤEl󼄕?\u0019#󴈫\u000b\\𤜽\u0008/O奅w\u001a0𠽓􇦟h\u000cOs\nP􀴊U0d\u0002􇈶q9\nFᮞ􈑃+@\t\u000f\t(󷧟\u001f󿎢\u0005-3I\u0002V\u0004৲&~\nk kv󿝁9𪥾𦈁x􃪲sC(xNZT\u000b9+u\\⦥\u001eL\u0015L􉹉=\u000f𝣘q^\u0010\u00167%/\u0001jꢤKe𢅉󻣠􁓭5}\u0008\u0019󺴯tDB꤮\u0011􂉟#q1j(Cg硎RG\r\u0007~8\u000b8󸄳𨁸􋫔vOg\u0012;\u0016p굸Ip􍕈+j|􋷖TO&W🛩\u0019=\u0013T眯❳𡸗藺@Dg뗇鏈]m C!𠊡vF\u0001􎠈N&(𬗨苽x(j{\u000eES􉶣\u0003-\u0007P\t묘+ \u001b-\r㤓r􂘰􉲿\u001699\u0007ZG\u001f󺙪L$𡫓{駤𞲩j𨶓bY~i𝞼Ո󰾣􆼣Ev|䂬󾚺\u0016󸃿􏞂\u0001`󱑓Nv󵻱B'?􁓼\u000e\u000f󽁘󺶞\u0008'\u0006s\u0007𮮿ᇇ7'\u0019􄲈\u0003g𣩈󺐈5\u001cgDuX\u0019g}􋗰󻣼\u0008RN󽢹/D\u0011O0?\u0012RoG;=\"Q1m\u0005􍁗\u000f\u0007%<\u000bf艧􊪫\u000f\u0014쳋𧬨N%P􋸈g)=QA]t.􁓴F\u0016;\u00013.wfEL\u0012Ru!\u0005qN\u001f󺽭􆪫\u0012\u0015P@I(#\u0001<}*2𭴢😫r\u000b%E󽁑WlL2x)+󽅗=2;\u0012[\u0012H2)􇯅𔓣th@𧺋\u000b爫\nk\u0010eWF-",
     "email": "@d*􀑚jA}",
-    "url": "https://example.com",
     "name": "E\u0013MNO膵\u0004Z󾢒\u0000I⎕5e3",
-    "description": "Gt'`-h\u0004\\\u001ci󵣑kꫤEl󼄕?\u0019#󴈫\u000b\\𤜽\u0008/O奅w\u001a0𠽓􇦟h\u000cOs\nP􀴊U0d\u0002􇈶q9\nFᮞ􈑃+@\t\u000f\t(󷧟\u001f󿎢\u0005-3I\u0002V\u0004৲&~\nk kv󿝁9𪥾𦈁x􃪲sC(xNZT\u000b9+u\\⦥\u001eL\u0015L􉹉=\u000f𝣘q^\u0010\u00167%/\u0001jꢤKe𢅉󻣠􁓭5}\u0008\u0019󺴯tDB꤮\u0011􂉟#q1j(Cg硎RG\r\u0007~8\u000b8󸄳𨁸􋫔vOg\u0012;\u0016p굸Ip􍕈+j|􋷖TO&W🛩\u0019=\u0013T眯❳𡸗藺@Dg뗇鏈]m C!𠊡vF\u0001􎠈N&(𬗨苽x(j{\u000eES􉶣\u0003-\u0007P\t묘+ \u001b-\r㤓r􂘰􉲿\u001699\u0007ZG\u001f󺙪L$𡫓{駤𞲩j𨶓bY~i𝞼Ո󰾣􆼣Ev|䂬󾚺\u0016󸃿􏞂\u0001`󱑓Nv󵻱B'?􁓼\u000e\u000f󽁘󺶞\u0008'\u0006s\u0007𮮿ᇇ7'\u0019􄲈\u0003g𣩈󺐈5\u001cgDuX\u0019g}􋗰󻣼\u0008RN󽢹/D\u0011O0?\u0012RoG;=\"Q1m\u0005􍁗\u000f\u0007%<\u000bf艧􊪫\u000f\u0014쳋𧬨N%P􋸈g)=QA]t.􁓴F\u0016;\u00013.wfEL\u0012Ru!\u0005qN\u001f󺽭􆪫\u0012\u0015P@I(#\u0001<}*2𭴢😫r\u000b%E󽁑WlL2x)+󽅗=2;\u0012[\u0012H2)􇯅𔓣th@𧺋\u000b爫\nk\u0010eWF-"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_13.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_13.json
index 7fe15324684..af210cece22 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_13.json
@@ -1,7 +1,7 @@
 {
+    "description": "W\u0015x;LV𠁿t+#࠷.~󼀷Y+ꊰ\\^(CK@\\\u0002|p\u0015{\\&j^󽫇$P^󷀳􋐗\u0006\u0010󹇸t󹠁=􁛇𧙿dx𠲌ᲢİO\u001bR츴\u0014\u00041GM\u0007S󵫹x$d\"\\jm;\u000fD\u0015h󺣚qd\u0016􂪙G\t𮆤w󺟃\u0002#`6󲹈􃱦$`B𑨎h?5?5!~9\u0008󽶻A􋛟6𪞦\\9(>\u000fq啓\u0018􍸩Kd\u0016𭊭𗱸𪜳)\u0000t0F\u001dF/\u0014*􌯧v\n𡄎%􌉸q󰩥Z㔠V'롤\u0017\u0004Fi\u001e􌀊茳󽏂~𠸵KR\u0010\u000b8\u0006A󿾍b\u001d􅍯E􊼼􆄍<bS+,㉴􍺳󾬱T\u0016P\tQ&\tp𐡿􈒚V𔕈􉔙o􎉙%P?BB*V\u0011󿑂f(V6㒝_G$AC𣄓pL\t\u0002𡑢󳀡ᯍ2\u0010\u000f𥮗\u001ff#Z+}𡣅~󹸊g􂮢c\u0015|NPy_󻗅'N􈲥\\q􆋝X噩~\u0003ₙG󰽧S􁷄u󽪇4N\u0004Y\nZ󷳜Df􍇼Fr\u001ej\u0011T􆃀8􋛖mkK;󱑊󵏥$ R纊띑𢀿\"O.\"e󻣑q#𨞠Yu\u001b𒃪\u0002d𫳔\u0012;󻆰N\u001ax\u0006&G\u0004L𩴝𭆛\u001b\u0002+;pi\u000c*{󹂶𥧹!-\u000e-m\u000c\u001a, =󳧩i5󻈘l𠧞󼗩$󺚽^Qr􊻕j󱊧V\u000c\u0012𤥀s\u001bZ\u000cC/\u0012O\u001fu1V𑻠𪉤\u0000I\u0019S 𠛞􈾑ci$2𝄹\u0003 fS.9􌳒籅\u001a5d!{\u0010)𬐘\u0001=w󳋽SC󴮞h<29Z\u001cv\u0006i~!\u0014\\􌃾&5󴈋 󼿙𧾠h~\u0019`[xtX\u0001􉳾h󿌘\u0000o6~=𬶹\u001d[=V7󰨫\u0013Q𓆙\u0011𗼏\u0011𢿱\u0010󲌏f 􅯖Lg\u0010i37\u0011𨦈5􃔆i󷬁qBꮧ\u0006􉟐Ꮔ]\u0002󽺀.\ts𨹇d𧥘F\"r󸛴j!\u001e<\u0004f쾧𧙥녠9𪊗𫤡%`\u0016>\u000e;󾓟I􂨟%~mH\u0001)\u0012,\u0018/9MZ𭤩h\u001e\u0003,{\u0005뇙4뻋Mi7T]B󷨔􎠌]\u000bU&<􃞵=k^𢎩\u0008a?)𗮸8\u001d|\u0007'㗆}@?hL겫QV/?p\u001cd􅻁iv􃕛z鳆77Qj \u000fnhW\tu\u0016%K𩳱]𪑥q\u0016ft􁰸\u0012jS\u00005q𪑚𩸛\u0005h􁹽⺃\u0006鼏1n{A#XQffⱌ\r󻹎3\u001b\u0016@z\u0000\u0003P𧔺ࡉd>|[U􇳄Iံ􎦠𝂍󰖇KyRA㣉+\u001ck妰𨍰\\nQ!􀅕𦊐r4󻹼?\u0008kO\u0010i?JR#V𦝗Zp5\u0015\"\t\t\u0004􈇶\u000bC@󴇞\u000cf􇺆\u0003\u000c㍹诺:\u0004f6\u0013▫푎󻩢󵾞7WnH*怿z𭮥S𗣯\u0019E\u0017\t\u0013TEf\u0013CP\u001f*𗐽`󼻮/\u001ca󻪈\"\u0012󽍐􍯧`𪗻\u001c\u000f\\􄦕$\r\u0010B𔒀󹋉𩏝\u000c\u0004𗇨6~\r􃈌䝅@%􀍬\u0003,I\u0012r@􋍜1뇅_뙧􁾨󴽲𔐉\u001b\u000c%54pb\u0010𐡪\tQ섿)􅂶~󾮰.􋢱`ꁥ􊧑G0󲿦􍂛uj\u0010w\u000e뽱^\u0010,;\\\u0014q󲇟m\u0015!j3t\t􄀽\r\u0017n\u001d)󵽺mT\u0004\u0006T\u0004\u001dh,帨\u0004ᕌ\"\u0013[椁lI𞢂󳤙5\u0002y7z",
     "email": "B\u001evq􃫹7@굹",
-    "url": "https://example.com",
     "name": "𣵸敝7\u0012􆯧Y<􄿘+Babu\r𮐴𠘼\u0004Go𨁚:􀾑z􃄑𨻻᧟􊙟tIid𦔶CR+􆯗󼬰\u0013h+Wju\u000f'\u001bc|󾮆?y4L𤃫Z\u001c\nQ*\r慉\u0006an􋯁Sw톘󳘪\u000f\u0001Z䕱I晠Nm\u000f>\u000e\u0005\u0008\u0016\u0002􍪂𪝨\u001e,@+Fm,;(cl",
     "password": "󷆴󳚁󰁗L􊣬󰱺T𘟲綣F_􆐒\u0000V낓\tHSx)\u0004x󸮍i[㔲*󽆣\u0016t]g󻏭ꚳ;\u0012$U\u001dY)𡦱\u0012a\u0008ey*_垆\u0004󰷚\u0004_\u001c䭭(\u0013􌧽󸧇)`\u0018\tc{*𝜝\u0002󼸆\u0017(\u0016\u000c\u0010\"\u0006𫖽\u0013󱉵{A\u00123\u0008\"k^\u001702𩖚󷦬<\u001e\u001ad\u0016KhꍇL𢗧\u0001􃠽󸞛cG\u001d觚䕦2l􊖱𩠸>ᩗ7g􎙛󾭭HP8t\u0015A[r\u001d$mat-󾽡\u0012\u0003?𩾚M𮧝!󶈁󽹿7\u001b\u00189HB𑒔xL􎅜+\u0004N☟H=\u0016^䟄O𠄃\u0002`n,\u001a~+\u0016\u0018󻜳<\u0019\u0012\u000f>󸔐9\u000e()J[=\u000c?MBFQ^}􎋏,􈝜􊢝\u0007ᒽ\u0011𠰷\u001b 􅄐fL+;𫉭\u001fp\u0005s#፟i􃬕[,\u001b*\n\u0003d󱋁#v6HW *T4h\r\u0010\u001a\u00192􌳥󼿹㚶\u0005lJ~j\u001dd\u0004\n+n𢎍\u00064\u0011(\u0005󴠒󶩬7y+\u0012q\r0\u0018eF\u0016󽗧𡕬Y\u001d]v𨻲\u000bᶍ󼹶cY\u0016\u0002냑R𢅵b#-􄿇[P\u001a1\u001b逕<󴂆\u0006\r\u0018<\u0002􆇨\u000b1\u001akw}\n(􍎾x8N\u0016S\u001c!zw\u0019􊪦/\u0008㉲͐o𫍥󷯂󽌪􋍄\u000bwN\u001c?􈒒7Ml󲊇DSr􈛋w\u0005\u000cM󸰹󼦐$I𢼔𫸳:N\u0018\u001c􄦬{ \u0015\u0013QspHP4F\u0008\u0015ᴣTI\u0012\u000e\u000fp𧈋󰑼2&w𥏖6\u001d8㾀-\t\rA䎐c\re5\u001f\u0001D𥥰k𤶶&O􆤫\u0008L4J)NSkhAY,v[󿟁wPL􎨹a\u0004\u001a\u0003\u001e}\u0007O6\u001c\u0006𧝋TkjQ[2\u001eY#X4j\u0016+󿷞袑O𝅜S%\"g\u0017-􋑪𗻯􋕿䃓\u0001!&􇰣3$\u0001􂼮s0g\u0003\u00132\u0013\u0018kv5𧷄fI𮎜'\u001e5\u00008󸏮]埪\u0014􇓑~Qs}IGki8r\u0004𣓺奦\u001d6C𤪒ꧠ󾁵𦽑ὌDP\u001a+~𤂞|m+Wp𠈄\u001b;N􉅴@\u0019𑚋뛪애11󵪅q󲮿'l\u0013󴾸Q󲮝􉰽sK.\nx\u0003\u0008V􌢉\u0013𬗦q{\u0004W*l\u0006Ox@<𢫿._~\u001ayJ\u0010#Fw_󽢞(i0\u0004o秚 \nHy+\u0017pF&}\u0012O4\u000e@ZDt\r",
-    "description": "W\u0015x;LV𠁿t+#࠷.~󼀷Y+ꊰ\\^(CK@\\\u0002|p\u0015{\\&j^󽫇$P^󷀳􋐗\u0006\u0010󹇸t󹠁=􁛇𧙿dx𠲌ᲢİO\u001bR츴\u0014\u00041GM\u0007S󵫹x$d\"\\jm;\u000fD\u0015h󺣚qd\u0016􂪙G\t𮆤w󺟃\u0002#`6󲹈􃱦$`B𑨎h?5?5!~9\u0008󽶻A􋛟6𪞦\\9(>\u000fq啓\u0018􍸩Kd\u0016𭊭𗱸𪜳)\u0000t0F\u001dF/\u0014*􌯧v\n𡄎%􌉸q󰩥Z㔠V'롤\u0017\u0004Fi\u001e􌀊茳󽏂~𠸵KR\u0010\u000b8\u0006A󿾍b\u001d􅍯E􊼼􆄍<bS+,㉴􍺳󾬱T\u0016P\tQ&\tp𐡿􈒚V𔕈􉔙o􎉙%P?BB*V\u0011󿑂f(V6㒝_G$AC𣄓pL\t\u0002𡑢󳀡ᯍ2\u0010\u000f𥮗\u001ff#Z+}𡣅~󹸊g􂮢c\u0015|NPy_󻗅'N􈲥\\q􆋝X噩~\u0003ₙG󰽧S􁷄u󽪇4N\u0004Y\nZ󷳜Df􍇼Fr\u001ej\u0011T􆃀8􋛖mkK;󱑊󵏥$ R纊띑𢀿\"O.\"e󻣑q#𨞠Yu\u001b𒃪\u0002d𫳔\u0012;󻆰N\u001ax\u0006&G\u0004L𩴝𭆛\u001b\u0002+;pi\u000c*{󹂶𥧹!-\u000e-m\u000c\u001a, =󳧩i5󻈘l𠧞󼗩$󺚽^Qr􊻕j󱊧V\u000c\u0012𤥀s\u001bZ\u000cC/\u0012O\u001fu1V𑻠𪉤\u0000I\u0019S 𠛞􈾑ci$2𝄹\u0003 fS.9􌳒籅\u001a5d!{\u0010)𬐘\u0001=w󳋽SC󴮞h<29Z\u001cv\u0006i~!\u0014\\􌃾&5󴈋 󼿙𧾠h~\u0019`[xtX\u0001􉳾h󿌘\u0000o6~=𬶹\u001d[=V7󰨫\u0013Q𓆙\u0011𗼏\u0011𢿱\u0010󲌏f 􅯖Lg\u0010i37\u0011𨦈5􃔆i󷬁qBꮧ\u0006􉟐Ꮔ]\u0002󽺀.\ts𨹇d𧥘F\"r󸛴j!\u001e<\u0004f쾧𧙥녠9𪊗𫤡%`\u0016>\u000e;󾓟I􂨟%~mH\u0001)\u0012,\u0018/9MZ𭤩h\u001e\u0003,{\u0005뇙4뻋Mi7T]B󷨔􎠌]\u000bU&<􃞵=k^𢎩\u0008a?)𗮸8\u001d|\u0007'㗆}@?hL겫QV/?p\u001cd􅻁iv􃕛z鳆77Qj \u000fnhW\tu\u0016%K𩳱]𪑥q\u0016ft􁰸\u0012jS\u00005q𪑚𩸛\u0005h􁹽⺃\u0006鼏1n{A#XQffⱌ\r󻹎3\u001b\u0016@z\u0000\u0003P𧔺ࡉd>|[U􇳄Iံ􎦠𝂍󰖇KyRA㣉+\u001ck妰𨍰\\nQ!􀅕𦊐r4󻹼?\u0008kO\u0010i?JR#V𦝗Zp5\u0015\"\t\t\u0004􈇶\u000bC@󴇞\u000cf􇺆\u0003\u000c㍹诺:\u0004f6\u0013▫푎󻩢󵾞7WnH*怿z𭮥S𗣯\u0019E\u0017\t\u0013TEf\u0013CP\u001f*𗐽`󼻮/\u001ca󻪈\"\u0012󽍐􍯧`𪗻\u001c\u000f\\􄦕$\r\u0010B𔒀󹋉𩏝\u000c\u0004𗇨6~\r􃈌䝅@%􀍬\u0003,I\u0012r@􋍜1뇅_뙧􁾨󴽲𔐉\u001b\u000c%54pb\u0010𐡪\tQ섿)􅂶~󾮰.􋢱`ꁥ􊧑G0󲿦􍂛uj\u0010w\u000e뽱^\u0010,;\\\u0014q󲇟m\u0015!j3t\t􄀽\r\u0017n\u001d)󵽺mT\u0004\u0006T\u0004\u001dh,帨\u0004ᕌ\"\u0013[椁lI𞢂󳤙5\u0002y7z"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_14.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_14.json
index 06d78f7e437..3cbad62f257 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_14.json
@@ -1,7 +1,7 @@
 {
+    "description": "<*n\u0001@磮-\u0002\r\u0014Wr\u000f󶃔\u0013\u001e􄩔|\u001f蠓\u0001E&𥚯󽃸𖣹!L\u0005J\u0006㞤󻮽/>\u000fF}5u\u001f\u001f9\u0014𪦾1\n󻢂􄓒I1V󸇄m\u0005𗬨g\u0005x󳫌\"\u001d􎭈c󻔔\r-/\u000e县Tf9𘗓\u0003a󽦒󷐱q\u001d󾧩\u000f1𭋛wL\u0000󵤪` o^𡾴D\r[!Z\u0019]𪷎\u00011\u000f`_xlwX~󰁍<KL󹩉}\u0004(󼩨}@\u0014\u0005\u0004z\u000c𬐒𓍕t𣪤󵑨{rUk\u001b\u000eC.8d\u000f16)󱞀&}\u0018%󹙐]#ME93XKFZ+`9'R(\\􇋍%鏭j\\O􊛋c7􄋙3􊰒𪞩d\u0003󱖼󶅹鯕󾃧ce[ni󺘽I扰%\u0005m\u001e\u0015\u0016R\u0019[𤫲4-y믩I#󷞫=Re\u000f\u0007?bj'Q*xY\rz检Ki\u001f룣jB\\𧳥@󿎒l𡑬b⿷2H\u0011覷E>\u00109󻮑l\u0000^V6`𑵕􆣤\u0004D oo5\u0004u\u0010MA󹥡\u0005\u0019i㙌\u001buc󱃄z7t􇌓W𠺚e\u000b)9󿨭f𗥜Fn𨈒\u0011\u0004e𐲔\u0006\u0019(\t𐢀𥠠𑊏\u0017💋Eb􅶎1\u0018D\u0015>mqH\u000f󳶢𗆸:\u00101_l,\r@O?󻫸\u001d\u0017󵝽\u000c𒇌A􉙜)6Y筎􉓽N\n\u001a(^Z/~o\u0000qNdf5\u00158`D[t_s𪾭\nb<SY𧫸qZ]󹿻\u001be\u0004KQ󿠒\u0016\u0016\u001f\u001d󳐗+$\u001b?#\u0002\u001f\u001d\u0017󳋺C:􄮁/𪛋]'벏I;𡹒\u0019z𬗳&Z\u000fO'#\n)􆱏\u0012_󴞾\n\u0017S:7󼈧z>=*\rQlb\u0019h󻑝O\u0019RKs\u001d\u0012\u000e梖q䚖=J@+\nz􄑙몎U,\u001aq􉘁7>M\u000bY􎺭hꋷT]􏈌[-+蕚Z'qW7%􌖓j6\\u\u0013\u0004`k𬅩!o􊜣\u001c\u000c\u001e𤡉1𬥥5MwmP<tY\u0010䑺`󼳵􁙂V-𤰲\n󷸠𦣾8\u0006ꆼC:Ou虈\u000c𪲅b\nQ􌁟􀴋Q혙\u0006\u0001\u0016\"'󼗥N\u0006\rJ*T3w0𤺖𭅪S\u0008\u0011\u0007󼳇+B󰠆=\t~\u000e󴦎𑶨)?D]\u0003󵶂}\\bo\u0016f\rG􉶍𝪬󸞚l\u0018G@r󶐸􄵟𦙣ECH,􂢵!}𣚘🚻\u0005J3\u0012+K羗x\u001dos􎣭\r\u0008𤪲P<28⦄w^󱬀𮪲𭚲K\u001e𬼋\u0018\u000b[#\u0010&b\u000c\u0002z-VV􆳯\u0007B\u0019<ST*r4𩺓􍜰*\u001a\u0000~y$於A.\r󽛋\u0011HX>;%Oԩ]Wp雰󳦸𗮑)\u0014앻󹳢MR󾗰P\u0005'\u0001\u001a-\u0013d􊂮{𭗺'<\u0001\u0018RGw𥵓䝘s,PwtQ~\u000b\u001cN\u0019\u0011@᠇R𦙊@\u001b(J\r<៕\u0007\u0004f󺤮겎~t\u000f􆰭|D()󱍉5j󳴚𬔖\u0018𑘳􆫦*􆴸#[0󶠞\u001c𠏴BCWP󳮺g=t𝇨\u0015󰍀󲒴𩪏V{q}#((𗹡6󸠝?:'7F\u0017㏥b􌊁D+j\u0005\u001eB'=󷅸\u0014􃚑􂖸k􌑞􀎄SB􀈸\u0013:b󳗤둜\u0000\u001b􆿁n?󶸶i𓏸8I趛[%[\u001ev /咖S𡢒𪿛?􏆦\u0018󴵽=w󴤬V󴑂톘\u0008]\u0018\u0015R%􌣀􋢘}􃤣$𭼥\u0015􃾁4\\\u0004|𢙬Ti󿃆\"󵡝󿣽\u0017EX g🎼 ❢X#q2􁚨<\u0010蘀􃬺H𪦠\u001a3W􂯌A𭋀Rv􅚳#𥰉B2\tF*𢤴wibh}+y4c\u0016𦀩`4󿱬o0}􂰵鲼EC$-\u0014b\u0012?CF\nK􆭦􁈶𘖤Y\u0002n7H𐮫p􋫁\u00117󻲿N%\u0013O\u0019{7􌷎h𗗭Pn𧯘\u0007頬_u𧯫洤\u000e𑚄;<",
     "email": "%a󽕷@\u000f\"{",
-    "url": "https://example.com",
     "name": "\u00073󻤋􎮭𣚜W\u0010\u0003f\u001aW󾏐\u00126󻾞𪨱^5]b\u001aS󰵑\u000c􌲠|=􇣟\u000cYu\"\u000c꼘V⬼\u001a4S\u0017󰁒􅍞9DD\u0010􆴶􁧱.M0p)󼼈>𢚮.\u0006$z,🍁s󾹻P􁓐<M󲿭\u0019s<",
     "password": "\u0000@*󱛘O3]]\u0013R5􌪹\u000ci\n챇CM\u0011r\u001dM\u0001(ẝ󶤲''󶜖\u0018d𠎑\u0010꺈𠼊\u0018챮\u0011\u0019\n𝔏\u0003z\u0005y.R/SY𭁄􌕆q\u000c\u0013􈳸D𐅳yrQ{\u0002\"󱘭􌷐[􊓂淁㙨\\\u001486_5#􏥇RVq[󳇀,1y!딷6􌉵kPX\td'z4\t?/3􇮨󺼫 #a󱯗\"\u000byn3󿖐\u0011餀,훃~nr]\\\u0002\u00030$魕0nw\u0008챹{&2J\u0013\u000f\u001cY姮tR\"\u0007j3W섧\u0008􆩑e󲺾_&6讆􅷭\u000b\u0017@󳽥l:)󹼟\u0019\u0005Pyp=wb𫫒𠃋6TB\u001fe0\"\u0018yb󵷖u5G|􇕒\u001erexL7C\u0011喐𗖗\u0017xa30Qr&.횲𫶕\u001f)S4\u0002\u0016L𢲖􉋱\u001b􌠺H󲭕Bt󾬏op󶳴e'\u0018𪩊v𩰞3/󴸵󵯖P🞌[o𦥿𨞂_쿀F^৽80K\u001ey\u0018;\u0005v\u0012jp𪎗,E9x枢󵌡m\r.\u0010-@\u0014\u0015;P\u001bW(c_\u001b\rl􇢐K𧽥%󶕅p|\u001chtf󴦀\u0000\u0011=\u0003E\u0010ȡfgj󷀜c}*D \r2w𧊲󱤚𦍗\u000c<𒁣he\u001d𤋂􂋖LWn􎨵#B􎺑\t󼵭;𫠈q\\pr2\u0019銈\t+fS/\u0018$󼣟y \u0019\u001e𣳱\u0015􇴪b9𐴷󵈖𨄹\u0010𭍁EJJlgg\u001d𩪓󲽬<op劆𡁠]!V􆈡\u00125h\u000c,3e󾸰X\u0012E\u0006S4􏩹􅱟d󼯛O𧩺ɦHYmၟ/쭧\u0005󱧀.\u0014\u0013N\u0017_V\r\n\u001bH182켡H\u0016\"P0A\"𩇨􇌨뚩X𢤒E\u0003󷝱JQd\n=tTU􍏒􇾆#𫬙INg\u0000㞓𬭸\u0010󴌏\u001e􈞌q􄌈@u󹇏5\u000f:\u0016\u001d\u0007𢵁\u000eh\u0013󾳿wi𭕢ok\u00167[󰪒\u0002\u001d^\u0014\u001a\\𭳦􁘒d{(\u000f⾽8\u0007󰼣\u001eT \u001b?Jn􀞻+4\u0002\\Z󶪩C>gO_p󺌧\u0001󻃦猎𦨕7I\u001ah𮉇qCk7󲷟𬣺𦧩N󺾿󳝭c롖t]|􃃏as􄯙ね􍩡5!w%𬫥*\u0018X\r󶾣R\u0011𡥒\u0007@#󾣛𬮳~\u000f\u001aP\u001e􇙭\\远9s>\u000e##\u001e\u0015󻼌􈲺U⦍g\u000c{\u000ei󰩴\u000bꌾ䒨󳀃\u0003\u001deo@E\u001en\u0010\u001a墠\u0013PZc(𗛧􇨮󲛥V2󶳧z􏡂\u000e愐.􅰤\u0006Y_#`&\u0007\u0016􏴥5^󲮸\u0019]Na\u000f􈃾\u0000%3$o=𠂠\u0006󻞷􂫎쿥%👡\u001a\u0018\u001a􌸿L𗁇Q/S\u001c󳪙<@a\u001c&!6𫚻~􆲇䑜\u000b𣊄𫜄\u0008\u0014\u0019b􋭢1𭹝#d\u001e&\r}𘘥🨆%t𥮙U|D\u0014m𬬾\u0015#yC\u0013amKV ?&pR8&4=󾑅\u000e3󽋒ꯏ*t<e󳚨𦥺\u0015𢔱s`Y*4iy𘎗C\u001b\u001e􁜿/'?􃷂󶍵{\u001aO^Z\u0013YgjN􆮳[\u001bl'\u0000z\u0019􄚪𓌒0\n:\u0011􇆘󽾢\u0011󶓋\u000e\u001cj􋂧@\u000bB𤤺z\u001e𠐐\u0001^%\u0001􄍠v\u0003(_\u0008𮪎\u00192􇗨+qp\n􂲬.\u000b\\%𮜯􆑷𫋵\tਮ\u001c\t𒊅GthH\u0010\u0008Y𧅐b!𡼓`?𧕫mrK\u001a%z\u0005𡏚􇩈3\u0013;锗Ca\\t_hW3肸~-𐚎󺎢𣚴􌃓\u0016zL\u000c\u0006𨽰󷷗􅚎\u000c28i-/\u001e뜁Q𧴮` b\u000bNF.UKPl\u000b/IJUZ \u0012Koh.􋶓\"h.\u0011P𩳭詣9Sg]\u001bk\u0000ZQ}\u0019􈟇UB\u001bVeu\u0001U􀄲.g*N􊆝@􊪨垧[2\u0008멎*#o趂Zjp\u000f\u0003\u0007&]qLD117:/&$\u000e\u0016b+\u001d^􎐍\u001b\u0018􌱑~;󲖚#;K󲹮",
-    "description": "<*n\u0001@磮-\u0002\r\u0014Wr\u000f󶃔\u0013\u001e􄩔|\u001f蠓\u0001E&𥚯󽃸𖣹!L\u0005J\u0006㞤󻮽/>\u000fF}5u\u001f\u001f9\u0014𪦾1\n󻢂􄓒I1V󸇄m\u0005𗬨g\u0005x󳫌\"\u001d􎭈c󻔔\r-/\u000e县Tf9𘗓\u0003a󽦒󷐱q\u001d󾧩\u000f1𭋛wL\u0000󵤪` o^𡾴D\r[!Z\u0019]𪷎\u00011\u000f`_xlwX~󰁍<KL󹩉}\u0004(󼩨}@\u0014\u0005\u0004z\u000c𬐒𓍕t𣪤󵑨{rUk\u001b\u000eC.8d\u000f16)󱞀&}\u0018%󹙐]#ME93XKFZ+`9'R(\\􇋍%鏭j\\O􊛋c7􄋙3􊰒𪞩d\u0003󱖼󶅹鯕󾃧ce[ni󺘽I扰%\u0005m\u001e\u0015\u0016R\u0019[𤫲4-y믩I#󷞫=Re\u000f\u0007?bj'Q*xY\rz检Ki\u001f룣jB\\𧳥@󿎒l𡑬b⿷2H\u0011覷E>\u00109󻮑l\u0000^V6`𑵕􆣤\u0004D oo5\u0004u\u0010MA󹥡\u0005\u0019i㙌\u001buc󱃄z7t􇌓W𠺚e\u000b)9󿨭f𗥜Fn𨈒\u0011\u0004e𐲔\u0006\u0019(\t𐢀𥠠𑊏\u0017💋Eb􅶎1\u0018D\u0015>mqH\u000f󳶢𗆸:\u00101_l,\r@O?󻫸\u001d\u0017󵝽\u000c𒇌A􉙜)6Y筎􉓽N\n\u001a(^Z/~o\u0000qNdf5\u00158`D[t_s𪾭\nb<SY𧫸qZ]󹿻\u001be\u0004KQ󿠒\u0016\u0016\u001f\u001d󳐗+$\u001b?#\u0002\u001f\u001d\u0017󳋺C:􄮁/𪛋]'벏I;𡹒\u0019z𬗳&Z\u000fO'#\n)􆱏\u0012_󴞾\n\u0017S:7󼈧z>=*\rQlb\u0019h󻑝O\u0019RKs\u001d\u0012\u000e梖q䚖=J@+\nz􄑙몎U,\u001aq􉘁7>M\u000bY􎺭hꋷT]􏈌[-+蕚Z'qW7%􌖓j6\\u\u0013\u0004`k𬅩!o􊜣\u001c\u000c\u001e𤡉1𬥥5MwmP<tY\u0010䑺`󼳵􁙂V-𤰲\n󷸠𦣾8\u0006ꆼC:Ou虈\u000c𪲅b\nQ􌁟􀴋Q혙\u0006\u0001\u0016\"'󼗥N\u0006\rJ*T3w0𤺖𭅪S\u0008\u0011\u0007󼳇+B󰠆=\t~\u000e󴦎𑶨)?D]\u0003󵶂}\\bo\u0016f\rG􉶍𝪬󸞚l\u0018G@r󶐸􄵟𦙣ECH,􂢵!}𣚘🚻\u0005J3\u0012+K羗x\u001dos􎣭\r\u0008𤪲P<28⦄w^󱬀𮪲𭚲K\u001e𬼋\u0018\u000b[#\u0010&b\u000c\u0002z-VV􆳯\u0007B\u0019<ST*r4𩺓􍜰*\u001a\u0000~y$於A.\r󽛋\u0011HX>;%Oԩ]Wp雰󳦸𗮑)\u0014앻󹳢MR󾗰P\u0005'\u0001\u001a-\u0013d􊂮{𭗺'<\u0001\u0018RGw𥵓䝘s,PwtQ~\u000b\u001cN\u0019\u0011@᠇R𦙊@\u001b(J\r<៕\u0007\u0004f󺤮겎~t\u000f􆰭|D()󱍉5j󳴚𬔖\u0018𑘳􆫦*􆴸#[0󶠞\u001c𠏴BCWP󳮺g=t𝇨\u0015󰍀󲒴𩪏V{q}#((𗹡6󸠝?:'7F\u0017㏥b􌊁D+j\u0005\u001eB'=󷅸\u0014􃚑􂖸k􌑞􀎄SB􀈸\u0013:b󳗤둜\u0000\u001b􆿁n?󶸶i𓏸8I趛[%[\u001ev /咖S𡢒𪿛?􏆦\u0018󴵽=w󴤬V󴑂톘\u0008]\u0018\u0015R%􌣀􋢘}􃤣$𭼥\u0015􃾁4\\\u0004|𢙬Ti󿃆\"󵡝󿣽\u0017EX g🎼 ❢X#q2􁚨<\u0010蘀􃬺H𪦠\u001a3W􂯌A𭋀Rv􅚳#𥰉B2\tF*𢤴wibh}+y4c\u0016𦀩`4󿱬o0}􂰵鲼EC$-\u0014b\u0012?CF\nK􆭦􁈶𘖤Y\u0002n7H𐮫p􋫁\u00117󻲿N%\u0013O\u0019{7􌷎h𗗭Pn𧯘\u0007頬_u𧯫洤\u000e𑚄;<"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_15.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_15.json
index 344bbc01b77..e33df485a70 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_15.json
@@ -1,7 +1,7 @@
 {
+    "description": "O1 ~Jc#c\u000b^V\u000eAW_ 󷭊`HrZ\u0004lA/<af𒌸\t<󷉮p&3WaI󺺊vX􋵘y@\u001f&\u0006\u0014*n\u0007)󶧰\u000f\u0019_t𣲏\u001f0)?X&d.Gd\u0016Z\u001b􇚚󹬖`H\nv𤰏ul7e\u001b􍍆N<ჂJ􎮶U<􎕸봣𬿔_@m𢶯\u0014~\\􌶕I\u0001\u0002\u000e8콢Dno57-K􈺤$\u0018􇖜㏒󵷟\u0016􊦈􁄟🞊g\u001c􉡚\u001c󹺡Pf~B\u0006\u0000r\\谹9{}!m䀧#KV𦜀\u0017x􀺣𪟩⍗nO5𩧸|󴹍❸𮌹Jj\u0005\u0016\u0004&RT󾕣t/Nu𭘚zWl\u0013>2g\\0􋖁\t\u0013b\u0011𐬟{z\u0012%Hk􍰘sqUA=&A5Q+\\&𗣥􇵺A􅊛{^\u001f)^5\u001c<iᾇ\u000c\u001c\u0004x]􈱯yl`_\\a0\"%ᦣ\u0000\u0015\u000b\u0001B𪄯󵏪:\u000e6ﺶ~x㲢\u0010^'􏐦ZL󲉷\u000f\u0019􎢲`E𢘜l諐𠧩WnkPPr􈀸𢠘@0y𧅀Lg󴰩\u001eX:Y󵓹\"շc󿏯\u0002Z󹇚Z\u0002迏𡭔\u0013\u0016\u0013\u0010H𗎋}\u0012􅢑𨚎W\u0017􅡐/8nh0H󷢃{\u0004\u0019힓𤄮쇘.^\u0000\u0008𪷕􍎧&mgC#$𥅢\u0015𗍒Y!𢓭M\u000c f\rB\u0012蒯YX U&󼠘\u0007\npd󲽥掕𥞫|󻴛\u0005鱮\u001d=s\u0000􁕿!a\u0006i󻅢\u0017;U멸h󰈸#x𝝹`󲢹\u0017\u0000\u0017WmF𭅠'󿨠T\u0018􍋟㥅𝜏𡏫h2𪺭^M~\u000c鮿z\u0004\u000b:T\u0004󱳑\u0010Yq._M\u0000㸠-\u0006𡧄A𫅇7)\u0012즖+\u0019mdw\u001a𩒙]iEA󿇁\u0005[L讖󱙔p􏤸\u000b]旎Q\u0008\u0001󳴩켜􏯃){𤼐􏒻􈓐\u0013<🏏\u0003\"H\u0006􃡘GC\u0015\u000c\\\n\r\u001aA􇥚%N>\u0004W\u001a\u0010󵑴󱣬$T>*\u0010\u000c㌃c𔘙\u0001G\u000bV潄\"<f󴝰󽄾_x\u0016KAc#/#\u000c=􈳡\u001ajwa乇K\u000b#󲌝󱲱\u000eFL\u0010􉢏U:􏇥\"<\u0018𧉼\u001d%+m\u0012XEhJ\r𭟂똭02ELVIuo0!\u0002\u001dn/g\u001b|v󷙨\"kM34Zu/𣭄r\u0012􊎨x\u000e\u0017V?P\u0007𫾳ஶ%TꆓyW󴓎\u001eഡ쨖7.LdU-\u0002\u0017MHZ-{\u0001FD<@|w\u000eR\"\u0003ade06\u00012LO0󱗹a)M1\"UqSCY\\O􋹾g\u0005G\u0005@\u0004g4\u0013G\u000e􌰉*`a󺊰4i\nQE\\_ძ\u001cu\u0005e5Zk\u001fG\u00154z\u0006󺩧𣝱</􊅂'\u0015[󸊫\u0007n\rV!e\u001a􇽌􆆒󺈭\u0000꒪\u000e\u0003e\u001c>LB9\u0008🐳+󳨁7O+柀\n`q-8 iu𦻻/\u0008󹫪\u0014㨺E\u0000?c斝\rK🏫~\u000b𪻥w{𬐇\"M)GU󸕅Y_'\u0012A󸰙􏯣􆊶z}UukH:8J{\\M9}\u001a_O󶯓󴳋󴯊A\"\tKA𠁏hHA\u0003t𬷖\u0013􎷋\u0007󳰤􏙭\u0014󰛜\u000f,0\u0017Ps𧤾P􌯚曜<2Mf𬑂2𘥔MQB\n\u001c\u000f@\u0018\u0001\u0013/\u000e\u001a7z􂓴􋭉9(1Dh󰓭ꌉg\u0016\u001eb0-*U󶡈\u000b󱰨i􉈚𩥘D쑎Qӿ<)𡲵T1F\u0011􋙰$\u0004#Ꮣ8\u001a(Y􋯵\u0010>􈣟쑘𐬕𗣄AC󸇂2𬅱0\r\u0010󿪷{𬝗+\u0000y45󸏙~𑒕Poa倞T\njꇅ\tf󼺍O􌏅\u000c]􅂹\u0003뛓&\r𓇢yF_\u001f\u0010ASe~[=/\u001f \u0004\u0008$魔􏫽g\r6x\u0010P\u001e\u0013疹OO󽽓r-ARf",
     "email": "𫘋-\\@",
-    "url": "https://example.com",
     "name": "\u0000A]𭔢Yw\"TOP[f\u0004w󲓊W뀥C=m瑜@s󲾇Z􌿧찯1 𧢓(\u0010树[\u0003V\u0008*𭎳\u0005󳤄",
     "password": "UL󻼽ཽ󾻖[𬫍ki􍵋ꦼ􃀃dMzz𢁁\u0011\"!Ut!󻇨𠀏󹯋u𤤔!𦎥󺀥K+'!x*e$^4\u0008􅭁􅊝&\"􆊬䠽P\u000fK􆬋𣼗\u0007$\n\u0014'%𥁋\u000f㜯󾸆\u001fq?𧸸N 󲵪NAsu_f䀻\u0011S\u0017J\u0007g(𢳳cee~􁔂Wᯘ\u0016`-B􎦦𗫘Zc\u0016\u0004𪧘.\u001bt䁧g\u0018𗊁\nt\u000bKD\u0001󼠟𘅣w\t(\u001a\u000cd\u001a󺑤J2\u00056;e󾺤c\u0016󴟪&+gU`hp\u0011W󲀝<\u000bq󵢔{􎱍vM󸱛⽃'</୩A􃥉!rY7x\u00007𥤏PNJ~^A+\u0018_n9𠎎8󺾆d>c𤳐)\u0001뻹'\u0008Xw\u0012y-eil~󸊞s[𐑤􂱯󶁮ꕗ\u001d\u0011\u0011\u0015CWK킷tJu7􈚘\u000c[ꁂ\u001c󲀕&\u0014𫙀𩢐𭵼C\u0004db\u0011T\u0002t\u0008vs\u001dc1=`\u001aKmu:3\u0002􁸂餠RMW)􁡽c$Qk􀊩2\r+𗛝棿EC📭R\u001cm\u000fPG\u0005X\u001dN\u0015[Z3aVL?􋐜|ﭴۛ\u001a{\u000e𫕹󵬽桰p\u001d'sp\u0013<c8\u000f<\u000f'𞣎\u001d@󻝌yC\u0015𓁶'Zb􄕙󴵞\u0003.\u0006 P\t󳠎z􁏗~𠓕>𠷬󾗯Y􋒾𨏂KD+X䤪\u001c𣽐vT\u000bO𦒥\u00056KENY\u001aT󳑛5󻞦\u0016绔K`g 𥂆𨀢\u0011\u001dh]*(w0_𫶚=\u00178㊮b󻯕6쒻𢸼P󼨷􊚮ꆝcI\u0010㓅\u0013𬙯忂\u001f𦭮\"P\u00033󲨤c󷰔 \u0007\u0003उz\u0016.^e(Wiy\u0004\u000e$\n泹>􉍀᳕r󾷆)^AE;\u00149𭈂\u0001𝜴\r𢔰$\u0017􅩗\u0006蒪0𤗃6𔗱\u000e\u001f藴\n_\u0005󾊂\u0003\u0014􌫹u\u001d桏Q𥰈H\u0001\u0006\u0007􎈙jiyh=<\u0017)<\u001f$󶤙i𪒐? I\u001ap\u0019f4V𧎤xPﲨM7G2\u0010􃨨􆰊󴌷󱁞JF^󽰗􂦧\u00143\u0019𨍌\u0006\u0007/VMhe䤸Uw\u00026r󼰅𬏛P\u0016>]Z1\u001fe嶣Os*3􏈑􈘲𔘵𤓜􏨊𐂗=󾪯\u001dtDk?𥥇9t\u00108\u000b\u001c\u0010(⟏𣴾NCw\u0014<􍡯C+(|􊯽􃘣&).\u0001\u0007+b\u0008n'`Mk􁃚\u0010熟\t𘀉h?\u0005{/\u000c󸡜9\u0015\u0012@씪󰘪g𘜭4vKVT\u0003\u000f[O\u0004\u000fay\u0008󱂲\\s\u000c􋏿\u0017\u0008􇝎<|P𬑐\u0017=a󴿘\u0000D$󹠾b~$󸴲𥴠r乄\"R󼄐\u0003\u0011秩M*sC3𒈃k\u001eo\u0019,\u0015\n𪫋5\u0017g1!\rd5-󲮗𮓃C󶖙&%zz3🛌􀅳菊:`M5B󵅙ઙ\u0008g\u0017Qg􋓴Y𭁡kZ􁐗\u001b𛊆\"\u000c\n\u001aFJ\u0002\u0008\u0011b=\rE6Nെ𒍎Ns󷅥!J􄩫\u0001\u000bVT\u0002󴙧􎥶`2/啀\u001a󴝘za]\u001d)􅎣l󷿥𑴓q􂂸􂵢dtj󻑪:g镵₠𡵦*U\u0012\u0001u\u001eI􀁻i鞎'.=\u0005W",
-    "description": "O1 ~Jc#c\u000b^V\u000eAW_ 󷭊`HrZ\u0004lA/<af𒌸\t<󷉮p&3WaI󺺊vX􋵘y@\u001f&\u0006\u0014*n\u0007)󶧰\u000f\u0019_t𣲏\u001f0)?X&d.Gd\u0016Z\u001b􇚚󹬖`H\nv𤰏ul7e\u001b􍍆N<ჂJ􎮶U<􎕸봣𬿔_@m𢶯\u0014~\\􌶕I\u0001\u0002\u000e8콢Dno57-K􈺤$\u0018􇖜㏒󵷟\u0016􊦈􁄟🞊g\u001c􉡚\u001c󹺡Pf~B\u0006\u0000r\\谹9{}!m䀧#KV𦜀\u0017x􀺣𪟩⍗nO5𩧸|󴹍❸𮌹Jj\u0005\u0016\u0004&RT󾕣t/Nu𭘚zWl\u0013>2g\\0􋖁\t\u0013b\u0011𐬟{z\u0012%Hk􍰘sqUA=&A5Q+\\&𗣥􇵺A􅊛{^\u001f)^5\u001c<iᾇ\u000c\u001c\u0004x]􈱯yl`_\\a0\"%ᦣ\u0000\u0015\u000b\u0001B𪄯󵏪:\u000e6ﺶ~x㲢\u0010^'􏐦ZL󲉷\u000f\u0019􎢲`E𢘜l諐𠧩WnkPPr􈀸𢠘@0y𧅀Lg󴰩\u001eX:Y󵓹\"շc󿏯\u0002Z󹇚Z\u0002迏𡭔\u0013\u0016\u0013\u0010H𗎋}\u0012􅢑𨚎W\u0017􅡐/8nh0H󷢃{\u0004\u0019힓𤄮쇘.^\u0000\u0008𪷕􍎧&mgC#$𥅢\u0015𗍒Y!𢓭M\u000c f\rB\u0012蒯YX U&󼠘\u0007\npd󲽥掕𥞫|󻴛\u0005鱮\u001d=s\u0000􁕿!a\u0006i󻅢\u0017;U멸h󰈸#x𝝹`󲢹\u0017\u0000\u0017WmF𭅠'󿨠T\u0018􍋟㥅𝜏𡏫h2𪺭^M~\u000c鮿z\u0004\u000b:T\u0004󱳑\u0010Yq._M\u0000㸠-\u0006𡧄A𫅇7)\u0012즖+\u0019mdw\u001a𩒙]iEA󿇁\u0005[L讖󱙔p􏤸\u000b]旎Q\u0008\u0001󳴩켜􏯃){𤼐􏒻􈓐\u0013<🏏\u0003\"H\u0006􃡘GC\u0015\u000c\\\n\r\u001aA􇥚%N>\u0004W\u001a\u0010󵑴󱣬$T>*\u0010\u000c㌃c𔘙\u0001G\u000bV潄\"<f󴝰󽄾_x\u0016KAc#/#\u000c=􈳡\u001ajwa乇K\u000b#󲌝󱲱\u000eFL\u0010􉢏U:􏇥\"<\u0018𧉼\u001d%+m\u0012XEhJ\r𭟂똭02ELVIuo0!\u0002\u001dn/g\u001b|v󷙨\"kM34Zu/𣭄r\u0012􊎨x\u000e\u0017V?P\u0007𫾳ஶ%TꆓyW󴓎\u001eഡ쨖7.LdU-\u0002\u0017MHZ-{\u0001FD<@|w\u000eR\"\u0003ade06\u00012LO0󱗹a)M1\"UqSCY\\O􋹾g\u0005G\u0005@\u0004g4\u0013G\u000e􌰉*`a󺊰4i\nQE\\_ძ\u001cu\u0005e5Zk\u001fG\u00154z\u0006󺩧𣝱</􊅂'\u0015[󸊫\u0007n\rV!e\u001a􇽌􆆒󺈭\u0000꒪\u000e\u0003e\u001c>LB9\u0008🐳+󳨁7O+柀\n`q-8 iu𦻻/\u0008󹫪\u0014㨺E\u0000?c斝\rK🏫~\u000b𪻥w{𬐇\"M)GU󸕅Y_'\u0012A󸰙􏯣􆊶z}UukH:8J{\\M9}\u001a_O󶯓󴳋󴯊A\"\tKA𠁏hHA\u0003t𬷖\u0013􎷋\u0007󳰤􏙭\u0014󰛜\u000f,0\u0017Ps𧤾P􌯚曜<2Mf𬑂2𘥔MQB\n\u001c\u000f@\u0018\u0001\u0013/\u000e\u001a7z􂓴􋭉9(1Dh󰓭ꌉg\u0016\u001eb0-*U󶡈\u000b󱰨i􉈚𩥘D쑎Qӿ<)𡲵T1F\u0011􋙰$\u0004#Ꮣ8\u001a(Y􋯵\u0010>􈣟쑘𐬕𗣄AC󸇂2𬅱0\r\u0010󿪷{𬝗+\u0000y45󸏙~𑒕Poa倞T\njꇅ\tf󼺍O􌏅\u000c]􅂹\u0003뛓&\r𓇢yF_\u001f\u0010ASe~[=/\u001f \u0004\u0008$魔􏫽g\r6x\u0010P\u001e\u0013疹OO󽽓r-ARf"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_16.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_16.json
index f7ecdbd79f4..061b6f49e32 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_16.json
@@ -1,7 +1,7 @@
 {
+    "description": "X\u001b&%\u000fr󷝶tGpJDG𗦖D\u0003𤠣p<'a\u0004kQus[=􃿘\u0019\u00144b\u0001fꊁxx\u0016􍷁c&Y`῾&𧠻\u001a@<0C\u0008&op\u0012).q\u000cR?L󽣈&􆽉\u0018Q\"k\t𧦰󷃓𪂧bg\u001b󵳠\u001dAK\u0012Y\u0008欯j倅.*WG󴥕K􀲡\u001c\u001fZ#\u0018\u001a𣀧𤠉_=𩰏I􏖍\u0008䌠r^\u001b\u001fA~\u0011\r뵖\u001a\"\u000e}𤉳\u000b\u000b𮤱\u000b󺔇@\n0\u000b\"{e\u0005f𦽈D𘀦􈃼G党󶪩󼦼猦RB䉂\u0014%upl\\0\npL V@󸕃 #ZI𑴤pv\u0012z.+@l;딴󱡷~QQa状\u001a𪍿\nk鶑\u0002󶽹Bw鰻\u0013J𗵗w$\u0018\u0018hJ\u0011􅝦\u0011\u0001⣺*\u0010j\u000e\u0006T󻼡o𖥦󸐍1$rQ?oKn󳑨t&󸻱~\u001d3 R8𪌯𗤋[$(󱐋Z4󽢚a Bp1𢩍t􋚕^/M𣟭H\u0011\u0011lW󳇈\u0004(󿡗)@4􋮕dM󼐁\u0014 0m\u0002IkmV\"\\𥮇M3_\u0001𘖆􆝐􀪈\u0004k^TU\u001b1D\u0011E$\u0013􄒠\u00042''Y􃓲g#$eꃄ<*YU\u001b]\u0012 ],󿨶\u0005~+@\rZ@Uw&IMz󳁬\u001f-\u001e󵹟\u0004A<sSz1S󹂷\u0000V]𡉛Q𐒌gf1_ᝅ%$)\u0011􂔶R<떶󶥘𦕨􀾐望𩇞\u000e􆰛𠰛cG\u000ft-|󲉾y󸬐d𭣣G\u0014􀣜\u0010fL+x`#𭑣\u0012𧾂5𫺃󿻠7\u00088p\u0003t]󷉔\u000f;\u0005`nbr􅈭\u000c\\h|𭂒\u0014k􂧚󿸦|𠊜rWl_󵼗2}󳸦M;^|e\u0018VVUV<酏\r􂮢GꙜz7aL􂦄j\n𥹳}ᑆ\u001c\u0019󾖷ai\u0018\"󵂧􇉀𡯄\u0002$Nn!\u0016HT-􂚖\u0019󲸱lj􉄜\u0001𩬗󱄾fV(\t{0lq𡜈7RRaBGYsq\u0016M\t=a𐊡69zd\u0002\u0007?1zF)U\u0013\"v\u0005M\u000bU*☍{\u0004cSXr\u0007Rྪ\u000c2M\u000e𫬗aW>rWv-[?􈑞\u001f𤕵w\u001b\u001c\u0011𫀅󽿪􍛕𭈫\u00175􃲚􈐮lr<D𤓦a􂐇􀦣>\u0000ka&Y􇙦;r)U\u0002x\u001b?Uw𨕲\u0011\u001c􆸾􋙝'𑀜𦤣􂓫󴞀\u0016\n-꼇]𧄄\u0015s𭆛<\"[>g\"\u0001\u00029󳍟dY􈞋\u0018녷\u0018􊪨$L\u001aIO}\n}0(5?k𠔑󲢈󻫖\u00034ꠈn\n샼𣵺;􇡔\r\u000bP^u􏸙\u0011#㩦\u001d8󷒸\u001aU󿲾O`cT$o\u0013󺖣𤨻㊤psO.|[#\u0016X[\n\u001bM, 􌵶&y,\u0015,`d,\u0018gMNr\u0000\u001a/౯E{ⱉ9R-\u000e\u0012􇵌E.\n$",
     "email": "\u001b\u000eFk2@;",
-    "url": "https://example.com",
     "name": "\u0016\t\u0017S,gN\u0006+mK󲯾>Yz\u0016^jl󱍧󼉪/@Up`\u0004䯎\u0005!󾿈Q\u001dH~?@=b\u0002_xీ\"𪵛cfF􀐩]㐍XP\u0008\u0010\"\u000e􁲕P'Z\rC]󼕬𐬐􄐢#󵌐Cq󷓭s\u0004􉴯=\u0016\u000e󹯹(%𦛜rU_~󴈣\u0016o|v<\r𭖡𫮕",
     "password": "ScV9\u0008湃\u0011/\u000e􈎅~\u0008@\u000fN\u0004p,\u000cﺵ󸥄O3鞠cu\u000bK𗐂𬁬󴅋Sfi􊿆&􍂑`\u001cG\nx𮊜0\u0018\r⓰>\u0002xC爩\u000f􊌉9󵲄\u0008H\"\u0018IA\u0012R𐆗&𠨻%\u001e󳇹Y㆚]*\u0019f!g\u0005;4􃱔M%􁒋󶗧𨛤h𠁳w󻔼􂵾絖\u001d\u0005~t&y𐇴i\u0008󽚨`ퟺl6􆮝􀽻+☼\tj𝡙;X\u0019)@m􅗾𒄑󻆣2`𥺇󺚑mw=wbEA\u000f&\u001b4wE􃦙SN䒓ZQ􀒨)V\u0015QX\u001ce\t-I\u001eeY{F`h\u0000x􆁑牛\u000b%\u0007p)tXiOV;+'6JKh\"\u0005\\h0\u00170󼺁􅧉K;󼡛3]H[󶱔O2f𫉳􇕍9iOa\u00030]!􆁧\u0017\u001cs>&󸤠[𫢾O𤁦/k\"h􁟿~#'G𐼾魑vmN𣁑<p2\u0016\u0011\u000c󼇴d𧆃q_y\u001f󲠏󸜏c隈/罩z)FK􌅘4􈴴󸉌\u0008v\u0006&\u0018\u001f\u0017󲈵M/`\\\u0019!'𫶚𪘑~LN^橯􈄮\u0003빰땫􄨁𦗗$󳒄aV􅘈\u000b2jE􅄀XNs\u0003MW𬈨\u0002OޓFpz<󽿷(u\u001bB]Sh3U𮧑UI?l0\"<\u0010󾭺If󳎃2S \u0016\u0006Dq~e𭉨.j𬊋􂗫\u001b)'/8:\u000en헪]b蝝􇫬\u001b\u0019𡎞𘓪\u001dpt𝟎Ғ#娴𪬃<l󺝯某󺬿f*z𮂐H𡺉`f!\r𮈙V􂚊鮭I鑠M`\u0017x.7(k7\u0016#b9<𮣯썹\u001e⸺<w𡈴\u0000O\u0012nC􂗅\u000f@W3\u000ej􀖇}\u0002\u0004\u0001𩑕$\u000bK}𣑟\u001747\tZ\u0007q𞢱𣡭Cmhs[/uo`2𨣡r2⭤)^\u0011s_󳊵9㠼䞺T\u0014%h󴸴\u0011\u0001_9O磹Z4쁧",
-    "description": "X\u001b&%\u000fr󷝶tGpJDG𗦖D\u0003𤠣p<'a\u0004kQus[=􃿘\u0019\u00144b\u0001fꊁxx\u0016􍷁c&Y`῾&𧠻\u001a@<0C\u0008&op\u0012).q\u000cR?L󽣈&􆽉\u0018Q\"k\t𧦰󷃓𪂧bg\u001b󵳠\u001dAK\u0012Y\u0008欯j倅.*WG󴥕K􀲡\u001c\u001fZ#\u0018\u001a𣀧𤠉_=𩰏I􏖍\u0008䌠r^\u001b\u001fA~\u0011\r뵖\u001a\"\u000e}𤉳\u000b\u000b𮤱\u000b󺔇@\n0\u000b\"{e\u0005f𦽈D𘀦􈃼G党󶪩󼦼猦RB䉂\u0014%upl\\0\npL V@󸕃 #ZI𑴤pv\u0012z.+@l;딴󱡷~QQa状\u001a𪍿\nk鶑\u0002󶽹Bw鰻\u0013J𗵗w$\u0018\u0018hJ\u0011􅝦\u0011\u0001⣺*\u0010j\u000e\u0006T󻼡o𖥦󸐍1$rQ?oKn󳑨t&󸻱~\u001d3 R8𪌯𗤋[$(󱐋Z4󽢚a Bp1𢩍t􋚕^/M𣟭H\u0011\u0011lW󳇈\u0004(󿡗)@4􋮕dM󼐁\u0014 0m\u0002IkmV\"\\𥮇M3_\u0001𘖆􆝐􀪈\u0004k^TU\u001b1D\u0011E$\u0013􄒠\u00042''Y􃓲g#$eꃄ<*YU\u001b]\u0012 ],󿨶\u0005~+@\rZ@Uw&IMz󳁬\u001f-\u001e󵹟\u0004A<sSz1S󹂷\u0000V]𡉛Q𐒌gf1_ᝅ%$)\u0011􂔶R<떶󶥘𦕨􀾐望𩇞\u000e􆰛𠰛cG\u000ft-|󲉾y󸬐d𭣣G\u0014􀣜\u0010fL+x`#𭑣\u0012𧾂5𫺃󿻠7\u00088p\u0003t]󷉔\u000f;\u0005`nbr􅈭\u000c\\h|𭂒\u0014k􂧚󿸦|𠊜rWl_󵼗2}󳸦M;^|e\u0018VVUV<酏\r􂮢GꙜz7aL􂦄j\n𥹳}ᑆ\u001c\u0019󾖷ai\u0018\"󵂧􇉀𡯄\u0002$Nn!\u0016HT-􂚖\u0019󲸱lj􉄜\u0001𩬗󱄾fV(\t{0lq𡜈7RRaBGYsq\u0016M\t=a𐊡69zd\u0002\u0007?1zF)U\u0013\"v\u0005M\u000bU*☍{\u0004cSXr\u0007Rྪ\u000c2M\u000e𫬗aW>rWv-[?􈑞\u001f𤕵w\u001b\u001c\u0011𫀅󽿪􍛕𭈫\u00175􃲚􈐮lr<D𤓦a􂐇􀦣>\u0000ka&Y􇙦;r)U\u0002x\u001b?Uw𨕲\u0011\u001c􆸾􋙝'𑀜𦤣􂓫󴞀\u0016\n-꼇]𧄄\u0015s𭆛<\"[>g\"\u0001\u00029󳍟dY􈞋\u0018녷\u0018􊪨$L\u001aIO}\n}0(5?k𠔑󲢈󻫖\u00034ꠈn\n샼𣵺;􇡔\r\u000bP^u􏸙\u0011#㩦\u001d8󷒸\u001aU󿲾O`cT$o\u0013󺖣𤨻㊤psO.|[#\u0016X[\n\u001bM, 􌵶&y,\u0015,`d,\u0018gMNr\u0000\u001a/౯E{ⱉ9R-\u000e\u0012􇵌E.\n$"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_17.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_17.json
index 4fe15568782..f5e6a705ad4 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_17.json
@@ -1,7 +1,7 @@
 {
+    "description": "𠅑x54c{Њ􅩳\nT`뛌\u0010銷P+4/􌌸\u0003􈰍R󳸟~絈y+k𣮴/􄟞,\u001fl>\u0003[T&i$Vj㫫\u0015\u0016$􄛶𠿸^\u001chM\u0019\nr{4ੱd􏃲󽵨IG\u0002𗀲",
     "email": "lW6/@fD􊻥",
-    "url": "https://example.com",
     "name": "\u0014*43􏰸Xg\u0015\u000e;\u0015J}󾲰wZJ󻍓.=c_\u000c\u0010I𔒨\u0008mU\u000fnT",
     "password": "\u0008\n6Pq=􀪁(y󹅻y\u0001\u0016􅜝PO4🦮LJ~𫸗\u001dXn Kc'Fn;;S\u0019]𪯎t󹝃Ib􏆢\u001d\u0015R􏳚FhbLz]\u0000\u0001🠼\u0015\u0005󴁧𦠐\u000fg^,\u000b\u001e󹏐𫕰#F\u0006p𐭣g\u0005i\u000e\u001a\u0013W\u0012\n\u000c\u0018\u0015赥wm;iKl\u0018$󺄓\\](*䎸M𦰚𘡲\u0000\u001aw𠃟t𪬤􆬳􂧈/넟$USI-\u0014\u000b%󺒟[궗󳙱*dh&'I{b󺯯)Y󲙂\u001b󿌅A\u0018Lั\u001e.𩅺i􎰇󴩥Tie=} \\(S'T\u0014m\t\u000e\u0010T\u000f\u0004􁱟m𛇖[1𩂛H𐴝痱}&\u001d晊^󺣵3H󶬱}G󱝳\u0016衃󱊻𫊪U󾯫6􊓸\u0017󴙑*b⋂(N􂽔x\u001eS󴌑􎫛]󳳅xL鷤}𨘩\u0008𭲗}𤉰𓌅\u000c\u0017\u00155K죿:𦯁䨰\u000f[􏫺\u001c>v\u001d&\u0016\u0017\"jK󷴃#\u0000㷋?󺤳emU\t3a~󸱑𭱸𥿻*u󳹑f_8􆐏ي󱜄e􇻽𥢷2ᦸ󹧀+c0𬢔R\u0004\u0002闢CW_3𭸚]󸔑&𪏥qU󶯙?7\u0001앯\u0012gc55u儉阛쨬Xt\u0012H𐹼;\u001b󾲠󵏐pP󽪅󰈁𠮤􇨽\u0005N-\u0016)06󿞳󱢾`賦YnY#(技t\u0013&\u0006iu^o5y1若#𑄹=𘏒g)ꚾ𦨔􈉂?􄎺𣬁\u0015浶墠 󶱩!K5􃚵fk\t;󾔲g\u0010l1\u0019\u0014Vgr$",
-    "description": "𠅑x54c{Њ􅩳\nT`뛌\u0010銷P+4/􌌸\u0003􈰍R󳸟~絈y+k𣮴/􄟞,\u001fl>\u0003[T&i$Vj㫫\u0015\u0016$􄛶𠿸^\u001chM\u0019\nr{4ੱd􏃲󽵨IG\u0002𗀲"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_18.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_18.json
index 5e4906e5c5d..cf6fe2fe510 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_18.json
@@ -1,7 +1,7 @@
 {
+    "description": "L\u0002\u000f\r{𬤮kn횤􏤙VXQ\u001b\u0012𩐆󻡨\u0003熀'􀪻햂𦸓\u001a\u0004󰚾\u0005\u000c\u0005C{@𮋅<[a􃗣gIW𦰆!R􉂊𑴺􋖝]󼀳z䜽𒌑\u000f𝃐N赂\u0014\u001a%1,T&􆉨*; +Lu\u000e󰙔nM󴐀\u0018\u001b\u0016X\u0002a$\u0010acT@P󽺹&𠑄t]k6욞;7Hළ𠑷𠔻MY.\u0007\u0000\u0007󿠾B\u0001Gdb=\u0000\u0010\u0007\nw\u000f\u0015𩸞𡑝Bci*\u0006A}y\u0014\u0008󲚁􁮓Z=󶪰S􍮢Rs(\u0019\u0010\u0014󵰔\"zA;jEcJ𗬦\\􉍮_0v\u000f#P\u0008􁚌x㰒sx󼦴𭷁𣪁𭝣$W􀖴S󵴼􎯳|6-d\u0017\u0007.\u0003􎱌􉫼)\u001cu􌼍.\u0006󶝙^l丫0􃄴q𗕿\u001eY󿌖ag陬Hᷮ󺎒􂷑4e懎aX[#*𤰐=:z냑󶇴􌜼7\u001b\u001bH󰣩dl병􉤍\u0019O𦌺'􈪏󷱆7:]夆x9JLR𫐂\u0001􏒕eGhco𩏾󳩜󳶠𮩭􃤗/]\u0001R\u000b=B𫋴K\u0001@Q%i\u000e\u0010\u0005\u001fz<r\n\u0011X:\u000c\u0019\u0013VYꓣt\u0000\u0006e2\u001e𘈇zjmY%b3P\u0018\n lf\u0007gu'\u0001\u0011A4󺠝􂭋HwuhV;\u001e􇡱f󹲨7𬂿Vh󿟚Hw4􍊸jD\u0016ཆ)dMI\u0008D𤯔(􉔁瘘r𣻒𤝡帇-=󻀈𝛎\u0003K1p,\n󷽜\n\u001c\u001f􏜂􂂕˖\u0005􂥐Q]󰑝\u001bS\u0011𢣮s/bBZ]\u0007WF\u0001j􀗾𤈬MT􇔟R6􍹿壮h\"\u00009|𫹝𬑻X0W(I+𥎠;􎑋\\\"=1i;8<yp\tg\u0013\"j)hQ\u001b𫙠Gv\u001b\"􆿭\u0016󴡳EObO푫`oCG\u0016􍌗zM󸮖\n󻂕𪲰%t󸌔# 𪦄0xzv!e[\u0019vPq󼫚E\u001f󷫞\u0006i\"{PIJ\u0000`T@_\u001dr緪pa!l㈏z9P\u0006ph𐝇\u0010V1𐀎𠙼椥d\u000blR#\u000b\u001f1/𘎭\u0000#~=&d䋶E\u000e9扅cm\u000ftuw<\u0013\u0001Y陱􀛮\r\u0008𨌺\u0005OJ)ZZB􁗣ᑫ\"\u0000📑sNO*6圙c𛃷)Yo􁟧\u001a\u000b{\u000e\u001a8\u0019D𣾟󲢐􄤝bxPK5{􉨓󵰯_s\u0001\u000b\u0018\u000fx\u000fme:/𣝫𪬌􏄾=b%3𭪘Yx󻋍=󸹷􋏸䫲E􁔯\u000bQ􈚪\u001a󰶏fN󹹲𮌻aBQ⭜.\u00114𗗆\u0019Q&p𣹦\u0016cIJ<F:󵇯\u0010\u0017\u0019\u000e噾\u0004\u000c%\\𐚻訢𫩱HUd󹖗*59`3+2o󳅆x󵏈",
     "email": "=\u0010@m",
-    "url": "https://example.com",
     "name": "\u001fZ󰶟,`g􊤶E\nY𭚵 h󰩌r𭎌\u0000xh{𑀸\r2L\u0008ⴣⲻ3󺿿Q;\rzJ*J𪐝L\u001eu%󰅥\u0004\r􇔫\u0013!\u0012l\t\u0013별\u000ex􂠟B1o󷵆\u001aD+\n`𞀖)󼼚[􊋠",
     "password": "w\u0015󺦳\u0005􆣵O5㉷\u0013}Sq0'𮂉\u001a?qk;𨒳P7_3\u0008𥳛 r,\u0015'𦰧爵\u001eVぷ[𧝏󳃈󿡜\u00184S𠞜𑨁D~zyZ\u0016h֬^𨧶𭣿\u0001\rX󷴉󱰄l$+U􏦄󸑤\u000c󻎊&\u00146\u0003􋉟隐>fh󹖑c<(x:_󺞝$\u001e|?_\u000c/𗐈bRvD\u0015󹒓66𫎍jr{ \u001c󾚀h?󰐐spq%&Rxm!i\u0011@󾤌𣥊2d􌒞xn󵖞oU 󱁳🄳f𣇇\u000bZg\u001c2􉟽㡭%T󰮚\u0011y豚\u0000B[\u0014`\u00110\u0002𠨗Q􉶡\u0011􎄿_!G*𑇄𑢶\u0006􍥠R\u0001\u000e1RV󾕌9<2&34b\u0013D2􌎯Ow.l\u001e\u000e\rAr󵹧𡖢\ra)🥊]!a\u0018\\9Vp6󼷽󼗋M\u0010\"}`8V􊽣펀ne\u0017&􃉃q𐌌\u000b咥\u0004Dcꑰ5a4U8󳐝fcm~উC􅯫󰚠4(􂗳Pk\t''M[茫𤗻1𧥶CBSt)k\u0000𠧡􄬻;s湚~8ml\u0014Ʉ󰓸󲑾ik&1}L;D]K𭁚\u0016􌻔m􉈾\r$󵴎𦺭$|𠻰M􉼑􆂫}+=\u0018&􃾖􎀭1𥼗𢚞w\u0017𫙶횳\u000b𨈤􏕓􍑂𭓡\u000bt􇋔7d𦳥e>38R􋟽􀿼\t%i]\u0018\u0006\u000c𑆻^\u0016\u0003t6´𣞸􏸋\u0015fgC7(-tv{mb􋦜=\u001a~}L]\u0000PpH\u001cqW]\nW𠕄\"󲒠\rgr)n'\u0016\u0019\u0004TNk鱟N󶍤Z󿉥􉐾\u0019󺕆𧣝㌉=F@!`\u0003;\u0014F\u00160k|8\u001envY ␏S\n=켻!l\u001bnUC:[HV븱\u000b𠒝\u0012N𧦒\u001czV󼟄W\u001d󶴷𫞍􄅞/G\u0015X𦀰\u0018 bA𬦮n\u0019tN𡂆%%a􈻝8`󹟛{_􁊟𘄾\u0015\u0001Bm\u000ck'Uz\u000bIi\u0019y􍋿x\u0018薱\u0012RmF}Ej\u0018S;s\u001f􍰕-\u0005Gi.p󹫰Y2𝕽\u0003^VUx䠮uA:,T\u000f[y⣳𭲤/\u0007󳔵\u000cz󻺅tq=,S㏕軗-0󷝴i3ld`*󲮭\"\u001c\u001c!\u0019Lt'W=-MW􇏏𦉗暈􌾿&x!Q𢦅\u000b􋥦0IY󹀬\u0001q􊷈0G𩥖h\u001bH \u0012𑋑􄽩62􇱽e󺬟󺷂/_@𥸾\u001a\u0010\u0013~(_\u001e4H\u0003K𑶘}\u000e􇧌Qb􏾉Js\u000c`\u001c􋵙𧣦(\u000cf\u001c",
-    "description": "L\u0002\u000f\r{𬤮kn횤􏤙VXQ\u001b\u0012𩐆󻡨\u0003熀'􀪻햂𦸓\u001a\u0004󰚾\u0005\u000c\u0005C{@𮋅<[a􃗣gIW𦰆!R􉂊𑴺􋖝]󼀳z䜽𒌑\u000f𝃐N赂\u0014\u001a%1,T&􆉨*; +Lu\u000e󰙔nM󴐀\u0018\u001b\u0016X\u0002a$\u0010acT@P󽺹&𠑄t]k6욞;7Hළ𠑷𠔻MY.\u0007\u0000\u0007󿠾B\u0001Gdb=\u0000\u0010\u0007\nw\u000f\u0015𩸞𡑝Bci*\u0006A}y\u0014\u0008󲚁􁮓Z=󶪰S􍮢Rs(\u0019\u0010\u0014󵰔\"zA;jEcJ𗬦\\􉍮_0v\u000f#P\u0008􁚌x㰒sx󼦴𭷁𣪁𭝣$W􀖴S󵴼􎯳|6-d\u0017\u0007.\u0003􎱌􉫼)\u001cu􌼍.\u0006󶝙^l丫0􃄴q𗕿\u001eY󿌖ag陬Hᷮ󺎒􂷑4e懎aX[#*𤰐=:z냑󶇴􌜼7\u001b\u001bH󰣩dl병􉤍\u0019O𦌺'􈪏󷱆7:]夆x9JLR𫐂\u0001􏒕eGhco𩏾󳩜󳶠𮩭􃤗/]\u0001R\u000b=B𫋴K\u0001@Q%i\u000e\u0010\u0005\u001fz<r\n\u0011X:\u000c\u0019\u0013VYꓣt\u0000\u0006e2\u001e𘈇zjmY%b3P\u0018\n lf\u0007gu'\u0001\u0011A4󺠝􂭋HwuhV;\u001e􇡱f󹲨7𬂿Vh󿟚Hw4􍊸jD\u0016ཆ)dMI\u0008D𤯔(􉔁瘘r𣻒𤝡帇-=󻀈𝛎\u0003K1p,\n󷽜\n\u001c\u001f􏜂􂂕˖\u0005􂥐Q]󰑝\u001bS\u0011𢣮s/bBZ]\u0007WF\u0001j􀗾𤈬MT􇔟R6􍹿壮h\"\u00009|𫹝𬑻X0W(I+𥎠;􎑋\\\"=1i;8<yp\tg\u0013\"j)hQ\u001b𫙠Gv\u001b\"􆿭\u0016󴡳EObO푫`oCG\u0016􍌗zM󸮖\n󻂕𪲰%t󸌔# 𪦄0xzv!e[\u0019vPq󼫚E\u001f󷫞\u0006i\"{PIJ\u0000`T@_\u001dr緪pa!l㈏z9P\u0006ph𐝇\u0010V1𐀎𠙼椥d\u000blR#\u000b\u001f1/𘎭\u0000#~=&d䋶E\u000e9扅cm\u000ftuw<\u0013\u0001Y陱􀛮\r\u0008𨌺\u0005OJ)ZZB􁗣ᑫ\"\u0000📑sNO*6圙c𛃷)Yo􁟧\u001a\u000b{\u000e\u001a8\u0019D𣾟󲢐􄤝bxPK5{􉨓󵰯_s\u0001\u000b\u0018\u000fx\u000fme:/𣝫𪬌􏄾=b%3𭪘Yx󻋍=󸹷􋏸䫲E􁔯\u000bQ􈚪\u001a󰶏fN󹹲𮌻aBQ⭜.\u00114𗗆\u0019Q&p𣹦\u0016cIJ<F:󵇯\u0010\u0017\u0019\u000e噾\u0004\u000c%\\𐚻訢𫩱HUd󹖗*59`3+2o󳅆x󵏈"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_19.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_19.json
index ff0d36bd54f..3ddd6ec957c 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_19.json
@@ -1,7 +1,7 @@
 {
+    "description": "0",
     "email": "􍣯\u0018Oe\\\u0008@􈊍\u0004􍬇*\u0017(",
-    "url": "https://example.com",
     "name": "\u0013-\u0018\u0003ﳑ\t/㑋T􂙫\r\u0019􇲪XNiu\\LB.+􈬒𠔺\u0012󴬥",
     "password": "\rAc󾜌􊍗n𫴚N\u000c^&\u001eHl󵻶\u001d(V\u0016柛\u0014!\u0014P󠅶𠈐j𦎢L}D\u0016#u󾪬[\u00066y􎏝d󺍽Qr<󵢺l匙89􉐤.󰯑JDWC4\u0008𗍈\u001eW~t\u0010x\u001a􂓫H\u001aY𠫗ej󷰁\u000c=\\\"z\u0013NFooo󸡂󶬠\u001e;n:<=fq=𧞈\u0002󲕘ZV,<𢂛\\󼏟aL󵔫`\u0017.8􇀌𠔟0󲏯w\u0000*􆬬![𡌐",
-    "description": "0"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_2.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_2.json
index f1abcd40fa2..773701d7452 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_2.json
@@ -1,7 +1,7 @@
 {
+    "description": "􌠋Ygo%ΰI󵘼`F\u0017YT\u001f-3󲔬沖\u0011G'㧛<艔􁗩&ꤟ\u0015𗅁𒁆\u001b]\u0012\u0015)!\n2K3ႚ[+{\u000bCν󶠜\u0014L𛇬\t􀡜E\u001b]AF\u0018褯􈞃􃥇\u000c\u0000\u0019}w[F䡨\u0000𮈤\u000f2𪣰^z𝜭>\t\u000eY𠁿$4f\u0005e\r􄩇E{􎩉\n[>􎝂󲊋􏩵xa\u000eEG󼠍󷅍usz\u0018􇺊Im\u001c1[$󲍚9/\r즅S1U𥶧qK\u0005,\u0012攠󼆯2󲲦ElX&92𭕖T\t\u0017\tkM5󺹑,󳯚#􄢝~'vmCROC󵙙`q(\u0016q􈧉]<𡒠h\u0018;\u00179산𥢕猁X𠋪eH\u0005󵷟e􌒌\u0010XKDs\u001a\u001a \u001a.ྦྷGZ𞠎@󵱜QDOJ𬰪􄃨e𛃂􀉟\u001b7󲖒瓛L󻚂\u0013h=[F􃚺\u0007fH𡟕f𛉼*AQb]ᅙH𫞨𦸁o\u0013&𪨓4\t)yBn25pNa𬛓Ex>\u0006%x쭄B\u001f&MFo.S􅁅=m&us𠯹j\u0003{\u0012:𠍇\u001e􃣩𦹪󸛑𫂬!u_\u001b?毀1n1\u0017zg􎒦N\u000c𫆇?㹽p𠯰󻺩\u0019\u0014X7vS𦍁󿼙P\u000f'󼦴󿉗Nu=.4M𮯘Wu \u0014}N]a,🡹􈿇\u0015)|ぅ9k􀋳\u000b􄚨𭤐\u0000\u001d𩓜\u001e9\u0018Tl􀋌󳚭\u000c읭O%􂲝+D\u0015\u0014\u001bY󴎑𡺖M\u001fc\u0000Y\u001ex\u0004c):󶄷\u000eJ󿀗p\u000ebS?[KU𮝱Ap_𨂥\u0003󰵳\u0013C\u0007/铆1mEmb\\ʝ\u0018\u0003B󾤢J髴&\u0016Z焭\u001abniY\u0012B6\u0013\u0018vm𘧮lM*𘏂𣽸M\u0011趮펁󺻊\u0003𣇬Ee𦦒󲒂w핽𓅢\u00017#[ck𘟪u0P\nPpN\u0011`*\u0004:=-hn#\u00011u:|<iYy\u0011\\f\u0019\u001bkb<\u0015\u000e\u001d𥀽aX+J4殓\u0010\u0010􈩩o9󼫝'􏝭􎷉=Qn󰚞L🍋l쵞\tp\u0017[\u0017\u0015O16䵀:􄘡|𥭙|􂡇s󱂻󷻹w1jKs]S\u0017a-\u000e屇\rt+$h)dkWz}7q!`2w?\u000f\u0017=\u001e2EEd𥖼𦙼󶀠=*𩳋󲻊*\u0016=􁼟\u000fu8$3\\𝔬󶂂􁣧|\u0000H􆋖Yk_\u0016􆚽M𩕥G\u0019\u000b䲶yY\u0004\u0017-\u0005@􅏪;<\u0017q\u0011!Z)󱷎,𨂊Z;e29S1쀠\u0019L𘙭 𛁖\u0006􋤒\u001c𦳤9w\u001e-9󺔴T1󼹇宨9bL\u0016T5g_𤹴^3\u0007󷮗󵣽􂭹\u0014o䌌\u0001nVnyq9r%}\u0001}|𐠳\u001cai\u000f\n13^\u001b𩦗A\u0006.2\u0007w𭬤󻁿k\\z&\u001a􌹯{?m󱒸𫫼􀁩褧9􋇓)􁥐m􍵕-]\r󴀉p\u000c&\u0017/\"P崦𦑋M\u0014\r\u001a\u00120\u000f\u001e󳀣D(됱`􆈚g\t妍\u001b󸛚'𣛗5h0{;𭣟h&BY_𦍓\u0014\u0015tq􆾖呿𤫺\u0015%`.h<&DA\u0017 \u000e\u0000\u000f\u001034熍󺌮c\u0012\u0000𦏏\u0001h\u0006ucTB&􄑦􊵊揌I\u001cj\u0017W\u0001𥼄\u0003M𧽱􃳪A[S\u0002􏕥\u0012:\u0019\u001e󱭲A\u0006d\u0005􃢢𗟣r 쎘𪚿\u0000M\u0001􏘊\u0010\u0015󼲛𡲟l]\u001b6\u001c/e⬟KG󱖺>쬂/\u0015􂱬>\u0012\"珌i^1ER\u001e󳋮8ѥ𤴖🀶)N𑚂wm궊7\u001a\u000c𠓓\u0018W􏷪1jf\u0002\n󶾯𘤗輐D\u0017x\u001ec#􁽅B~󰎞T*\u000f𞤢󹡭0.r\u00049F{u\u0012",
     "email": "S󴈑k\u001e뿋G@T,",
-    "url": "https://example.com",
     "name": "Tx뫫q􄅀@\u001a󺕹\u0007W\u001cG\u0014\u0010$\u0014$`\u000bO?\"Z󿢗􈟛5K",
     "password": "yx?@/􃻮I\u0010􋤗]L󻐣\u00126C\u0001醫\u001eF0A󶰭\u0011\u0007쩖v𦊍=ul<\u0001\u000e􏖾㝍=}\u000bZ\u00125\u000bZ酘yy]싻\u0017󱫒󹱓\u0017\u0007g!K\u0004~kg\u001c3<\u001d𥸡\u0015󾳍eT󳗖j􌾉j+*`𫚌␋wprI&󴇻H\u0001󱩖Sb\u0014.LaL󿧘􀒝\u0003!x#-􂙯\u001a 􋷢\t\u0001o􂶶xc􂁒y\u0003\u001b𘪤PH𘁨.K\u001f󺤔b\u0014%6\u0000汳\u001a}Q\u0002\r\u0008\u0001󺋶ໞ\u001f􆟛\u0002!xvB4-g)Ꞩ\u0006!GN<󱙶z􌝇􎀚\"𨚔n𣆠wr2lY𪙶9k🨀hL粤/\u001a\u001e􏩚}c󽞆10R\u001f\u0018isO\t㦝jP#ziᑉnaR\u0010\u0018a\u0016d῍􈙑OrW􁯆𔐴𞤟\"𡪠잲\u0011+'\u0008qS\u0006󳨆\u0002󰗈*:󷡃!𩊳J\u0018s{\u0010𓎛#􎸒󲫀u𨆘\rk\u0004ceB\u000f󽥡\"󰾉㗠q𪴆ed􅏤􄚜𗐵~䕝~]⣌'\"vi\u00069{[zG􋞠C^􌱾杞6\u001a𭽅-\u001em\u000b/\u001e𭗹Y:􎅺<a𑄲-[Q\u0004Q\"\u0011a4𞺄>􌊹r\u0001x􏕬󹤢OR+􅴓㞁𗲬>𬎏:q0'\u0005a󴹠np{\"(􇠌畷뱓#a󵊔𥷃QN$T󱰦?Dcj韖:𦛞#nW}𗶖z\u001a𢼌n$􋮙UP`\u001e?1Z𘓚mx\\峱!*􏫗􌕂\u000f􎿫Qo󲳁󿨸\u0002\u0007|/\\6\u0011𧳩\u00147e􃩱y\u0006T\u0018f&_蹫^sy􍆮𑈝;^\u0014\u0006#l:i Y\u0007|f\u0017.$챶\t\u0011\u0006􉳓p\u0007􌟫\\l\u0010?di\u0015𬜬yr(􊩣O􃉁\u0003Ͳ\u001f𨡾h􁡤\"j\\\u001a}\u0017𬈊\t\u0014敏󾎣|']u󰽀󿵘=8\u0000\n𝇑=\u0013Bkuj]<迧춼\u000f-𣘸t㌘'󶖨D튙&\u001f\u0010T??􎑽\u0017\u0001𩔭\u001f㬨t𬸂\u0004|zUk\u0014󲡼\u0006J_4L\u000b\r2Egy{󵏖D󴐛\u001f졽B𐬂%󾭅\t\u000e􋏦𗕻X\u0015#\"ꨔ\"󻓰W;ar𣌆𧱌!B-[𑢮􊣵󼉸䖢#!|k-a?O􇽑𐑍Y\u0019*l𠥟c(\u0016]䏴\u0003c#󽍄m;􌅂𭤜2X9吻V\u0004b\u000c5&\u001e𧥒h􂳣O,gG鸱睪\u000cJ\u0019󽸟yex􄝣\r\u0003|\u0000>\u001d􃏘g\u000e\u0004Er\u0006i=O&肧𗎴𐔶\"\u0010V\u000f\u001b𗛾]\u000bA2\u0016l𝤻~pn􂽗H*eK󶁶%K4K~\u0017_O􆿿fV%󲫤\u0010󷜁b\u0003~7@'u􀻴𣞢㹡FfsljK~\u0014Igb𭐖𤤡󸣹8Nz􄟨\u0002Dy𝠤󻑝􉟸3pd3]^NBዥG\nG}7\u001b㙝􆫡b]􉘚WM!Hf𑲡e-𬳆\u0011I􇢰􁣥)P\n\u0008GK-Qh5\u000cS\"zA鍳\u0005\u0003\u00178m|qL`\u0003𡲱𨹷:\"*􆥂;hq\u00103b1𑰡\u0003{镓_􌣚9􈣓𑓅\u001ace𥪍\u0016\u001f櫫F詵\n\u0002dJ󲫳c\\4\u0005𝩎𑒪v\u0016\u001c\u0006\u0002𫬢iY􆧒緬4n\t􈞢/𔔭\u0011t(S[𡠸􁷬00`𡛙~󷣫^󰱤\u0002\u0000e􂺙\u001d[𫺴TsJꘑGܱ\n s \u001e\u0018 ^!b?t\rFe푥 82􏵡􋀛jf󶣥\rF<P>,驕UF􍩪𬤚4\u0018􁴆:R𨢪Jm􉺃𡬊G`7_\u001e\u001dX𦴂9𩳮T󾎺E>@\u000f\u0007@藹\u0018f2'Y􁐧V􆃵U󶿸R\u0000\u0013\u0006u\u0003\r𘩷g󰝮1d󲳴7<r\n\u001b\u0008UiX􁙷x􄲄󸘒似J푥zZ𣷃.갯",
-    "description": "􌠋Ygo%ΰI󵘼`F\u0017YT\u001f-3󲔬沖\u0011G'㧛<艔􁗩&ꤟ\u0015𗅁𒁆\u001b]\u0012\u0015)!\n2K3ႚ[+{\u000bCν󶠜\u0014L𛇬\t􀡜E\u001b]AF\u0018褯􈞃􃥇\u000c\u0000\u0019}w[F䡨\u0000𮈤\u000f2𪣰^z𝜭>\t\u000eY𠁿$4f\u0005e\r􄩇E{􎩉\n[>􎝂󲊋􏩵xa\u000eEG󼠍󷅍usz\u0018􇺊Im\u001c1[$󲍚9/\r즅S1U𥶧qK\u0005,\u0012攠󼆯2󲲦ElX&92𭕖T\t\u0017\tkM5󺹑,󳯚#􄢝~'vmCROC󵙙`q(\u0016q􈧉]<𡒠h\u0018;\u00179산𥢕猁X𠋪eH\u0005󵷟e􌒌\u0010XKDs\u001a\u001a \u001a.ྦྷGZ𞠎@󵱜QDOJ𬰪􄃨e𛃂􀉟\u001b7󲖒瓛L󻚂\u0013h=[F􃚺\u0007fH𡟕f𛉼*AQb]ᅙH𫞨𦸁o\u0013&𪨓4\t)yBn25pNa𬛓Ex>\u0006%x쭄B\u001f&MFo.S􅁅=m&us𠯹j\u0003{\u0012:𠍇\u001e􃣩𦹪󸛑𫂬!u_\u001b?毀1n1\u0017zg􎒦N\u000c𫆇?㹽p𠯰󻺩\u0019\u0014X7vS𦍁󿼙P\u000f'󼦴󿉗Nu=.4M𮯘Wu \u0014}N]a,🡹􈿇\u0015)|ぅ9k􀋳\u000b􄚨𭤐\u0000\u001d𩓜\u001e9\u0018Tl􀋌󳚭\u000c읭O%􂲝+D\u0015\u0014\u001bY󴎑𡺖M\u001fc\u0000Y\u001ex\u0004c):󶄷\u000eJ󿀗p\u000ebS?[KU𮝱Ap_𨂥\u0003󰵳\u0013C\u0007/铆1mEmb\\ʝ\u0018\u0003B󾤢J髴&\u0016Z焭\u001abniY\u0012B6\u0013\u0018vm𘧮lM*𘏂𣽸M\u0011趮펁󺻊\u0003𣇬Ee𦦒󲒂w핽𓅢\u00017#[ck𘟪u0P\nPpN\u0011`*\u0004:=-hn#\u00011u:|<iYy\u0011\\f\u0019\u001bkb<\u0015\u000e\u001d𥀽aX+J4殓\u0010\u0010􈩩o9󼫝'􏝭􎷉=Qn󰚞L🍋l쵞\tp\u0017[\u0017\u0015O16䵀:􄘡|𥭙|􂡇s󱂻󷻹w1jKs]S\u0017a-\u000e屇\rt+$h)dkWz}7q!`2w?\u000f\u0017=\u001e2EEd𥖼𦙼󶀠=*𩳋󲻊*\u0016=􁼟\u000fu8$3\\𝔬󶂂􁣧|\u0000H􆋖Yk_\u0016􆚽M𩕥G\u0019\u000b䲶yY\u0004\u0017-\u0005@􅏪;<\u0017q\u0011!Z)󱷎,𨂊Z;e29S1쀠\u0019L𘙭 𛁖\u0006􋤒\u001c𦳤9w\u001e-9󺔴T1󼹇宨9bL\u0016T5g_𤹴^3\u0007󷮗󵣽􂭹\u0014o䌌\u0001nVnyq9r%}\u0001}|𐠳\u001cai\u000f\n13^\u001b𩦗A\u0006.2\u0007w𭬤󻁿k\\z&\u001a􌹯{?m󱒸𫫼􀁩褧9􋇓)􁥐m􍵕-]\r󴀉p\u000c&\u0017/\"P崦𦑋M\u0014\r\u001a\u00120\u000f\u001e󳀣D(됱`􆈚g\t妍\u001b󸛚'𣛗5h0{;𭣟h&BY_𦍓\u0014\u0015tq􆾖呿𤫺\u0015%`.h<&DA\u0017 \u000e\u0000\u000f\u001034熍󺌮c\u0012\u0000𦏏\u0001h\u0006ucTB&􄑦􊵊揌I\u001cj\u0017W\u0001𥼄\u0003M𧽱􃳪A[S\u0002􏕥\u0012:\u0019\u001e󱭲A\u0006d\u0005􃢢𗟣r 쎘𪚿\u0000M\u0001􏘊\u0010\u0015󼲛𡲟l]\u001b6\u001c/e⬟KG󱖺>쬂/\u0015􂱬>\u0012\"珌i^1ER\u001e󳋮8ѥ𤴖🀶)N𑚂wm궊7\u001a\u000c𠓓\u0018W􏷪1jf\u0002\n󶾯𘤗輐D\u0017x\u001ec#􁽅B~󰎞T*\u000f𞤢󹡭0.r\u00049F{u\u0012"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_20.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_20.json
index eac64180ef2..eea3a2220b2 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_20.json
@@ -1,7 +1,7 @@
 {
+    "description": "*S#b𒌭\r\u0014􅼝V-蘮;}􁊖􂌍*h\"&䮲mM踽PWq%v\u00055麽fk[a/󷙊𘤶\"\u001f\n􉿂𝑧S2/O:TRP[❣󺻦)\u001es?\r\u0003P0u)\u0006\u0016𣩉S_𥕰!I+\tj햯g𭪀浻Hr\u000fAd?J\u001a\u0008a𝨰󸊦Be~e󲹺j\u0014-nu𝨚M?𑄗.NVdMeOTq\u0008p-􅐇􈞪!@\"\u0012z6JK𧭢yM\u0013r􂄽\r2/\u0014Y\"\u0016\u0008O􊥁t􉁨\u0014rLS.\u00020?x넒󹧦[Q􉌯?\u001e7뻸=\u0014@4◊F󷙕uH􇠱𨮬踠e󳔍9\u0003|\rL𑐅\u0006䡕\u001a\u001b𩉘$𢸞r\u00119\\_/v𑱂U/\u001cWF󱻰u當\\+\u0010綋6L\u0006'bc󽇒󱬊\u0007C2𠒃6㟦<\u00114􄑶M+\u0004P\u000cG./9z`]􂬠i(誸𝨭2􋝒}RBwMyBE\u0004M𣊪E쪄O$Le\u0014A󼽒xj㼬󸧐\u0007tW󸖭xm遖v~\u001b\t5\u0015鰗?𩮥g\n Y𫽥󾕅.dG\u0002\u001103􂓹[eN:JO\n<[𨌦􆕌c\\hV6@\u0000M𡼸\u001f𐰱]x􇋔uJk<O󰿲Ap8+)Jn\u0005k&@6󶳜􂶠f\u0017\u000c\u0016V\u0012\r!𫅺󺃷魭 𩥊􋉈#_[𥉛𓃘\u0003𡗯􉽒y􏺹\u0010:𨥻󹰡JG𦡛\u0017𡟧鍀󴦾o)\u001e𝒽;🛊𘖵R󱾽;w9\u001f\u001b\u0002v𬳃\u001c17@\u000cE+*􆛜0󱑵\u0001\u000c\u0000\u0013㌭䵴\u0014\u000f)f\u0010f󹥘\u000f􎞕XA\u000c!\u0001z+􉕽y-\u0006\u0006􃎮]w􅙒|R\u001d4s󻆣􍉱\u001dE􏼭ewg𘙾𫅍󽔌𦐝\u0007\"\u001e\u0010]\niAz𧬎+Y_󺺻E'\u0019)\u000c➚\u0004\u0003\u001c𥳓􇲩\u000c󴔒\u000eg旳$+\u0011{\u0007󲇫🠲yV𤝀\u0019/\u0006M𠼷泍󻝔;>3)\u0002u\u000c\u001a69=\u0007\\!D3𦅍􌇶[U\u0011l#A𠐮@\u0014_\u0017b🖋𡐟ed\\󶁠h%\u001c=U(I#\u0015𗬠\u0015\u001a\u0005%J\u0007\u001b39}j_뾊\u0000눋|h&i{\u0014(\u001e\t󿩂/h옆𖼚}\r=eRH􎚔6\u0007\u0013󿣣T\u0008𢝂jD􎱋&\u0010k𧚛󿤼)𨜝􀼭E𮂷𭟾&K%]X𮝍^R|+\u000fUc\u0015@\u0002\u000cLI􀾋eH",
     "email": "@\u0014:",
-    "url": "https://example.com",
     "name": "s𢣟\u001c4,v2\u0010E\u0002F\u0016f\u0016\u000b$🁧󽘝C􂜈􌏫𠶐*2K[􈩦2?\u001d^1` 𧥃6?!􁿝!\\\u0002ァW/䰄􄓓\u001e=\u001fM\u0003~.W",
     "password": "Wx\u000e\"\u0012\"5v\u000b𤷙\u0010}\u001e󽮔w􌤛:^ꨦ\u0015\\Z􀛝J&\u000c<\"𘏃􊾔&daGH􎀿\u001e󴶛􋿸~\u0010\u0006o󰻅속L􉔴㑈bέ/겠𫱟-#@_Ṏ\n🩬jdIs@r~k𦖺󹞎X\u0012>𭉲􄊚􅬢\"\nN5𬰸-d#67\u0006F^G;5𭖢f󼟦\u001e-g𢑎eg􋞧J(0<&\\𧧏z\u0008󲥄\u001e?Y(\u000f𬁸ORXUf=\u001fxW5=𬑖3󽀚N\u0002!YK󴣄,C󼔟#p󷙪욫r𫵨,<𥰏0󽄛󳖽E𠩝\rh󾤨\u000f(\u001214?pJMN\u0014\u000ed\u0011ᶫ\u0019󵥔📫\u0008𗇑/S𠯱꾲Pd \u0012fj\u001aLm'\u0013i7𢁝)2B󰤐鯿r7tLJ<W!!\u000cr𘎍<􆪇\u000b똷\u0015S𐃚GV𧌾WmGV/\u0016OZaꦏ\u000b\u0002\u001fV]G󹕋=OaCQgi",
-    "description": "*S#b𒌭\r\u0014􅼝V-蘮;}􁊖􂌍*h\"&䮲mM踽PWq%v\u00055麽fk[a/󷙊𘤶\"\u001f\n􉿂𝑧S2/O:TRP[❣󺻦)\u001es?\r\u0003P0u)\u0006\u0016𣩉S_𥕰!I+\tj햯g𭪀浻Hr\u000fAd?J\u001a\u0008a𝨰󸊦Be~e󲹺j\u0014-nu𝨚M?𑄗.NVdMeOTq\u0008p-􅐇􈞪!@\"\u0012z6JK𧭢yM\u0013r􂄽\r2/\u0014Y\"\u0016\u0008O􊥁t􉁨\u0014rLS.\u00020?x넒󹧦[Q􉌯?\u001e7뻸=\u0014@4◊F󷙕uH􇠱𨮬踠e󳔍9\u0003|\rL𑐅\u0006䡕\u001a\u001b𩉘$𢸞r\u00119\\_/v𑱂U/\u001cWF󱻰u當\\+\u0010綋6L\u0006'bc󽇒󱬊\u0007C2𠒃6㟦<\u00114􄑶M+\u0004P\u000cG./9z`]􂬠i(誸𝨭2􋝒}RBwMyBE\u0004M𣊪E쪄O$Le\u0014A󼽒xj㼬󸧐\u0007tW󸖭xm遖v~\u001b\t5\u0015鰗?𩮥g\n Y𫽥󾕅.dG\u0002\u001103􂓹[eN:JO\n<[𨌦􆕌c\\hV6@\u0000M𡼸\u001f𐰱]x􇋔uJk<O󰿲Ap8+)Jn\u0005k&@6󶳜􂶠f\u0017\u000c\u0016V\u0012\r!𫅺󺃷魭 𩥊􋉈#_[𥉛𓃘\u0003𡗯􉽒y􏺹\u0010:𨥻󹰡JG𦡛\u0017𡟧鍀󴦾o)\u001e𝒽;🛊𘖵R󱾽;w9\u001f\u001b\u0002v𬳃\u001c17@\u000cE+*􆛜0󱑵\u0001\u000c\u0000\u0013㌭䵴\u0014\u000f)f\u0010f󹥘\u000f􎞕XA\u000c!\u0001z+􉕽y-\u0006\u0006􃎮]w􅙒|R\u001d4s󻆣􍉱\u001dE􏼭ewg𘙾𫅍󽔌𦐝\u0007\"\u001e\u0010]\niAz𧬎+Y_󺺻E'\u0019)\u000c➚\u0004\u0003\u001c𥳓􇲩\u000c󴔒\u000eg旳$+\u0011{\u0007󲇫🠲yV𤝀\u0019/\u0006M𠼷泍󻝔;>3)\u0002u\u000c\u001a69=\u0007\\!D3𦅍􌇶[U\u0011l#A𠐮@\u0014_\u0017b🖋𡐟ed\\󶁠h%\u001c=U(I#\u0015𗬠\u0015\u001a\u0005%J\u0007\u001b39}j_뾊\u0000눋|h&i{\u0014(\u001e\t󿩂/h옆𖼚}\r=eRH􎚔6\u0007\u0013󿣣T\u0008𢝂jD􎱋&\u0010k𧚛󿤼)𨜝􀼭E𮂷𭟾&K%]X𮝍^R|+\u000fUc\u0015@\u0002\u000cLI􀾋eH"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_3.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_3.json
index 249b4dc7672..f959b315599 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_3.json
@@ -1,7 +1,7 @@
 {
+    "description": "獛3􅼅T􂎊\u0010y^PS}c\u001dm\u0008QO5𫰺 z\u000eA{W󲃩\u0016\u0006?z`m&\u0007󳉂􄄿􃬘Gb\u000bR*p \u000bJ󰹪\u0019Mjg\u0007Xwt􎮧P\u00111m?\u0001R\u0007\u000fA󿺡ጇ\r 􃊽e𓈖𬣁󵾣A2꛶0\u0003󴘞𤄖x\\t🆘08󸳖\t\\\u0008𥳝z]sOjm\\挅ｻw4DW_𦣹\u000c\r\u000f\u0016)\u0005\u0019#n=𘉍\u001d\u0010􃌑^n\u0010j􏐉2.\u001c􇃭l\n\u0010+5\u0012y0\n.E#\n\u0018\u001c\u001bﶵ! 3\r\r󲬧 \u0008\u000c(S\u0000N\u0000'q{\"Ryw\u00008\u000c+\u001fv2\u001dP󵌎󶡔jaM\u0012[\u0008\rx\u001a$l𨚛^󳉟[*껲𖺁(\u0014]P|󿋠,i!\u000f<󸪱q𥧼s\u001f􅅵뻞`bZ^󶧿𑌞%B\u000c􄉰V𠄝6<z𘜟v+㉀G\u0000\u0007􍡲H\u00114􄡧\u00149Z󵠩U\u00166󵦒o𩴕-㻌􁓊\u0018󵈛V^𭼇\u0015􏄧𐊕;H8努\u000f榛7🟫:H\u00003\"䥓8)\u0008w6l\u001c󰱚𢐞O\u0019󶖛𘓟🨃\t\u0017)𤰕hmuPMW􁣦N\u0013}%􎶮蹦u⡓i(~\u0011x𞸍G81\u0014\u001dI󵳖\u001d\nnP󴯽􂴧󶿃pqt\u0019%+D𤪸\u000f?dJQE\u0003푻\u0002𗛚􃐒􊰛N䰩Zz7\r0𫫻M[Y5i-X􈲆#󼣛Ms\"8r󼠧𝞮\u0010堡ks\"V2\"fmlE\u0004;5u%󺫌쐅s>yhj􁗄𭈏\u0011𫧎𣁤Z(\u0012􋑺\u000fL|t-󹝙=%\u001f}\u001c苙\u0019\u001e\u0005\r𦠯3𦉜\u0019B耢a;!𣜠'M󴱿k)%0+󹔛oM\u00043K\u0001$\u0002-tR>$`\u001bd\u001f\u0018Z\u0002𢊎RHG󿲣􈡄T-;<{忙K\u000b=7.mP#󰖇}G74\u0017^󳤹N\u000fF*$b\u001d\u000b'J󳾚5j귭𝛔􋈁s[\u0015𩥷\u0005᎙l󳸠\u0001xN𡭻6\u0006\u0005v𮗓>9aR􅺏󲄴T\u001b\u0008-QZ\u0003\u000e󷶶.\u00149]􎲇E𢜷\u001cl롟\u000cCww9Cys\u000f%揈􀍞WY补R3\u0012*Y\u000ba\u0016\u001b\u001d\u0015\r\u000e@ U\u001bG&,>]󾴩\u001e𑒞\u000c*j{𛊶\u0001G􀗐\u0007[m脦𖹅-󷬪󱌨)3qH]璝2 C5Ih$D􊥵[󵀩^@FfꟄ},{󴧁OemlSN􌽠\u000e|wF􂨥\u000eY\u0012𒃼󿑜Kt]\\\u0003BQ󰕬\u001c寁󽳝Db횕󻏾\u000c􅡮钼x󴞗󹰶!uj",
     "email": "y\u000e𝟲@ e",
-    "url": "https://example.com",
     "name": "!\u0002OF󽠋􃥰􌞻󺝢𧯜𗲲+|\u001e\u0012NYwPo\\%𬓐vWF뷁\u0014\u001ck􂥴↝\u001eCQv􁣓󵹓b𧪂𥖧(𡽻_뮊\r􇫏􋵃r\u0005􀪔󳦌󺓃A,y%|⤕\u001fR\"󶉙w*􄥡B8󴛄k!{䶩M|e",
     "password": "~8㠃􃏴ڌ> \u0016q-gd\u001frD\u0003b\u0016Ux󷌬𣦉⊹msB\u001cqe\u000b*,\u0008􍣺\u000bs\u000c\u0004\u0010dh`j\u0011$V^\u0001\u000f𬈮\u001c\u000b\u000e󷨬􂫻\\\"\u0002󱄉hf\u0018s\u0005{\u001c e\u00188K􊳈L𤤵f\u0016sP󵊅oin􏣣\rG\"tXU7S𝦙\u00007C`x􇬼𥝇z\n\u0008\u00017󷌰\\\\\n𥫕\u001aG\u001a\u0015)d%󲥉\u0019 ]7坏H5t^+Sg \\\u0010𗽧\tbI3𩩬E5􈓁夆\\@vp#Y\u0005BA􅤑y9z\u00007🁯\u001ais^&\u001bh\u0017\u0018\u001etlM\n\u0008rT@W;qs󻚝n\u0004f\u0016#ᷠ󴃄))M\u0008`𪰦𥩭K􂢍(ftW\u0013􀕹r\u001b_󾶦􀿮*$2,\u0016(U,\u0019\u0018BFp\u000bXR\u0016\u0012\u0000=3)\u0013j9􂰗s􉵢-k𥔋콮UG󴝠N}\u0004􀜔",
-    "description": "獛3􅼅T􂎊\u0010y^PS}c\u001dm\u0008QO5𫰺 z\u000eA{W󲃩\u0016\u0006?z`m&\u0007󳉂􄄿􃬘Gb\u000bR*p \u000bJ󰹪\u0019Mjg\u0007Xwt􎮧P\u00111m?\u0001R\u0007\u000fA󿺡ጇ\r 􃊽e𓈖𬣁󵾣A2꛶0\u0003󴘞𤄖x\\t🆘08󸳖\t\\\u0008𥳝z]sOjm\\挅ｻw4DW_𦣹\u000c\r\u000f\u0016)\u0005\u0019#n=𘉍\u001d\u0010􃌑^n\u0010j􏐉2.\u001c􇃭l\n\u0010+5\u0012y0\n.E#\n\u0018\u001c\u001bﶵ! 3\r\r󲬧 \u0008\u000c(S\u0000N\u0000'q{\"Ryw\u00008\u000c+\u001fv2\u001dP󵌎󶡔jaM\u0012[\u0008\rx\u001a$l𨚛^󳉟[*껲𖺁(\u0014]P|󿋠,i!\u000f<󸪱q𥧼s\u001f􅅵뻞`bZ^󶧿𑌞%B\u000c􄉰V𠄝6<z𘜟v+㉀G\u0000\u0007􍡲H\u00114􄡧\u00149Z󵠩U\u00166󵦒o𩴕-㻌􁓊\u0018󵈛V^𭼇\u0015􏄧𐊕;H8努\u000f榛7🟫:H\u00003\"䥓8)\u0008w6l\u001c󰱚𢐞O\u0019󶖛𘓟🨃\t\u0017)𤰕hmuPMW􁣦N\u0013}%􎶮蹦u⡓i(~\u0011x𞸍G81\u0014\u001dI󵳖\u001d\nnP󴯽􂴧󶿃pqt\u0019%+D𤪸\u000f?dJQE\u0003푻\u0002𗛚􃐒􊰛N䰩Zz7\r0𫫻M[Y5i-X􈲆#󼣛Ms\"8r󼠧𝞮\u0010堡ks\"V2\"fmlE\u0004;5u%󺫌쐅s>yhj􁗄𭈏\u0011𫧎𣁤Z(\u0012􋑺\u000fL|t-󹝙=%\u001f}\u001c苙\u0019\u001e\u0005\r𦠯3𦉜\u0019B耢a;!𣜠'M󴱿k)%0+󹔛oM\u00043K\u0001$\u0002-tR>$`\u001bd\u001f\u0018Z\u0002𢊎RHG󿲣􈡄T-;<{忙K\u000b=7.mP#󰖇}G74\u0017^󳤹N\u000fF*$b\u001d\u000b'J󳾚5j귭𝛔􋈁s[\u0015𩥷\u0005᎙l󳸠\u0001xN𡭻6\u0006\u0005v𮗓>9aR􅺏󲄴T\u001b\u0008-QZ\u0003\u000e󷶶.\u00149]􎲇E𢜷\u001cl롟\u000cCww9Cys\u000f%揈􀍞WY补R3\u0012*Y\u000ba\u0016\u001b\u001d\u0015\r\u000e@ U\u001bG&,>]󾴩\u001e𑒞\u000c*j{𛊶\u0001G􀗐\u0007[m脦𖹅-󷬪󱌨)3qH]璝2 C5Ih$D􊥵[󵀩^@FfꟄ},{󴧁OemlSN􌽠\u000e|wF􂨥\u000eY\u0012𒃼󿑜Kt]\\\u0003BQ󰕬\u001c寁󽳝Db횕󻏾\u000c􅡮钼x󴞗󹰶!uj"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_4.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_4.json
index 68aaafddcf1..feb6897562c 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_4.json
@@ -1,7 +1,7 @@
 {
+    "description": "􁴳󸠝󰛍e\u0018\u0018'Y8}sJO(qR𑋪[\u001d\u0013W󼮜󾏗𢋴\u000eX$},u곀Kv𨣦<\u0012󵚷\u000c􀨌H&UJ𗯜$UJ}\u001b\u0007b!j🗲T󻙜\u0001eWj\u001fii\u000bLc 🦖􄣉7\\𪶹(%\u0001🐉T\u001a󰼳KC𫴝I𤒂#𥱴~ZS~+\t㎐H5\u0006u+𭘻Zꈸ󷰷Yd\"y=G󺪇!\u00048P$[\u00173𫠙𪽌͟|\u0006I􏔗O􌭅)\u0011\u0005뭋󱹱\u001f鱗G\u001eEG<%Q6􃊌T\u001e<eedf6'󰍽𤜃3F>d\u000fFE)`\u0017􅞿O2\u0008󸄪𮁌I\u001bc?nw􈭹!󸷎T𫹨t𡫖拵\u0006𤙵p𓋞~lu\u0007\u001c礂}\u000eᔷaa􀇛T+\u00162𬭗XRZ\u000fb#\u0018ដXzW􍸢>󻰙􈂐\u000b䘁\u0000]󾼄\"%\u001e🪁ꬶ󸒧q\u0005􊴷𫓷𭨚]S%0 0T<6X<Rz𪇻A:I/󼝇4\u001a\u00006\u000f",
     "email": "󲨇'g\n@󿜍Z󿔍\u001d",
-    "url": "https://example.com",
     "name": "堙\u0017\u0001\r\n􄌹:\u0010rҮN[9T#p􆛧󴗤=Ltw𩯅\u000cQﺪ,&JG8I#!8䆦'Y0Q􀳶^\"'u2\u0014\u0019_\n붐\u001fD\u001b\u001c9 QF\u0019bh;O|􀓈'2􊠭􊘒#D?\u0016K􏥦",
     "password": ")i􂂰r\u0010\u001b-\u0002g*\"K`\u000b*𩦷uh1_󽺈L󵙗7󻵬e,&gWb#o\u001a\u0001\u0008MA3󲮢I\u0014-\n𤞱㚤\u001exi􈗲󾞔\u0003\u0016Y#m$\u000e\n3'􎃻\u000b~8rte\u001bom🚚󰌭~\u0015{|󷩺=XAW\u0018N8,󱫀w韌\u0010󾎘ꍾB\t&\n,5X3􋪭ᖧsVvh(G咫􋔛\"B\u0000[tE;㼪\u001cB\u001c[𛄞m?葁\u0008𗻉Ns|\u000e#􉕮\u0001)\u0003r,$y6\u000e\nﳖfp\u0017oᛙE\u0006'Ac7󻋌8r󼓲g\\#(F(R|-l2\u000f?\u0005I&󾗀N𣌧\"\u0018:mB𫍖\"󴼞󵄳\u0017\u001cds-z6􂶂\u0004୨􄺍\u000f\\\u0011%0f\u0019\"徯L\u0010\u000ek􃂰?&\u0015_2f{.🙌[𝃜-f􊆔\u0008􆺠(K;/􎻉\u001aKy󷗖\u0019uxcwc󼮔Mx(󺞡𩊞>\u001a\"i󴺃yBz𩎻\u001a\u001d󵶞󰢸$侂⸌*\\}\u0016\u0007SV𭚊\u0008\\4>GN_K􂽓\u001f󷷬Z~9N𐛋𢒩H#$𠥶&/di!𡑦,ZJ\n=O\ry/嚤\u0011𨦅7nN䆴l?𭫌xp𡿭q󸥻􏹡Ao\u0000N|G󿝕f󷊪󱶻𢌪z\r(;P銨鸢\u001eh?Yo#\u0017Udꯞ󹒴W􉉶a󾈼e^􌰏T𢒛􄛍x𠱘)M\u0008(꼇xJ𐌿􆋷}k􉭙𬧲x􄻘E󴆑3Q 捼\u0000^gd蜡\u0004}D𝒚j󶴦𨭢𩳭\u000c헐o|웋:RW.󸅀\u0000t𪚊󹩃I\u001by2mm災좝]\\R\u001e$\nV\t0&󸜿\u0014􌄎[X^𠳼$2􊨵s\u0015\u0004𝌘qQ遒􀞊𥷾\u0008.龣N􋎒.pSw\u0008WI\\\u0010\u0007%r\u0011\u000c󵳰?J\u000cJD\rLS@{吽6,6𑈗󸐹\u001f\u001d􍇪g󵧺輺b;𗚇U\u0002d\u0003􅢓\u000b<&E)ﾩ`ﲄk𞡯𪃋\u001bu#\u001e\u001b뷥8􊹻*@VJGm󿥮\u0019󳫁\u0014k\u0015I \u001f#_!􂅕􎃜\rc4@𝙽5 W\u001cGFS謂\r\tnGb\u0011󶙵繤\u000f>gCr?*#k8P\t\t\u0002􂵭\u0015w4u𐼺&`F\u001beNk< 0󾙳󲛄P.𡟑jᢨ|{􌑆k􍭯󼸱Ήn\u0008X􇍞\rB􆌫y\r𠒮U􁇕ꮛ@𞢕ki\u0017@𑁄\u001co꽇ZmB𡙲\u00160𒇇𩥌8󲍪8扫󠀮ᘲ\u0019媬\u0015\u0018\u000b\u0007|.nCX󹘍\u000e|4?\u0012t5h𖹨S\u001eu,&m3WL*푧\u001f3抪\u001d\u0007m/$+\u0005VM8$}󱐼\r\u0000􌑀𫖙\\}g󾸡􈷃G􅂼U󲟂P󲦸𭴩\r7\"\u0003讕7\u0002􇑻\u0016L\u000f\u001clf4;󲭋#\t𥷆\u00002:g@'K􊬷𝖢ſtꯣv\u00039𫢏D*Cjlr誵\u001d)𤪲{An3\u00178􀋱eu󻅍B0eO\u0012𣳀\"<rS-L[𧛠>\u0014𮍚Q\u000cf󱜦󶆶b𫯫\u0019\u0010\u0003Xglf\u0004󶀟D%/dd\u0014𡲚l\\\u0015􋄞Q𧩤:𥌵x!3탵󻹴9㸩0?\u0008􋌕<@卾RQ\u0008\u001b∱W펻x!h𭟚󴊾6\u001a=~𮣝𩫽x𭳠\u0001\u001b𬟚\u0001𛱶碠墱\u001fA𭫃\n\to𢵁\u0012\u0007eX󳴟\t󵂮F~E⢊q8m햜\u0004󴤛(^𗏸H􀹦\rMlD>􉄣󹡈􂴼rC􋒤pfoc𝁫J\u001d𢗻woa-󼛩A/\u0003󻯊𬡯🨕R󵒦oGyj􁐥\u000b\u001f𡛼p\u001b?vw5]󲼕r𬧧􈊁#􌄽)DQ\u0014\u0015Uh`:){x𤓓󽓛/MHDZ􏧂O빆1;tR𮞃􊌧􃆚M􀪉\u0006QC󲕴􈞈",
-    "description": "􁴳󸠝󰛍e\u0018\u0018'Y8}sJO(qR𑋪[\u001d\u0013W󼮜󾏗𢋴\u000eX$},u곀Kv𨣦<\u0012󵚷\u000c􀨌H&UJ𗯜$UJ}\u001b\u0007b!j🗲T󻙜\u0001eWj\u001fii\u000bLc 🦖􄣉7\\𪶹(%\u0001🐉T\u001a󰼳KC𫴝I𤒂#𥱴~ZS~+\t㎐H5\u0006u+𭘻Zꈸ󷰷Yd\"y=G󺪇!\u00048P$[\u00173𫠙𪽌͟|\u0006I􏔗O􌭅)\u0011\u0005뭋󱹱\u001f鱗G\u001eEG<%Q6􃊌T\u001e<eedf6'󰍽𤜃3F>d\u000fFE)`\u0017􅞿O2\u0008󸄪𮁌I\u001bc?nw􈭹!󸷎T𫹨t𡫖拵\u0006𤙵p𓋞~lu\u0007\u001c礂}\u000eᔷaa􀇛T+\u00162𬭗XRZ\u000fb#\u0018ដXzW􍸢>󻰙􈂐\u000b䘁\u0000]󾼄\"%\u001e🪁ꬶ󸒧q\u0005􊴷𫓷𭨚]S%0 0T<6X<Rz𪇻A:I/󼝇4\u001a\u00006\u000f"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_5.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_5.json
index d3bcaddd579..7e72d476b51 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_5.json
@@ -1,7 +1,7 @@
 {
+    "description": "􏖙^\u0016A%BD󲩓ev}Ia󼏴p쵶+PI~%l􌧁6ZO󶩒EZ𣙰u𪘢X\t\u0014\u0013;걵􍊤c󿆯Nh`ᣚ{13\u000cjQ\u0019M']󿙡e𪎡^􃣿41𘋣𪓨1;\u0006\u001b;鲷\u0016I0*`t\u0008\u0006󶘖Art\u000c𥬶젽𤢖|g􍞅dd<a<}\u00134\u0006󺘁\u0002󶮐\tF'Gg􏡦􂭸􎺫_%MC{^󹀷􀌸P~k!\u00073 MT\u0015h􀻂tB瞪􏏍\u001aQ\u0000\u0018|5SP1\u000c􆼲\u0015O躄\u000c󺋤^Sx\r𐘁h\u001b\t#-l<\u001b𫏮+w鎄6܄O\u0008:vp􍫗\u0019󾶊A/󽠁𫨳\u0019󰣷M?MM􍶵\u0006:Kaqg5󺓅\u0015f\u0007\u00174ᯊg\u001f\u0016%𠺟\u0004\u0015\u0001󶒓\rzI\\󰠜󻩴Rz?R䧵L\u0013P\u001bEy🨄a}\n*𦋞􃢲S􁣊ꅐ􊻟o M𦑇󾺢r{5!𬠻\u001b\u000c𘥪𞲖A􀙧󼟙\u0019p𧷼[󿚘=t\u0018>\u0001P􏦪\t𧸂x*\u001f\u0012=;𥢓N𧔙􀎢\u001bzH\u0013\\\u0006𓁝𧠚=M𥿭@|鑗\u001fi=\u001c\u000f􉝹􌾯",
     "email": "􉐱@",
-    "url": "https://example.com",
     "name": "𩓢\u00124)􄒃\u0005v7\r\u0003p\u0010eI𬾐4SD^𐴃;9*",
     "password": "𡢗\u0001\u0003'\u0019Qz\u0001%􋴵𦳐p;뭙e\u0006iF􂁴\u001b\u0001gL#󽅕\u0017􎎁\u0006\u0006+\u000f󽔀T⠲r𬑥\u0014_0\u001d0󿷠])'􇢘\u0005'𥡆^n\u0016c;\u001e􋁖KwzB\u001e\u0008𘪃qdQ礈󺮏\u0007-郚h𬈮>~Hi,Ԃ􋍜𡌺R4'a𥣦\u001e}p􁓳󲣟𪻔P?\u0005naw\u001e\u001f󹏤@zr\u0010)𩳎&㈲\u0004\u0017!|T\u0000 '\u001f)cM\u0018\u00054`𨟢F殯=)U6.\u001b\u001c7\n__~􂖫Ruo􃽆󲞺",
-    "description": "􏖙^\u0016A%BD󲩓ev}Ia󼏴p쵶+PI~%l􌧁6ZO󶩒EZ𣙰u𪘢X\t\u0014\u0013;걵􍊤c󿆯Nh`ᣚ{13\u000cjQ\u0019M']󿙡e𪎡^􃣿41𘋣𪓨1;\u0006\u001b;鲷\u0016I0*`t\u0008\u0006󶘖Art\u000c𥬶젽𤢖|g􍞅dd<a<}\u00134\u0006󺘁\u0002󶮐\tF'Gg􏡦􂭸􎺫_%MC{^󹀷􀌸P~k!\u00073 MT\u0015h􀻂tB瞪􏏍\u001aQ\u0000\u0018|5SP1\u000c􆼲\u0015O躄\u000c󺋤^Sx\r𐘁h\u001b\t#-l<\u001b𫏮+w鎄6܄O\u0008:vp􍫗\u0019󾶊A/󽠁𫨳\u0019󰣷M?MM􍶵\u0006:Kaqg5󺓅\u0015f\u0007\u00174ᯊg\u001f\u0016%𠺟\u0004\u0015\u0001󶒓\rzI\\󰠜󻩴Rz?R䧵L\u0013P\u001bEy🨄a}\n*𦋞􃢲S􁣊ꅐ􊻟o M𦑇󾺢r{5!𬠻\u001b\u000c𘥪𞲖A􀙧󼟙\u0019p𧷼[󿚘=t\u0018>\u0001P􏦪\t𧸂x*\u001f\u0012=;𥢓N𧔙􀎢\u001bzH\u0013\\\u0006𓁝𧠚=M𥿭@|鑗\u001fi=\u001c\u000f􉝹􌾯"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_6.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_6.json
index 1d2a4e1c1d1..b27ff1aca4c 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_6.json
@@ -1,6 +1,6 @@
 {
+    "description": "5ZK~v{􅋗EG\u0000>\\䧙\u001bb\u000cR󴥂E\u0014󸚡\u0017B6]<WC\u0011\u0004䶩9k5Ї󸐄\u000b@B骽*蘭;M\t\u0001⿓\u001b\u001e@v_`ce i|g\u001a\u0010\u0014x읷>(WU󵈍t\u00003u%%\u001fy<<𬛎9\u001a\u0005RcFvשּׂ;nB?w􁜰\u000e󵹼􋕖|􂐢|l]\u001c󼔎\u0002<󽳽hBlj\u0019K\u000c\u0000*z𩼴葼󻸟󰉝*U󷧶~\u0011-󻒀ࣻ@𧪪􈙪q>𭡋hw\u001f󴃞 P􅥅G󺎠HS󺿮\u001fp󸙲􎄚w碧0􇨨󽜾ya-J3뢰𩮳\u0004J)\u001dki𘤱\u0000D|󲁥s⇴Ue󷥒u𗾇w\u000e\u0018|\u000b.𫀕􈧤\u0013𦱔雾𬰡r\u0013gH𡹡B)\u0000ᶙ,\"㝔n\u0013󼔾}䘡𫰴-V\u001el\u0000r\t\u0016􆓕^O*X\\6t󰅿.󶵥F􌀸b\u0015𨧭z\u0004r􄰼bG.l\u0016𣳂J󼗣𥴩 /4qOZP𡻔Q\u0019\u001d𧩸\u0001\\\u0004j#ZpBZ#󹗷\n\u0001#_XO\u00176?gg󰙲\tX􎭄g\u0010􀕤b󺃨G\u00178\u001b󺴛V u\u0012+h\u0003R􈺈d鳺󰔸Q\u001f\u0000<o孮\u001aT􁓬𑓅_㔨颡\\5􃓹𝂠1:􍥦\u0005\u0003l&`쀂>v\t\u0004tj\u001fU\u000c+z𞲎\u001d󾱾F\\@􍘬=𐅪n\u0005\u0019Vr󻓲TW觸\u0012i󽀔\u0008{0XUg🚎\u0003t𓌚yz🁨󱄃\u0007OkJ珼􏠳1\u000bx\u0002~𦑇fQ\u001d􂘼\u0006H;o󷚉[{􁸕S\u0012KㆄA\t~ho9",
     "email": "􏏤𤘹􂤒𡠆\u0015@\u0003􂟣\u0005-H",
-    "url": "https://example.com",
     "name": "\nLY-󾏄􁐨`\r\u0002贯`\rBa\u0012jv*m\n\u0012\u001app\u0010\u0004+pq=P󵪀𭌣c~ꜶQp5靅5􀭒X 󲣫*%􂕚&QNA\u000e6䏥e\"K供B\u0003=􋗧𫵘2a􂿜󽁃󿶰\u0006𦾩.\u0001\u000cP慌f\u0017𠭴2h􏝃t𑿡􎴵i󰚯x]cx\nC퉸\u00179;￡${󴫱v􂄚#SNKZ@𗗠-\u0013E\u0006{\u001d",
-    "description": "5ZK~v{􅋗EG\u0000>\\䧙\u001bb\u000cR󴥂E\u0014󸚡\u0017B6]<WC\u0011\u0004䶩9k5Ї󸐄\u000b@B骽*蘭;M\t\u0001⿓\u001b\u001e@v_`ce i|g\u001a\u0010\u0014x읷>(WU󵈍t\u00003u%%\u001fy<<𬛎9\u001a\u0005RcFvשּׂ;nB?w􁜰\u000e󵹼􋕖|􂐢|l]\u001c󼔎\u0002<󽳽hBlj\u0019K\u000c\u0000*z𩼴葼󻸟󰉝*U󷧶~\u0011-󻒀ࣻ@𧪪􈙪q>𭡋hw\u001f󴃞 P􅥅G󺎠HS󺿮\u001fp󸙲􎄚w碧0􇨨󽜾ya-J3뢰𩮳\u0004J)\u001dki𘤱\u0000D|󲁥s⇴Ue󷥒u𗾇w\u000e\u0018|\u000b.𫀕􈧤\u0013𦱔雾𬰡r\u0013gH𡹡B)\u0000ᶙ,\"㝔n\u0013󼔾}䘡𫰴-V\u001el\u0000r\t\u0016􆓕^O*X\\6t󰅿.󶵥F􌀸b\u0015𨧭z\u0004r􄰼bG.l\u0016𣳂J󼗣𥴩 /4qOZP𡻔Q\u0019\u001d𧩸\u0001\\\u0004j#ZpBZ#󹗷\n\u0001#_XO\u00176?gg󰙲\tX􎭄g\u0010􀕤b󺃨G\u00178\u001b󺴛V u\u0012+h\u0003R􈺈d鳺󰔸Q\u001f\u0000<o孮\u001aT􁓬𑓅_㔨颡\\5􃓹𝂠1:􍥦\u0005\u0003l&`쀂>v\t\u0004tj\u001fU\u000c+z𞲎\u001d󾱾F\\@􍘬=𐅪n\u0005\u0019Vr󻓲TW觸\u0012i󽀔\u0008{0XUg🚎\u0003t𓌚yz🁨󱄃\u0007OkJ珼􏠳1\u000bx\u0002~𦑇fQ\u001d􂘼\u0006H;o󷚉[{􁸕S\u0012KㆄA\t~ho9"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_7.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_7.json
index c34a8753bd8..584b3d68ff4 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_7.json
@@ -1,7 +1,7 @@
 {
+    "description": "ia𩋕\u001a$\u0016忡Km\u0008Fc󱱜\u0010]m\\'\u0017d\n􆏥mm-𪊋L𨧭슗𘓊}\u0015󳨚\ne\n\u0000Wy뛤𩏯\u0016\u001a=P=寣\u0006sbD\u0019fY󵿟p\"R𘔨g󷣉H􋢟𔐥L\n􂡺>\u001bl>Q\u0014BlW𨥴\u0007\u000b\u0007T+'?rI)\u0015󸆜H\u001c\u001ad􂦿\u0001󻐓.A=>\u0007{@G<zob\u0014띄*=𠹿?eb𠦩;\u0012𗵥/`Q\u000f\u0007?^`f&􊘳󿐦h'\u000bV_?y4\u0012\u0005Ek󰈷r𗡎\u001f􌆘Rz_Z󺎍xs_3쾑\u001c7벀A󻒉􂵟󽥡󺂖3wl6𦳿9q\u0010\u000f&P\ttxEj{~4J鐥\u00168\u0019@􏜙W=󾴵\n.u􅹞𐋉𧲫*\tV􅾩W|\u000b\u001aV⳨󰄎z9M6{W1蕍􍽡\u0013󸞭9XM]씲u/󱢟􀵁\u000b󲸼?5Q\u0010LhW\u0002󻪱\u0015\u0002􂐕jpF=\u001f{퐧3f*=\u0004􏓨\u0008=\n\u000c)=$\u001d1La𢇄;jzm𥙃蔷\u001aS0J\u001b􂘥 𠇨y\u0015\u001a^𣬿,󳯦𘛂O󵼽􏈓a뼾5 Y,靣)\u0010󳭉1+A\u0015}􍙭~\u0001b9􋛸󼸗'3\u000eS}.\u0015KLP󺷶􂵯􅃻6'=2\u0002C㬢\\H8Uf\u0016LSN󹋓󸩠k󸁍O4\u0017\u0004)1}P4\u00183\u000e[Mc𥶹h\u0005(𢊔恹r^z\u0014#DV\\$I\u001c/\u0012Z^i󱹺}𫽙f󼂀QyE21\u000b󶕬uL󳩍뱤\u0013𣜧rds\\zj𥯣\u001c􇴇􁾴\u0017\u0014d\u0010PM/^􏯅\u0007粩G鶆𧎊@t⊇\u001d\u000ena)M$K󾀳󶁉\u001cR󾺡k6tv䱂\u0011󺱐/,w\u0005U\u001a\\0\u0014m3`eQ嶧 ]>Bf𖣧$G2\u0017􉌴:󿳻󱋽v\r\u001eL\u000b^ujRN+b#ꚧ$CulYu7\u000f\u000f꣮R\u0014?󵪍XiDD\u0018\u0019᭼X\u0013\u001bi𥨗r3󹇌\\mZ􊢡󹔒􎶀|eJ;9쁛\u001cb\u0010􅣄\u0018p􄠰7𤏍[j\u0008\u0015)󺞃?X]c𧹺􆚿\u001d膌a\u0006ⶶ .yu󹱈󽦮𣩶􉀛Ê𩳟\u0014M𧱅?Q*pzVXTk/󻠈*\u0000D놂\u0001🎕⣖aD!6]\u000b5x蜬􇜆>n|#\u001e󳅃􍓗\u000eA\u0005㏞\t%4󺏡Ƶ\u001b+-_\u0016\u0016󶒇􎄺\u0005dH𢐴􊟲-:\u000fQx\\󵀈𤟐a\u001c󴀡𠡚eJ􌖀,󶵐\u0019|ட4檊󽹵k;\u0008󽩇6\u0017s~\u000e𐱆\u000ezJ𝀝Dm/ra\u0011S0 \u0011剐\u0019jw\u0013{𩓫\u0008􌥘C\u0002`J7#\u0001-\\]$\u0019𥯏`Z=|􁅴\u001f𨭂\u0007\u0012󵮍[\u0019kX?𐰺%0HOW@Ew𪜚'4𩊡[B𗭘󸌁^m􌸌󻧚tE􅄯Q\u0006𦐘\u0002Z\u0016󱾗M\u0015_R\u0017N\u0016\u00076\u0010:䬚S\\\u000b􈃻-Y7\u000c\n6􅃴hc󷊜&N􂔜􌭔E􏚠\u000bCqHrWV𧢏􃀳𠃋srO􀰺 󺥵/\u0002~𡜞蜞C愫𣝑A6WvF|󳢢MK\u000beS.+)4|\u000c󱉚m<_{\u0005\u000bW]􂠐m\u0003(&𖥺e㊱󱖠\"朇kC裚i󰱿\n/&,7󴭻v\u0019-s\u000e𫯷䁷󽴦몭󲟘_\u0017,_Rk,=Fx_𦯚\u000b􄚈#yℤ\u001e邤\u0000V\r󹑘\u0010\u0019WD󠀻BV󼛝6􆝋ࣘq\u0006圩𧪎欜󵽼\u0008􂕋>'\u0010󴤲",
     "email": "e\u0011₋c[i@2CTG\u001f\r",
-    "url": "https://example.com",
     "name": "^􃊤\u0005MSO􃋏0\u0002",
     "password": "8\\%\u0002넖s\u0019F\u0019v5BC𩓷NL\u0004埚\nTASqz)\u0004kQ􄉽UD\u00060\u000e󴡀􀀫筸󻓽\u0016󾏸🔁\u0001􆖞qM_,𩭇+pa8\u0001J\u00002r\u000f#􎸯-\u0019\u0001^\t剽XuS𦯄\u0007\u001b\u001a_󱊎XPC𐝥\u0017&C73󼪬\u0016|/M2F\u000fS\u0008煱I3{/\u001c>\u0012H5rv5\"?!0𣢃^SC\u0008S5𓈊XP}0VT𩩍\u001cDꑺ`\u0006󸰟f􎣉𠂸Qt`P9~𪢶\u0006\u0017𑿪󼶵K=\u0015RC뇉􏙨􀉄\u001d\rY􏁑e&\u0013d\t率󴃶󻌿W\u0010\t!\u000bex@]xh\u0019o%𬜁􈍇􇑾k夁7/y:􋐦󷑊R𘘯A3㳣􁚔*tnwXQk𡋻􅭓􅢠𨰧𛆋\u001a𤝡\u000e\u001eㄾ\u000cꍭ'!%p\u0007􏠢x\u0001􂎬鵈SP󶈸T𦰓j\u0019$5vA;2Y3\u0010􇙿𐄔`{\u0019S6\u0017\u0016𡾾?󻾘m\u001c螮I𬱃E0䯖<.Gu\u0006\u0006\u0012\" -C_W䛵j\u0013\u0015\u0000C\u0015s欙\n\u001c&G -e㏣\u000bM+pB|𬤠d\r\\,2M󵰱𪧕qA泾\u0008.􀝔gP{5y0󶍁\u0001􃶭d|\\EUG비s𣏃\u0002F\u0016`󽭲OD\n';􆂬$$D􃓶: r\u00114𘣾\u001b\u000b\u0012j+\u0002P\u0016cZF,u􀰳𪽄\u0019\u001b|yAE'蠱\u001301I\\J\u0010\t\u0000\u0006^mn𪑷7/\u000fs撗\u000e4c!u󻹎P(\r-\t\u000f\"賵\u000b2Y;\"h􄿮`?;\u0004\u0003&tyLb(P􊻗2EC\u0006󰂁O+Gt𡝨\u001d􀽟;wwl8\u001czW󶩉\u001e󹶱c𭱤kSB%\u0004nC-\u0019%\u001c󷱍.\u001dy􆎑􄞈􂨨\u0004󿊴𢼠𝅜􋂢i󸖨&7𩊛\u0011󶹾\u0016󹌁.W𮕋9셖a(d􇭏,𢓰xOX􍓃􅵉󸖹𧮤)H󲈸7K𘋙@\u001fM䰮c휭K6xk\u0016\u0015𡋠CH,$⅜y\u001cK􇐰iZ􍚞\u0007\u0002\u0001k\u001ax𐌃􆒚h\u000f\u0007YH􋹘\"舙􁤁$u沞wk\u000f\u00113\u0013\u0004󻔅􋜵>\u0017􏞿D􅭨kHAt%\u0001-AN减\u00070|\nC\u001bLdigb\u0016O\u00154𦛉>\u0015\u0011哀𬑶쿉KE􊝤%𭄽huLv;𮘈𥐘栲ll(}]8#􌽗䂹0(󽳉#𨓕cd`-\u0005𓊑P󼲎[ 􊆺[$脼^􇍑,uKr𦬛!M웥#b𣯢]i𢹼\u0003u\u001d\u0013\u0018bU.pgb􂵂[N\u000f,q\u000bed\te\u001c`<7X'ot󰈺\u000b𦲑KK𥛾g𭄄w󺳵𣝻['!\u001fx/.\u0012ഠJV󿒇uC=C𤎛rا\"𥠛\u001djR*",
-    "description": "ia𩋕\u001a$\u0016忡Km\u0008Fc󱱜\u0010]m\\'\u0017d\n􆏥mm-𪊋L𨧭슗𘓊}\u0015󳨚\ne\n\u0000Wy뛤𩏯\u0016\u001a=P=寣\u0006sbD\u0019fY󵿟p\"R𘔨g󷣉H􋢟𔐥L\n􂡺>\u001bl>Q\u0014BlW𨥴\u0007\u000b\u0007T+'?rI)\u0015󸆜H\u001c\u001ad􂦿\u0001󻐓.A=>\u0007{@G<zob\u0014띄*=𠹿?eb𠦩;\u0012𗵥/`Q\u000f\u0007?^`f&􊘳󿐦h'\u000bV_?y4\u0012\u0005Ek󰈷r𗡎\u001f􌆘Rz_Z󺎍xs_3쾑\u001c7벀A󻒉􂵟󽥡󺂖3wl6𦳿9q\u0010\u000f&P\ttxEj{~4J鐥\u00168\u0019@􏜙W=󾴵\n.u􅹞𐋉𧲫*\tV􅾩W|\u000b\u001aV⳨󰄎z9M6{W1蕍􍽡\u0013󸞭9XM]씲u/󱢟􀵁\u000b󲸼?5Q\u0010LhW\u0002󻪱\u0015\u0002􂐕jpF=\u001f{퐧3f*=\u0004􏓨\u0008=\n\u000c)=$\u001d1La𢇄;jzm𥙃蔷\u001aS0J\u001b􂘥 𠇨y\u0015\u001a^𣬿,󳯦𘛂O󵼽􏈓a뼾5 Y,靣)\u0010󳭉1+A\u0015}􍙭~\u0001b9􋛸󼸗'3\u000eS}.\u0015KLP󺷶􂵯􅃻6'=2\u0002C㬢\\H8Uf\u0016LSN󹋓󸩠k󸁍O4\u0017\u0004)1}P4\u00183\u000e[Mc𥶹h\u0005(𢊔恹r^z\u0014#DV\\$I\u001c/\u0012Z^i󱹺}𫽙f󼂀QyE21\u000b󶕬uL󳩍뱤\u0013𣜧rds\\zj𥯣\u001c􇴇􁾴\u0017\u0014d\u0010PM/^􏯅\u0007粩G鶆𧎊@t⊇\u001d\u000ena)M$K󾀳󶁉\u001cR󾺡k6tv䱂\u0011󺱐/,w\u0005U\u001a\\0\u0014m3`eQ嶧 ]>Bf𖣧$G2\u0017􉌴:󿳻󱋽v\r\u001eL\u000b^ujRN+b#ꚧ$CulYu7\u000f\u000f꣮R\u0014?󵪍XiDD\u0018\u0019᭼X\u0013\u001bi𥨗r3󹇌\\mZ􊢡󹔒􎶀|eJ;9쁛\u001cb\u0010􅣄\u0018p􄠰7𤏍[j\u0008\u0015)󺞃?X]c𧹺􆚿\u001d膌a\u0006ⶶ .yu󹱈󽦮𣩶􉀛Ê𩳟\u0014M𧱅?Q*pzVXTk/󻠈*\u0000D놂\u0001🎕⣖aD!6]\u000b5x蜬􇜆>n|#\u001e󳅃􍓗\u000eA\u0005㏞\t%4󺏡Ƶ\u001b+-_\u0016\u0016󶒇􎄺\u0005dH𢐴􊟲-:\u000fQx\\󵀈𤟐a\u001c󴀡𠡚eJ􌖀,󶵐\u0019|ட4檊󽹵k;\u0008󽩇6\u0017s~\u000e𐱆\u000ezJ𝀝Dm/ra\u0011S0 \u0011剐\u0019jw\u0013{𩓫\u0008􌥘C\u0002`J7#\u0001-\\]$\u0019𥯏`Z=|􁅴\u001f𨭂\u0007\u0012󵮍[\u0019kX?𐰺%0HOW@Ew𪜚'4𩊡[B𗭘󸌁^m􌸌󻧚tE􅄯Q\u0006𦐘\u0002Z\u0016󱾗M\u0015_R\u0017N\u0016\u00076\u0010:䬚S\\\u000b􈃻-Y7\u000c\n6􅃴hc󷊜&N􂔜􌭔E􏚠\u000bCqHrWV𧢏􃀳𠃋srO􀰺 󺥵/\u0002~𡜞蜞C愫𣝑A6WvF|󳢢MK\u000beS.+)4|\u000c󱉚m<_{\u0005\u000bW]􂠐m\u0003(&𖥺e㊱󱖠\"朇kC裚i󰱿\n/&,7󴭻v\u0019-s\u000e𫯷䁷󽴦몭󲟘_\u0017,_Rk,=Fx_𦯚\u000b􄚈#yℤ\u001e邤\u0000V\r󹑘\u0010\u0019WD󠀻BV󼛝6􆝋ࣘq\u0006圩𧪎欜󵽼\u0008􂕋>'\u0010󴤲"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_8.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_8.json
index b2b15af7930..a4194a2c1f8 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_8.json
@@ -1,7 +1,7 @@
 {
+    "description": "-\u0008k8Y|'줦F~?󵚡c􃘫@⽎\u0004=ੁ⽼j𠼎>s\u000fE\u001eZ􇐂VI󰖍xZ gz󠇧\u0019{둪Z;𗬰𤢥󿅍nX%h_,G𢱆逪+𢝯pgd󺶝𦹨V:/\u000cq~j(+Oa􌩬\u0011f\u000c\u001c𫒿/\r\u001e=v;􁨽9=7𢀃󳎲\u000cY-𠕓􇶩Z%􄞺𨖳PO꓆􀎭􌋉<𤪶\u000c`\u0017z䵪~𣇊𨌷\u0000\u001b\u000c󰵳K􏻢𦏸h\u0002􌭸\u000ft\u000e\u0019\u0013\u0012]TM\u001a#j俏_fzNi;󻺕e3🦔_b\n󽫏\\hn6Y󿐐+g\u0004\u0019FJ\u0014?󼦜𤧄ꤋ4l𑀬\u001fZ󴴜'Y􏪙\u00148𨾶󳎦=PZQ@􎒊\n󳭿옐󱩅𭁦y󺢏d\u0010e􀻢P𪕻L󴦃:􉮤I뷬<\u001a󿉽\u000c􇛟\u0013|E󽋗\u0002I􄞐3\n콴\u0000􉏵7\tn\u0014\nF󰷶@\u0012\u001d\u000eiB\u0010\u0011W6)𨳔8;\u000cIl\u0004)\u0013𫬃k􈟬_\u00047<=Wx향\"YG#󱫱#|=P􎯬\u000c\u0004\u0017\u0008ok𪜏V􄸡\u00042B]𥣍\u00010e\u0015𧨦鞅;@𫫾R\u001e,NUR􂈁7󾷬\u0010\u00013s,'󼼖𦑔􀧜\u0007\u000e󷜤􌄾58^󰥊\u0014da𨭘\u000e7\u001b(R𐳰x𫃬{㓍𛃬?l#\u0005q\u001dxB􊐗(%j󸳩𗥐\u000c^>q􄎄7鱸􅶓XL\u0004.􎛭\u00074𫮜􌁦\u0010cpr?釞4􃋷􌩤𣮮\u000bS𧁭gZ\u0000\u0001\u0000h(u􇕜`eRZT=Z\u000e𤤘\u0016Ha\u0003􈏘𬃁\u0014x𩑍abpmUb\u0001\u001e𪿍󵛧􇧪RA􍺋󽧷l),𠑩󿍟~0\u0005Na鬟󸪯𦠒護<u<\u001b\u0004K灴\u000e 󱓕𘥀􊇬=󹵦𗠠􄷂W|\u00109\u001d\u0008k;W2$Z𩆋BS𞋵􀳓}𮬃􎈳8\r\t_\u0007#\\P􇍢Oc>r?}􃡨\u0001\"㚎_9Ge󱌿\u0019BEԥͼ􀁵贻xmP𡱑pg\u001e\u001f\u001a\u000b𪌕虉J𩿱H\u0002ꊖ𐬤<iBj\u00021\u00145󽛠𖡴𑆦Y甋􀂃1%🅪􇤛\u0012/4:𣖯󹣌!\u001c\u001e\u001f龉/\u0017󿁩7RnU\u001b󸩣𤖧\u0014o%}􋸗\u0019+--b5\u0013峚*a\u001fNvY􏠵\u0007\u000e𮦷L\u0018^Tu󽖁MC[\u0014(􎄎󴒧!H2EO􊨬\u0018 \u0007o0x_􀄷Rލct⟤\u0008~!󹾄\u0007􉬏󼗌$U\u0016q\u000f𧄢;\u000fL󱉈9yM󳁦p옰;(f?U􊥭a(e!x悜n\u0011􊥋󼚿8􍧯쾄\u0016𥀽𭺥5x'Eb$a.]樟~䆇T{\u0012\"|\u0008\u001c>\"V傱\u000b`( JAC󶴧\u001f剞m[슅\u0014\u001be\u0004󺰡𑀩/\u0018SX:s>k⏓q-\u0006C $[M픵T^46\u0008󳍄{q􈈢x&G𫥅𘪹𞢎\u0011􎤶aM􁣊N􋿟\u0013\u0018󳆉G%󸴺^7\u0004󷠌(c\\\u0017󺯤𧞏gYb\u0015z+\u000f`\u001a\u0002hT?@旲􎥿\u0000!zX\u0017P􅑉my漯\u0000봹6𧝙Y𠵫\u001cE閤+:󿻏远%\u0010𭾀p\u001dO􌇼\u0010\u001d\u0018\u001d9\u0015E𣵋\u0010i𨑊T~i󻬠V\u0017𣆒H\n\u0010\u0015􃸦\u0015;􎁜\u0005𤋢𤠁\u000c\u001bv\u001eMq59{\u0017🏟2J\u0013.\u0013P^",
     "email": "\u001a#\u0019dlb@\u0017󰦍\u0015^",
-    "url": "https://example.com",
     "name": "㩆\u001eh􅩏;Io2:\u0015^e3\u0015𥓍Vq=\u0019􊓵\u0003􆬸􏝇\u0011h5Zqc􈙩vz\u0008V\u0010\u0016Zh-\u000bZ4󶑯5/KI󸕫㦷\u0015\u00139徠:q5Oe􈮣9\u000b:xx'U􎎲\u001at|\u0011O-}\u0001\u0014Zz󹝟z[,F{􆗄\u000bਁ\u001a4\u00100-\r\u0008\u001fw\u000f\u0013a􆔜mv\u0011;鯝W&e|󶜇􇽰;o🔼𢑞\u0001ds眮\\󾽊\u000f.픴J.1",
     "password": "𬖩2𭽏qfb\u0002訅􋏕𫪬\u0002aC\u001b𒃙𬘐𐅥{\u0018𮘻w􏑆D􁠐q\u0011!N.]bQ\u0003*\u0017\u001f\u0007󿥧q𦥲w𥏽)p\u0006󳊩􆿴𬑒){N5\u000f'Eb㭴\u0016x\u0000􆆶󱘉YB7􋋤co\u0004,[󶶮kDB􇴒qU\tr좺s󽂘Jv*羇)TM1󵨘=䍩\u001f=g\u0002𨂂\u0014\u0004-5\u000cr@f뼘󸬋80\u001f𨳜뻍ns8WB\u000c􊹱#C\t겴_𗝪Fl𥇔\u0008K~\u0006󴍹\u001c𧑒9\u0016.\u001a4R\u001c#𨖵䄈2\u0000\u0006伸\u0004\r\u000f􈶘\\\u000c),퐣kJ𬆸􂗀2B27\to?Gލ+r􉓽o\u0013\u001d(\r\u0006J:`\tZ\u0000Kp\u001exK~,E􂖇\u001338󴖿\u0018󷉶𪳂ynza\u0010g􍳰fB\u000eX\n􁂊􏼫H􆯇󲆀b+󻷈IC$\u0008󶃰𘒍}jc󸥉B\u0005+𭡢\u001f箒\u001a\u001a\u001a\u0003|\u0015󾚃Q􈂢\u001a1󳭩C\u001dA󿾞X_𣜐\u0003T;󷯫\u0008(𣉜\u0001🏝𝛩9no 󷖾v媜b(\u001b48\u0007󺋦wEL𡾏􉸞\u001c6ePOm{\u0011𨆫,&zj\u00069f\u001cd%z􍿟󽖱6\u0010󽮑i,\u0010\u001dy,Tꆜ>z\u0006【\u0004{yUcu剕\u0016𠲦gB녯\u0007t\u0000Ka>𨒕󱵌 𬡽􌸿~\t󸭕􇶎yzRZW󶉐\u0001T󾑫,\u0004Y~F𮚉\u0011\u0002Z󰯾\\8ei$FViM[e2F\u000f􆶕RcZ󾺗\u0015N甔Kr\u0008o\u0008\u000e;\u0002s=𤵑v𮆬L&r꿑3\\𩚠6\u000f뾕惾\n􀏍𢷟𢱉4􄱺YX࠻\u001b󼩼廓𥃥cFE\u000c3􍚕QiPb\t𦅎\u001a\u00079&\u000c󹼳\u0005\u0000\u0002\u000f,M\u0014\u0013~tx0u𐹠c6\n􊮫􂪃WA-⣇S\u0011?󱞀𦲯^𠘬u\u0011|#0I𬔵􏩵\u001da𪤡𑈱r<k􉸵\u0015bN𭥷\u001a\u001f\u0017G\u0016w%\u00028u𘄣i\u001dO\r󱈵\u000b\u0001yu𭔜\u0013\u001cs􊨲𗸊𭅅24\n_W2t\r]Ou&󳝺\u001du]\u001d >\t%􈛃RkwJ:􈓷^𧵔􅐞iI􏫩f\rx蒎eN𫆕uE𧅶𫉥鎁];毜\u0018\u001c𦃕蔌\rT\u0008𧮱𡚻\u001aS|V􃜉&􂦦\u0010:\rYxL[ረF,c쫇\u0014n>􅘏\u0004;/+􆡞\u001a𧞆\u0015t𤊇또#<\u000eV瑺\u0014$󾉁5󴍹􅦌𨴱eN\u0011\u001e\u0002􍔇\u0015u3~\\𨰛𖣘𪁿(󼐶[𥒈\u000fC<𨁹|Um􋩩e]J\\󼫊]\u0000Ac􎚍#銭󾲗󳒷o\u0004S󼜯餻9\u0007=T\n[WkRO\u0016/􁩥u$`(󶢦\u001bw\u0012\u0006;􉼱B􊶩I[gi󲙙",
-    "description": "-\u0008k8Y|'줦F~?󵚡c􃘫@⽎\u0004=ੁ⽼j𠼎>s\u000fE\u001eZ􇐂VI󰖍xZ gz󠇧\u0019{둪Z;𗬰𤢥󿅍nX%h_,G𢱆逪+𢝯pgd󺶝𦹨V:/\u000cq~j(+Oa􌩬\u0011f\u000c\u001c𫒿/\r\u001e=v;􁨽9=7𢀃󳎲\u000cY-𠕓􇶩Z%􄞺𨖳PO꓆􀎭􌋉<𤪶\u000c`\u0017z䵪~𣇊𨌷\u0000\u001b\u000c󰵳K􏻢𦏸h\u0002􌭸\u000ft\u000e\u0019\u0013\u0012]TM\u001a#j俏_fzNi;󻺕e3🦔_b\n󽫏\\hn6Y󿐐+g\u0004\u0019FJ\u0014?󼦜𤧄ꤋ4l𑀬\u001fZ󴴜'Y􏪙\u00148𨾶󳎦=PZQ@􎒊\n󳭿옐󱩅𭁦y󺢏d\u0010e􀻢P𪕻L󴦃:􉮤I뷬<\u001a󿉽\u000c􇛟\u0013|E󽋗\u0002I􄞐3\n콴\u0000􉏵7\tn\u0014\nF󰷶@\u0012\u001d\u000eiB\u0010\u0011W6)𨳔8;\u000cIl\u0004)\u0013𫬃k􈟬_\u00047<=Wx향\"YG#󱫱#|=P􎯬\u000c\u0004\u0017\u0008ok𪜏V􄸡\u00042B]𥣍\u00010e\u0015𧨦鞅;@𫫾R\u001e,NUR􂈁7󾷬\u0010\u00013s,'󼼖𦑔􀧜\u0007\u000e󷜤􌄾58^󰥊\u0014da𨭘\u000e7\u001b(R𐳰x𫃬{㓍𛃬?l#\u0005q\u001dxB􊐗(%j󸳩𗥐\u000c^>q􄎄7鱸􅶓XL\u0004.􎛭\u00074𫮜􌁦\u0010cpr?釞4􃋷􌩤𣮮\u000bS𧁭gZ\u0000\u0001\u0000h(u􇕜`eRZT=Z\u000e𤤘\u0016Ha\u0003􈏘𬃁\u0014x𩑍abpmUb\u0001\u001e𪿍󵛧􇧪RA􍺋󽧷l),𠑩󿍟~0\u0005Na鬟󸪯𦠒護<u<\u001b\u0004K灴\u000e 󱓕𘥀􊇬=󹵦𗠠􄷂W|\u00109\u001d\u0008k;W2$Z𩆋BS𞋵􀳓}𮬃􎈳8\r\t_\u0007#\\P􇍢Oc>r?}􃡨\u0001\"㚎_9Ge󱌿\u0019BEԥͼ􀁵贻xmP𡱑pg\u001e\u001f\u001a\u000b𪌕虉J𩿱H\u0002ꊖ𐬤<iBj\u00021\u00145󽛠𖡴𑆦Y甋􀂃1%🅪􇤛\u0012/4:𣖯󹣌!\u001c\u001e\u001f龉/\u0017󿁩7RnU\u001b󸩣𤖧\u0014o%}􋸗\u0019+--b5\u0013峚*a\u001fNvY􏠵\u0007\u000e𮦷L\u0018^Tu󽖁MC[\u0014(􎄎󴒧!H2EO􊨬\u0018 \u0007o0x_􀄷Rލct⟤\u0008~!󹾄\u0007􉬏󼗌$U\u0016q\u000f𧄢;\u000fL󱉈9yM󳁦p옰;(f?U􊥭a(e!x悜n\u0011􊥋󼚿8􍧯쾄\u0016𥀽𭺥5x'Eb$a.]樟~䆇T{\u0012\"|\u0008\u001c>\"V傱\u000b`( JAC󶴧\u001f剞m[슅\u0014\u001be\u0004󺰡𑀩/\u0018SX:s>k⏓q-\u0006C $[M픵T^46\u0008󳍄{q􈈢x&G𫥅𘪹𞢎\u0011􎤶aM􁣊N􋿟\u0013\u0018󳆉G%󸴺^7\u0004󷠌(c\\\u0017󺯤𧞏gYb\u0015z+\u000f`\u001a\u0002hT?@旲􎥿\u0000!zX\u0017P􅑉my漯\u0000봹6𧝙Y𠵫\u001cE閤+:󿻏远%\u0010𭾀p\u001dO􌇼\u0010\u001d\u0018\u001d9\u0015E𣵋\u0010i𨑊T~i󻬠V\u0017𣆒H\n\u0010\u0015􃸦\u0015;􎁜\u0005𤋢𤠁\u000c\u001bv\u001eMq59{\u0017🏟2J\u0013.\u0013P^"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewProvider_provider_9.json b/libs/wire-api/test/golden/testObject_NewProvider_provider_9.json
index e079db7218b..1616f392f48 100644
--- a/libs/wire-api/test/golden/testObject_NewProvider_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_NewProvider_provider_9.json
@@ -1,6 +1,6 @@
 {
+    "description": "i󷕳gG\u001a[ᰩኬ𐓀WṶ\u0000/$󶖑PU+ā\t;/0􍬟夞U0\u0014ྐྵM2Q}$W􎛘-𨌕+𬅈\u0007M󷎌5\u0015鼉_𥒺󼢀%\u000f\u0011t\u0007𣩪R󺁃4o?V-:H瑢!P\u001d\u0017N,􀺧3\\㾪𣝘\u0001GqKb􋛽􃙕i=t|K󿧏G 9􌥢X󶁯o쵐􉍞)mR\u0013f\u0018\u0002\u001aNU\u0019Af󱲘Q9t𡣖𠹄\u000b􈊞@󶊶􌄲M\u00198S`[e𗘓m6F\u0016G}󹣮K>ᐉ󸯳^ec9\u000fYG\"6mcB4𭖨𢥕ᢷh$\u00055+|&L󸼼\u001aƆAv󼗧\u000bxS9􉂣c`D\"\"b𬫱\u0016ᢠ󽋤\u0013z𤇇Q`Dr􈉴R𗫛h^\u0015>\u0004\u001cM>J;󻒷=n𠥊z|E\u0015􏸦Vl􂓝P>󹳲V𑢸jz\u0003𦭨𪯶qP-h[冴R9󺝞*\u0012\u001a𦢶+\u0016$@𩋊<𫖛K_􉇩T𦀦?_〖Iz𣭛󴧪ꢞp8^>\u0006C욉ၷ?\r$𧽵f􄧧#\u0014I毪'\u0013\u001a𦍈l\u001f5󾉵\u00116o\u001flk󸿖𩅖𧈝y􎖰\u001b\n\u00025\u0011󱎓Ohq/\u001b􅳱S󵉭ewtk􆭍􊿡H眀tnSE5\u0019\u001f@a𫼽d𩿱\u0003@\u0005𖡙\u0010G`󳴃8𘟚𠳨􏪱𥃚?jN𠆝w)4,J\u0013𐧊(\u001c|*\u0017ZNdJ笱fcx\u0012rjH$㳩􎱈R󻿢󶒔\u0008A#=􏡶𦸵T󾰗ty!\u0000l樶H唆OK\u0017[R)𝐫1`𫱘\u001d\n\u001b婍rAnl𡗀3n󷇺\r+𪝠5􆅪%R5tIG/,E􀷔_C\u0012\u0003󱛹r룮\u0008𗺰\u0014𘕁Xy-󾲄h|𥳪\u0004􎖂s\u0016v4\u0003.Q\u000cb,􋛼\u0012C\u0014'讣JFS!I*p檴&\\E\u000eS8ꍇ9𒐤4t𨢫㢵󷭷9v\u001fV\u000f􅩠\u0019\u0018\t앒p\u0017V\u0008\u0006bY𨀔o\u0008𞄈j)Y\n􀈰LE[{\u0016'E: 𮡑󹯃D𬤌~𩒨\u001b\u0011p󺉡J\u0016𮀖[士􇐠\u0006Mg󱞉\u0001xK󻄊C\rK\u001f\u0016-鼅<􃌗P\u0003E<[4􄧔KIXm\u000eV\u0012]Q*r\u0016*\u0001􇉊\u0015\u0000~gA𗢺XB{\u0005N2􊝛뛊p\u0017\u001fn.}OB1\tU\u0019JHB􂽻\u000f𩂩DP\u0012󺭖$󳇴\u0016}윧\u001d𡬨e72𦸦)&ol\u00189I\u0007DOW\u0005i선4\u001ezbB\u0014统L\u0005X􌅶󾊋\u0013d󽭄2󷨞w8􀏙􍫮I\u00002𮥝\u001e𨨸\u0013x뇝(yLL󳢿\u001diFSE8\u0014#\u0001T󸸶\u0013\u001c𪯻\u0015􁬰kf𦖣ߊ\u0017\u0006mh效'Lqo,\u001d(󱾧\u00031@\u0015b\u0007\u001a:\u0018/\u000bA\t𪮋鼻gv􄽅𦳈i󵹩\u000e暑첱V4BEy󵲊\u0016\u0016&󵡱混ak󺄡𧬥$􇐻BV\u001d\u001bnV?$/F䰖閽7.?/K\u0006X\u0006IZ/\u001e𡔶𧪡𥡞x^𪼁;\u000f\u001e𬐳\u0018rwFL\u001b5T\u0010v𪴞\u001fG𨸇x\t ;\u0002h@󵸈~􎭇\u0000;􊗃*Mu\u0017Iy`FI`X汓6#,Hb\u0015~@𭐌\u0017m>눈`H)E𩏯p@~f󲭡\\\u0007\u0016H⣦𦴈\u000f󽥰oJ7󵃅)$\t8pxM􇷒\u0003\u000eﭐ]\u000cn􈴊-?^\u0018Mda/􄏸Ei(􏷀=󹜾𦑧&62.\u0000",
     "email": "8-\u0016\\@\u0004옐~#",
-    "url": "https://example.com",
     "name": "h{kᮤ𧥕𘒭.t󶿥\u0011K\u0016>O\u000f\u0001뿐pJ\u0001\nh(􂜊E燙9䜃\u0015\u001cܛ\u000bD󳄵\u000eg6F􁙉qUD톢󻋲hn]f툏$kZg󰗯\t~;󸙈󵶞k󱟔5𧚍r\u001e\u0006[\u001e󸧪𬶝靟\u000733𤀰6􅉩$#{\u001d\u0010\u0004X\u001c=N\u0019𫾳6<0%\u0012cdm𪦑b㟼\u0005=9F2:𬡑~\u0019\u0017묬k!Q𥙾􏊀[\u0000eld",
-    "description": "i󷕳gG\u001a[ᰩኬ𐓀WṶ\u0000/$󶖑PU+ā\t;/0􍬟夞U0\u0014ྐྵM2Q}$W􎛘-𨌕+𬅈\u0007M󷎌5\u0015鼉_𥒺󼢀%\u000f\u0011t\u0007𣩪R󺁃4o?V-:H瑢!P\u001d\u0017N,􀺧3\\㾪𣝘\u0001GqKb􋛽􃙕i=t|K󿧏G 9􌥢X󶁯o쵐􉍞)mR\u0013f\u0018\u0002\u001aNU\u0019Af󱲘Q9t𡣖𠹄\u000b􈊞@󶊶􌄲M\u00198S`[e𗘓m6F\u0016G}󹣮K>ᐉ󸯳^ec9\u000fYG\"6mcB4𭖨𢥕ᢷh$\u00055+|&L󸼼\u001aƆAv󼗧\u000bxS9􉂣c`D\"\"b𬫱\u0016ᢠ󽋤\u0013z𤇇Q`Dr􈉴R𗫛h^\u0015>\u0004\u001cM>J;󻒷=n𠥊z|E\u0015􏸦Vl􂓝P>󹳲V𑢸jz\u0003𦭨𪯶qP-h[冴R9󺝞*\u0012\u001a𦢶+\u0016$@𩋊<𫖛K_􉇩T𦀦?_〖Iz𣭛󴧪ꢞp8^>\u0006C욉ၷ?\r$𧽵f􄧧#\u0014I毪'\u0013\u001a𦍈l\u001f5󾉵\u00116o\u001flk󸿖𩅖𧈝y􎖰\u001b\n\u00025\u0011󱎓Ohq/\u001b􅳱S󵉭ewtk􆭍􊿡H眀tnSE5\u0019\u001f@a𫼽d𩿱\u0003@\u0005𖡙\u0010G`󳴃8𘟚𠳨􏪱𥃚?jN𠆝w)4,J\u0013𐧊(\u001c|*\u0017ZNdJ笱fcx\u0012rjH$㳩􎱈R󻿢󶒔\u0008A#=􏡶𦸵T󾰗ty!\u0000l樶H唆OK\u0017[R)𝐫1`𫱘\u001d\n\u001b婍rAnl𡗀3n󷇺\r+𪝠5􆅪%R5tIG/,E􀷔_C\u0012\u0003󱛹r룮\u0008𗺰\u0014𘕁Xy-󾲄h|𥳪\u0004􎖂s\u0016v4\u0003.Q\u000cb,􋛼\u0012C\u0014'讣JFS!I*p檴&\\E\u000eS8ꍇ9𒐤4t𨢫㢵󷭷9v\u001fV\u000f􅩠\u0019\u0018\t앒p\u0017V\u0008\u0006bY𨀔o\u0008𞄈j)Y\n􀈰LE[{\u0016'E: 𮡑󹯃D𬤌~𩒨\u001b\u0011p󺉡J\u0016𮀖[士􇐠\u0006Mg󱞉\u0001xK󻄊C\rK\u001f\u0016-鼅<􃌗P\u0003E<[4􄧔KIXm\u000eV\u0012]Q*r\u0016*\u0001􇉊\u0015\u0000~gA𗢺XB{\u0005N2􊝛뛊p\u0017\u001fn.}OB1\tU\u0019JHB􂽻\u000f𩂩DP\u0012󺭖$󳇴\u0016}윧\u001d𡬨e72𦸦)&ol\u00189I\u0007DOW\u0005i선4\u001ezbB\u0014统L\u0005X􌅶󾊋\u0013d󽭄2󷨞w8􀏙􍫮I\u00002𮥝\u001e𨨸\u0013x뇝(yLL󳢿\u001diFSE8\u0014#\u0001T󸸶\u0013\u001c𪯻\u0015􁬰kf𦖣ߊ\u0017\u0006mh效'Lqo,\u001d(󱾧\u00031@\u0015b\u0007\u001a:\u0018/\u000bA\t𪮋鼻gv􄽅𦳈i󵹩\u000e暑첱V4BEy󵲊\u0016\u0016&󵡱混ak󺄡𧬥$􇐻BV\u001d\u001bnV?$/F䰖閽7.?/K\u0006X\u0006IZ/\u001e𡔶𧪡𥡞x^𪼁;\u000f\u001e𬐳\u0018rwFL\u001b5T\u0010v𪴞\u001fG𨸇x\t ;\u0002h@󵸈~􎭇\u0000;􊗃*Mu\u0017Iy`FI`X汓6#,Hb\u0015~@𭐌\u0017m>눈`H)E𩏯p@~f󲭡\\\u0007\u0016H⣦𦴈\u000f󽥰oJ7󵃅)$\t8pxM􇷒\u0003\u000eﭐ]\u000cn􈴊-?^\u0018Mda/􄏸Ei(􏷀=󹜾𦑧&62.\u0000"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_1.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_1.json
index 2e2a2318259..557ed9ae8a0 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_1.json
@@ -1,3 +1,3 @@
 {
     "id": "0000007f-0000-0076-0000-00140000003c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_10.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_10.json
index d47a28176dd..271943ea61a 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_10.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "",
     "id": "0000004e-0000-003b-0000-005d0000004f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_11.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_11.json
index 75148b4920f..7f002e16b42 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_11.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "fjxhvLuMAS6jsck=",
     "id": "00000022-0000-007e-0000-00590000002a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_12.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_12.json
index 87249ede190..a0e5a15bc3c 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_12.json
@@ -1,3 +1,3 @@
 {
     "id": "00000049-0000-0046-0000-005a0000006e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_13.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_13.json
index db697436984..e3803d98771 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_13.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "gUQcN1bP_8h3BBlT4pw=",
     "id": "00000016-0000-000c-0000-002000000049"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_14.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_14.json
index f2635d49983..d033ae20294 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_14.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "mMpX0PDqAg==",
     "id": "00000026-0000-006a-0000-004c00000031"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_15.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_15.json
index 6d855863ce8..36de4d0974a 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_15.json
@@ -1,3 +1,3 @@
 {
     "id": "00000068-0000-0041-0000-00180000006f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_16.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_16.json
index de3be6f07c7..e7f59edd09d 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_16.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "Cwj-OA==",
     "id": "00000018-0000-0046-0000-00200000000c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_17.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_17.json
index 0562c9e6365..92ea25dae2b 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_17.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "3qpW2poPhag=",
     "id": "0000003f-0000-001b-0000-006400000030"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_18.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_18.json
index 80ae9b5e00c..93398fc0872 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_18.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "SdKMiA2x5Lm8xg==",
     "id": "00000073-0000-006f-0000-00560000001a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_19.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_19.json
index 4ea862a77dc..b5ff775d205 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_19.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "5fs3s32wpdzsZSw=",
     "id": "00000051-0000-001b-0000-00410000001c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_2.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_2.json
index 8117f9bdfbe..a21754031fc 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_2.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "",
     "id": "0000000b-0000-001a-0000-00760000003c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_20.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_20.json
index d02bab6a0eb..0b5d25bd4a6 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_20.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "aGP5hjgYDA==",
     "id": "00000018-0000-0017-0000-000800000011"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_3.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_3.json
index 7b88d26f6ea..a9f65f4bc7d 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_3.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "r5t59oHh0QO-LabQ",
     "id": "0000006d-0000-0017-0000-003200000046"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_4.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_4.json
index 56da27b3c95..8cd87567d23 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_4.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "Vg==",
     "id": "00000031-0000-0070-0000-001500000009"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_5.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_5.json
index ecf93fcb35e..07e01a34ac3 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_5.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "xriWfCcjSkRgzsyR7Q==",
     "id": "00000011-0000-003a-0000-005600000042"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_6.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_6.json
index 2625583446c..161ac81400a 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_6.json
@@ -1,3 +1,3 @@
 {
     "id": "00000052-0000-006a-0000-000600000016"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_7.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_7.json
index b47ba7be932..2d15f526c5c 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_7.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "ZYnc99Mbj9vs6Q==",
     "id": "00000064-0000-0068-0000-001c00000050"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_8.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_8.json
index d43016aadf6..2fabf76a884 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_8.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "dQoSScSqO--gFA==",
     "id": "00000040-0000-005b-0000-006600000011"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_9.json b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_9.json
index dca96accb70..97813cdd721 100644
--- a/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_NewServiceResponse_provider_9.json
@@ -1,4 +1,4 @@
 {
     "auth_token": "aJWKRU079Q==",
     "id": "00000042-0000-0041-0000-003700000015"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_1.json b/libs/wire-api/test/golden/testObject_NewService_provider_1.json
index af43b56f7d3..e48aff0fee5 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_1.json
@@ -1,12 +1,12 @@
 {
-    "summary": "~󵙞)\u001cF{!r\t6k􌕟\"f䢏S0`𢇕;\u001d`B䘶𗢥\u0003𡚜I\u0010}\u0002\u0018\u0019,)󺄊>a𬧝B󶇆C𮂬􄛰󹏂\u001e𭭾#に󴾽mk𪏽\u0008.\t5i@<猖𝘊\"CQB🌎",
+    "assets": [],
     "auth_token": "uw==",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "逸!F𧼢\u000e\u0008dU=JA\u0004jQah\r\u001ab|W󱛹\u0000w􋹙𬚂*4󿁡6𠘘/􋨜\u0018H뭕LW􅏟䱔sG\u0015l柧a\u001b\u0015;okw\u0007kaN𣶮𔕥DAG8pVg\u001f;𗙹@O>Y󿼿M𢶿a𓐎󲕍[C;iS%brix\u0001\\h\tp𫑒󷦫^鹣\u0014𪂋$",
-    "assets": [],
     "description": "􊎒dd𥢾􌐍i\u0003丿􄣛F\u00113$6Iᯯ{आ𦽜󱭭e\u0008m=xO*󰈉􊈎t1\u0013QZ/m🔎\u0001\u0013)w\u0005\u0006\u0006\u000c󹺊𫲒<𘒣!딄󶑬r􁱄{e􀒪;󰡆MV\u0012^Va%􍑁Mx~w_B\u0003\t􍐜\u0000Vf[eE8\u0000OU-\u0004gY\u001aV냺𭺜\u0000\u0005O\u0017\u000f!%\u001e#𪯒?􋈌w\u0008,T>X_3S7􁨼O𬶻􅣔c`\u0000󴭫L\u000eXv\u0018𘋦w;`'C\t\u001f󵨈\u000e\u0017A:M\u001fHh􄵄&zF'\u0014\u000e#\"ErZ\u00199t\u0010\u0004h9D榖쎅\u0011",
+    "name": "逸!F𧼢\u000e\u0008dU=JA\u0004jQah\r\u001ab|W󱛹\u0000w􋹙𬚂*4󿁡6𠘘/􋨜\u0018H뭕LW􅏟䱔sG\u0015l柧a\u001b\u0015;okw\u0007kaN𣶮𔕥DAG8pVg\u001f;𗙹@O>Y󿼿M𢶿a𓐎󲕍[C;iS%brix\u0001\\h\tp𫑒󷦫^鹣\u0014𪂋$",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "~󵙞)\u001cF{!r\t6k􌕟\"f䢏S0`𢇕;\u001d`B䘶𗢥\u0003𡚜I\u0010}\u0002\u0018\u0019,)󺄊>a𬧝B󶇆C𮂬􄛰󹏂\u001e𭭾#に󴾽mk𪏽\u0008.\t5i@<猖𝘊\"CQB🌎",
     "tags": [
         "medical"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_10.json b/libs/wire-api/test/golden/testObject_NewService_provider_10.json
index f9a011d9a0a..7164b7e67eb 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_10.json
@@ -1,13 +1,8 @@
 {
-    "summary": "\u0007󶭋\u0013𥏂_vw\\\u0008WxJe𭔽𧪮󼴡n\t\u0011󽼮M*7k\u001e,#\u0019oO\u0019\u0008𩁹\u0012󶎢𡨘􌉘J󶨀?𨋋\"\tS\u0017]PWw8\u0004\u0011\u00081\u001e󻋈㒅闻XR𖧀xm5낰O󰟒\u0014󵑓\u001e󽏼;\u001cv󻾅m\r\n\u000fXl\u000b",
-    "auth_token": "",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "\u001d􏁊E\u0016\u0017U󹆾w󽻽􏩅7*𪱝Sb𐮋\r镀.2\u000bL\u0019O\u0012=\u000e):\u0000%󿶝\neP\u0019?\u0012\nI􋗮a^;^𫫄𪨆\u0012\u000cb𐽃󸙃⩵󷄙3\u001f𛃬󱄞􌲿󶨨h2%",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -15,14 +10,19 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "auth_token": "",
+    "base_url": "https://example.com",
     "description": "6V9H\u001e󼠊󻊔|󶫮0𤵦뇋DHs󷼞IeJ.\u00022Nꄙ)0_-𐩖|\u001a Y'Dꪵ 𦟌\u0012g2q|Z󷱋gb^36T\u0011\u0005𣼌_8.|\u0006풝oQN6&o\u001e󳈶D#mEgg>\n9L1\u0005\u001c\u00045o\u0007+-~i'\nb𤴽~\u001f@􊮐'\u0013\u0016e\u000cPm\u0007p:􀗷5\u0005.曅\u0011XR}󶧕󳿻𥫅,󽽕0xȩ􄜜q􀝀qx󾲚󸾯/[McF􈷒@𨘫\u0011\u0004󶷪F𧗢hHNO􊷖q%\u0017.󹖅M𡊡\u0005𡊮X𬅫\u001di{o\"T훇 \u0001탃C󼀑?Dsq=􋚞4SoiR☬󾗼􇴒T󴢲)\u0008u𡲟C֗gd\u0005\u000bT󼒂𪝂Ys󹝯6ZNo𬔉󻨧\u001dJOw<HO󰵗y􎰳0f~C1B\u001c\u0018qM\u0005Wᮋ7\u000e󼢂􍛀E􋦮𢆅󴜬P\u0005P\r'D,?E@\u0010삆7\"Et𨖛$􎨢o_L2󺤷h05󼥱))􂧋\n}\u0008\\T\u000bD󸌌F𝈎YJ\u001fRI\u001e\u0004􅴧𗍠唲N7􏜤t\u001a?\r7(2NcU㮟#\u0019󱎮󷾈\u0010s06}Ir9hᅜ\txo\u0014巶X𠑉d\u001bC\u001fᚥ\u0014\u0012\\,𠢭\u001f\u001f7𢣢5S'g{𪗓􃥲\u0004𨶶#2JL6/ip`#c(3\u0019镀9𑒃𫨝B􆞺YBp\u001a)Tf𧡕\u0012忱 &u);Nd۩~\u0003:gTrs🚩럞󸻿􆹉]O󿌍<􅒍\u0013D𬜌f󲀿􈸽)\u000cx𞤶k2󲀮Z𨨻kQ\u001aLV?@Pv􌠵S\u001a5}2C0V泼kmU쪸P\u001fG\u0008\u001d𧩛⺅@X󱇙4:B󹐮\u000b'\u0000\t󻃚L\u0013􆊺T\u0011\u0008H:󷢊AiK},󼹗",
+    "name": "\u001d􏁊E\u0016\u0017U󹆾w󽻽􏩅7*𪱝Sb𐮋\r镀.2\u000bL\u0019O\u0012=\u000e):\u0000%󿶝\neP\u0019?\u0012\nI􋗮a^;^𫫄𪨆\u0012\u000cb𐽃󸙃⩵󷄙3\u001f𛃬󱄞􌲿󶨨h2%",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "\u0007󶭋\u0013𥏂_vw\\\u0008WxJe𭔽𧪮󼴡n\t\u0011󽼮M*7k\u001e,#\u0019oO\u0019\u0008𩁹\u0012󶎢𡨘􌉘J󶨀?𨋋\"\tS\u0017]PWw8\u0004\u0011\u00081\u001e󻋈㒅闻XR𖧀xm5낰O󰟒\u0014󵑓\u001e󽏼;\u001cv󻾅m\r\n\u000fXl\u000b",
     "tags": [
         "media",
         "movies"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_11.json b/libs/wire-api/test/golden/testObject_NewService_provider_11.json
index e586266dc37..b819e5500ac 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_11.json
@@ -1,28 +1,28 @@
 {
-    "summary": "}󾶝\u000cz1f<H􈘳H2􋵖􅈍\u0015xT'!q􂃙󳞰>𐳒\u0010\rDᑿ𝆍\u0006󺳘P6􏆮𡂌𘋛\u0017\"󸷇'\u001bo\u001b敹𘧴-O\\g4c9󲷫,􌧄PI\u0008:r,􁹮@0\r}􀕛󶃁*o𝐦\t,󾎸D󶈜j;DA𫏞믊\u00167(🜶^󻸅h🥑%",
-    "auth_token": "",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "?\u0012~\u000e\u0001𝚴zN㷎RM\u0016󽤌~\u0004󹔹\u0003<㣣O𗛶5\u0004VK;󴀏󲐭 ;\u0004U󱬄C쮜𫞤􁉅z\u0007󽯱gi[\u0017T㯚𝂿@𬻨𤱜\u0011\u0002;+\"m侜􀾶􆀅c\u001c\u0018Y\u001aJ􀏭􇷒\u0005\u001e󱊶&c2yY/J\u001e\u000bx\u001e\u0006󺘗􎢑\u0005J<y!\twC",
     "assets": [
         {
             "key": "",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "auth_token": "",
+    "base_url": "https://example.com",
     "description": "􋍚렆f\u0013=I^f,󺷛PvgntY\n>𩳒􅅿L7%􌝣E*jc\r쉰𘦾W (B*􊂒;C𪽂􋊗󠄠\u001b- >^𠍷\u001b;\u00110ﱨ8\u0001S@󻜻V;\u0019\u0011[[\u0002#B󵬴􁕀m\u001c\u0013\u0006N\u001c􄍴tY#q􂡿𗒐紐$䥛}o\u0018=擳𪔫\u000f󶮓\u001f\u0000\u001e󹑨\u001b9\u0000\u0007'𦋳K3\u0013i Fft\u001d-J\u0008\u000c\u001cCLԽ\u0004Bd\u0006ﶄ\u0019Nmzb%@󱐇|2\u0010𩋣RXH\u0002.i[\u00192􉠟3\u0000\u000fZxy󻣴3-s\u001aM󿸬𓎳x2󷄷\u0001/T皕󹹳p\u000bvl\u0010cS-\u0014cK\\􀊒D\u0012~􁳰􎚭l~y\u0019\u001e\u001b𤯥\u001ef􇐣b?\n󽇝w􀳯v󻕰\\Wt?Z5중뷌|㈪2\u0010𫧱\u000e\u0000􍫾)\u001c닷\\z1f\u0016\u000e𡼩𦸉怑\u001aN⁹:`􃡛33.FZZK삺\t:󸢳\u001f_䁰G𑨗+9𦻓S h𪟉󶦘V\u0013`i屆{u􁎖eJg􊠒\u0007󻈐'yx\u0001󾳋V\u0002󼅺\rIc\u0015|{rS>W\\t3rc𤛷O~54էI?FKr5奪e󵆀>\u0014_ZS姃\u001eyYO\u0005[M9\u000e󵠛;􆮎BC[\"\u0016x\u001d𑦰󻃱i𑒍\u0013E犢䇤L{\u0018c&3󽂡\u000f9􍜆剌󵅩\u001b\u000cbf􉮚t\u001f\u000b'}\u000fv\u0011<^P󶁘)\"􊍆'3CH&𞲬\u0000􃏣7$_𖡋\u0006'\u000eꂤ`S6v\u0017􊹋𗿩\u0013DGX~𐕜f\u001fj𗢦􁯢􄦎d\u0005𞄈YDm􏔐kw\u0010\u000c\u00051ꌃ\u0017~|􊌐읎􏝷$h󷖍𘏼j痎0;𡋏\u0002,䘱족U \tg鱄\u000c𠁤0𩒘n\u0000Mw􂻀|F􌉚𑂊2lh\u0014\u0019W*󶐾!]\u0006\u000b\u0006|k\u0019|>\u0012\u0002kszV􋠓v6\u0000\u0011%~􊀹\u0017Z\u001fR󻑵\u0014𝃝{󷠜~]\ry'􂳖C󱰷jD8;\u0005\rG'𭓋\u0017\u0008􌰻]\u0003(𧱄1U~:{\u001e.T󰜲\u0004aI󺯚\u0005V\u001f\u0001w=g𤟎\u00102󲰏\u000eQd6w!A`~m?rb𮕝o$𔖤(aDS𡐼绗󸞶# O6\u0012!\u0013w􎻩𨋜OR쳚{w]岤\u001f\u0008}\u000e|:=K5X\u0001z\n\u0002𘦍p􊒡󿔧4\u0015󷱆􂀵Tx嗁E\u0012\u000cQ\u0006󽡜;ꉇ⾜:𦷓\u0015ﲽ3舕􂚮i\u0014橯𨤊#􊖌Uo\r\u0005$\u0015\u0016WF\u0008􄓠6􃍦\u0019*\u0008\u0006󷕡?V)t𣘬󳋫\n􌊽H`$\u001bt}[\u0007>sf􏠃1盌Wk0\u0005u\u0010󹘩p𬭨%\\𐬺􂨛KQ\u001b?H\u000b􉶘􆍠9🞻E𡑁Q9y\u0001Cj\t𢘬𓊅wB\u0013y\u0014􈨞󻖽𡿼ਥ\r崶\u0002{Fo𩞦e𪈃,8\u0007/\u000e󷊇\u0010P5RZc5𨳫Z\u001c󵃯q9W\"~\u0015Dz. 󿱔4􍿵B󻪦\u0000%J𦬳Dy󱼉/h\u0011;𮔥~dhH\\s󺕘\nBPyqm\u001f􆻗즻?{\u0019Ta뾚\u001dD\u0002!.S𫗸\u0004,􎁚𦰬􁀩82􂕣V􇴢^uw\u000c#􍔪NZ\u0012󺽜˴/\u0008<󰝓\rh<\u0013MkO􈊊𨪤K󵔛K[袏y\u0018𛂉y&\u00179,Ca\u001c`XF\r>@𫍵[\u0014s\u0004􌴽\rRW\u0013􄫇}UtM,D@\t\u001d󸒞\u0012BKthM\u0012\u000bH󰑗쳒!\u000f$T0IUP\t\u00116k{C#\u001e☝\u001f󵗡+-󵨰#􍤳\u000f\u0016T,[ഥ𪀅KY&B\u000bi\u0011:𫶟S􁾧\u000eQUᤉd\"Qm3%󴀬!vE{𘚶󺇲v4㈉PHf4􀈡󰑶\u0002UD䞐Jo",
+    "name": "?\u0012~\u000e\u0001𝚴zN㷎RM\u0016󽤌~\u0004󹔹\u0003<㣣O𗛶5\u0004VK;󴀏󲐭 ;\u0004U󱬄C쮜𫞤􁉅z\u0007󽯱gi[\u0017T㯚𝂿@𬻨𤱜\u0011\u0002;+\"m侜􀾶􆀅c\u001c\u0018Y\u001aJ􀏭􇷒\u0005\u001e󱊶&c2yY/J\u001e\u000bx\u001e\u0006󺘗􎢑\u0005J<y!\twC",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "}󾶝\u000cz1f<H􈘳H2􋵖􅈍\u0015xT'!q􂃙󳞰>𐳒\u0010\rDᑿ𝆍\u0006󺳘P6􏆮𡂌𘋛\u0017\"󸷇'\u001bo\u001b敹𘧴-O\\g4c9󲷫,􌧄PI\u0008:r,􁹮@0\r}􀕛󶃁*o𝐦\t,󾎸D󶈜j;DA𫏞믊\u00167(🜶^󻸅h🥑%",
     "tags": [
         "games",
         "integration"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_12.json b/libs/wire-api/test/golden/testObject_NewService_provider_12.json
index c12949d02f4..9b31888d423 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_12.json
@@ -1,18 +1,18 @@
 {
-    "summary": "⤍󰽒𢙟\u000fm7󸘕AoM\"9󺸡Jd 󳱺NA\u0012𗕭\u0014u𥴥􃔎X;\u001fBj\u0019􂗳3z\u001a$􆶚S𩗘󽁐%m𡂘􉁐M\u0012𨏊󽛄T󺑒}}c\u0012󸲒쌗𠕕\u001e\u0016󼗧`\r󰲯b\u000b􊌆\u0007f䊣|y)}\u0017oT󽂩JInY\u000eC𠈲G𣁞􊐸qfn\u0011\u0018y􍀶.􎐤JQ&\u001a\u000e㪌,",
-    "auth_token": "aXY=",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "\tqℷ\u000fOm\u000eg1􀂭}𪥁\u0004M\\𭴚;l",
     "assets": [
         {
             "key": "",
             "type": "image"
         }
     ],
+    "auth_token": "aXY=",
+    "base_url": "https://example.com",
     "description": "\u0016𩃥\u000e+Fp𛋠UXh\u001d􋚨ဂ>𬰱\u000c꜁𡥂r7K𩑟j8MUbx􆡿P~\u000c󸙶󳸷94f􃄙\u000be*N.e㌩9}㶌'\u000e􍅲yC𢇍UN\u001d\\\\\"@\"󴫻T|&\u0008i󼔄0\u000eA𩮸\u0003r\u0017Eo:\u0017|8𣤛􂤂-\u0001􎳶\u0010𮤑𭡆L\u0006􏐄\u0014\u001a𭓬\u0007DI$\\faHndk I9􋕱\u0004I]汆 􍝞󹡂Ot𠇅n\u001fgdy<25\u0003𗟍%\u0013 𧹲𬩨X?&2󳆳]/𬫇k󾼶W\u0010\u0006\u0008􈐔篕󴢙Z\u001fC\tN/󰊤{𐩹\u0014\u0005!􃮐K􎻙\u0000𝂌RLr𨦞 \u000e𫎷o\u001bz\u000c2!mg\u001b&\"ESG8=J1\u0017?XChkj𒁝\u0006\u0007V\u0006A3𦟠늁t𗙅t𤯚:_𤯈𢿒>\u0008㨲\u0013J풶󽭣􂲕\u001c)\r␍\u0005𐽅􌺦\u0000]􌨟1낚\u001cU拄㑔!Hd\u0004Te􊱥Elg\n/ꯢ\u000c餙𪻔^\u0002HEj\u001f\u0006󲑏_󹋪4j􆢦𭐃5𩊢kgP\u001a禈dFG󲺩\u0002n󽟀W:􃘤0𩮠)-8ేY&[\tn􅧍􈓰I-b\u001eV1x\u0005􌌝s]𡃽𒆢\u001a<st\u0007~⋸M𭉡^im\u001dFM#𧶥s\u001fM\tI\u001d긦㱰x\u0006(22\u0015\u000bs𪏻+󿂁𗷟ma󷦫>{𡀧9 \u0007ᚘ\u0016\u0004󳗤-􌤧[D􅄺\u0016",
+    "name": "\tqℷ\u000fOm\u000eg1􀂭}𪥁\u0004M\\𭴚;l",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "⤍󰽒𢙟\u000fm7󸘕AoM\"9󺸡Jd 󳱺NA\u0012𗕭\u0014u𥴥􃔎X;\u001fBj\u0019􂗳3z\u001a$􆶚S𩗘󽁐%m𡂘􉁐M\u0012𨏊󽛄T󺑒}}c\u0012󸲒쌗𠕕\u001e\u0016󼗧`\r󰲯b\u000b􊌆\u0007f䊣|y)}\u0017oT󽂩JInY\u000eC𠈲G𣁞􊐸qfn\u0011\u0018y􍀶.􎐤JQ&\u001a\u000e㪌,",
     "tags": [
         "sports",
         "weather"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_13.json b/libs/wire-api/test/golden/testObject_NewService_provider_13.json
index b10cc8f7e0e..0c81a7abb80 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_13.json
@@ -1,18 +1,18 @@
 {
-    "summary": "􅐤\u0018𡠈󽯧𗴤\u0001\u0014\u0013\u0006|fVa\u000b!<􈚣𩃳<\\PI+y3}𝩒󽷈럟\u001f\u000bz=C?􁽦ry𫩧𫼟󹨦[󺒡󻓳';mnM饛t;IT{G𐧶㸲\u000e󿱣~𩜦?*]ntB&\u0006D<x\u0002:W",
-    "auth_token": "qH0=",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "\u0001%\u0001xӬ",
     "assets": [
         {
-            "size": "preview",
             "key": "g",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "auth_token": "qH0=",
+    "base_url": "https://example.com",
     "description": "8\u0008Z?\u0013􋐂W.\u0013B/\u0008𦴿`x+dBT1KQ%\u001abu𗟩\u0004?Nu􃧳8䇅󾈏c*\u001aHAE𝣍\u0000.𭽌|𬵢􎘞⺎9g𩃖㥞\u001f\u0017N%:j􊥆\u0012-\u0015􅎸ZEw*\u0011🔪𮪞L]🌓\u0007x /v\u0005b\u0015$X 􈒈oT.H\u0004\u0008<n\u000b\u0010󹉤懩K\u001f1!\u0002/M0v}𩛻8m.u']\u0000ﶣ\u000b8!󰪦Wtu𧩥rs\u0005\u0005=bF1A\u001f1\u0019󾣐📢𣽳𠮂􅯻𥽢E\u000e*\u0016gr>K=vGF󽫾k􊪫𢈷􀖔U\u0001\"w􀈓.jf𣏨5𞺁xKP}pj\u0010𘞩\\Ya􆧦􁂢蒑\u0007`*?Eel4\u0004𓁝揻.\r볗\u000e:s\u0011𘈆%㝦\u0001..𤥫&𭱷\u001e󹑅O37러\u0016nE2)G\u0019`&'󵱥CAD\u0006a\\덅ig?y􈕄\"]-wC󲹟/&J􇨓Sಃ󽹻g+6]'oP*菁*󾓥M鮜𦖳z􄭼𣣎xQ2Y,(𩯘\u0011\u0005v\u0013|-󴿷\"GL`󽉪𓆬\u0015󹨮U髒\u00120􆀜\u001f\u0002󳮡GTs𢻞(~} abCYS󳮥􅸙BW􋆇i៑𦡫𣘬𪔉0>#􌻌k𡂠𩃚-\u000f𮅐_f󳲋\u000b/[%t\u001c;HX𪫺􎑷ॵ𡩋\u000bIH𢄘6\u0012\u0015L𧕋𪎼O􏞅(J4p]𣴉忄N}s㨀rx⒤󼙅\u001dII\u0016(Zweu󷺡b􅼌𫋌t.xMfO\u0007~pTA\u001f󶘏DO竟Od󴚘L<}b6RM~􌛵𤤗𬸒􂷢\u001c𮙴𨉖󾰧􇓺𪠂THsF'𪖎8o\u0004",
+    "name": "\u0001%\u0001xӬ",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "􅐤\u0018𡠈󽯧𗴤\u0001\u0014\u0013\u0006|fVa\u000b!<􈚣𩃳<\\PI+y3}𝩒󽷈럟\u001f\u000bz=C?􁽦ry𫩧𫼟󹨦[󺒡󻓳';mnM饛t;IT{G𐧶㸲\u000e󿱣~𩜦?*]ntB&\u0006D<x\u0002:W",
     "tags": [
         "finance"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_14.json b/libs/wire-api/test/golden/testObject_NewService_provider_14.json
index 5cda3f335bf..842bfede2f6 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_14.json
@@ -1,19 +1,19 @@
 {
-    "summary": "\u0006\u0013⾚\r󾕀pl+\u0012{\"\u0016'FDzP\u0013n𦠝_\r:$4<🟕0\u0003[\u001b&\u0008\u00196\u0012𦗨xhvG#\u0014\u0005􀀴",
-    "auth_token": "ukk=",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "􅈹]첝)\t^<%3g􇀝\u000em􉴭w􋨏\u001b󸾳=ﾨ􆈺𫛒^𫲪s@𣘶{IX\u001b!\u000fk[볊\u000f!",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "auth_token": "ukk=",
+    "base_url": "https://example.com",
     "description": "Z]󿰰n腏v!\u0005\u001d𬴱h昂牐\u001e>uz󻮟%br\u0005`\u001e𠛭\u0011􂜃c-\u000f\u0014i)\"jWZ:\u001cn\u0019H4􈰱0\u0011\n\u001ex{V𬜡3g󿏿􎜬e󼯱]𭻗􆒓𧶡~􈵬\u0003;b􆞐/쒱0󸃢decuih\n뛗㧬󳸫\u000b𢦘󶾂󷮉𤷓𣝁𦬏`2w\u0007󿙇OlM7󻠝⎠-􉂲𨓂.󱰳g\u001fL6\u001eS\u0016W>E'<v\u0011𝕧}a5\u0011𡢸\u000eP>/j|𛱷Ks𥸩)O󷿻\u0003𢵴\u00120sQh홊'.P\u0013󴔮ʏꮃB􆋛O\u0013]j\u0019Y𘍦\u0002􄭿DO\u0002a􋑕puV#󹅧k\n𛈡^(\u000c󸎝󻟹_\u000b[,/&i\u0014\u0000&x\u0010\u0008%f4d\u0003\rI롣\\1𬩎:(w_V\u001f󲔽8🡗䎭!D\u000b\u0002\u001e󴠵C\u001f󿽓O\u0008Y󳟄}FB󷺁 kC􀑘2󺖮\u001d㍜x󸠴\u0014\u0006蠳\u0011\u000e󸴨҆IePP0\u001a\u001c-\u0015|:za꤀𧥆F\u0015\u0018􇋄=⸦𡶴1\u0011\"eꞝ<*\u0018\u0012𭣶\u0001[\u0008 𥋍uQjx\u0017𦍩\u001dR|\u0003c",
+    "name": "􅈹]첝)\t^<%3g􇀝\u000em􉴭w􋨏\u001b󸾳=ﾨ􆈺𫛒^𫲪s@𣘶{IX\u001b!\u000fk[볊\u000f!",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "\u0006\u0013⾚\r󾕀pl+\u0012{\"\u0016'FDzP\u0013n𦠝_\r:$4<🟕0\u0003[\u001b&\u0008\u00196\u0012𦗨xhvG#\u0014\u0005􀀴",
     "tags": [
         "photography",
         "sports"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_15.json b/libs/wire-api/test/golden/testObject_NewService_provider_15.json
index 096f77df54a..8f4761c8d7f 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_15.json
@@ -1,25 +1,25 @@
 {
-    "summary": "󹜃8UyY2\u00133qr󵗣𨇹􈰐􍤽􀧕\n𦨏7lx:l𤯚\u000fV\u001d j󱆾0p73𬾘m󽐢\n=\u0012 Y󳵰妰w󼚙&7$eD𮘥0",
-    "auth_token": "",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "\u0016Cg􀤅_󼕰L\u000b\u000f_i\u0013\t𞹪M󷔻󰋁𑘵x𠒦i\u0002Ly󽂼􇹌􍽆􋶍p\u000f팮wk!WT7)\u00068@K𖹶d\u0019\"󴡝YR\ttX'\u0008󺎂-'𡉻\tᮻ4[P>\u0017'+􃵳ꓸT\\\u0004󷋲\u001c\u0001dO,t󼙯\u0000{WQ◲r\u001b樜%b6!a\u001c>\u001as\u0007\nb6mC\u001b",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "auth_token": "",
+    "base_url": "https://example.com",
     "description": "r3j륗x\\󳸶\u000f-p4%'6j\u001f\u0002􏝢\u0014\u0006{\u0015Cs\u000b\u0011\\󹘚徰󾧝\u0007􍗄'\u001emJ$\u0012\u00153\u000bgi\u000b󷦔DnY+%j\u0005􅸘+e=􏷗캓1󴎊UY\u0001󻛋z6!(\t􁭋\u000f\t1􆘧E;Z8󶂇댚 \u0005(\u0017vU\u001d􃥪󾂦\t󺦋\u001dYyꙔ\u000b𢧙\u0014c𡌪Yf࿆徂\u0011T\t𩣕L\u0010\u000b𥥨し𦆅*󱉰d\u0008奋7wDK\u0010󸫵)􉥞o捪\u0004\u0019􍂋𐊽l\u001c󳩟`ꏋ󼓄'􄴥JM^2\u0005K\u0010w'H𫳏F*\u0004St\u001f\u001d𒄡󳴢b)\u0012B/\u000e씛i󳔋FI9\u0010pN\u0008◘P\u0013x􏛋𒆏㞡R𐠰𧅀:e𫩓vRwQx燒𦽯\u0001J\u001b:G\u0008🕱후􈥂M\u001a\u000b,0c?󿞉ඛ#gY@\u0004Z哛R駲𖥄\u001f1Vd􎇱𦰎\u0004u󽈱ar󵲟􄟱𑰌\u0007\u0016'𠀒􇸘1v\u0017nf\u0002󷋏&􍴛f  \u0016𩰪u\u000bMo̝L\"~혵d狱C=󶫃󻻱(<j\u0001K=7􀩝@c󹺞/Gc6𮄿\u0016B\u0010+2jbB\u0000uE􇫭ﶴ\u0001\u000eC\u0004󼼤𑊩Y\u0003鼑-\u0002\u0008嚫 X󴂍}󽽩'􆽔s`\u0010X맮\u0003@#;\u0004󰇠㕇Lg𝝍\u0010\u001e𧴳􂸱|󿉌\u0001o@􂙵R/x\u001f\u0019 U\u000c\u0008+􅟆󳠶\u0002v\u001f𥑯7􇡘6h坲􍶏\u000f􅔣p !􁗗Pm\nu\u0008𨊂q􀻺:轳x_𨽹\u0008𫖡󾋾樰V􂗒D2s\u0017奈􎳖!\u000fA󺺊z􋏞\u000bXj}ا_\u0002\u0006\u0004-\u001eZ`X糋w􂉣𩄚\tQ𨇓ZaUyM𝦑J𗉝*\u0016\u00047\u0007\u0011Y5󻉣4/燏M𢌾\u0012B􊺆僪TF%󼰑𪻕BI=~𡶧୦n4^r괏\r𡼖*󱂝\u0003S\u0003n\u001a|=􂡂A􀔸岾𤎠󻬍F5o1'\rD󽺘ꓝ󱆱7\u000e/𨲓qd\u001cP,𦢄$𢎮{Hr󻳍􇻜C.\u0004+gu,i`͗sg𮨶!;\u001c맊\u0010i\u000f􄀲􍀭EKLr\u0011ktcZ[\u0016t?\u001e𮈆\u000f!ㄚg\u001eA㖻W󲩱'+􎭽\u0000\u001d]x\u0004#\t䰉G%%-Z氢𭨈􏢀r𤃗y󿬞T<L9\u001b𮚓e𪏔u𡳳)󻨛\u000212I\u0010𠿭g쟇`A9󸦇𤿨 'S|*󿮛B`u,(\u0018Y\re稪iZe𗗥\u0013\u0016􈻽&󼣼R🎎\u0005~\u001ac􅉭\u0001:,=4?\u0006_\u001f瞶\u000449l`\u000b\u001d𦴚\u0003󺱑􆜍wFo}^𑵴\u000b]pB\u0019􅉍$\u001b𥄠?q𧄝m1㭁Own􂃥\nGzII撰\u0003󰫤W/X/\u0019\u0017/󶏞𧃞T?E5\u0007:\u0014s)OC\u0016\u0002X𫼄/,𠂠\u0017h􂭟Qy┙XM𥌓𪥄pY(T\u0003'\u0017C􊚍󹩧U\u001b\u00021𬰿\u0016\u000e\\a#!e󷞋G-*\u0010\t$\u0004\u0015wQMZ\n𥉐햴Zu쐎􃴒{jt􃜱\u00081:V\u0001Px󸡞鵉Q/kO\u001ba\t𬬺{n賅𗘰|+q𗏻\u001e𦋑D𧇛!\u0013b􅒆涯$l:JUm$\u0004Y𫓱􀞷1󳧐~\u0011ncK\u00079\u0018bh%􆯮󽘦z#󱍙7Z􎋖􌿅\u0012󹸜#􈣽(ꀌ(𣰅]aC~+p,yT]𦀯􅽴?󲨻%𢏬\u001cU*P$K>3\u0011`\u00136'`xrB󷅤𣇯窃]Ja\\HJ\u0017t\r4\u0016F\u0000UY\u0019\n@N]B𦠶8<𮣞\u000fQgcy\u0008pQ5\u000f\u0001ny\\#𦹌󰼇\u0000􍶢󽝉𢙒5僭k #疜G4\u0018⋌&8sC,>⯳b𐆆󹼯\u001b\u0019𧮔𤉫ZRs𒁊6󽣵~ᇴ𠽳❈\u0013szb1a%Mt󰯲􇆺b􀯥\u00130",
+    "name": "\u0016Cg􀤅_󼕰L\u000b\u000f_i\u0013\t𞹪M󷔻󰋁𑘵x𠒦i\u0002Ly󽂼􇹌􍽆􋶍p\u000f팮wk!WT7)\u00068@K𖹶d\u0019\"󴡝YR\ttX'\u0008󺎂-'𡉻\tᮻ4[P>\u0017'+􃵳ꓸT\\\u0004󷋲\u001c\u0001dO,t󼙯\u0000{WQ◲r\u001b樜%b6!a\u001c>\u001as\u0007\nb6mC\u001b",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "󹜃8UyY2\u00133qr󵗣𨇹􈰐􍤽􀧕\n𦨏7lx:l𤯚\u000fV\u001d j󱆾0p73𬾘m󽐢\n=\u0012 Y󳵰妰w󼚙&7$eD𮘥0",
     "tags": [
         "entertainment",
         "productivity",
         "video"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_16.json b/libs/wire-api/test/golden/testObject_NewService_provider_16.json
index a4332cb07ed..1edf7e274d3 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_16.json
@@ -1,13 +1,8 @@
 {
-    "summary": "𮧅\u000f5Jk\u001c0M􌘬􁟑o@껟\nH2miIPd\u0008\"󷈌w*􀜂\u0013Cmv6\u0008\u0002\u00075@!l鑒\u0017h:𬦔稀xZ󹂯sSb\u0014\u0012􌌘&P𤇠S\u0008:k𦻶껧D@\n𘢐ru𘋫𧳧\u0017X\u0001\u0019> 􋁠_X\\􆚔𭱸(4󼇖馭\u0006e􂤺𭛃&䝀\u000b2d\u0006w\u000f稦`&􋅛N",
-    "auth_token": "YA==",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "s)2􍮎\u0012𥈐\u001c\u000c;\u001a`^,(%bf4\u000c󿌝dឣ[;-􏩪-Z(\u000cح󲋰CaF􎲱𧶏􋫅B𦰋GZ𨉂Bdm/^\u001ctndbbP􉋀􁂤;\u00066*o)d汕\u0003􃥥\u0008$OP􇉹𗗊eE{}F\u001aLP蹴3Zb5O}Ezq\u0008k󷻌8=<󷭦MD\u0012=ᮡ􉼸󽜵\t󶾡雂󻨍t\u000ch􁞵O\u0006\u0000ꉼ,(:qﾒ",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -15,20 +10,25 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "auth_token": "YA==",
+    "base_url": "https://example.com",
     "description": "fldm&,\u0004􊇾]Y\u0010uH󸡳Vz󼀺鄮B􀘬ZvcsGQ\"\u001bn\u0013Mm\u0002󲴪`n\n\u0016R􏓁\u0008\u000b\u00081b*􁛱\r􊧝jDi'𗹿Bd\u0014!.k`p\\\u0014𣰆\u001a<􆞮['\u0004%\u0001a6\r箤,7󼈏3",
+    "name": "s)2􍮎\u0012𥈐\u001c\u000c;\u001a`^,(%bf4\u000c󿌝dឣ[;-􏩪-Z(\u000cح󲋰CaF􎲱𧶏􋫅B𦰋GZ𨉂Bdm/^\u001ctndbbP􉋀􁂤;\u00066*o)d汕\u0003􃥥\u0008$OP􇉹𗗊eE{}F\u001aLP蹴3Zb5O}Ezq\u0008k󷻌8=<󷭦MD\u0012=ᮡ􉼸󽜵\t󶾡雂󻨍t\u000ch􁞵O\u0006\u0000ꉼ,(:qﾒ",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "𮧅\u000f5Jk\u001c0M􌘬􁟑o@껟\nH2miIPd\u0008\"󷈌w*􀜂\u0013Cmv6\u0008\u0002\u00075@!l鑒\u0017h:𬦔稀xZ󹂯sSb\u0014\u0012􌌘&P𤇠S\u0008:k𦻶껧D@\n𘢐ru𘋫𧳧\u0017X\u0001\u0019> 􋁠_X\\􆚔𭱸(4󼇖馭\u0006e􂤺𭛃&䝀\u000b2d\u0006w\u000f稦`&􋅛N",
     "tags": [
         "medical",
         "photography",
         "sports"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_17.json b/libs/wire-api/test/golden/testObject_NewService_provider_17.json
index 63eb710f6e2..6e754e163b5 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_17.json
@@ -1,12 +1,12 @@
 {
-    "summary": "hU/􊱴;󳊘󻈘􆶰𐋪a󲏱d􂓖l(Z豠\u000e󹡈i\u001a㗰`6𫴘󲰤ᬶ",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "=𦚟🥚\u0014󴧣n浊j\u0002󼒍n𗣣\u0006􉃋􀢯t뻶􄪴z.!\u001e\u000b?󲆈z=)xZ꛵\u0006牁\u001e\u0015*𨂼N[𩇌e3>\u000b;\u001e𗋚C𪇰\\,\u0018ૃR\u0005{🀥nj(<S+1OY桂𫱽",
     "assets": [],
+    "base_url": "https://example.com",
     "description": "󹡐쩍7397et𠔉;&+9􊡿g\u0018𑁚\u0006\"7\u001a맂F\u0003\\>\u0018\rt`\u0014m}d󿏏,𠻣N+S\u0015`\u000c󳧂q賈\u0019E𤮆Y>\u0001\u0003*<3􅼃jm\u00058󾋸kl汕\u0014\u0011,󷸙鲳\u0004D_2&󼃾\u0000{3IhLSG\u001c🀢\u0012M3~\u0012A𗁮vo=4󵐭iize.z%P󹅺&󼀠\u0014_H𦯕6\u000f\t%󸘩Q,o\u001bKn5􂧕BPc󳳤􌔳\u001aWW𦲻6Y,W𦈠\"GhCro-뽉b\u0018E\u0017Z/CX}󳰝4b􇭚\u0010[\u0005鲙:󵓖?w摯iP\r9Z@𠝾m󵃽a􇿰n;pY@\\JB._􍐳󺌳@𤍑1\u0000\u0001HH}􋫿Rₙ󵋢H\u000fxP&\nY%\u000e&𘨰!󲎏𩧶􉺡s𭪑T󳵪)􇥤M󱰑᭥𧡲9\u0003\tp𦤼,H\rjY\u000b;ࣽᅃy+9𑴪\u001d5Lyv\u0012\u0008,>􇸟)􋊐.c􍂤\u00114󹪲i\rf%􈢌\u0007􆒳\u0003SjlꡔZy\u0001d\u0006q\u0000|-o&;l3|3󹷷B𫤵^\u0010󺃧dB𡲖\u0004&.Pa\u001e\n\u0000Z㶧营\u0001Z󱖀dN𨮵F4G\u0004u'{캭􊐔\u001d󼼀􇎺噀F\r~\u0007\\qF󻦶l\u001eI𗄟'傚T+𭊃Q 3\u0013轜:.3Pc=􂜖>⅕zS\u0002􃵍H\r8i<\u00115𣶳\n6I𗹱𢤌MK\u0014&)􊁘I􏶲6J󿢭Q-h𠏒𘘅\u0017Z\u000b\tOAYb]z~\u001bI\u0006􃥅􀇈(𥥷(W[\u0012y󲥇\\0𫭙3󶢕\u0017󱦑\r𧹮󺯽,P𗈀\u0004G\u0010𩝋f9BO㿍|4𥡂\u0013Sᴊ57C/6􏍪F\u0000n!'^b\u000e⦱u󰩽khm}e嫇e'𡙲𠘰\u000c󺕠\u0003𑊆(v\u0004\u001eBH;$U2\t$^𥼿t\u000e\\QL歇u󶪱z$V0-1𗙎\u0006LAs󴵓)􄇉9/\u00154􆋐󴰽zn*\u0015\u001d](\nC#疙\u0004#Lz",
+    "name": "=𦚟🥚\u0014󴧣n浊j\u0002󼒍n𗣣\u0006􉃋􀢯t뻶􄪴z.!\u001e\u000b?󲆈z=)xZ꛵\u0006牁\u001e\u0015*𨂼N[𩇌e3>\u000b;\u001e𗋚C𪇰\\,\u0018ૃR\u0005{🀥nj(<S+1OY桂𫱽",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "hU/􊱴;󳊘󻈘􆶰𐋪a󲏱d􂓖l(Z豠\u000e󹡈i\u001a㗰`6𫴘󲰤ᬶ",
     "tags": [
         "media",
         "weather"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_18.json b/libs/wire-api/test/golden/testObject_NewService_provider_18.json
index aaa2695ffc2..03ec6a44e2c 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_18.json
@@ -1,8 +1,4 @@
 {
-    "summary": "𘦆Y{)󳍪DBɡv/\u001e0q\u0012Df󵻋\u001d\u00113#\u001aF􄿔M1I\u0010=q\u0011>ev7\u0001}<J:U\u0011?]@nv#o𦟈𣻖_琥\u001cem\u0011I0𩤍,c𗣇at󶣓c􏤕ꞟc䴢U(lmd(JhK\t\u0005󵈳e",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "Z𑱱#x\u0013\u0005u𥝡~dي𝗳󿚅w\u0002\u001bk\u0014 ESQ!+-G8\u000cX\rU𡖽\u001a\u000bnF䵓 \u001aF󿎽􄽘",
     "assets": [
         {
             "key": "",
@@ -17,10 +13,14 @@
             "type": "image"
         }
     ],
+    "base_url": "https://example.com",
     "description": "@𡒻𣓃󱘛Ttt\u0015r_􋃔\u0018\r(G\u0010_󲘉\u000c𠛏g|/\u0019\u0011Q\u0015]\u000b􃛙.~𧩧𬡦𧷼\u0012\u0016􁅌𣿗'!xfJWN􀘗홠#*P<V\n+𗦸𮒻G_>Y\u001d븥𗳒I;Ⴌ𗾴.ku殜)3B\u0003􀭒\u0006􈨗h𗰄\u0012\\a,D\u0005\u001d󴪇\u001d𪹼^3뤊,@\u0017𧂦z⼯f$􀧏\u0013E􈘤R(PZBg/6tc􍪌qx􈾂𐔁Yp\u001b3E(󸅚(𨡾b🗉X􏁸${2P\u0003𦂎%􀫝釠#&J\u001dQl𖨢$f\"V󹳚<Ew󿽖\u001a􈉀𢦚iK~鎬|Tu􋵷\u001be􈂵l\u001c􊢰󿡙\u0018a{^𬓋FB ]\u0000Hn䈥\"{H:y-W\n𡣉𐅃h(DX,2\u000f􀈩G\u0016eP\\J󲇬 ~\\v𮌮𑈕<𥣕 X3\u000c\u0016@茈􃨡&)x⪼w𤜠Y󽀉𬴰𡶞\u0006]<{U,Kp\u0004\u001c]􁮴\u0015\u0005\t",
+    "name": "Z𑱱#x\u0013\u0005u𥝡~dي𝗳󿚅w\u0002\u001bk\u0014 ESQ!+-G8\u000cX\rU𡖽\u001a\u000bnF䵓 \u001aF󿎽􄽘",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "𘦆Y{)󳍪DBɡv/\u001e0q\u0012Df󵻋\u001d\u00113#\u001aF􄿔M1I\u0010=q\u0011>ev7\u0001}<J:U\u0011?]@nv#o𦟈𣻖_琥\u001cem\u0011I0𩤍,c𗣇at󶣓c􏤕ꞟc䴢U(lmd(JhK\t\u0005󵈳e",
     "tags": [
         "food-drink",
         "poll",
         "quiz"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_19.json b/libs/wire-api/test/golden/testObject_NewService_provider_19.json
index 0960ef1e5e3..05a1aab2612 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_19.json
@@ -1,17 +1,17 @@
 {
-    "summary": "𥂲&Q󱵆N\u001513xU󺉛\u000cf}\u0016z\u0006𮝵\u001e\u001f𝢝􎳮󿨼?󱧨#+󽑣qiHE𤌐%t\\:zBooW󶌤􂻑\u001d𪑱胫i\u000e\u000e𬕸p\u0016bZ$󸉞v󾐆\u001f?绒\u00037om~!\u0000>s\u0015𗮞\u001c󴞨𦵉𧢧EN\u0017𖤿𤼺7󻽑\u0008🥱K^\u0015\u0008b(j􉣶/~%#\u001a􈨺\u0015􋧋q\u000e\n󲰾\u0018j/#96𠰚\u0008u8qv\u001fo𢵑\u001c􋢽",
-    "auth_token": "",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "\u0018=􃃜]RY􃲵w>\u000f\n䀑\u0003=􊭛(M\u0008Jy󹑴\u0007rv\r5ᦊ􄜴6􅕣🖤餠馉\u000b\u0015mH𨆬MO𑵙u\u001f럩U󰂿􁰥\u0019􀄽^\u000e%\u001f𗻺㧦}C󱭪Av\u0010]|7:𩇪 󰝻\r+􅧈ﮝ7\u001cP󳈈󵸘Y\u0015<\u0017𐳔Y􃥖\rJ\u001cD􌋘\np𠣕󽘦\u0008𧠂\u0012)R\u001e݂󴕸,Uxv\u000b:EnAS⥸hLo\u0015𨊰\u0012𗁑~\u0005",
     "assets": [
         {
             "key": "",
             "type": "image"
         }
     ],
+    "auth_token": "",
+    "base_url": "https://example.com",
     "description": "\u0010\u0017\"8􂟋y\u0010C󹅚󽈄󰀼D@juy\u000ek􃅎e\nl🅊􊍫󵕀0\u001b\u00009Ag_.􉾢;4B^h\u0002\u001b󲃨𠥻\u001a}\u0019\u0010\u000c|mJYa9`Y𠌲󳹛\u000eLb𦆁Vg\u000f}{片i?{\"cJIl𥎥7𥐵\u001c`􂛞t⠇K\\k\u001f\u0016$@K 􎅭W\u0019􈒁\u0016}0&\u0002\u0003󽝞,\u0017DuIu$𤐦􌴖=󷏺\u000c?􏇓{\u0018\u001b/L𪃵Z\u0019s'𠱫\u0011𣂼p褩}m𩑡\u000bjh~CgC󱵡.@zz㮑#󾫅NKhbM\u0005􁸐X]`\"d%>l\u0002\u0017\u001eX\u000cKa\u000070IJ󲒘jax6\u0011󸷲_Lm\u0013\u0002!󶯙u󺹈S􀣖􅕑$g[i\u001c,U8󰴵\u000c8\u0013x}􄡉_YG􎻹𥨗GP\n.\tQ8u4𮘻:w\u0004#9}󿸻9^^H󶼗ꥇ\u0016C\u0006\ru􊂁󸗰􈝵:􄃊RQ#`T\u001ak=󳔔=<\\)|𬇵𪲉K_-r<\rW\u0001𬬚󴨾!󼝞\r|O4\u0019\u0013\u000bdh𣴢!\u0017-􏚀\u0008\u0005\n^_󳕒<ꬮ])\u0019헲p𩟄\u0017k󴡑7\u000bEFP\u0007􁠄\u0001n|a^󳳍觨\u0017kuA\u0005C7\u0015\u000c<\u0015k]]-8\u0011^𦹪aX#𤩑툨O\u0015-\u0017$/寭i\u0001hnq;o𑌙􍣬􃺼\u0015􂅩-\u000bc󷘇\rd\u001e\u000cBc𝓡󷁼/N쨬A\u000f=rWߢ󰳎󷴺S𖺆\u0019􍌴l􄸭?㾊􍃡&Z􊈵,𥒎<h1󷿧󺒟\n\u0007]𓈞e󻤮5𮮏h\u000cGl`\u0003Ix󳼬\u000ef=K𫺋e􊸛a𨺄l\u001e􌆱\u0013󲙏p/\rT\"4k{$A𧽋\u001c􌩙󻳲?GL)\u0011+\u0012u􅫎NpaQ\u001b󶟃󱆶𐰽QU\u0010\u0008S𐲝v\u0007!󲛎:P;UPe𢌆\"𪏶󳨩󵼉$DOIMxഠ2+\n\u0004\u00167d\u0015󸶧h󺈽0\u00085憏􌴣A&r9C(t􂄼u𩨪Ybi|/0􄔾󱰣N𛰋M'󶳙>\u0010\u000b󼐓󷻅\u000fY\u001a𢌟],(\n%\u00193gwe𬮄2ͼ󳫖\u0008𧬡󽶨B\u0018뾱\u001e\u0004\u0014ᾟ\u0012RW􅹏𗁊Kn\u0010\u0017R\u0002",
+    "name": "\u0018=􃃜]RY􃲵w>\u000f\n䀑\u0003=􊭛(M\u0008Jy󹑴\u0007rv\r5ᦊ􄜴6􅕣🖤餠馉\u000b\u0015mH𨆬MO𑵙u\u001f럩U󰂿􁰥\u0019􀄽^\u000e%\u001f𗻺㧦}C󱭪Av\u0010]|7:𩇪 󰝻\r+􅧈ﮝ7\u001cP󳈈󵸘Y\u0015<\u0017𐳔Y􃥖\rJ\u001cD􌋘\np𠣕󽘦\u0008𧠂\u0012)R\u001e݂󴕸,Uxv\u000b:EnAS⥸hLo\u0015𨊰\u0012𗁑~\u0005",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "𥂲&Q󱵆N\u001513xU󺉛\u000cf}\u0016z\u0006𮝵\u001e\u001f𝢝􎳮󿨼?󱧨#+󽑣qiHE𤌐%t\\:zBooW󶌤􂻑\u001d𪑱胫i\u000e\u000e𬕸p\u0016bZ$󸉞v󾐆\u001f?绒\u00037om~!\u0000>s\u0015𗮞\u001c󴞨𦵉𧢧EN\u0017𖤿𤼺7󻽑\u0008🥱K^\u0015\u0008b(j􉣶/~%#\u001a􈨺\u0015􋧋q\u000e\n󲰾\u0018j/#96𠰚\u0008u8qv\u001fo𢵑\u001c􋢽",
     "tags": [
         "video"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_2.json b/libs/wire-api/test/golden/testObject_NewService_provider_2.json
index 506eb4ca2f8..c10721deb74 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_2.json
@@ -1,14 +1,14 @@
 {
-    "summary": "\u0017DTO\"⍤)\u000bo辭䓉\u000b󶍈𩙟\u000f 𬴙7\u001f軭\u0015\u0017󼋹q\u001e󵁠𭶼",
+    "assets": [],
     "auth_token": "Dag=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "CmN1\u0006",
-    "assets": [],
     "description": "I􏮹\u001b*6幱f)B#.cDw􎳍w\u001c\u0019#3𠊏􉈯\u0001LW/a㓆AXRm*ud*0𫎦\u0010`gu𥚋𪰦-\u000cTW>(\u000eB>\u0013L$.\u0004\u0006IR\u0005GV%󻺇/~􁍈ₑ\u00016y;##\u00042\u0003𮕄4l6l躒􊋥󽤡\u0007Ni쥬\u0012mS󴯛L􁍑~󺒽L\u000f\u001fvT)𪴾\u0005n􊄋r􍑏\u001b󴬺7\u00181-\u0019\n<\r䟟󲎡\u001c 􆭥𖧸/褡󸂰\u0003abW+\u001c$惆.~/\u001f5r\u000533\\\u001d%i#픃𡆝㈝0\u0008􂊉B\u0001\u0012~ꚝ󿁲\\qqXub鳹 +$􈛩𠓆MxpdY\u0002\"ꕁu𫠼7j&Fpt\u0008\u0016𣂜𘌘C?YO13𤧘^􍈔\u0018 `h\u000bL􍄅TY􀢌r𡸷󾥾^]\u0000( <7WI]e^ix~􋹜\u0018\u0017褀:𨱇/󿭫=\u001et󸺗𐏐,fq[r;{+\u0008𨭶AxH󻕟T\\𘦭|x>!\t\u001c\u00067%𢎲Lj5 듬.Z􆆩x\u0004^M􅐽[𡂭\\N\u0001+eW\u001cu㺳\u0018􁘲𧽎&𬞇E5𤪞䑂tPX9@VnH󺘌<􍾁_\u0014ꀆ{墥Cg\u0007r\u0002󱲁<Y;\u0001=NM!󾜌39\u0006u\u0011\u0012돦\u0007$\u000ez\u0017+xZ=.$\u0002\u001e􉤩󠆴󾗫j̭\u00088y𗛍f<‪e\u001e𑚷􋫬xR)\u001b􋌧4p憼\u000ej􄸼􀏷I𠸆\n\u000b\u0002𨰟p􃏧Ukpp;",
+    "name": "CmN1\u0006",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "\u0017DTO\"⍤)\u000bo辭䓉\u000b󶍈𩙟\u000f 𬴙7\u001f軭\u0015\u0017󼋹q\u001e󵁠𭶼",
     "tags": [
         "finance",
         "graphics",
         "news"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_20.json b/libs/wire-api/test/golden/testObject_NewService_provider_20.json
index 38c5f0d2b34..b01417adb15 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_20.json
@@ -1,18 +1,18 @@
 {
-    "summary": "쵮𨠉\u0019󵡱4󿈳𪢋𣼲f🡘𨽄\u0007W,4􎾨𡱰\u001aR\u0018eTZs3rx&\u0016󲻃p􋘯\t'74E&\u000e@4Cy\u0003!bx\u0013AFZK\u0011􎯥T9NT𮤢[\u001d@\u0018&u\u00038\"z!爿N𥳢6=􈿕𦍝\u0001~\u0012\u0001",
-    "auth_token": "e4k=",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "\t謈$\u0015\u0017h𥏞\u001a\u0016*[󴄒𪹵@𨱿_􋗽_\u00114&o𝞍a\u0016\u0001[Xn1=}󾍓'1\u0019O\u000b.yD\r\u0019C\u0002\u0013R\u000et𡒡i󲲖B\u0004f\n🐐J y鲺%d^!z8s􉹗",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "auth_token": "e4k=",
+    "base_url": "https://example.com",
     "description": "𢤈.?}􎮘Zaﬗn\u00023􃓺~%Vk(韠V$\u0002xYၵm􇓧a짫\rL\u001f\u001aG𨕬sG*󺃉A\u001b蕀\u00074\u0016C\u0014\u00183\t5𤶫\u0000󾫠􂋩㣿2\u0008\u001ej!IU;7𬫌\u000ck~87𣲶j)𨞐\u00058\u000c<󾵅𗈧𫚒􋶗\u00027I𣒇i􂲢>M;g\u0019d;\t\u001c􏞓B稴p\u0019\u0006d@e\u0015j^𥆹@X\u0019RL󹿣\u001a䱑rI\u0011𨔎\u001cto)*Z􄪀Z?\u000c\u0003E𪭟_蓵\u000fa5!;|󰹷􏊌`0\u0001G\t\u0018p=戳y\u0016A􀪘 \",ꇢ䰛󸁺搱yj/^Z\t6!󵹁(,􎣔%P󵫗Xw-󳗜\u0001\u0003\u001eyr~7󽅑`&\u0007}y^󺛃I\u0008󿵻6e\u001dG?𡔓\u001c\u0002b;|쎥𐕀\u001c􎐟j\u001e󹽒ag\"a42􂍅䮡#@|Hw𧈁:h\u001b\nශ\u001f𩌝R#儐%(/dd\u0004}A'l􉞐y􎎦VC􊿋}6\u0010\u0014(􅴧\rqS>𪗏Jdrv𢝚􇺷\u0005\u0006S\u001bSg􅿌.E\u0016{KLv/p𬱶UwUQ\u000b%􁒍n=𠓷𬃊s6𔗑!?ۇ􄣖x&}\u001c#C[\u0003䤤\u0001a^𪷑Q@𣄀󴖖j󶊝\u000ec,K侧􇭕>F@⺊5]\u001a󱲓􏥕빱,;a󵢛0󽃲'\u0015\u0000SH\u0003\u0011)\u0017J\u0006o\u0000^鈢􁭁𨛚x`\u0015􍆛󳷽Y\u0006\u001d󸉚h㾦wm绫C{\u0019🦌) ,D\u0004\u0014v7:f􉧆]2HM𬒪{I𝁹1KFTT6>𢼦W𮙚S]B!-\u000e^󹜾𨘡D\u001e!=j帰d>&1+s\u0019^㥠i󿺎\u0019H\u001e𣕁+\u0014DH\rPCmi\u001d\u0018𢣧l󸱘4􀦻lb𦍩3뒞𭹘?\u001f즟󷥞3􉁇\u000c\u0007ℳM()\u0017􎙮\u0019m𭪴庢\u0000\u0000f\u0000b?a2c􈷕*\u0000xZn-/N+\u001bc\u0000f\u001ai􋹧l\u001cP󠇣𦂻&Y%$@O4\u0002;𧦞\u0004n⼇/IO􂡈f\u0014+A\u0016/\u0015[\u001c\u000474幵\u0019MDfl\u0002\u001a󰇍󰞙\u0018d㭄p I\u0007_}娶󹈚it󽌘H'Fa\u0012􇑟FQ)w􎦥#\u0000j )\u0008􈴼^\u000e/e􉂸\u0010>hb𨻋󶺲V.\u000c\u0001㠖!🧚𘡼\u000eL琲\u0012*󱁇YCUmz\u0010󶮆󸌓𪐿f9",
+    "name": "\t謈$\u0015\u0017h𥏞\u001a\u0016*[󴄒𪹵@𨱿_􋗽_\u00114&o𝞍a\u0016\u0001[Xn1=}󾍓'1\u0019O\u000b.yD\r\u0019C\u0002\u0013R\u000et𡒡i󲲖B\u0004f\n🐐J y鲺%d^!z8s􉹗",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "쵮𨠉\u0019󵡱4󿈳𪢋𣼲f🡘𨽄\u0007W,4􎾨𡱰\u001aR\u0018eTZs3rx&\u0016󲻃p􋘯\t'74E&\u000e@4Cy\u0003!bx\u0013AFZK\u0011􎯥T9NT𮤢[\u001d@\u0018&u\u00038\"z!爿N𥳢6=􈿕𦍝\u0001~\u0012\u0001",
     "tags": [
         "video"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_3.json b/libs/wire-api/test/golden/testObject_NewService_provider_3.json
index a6c5b256ef6..8b1bd894840 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_3.json
@@ -1,14 +1,14 @@
 {
-    "summary": "C5\u0011􎪣\t|2󷂭󳿴𥒻􈁩,)\u0004UQ􊦈2u",
+    "assets": [],
     "auth_token": "",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "ERح\u00013gq\u0013L󾤚\u0003􋂰+􌱭;Bv\n\u0002b%𩧱7;\u0001\u001fMJ'󰲰k>󸔸V-=zt2H𬈯\u0019\u0017󸏏!󻑀o4􊱢\u001b\u0002\u0018E\u0010\tE e􋄂\u0006𢨆7xM􍼝D~A^\u001f􂁝X,BFIJ\u0015>\\@M_j4\u0010𦏬\u00088S𥡧NPC󱽫\"M\u0012pc\\c7󹀥k!q\r/􋵨yy􊷲X@EF\u0010Z􆫥%W酃󰛓",
-    "assets": [],
     "description": "h\u0012U%􁛍sb}䔕􁉾􆐥𑵑✨􈼎\u001c󾑚\u0010􆖆3/\u0005\u000f2Xx\u001c밒\u001f놸x⽊`, Zz|HSQjO􀟳𬐕!{􄴩󵂒\rF[W&𧜽􈘰􂫇\n奬􏾤$'𮝧%􍈰HLQw)\u0004@R𢩻e#󽹸b)󷮴7􊋏꼪\u001d\u001b槡1\u0016n\u0010n\\𠣮S􇇵ks􂬉,𤢵䮭,O\u0015􀒞\u0013y,𠞒[zI8[>FY^&󴱊i!䙄%a􊐌𮆛/H\"9󿔧mn\rSi +.UR𠢙􈡅F3U\u000c礭餋\u000e𬾉L𦍞c\u0002EAW尖𝆭eWNmn𧕗o𬞆\u001b\u001d/𫵘\u0008􀜽@\"b\u0004\u000e?\u0014Q\u0013L5􌨟!󳘲K`\u001cS3R\u001b\u0014",
+    "name": "ERح\u00013gq\u0013L󾤚\u0003􋂰+􌱭;Bv\n\u0002b%𩧱7;\u0001\u001fMJ'󰲰k>󸔸V-=zt2H𬈯\u0019\u0017󸏏!󻑀o4􊱢\u001b\u0002\u0018E\u0010\tE e􋄂\u0006𢨆7xM􍼝D~A^\u001f􂁝X,BFIJ\u0015>\\@M_j4\u0010𦏬\u00088S𥡧NPC󱽫\"M\u0012pc\\c7󹀥k!q\r/􋵨yy􊷲X@EF\u0010Z􆫥%W酃󰛓",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "C5\u0011􎪣\t|2󷂭󳿴𥒻􈁩,)\u0004UQ􊦈2u",
     "tags": [
         "games",
         "lifestyle",
         "video"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_4.json b/libs/wire-api/test/golden/testObject_NewService_provider_4.json
index ef2af52dd49..5ab941b4e13 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_4.json
@@ -1,28 +1,28 @@
 {
-    "summary": "Mྸ@~󹾝󱧂;!h\t􀱹W\u0005􃤁W󸢈j{C,]䪔\u0013Tmm+]4衸𤻄5J⓾𮭗􁚿4󲴰\u0006\u0003!N󴸄\u0014\u0001p\r潞\u001d{3",
-    "auth_token": "",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "]~~\u001a􊃮\t_搅<6󳸿?lwcI\u000b\nw'⾡Y%yF=<,3\u0011&\u0003pw6O\u001a𬼅_i\u0015t-܊Jh%\u0018_𤥫fy󲨤𨝈\u0015Z󺼻鞴f󿟠e-𪰱𮬆Dt>}0\u0000ryA\u0008y\u0014H\u0001",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "auth_token": "",
+    "base_url": "https://example.com",
     "description": "=Y馂5@\u000fy󹮟\nQm􋃆sᬖ%\u0015{󳣞|^)\r7{􀣱l\u001cM?46ՃD)􆢿_\u00109\u000c\u0004\u000bkl\u0000<\u001firM􆿄󱥶z\u0011䅽#𠔳@|㯐\u00042Y󲂶BOsU펙􄩥\u0006+y𨼍\u0006JRaY\t.􍊱a[.㖀\u0015𡤹\u0014Uw1.\u000fc(𘫧\u0014\u0006\u0008.\",U𩒢\u00175􌳖=h4cAD\u0001h\u000eOxB\u000c𓈏f(\u0007MC\u0000@󴣩8&\u001f󺉋\t𧎟\u0000􎖯1\u0000E%\u0013M5i痈뱏.󱌧/\u0013\u0011+J\u0007\u001d\u0010g+􀆑x\u0011\u0005𩌺\u001bu>`p𮋁s\u000f󷅚np\u001eOZ2𩆬:x䏦𧠵􅈐\u0007S𖧙\u0003J󿡁\u0005Q}󱠾𨤕𪳥\u001a(􌨬ꖩ#h冡UtМ\t2,&󸗄󺳬*𥸴a=&(󷥶\\5𮄩𥉛𪒵,y,",
+    "name": "]~~\u001a􊃮\t_搅<6󳸿?lwcI\u000b\nw'⾡Y%yF=<,3\u0011&\u0003pw6O\u001a𬼅_i\u0015t-܊Jh%\u0018_𤥫fy󲨤𨝈\u0015Z󺼻鞴f󿟠e-𪰱𮬆Dt>}0\u0000ryA\u0008y\u0014H\u0001",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "Mྸ@~󹾝󱧂;!h\t􀱹W\u0005􃤁W󸢈j{C,]䪔\u0013Tmm+]4衸𤻄5J⓾𮭗􁚿4󲴰\u0006\u0003!N󴸄\u0014\u0001p\r潞\u001d{3",
     "tags": [
         "movies"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_5.json b/libs/wire-api/test/golden/testObject_NewService_provider_5.json
index f2b61dbfbc2..38ea4547e38 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_5.json
@@ -1,18 +1,13 @@
 {
-    "summary": ";|H\u0004R\u000ev/\u0007󽦊W𨎈Zrdc𑦵nJn\u0002\u001d\u000bcx%\u0017\u001c!􅙇􋱛\u0015\u0019􋟷d智+\u0007d󽱩I\n\u0018Q(\u0003RN\u0012𠫮쐚@)M!t𐇚阥𣙘\ne:.\u0004hEI𪩦𗱞\u0012.[6󶩬L眓o􋤣\u0012o.𤞣o\u0018:Q\"\u0014=Fi",
-    "auth_token": "Hg==",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "\u001ay􏹄㻾s:\u001a􃑟\u0004\u00068h\u001e􎬨󱨿V5D\u0015𬄒\u0003󹍖\u00130𭪠i􏂉b𡣧b\u0000\u0015\u001d󸙆.&nf\u001c&],1+ed􄵿q󼫇&\u0008wl?h3?𐋲􂆽 췅'󼳉𩣽|􍙻諓󻠓\u000b􋆈\\擯ehe>v􇵾K&􆪣lu7aa\u001a8BUg\u0019𗉢",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -20,25 +15,30 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "auth_token": "Hg==",
+    "base_url": "https://example.com",
     "description": "\u0008!瑜􋪖󷳑+\u0003Q\u0005炷\u0005y􄧿9F픜}]a󹱩Sl0E􌐜Y~􂸎𗍛\"@U+\u000bn󰅘j្9󺅇ZZFA󻝲lTf\n(\u0002y\u001d'쇃/𥏷^D_Qcq󳪶A󻱨S%\u0018\u0004-􏐣}]me\u001bKc𝌬􄂙ZE1\u0008=𭤹C\u0007oIqvd\u0000&\u001b󰳺괤d􋡟TxJM|H􋠉\u0008nkA~o)𓃏]\u0017Q댸븤\u0004遣gZ􀩆CX\u0008~􄄔kw)\u0006Q(e頻**\u0012\u0002󶏊\u0000f\u0012􍁩P迼O􄽘*D>\u001e\r_\\\u000f\u0013􍘌SR\r\u000cM󺃏;!􅇢􏌮92􂊺ჟ􆾅3U󰰓S8𧦆uJ.Z=\u0004W2┿c옥𠐻r\rq;\u0014𒉋\u000fY\u000b󸊩uL\\졆󶿐\u001a􇿏󵠹\u0017\u001d먎󺎥3y<OM􍎳/[󽨬湁O\u0012L~􆌾i\u0008i𘁖󿯹_\u001dR\u00008h󳨑Nw󱓳󳇵댹􍦥w:\u0001+\u001e\t󹉫4\u0010L䨭5=C\u0010‧~~R䥑􌧥jG\"\u000b%:bU󻵠􍰍\u0012󰄽𧳌,􅕃𩴯,:󾏒\u0017󱱷:-次\u0013󲛀\u001b󱦪[\u0003\n󽁚0󷢥󿠤\u0017\u0002!X4YH\u0001󳸩h5i𐱄sB\u0011󵾇𦳟𧒷𪰚컎\nVSj汤󾎐PV𢄮꼆󼝚wyO~\u0016cT\u001e\u001d@\u000e\r󽁧?g􋋉xs󱽋𛈂𣌌\u0012􉌠d㗫𠜒#􍋎瓕\u0007􈖥NT\u0018󵜊mk𨺷ੇ\u0012[lfx|-窌Z\u000bux𡃅𫪊m􇵄1轪\\GK\u0015!.旤2)\u0010\u000fK􅽿e\u001d눨𦺰𝘸䚝v2𗵲􇁪pI</_󲌩\nW󺗀\u000c\u0000C􁍢0b\u001b\u0008𩝇\u0012.c5:@I3𡂑󺒳c刔\u001a􋈲\u0004d󻟎伋b.\u0007/%\u0007]!𪱗Ớ|im71H𭱷b\u0018H\u0010􀱟󲦙\u000bRy\u000b:\u001aAPiwgtq􈚀쮓P\td-~s􁂄f󽪡詻🕵𭏱\u0008+🨨>OvPRFh􇹋쥧}\t.\u001e\u00046􀪦+X𡁑\u000e㥯𒔽󷛗B\u0001𝞓X)]Ci;^󱶴QNY|單+=IvL}Cs(XZ􋹰\"\"`󻩟𐔲\"\u001d𛃅3}\\\u0000\u0008\u0016jXqx}K($W6􏏵,^􃒕6_@,6𥨗\u000b0k\u0019ss*KU~0{u􂅔씜O.bj[s.\u000cc'𧴕$+9}6N󵣱\t\u0012\u000b䙙FiP^;Nf𪰇p\u001c􉧑~L;_b􃩤~B𦓚􁝟􅟷\u001e\u001b𥛴\u0003\u0018F[|\u0000m7\u00064\u0005\u0007\u0011𥵰󸜤C2\u0007𦬳=􅙂𨣀\u0002𑀍\u001c7\u001fK[\u001f>K𖹧𧉅N?9\u001aJ栶\tS|\u000cs𞠁Zq󵳖d󴗪UU\u000by\u0007󼪓\u0013\u0004s_`zze+􈲞Ar`􊍎E꾇'\u0002𮒬\"Y2\u001c;~'1_S\u000f󴐧9$]𘕿\n􉾅\u0004Dq𤦑􄟐䝚",
+    "name": "\u001ay􏹄㻾s:\u001a􃑟\u0004\u00068h\u001e􎬨󱨿V5D\u0015𬄒\u0003󹍖\u00130𭪠i􏂉b𡣧b\u0000\u0015\u001d󸙆.&nf\u001c&],1+ed􄵿q󼫇&\u0008wl?h3?𐋲􂆽 췅'󼳉𩣽|􍙻諓󻠓\u000b􋆈\\擯ehe>v􇵾K&􆪣lu7aa\u001a8BUg\u0019𗉢",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": ";|H\u0004R\u000ev/\u0007󽦊W𨎈Zrdc𑦵nJn\u0002\u001d\u000bcx%\u0017\u001c!􅙇􋱛\u0015\u0019􋟷d智+\u0007d󽱩I\n\u0018Q(\u0003RN\u0012𠫮쐚@)M!t𐇚阥𣙘\ne:.\u0004hEI𪩦𗱞\u0012.[6󶩬L眓o􋤣\u0012o.𤞣o\u0018:Q\"\u0014=Fi",
     "tags": [
         "books",
         "photography",
         "rating"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_6.json b/libs/wire-api/test/golden/testObject_NewService_provider_6.json
index 71dd5d58c17..3371cc45021 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_6.json
@@ -1,16 +1,16 @@
 {
-    "summary": "󴝴Nm#P,꿐)AcMhv~\u000e氣1<nxaKTV\u0018󼎗ww|y󺖮<􂲙XYx<𩬇)v􇿫g4K􉴘A0u*I=\u0008\"*vG󽱎􉑤\u0018𤍐\u001dhv㔺䏈➻\u0016\u000eXb-YiQn",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "~k#\u000c𦽌\u001aj\u0010_􊱦b󺸬Jy\u0003\u0017kl𨙹U𗪄M~\u000c",
     "assets": [
         {
             "key": "",
             "type": "image"
         }
     ],
+    "base_url": "https://example.com",
     "description": "0\tZ𧩛h􂖓𬨭g\u001e\u0002S\u0000􍭺𪧳𗚼\u001fl^\u000c\u0015𠤒󾅷𘤞*vez:𗥨\tLOk\u001f0􂭕\u0015𪠈l\u001b\u0002:O\u001b\u0012\u0016a𓆺󱈳A=Q踔#󷒻\u0005⭦&K\u0010ppr*H*􊜽\t󿉰 'WrM;-𭜀\u000b<N\u001a5\u000e\nZ:󼵜󶍍𨺺􆮔]'xo]󵎥\\\u0017󽌘􍚎\u001a𦱴iaΓ󽱭\u000b\u001b\u0001B􄇺qb𪔆\u000flU󠄫󰦰\n3YQ󼧜𥫀􍫶𘇱\u0002a1𢦞􃬸󳾞E\u0011vfFn6\u000bck\u0010%􍰎룠E,󼱛r7B𬣼\u000e,\u0002cLMW\u0013nz\u0005S󿽼L􎠺b\u0019\u0001W\u001dd+pj%w\u001fCs\u001a*𩤸.A\u001a尣7S􋡫𡻄F􈿊`H(7.󶶚1\u0014铄\u0015O󿧰􉨓𤖥Z𢩊\"t\u0013cx\u001d\u0003AbO\u0001𬰩BA\u000eJ<C禉􋕡=\r^\u0000oW\t\u0017\u000cS5A􌖅ꕤ~p\u0008拁􈂔/􌚥蟫WS\u0010>󳍍𩼺􆎶𬞿^2J&X󾿔\u001639\n󳑎-?\u0012s\nAgK𮐍𨈫\u0001烴􆶜\u000b S2R\u000f\u000cGH󸗢vG s\u001e\u0010#|-\u0004+B􁿚>\u0003󶱽dG\u001aAI3󾡷b\n𩈮\u001b􏔛􆭺\u0006\t𭯂\u0008Ꮩ`𗺂zPC\u000f裕$\u0014ꟿM39\u0015$\u000b<\"T>j󱁄{-􆺌\u0002\u000c\tc\u0013L󱧧󿥲\u0008𑐒O\u0016hu𩸃G暰3l\u001e𘧫;oqC􀶞y@8WLY%\u0008|%<%|\u0004\n􀭔\u0012j𛆙g^\u001d􆑝D旞􂨓!{𤘞ᗛcꖋ^B𤬸h\rv\u000bX4녈ሺ^𫑎a)\u0013q\u0015\u0019>𤝦hgm>\u0017osO􇗦\u0013>B\u001e\u0016'󿢵􍺶vqW󲨱}~䭖L\"8?\rX\u0019+󻏃𧰱<w8XQ􄗐i\u0012|R󱺐𩷵sx𠌯e\u000c\u0004\u000cd 04⹍ e\u000b􌮾M\u0004󻥂*pG\u000c\r䉟,\u0001𥲃oc󳋘v\u001f󰒦󾣨d⾎g}𭇜󼔥:R􉯖\u000eY\u0013:\u0006󶆜󺺣􇍄󺻎%h.𫋑\u000f\tu\u001b\u0002S(NK2P~𡤅]𘝼\n󲕼|\"\u001aH𪻉􉇜&󱄅sB𮎃k*쨁e󻝼􁘳\u0001A)K𭷄𓌮\u0006n'u}岝>_msT\u0010C\u000bP󱋯vK\u0000𤈦𗉴<\nPs𬒞\u0014 mC𠶋b𨘩\u0019\u00179w\u0005\t𞡟h{af6l󻰜[]\u001c𝆤􊸏𥍥!FF0(+\u001d𡺻\u0014(\\ \u00073D􃗊󱩐\u0003􆖴􄨖𐚢뽑!􋕬􅡡7\r󿀢,'ﭺr䧰,疔]\u0003]g􄺲%\u000b1PaN|琣\\9>q󻾊D2M\u0018H~𡒪F\u001dh.𡬃b􊸐`hj󾫷}\u000b;\u0017𝡀9ag'󿔉ꕢw|1\u0005KQF\u0005𬁂bPlTg󴖽\u0000hs&Xp𦿏|O\u001c\u001b]ィ󵋣􎴔\u001bB\u000f\u0010s>>𨪒\u0002𐓈\u0010射󷶶ufr*%6XV𑋋43p!MKyD𘢫F􅗵hl􎫻[\"\rf􄁛餢󳊑K󷅟􆤊Kj\u0017\u0001\u0014w󲡣ﳳ_>\u000bq4u8w\u001aDsv\u001a󼩡\u0013b \u0007:\u0018𭏍%\u0003\u0019󴃑i~J&0+b\u0006+㣟_\u00165|\u000b󿃧!qaⰻq𨁹|?e;K|\r\u0001}󽀖u*󸅬!8󷠟𤙲<𗟌\u001ct\u000c<႕.𦹶e/H\u0015\u0014󻩰\rC)\u0011􉲝\u0014wV󸺫\n𫒿I𑢹D\u00012LEQ􍺲荿㳁\u0004􃃇皹㒝5功=qQ\u0001`𡺒\u001f\u000eT𗴸\u001b \u0001n\u000eH牍ks\u001b𠧀㑏eN",
+    "name": "~k#\u000c𦽌\u001aj\u0010_􊱦b󺸬Jy\u0003\u0017kl𨙹U𗪄M~\u000c",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "󴝴Nm#P,꿐)AcMhv~\u000e氣1<nxaKTV\u0018󼎗ww|y󺖮<􂲙XYx<𩬇)v􇿫g4K􉴘A0u*I=\u0008\"*vG󽱎􉑤\u0018𤍐\u001dhv㔺䏈➻\u0016\u000eXb-YiQn",
     "tags": [
         "social"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_7.json b/libs/wire-api/test/golden/testObject_NewService_provider_7.json
index b6803f0e295..7b607c78134 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_7.json
@@ -1,19 +1,19 @@
 {
-    "summary": "䦅;o𬲓6龈\"\\󼣩Q|􃽠EZ'\n𫧗+Z󱇉mp*󠅠􋛃󺢕\u000e\u0019z󲡙Ga\u000fZcp󱳔/\u000cM\\4ݥ0/F\u001ch\u000f$芗o <[5\u0015󼄦\u000e:m2\u0002󿕭8%톥X􄖠\u001b?𝥯3J浓P󵔝\u0001'=oꆊ)JC󴌦|𝄐𥡞􆝧𪢮",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "󳜭\u0002?\u0003yo4=\u0002𠾏(C{󼽆\u0006\u0002􏠨Hm]󻇎P+\u0013\u001d9$硙AZ=ᚇI=3𑣤{ㅀJy\u001e$,f;s\u0012>\\K\u0000ⰺ𩁦\u0008/􊓚&dhMp􊧡細wI\u0002𞢅O\u00049􃑮qoW\u001700𢦊|:G~o#\u000f􊏪;`(􊀢>󿄫M􏜐W\u0019A𬴲\u0016󵖈x󷗭\u0016y\r\u0014^A8𬶱\u000c-􃆕>",
     "assets": [
         {
-            "size": "complete",
             "key": "\u0006",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "base_url": "https://example.com",
     "description": "MDL^k𑖳4\nN\u0005𞤼\n㧨Ls󺙃\u0017Z󳁴􇴞%s_컑e ,fu_Uh\u000b~\u0011i{X􄔠󳟈y;𣪫\u000e7:T\u00075.㳫퉛􊘡5!9~MU\u0016he_󻔰\\􄶉룼f𪽧j󳔧)\u0019YT(P\u001cH\u0004.󹫑(\u0014v鴥0ꓵ(pO󹻈R\u001fHH󾚃\u00032&Qr\u0012a􈊝?\u0015\u0004\u0005Y􌋹\u0014lc\u0012\u0004V\u001a\u0006\u0012\u0010}'{!6󰘮l攷𗶰\u001d|獞\rnⵗ􂚳컫O󷀮()􄌹L8+𧪾I/ t5r\u000e|!T印𨚤􉁣L&덮𩹭!e'㛂TY􀍈I:F󳜐󾦘{!sH\u0001r\u000caNoi /\u001c02n$|-k\u000b.󰊠i󸧮\u0003\u0018[T􅑅fꢪ淩\u0008G븋@\u0019o\u001cw臾SB#􁙨`NM--悅bl\u0000+(𥵈􉣮i􊮠t1\u0012\u001c믒h v0-\r\u0008풠􈏆>\u000b哾㽡&􌘊\u001cnN󲍺8􉾾𦽣𡚙v\u0018[涅ka\u001b\u001fa􇚼6\u0018\u0004)):E\u001e\u000bn\u0012\u0014^\u001f.C%v`HuL\u00147\"\u000ba5\r󱟘𧴺𥷉Z3\u0017𠟐\u0018.C-􈯎f\"󰿶\u001fR\u0006\u0001󵶁e􁴐\u001fhow.\u0015\u001d%=􃶧 l󼍓\u0013+J|C\u0008bw󱪇6#󰋱@ FP􇤻\u0012\"p\u0017SC\u0010髦B𭣭ry\u001c\u001cf𘃸􇭖𪩖w\u001e\u0016\u001d%nwl󺑈󷫥MFjF𭣠\u001eHa5󾇡뀌7^L\u0001l@r+;큔\r,H~tL$\u0013l!jM\u0016w;CV\u0008C\u0002<𮀖𦻵󹡤k醔l󴍘LIy𮒷gy>3k󷂧􎺌🝟𤝬'\u001e$^9鉇}3\u0014s\u0014Q$_|c\u0018*\u001b󼎻\"m?3f~\t&xc-5\u001b𧷀rL\u0014𡉠\nrꗭ\u000c$󻋩n/9\u001d󹩼hh\u0011畉󾓠㚵E1軞kI+􏜆\u000fh/\"b4Fh&󽔗F$jJuG\u0019𫈂\u0012`LS\u0016\\N^\u0016.\u0005󹃶􅁔lJ󲀓[t\u0013#moⓛ󱛾\u0017E%[0Ðl7𢌲𠣤⬾'\u001c2+\u0015󾪕󱞈L𡁱Fsn묶㙋!&N&\u0005ܖ/sM\u000e@\u0008kQ􀣧sU𨊩z2L\u001ew\t\u00148ꔼ)K\u0004j󰺎EZk)𡩉󸸦󶵓p􊔍\u0012\u0003~yR󺵶/|l𦴋\u000bﹴy\u001a\u000e\u001a\u0018󷹯6𨾤Ep􅳟Td9L-Tz$^𑘜𦬢L 􉺌oG\u001a𢳡E'峲\u0001H󲧄MeIm􋯳􄟾-􃽖k0잯\u0008犵r􈠸R4\u0018\u0004􊞟𝣪􀧬>\u0000?Nb\rh􁑣u\u0011=O`\u001c𘁋􀮥&\u00184󵺺𔑼𢜾xtX^xw\u000f藗b𭀯􀧮󵪿\u0014\\H󿱺ILgKn𠘃V8y2\u0015gW\\p𐩓螰t-\u0001?.t햒󵛋AG6?\u0011JPy",
+    "name": "󳜭\u0002?\u0003yo4=\u0002𠾏(C{󼽆\u0006\u0002􏠨Hm]󻇎P+\u0013\u001d9$硙AZ=ᚇI=3𑣤{ㅀJy\u001e$,f;s\u0012>\\K\u0000ⰺ𩁦\u0008/􊓚&dhMp􊧡細wI\u0002𞢅O\u00049􃑮qoW\u001700𢦊|:G~o#\u000f􊏪;`(􊀢>󿄫M􏜐W\u0019A𬴲\u0016󵖈x󷗭\u0016y\r\u0014^A8𬶱\u000c-􃆕>",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "䦅;o𬲓6龈\"\\󼣩Q|􃽠EZ'\n𫧗+Z󱇉mp*󠅠􋛃󺢕\u000e\u0019z󲡙Ga\u000fZcp󱳔/\u000cM\\4ݥ0/F\u001ch\u000f$芗o <[5\u0015󼄦\u000e:m2\u0002󿕭8%톥X􄖠\u001b?𝥯3J浓P󵔝\u0001'=oꆊ)JC󴌦|𝄐𥡞􆝧𪢮",
     "tags": [
         "shopping",
         "tutorial",
         "video"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_8.json b/libs/wire-api/test/golden/testObject_NewService_provider_8.json
index 96ab141be76..ad7c718ad30 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_8.json
@@ -1,24 +1,24 @@
 {
-    "summary": "\u001b0/",
-    "auth_token": "tw==",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "k?i󶋚M\u001c\u0010;󰷎􊥺\u001a\u0008㼌c\u001d𭛾z\u0004*&\t委\u0017Xr'i.\u001e𦳎OM\tﶒ&C\\>\u0012}3\"UⲲ&n\"_􄷄Km𠪴娉Z󴲇e깫",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "auth_token": "tw==",
+    "base_url": "https://example.com",
     "description": "􂪂 M\u001c𪫾榲\u001c躤a9mN\u0015-M􂍼N7󺊠\u0000m8|\rq𓋞:ꖈJI󿃅􄣍󱠵bSV땧B\r",
+    "name": "k?i󶋚M\u001c\u0010;󰷎􊥺\u001a\u0008㼌c\u001d𭛾z\u0004*&\t委\u0017Xr'i.\u001e𦳎OM\tﶒ&C\\>\u0012}3\"UⲲ&n\"_􄷄Km𠪴娉Z󴲇e깫",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "\u001b0/",
     "tags": [
         "education",
         "graphics"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewService_provider_9.json b/libs/wire-api/test/golden/testObject_NewService_provider_9.json
index 63f0e288aeb..34005b26753 100644
--- a/libs/wire-api/test/golden/testObject_NewService_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_NewService_provider_9.json
@@ -1,12 +1,12 @@
 {
-    "summary": "+\u000cUv𨫴Y𣻳v%󳇡a\u0017𠀑𣑑󿅀𩟄~\u0015=C󹼂*'\n\u0018\u001b,𨊨⽓贽禣\u0013\u0003*c\u0010𧁷󱣞\u0000U⛝u",
-    "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-    "name": "𥛜<jc4x𓐈\u0006x𫣀7\"\u0007V<\u0007fN􋙸iX5o􇩃:􇖍ᬿ'oe",
     "assets": [],
+    "base_url": "https://example.com",
     "description": "uH󹴃뱯ꇙK\u0005\tF\u0013E𨌣󹸟CQ黍N\u0003􎢗󸮂󽂉𡷲<\u001dO\r􌴍kI獕zR\u0007󽂽􄲐j󰭶\u000f$N\u0003yx㈫t\\Y\u001b>(|1􀏴\u0015x,c?􀶺sR\u001f󳢾\u001e7\u001erMekX涏a\u0018YR\u00146􀐰ycX\u0008Mr􆼞\u000b;U'zoa􅑴@㈔𣥥\u000fI}=t1􂫁\u0005􀆈\\7~(=1􎟼c:\u0013M3{3㎑\u001c󹐅^z\u001e𧲻<f2\u0008'𒔬\u0000\u000fL𢶢,𬒺\u001c6\u0017;\u000enꠝ\u0011\u0003\u0016z2󱹏󰢈Sh\u0007铭]x>m\u0016\u0016.X􋣠󻁅󱙻'm2!a&#𥷫Q󴔼^@TW𖺚wX?𩄬3\u0000􎅘􊕍/]E\u0003\u0003𓄫d<Ybellf?\u000cGC7􃺢?\u0013Qr$\u0000T\\󴺌( \u0019:lOaTq)6𛁽z\u0019}Y]􎱵􊡫섟󽍯iC}𖹮􊙐􈳍\u000e\u001b\u0004𝒇跽\u0012\u000b􊮱8V&\u0018\u001cA󷨆!R𣝈=\u0010If&\u00063􄯒bM9V53c\u000bda&󴢙(r1~6􃝃\u0000j_6\u0017⤅'E녑\n붕#\u0014NBq􌶾x󲭎\r\u0019\u0013\u0003.7\u0006J%@Wp(b􉫿1\u001fm17)U\u0001􅟮>􍃝󳾴p𓐣eG𬯜\t􃍳􉨰摋9N:%􏿘yI\u0019\u0001p\tL\u0004\u000b.J𥱕𑵅𓊃\u001e\u001c􊐧\u0018􂅇#\u001d\u000c]Y𐹽=v\u0004\u0017󳙔5\u0012᭠ｈ\u0001Bvw𔔢\u0006V\u001d+ju+Lc󽄨.nhc5\u0015G$𖽢\u0011\r䪪J𒌣󽌜\u0013gfA(\u000b\u001c\nvV*u𣼕󵓇j􁟣\u001f统x\t+<\u0003<𓍹&O\"\u0001\u0004󾰘𧔼3ꖌ%\"h赴X~3󼉉W󻡚\u000e6\u0019𫤑󲱁'%􇞎ڎ\u0005W+m􅫙\u0000;􎣹Y츈\u00146:x-\u000c󼝤%6<pa,`𧉯7\nZ,!𧉧􎷸\u0017󽝃#􏟆􀟉k\u0011󻽪\u0018.V(u涑Z\u0013k󽬑􁤋\u0019甑󽅷\u0019\u0003􆔂1aooV<\\3\u000b\u000f󷲥*ᙘ喴)\\j󽔯韦KKkd䥶󳰉wV%􏱉\u0018\u0012~3?󽒢𨟑:󰟸~Q\u0013𩼽lx\u000e󰸛\u0017󷫿𢵜J𘏈F\u0010\u0010Z 𘄚􍤬K&㉩zKY􍈘-0\u001fl\u0007\\\u0007}\u0007𥝌1\\+絕Bs>i􄡹_𫛮꿼<%鞝iz9(𤲱@\u0014bW\r𡔂#$嘫\u0011􌽪`:U󴭒𪅷짘\u0007pt1㝝18󸙘}󷍋o𝀎.􎊬\u001b]DO8xꧡ\n\u001a䢳𠩦𨽷􎏆l𪚞4di}\u001cQ\u0000\u000c\u0008󾠫0`\\\u001aarBM龕 \u0013\u0003썩\u0002=\u000e-A𪌖􄿪\t]6\u0003?B1\u000e$Z\u0005𮠨\u0005\u0008)📁A󸁵􏒩󷩔󲿌-uQ\u0011󸝎0N)𪄢*\u001e\u0008\u0006󷌹\u0019\u000bZ=󳵢N\u00165,W􃗦\u0012m𩶪󳨼\u0011\\&\n\u00068􎃲a8o\u0008i𭚣X\u0000R󻋱j\u0018浽Q󸳞\u0012𗋄dn􆮚O\u0011󶧼1X7W9eRU􊮷fUkm󳿗8\u0004XP_>bT\u0013Dq􊞋B_o씱P󶑇WB\u0017^􀱫\u0002\u0004$8F𓌍<\n{꿞|V쑑^TG\u001ajz\u000b󰉿tgKDk)\u0016𩟖SmdyXa_\u0007;\n\u001aO<🥧\u001d_^/m7Kj\u0000",
+    "name": "𥛜<jc4x𓐈\u0006x𫣀7\"\u0007V<\u0007fN􋙸iX5o􇩃:􇖍ᬿ'oe",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "summary": "+\u000cUv𨫴Y𣻳v%󳇡a\u0017𠀑𣑑󿅀𩟄~\u0015=C󹼂*'\n\u0018\u001b,𨊨⽓贽禣\u0013\u0003*c\u0010𧁷󱣞\u0000U⛝u",
     "tags": [
         "audio",
         "productivity"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_1.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_1.json
index 58e0bb4ce82..816975f5694 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_1.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_1.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000002-0000-0007-0000-000200000002",
-        "created_by": "00000001-0000-0000-0000-000100000004",
         "created_at": "1864-05-04T12:59:54.182Z",
+        "created_by": "00000001-0000-0000-0000-000100000004",
         "permissions": {
             "copy": 0,
             "self": 0
-        }
+        },
+        "user": "00000002-0000-0007-0000-000200000002"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_10.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_10.json
index 44c7ca4acbc..5cef47ad036 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_10.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_10.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000008-0000-0003-0000-000600000003",
-        "created_by": "00000004-0000-0006-0000-000600000008",
         "created_at": "1864-05-15T10:49:54.418Z",
+        "created_by": "00000004-0000-0006-0000-000600000008",
         "permissions": {
             "copy": 0,
             "self": 64
-        }
+        },
+        "user": "00000008-0000-0003-0000-000600000003"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_11.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_11.json
index 1e0850928ad..3ab5d98fdef 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_11.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_11.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000006-0000-0005-0000-000000000002",
-        "created_by": "00000002-0000-0003-0000-000800000002",
         "created_at": "1864-05-14T12:23:51.061Z",
+        "created_by": "00000002-0000-0003-0000-000800000002",
         "permissions": {
             "copy": 0,
             "self": 289
-        }
+        },
+        "user": "00000006-0000-0005-0000-000000000002"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_12.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_12.json
index a5bfa962ab0..65c5d541581 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_12.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_12.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000001-0000-0004-0000-000000000007",
-        "created_by": null,
         "created_at": null,
+        "created_by": null,
         "permissions": {
             "copy": 0,
             "self": 1408
-        }
+        },
+        "user": "00000001-0000-0004-0000-000000000007"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_13.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_13.json
index 0d074899cd7..a2d780caae3 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_13.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_13.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000002-0000-0004-0000-000600000001",
-        "created_by": null,
         "created_at": null,
+        "created_by": null,
         "permissions": {
             "copy": 1044,
             "self": 1300
-        }
+        },
+        "user": "00000002-0000-0004-0000-000600000001"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_14.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_14.json
index c63d3855c28..75ca7797381 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_14.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_14.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000001-0000-0000-0000-000500000004",
-        "created_by": "00000006-0000-0008-0000-000000000003",
         "created_at": "1864-05-16T00:23:45.641Z",
+        "created_by": "00000006-0000-0008-0000-000000000003",
         "permissions": {
             "copy": 0,
             "self": 99
-        }
+        },
+        "user": "00000001-0000-0000-0000-000500000004"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_15.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_15.json
index fdb0db5db3a..d74d048b153 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_15.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_15.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000000-0000-0008-0000-000800000007",
-        "created_by": "00000006-0000-0004-0000-000300000006",
         "created_at": "1864-05-02T08:10:15.332Z",
+        "created_by": "00000006-0000-0004-0000-000300000006",
         "permissions": {
             "copy": 520,
             "self": 2568
-        }
+        },
+        "user": "00000000-0000-0008-0000-000800000007"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_16.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_16.json
index 32f5a65f8ae..4135db7dbf2 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_16.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_16.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000000-0000-0006-0000-000300000005",
-        "created_by": null,
         "created_at": null,
+        "created_by": null,
         "permissions": {
             "copy": 0,
             "self": 3145
-        }
+        },
+        "user": "00000000-0000-0006-0000-000300000005"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_17.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_17.json
index 327d12db307..403aa118109 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_17.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_17.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000000-0000-0008-0000-000400000005",
-        "created_by": "00000004-0000-0008-0000-000800000007",
         "created_at": "1864-05-07T21:53:30.897Z",
+        "created_by": "00000004-0000-0008-0000-000800000007",
         "permissions": {
             "copy": 0,
             "self": 0
-        }
+        },
+        "user": "00000000-0000-0008-0000-000400000005"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_18.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_18.json
index e31bacb4d1b..9b7ce7fdf2a 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_18.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_18.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000006-0000-0003-0000-000000000001",
-        "created_by": "00000000-0000-0000-0000-000500000002",
         "created_at": "1864-05-11T12:32:01.417Z",
+        "created_by": "00000000-0000-0000-0000-000500000002",
         "permissions": {
             "copy": 0,
             "self": 0
-        }
+        },
+        "user": "00000006-0000-0003-0000-000000000001"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_19.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_19.json
index cf875ba5ee5..e4b2ff8c572 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_19.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_19.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000004-0000-0005-0000-000100000008",
-        "created_by": null,
         "created_at": null,
+        "created_by": null,
         "permissions": {
             "copy": 130,
             "self": 4234
-        }
+        },
+        "user": "00000004-0000-0005-0000-000100000008"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_2.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_2.json
index 9fcbb9feb7c..5ffdc1cdc40 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_2.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_2.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000004-0000-0000-0000-000200000003",
-        "created_by": "00000003-0000-0000-0000-000500000008",
         "created_at": "1864-05-16T00:49:15.576Z",
+        "created_by": "00000003-0000-0000-0000-000500000008",
         "permissions": {
             "copy": 18,
             "self": 63
-        }
+        },
+        "user": "00000004-0000-0000-0000-000200000003"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_20.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_20.json
index 4c0158e4667..bce0adbfb44 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_20.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_20.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000008-0000-0000-0000-000000000004",
-        "created_by": "00000008-0000-0000-0000-000400000008",
         "created_at": "1864-05-05T07:36:25.213Z",
+        "created_by": "00000008-0000-0000-0000-000400000008",
         "permissions": {
             "copy": 0,
             "self": 1716
-        }
+        },
+        "user": "00000008-0000-0000-0000-000000000004"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_3.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_3.json
index e15db3e5686..7f39cf33e6d 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_3.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_3.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000008-0000-0008-0000-000700000005",
-        "created_by": "00000005-0000-0004-0000-000500000002",
         "created_at": "1864-05-08T07:57:50.660Z",
+        "created_by": "00000005-0000-0004-0000-000500000002",
         "permissions": {
             "copy": 67,
             "self": 2123
-        }
+        },
+        "user": "00000008-0000-0008-0000-000700000005"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_4.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_4.json
index fd8990834f5..68f8c96a3f6 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_4.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_4.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000000-0000-0001-0000-000700000005",
-        "created_by": null,
         "created_at": null,
+        "created_by": null,
         "permissions": {
             "copy": 257,
             "self": 261
-        }
+        },
+        "user": "00000000-0000-0001-0000-000700000005"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_5.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_5.json
index a8c4f1dd646..67a03bfa8c4 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_5.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_5.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000000-0000-0000-0000-000100000002",
-        "created_by": "00000000-0000-0000-0000-000600000006",
         "created_at": "1864-05-12T23:29:05.832Z",
+        "created_by": "00000000-0000-0000-0000-000600000006",
         "permissions": {
             "copy": 4,
             "self": 1156
-        }
+        },
+        "user": "00000000-0000-0000-0000-000100000002"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_6.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_6.json
index 68780bd1f5f..ac4221caabd 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_6.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_6.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000002-0000-0006-0000-000400000003",
-        "created_by": "00000006-0000-0001-0000-000800000003",
         "created_at": "1864-05-16T01:49:44.477Z",
+        "created_by": "00000006-0000-0001-0000-000800000003",
         "permissions": {
             "copy": 65,
             "self": 4419
-        }
+        },
+        "user": "00000002-0000-0006-0000-000400000003"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_7.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_7.json
index 70a30e11875..c64d711cf67 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_7.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_7.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000007-0000-0004-0000-000500000005",
-        "created_by": "00000000-0000-0005-0000-000000000007",
         "created_at": "1864-05-08T14:17:14.531Z",
+        "created_by": "00000000-0000-0005-0000-000000000007",
         "permissions": {
             "copy": 4,
             "self": 3116
-        }
+        },
+        "user": "00000007-0000-0004-0000-000500000005"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_8.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_8.json
index 5b268ef763b..592e481b2d0 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_8.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_8.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000008-0000-0003-0000-000200000003",
-        "created_by": "00000006-0000-0000-0000-000200000002",
         "created_at": "1864-05-16T06:33:31.445Z",
+        "created_by": "00000006-0000-0000-0000-000200000002",
         "permissions": {
             "copy": 32,
             "self": 32
-        }
+        },
+        "user": "00000008-0000-0003-0000-000200000003"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewTeamMember_team_9.json b/libs/wire-api/test/golden/testObject_NewTeamMember_team_9.json
index 7e6e1114ead..19ea9e0c4f0 100644
--- a/libs/wire-api/test/golden/testObject_NewTeamMember_team_9.json
+++ b/libs/wire-api/test/golden/testObject_NewTeamMember_team_9.json
@@ -1,11 +1,11 @@
 {
     "member": {
-        "user": "00000001-0000-0008-0000-000300000004",
-        "created_by": "00000002-0000-0001-0000-000700000000",
         "created_at": "1864-05-08T10:27:23.240Z",
+        "created_by": "00000002-0000-0001-0000-000700000000",
         "permissions": {
             "copy": 0,
             "self": 128
-        }
+        },
+        "user": "00000001-0000-0008-0000-000300000004"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_1.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_1.json
index 83035c0d3dd..70905311924 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_1.json
@@ -1,15 +1,9 @@
 {
-    "phone": "+35453839",
-    "team_code": "ZoMX0xs=",
-    "locale": "so",
-    "managed_by": "wire",
     "accent_id": 39125,
-    "name": "\\sY4]u󼛸\u0010󺲻\u001c\u0003 \u001f\u0017􄚐dw;}􆃪@𭂿\r8",
-    "password": "dX󹊒赲󶻎ht𘙏󴰏\u0007>\u0018\u000bO95\u0015\n(𩝙󻞌嶝f]_𪀮\u00002FQbNS=6g󿷼P𢲾􃨫󰧽􅤹M\u001e7\u0016~\u0017m󽎭\u0006\u0001\u000bkgmBp\u0017w悬𩓯f󹼮%Q\u0004𢔶kP|G𥬅\u0017B-\nJWH(8)4$󱠶<7𭨖\u001cI\u0008A\u0010\r?󹀊\u0008\u00085\u0006󶟨d \u00166􍉶G\u0018\u0008\t=qG􃁰 D\u0002vV\tYpg󸋮吝q\n \u0017L􁼛-􏕋\u0013󺃝F7Q􊔜]揃i?\r\u0010\u001b{=􎕻_?e􇢹%\u000eR󱆼\u001b+\u000ef\u0017q:g\\Rk馍𪝞[l\u0015􉜀VK\njwp\u00043TJྏEj\u0002R7d83ON\u0017q獿\u0019𮣜N8\n\u000f󻦼u:GꓻFZ\u001c<\u0015揤7􉖬tH󿳸;hbS{ꮯ\u001csMs󲷒9B4􀷾35c(~CUc󸇪\\V_XD3<L=\u000b\u001a\u001auH&\n(󰸶\u0001\u0010tn\u0001nU\u000e_\u0015t𝩱\u0010|\u0008𠟊UK\u0018[w<󴰿􎆘b+r\r%g'v𛈖敄E􃁔󳍔D𤁱􄂫⻣T@Fv\u0008%?U\\O]",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -17,8 +11,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􁿐f",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -26,8 +20,8 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "5]m\u001bnwr\u000f𐔵x\u0003󴪤2",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -35,13 +29,13 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "778@F]㯊\u0002",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "i",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -49,17 +43,23 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0017Q\u0015",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "s-5\u0015Bq<Fj\u000f%􅁣𤯍io",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "cfTQLlhl6H6sYloQXsghILggxWoGhM2WGbxjzm0=",
+    "label": ">>Mp१𤘇9:󺰽􋼒\u0010D1j󾮢􂊠;􄆇󳸪f#]",
+    "locale": "so",
+    "managed_by": "wire",
+    "name": "\\sY4]u󼛸\u0010󺲻\u001c\u0003 \u001f\u0017􄚐dw;}􆃪@𭂿\r8",
+    "password": "dX󹊒赲󶻎ht𘙏󴰏\u0007>\u0018\u000bO95\u0015\n(𩝙󻞌嶝f]_𪀮\u00002FQbNS=6g󿷼P𢲾􃨫󰧽􅤹M\u001e7\u0016~\u0017m󽎭\u0006\u0001\u000bkgmBp\u0017w悬𩓯f󹼮%Q\u0004𢔶kP|G𥬅\u0017B-\nJWH(8)4$󱠶<7𭨖\u001cI\u0008A\u0010\r?󹀊\u0008\u00085\u0006󶟨d \u00166􍉶G\u0018\u0008\t=qG􃁰 D\u0002vV\tYpg󸋮吝q\n \u0017L􁼛-􏕋\u0013󺃝F7Q􊔜]揃i?\r\u0010\u001b{=􎕻_?e􇢹%\u000eR󱆼\u001b+\u000ef\u0017q:g\\Rk馍𪝞[l\u0015􉜀VK\njwp\u00043TJྏEj\u0002R7d83ON\u0017q獿\u0019𮣜N8\n\u000f󻦼u:GꓻFZ\u001c<\u0015揤7􉖬tH󿳸;hbS{ꮯ\u001csMs󲷒9B4􀷾35c(~CUc󸇪\\V_XD3<L=\u000b\u001a\u001auH&\n(󰸶\u0001\u0010tn\u0001nU\u000e_\u0015t𝩱\u0010|\u0008𠟊UK\u0018[w<󴰿􎆘b+r\r%g'v𛈖敄E􃁔󳍔D𤁱􄂫⻣T@Fv\u0008%?U\\O]",
+    "phone": "+35453839",
     "phone_code": "wCWrnJoscPLT",
-    "label": ">>Mp१𤘇9:󺰽􋼒\u0010D1j󾮢􂊠;􄆇󳸪f#]"
-}
\ No newline at end of file
+    "team_code": "ZoMX0xs="
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_10.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_10.json
index deaba85c6c7..8e3754e980d 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_10.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_10.json
@@ -1,45 +1,45 @@
 {
-    "email": "zl􏣩􌲚\u0006<HnC𢾰禫^k!髤Mw䯑𩝱ꚭ<􌣡\r\u000b􏹔𧒮\u001bV@m탥C\u000faR👽DV🄤\u0006F",
-    "locale": "el-SL",
     "accent_id": -4837,
-    "name": "􉒥젉W\nX\\",
-    "invitation_code": "lGTLiCWOo127k6MaZVi9VpiQxd8=",
     "assets": [
         {
-            "size": "preview",
             "key": "\u0012𘟟\u0016\u0013P",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0011󴇥󲯊",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "z",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "5ꢡ g\u000cM!7",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "]􇽍\u0003<vo󱉷-%𮫖7~B\u000c",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𘕼𐳬0\u000es\u000e󲌇􍮡E\u001ac",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "J󺈁9)",
+            "size": "preview",
             "type": "image"
         }
     ],
-    "email_code": "4PYpdjJAvFqyXmM0Yr885x5iSuZUzQ=="
-}
\ No newline at end of file
+    "email": "zl􏣩􌲚\u0006<HnC𢾰禫^k!髤Mw䯑𩝱ꚭ<􌣡\r\u000b􏹔𧒮\u001bV@m탥C\u000faR👽DV🄤\u0006F",
+    "email_code": "4PYpdjJAvFqyXmM0Yr885x5iSuZUzQ==",
+    "invitation_code": "lGTLiCWOo127k6MaZVi9VpiQxd8=",
+    "locale": "el-SL",
+    "name": "􉒥젉W\nX\\"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_11.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_11.json
index 7542064affa..f838ae3f3cf 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_11.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_11.json
@@ -1,29 +1,24 @@
 {
-    "phone": "+43575413322561",
-    "locale": "tg-BD",
     "accent_id": 174052,
-    "picture": [],
-    "name": "hG\u0013碡e-󿲗f5\u000c󶭗\u0018d󺚌𫌻bR\u000c󳟢􊍽􎧏pJ",
-    "invitation_code": "w1bhwQG7MiCYb7O4aguK7iSgND5JBw==",
     "assets": [
         {
-            "size": "preview",
             "key": "~\u0005􎒛ld=\u0000Jc\u0011\tw􎨸\u000eh\u001e\u0016",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "E2p\u0017h􌑰",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𦈖,𫩝󸅨ޏ\u0000|@Q",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u001a-/􅠒𭳮􀒐'*\u00131󰏀\t􎲷􂥱\u00018\u0000",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -31,23 +26,23 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "pEf",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "`󾿁𧣭PX\u0018󲵈\u001e{",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "4A\u000bj脘oc",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0007\u0012B􆃹J󳍍V2?G",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -55,18 +50,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "ጅ󽆑+ᬝFMEp􀔌H\t\u0005",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0001;\u0013\u0013\u0006\u0004b5^s:\u001c\u0005󰩐y\u0011\u0017",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "v􃮞",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -74,18 +69,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "^ 𘡣藝\u001e@",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "8ﶱ𩳢\u0010E𒌍󻀏\\Z\u001b5<c𧅒2",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0010󽨻𦤩Gc",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -93,8 +88,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􏹌Q\u001fh%1\u000c𝨝溬:`",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -102,11 +97,16 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "瀷\\Q<\u0001X44鮚d􁎺",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "Z-Zl_Qv7tQ2uarU-IzTDMXzogSXj",
-    "phone_code": "XnBOrq6YI4Q_OfxeADfxgHnlqFMQaauOlT003dC1JCCI"
-}
\ No newline at end of file
+    "invitation_code": "w1bhwQG7MiCYb7O4aguK7iSgND5JBw==",
+    "locale": "tg-BD",
+    "name": "hG\u0013碡e-󿲗f5\u000c󶭗\u0018d󺚌𫌻bR\u000c󳟢􊍽􎧏pJ",
+    "phone": "+43575413322561",
+    "phone_code": "XnBOrq6YI4Q_OfxeADfxgHnlqFMQaauOlT003dC1JCCI",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_12.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_12.json
index 3ff767ce028..b5de0b71dc9 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_12.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_12.json
@@ -1,70 +1,64 @@
 {
-    "email": "g\u001cn))s/𧙊?\u001dQXb2 @U𨱐=B3Cod*󵓄ᯡ㏔",
-    "phone": "+195504776",
-    "locale": "et-TG",
-    "managed_by": "wire",
     "accent_id": -48922,
-    "name": "S𠴷[\u001eVD, \u0010BH\n,\u001a\t􄊇M棿1\u0001\u001e[􎤟,𥠈\"v󾶮MP\u000cObI\u001e\u0014씞󽻧\u001c\t7i𠧭\u0008\u0002T#뾱O󷙫\u000e\u001d!C\u001a\u0004{1\u0016  +\u0013\u0004􌲇𣝨(𤶐󷇀\u0014𬽑lh\u000f𡱹",
-    "password": "c𣪫~b@qM􅢳󿲯􇨘BL$b\n.^{p\nq\r\u001a,šP~󳂙`\u0016?\u0018􉦊7I놘\u0012􁧞\u0003f\u001a𣝼\u000ck%\u001f􅓹𡅗;0&k\u000f\u0015HY5_u𡜷",
     "assets": [
         {
-            "size": "preview",
             "key": "󽅗\n􏀬N",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "ENiRZ L􆢱. 𨤁\u0000S\u001a =",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "h𝑆\u0013",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𢥃x󾗒p\u000e찴,\u0015](\u000f",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0005.P贈_쨔􆋐D",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𩏸􃫬b",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u001bo\u00146",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "t,𫊆\u0002\"\u0008\u0002mE\u000e",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "t𔔓\\\u0014\u0018;",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "p)LK",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􈓁˟qx\u000f8mQ\u0002\u0014\u001c𮝡Ŧ",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "e",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -72,28 +66,28 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "Y\u0006",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󴭛\u000f\u0002\u0003Mux𧽨탸껙j\n}7\u001e\u0011",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": ":",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "j􆛝\u0011n󳦷`\u0012n\u0007𑱷𮞖\u0004􍎭\u0008𬢟",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Mx\u0018/\u001b\"G_\u0015\u001b",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -105,12 +99,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "]󹼲X(q\u0017O𦳹",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "email": "g\u001cn))s/𧙊?\u001dQXb2 @U𨱐=B3Cod*󵓄ᯡ㏔",
     "email_code": "UVZ6MaxnslUCv-4=",
-    "phone_code": "fsYfmzlCyBE3ZK8opHg=",
-    "label": "\u0011\u0008g󷤜-\u0008\u0018댂LP|l⅂􂫅/㩗\u001b\u0005"
-}
\ No newline at end of file
+    "label": "\u0011\u0008g󷤜-\u0008\u0018댂LP|l⅂􂫅/㩗\u001b\u0005",
+    "locale": "et-TG",
+    "managed_by": "wire",
+    "name": "S𠴷[\u001eVD, \u0010BH\n,\u001a\t􄊇M棿1\u0001\u001e[􎤟,𥠈\"v󾶮MP\u000cObI\u001e\u0014씞󽻧\u001c\t7i𠧭\u0008\u0002T#뾱O󷙫\u000e\u001d!C\u001a\u0004{1\u0016  +\u0013\u0004􌲇𣝨(𤶐󷇀\u0014𬽑lh\u000f𡱹",
+    "password": "c𣪫~b@qM􅢳󿲯􇨘BL$b\n.^{p\nq\r\u001a,šP~󳂙`\u0016?\u0018􉦊7I놘\u0012􁧞\u0003f\u001a𣝼\u000ck%\u001f􅓹𡅗;0&k\u000f\u0015HY5_u𡜷",
+    "phone": "+195504776",
+    "phone_code": "fsYfmzlCyBE3ZK8opHg="
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_13.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_13.json
index 66087236de7..3bc1910f48e 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_13.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_13.json
@@ -1,20 +1,13 @@
 {
-    "phone": "+40846434926274",
-    "locale": "bg-UZ",
-    "managed_by": "wire",
     "accent_id": -18284,
-    "picture": [],
-    "name": "\u0004ui",
-    "password": "󰲋2\u000e檑vXm1𨜰>\u001dY𠌓g󸫡pjer􉶴𮨁?원'JKn,Jat\u001c\u0007q󾂺𝖑\u0011傄󽄛e#󵊉{.󽶯d􏀧\u001e􋾒􅫑!󴞔󶪰\u0007娦\u0007~Nv!\u0007l󷃦z{\u000eeF\t*\u0006\ryt􉜑i𗵲\u0010%`tZ\u0017 HC'бJ\u0002\u001e/𑖛e\u0008󱲘󰁥 C(Ef\u0006􆌃`{/%\u0018ox3𠛩󽹚􊱃𦥈㒸\u0016?\u0002=􌾱J𦑮o>\u0011:𠔿\u0015󵻽!F{\n\u0003Q\u0013᎒\u0002YzrH\nG9ZS𬧥\u001f\u000b\u0018O􁄚󸓚< Mu􉯵𣸉yi3\u001a3\u0012#M𐴊\u000e\u0008,.E瓤􇜗@2󹪬\"Kd\u0001t󶣰m\u0010\u000f\u001a0\u0008s]C\r\u0016\u001foXD:\u0011%\u000b[􊠺=U]󼬒8\u0002x7𤵍\u001fJ􊠕n?틾𢘘K 𐠙]􀩑@啫`H\rL%𥆇Z<J𩛂\u000c󲆿-7𫳻\u001bX􏎙N\u001e\u0010w\u0008Z~⃠VFrJ6O㺫𝦗n𦸺\u0010lO\u000b\u001a~B60dS󰛡󻂨󷞩|\u0006􀸨􊽭􏜺fAW \u000f酙R즉w\u0018@騑lE\u0016n󾥮zy\u001f7𠿸Y𤲐j\u000fAO6Fv䤰枎\u0006q󱙳𬥨iW􄲊󸺍\u0000pA3\u0001􎟘9H7􇦴\u000c󹸣󾁧S/􇇗o_g'8Q,?')\u0008𮦄\u00175y􌖺麾`Q_w$f𭔲\u0010+qz=󲔴\"+\\뺈\u0017$qi\u0001k揿@v\u001dI'l꒙|\u0001'0䅹a𧍙Sp1≽^󵜸y𭽓\u000e5<\u0015P\u001eY\u0007뽪\u0003o􊚁io𗈸ww.9Y\u0008􁘆J뇊Sf\u0000\u001c:;)bh󳩆𘓲𝇢$\rn\u001b\u000fw\u000b@a0+󰣎\u0010􅷫𠛯􏍲\u0010K%Vtn󹢏󰶤\u0014󰲂꣐\u0008􄚼\u0008\u001b􆊇5,Qj󷹘\u000c𧶏\u0008\u000fWm|􀧧C󴓗#\u001dz𡯑𗢜𐎃󶱕%\u000c\u000c\u000fXqVza\u001e􇶙pcନr\u001a]w\u0012)꿎iW=Sz󳊍~j$󾹦1󸗭2\u000e\u000f5\n􅠠(\u001eQ𒇽𔘤\u0010c<x𬚡^\u001aF𩢗\u0017\u0016'︒𨓀~76A\u0000;L􎞫\u0004\u0000.z􂜓󿙵G􀋛v䡕i\u0016>\r\u0016􉘗oqtFEB𪋜[\u0015\u0007\u000bv$H&J\u0003😟􂰀󹸛8D頥X􆀉\u001a􌦓􌾆𖼷)uV❋䪢\u0000\u00119o\u0012(䕝\u001b\u001b\u0001*YO>fWl\u000etේ룙s*\"\u0010󺐈󻄤\u0001vgKYmv,𩬽v𧜆\n\u001dO􃎬}􄲓Dfj\u0017\u0016\u0014󠆔\u001e~𪉪[𩎫􅦠錀s𑄉󷂏@W如𧹼w.\u00155<𣷪n󺗺E4is𢥶o𡱊V'೦\u000cy\u0016a\u0002\u0005\u0001\u000f@\u0016鬙萞AO>S\u000b󽼺#`𞤊.\u0006𝡕F􌧓󹗬#󸊨R\n𤄳\u0010xL𦦓\\􄢨(􆑉G2𧮂 $􊐱􈉃𦋟g\r'#<Zsc",
-    "invitation_code": "oYu2EkO4OdjPAeBx-tOeGAHapJ62b5ZcuA==",
     "assets": [
         {
             "key": "6􌮆|󵌫\u00045z􇹊󻬤",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0015􋴶􋖝y\u0002󽒯c\u0008-",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -22,8 +15,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "[󻶝\u0019WU3d0/K",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -31,8 +24,8 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􊷫􎄍#\u0006",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -40,8 +33,8 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "6$(TkM",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -49,26 +42,33 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0008\u0005􈵞La65=󳁈𫌵R8",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󷨘\u000bj𪉡k",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0014\u001b|􀉎",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "D\u0001\u0018ṉl:",
+            "size": "preview",
             "type": "image"
         }
     ],
     "email_code": "jtAT26_-fRZ3qS2Gx5Cfvrk0mgi5gnPx",
-    "label": "d􄠧𩢬\u000f󹳁𪀘IZ蓀sS\"wjcI􄙨𤁗𢛸`X"
-}
\ No newline at end of file
+    "invitation_code": "oYu2EkO4OdjPAeBx-tOeGAHapJ62b5ZcuA==",
+    "label": "d􄠧𩢬\u000f󹳁𪀘IZ蓀sS\"wjcI􄙨𤁗𢛸`X",
+    "locale": "bg-UZ",
+    "managed_by": "wire",
+    "name": "\u0004ui",
+    "password": "󰲋2\u000e檑vXm1𨜰>\u001dY𠌓g󸫡pjer􉶴𮨁?원'JKn,Jat\u001c\u0007q󾂺𝖑\u0011傄󽄛e#󵊉{.󽶯d􏀧\u001e􋾒􅫑!󴞔󶪰\u0007娦\u0007~Nv!\u0007l󷃦z{\u000eeF\t*\u0006\ryt􉜑i𗵲\u0010%`tZ\u0017 HC'бJ\u0002\u001e/𑖛e\u0008󱲘󰁥 C(Ef\u0006􆌃`{/%\u0018ox3𠛩󽹚􊱃𦥈㒸\u0016?\u0002=􌾱J𦑮o>\u0011:𠔿\u0015󵻽!F{\n\u0003Q\u0013᎒\u0002YzrH\nG9ZS𬧥\u001f\u000b\u0018O􁄚󸓚< Mu􉯵𣸉yi3\u001a3\u0012#M𐴊\u000e\u0008,.E瓤􇜗@2󹪬\"Kd\u0001t󶣰m\u0010\u000f\u001a0\u0008s]C\r\u0016\u001foXD:\u0011%\u000b[􊠺=U]󼬒8\u0002x7𤵍\u001fJ􊠕n?틾𢘘K 𐠙]􀩑@啫`H\rL%𥆇Z<J𩛂\u000c󲆿-7𫳻\u001bX􏎙N\u001e\u0010w\u0008Z~⃠VFrJ6O㺫𝦗n𦸺\u0010lO\u000b\u001a~B60dS󰛡󻂨󷞩|\u0006􀸨􊽭􏜺fAW \u000f酙R즉w\u0018@騑lE\u0016n󾥮zy\u001f7𠿸Y𤲐j\u000fAO6Fv䤰枎\u0006q󱙳𬥨iW􄲊󸺍\u0000pA3\u0001􎟘9H7􇦴\u000c󹸣󾁧S/􇇗o_g'8Q,?')\u0008𮦄\u00175y􌖺麾`Q_w$f𭔲\u0010+qz=󲔴\"+\\뺈\u0017$qi\u0001k揿@v\u001dI'l꒙|\u0001'0䅹a𧍙Sp1≽^󵜸y𭽓\u000e5<\u0015P\u001eY\u0007뽪\u0003o􊚁io𗈸ww.9Y\u0008􁘆J뇊Sf\u0000\u001c:;)bh󳩆𘓲𝇢$\rn\u001b\u000fw\u000b@a0+󰣎\u0010􅷫𠛯􏍲\u0010K%Vtn󹢏󰶤\u0014󰲂꣐\u0008􄚼\u0008\u001b􆊇5,Qj󷹘\u000c𧶏\u0008\u000fWm|􀧧C󴓗#\u001dz𡯑𗢜𐎃󶱕%\u000c\u000c\u000fXqVza\u001e􇶙pcନr\u001a]w\u0012)꿎iW=Sz󳊍~j$󾹦1󸗭2\u000e\u000f5\n􅠠(\u001eQ𒇽𔘤\u0010c<x𬚡^\u001aF𩢗\u0017\u0016'︒𨓀~76A\u0000;L􎞫\u0004\u0000.z􂜓󿙵G􀋛v䡕i\u0016>\r\u0016􉘗oqtFEB𪋜[\u0015\u0007\u000bv$H&J\u0003😟􂰀󹸛8D頥X􆀉\u001a􌦓􌾆𖼷)uV❋䪢\u0000\u00119o\u0012(䕝\u001b\u001b\u0001*YO>fWl\u000etේ룙s*\"\u0010󺐈󻄤\u0001vgKYmv,𩬽v𧜆\n\u001dO􃎬}􄲓Dfj\u0017\u0016\u0014󠆔\u001e~𪉪[𩎫􅦠錀s𑄉󷂏@W如𧹼w.\u00155<𣷪n󺗺E4is𢥶o𡱊V'೦\u000cy\u0016a\u0002\u0005\u0001\u000f@\u0016鬙萞AO>S\u000b󽼺#`𞤊.\u0006𝡕F􌧓󹗬#󸊨R\n𤄳\u0010xL𦦓\\􄢨(􆑉G2𧮂 $􊐱􈉃𦋟g\r'#<Zsc",
+    "phone": "+40846434926274",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_14.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_14.json
index b6c9e78bf88..a644ce80092 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_14.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_14.json
@@ -1,8 +1,5 @@
 {
-    "email": "_𡶱0yK~}|8웾5\r􍙱A\u000b>􄮐?f*n𗳉'F쒔kg @\u0012Zi᥊𤁏V宎\u000f\u0007\u0018􏕢6E\u000f\u000b7,󼵋f2N",
     "accent_id": 18920,
-    "picture": [],
-    "name": "H'[\u0010Ep+G\u000e𮫞M\"󴒒",
     "assets": [
         {
             "key": "󹶇~\\\u0008]󹙇6'$󻦿",
@@ -13,18 +10,18 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "4Hi𫵸b7",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0017􋭱@搈9\u001e%Ⅺ*\u0019𬱪]􆗋\u0014{",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "f=X\u001fF|xOI\u0010𧕃𘩑U%a",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -32,13 +29,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "摧4I\u001b\u0016.",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0004𮌭M𠗬",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -46,7 +43,10 @@
             "type": "image"
         }
     ],
+    "email": "_𡶱0yK~}|8웾5\r􍙱A\u000b>􄮐?f*n𗳉'F쒔kg @\u0012Zi᥊𤁏V宎\u000f\u0007\u0018􏕢6E\u000f\u000b7,󼵋f2N",
     "email_code": "879HiMc=",
+    "label": "󲛴N",
+    "name": "H'[\u0010Ep+G\u000e𮫞M\"󴒒",
     "phone_code": "2IG53xZ-sTN_Om5U9MMGmxMXgD4I8m0OOhHe2VI=",
-    "label": "󲛴N"
-}
\ No newline at end of file
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_15.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_15.json
index 5f9cfa95b60..fbf3b1274b5 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_15.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_15.json
@@ -1,30 +1,24 @@
 {
-    "locale": "nv",
-    "managed_by": "wire",
     "accent_id": 55236,
-    "picture": [],
-    "name": "\\x\u001b𣮇/󸛾􌕽EGo尭􎻝𡋑􍖱Q.@\rp-~􀧫q\u0014+\u000eX<Q[@t\u000bt󴇾lN󸚺K𖬮쟳󺩟扂?,/fG󲰃1v\n\u0011$$2\u0015h<i𖠂A\u0003𨫺\u0007\u0018􁹵跿4_F荥Qo!󺄱b󾬉i*Q{]㿮",
-    "password": "E4LVn8xD>􌃈!􂑢sQnJ罝h08𮑹-􊷫Sf𐓸o\u0002𑿀3*󻄠e\u001f\u0005\u001b[|`𪹾\u001e􆠽P􆃹_$𥢀9RY\u0016􄏶3#\u0016f\u001ahN_!𤦽\u000e(@|>C\u001c㌦_U\\-𖹆.\u000b𡏰|􃞆=&󱀏\ny\u0012󳋖\u0005M!𣚄\u0014@qj󵜬x𭹋ꖎ\u0013V祙\u000b=󳋀\u0004Afq􌿁\u00050k\u000e玲\u000eN\u000e~*\u0007庰\u0007\u0014\u0003蒗U#\u0000{kb`\u000eu\u001f\u0003/󺃏6j􀧐j\u0019󿐕|`󿆟\u000e5>𤜥\u001f⒁f>}b󴾛CV\u0008qx\u001fC󿁛\u0011\u0004k3;qC󾚝􆀩`𪂈󽉲Z_:􋷓􁎈\u0011v𥣬􃴶t\u0013櫹w \u0010󳬜am0𢼋󼒝\\\u0000]\u0008NwqW\u0011.A􊹩rn\u0015L2\\@v󼗧􎆫\u0005𢂄JsifO`􉘅ZDD|Il􊽳Nd󼴬\r􂆏\u0000\u000b􅿱󺁼v􄨋MPW>&D\u0001􈫤힅h\u0015􏀵\u0008m\u000f^)J>@I7\u0000󰬵\u0015\u0012]Jr󺦢Qi\u0008󱛂\u0014-󳅨\u001b􌛽Yb%vY\u0014 KP󹁷\u001d󶰽􀠐d\u0019(0􊺡nz]*$󴻕󽍜^D\u00179􆪮X􄞻𣋋\"]󲏡#ꯪw𧽵Y\u0019𡠰{0\u001f䲯𭫜QqW壎裄󲲴𠤏O<`jAams7xC𭙖p\u0000􌵸\u0013􁜬fd\"\u0004q2?忲𥆙7DxTn\u0010!V\\僼A\u0005;\u0000?\u001b𩋧\u0004)A\u001a\u0003󼒂A\u0010O\u001dw螪~r惐*󹊼3Y\u001e\u000c\u000fl]p󷜼Nb󱈆a:cm\u0002Y\\`쵯XV;WWFG\u0014𢐚i7\u001f4(𐬓\u0019Z]A\u0019p􉘾o-e\u0015Sn⍪𮒓\u0002󻕍󶹂p𣈻\u0008\u000eT􆆎Hi󰹠𪄈𪠝􇞶e␙{⌼G*c􍩼'𢳏\u001c*9TgW\r뛌,vV=+{𨸷󾆨|􍤅E(\u001f=U~\u000fd#9lkWi*x\u0015}E?晻q㳴𗅻4em𝜺\u0002J\u000c\u0006\u0008\u000bByD\u0001𮙗\u000c\u001b餕\t*󱂕\"\u001d\u001cA{XvC)𑧢A蛋\"󴔖\n󱀗j󲸡𡝊\u0018\u001c􉵙𩗒\u0006_󵄡c뫖􆬵tccC㮷􂚍`\u000c9P陼亞􏭤i􂍡>󹏑\u0019G\u001fa\u0014J􉂵G|\u0002\u00033\u000eEZ.\u0018\u000cy_A\u0013F+sX{-\ndy􈈴􊥁!8a1a􁽋Rv󴖁\u0007e𘣾􅂧=󲾗\u0002\t0V\u000c𫃖8I􃔜_\u0018l6Ra+sX\n4󼭓R􍙊𖧼]%\"r㣵s<󽀹𩄍󽏤0󰇆=K넜ZQ󱀾󺩟lx`\u0006|7\u000c\t𒂰\u0011풞\n\u000fO󶶭 \u001a?<󷓚鈭Di􆸘.U~\u000c𮁛,>w.鸊𪂲!3􏴂\u0019[l-tI\"y壸󲇨bS><󺊯𤹅n𝡍&􌞧X+\nvhY^\ny\u000e0𤃉\u0002\u0005V\u0011~%\u0001K>𪈰(;G/;汦M􈝪\u0018$t􁺼~􄟧𘔼JZ󰫞e𘞭\u0015􀏓-{}s󱩕v@\u0019Tf\u0004+뎰\u0007󺂱pS\u0012\u001cJ?𠸱┲y씿~\u0001\u0017𖨗(,󲹸=W𦹪J\u0006%*9;q󺅞𩥷\u001fp\u00079@; \u0001N\u000b!䚋(on\\!0P<&X󸻝QmuA􎹟\u001bC%\u0005𥨽\u0013\u0014vRnch􉾤'󹽼ᆚ\u000f\u000e󳁢wB󰊿h?qt+\u0005\\<ui\u000b2Z瀪Jtr_\u0002\u001e]L/5-衤=󵍊沚\u000b󹈨\tX^ᮉ\u0010d𡑃\u0011}\u0011󼓶w􌇯?置/%𖤭\u000c-):93\u001f\"𡒘ࠣ𡖛\u001a\u0001\\<𝪨\u001a\u001d>7餶󾏋\u0003\\;􆪏",
-    "invitation_code": "",
     "assets": [
         {
-            "size": "complete",
             "key": "|/𣉘咪",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0004",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\nwa^|?𥴺\u0013v",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "}Wh",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -32,8 +26,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "g",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -41,28 +35,28 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "9b\u0016? /\u0016\u0010",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􎃫.𪇈r",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "9L䠟Azm𩸈;㿬",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "<Tq2(􄾏S\u0016w􆱁󳲾",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0014􇳤k7\u0004\u0014༞D\u0006􀡠:\u0018\u0018@",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -70,23 +64,23 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "a}[c\u0004F(2\u0014\u000e,`",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -94,8 +88,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u001b",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -103,32 +97,38 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "VvXFZ詹",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ",揘\u000e8𬌖𢖩4\u0017",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "4J\u00055/=)DEPo𥅪\u0018\u0014\u0015_",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "O\u0016*",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u001fLQO\u0005𧸠􁰂",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "BJRDcvUPrlO-pgxRa76Vnl4de3eygJ9240aMhw==",
+    "invitation_code": "",
+    "label": ")/\u001bb\u001c\u001eULi&PV#2dC|𗮋lU#+y'_󻏌",
+    "locale": "nv",
+    "managed_by": "wire",
+    "name": "\\x\u001b𣮇/󸛾􌕽EGo尭􎻝𡋑􍖱Q.@\rp-~􀧫q\u0014+\u000eX<Q[@t\u000bt󴇾lN󸚺K𖬮쟳󺩟扂?,/fG󲰃1v\n\u0011$$2\u0015h<i𖠂A\u0003𨫺\u0007\u0018􁹵跿4_F荥Qo!󺄱b󾬉i*Q{]㿮",
+    "password": "E4LVn8xD>􌃈!􂑢sQnJ罝h08𮑹-􊷫Sf𐓸o\u0002𑿀3*󻄠e\u001f\u0005\u001b[|`𪹾\u001e􆠽P􆃹_$𥢀9RY\u0016􄏶3#\u0016f\u001ahN_!𤦽\u000e(@|>C\u001c㌦_U\\-𖹆.\u000b𡏰|􃞆=&󱀏\ny\u0012󳋖\u0005M!𣚄\u0014@qj󵜬x𭹋ꖎ\u0013V祙\u000b=󳋀\u0004Afq􌿁\u00050k\u000e玲\u000eN\u000e~*\u0007庰\u0007\u0014\u0003蒗U#\u0000{kb`\u000eu\u001f\u0003/󺃏6j􀧐j\u0019󿐕|`󿆟\u000e5>𤜥\u001f⒁f>}b󴾛CV\u0008qx\u001fC󿁛\u0011\u0004k3;qC󾚝􆀩`𪂈󽉲Z_:􋷓􁎈\u0011v𥣬􃴶t\u0013櫹w \u0010󳬜am0𢼋󼒝\\\u0000]\u0008NwqW\u0011.A􊹩rn\u0015L2\\@v󼗧􎆫\u0005𢂄JsifO`􉘅ZDD|Il􊽳Nd󼴬\r􂆏\u0000\u000b􅿱󺁼v􄨋MPW>&D\u0001􈫤힅h\u0015􏀵\u0008m\u000f^)J>@I7\u0000󰬵\u0015\u0012]Jr󺦢Qi\u0008󱛂\u0014-󳅨\u001b􌛽Yb%vY\u0014 KP󹁷\u001d󶰽􀠐d\u0019(0􊺡nz]*$󴻕󽍜^D\u00179􆪮X􄞻𣋋\"]󲏡#ꯪw𧽵Y\u0019𡠰{0\u001f䲯𭫜QqW壎裄󲲴𠤏O<`jAams7xC𭙖p\u0000􌵸\u0013􁜬fd\"\u0004q2?忲𥆙7DxTn\u0010!V\\僼A\u0005;\u0000?\u001b𩋧\u0004)A\u001a\u0003󼒂A\u0010O\u001dw螪~r惐*󹊼3Y\u001e\u000c\u000fl]p󷜼Nb󱈆a:cm\u0002Y\\`쵯XV;WWFG\u0014𢐚i7\u001f4(𐬓\u0019Z]A\u0019p􉘾o-e\u0015Sn⍪𮒓\u0002󻕍󶹂p𣈻\u0008\u000eT􆆎Hi󰹠𪄈𪠝􇞶e␙{⌼G*c􍩼'𢳏\u001c*9TgW\r뛌,vV=+{𨸷󾆨|􍤅E(\u001f=U~\u000fd#9lkWi*x\u0015}E?晻q㳴𗅻4em𝜺\u0002J\u000c\u0006\u0008\u000bByD\u0001𮙗\u000c\u001b餕\t*󱂕\"\u001d\u001cA{XvC)𑧢A蛋\"󴔖\n󱀗j󲸡𡝊\u0018\u001c􉵙𩗒\u0006_󵄡c뫖􆬵tccC㮷􂚍`\u000c9P陼亞􏭤i􂍡>󹏑\u0019G\u001fa\u0014J􉂵G|\u0002\u00033\u000eEZ.\u0018\u000cy_A\u0013F+sX{-\ndy􈈴􊥁!8a1a􁽋Rv󴖁\u0007e𘣾􅂧=󲾗\u0002\t0V\u000c𫃖8I􃔜_\u0018l6Ra+sX\n4󼭓R􍙊𖧼]%\"r㣵s<󽀹𩄍󽏤0󰇆=K넜ZQ󱀾󺩟lx`\u0006|7\u000c\t𒂰\u0011풞\n\u000fO󶶭 \u001a?<󷓚鈭Di􆸘.U~\u000c𮁛,>w.鸊𪂲!3􏴂\u0019[l-tI\"y壸󲇨bS><󺊯𤹅n𝡍&􌞧X+\nvhY^\ny\u000e0𤃉\u0002\u0005V\u0011~%\u0001K>𪈰(;G/;汦M􈝪\u0018$t􁺼~􄟧𘔼JZ󰫞e𘞭\u0015􀏓-{}s󱩕v@\u0019Tf\u0004+뎰\u0007󺂱pS\u0012\u001cJ?𠸱┲y씿~\u0001\u0017𖨗(,󲹸=W𦹪J\u0006%*9;q󺅞𩥷\u001fp\u00079@; \u0001N\u000b!䚋(on\\!0P<&X󸻝QmuA􎹟\u001bC%\u0005𥨽\u0013\u0014vRnch􉾤'󹽼ᆚ\u000f\u000e󳁢wB󰊿h?qt+\u0005\\<ui\u000b2Z瀪Jtr_\u0002\u001e]L/5-衤=󵍊沚\u000b󹈨\tX^ᮉ\u0010d𡑃\u0011}\u0011󼓶w􌇯?置/%𖤭\u000c-):93\u001f\"𡒘ࠣ𡖛\u001a\u0001\\<𝪨\u001a\u001d>7餶󾏋\u0003\\;􆪏",
     "phone_code": "lrdPhnTqFFN2mVM=",
-    "label": ")/\u001bb\u001c\u001eULi&PV#2dC|𗮋lU#+y'_󻏌"
-}
\ No newline at end of file
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_16.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_16.json
index 9dc326ca68b..4877eeea425 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_16.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_16.json
@@ -1,20 +1,20 @@
 {
+    "accent_id": -26284,
+    "assets": [],
     "email": "x\u0007𝑫𡕞􎅘@C􁇸\u001c;􏾁\t?􃳼;\u001d`\u0000𗐠\u0007",
-    "phone": "+534443880",
+    "email_code": "XYsxg7ZJ_P0cEi1JGv7oJTI=",
+    "label": "9",
     "locale": "yi-CK",
     "managed_by": "wire",
-    "accent_id": -26284,
-    "picture": [],
     "name": "36僥\u0019𡇩󶖖\u0012􎴠L\\𧪈籣\\:ｃ𣨥󳪛𧒢-틴N㼍𣮪[oe𧚪%4\u0017]𮔎",
     "password": "󱦄Bᨩx󻕙v*Sh\u0017W k\u0012D ThP6$􀴏\\gc曞𬙓LS􌥾apGZ?8+􊶂h:\u001c)􁳴W󼎍Z'C\u000bH􇸀yI!u9[ ;*_𑀱[\u0001F󼈻\u0019.,󲢱󷧾\u0010wL\u0000\u0015S󼁴潫󺧓_K\u0004󱭻\u000eB􃐭EM>;􅾓1\u0012MT\u0017󻀫\nX\u000f\u0014󿄍&s󽿅3\u001a\u0013!cz𨡳𑰩Ab􇦑𒒑\"\u00113󶁭#%`\u0000\rr􆊆[0鬩g!/𪸰\u0006\u001a𤉣X\\\u0019y􅭽Ci\u0001)8'\u000f2\u0007\u0008j4h呲􇎵!􄓋􉁋􉒽jp󼧔󾍞𨶡.𠊼[<拖\u000fve(\u0016 K􋠒\u0007E\u0019TC\u0014L󺛜j\u0015`j`􇏜g\u0002?QQKh􄢥Gdp/\u001e몠\u000bj𪤝&;,qr䖽\u0014Bz\u001eW󿟠c\u0012}\u001b󳅓LdU\\cwz󳃶\u0018|gY󻵞n􉓻lꀇoi󰝺𢽯\u001a\u000c//􍮘L=煈]󶙆⌿𤾿󶮽y(\u0000w\u001f_\u0005m􊼳K|館d\u0004R,􏫳󸁲󳝺Nx𐚀󲭮\u0007\u000ejS=27,k\u0001w\u000b\u000be 󿙙\n絠{\u000bC𪄳6K 󿘺\u0010n[zPl\u000e\t\u0017%􈷜\u000b􈉕J􌹩𘒰\u000eN!󴧷ꉱ􎳝)\u001eN;0\u0003H+𪊅?}6쎋麰󿭋廩5S\u0010\\\u000b\thJ@\u000f\u0012󸞛WD􅧎𥽌`\u0011e\u0006\u0019𠉆\u000b􎌮\u0011h\u0011'KR𘖢cB\u000f5\u0007^⡌?0{y􍤈`㾉\u001bS(\n(6:=󸽯uvwL=󱗢\u001f0t\u001e|􆪿<􄺐\u0010U#=\u0004)KR~(歃𪧥\u0001\u0017极󲣹\r\u001a-𩨑<𣵨\"iVGqt+]c샋\u000e\u001cl􃬉𬛟\u0000]m󸔰R\u001f꾥\u0011B\u001c\u0012\u0014\t\u001d霖嫌#FB/W󻡹􍘪\u0017`\u0003B󶎖h]꒖U%\u0000\n\u000eY𣮵엯;t\t-%󷥒L9𗣸Ju\u0015v\u001ccw\u001d,􋄡𠅅3 􁼵x0l+_i\u0008󶢻?\n&􊂇\")H-C-􄈋_\u0016(b|뾆\u000fo𐍂?e⎛]𥱥0E\u00001\u0011辶􉡞쌭\u001bl .P5XY\u0007􇷦󾶖&􄛇󹵅tKm𠢳🩃'\u0002J\u000e9􁢊N\"\u0008\u000fRo􇴡䌦i%󻆔􉭮󾬜1\"\u0014j􃌸𮎌槌\u0006\u0004V<5\u0001\u0000]N陴qCf𧫅;.$~a60𩱷W\"\u000ea\u0001􁸒􏳂\u001e\u0005󱪔q苯쯼\n⍄\u0004\\}𮛞w\u0012(\u001c𥐞/󷢈kv\u0006T􈜖Ze3􊺲l䞊M}e\u0000U]󾽥@DOW\tu2t|@\u0002𤝓xc?%󹩇?]\u000b!\u0005\u00158@G𛇤~l𧯉E-\u0000w\u000cFl\u001ev\u000bNb:虠e\u0012@𩔕\u0007o9G󷨶B􂙇f|􋊤\"\u0002-C*>RM&\u0012〔\u0010uPt󿲧@\u001ak󾟏?\u0007󷽐5Q~dUMlfk\u000e\u0007MC𧨋'J(\u0016\u0013⏶𩻘/𠶴<󷩍+󶉼XSzcB𨉣/$𝜂n𘋗􊟇_v\u000e􂪱8蒗\u0007CO􎦲󵇞􍴃𥓄:켐qy𥃂\u001a𢰀𧷤elk\\\u0019𢃼\n󹻟7쬲𬷭e󺾀K+e󷻀\n\u00198h\u0018\u0013eLD\u0011䈓Y\u0004$#\u0013겂ܮT𢈳=!\u0005􊎣<\u0013Fᣏ(5?\u00112𦩵\u001fr໔3%􎤁󴇓\u0006}9\u00070rF\u0018MH\u00108𫮩R󷆼𐅡􃍭Q*\u001b~%𐄁C\u0004\n\u001ar#\u0014\u0014n\u0012tx𠲤e􁇩𩟷.Z\ry8O\u0017",
+    "phone": "+534443880",
+    "phone_code": "zCo9DoCXHJwpHDl4N7m-hyRBkTE__sgzyg==",
+    "picture": [],
     "team": {
-        "icon": "󿯬%\u001f\u0014y0隨\u001fx箌󳓐4ᴦ􎻷􉩞*=∃#V%(\t\u0006x\u0018k􃹨\u001el\nG\u0012d椿\"W􉧶)~󲡳fx\u001a\\󵮭\u000c􀛎\u0015O\u0011t&𭽮\u000f\u00199􈑶\u0013𖫰Z엦J􈏚#JjO3\u0004\u0007􏬻'\u000b><%5SFN\u0014S +7+䎝2􆺇🦑􉔌ⷐ]\t\u0015󴑂v\u001b&D(\u0016c\u0019ꖈ\u0001􃏂𥽖'\u0008󵸨\u0016cv/Z\\⨬󸽬􇐋O}\u0013\u00081X󱒵K\u0018n𠠃I!󸏤8\u0007so􀩽il󰁆󻎩󹄵\u0000󹋍𣕕'𞻰趜BJ\\.v󼆊\u000c󻘥gB󹹑󼴝y\u0002@0󹵾\u0012L)𡍹Q󸕥&m】u [󾹥'\u0013n𮔋\u001d\u0016𧎡􅍦🌂Mq4|\tz6󸧀\\hN㧧<S􌏗x\u0014!s1\u000f􍼴\u001a􄾅󲒽𬮩\u0019\u0004\u001a䱪\u001bire*R7鱯􈖸]\u0004MlL",
-        "name": "\u0013!\u0007z󺔐\u0001N󳿈^lC\n󱔆󼆞_𩓈􏭘U8 \n90i3Z\u001a\u0016\u0012𢠢6ꛅ𖧟𠍃~~)\u001b=􃥥t𥅒\u001es\u000bぬ\u001fs\u0008\u000f􇆔b𤿔\u0008󺄚𫁅+e􆷝: 󹟤rU",
         "currency": "HRK",
-        "icon_key": "㽰x󶠌{V\\S󾁵E|▬Ra'hV󹚷;\u0015𠇯\u00102/\u0010jD]d{𡈳󳙇𦑗O\u0008𭹒𪻏\\]\u000cr􀇇􆄾t-xD0𪥱J\\v􇐅𡥚y9󹽯b􍀿}Q\u0010;\u000c􁔜?\u0005\u0002<\u0004󼑘r\u000c󺫋_喵ꘑ"
-    },
-    "assets": [],
-    "email_code": "XYsxg7ZJ_P0cEi1JGv7oJTI=",
-    "phone_code": "zCo9DoCXHJwpHDl4N7m-hyRBkTE__sgzyg==",
-    "label": "9"
-}
\ No newline at end of file
+        "icon": "󿯬%\u001f\u0014y0隨\u001fx箌󳓐4ᴦ􎻷􉩞*=∃#V%(\t\u0006x\u0018k􃹨\u001el\nG\u0012d椿\"W􉧶)~󲡳fx\u001a\\󵮭\u000c􀛎\u0015O\u0011t&𭽮\u000f\u00199􈑶\u0013𖫰Z엦J􈏚#JjO3\u0004\u0007􏬻'\u000b><%5SFN\u0014S +7+䎝2􆺇🦑􉔌ⷐ]\t\u0015󴑂v\u001b&D(\u0016c\u0019ꖈ\u0001􃏂𥽖'\u0008󵸨\u0016cv/Z\\⨬󸽬􇐋O}\u0013\u00081X󱒵K\u0018n𠠃I!󸏤8\u0007so􀩽il󰁆󻎩󹄵\u0000󹋍𣕕'𞻰趜BJ\\.v󼆊\u000c󻘥gB󹹑󼴝y\u0002@0󹵾\u0012L)𡍹Q󸕥&m】u [󾹥'\u0013n𮔋\u001d\u0016𧎡􅍦🌂Mq4|\tz6󸧀\\hN㧧<S􌏗x\u0014!s1\u000f􍼴\u001a􄾅󲒽𬮩\u0019\u0004\u001a䱪\u001bire*R7鱯􈖸]\u0004MlL",
+        "icon_key": "㽰x󶠌{V\\S󾁵E|▬Ra'hV󹚷;\u0015𠇯\u00102/\u0010jD]d{𡈳󳙇𦑗O\u0008𭹒𪻏\\]\u000cr􀇇􆄾t-xD0𪥱J\\v􇐅𡥚y9󹽯b􍀿}Q\u0010;\u000c􁔜?\u0005\u0002<\u0004󼑘r\u000c󺫋_喵ꘑ",
+        "name": "\u0013!\u0007z󺔐\u0001N󳿈^lC\n󱔆󼆞_𩓈􏭘U8 \n90i3Z\u001a\u0016\u0012𢠢6ꛅ𖧟𠍃~~)\u001b=􃥥t𥅒\u001es\u000bぬ\u001fs\u0008\u000f􇆔b𤿔\u0008󺄚𫁅+e􆷝: 󹟤rU"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_17.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_17.json
index b5957db0775..965a9e9446a 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_17.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_17.json
@@ -1,24 +1,19 @@
 {
-    "phone": "+251656534",
-    "locale": "ga-IT",
-    "managed_by": "wire",
     "accent_id": 13420,
-    "name": "􌷒\u000f\rM𩙴≗B👹𪢘2\n\u0002\u00121n]啙",
-    "password": "𬓿YALj\"􇟼􋫒\u00146󼅰\u0015{\u000b2𡷗􂒕59yPA,%\r\u0000_𗤂\n􍘯nᛅpA𑢻P%>\u0008_0\u000c\u0003o\u0006>􁳇𪻔JG$7uj+𣍝\\𩜗\u001fS\u000e􌆧\u0015$Z\u0007\u001aG𡨺풲j 𞺰sE\u0016N𨣰􁰯\u0017\u000fSG8-𗍘󶖲\u000b\u0014\u0001􏬚a\u001d𖽴Y,𘧭\u001eF\u001arZ瘪\nEo\u0002\u001al\u0012􅄒}vJM󾜲65\u001cP5\u000bK󰹜=]P􎗛𑘕𮉁𫒊T𢐯𦘶𥢚\u0012Y󽒬E󽂸󳃣\u0016`􎳆\n􁨩6\u0000\u00077킮{4􀴀jx\nŦ󸜸<z𦩓B𪃅U\u001b旾j󷔍\\Ꮊ\u0004􌟷\u001b0G𣳲\u0014y\u0003f𩐬E}\\\r𡃫􏄼\u0006\u0014􎢦{o\u0015yu􂈓\u001cኚ𤼼\u0008|󴺀􈰁𢋬靊0竊\u0005󼟃}^G4􊾂󹳀Ql>.嬖󹩩7\u0013\u0007+f𐅴N󽰠\u0016?G󻚮𤂹M\r\u0016𮢩_􏕛歈C󿎉G\u0010󻠫󷶶T$\u0001}󲪥\u0000L􀯟ń镐Y*v㝒􄁮𦝹\\T\u0001󺼿EL pS󺞘0Ny5\u0008>뼚提4}8᪓\u0001.󠅝\u0000𩽼s\u0006j󴛚𦵀혴>􆪒x\u0017M\u0011u㕤裂I\u0008\u0007x0|U.\u001bb|'l\u001a󺹫h􄇔<攁hxJㄤo]g\u001cdUj􏺇\u001a7\u0002𭸙􍷥􆅲\u001a󱖏 ?ji@\u0001􇊵󶮰Q𔔨\u0005<>􍴕(󴛸h\u0017\u0013m*j+፞t\r􃚡󻨕sv\u0014\u0019􏿍󻁨`.a󠁓&𬿥c\u0003S\rEq\u001a=Zc𭽷ᓭ\u0003v뾿\u0003\u0017\u001e\u0004 󷹞jMt􅷙O鐖,䷔𫝅_>#BB𝣧-t󵎭𧯌\"q@󼆲􏪍ꏒ𮄿%,󲭳9z𗬪\nM𠹦󹗗p\u0001􎎕p𒎋🢠\u000c𖧔r7+󵚫\u000fX\u0012\u001aPtOj\u000fZO@'󴙎󿧺o𡇫󴖀P􆂭\u000cb(skyZ羚b;@􀬻.\n4v'gD󺌴9\u001600Ih|󼬺䡁a\u0002t\u0015\u0008󷬄XᡛQh-m<Vb?Dz􍞻𢁦&^&􂤭\u0002>冕@犽q\u001ew=:󸾽\u0016𦴍&&n\u0018\u001e\u0010\u0011\u0017樻􃫌􁟆*zQ\u0004`O󷪤|%[\u001a󵶉\u0002x\u0013ezypH4󺬣\u0016<\u001f/wb\"𬛯\u0001'􁻚𨣢|\u0017𫛍\u0005S\u0018[\u0017D􄞭🔀{蛦(\u0016g7u \u0007pvj󻲮Vr\u00168󳔴\u000f\n󶞵j𦑣,𨚀Nn\u0000d긕^]#\u0007a}k^𤐺ZPzT6|JA\n4w4󲚎𨮄R^z7㤘U\u0006􏸭䵇ᒸ噑𦓩W􁭻-\u0016𧋎L󴶖\u001d\u0001􎢪\u0007\u0011᧞5p\u001f廖V&I𪴪\\ #\u0014J\t􀕖pb.󶮫<j\u0013\u0003L\u001d\u001e17'\u00147𧽥B𞺚7󽐾 󿌌(;\"􏼾L􁸆🁁np\u000f淿6􈌌󲜙\u001d􃷨e6t\u0018\u00128t{綖{\\jfj뤓'c`T@󳖡i[0U\u001d+V\u0002|\t#󿦲S\u001f𗵇\u000eQA𗁃VTRa'=\u00080\u0012􏤮Z􍓄>Y=\u0019B󳋣󾆆\u0017\\\u0003Fu3=fgk0tHMV󶝷L&\u001c􇥘𨹼𗢿u󰦹􉕽#$\u001aHr\u0015bC=󽌨𨔘f}@FOXE㵮b􌝩\t\u0004󲫒\u001a'0\u0001ℛ\u0004𗟤|UBm􍏼U.0󽨪௦0ᕑqC5𨭔qTEeK?Y󾲺V!Po𭝇y󵕀󵰈􇘖)>󳰣\u0001𧞞𨪂@\u001b\n>-q\n8\u0004󴸒E*/󵨱3\u0019q:JRP󰊤􍹁𮡸L떘yl󲕥!Iczg\u001b嵟Zdc󹾲󲅶IlG\u0010fwx釒b莳/{\u001a,0𑋄\u00055>䎉􊠏U7J󼸜\u0000z'🙑凇'\u0004௧_f\u0011B\"B{Q@\u0015𘀔𒀝b3y𣹧􇑝W[j𢪶j􃱋[𬉹]\u001a\u0019\u0018{\u001a폓^%󺱔T\r쥑qIfX𒓑w𘡞}\u0007F􌴂\u000fq,󰟞teNy𥏂vM",
     "assets": [
         {
-            "size": "complete",
             "key": "J(Yl\u000b뢮",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "㒠;s ",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "ᆘg􇣙`ㅬF󽎎楷",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -26,23 +21,23 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0019󹠨􄕾ᓎ-􉽶",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0013O[j􅢑卹\\󶍞Pr𦌚\u0000\\",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󷳸d^􉬂1m\u0014j",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􈔑*k`𗦰𝩉𐤅U\u0005",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -54,13 +49,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": ";\\",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󻊕\u001a󷮙",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -68,8 +63,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ".-Vja\u0000!\u0001\u000e9ὧ",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -77,6 +72,11 @@
             "type": "image"
         }
     ],
-    "phone_code": "KHcnKK_qpFuroGfcTO0nxQ5ntFkICAdG",
-    "label": " T𝩰9!\u001f P>x􄊰.𩌥􀾀].􄸛-&̴󾯳x\u001b\u0015􃿍[\u001e\"𪳿\u00029"
-}
\ No newline at end of file
+    "label": " T𝩰9!\u001f P>x􄊰.𩌥􀾀].􄸛-&̴󾯳x\u001b\u0015􃿍[\u001e\"𪳿\u00029",
+    "locale": "ga-IT",
+    "managed_by": "wire",
+    "name": "􌷒\u000f\rM𩙴≗B👹𪢘2\n\u0002\u00121n]啙",
+    "password": "𬓿YALj\"􇟼􋫒\u00146󼅰\u0015{\u000b2𡷗􂒕59yPA,%\r\u0000_𗤂\n􍘯nᛅpA𑢻P%>\u0008_0\u000c\u0003o\u0006>􁳇𪻔JG$7uj+𣍝\\𩜗\u001fS\u000e􌆧\u0015$Z\u0007\u001aG𡨺풲j 𞺰sE\u0016N𨣰􁰯\u0017\u000fSG8-𗍘󶖲\u000b\u0014\u0001􏬚a\u001d𖽴Y,𘧭\u001eF\u001arZ瘪\nEo\u0002\u001al\u0012􅄒}vJM󾜲65\u001cP5\u000bK󰹜=]P􎗛𑘕𮉁𫒊T𢐯𦘶𥢚\u0012Y󽒬E󽂸󳃣\u0016`􎳆\n􁨩6\u0000\u00077킮{4􀴀jx\nŦ󸜸<z𦩓B𪃅U\u001b旾j󷔍\\Ꮊ\u0004􌟷\u001b0G𣳲\u0014y\u0003f𩐬E}\\\r𡃫􏄼\u0006\u0014􎢦{o\u0015yu􂈓\u001cኚ𤼼\u0008|󴺀􈰁𢋬靊0竊\u0005󼟃}^G4􊾂󹳀Ql>.嬖󹩩7\u0013\u0007+f𐅴N󽰠\u0016?G󻚮𤂹M\r\u0016𮢩_􏕛歈C󿎉G\u0010󻠫󷶶T$\u0001}󲪥\u0000L􀯟ń镐Y*v㝒􄁮𦝹\\T\u0001󺼿EL pS󺞘0Ny5\u0008>뼚提4}8᪓\u0001.󠅝\u0000𩽼s\u0006j󴛚𦵀혴>􆪒x\u0017M\u0011u㕤裂I\u0008\u0007x0|U.\u001bb|'l\u001a󺹫h􄇔<攁hxJㄤo]g\u001cdUj􏺇\u001a7\u0002𭸙􍷥􆅲\u001a󱖏 ?ji@\u0001􇊵󶮰Q𔔨\u0005<>􍴕(󴛸h\u0017\u0013m*j+፞t\r􃚡󻨕sv\u0014\u0019􏿍󻁨`.a󠁓&𬿥c\u0003S\rEq\u001a=Zc𭽷ᓭ\u0003v뾿\u0003\u0017\u001e\u0004 󷹞jMt􅷙O鐖,䷔𫝅_>#BB𝣧-t󵎭𧯌\"q@󼆲􏪍ꏒ𮄿%,󲭳9z𗬪\nM𠹦󹗗p\u0001􎎕p𒎋🢠\u000c𖧔r7+󵚫\u000fX\u0012\u001aPtOj\u000fZO@'󴙎󿧺o𡇫󴖀P􆂭\u000cb(skyZ羚b;@􀬻.\n4v'gD󺌴9\u001600Ih|󼬺䡁a\u0002t\u0015\u0008󷬄XᡛQh-m<Vb?Dz􍞻𢁦&^&􂤭\u0002>冕@犽q\u001ew=:󸾽\u0016𦴍&&n\u0018\u001e\u0010\u0011\u0017樻􃫌􁟆*zQ\u0004`O󷪤|%[\u001a󵶉\u0002x\u0013ezypH4󺬣\u0016<\u001f/wb\"𬛯\u0001'􁻚𨣢|\u0017𫛍\u0005S\u0018[\u0017D􄞭🔀{蛦(\u0016g7u \u0007pvj󻲮Vr\u00168󳔴\u000f\n󶞵j𦑣,𨚀Nn\u0000d긕^]#\u0007a}k^𤐺ZPzT6|JA\n4w4󲚎𨮄R^z7㤘U\u0006􏸭䵇ᒸ噑𦓩W􁭻-\u0016𧋎L󴶖\u001d\u0001􎢪\u0007\u0011᧞5p\u001f廖V&I𪴪\\ #\u0014J\t􀕖pb.󶮫<j\u0013\u0003L\u001d\u001e17'\u00147𧽥B𞺚7󽐾 󿌌(;\"􏼾L􁸆🁁np\u000f淿6􈌌󲜙\u001d􃷨e6t\u0018\u00128t{綖{\\jfj뤓'c`T@󳖡i[0U\u001d+V\u0002|\t#󿦲S\u001f𗵇\u000eQA𗁃VTRa'=\u00080\u0012􏤮Z􍓄>Y=\u0019B󳋣󾆆\u0017\\\u0003Fu3=fgk0tHMV󶝷L&\u001c􇥘𨹼𗢿u󰦹􉕽#$\u001aHr\u0015bC=󽌨𨔘f}@FOXE㵮b􌝩\t\u0004󲫒\u001a'0\u0001ℛ\u0004𗟤|UBm􍏼U.0󽨪௦0ᕑqC5𨭔qTEeK?Y󾲺V!Po𭝇y󵕀󵰈􇘖)>󳰣\u0001𧞞𨪂@\u001b\n>-q\n8\u0004󴸒E*/󵨱3\u0019q:JRP󰊤􍹁𮡸L떘yl󲕥!Iczg\u001b嵟Zdc󹾲󲅶IlG\u0010fwx釒b莳/{\u001a,0𑋄\u00055>䎉􊠏U7J󼸜\u0000z'🙑凇'\u0004௧_f\u0011B\"B{Q@\u0015𘀔𒀝b3y𣹧􇑝W[j𢪶j􃱋[𬉹]\u001a\u0019\u0018{\u001a폓^%󺱔T\r쥑qIfX𒓑w𘡞}\u0007F􌴂\u000fq,󰟞teNy𥏂vM",
+    "phone": "+251656534",
+    "phone_code": "KHcnKK_qpFuroGfcTO0nxQ5ntFkICAdG"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_18.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_18.json
index 608b04cfab2..00409dfeadc 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_18.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_18.json
@@ -1,59 +1,59 @@
 {
-    "email": "@𥧧󽏧🛆􆢸",
-    "phone": "+5329622943",
-    "team_code": "mYNFyKFVL1hf66I1Exr3P8kiIA==",
-    "locale": "rm",
-    "managed_by": "wire",
     "accent_id": -14264,
-    "picture": [],
-    "name": "!1\u00181𣌯=o/+􉤄(\u0013\u0013f\u0010ꃕ⁛𮫊󹉥;=\u0011\u000e}\u0019􃨃Vla\u0014𩕉{xx 1rYe􀥯K/",
-    "password": "\u0002嶔-\u000eyRe\u0017\u001b\u0010E𤫵/-\n\u0006\u0006z\u0008\\)󽘙:z𫁙􈐣W~\u0017햳yU@\u001e9!􌝚S&\u0011U\u00023f\u0007𬃣D-:8x Z\u000b𣢘y\u0007󲷵t𘨲0󹴩\u0018LvB𢨰􀭒`dq𖬥\u0008@Dh\u001e^𬝋!Zrdy&郧njK𨊤󾾈c>k\\󹈓a'{?􇨚8勤2󷮛\u0010{0倦<𢫧𒈂Jyp󻖟C]{{쒇EJ2qᎣm󲞣8\u001cj?\u001a\u000fq𡋃%󳗉\u0015c𛰡󼠉B#D􅩺d[)H%1V\u001d󼠦Ul􃑐􄳌i\u001b綝쾞}1\u000f􆖍e_\u0016󷙥􉵒/\u0011h􏑦\u001bniQ𨹤/z\u0015BHL\u000f\u001e\u0002􌸙󱋈􆴮\u000c졳$𡧼\u001f\u0005\r\")榎􂯞\u0016𤽱󵔈ZTY^􎓡E󵌽\"ౕ\u001a.;;ꤍvw󿫥7𦝤\\\u0002]</\u0016ᩈ􍠍\u000f&󱜨)L󱷍/𦝑D􅻹uNR>󾹘Sk\u0011)\tx'b󳄑􌙿󹑢v1L'b\u001a𬶜.t%ꇜ􀇰\u00141𥽅}\u0019{{/0\n据A3󰝺f\u0008󷣦􋚸\u0005𪖗𡅪\u001e􋯁仺bC/𗾏𐤉_~䆡>􁨨췤l\r𗡻洊6Sl\u0019\u000f𪒦𥽙 IR57\u0004\u000b=H4h>%􊯽Z𦭿\u0018_󼼍\u000f􅩈Q8e𭙏\u001dn\u000c\u0008y󳾚𤟝RWn\u0007i\u001a\u0015󰜡\u001eVG{󾘝,Sw=󳵣QB1V\u0004eb𓉷+\u0018A鄖bR\u001bᮺ󿣥\u0015\u0000&󼉰w\u001e%\t𢹽`*󻚤e:􂪞Nbk\n]tYJ\u0006(n\u0011(2%ﻲa j`)\u0010􏓓􋨼𭸺c'􁾩k\u001d\u0010wsz㊠+󻧍7𭐐𩱿\u0014R\u0017􏪧n\u0010B=\u000fj{􆐎05㿱w\u0014X󸊧\u0001\u001f𧖢\u0016{d2c\u0014cn%qT𐳀N💢빻0􂷖P9N\u0017\u0000e9!🩣㕀2\r\u0007@U\u001c\u001d𘁝Z\u000b=(w┭\u0008\u0019.)Lp􋦥RJJ\u00142􉪈\u001d𪐀A\u0010\nZ\u001bx􌢻f1b鉧cn3>9}eተ󵤾\u000b\u0011]K[\u0012h􁇞C􈬖\tQ\"@hD<P_DK刬=~{𨟟e􍞺a-\u000c5𖹸D^𑦶𢬙󾩱\u0015\u0004𩦵𒔶\u0000\u0015F\u0008oh'8];3󼖇&𓉷u\u0000C􏬔\u0012ox'𦾏󻚔D𪻅\u0015puu\u001c$\u001a{\u0006K\u0003e\u0001󳃚\u001e7𨼪켕/󺤛\u0001\u001d晈 ~|V\u0008\u0015DMt󺼚􍲍𡞱\u0016O􋫁H󾩠'S􉪣𢎓􎟟y#.)/模P\"\u001fH\u0007=#鰋JV􎘛󴓟2FBEHi姛B\u0005~L𤯬\u0006W􌙏`%􉠳;\t􈖐&􉮜\u0002󽮘q\u0002T\u0005<3鮻z{\u001ae}\u0006􃿲;C\u0006\u0018𗪦ix\tL\u0010q\u0011t󿩒L{M+\u001f\u00076𬨼0.\u0011?4󻓄􈇩P󿷲\u0019qRP\r􃗭\u001dcI*덦[𥉃Ij\u0007<cv\u0012o󴽢J󹿨i$(`t{苈󲦶PN􁰨n[\u0007ej\u0008\u0019|6!􍛽𬙅N|xr𥸸󿱼􁢯^🃃􆕐\u0010􌷈CLX\u000f7M\rys2@\u0013􆱻𧋾:/󹨥mm\u0004\u0018c$/s𧏍]\u001e|\u001az􈾾􇽽\u0007󾔨물\u0017D\u000f`M%𤛳󹣛",
     "assets": [
         {
-            "size": "preview",
             "key": "*e􉼖⩣",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "H𥩹𫼧_^",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􌡾\u0010S\n𡣡Z􈭆\u0017z20󹉨0S䭮",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "Zi\u0002\u0016𩸻#/ힷ}\"\u001b󼞞",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Z𡬙\u0017]NL1t\u0012\u0019\tE\u0004󻓭",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𤜦%9󴱼󷺥",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "%y",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\\H\r8~4󳐰䒩V",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "`j乄",
+            "size": "preview",
             "type": "image"
         }
     ],
-    "phone_code": "lQ-HusGetqIpBMbG7sWjrEOE4v2-Ym0="
-}
\ No newline at end of file
+    "email": "@𥧧󽏧🛆􆢸",
+    "locale": "rm",
+    "managed_by": "wire",
+    "name": "!1\u00181𣌯=o/+􉤄(\u0013\u0013f\u0010ꃕ⁛𮫊󹉥;=\u0011\u000e}\u0019􃨃Vla\u0014𩕉{xx 1rYe􀥯K/",
+    "password": "\u0002嶔-\u000eyRe\u0017\u001b\u0010E𤫵/-\n\u0006\u0006z\u0008\\)󽘙:z𫁙􈐣W~\u0017햳yU@\u001e9!􌝚S&\u0011U\u00023f\u0007𬃣D-:8x Z\u000b𣢘y\u0007󲷵t𘨲0󹴩\u0018LvB𢨰􀭒`dq𖬥\u0008@Dh\u001e^𬝋!Zrdy&郧njK𨊤󾾈c>k\\󹈓a'{?􇨚8勤2󷮛\u0010{0倦<𢫧𒈂Jyp󻖟C]{{쒇EJ2qᎣm󲞣8\u001cj?\u001a\u000fq𡋃%󳗉\u0015c𛰡󼠉B#D􅩺d[)H%1V\u001d󼠦Ul􃑐􄳌i\u001b綝쾞}1\u000f􆖍e_\u0016󷙥􉵒/\u0011h􏑦\u001bniQ𨹤/z\u0015BHL\u000f\u001e\u0002􌸙󱋈􆴮\u000c졳$𡧼\u001f\u0005\r\")榎􂯞\u0016𤽱󵔈ZTY^􎓡E󵌽\"ౕ\u001a.;;ꤍvw󿫥7𦝤\\\u0002]</\u0016ᩈ􍠍\u000f&󱜨)L󱷍/𦝑D􅻹uNR>󾹘Sk\u0011)\tx'b󳄑􌙿󹑢v1L'b\u001a𬶜.t%ꇜ􀇰\u00141𥽅}\u0019{{/0\n据A3󰝺f\u0008󷣦􋚸\u0005𪖗𡅪\u001e􋯁仺bC/𗾏𐤉_~䆡>􁨨췤l\r𗡻洊6Sl\u0019\u000f𪒦𥽙 IR57\u0004\u000b=H4h>%􊯽Z𦭿\u0018_󼼍\u000f􅩈Q8e𭙏\u001dn\u000c\u0008y󳾚𤟝RWn\u0007i\u001a\u0015󰜡\u001eVG{󾘝,Sw=󳵣QB1V\u0004eb𓉷+\u0018A鄖bR\u001bᮺ󿣥\u0015\u0000&󼉰w\u001e%\t𢹽`*󻚤e:􂪞Nbk\n]tYJ\u0006(n\u0011(2%ﻲa j`)\u0010􏓓􋨼𭸺c'􁾩k\u001d\u0010wsz㊠+󻧍7𭐐𩱿\u0014R\u0017􏪧n\u0010B=\u000fj{􆐎05㿱w\u0014X󸊧\u0001\u001f𧖢\u0016{d2c\u0014cn%qT𐳀N💢빻0􂷖P9N\u0017\u0000e9!🩣㕀2\r\u0007@U\u001c\u001d𘁝Z\u000b=(w┭\u0008\u0019.)Lp􋦥RJJ\u00142􉪈\u001d𪐀A\u0010\nZ\u001bx􌢻f1b鉧cn3>9}eተ󵤾\u000b\u0011]K[\u0012h􁇞C􈬖\tQ\"@hD<P_DK刬=~{𨟟e􍞺a-\u000c5𖹸D^𑦶𢬙󾩱\u0015\u0004𩦵𒔶\u0000\u0015F\u0008oh'8];3󼖇&𓉷u\u0000C􏬔\u0012ox'𦾏󻚔D𪻅\u0015puu\u001c$\u001a{\u0006K\u0003e\u0001󳃚\u001e7𨼪켕/󺤛\u0001\u001d晈 ~|V\u0008\u0015DMt󺼚􍲍𡞱\u0016O􋫁H󾩠'S􉪣𢎓􎟟y#.)/模P\"\u001fH\u0007=#鰋JV􎘛󴓟2FBEHi姛B\u0005~L𤯬\u0006W􌙏`%􉠳;\t􈖐&􉮜\u0002󽮘q\u0002T\u0005<3鮻z{\u001ae}\u0006􃿲;C\u0006\u0018𗪦ix\tL\u0010q\u0011t󿩒L{M+\u001f\u00076𬨼0.\u0011?4󻓄􈇩P󿷲\u0019qRP\r􃗭\u001dcI*덦[𥉃Ij\u0007<cv\u0012o󴽢J󹿨i$(`t{苈󲦶PN􁰨n[\u0007ej\u0008\u0019|6!􍛽𬙅N|xr𥸸󿱼􁢯^🃃􆕐\u0010􌷈CLX\u000f7M\rys2@\u0013􆱻𧋾:/󹨥mm\u0004\u0018c$/s𧏍]\u001e|\u001az􈾾􇽽\u0007󾔨물\u0017D\u000f`M%𤛳󹣛",
+    "phone": "+5329622943",
+    "phone_code": "lQ-HusGetqIpBMbG7sWjrEOE4v2-Ym0=",
+    "picture": [],
+    "team_code": "mYNFyKFVL1hf66I1Exr3P8kiIA=="
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_19.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_19.json
index 331761a56b2..c2a0e8fe513 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_19.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_19.json
@@ -1,13 +1,9 @@
 {
-    "locale": "pt-SV",
-    "managed_by": "wire",
     "accent_id": -5205,
-    "name": "粔!\u000b🙎EZm<1\t􂠐𩆒\u000fdL􏂼􈈓=\n𭫛􀈇\u000eQ-𨀜98h󰠆𧉸8}T\u0010􀅳z'\"𢄻􇟎\u0006\u0007􎒷O𭕿󹠳\u0017󱤎任𩇗\rjr𪟇\u0002􎮽F)|An+vO=+]\u0011\u001f`󳊚)8𬘆 \n\u00195D􃧔\u001e󱑼􂘊N}⇭ha/􎞺1?*k?4\u0011k\u001b_𬾯h􄫅7'􅬐\u00131\u00054\u001e\u001boYL󵚿A󸯮@O",
-    "password": "J𮛞읬c􏢦2x\u0004\u0001\r-'􃭯㪤T=F𧪮􅟆\u000b\u0013姌\u0002g𨚜<䞸m\u001ep䬕L󺅢𠗧J㚛􋊉#p㠓\u000c􎖕\t\u0014Qd􋼷QuZHVz|x󶦇󲜱$!8ueATݚF+\u0002v􀁫Gl\u001d\u0018𗹬)W\u0016𩦊􍍮𦐲{\u0013qO9R{􇳫󷫺𭖡!󷪵\u0000t1$𤑴G\u000bD^gJ*\u0019$\u0016E|]3褕\n{P3:㉲鹻}𨍮\u0006\u001dt,􊪨,𩷺@{C􀽿󶹗=􅵽H􉈑({Zo?#\u0017􏽿T=\u0007\t撾􃖛􉴼<0=]|􌵦􂇚!󺩛!&􃲞\n𧜩圜C\u0004M:-\u0017u𘐧t,󽌰C=E\u0000N6\u000b\u000c\u0010G怙\u0010B렽𤿾腃<\u000c󺖦[r\u0011\r￣𭈧󼹉.}A\u001f𒌈\u0008)+%0𦌣O􋴍3XB3i\u000b!\"􋓌𦀸𦫬\u001dP|\u0018%\u0004Ze𣗈R50nB\u001al/=+9\u001fG3⣺\u001bs\rj]Q+/p􄄫#􎒒\u0012孖󹶚3U~\te\u0004\u0014_v%b*P&7AJ[󱺉uGH.\u001f󹶩󿤪:\u001d󿅎 􏒭\u0007\u000f/\u0011\u000f􁒳􅫍&3#\u0001\u0016M󲹍X􄌡ℕ箁􀓱􂒓-\u0012*;z􂠈\u000c鴠ｊ\u0015;􄤨\u001e\u0006VU/b\u000fW𪇝rS𧱢Z󹍷K4#7􅫤\u0001$1J𮨴8􏏴>Y􎈯\u001c\u0011\u0003sY@\u0019OAc\u0019)k\u0011\u0008r9~q\u0006R~􆛃m=󷭉$𐡵P#s\u0010lH\u0004K\u0015*\u001f}z䓠拫\u001e𭎠W`U\u0012@ワv.e7\\\u0002UQ\u0015󿣴\u000b^C%&[9p\u000c_\u001bg49)\u0003㘧r\u001b𫼋8󾦬V\u000bX\u0008qh􆀾\u0011|\u0018􀞾{0榪-\u0012y\u0010tH&P󷿰x\n\"G\u0007\u0004m𨍓鏠󿨨;#G\t^sSr𧹒c",
     "assets": [
         {
-            "size": "complete",
             "key": "#rp*?\u000e\u0019/f^",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -15,11 +11,15 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "r;J",
+            "size": "preview",
             "type": "image"
         }
     ],
     "email_code": "SY1yub-qH1N37ltqE8QIz4pb",
+    "locale": "pt-SV",
+    "managed_by": "wire",
+    "name": "粔!\u000b🙎EZm<1\t􂠐𩆒\u000fdL􏂼􈈓=\n𭫛􀈇\u000eQ-𨀜98h󰠆𧉸8}T\u0010􀅳z'\"𢄻􇟎\u0006\u0007􎒷O𭕿󹠳\u0017󱤎任𩇗\rjr𪟇\u0002􎮽F)|An+vO=+]\u0011\u001f`󳊚)8𬘆 \n\u00195D􃧔\u001e󱑼􂘊N}⇭ha/􎞺1?*k?4\u0011k\u001b_𬾯h􄫅7'􅬐\u00131\u00054\u001e\u001boYL󵚿A󸯮@O",
+    "password": "J𮛞읬c􏢦2x\u0004\u0001\r-'􃭯㪤T=F𧪮􅟆\u000b\u0013姌\u0002g𨚜<䞸m\u001ep䬕L󺅢𠗧J㚛􋊉#p㠓\u000c􎖕\t\u0014Qd􋼷QuZHVz|x󶦇󲜱$!8ueATݚF+\u0002v􀁫Gl\u001d\u0018𗹬)W\u0016𩦊􍍮𦐲{\u0013qO9R{􇳫󷫺𭖡!󷪵\u0000t1$𤑴G\u000bD^gJ*\u0019$\u0016E|]3褕\n{P3:㉲鹻}𨍮\u0006\u001dt,􊪨,𩷺@{C􀽿󶹗=􅵽H􉈑({Zo?#\u0017􏽿T=\u0007\t撾􃖛􉴼<0=]|􌵦􂇚!󺩛!&􃲞\n𧜩圜C\u0004M:-\u0017u𘐧t,󽌰C=E\u0000N6\u000b\u000c\u0010G怙\u0010B렽𤿾腃<\u000c󺖦[r\u0011\r￣𭈧󼹉.}A\u001f𒌈\u0008)+%0𦌣O􋴍3XB3i\u000b!\"􋓌𦀸𦫬\u001dP|\u0018%\u0004Ze𣗈R50nB\u001al/=+9\u001fG3⣺\u001bs\rj]Q+/p􄄫#􎒒\u0012孖󹶚3U~\te\u0004\u0014_v%b*P&7AJ[󱺉uGH.\u001f󹶩󿤪:\u001d󿅎 􏒭\u0007\u000f/\u0011\u000f􁒳􅫍&3#\u0001\u0016M󲹍X􄌡ℕ箁􀓱􂒓-\u0012*;z􂠈\u000c鴠ｊ\u0015;􄤨\u001e\u0006VU/b\u000fW𪇝rS𧱢Z󹍷K4#7􅫤\u0001$1J𮨴8􏏴>Y􎈯\u001c\u0011\u0003sY@\u0019OAc\u0019)k\u0011\u0008r9~q\u0006R~􆛃m=󷭉$𐡵P#s\u0010lH\u0004K\u0015*\u001f}z䓠拫\u001e𭎠W`U\u0012@ワv.e7\\\u0002UQ\u0015󿣴\u000b^C%&[9p\u000c_\u001bg49)\u0003㘧r\u001b𫼋8󾦬V\u000bX\u0008qh􆀾\u0011|\u0018􀞾{0榪-\u0012y\u0010tH&P󷿰x\n\"G\u0007\u0004m𨍓鏠󿨨;#G\t^sSr𧹒c",
     "phone_code": "ZdxnNFLHOnpzlZ3zpURGlFYKDDX3bA=="
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_2.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_2.json
index b225622f4a5..dcd93abb676 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_2.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_2.json
@@ -1,18 +1,14 @@
 {
-    "locale": "pl",
     "accent_id": 83826,
-    "name": "ﱷ􇅥TL󱕶M9𢀝+\u000eꄄ󱁤P\u0012𮝸惡o𞄃󻉘0\u001d\u0015󸸴d\u001e𭩥'&\u000fc𝁝\u00005􄐳sRi&_lྔj#𥈌M\u0010j`󵧸Y􌼿<\u0006󱜥2/\r\u001cbE鯕|n\u0017󰌩.Q\u0016\u001e,𢷚S𨧺𣳤3𦢜󻕕츤yg-h,",
-    "password": "2\r+7k;B\r$=󶸡^j);._bux绨.硖ohh\\m⦗#􆙚\u001bQ\u000f\u0000(\u000b\u0004g\n=𭃾>.`\u0005u2_\u001e\t\u000c1%a\u0018\u0011𧔞(z𢋰\u0005+e!sｸ􆈨\u0015)\u0016?V5<jB\u0012𣎻Pc;ᷢ􄈸jf[8󺥶􋩫\u0017𓄤\u001e\u001e󳁻󼼱\u001c졛y\u000cr𩫲&_\u001fg\tF\u001dm\u0000')8􍑵\u0003\tf6&𥽊\u000bT)\u001e쐞M!\u001e\u0002?\u0000P<n*􂻄\u001b\"m\u00063\u0000Ke\u0017|YZ\u0007𫖥􌺣󴘗\u0004<e\u001d\u00177W\u001bE麽H%\rLt\u0006𐠀쪒󽊺󾄉􌡜\u0010󲷸\u000cc\u000eVNE\u000cQ9\u001e^>󶋖󲉖e\u001d\u0004aZ줦#􊃥W5ej\u0019\u0015'()‧9=%i&K=\u0016\u0004+\u0018\u0013ti\u000e\u0018(G􉀸E;𬣩\u0007􈋿fw嗘\u001c4vM`B\u0005!,吉g=s\u001e`<Q;\u0015_Z\u0006n`燝b啡\u001d𥿎<𭢢d\n<vW?\u001buUB:a8􄥳𣘴\u001cb🕝y#\u0019P9R󾋨k\t-n\u0006#1%A`BI`\u0006󴴄`󾿘M󼰉𠐪𢶌Z$\u001e󵰉Xq􉝧d󻼺zcH0\u0001𣇜󳥪L\u0012G)\u0000I/Z𮀸d\u0007Xa=:􀢀\u00127\u0018s𭖀ˊ\u0004􏀌O􆒷=4]\u00158𨫝y3V𬓎W􃚣;V Z􋵺c𥝛PA.\u000en>6󼑤\u0004qJ𧲁\"^W\u0013𝆂𡨆7.\\惂y5\u00100\t㲷fXk+󾅔0JFKHU1_􌨉荍3\u0000[mjLZ󹽑wꢩ󳵴O\u0010\u0015󱤿󱯖w87\\ms\tv\u000c𬏦\u0010􇸧]\u001dY\u0014.^\u0018cXz3􉯴wFP󳆝\u0014DED󵆖~s\u0004\u001f\r\u0011T?%]f􂬗R󳕮\u0004\u0014Nt?&wk\"􆻜V􈁲R_lO󵥪\u0015|\u0015O,\u0014󲍤0󽣍{󽧗󼉗󶘖􌮣\u0018\u0008\u0018\u0001𠰭\u000eF\u001f=𩠦𢂨zWGwm\u00101𭬝z%\u0017𠐘&\u0010􁖑𣷥𑪏\u0017\u000bl\u000530L<U\u0007j핇\u0011E㺎1\u000f􉧯07Z\u0004􆗟 櫛;\u0007𦜫􃓐󸿕UN.[C󰭏V󴤢􁪩𪢜n󺮐\u0015|>8u.6󺺃􃋚𠖣\u0014P쥸\nUr;@\u0004@􊚆󷗍q DB􎪙7􏻽󳋮)T\u0006+𘓨\u001e?守 x\u00152\u001bo}\t*0􋖱\u0017[\u0008>\u0019h\u0001!\u0018 {H'\u001a􈨓1Bj0L\u000bDf𭻡\u0016T\u001c𥵛+/B􁏎멲|vE-🟧d`JN5}*n+a@sw覩Ll𡇖*B\u0017!'􉯓R\u0002RHv=xl𪰽)▀󶘽=J\ru\u0014ej1\t&ᗃ;\u0002eFIc|:􇷚T􂛉Qr𠹤u",
-    "invitation_code": "diTpWbMfSg==",
     "assets": [
         {
-            "size": "preview",
             "key": "􀻍m",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "9\u001bu",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -20,18 +16,18 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "a",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": ")6z􏟊",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󸣓\u0011l砎f9\u0002]a",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -39,27 +35,31 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0015荤|󽬄𢍸.􉕪󹋀\u0019\u000ea",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𬢛囹𨜴+*",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u001e\r\u0019RL?𑣪꺈𢪥\u0012\u0017",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󰫻\u0006ois\u0005.𧢦,\u0012𫅎wQ8ˣ",
+            "size": "preview",
             "type": "image"
         }
     ],
     "email_code": "",
-    "phone_code": "f8P9kJNmXRDbYKMdk-M4-uszmYmBIHZ4hLmc",
-    "label": "\u0010w𨢍 4\nṝ6\u0014>0.\u001b\u001bR\u0015"
-}
\ No newline at end of file
+    "invitation_code": "diTpWbMfSg==",
+    "label": "\u0010w𨢍 4\nṝ6\u0014>0.\u001b\u001bR\u0015",
+    "locale": "pl",
+    "name": "ﱷ􇅥TL󱕶M9𢀝+\u000eꄄ󱁤P\u0012𮝸惡o𞄃󻉘0\u001d\u0015󸸴d\u001e𭩥'&\u000fc𝁝\u00005􄐳sRi&_lྔj#𥈌M\u0010j`󵧸Y􌼿<\u0006󱜥2/\r\u001cbE鯕|n\u0017󰌩.Q\u0016\u001e,𢷚S𨧺𣳤3𦢜󻕕츤yg-h,",
+    "password": "2\r+7k;B\r$=󶸡^j);._bux绨.硖ohh\\m⦗#􆙚\u001bQ\u000f\u0000(\u000b\u0004g\n=𭃾>.`\u0005u2_\u001e\t\u000c1%a\u0018\u0011𧔞(z𢋰\u0005+e!sｸ􆈨\u0015)\u0016?V5<jB\u0012𣎻Pc;ᷢ􄈸jf[8󺥶􋩫\u0017𓄤\u001e\u001e󳁻󼼱\u001c졛y\u000cr𩫲&_\u001fg\tF\u001dm\u0000')8􍑵\u0003\tf6&𥽊\u000bT)\u001e쐞M!\u001e\u0002?\u0000P<n*􂻄\u001b\"m\u00063\u0000Ke\u0017|YZ\u0007𫖥􌺣󴘗\u0004<e\u001d\u00177W\u001bE麽H%\rLt\u0006𐠀쪒󽊺󾄉􌡜\u0010󲷸\u000cc\u000eVNE\u000cQ9\u001e^>󶋖󲉖e\u001d\u0004aZ줦#􊃥W5ej\u0019\u0015'()‧9=%i&K=\u0016\u0004+\u0018\u0013ti\u000e\u0018(G􉀸E;𬣩\u0007􈋿fw嗘\u001c4vM`B\u0005!,吉g=s\u001e`<Q;\u0015_Z\u0006n`燝b啡\u001d𥿎<𭢢d\n<vW?\u001buUB:a8􄥳𣘴\u001cb🕝y#\u0019P9R󾋨k\t-n\u0006#1%A`BI`\u0006󴴄`󾿘M󼰉𠐪𢶌Z$\u001e󵰉Xq􉝧d󻼺zcH0\u0001𣇜󳥪L\u0012G)\u0000I/Z𮀸d\u0007Xa=:􀢀\u00127\u0018s𭖀ˊ\u0004􏀌O􆒷=4]\u00158𨫝y3V𬓎W􃚣;V Z􋵺c𥝛PA.\u000en>6󼑤\u0004qJ𧲁\"^W\u0013𝆂𡨆7.\\惂y5\u00100\t㲷fXk+󾅔0JFKHU1_􌨉荍3\u0000[mjLZ󹽑wꢩ󳵴O\u0010\u0015󱤿󱯖w87\\ms\tv\u000c𬏦\u0010􇸧]\u001dY\u0014.^\u0018cXz3􉯴wFP󳆝\u0014DED󵆖~s\u0004\u001f\r\u0011T?%]f􂬗R󳕮\u0004\u0014Nt?&wk\"􆻜V􈁲R_lO󵥪\u0015|\u0015O,\u0014󲍤0󽣍{󽧗󼉗󶘖􌮣\u0018\u0008\u0018\u0001𠰭\u000eF\u001f=𩠦𢂨zWGwm\u00101𭬝z%\u0017𠐘&\u0010􁖑𣷥𑪏\u0017\u000bl\u000530L<U\u0007j핇\u0011E㺎1\u000f􉧯07Z\u0004􆗟 櫛;\u0007𦜫􃓐󸿕UN.[C󰭏V󴤢􁪩𪢜n󺮐\u0015|>8u.6󺺃􃋚𠖣\u0014P쥸\nUr;@\u0004@􊚆󷗍q DB􎪙7􏻽󳋮)T\u0006+𘓨\u001e?守 x\u00152\u001bo}\t*0􋖱\u0017[\u0008>\u0019h\u0001!\u0018 {H'\u001a􈨓1Bj0L\u000bDf𭻡\u0016T\u001c𥵛+/B􁏎멲|vE-🟧d`JN5}*n+a@sw覩Ll𡇖*B\u0017!'􉯓R\u0002RHv=xl𪰽)▀󶘽=J\ru\u0014ej1\t&ᗃ;\u0002eFIc|:􇷚T􂛉Qr𠹤u",
+    "phone_code": "f8P9kJNmXRDbYKMdk-M4-uszmYmBIHZ4hLmc"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_20.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_20.json
index 0d23c7736e0..afc9fa11247 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_20.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_20.json
@@ -1,15 +1,9 @@
 {
-    "team_code": "B7ams5fFLxcw1iSuEZIpbQ==",
-    "locale": "pl",
-    "managed_by": "wire",
     "accent_id": -14182,
-    "picture": [],
-    "name": ")Q>\t\u0004􀲻O&G`)wJ􂑑󼄟󺅞𨐦~\u0002V.􎎑e+d\u001b𐃢󽁉󹫧g[~𠦱9𠗫QxR\u0017HMtNg\u0015𠨴H𮥄_x󺚍ⴔvx3\u0006}\u001bNo9Pd\u001cV>",
-    "password": "$LQ\u001e@󻗇Q𘪕y5𠚒T\u000b󿯉mMd􆌍6@0T뉊}S𞸲>󰣚󾱏\u0007C𠈢\u0010=m:$^g󳁻N\u0013Q\u0003\u0013>]hmg(謧Ae\u0003𘃴@-m\"@\u000b\u0002훵yY􂾺]\u000cby1괥O􉃨ZO⼄󸹨:\"&廊􄁕\u001a𡿐a󾦪qE\u0011W됽gBʰ5MTꉚI𪟗􎍬;\u0007&2𗈒`;Uy𠑯𝜁3\nࠅ󰇭\u0016\u0012Ʌ𑖞k*\u0001v󻿘\u0019\u0005\u0012􄀧\u0013]+鴰'𛉣􇳷,",
     "assets": [
         {
-            "size": "preview",
             "key": "06m\u0000𩼄",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -17,48 +11,48 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "92",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "9􀣢\"B\t1󴂷|",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "B ",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u001ag",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "[\u001e􎯪n/",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "嗿",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􄦨3",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "!Ἓ|R!81",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\"U))K𡽢\u0014`P",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -66,36 +60,42 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "M\u0012,\u0017\t篜",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "&𘞣%e5",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "Fu􋕾X\u0006󱯴8wq",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "L",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "FyZs9暑2\u0005",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "B\u001fZ󰚌o\u000c\u001e-􋽳",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "u7kZwe4BWVUT4ofDJg==",
-    "label": "\u0012눎I'\u0015\u0012,\t|"
-}
\ No newline at end of file
+    "label": "\u0012눎I'\u0015\u0012,\t|",
+    "locale": "pl",
+    "managed_by": "wire",
+    "name": ")Q>\t\u0004􀲻O&G`)wJ􂑑󼄟󺅞𨐦~\u0002V.􎎑e+d\u001b𐃢󽁉󹫧g[~𠦱9𠗫QxR\u0017HMtNg\u0015𠨴H𮥄_x󺚍ⴔvx3\u0006}\u001bNo9Pd\u001cV>",
+    "password": "$LQ\u001e@󻗇Q𘪕y5𠚒T\u000b󿯉mMd􆌍6@0T뉊}S𞸲>󰣚󾱏\u0007C𠈢\u0010=m:$^g󳁻N\u0013Q\u0003\u0013>]hmg(謧Ae\u0003𘃴@-m\"@\u000b\u0002훵yY􂾺]\u000cby1괥O􉃨ZO⼄󸹨:\"&廊􄁕\u001a𡿐a󾦪qE\u0011W됽gBʰ5MTꉚI𪟗􎍬;\u0007&2𗈒`;Uy𠑯𝜁3\nࠅ󰇭\u0016\u0012Ʌ𑖞k*\u0001v󻿘\u0019\u0005\u0012􄀧\u0013]+鴰'𛉣􇳷,",
+    "picture": [],
+    "team_code": "B7ams5fFLxcw1iSuEZIpbQ=="
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_3.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_3.json
index 25af19b3871..404946de1d1 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_3.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_3.json
@@ -1,11 +1,5 @@
 {
-    "expires_in": 13846,
-    "locale": "kn",
-    "managed_by": "wire",
     "accent_id": 26132,
-    "picture": [],
-    "name": "&W\u001aQ𪕧A3N\u00164Y(Z,\u000b\u0010\u000bpv􉀕h\u0016𭛂^`P:\u0015r\u000c_𡟿,􉈈&󾔪󽚸憿8\u0015ixb\u000fhE􄱫\u0004󹀄ᎌt=𤟠󲈡\\푥iX\u000b\u0017𤥓\n膀`acU'鎯\u0007\u001d􃋿\u001d󼜝4fGC-",
-    "password": "\u000f􂤾\u00122\u0019x𧐵[Bo_I+𭂢(\ti􂋠l\u0008𡎅𭯢𧟴y󶗓\u000e\u00162/^\nN\u0017jꓖ ﾸ+I󱎓󴾀펌E)+𤬙􋘗\u0004C衾􎩟ᦘ󿿔E%O𦂃+e\thZ􏰴\u0011􌎇\u0001p@얥𤌊\u0007[\u00028F󳧕 45𦺩\n\u001a^*1h𝢕󰵭g𗤣d\u000b=𭁗UM\u001bi𮭗\u001d\u0010󺑸\u000bb0vV\u0017󾋗7􏜜8W<𣘏瓪􊁅d\u0017󿮿󹳜\rh􇏬qr[𦝫+\\)a7L:\u0016\u0000D@@Y$\u001fn􄮛\u0005\u00015\u001b3󹼯uC-t>\u0014\u0002䜯􆾄2]\u0007󹯴専VK^Pd𨯐Vp𫨮zW􄵌(󾪴9`x𫾐󰕯\u0011󶤂<=LP\u000c󸪋e\u000cz=3<𥥯e𘔭5.A▿oL\u0012]􌹸􎝕\u0008{cDQ𐳰굏G󽰇qf𒂥_f󰳪D\"\u0012u\u001a\u0005􀅹++Es􆔀\u001e<󹨜?[j\u0017\\󷅛\u000f^}5𫤀𢊿k\u0000\\X\u0019􁛃qG\u0006+\u000e\u0003\u0012U狾!:\t._󶲩ېﲗS.!\u001al_󿢏\u001a󹥾5M𡼄𮁛v^\t\u0008`P-蕕𬜱𢠟𨥩𠄖𨗵􄂴(Zo\n󾞿𩂸b뱲\u0018\u001aS􉶒O=U􁯄Y]󴞰󹟛.N\u001fg!\u0014L$VbD􆜪\u0000p旰\re\u000c䎕Sz[㢵>\u0016\u001b\u0001g\u0012𫝝L.\u0004Uz󴔟\r\u0019\u000e🄇X􇎤8{|\u000fU\u0016$Q!9\n\u001f󹲱桗\u0006'_w]\u001bQ|:\u000b\u001a3H󼟱M:d\u0000󼲝OkD\u0014󵌄4\u001c𛋅󱡐屬p_𗄗M",
     "assets": [
         {
             "key": "\u000c\r",
@@ -20,35 +14,41 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "j\u0019\u001a𐢝𦴬󲅬a8ࡐ\u00144V𝧨y󷰭",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "6􄖫\u0008󺕠4\u0010",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "`1j'C3'}\u0012",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "e",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "*B",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𦳢C𢭴䕜!X􌧴\u00014\u000f+󻉢",
+            "size": "complete",
             "type": "image"
         }
     ],
-    "phone_code": "6xSzqRncYoN4AWAUeSKRw5ZKPWz8PBSQkOx-"
-}
\ No newline at end of file
+    "expires_in": 13846,
+    "locale": "kn",
+    "managed_by": "wire",
+    "name": "&W\u001aQ𪕧A3N\u00164Y(Z,\u000b\u0010\u000bpv􉀕h\u0016𭛂^`P:\u0015r\u000c_𡟿,􉈈&󾔪󽚸憿8\u0015ixb\u000fhE􄱫\u0004󹀄ᎌt=𤟠󲈡\\푥iX\u000b\u0017𤥓\n膀`acU'鎯\u0007\u001d􃋿\u001d󼜝4fGC-",
+    "password": "\u000f􂤾\u00122\u0019x𧐵[Bo_I+𭂢(\ti􂋠l\u0008𡎅𭯢𧟴y󶗓\u000e\u00162/^\nN\u0017jꓖ ﾸ+I󱎓󴾀펌E)+𤬙􋘗\u0004C衾􎩟ᦘ󿿔E%O𦂃+e\thZ􏰴\u0011􌎇\u0001p@얥𤌊\u0007[\u00028F󳧕 45𦺩\n\u001a^*1h𝢕󰵭g𗤣d\u000b=𭁗UM\u001bi𮭗\u001d\u0010󺑸\u000bb0vV\u0017󾋗7􏜜8W<𣘏瓪􊁅d\u0017󿮿󹳜\rh􇏬qr[𦝫+\\)a7L:\u0016\u0000D@@Y$\u001fn􄮛\u0005\u00015\u001b3󹼯uC-t>\u0014\u0002䜯􆾄2]\u0007󹯴専VK^Pd𨯐Vp𫨮zW􄵌(󾪴9`x𫾐󰕯\u0011󶤂<=LP\u000c󸪋e\u000cz=3<𥥯e𘔭5.A▿oL\u0012]􌹸􎝕\u0008{cDQ𐳰굏G󽰇qf𒂥_f󰳪D\"\u0012u\u001a\u0005􀅹++Es􆔀\u001e<󹨜?[j\u0017\\󷅛\u000f^}5𫤀𢊿k\u0000\\X\u0019􁛃qG\u0006+\u000e\u0003\u0012U狾!:\t._󶲩ېﲗS.!\u001al_󿢏\u001a󹥾5M𡼄𮁛v^\t\u0008`P-蕕𬜱𢠟𨥩𠄖𨗵􄂴(Zo\n󾞿𩂸b뱲\u0018\u001aS􉶒O=U􁯄Y]󴞰󹟛.N\u001fg!\u0014L$VbD􆜪\u0000p旰\re\u000c䎕Sz[㢵>\u0016\u001b\u0001g\u0012𫝝L.\u0004Uz󴔟\r\u0019\u000e🄇X􇎤8{|\u000fU\u0016$Q!9\n\u001f󹲱桗\u0006'_w]\u001bQ|:\u000b\u001a3H󼟱M:d\u0000󼲝OkD\u0014󵌄4\u001c𛋅󱡐屬p_𗄗M",
+    "phone_code": "6xSzqRncYoN4AWAUeSKRw5ZKPWz8PBSQkOx-",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_4.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_4.json
index 45f18103284..cb07c67607b 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_4.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_4.json
@@ -1,28 +1,18 @@
 {
-    "email": "󾏙橭5h4@I㎛\u001e\u0005L\u001d^i\u001c\u0013{",
-    "phone": "+900959711",
-    "name": "\tP\u0002\u000fꃦ\u000b\\\u0016?`U\u0018t<7[i󻚇\u0012\"𠩲L\u001b+Z<_㈙M󴤩𤎺5Y陡󿋃`/0􇪘.\u0017],N?U_𢁛\r&􅞃j폚\u0003羜U!3vXgT𓀐𠋒\u0012@?龘󵮓麊\u0011\u0000𠽟㚢G\u0019jM~\r\u0017]S\n8\u001fkmi",
-    "password": "\u0004\u0014𬊽2􍚻􇟢C3\u000eB\u001am0󱟠?[9kX鯊󷑥\u0019𠳴gDmi4n􆋸VH󷝠\u0019l\u0006\u0000𪫕\u0007𮞏ट%\u0015+5A/Hꨮ!2\u001f\"V􋱮瀽󷾨𭘛Yet󹐼=Q\u0015$o=Pg𑈁􀓐𤵗𧸐#\u0000;󺨿\\󿎙R䯇󴉎-󾔐`;0󴶂驊T󿓦􌵨󺆠𥪀𡱺0\u0019EM󰾌I\u0003첐9O\u0003􇿶? s&󺸁獉#6ﮝS\u0000j)Lp𛁎􆘽Ba$\u0014H5􇲏e>[󵓡\u0002𝘾__􍜓O󷥃Mi+NQ\r\u0006o@𩱺岫pX􁿧`\u001co󹶾Wbu\u0003W61𮟦`\u000f$􉠱q𫥕9",
-    "team": {
-        "icon": "󴍲<y󺓍M􏇮+0t\u001d\u00037)\u001e1j󷧸󿙀I嶈\u001e卛\u00122󿫽\u0015k\u001a?Uᚰ󷤗/aa8\u0013檨ODP\u0006𧵡I􌆝􈮥F󴡮y𐪜󷎈)\u0001\\􅐬0?Rg;'}",
-        "name": "T󾨣y+f󱭄Td>#N7P\u0012\tU:T#􊡏Ib\r􏺀\u001b7e󼎌􌪵\u000bTr\n寎7>Kp𘜺H#&\u0011-A+𝋪MD𒂉gbmyh\u001bzHtUH𫋝\u000bO\u0001茶\u0013b(l\u000fA\u0005UW9s\u0003㰚𢌊𣔡󹓡1󳆂䥒􁳺\u0017\u00110ᅖ\u001f𬴓f󴡃Y𠟯\u0006𗨫z7\u0004􋪻DY􉈟􍚡PT0\u0000󼩼\u0018𨍎a􋗌\u000ec\u0006%U󾵮Q0{4󶬀!\u0003\u001ahTV󸿊\ti𪞓4NX󴉍\u0006\\3􏈕q󼨯📑􏼖22^I\u001d*𗙐WK\u00071𗸾i6\u0010!𣴪\u0015hHfⵦ\u0007󲳕G\u0016⯨󸗌􆎀bXw􍾡󴆴\u001b]r{􂠂u􈄒󸾼󹈾G^^&𫛮\u0011l󲐦󵢁D?*\nz𭞬^𤡨󿮛𘌟[S󺎭󰷡𩖰t&\u001dxd$\u0005􄊀\u00080ꖻA􉵣󶡜s\u001b󵊡\u000b$𮪳4󶀳\u00182@\u0017\u001f8|",
-        "currency": "PAB",
-        "icon_key": "\u001e붧[\u0000;\u00066Ti7\u00144𡵐t\u0016'𣞂#{믏F\rx3me𖧑2\u0001?\u001a\t󰍏HM􁏶aX3M\t\u0008ᗽY􀈝a󼒩\u0011P𠯠Iፂ,\u000e\u0010\u0018\u0001\u0007ya􀻩u󹚘\u0002똙\u0014T󽤋\u0011j􆇾#Vi𗭐𗈍[\u0017O\u000f<跄Z\u000c@\n7I󲨀4x󴹪󾬭p$[d2Mn&\"㵹[=󾵳􉄪\u0011\n\r\u0000!\u001c𬕔0\u001a\u0013K\u0008:1\u000e~X􅀨􀧟=;􀢅\u0006=\u0004𗝉6\u0010\u001d􏘭H>]𢡆󽼽v7􈗵󰴳󺳟.􀂌,A\u0008\u0012C-\u000bX𭄯9\u0010\u0000?\rK􍂶\u001bg_m\u001e\u000c\u001b\u0003<>d 2𩯮h.,\\㯨b􈔌\u000f'.j&巨'`\u001b\u0004NA\u0008"
-    },
     "assets": [
         {
-            "size": "complete",
             "key": "󻥂m􄼋𣴄I尧<\u0012Ww󳔒I\u0006U0",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u000bMBX6[\u0005`o𫲒yW)\t\u0010\u0005",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "k\u0005M.\u0001^\u0011\u0000",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -30,28 +20,28 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󰮪*s)\u0016`",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󾯎󳩁󲖰3\u0005 \u001fo,󿖪;􊊱SF5𝕀",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𠤵􌢛",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "/\u001e􀎥貐Q]ppr",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "'u\u0013:𣊌\u001c\u0002󿆘o.椉􎵓v􍌋\u001c{\r\u0005",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -59,8 +49,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0011",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -72,11 +62,21 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "h笓&;b\u001du]\u0019t\u000c9𪼕.ⓕ n%",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "email": "󾏙橭5h4@I㎛\u001e\u0005L\u001d^i\u001c\u0013{",
+    "label": "\u0000􉴵vK\u0016󽵋壋",
+    "name": "\tP\u0002\u000fꃦ\u000b\\\u0016?`U\u0018t<7[i󻚇\u0012\"𠩲L\u001b+Z<_㈙M󴤩𤎺5Y陡󿋃`/0􇪘.\u0017],N?U_𢁛\r&􅞃j폚\u0003羜U!3vXgT𓀐𠋒\u0012@?龘󵮓麊\u0011\u0000𠽟㚢G\u0019jM~\r\u0017]S\n8\u001fkmi",
+    "password": "\u0004\u0014𬊽2􍚻􇟢C3\u000eB\u001am0󱟠?[9kX鯊󷑥\u0019𠳴gDmi4n􆋸VH󷝠\u0019l\u0006\u0000𪫕\u0007𮞏ट%\u0015+5A/Hꨮ!2\u001f\"V􋱮瀽󷾨𭘛Yet󹐼=Q\u0015$o=Pg𑈁􀓐𤵗𧸐#\u0000;󺨿\\󿎙R䯇󴉎-󾔐`;0󴶂驊T󿓦􌵨󺆠𥪀𡱺0\u0019EM󰾌I\u0003첐9O\u0003􇿶? s&󺸁獉#6ﮝS\u0000j)Lp𛁎􆘽Ba$\u0014H5􇲏e>[󵓡\u0002𝘾__􍜓O󷥃Mi+NQ\r\u0006o@𩱺岫pX􁿧`\u001co󹶾Wbu\u0003W61𮟦`\u000f$􉠱q𫥕9",
+    "phone": "+900959711",
     "phone_code": "2HSeS4jKke89LUPF1_upoD2sztr2wqUm1wUagZKM",
-    "label": "\u0000􉴵vK\u0016󽵋壋"
-}
\ No newline at end of file
+    "team": {
+        "currency": "PAB",
+        "icon": "󴍲<y󺓍M􏇮+0t\u001d\u00037)\u001e1j󷧸󿙀I嶈\u001e卛\u00122󿫽\u0015k\u001a?Uᚰ󷤗/aa8\u0013檨ODP\u0006𧵡I􌆝􈮥F󴡮y𐪜󷎈)\u0001\\􅐬0?Rg;'}",
+        "icon_key": "\u001e붧[\u0000;\u00066Ti7\u00144𡵐t\u0016'𣞂#{믏F\rx3me𖧑2\u0001?\u001a\t󰍏HM􁏶aX3M\t\u0008ᗽY􀈝a󼒩\u0011P𠯠Iፂ,\u000e\u0010\u0018\u0001\u0007ya􀻩u󹚘\u0002똙\u0014T󽤋\u0011j􆇾#Vi𗭐𗈍[\u0017O\u000f<跄Z\u000c@\n7I󲨀4x󴹪󾬭p$[d2Mn&\"㵹[=󾵳􉄪\u0011\n\r\u0000!\u001c𬕔0\u001a\u0013K\u0008:1\u000e~X􅀨􀧟=;􀢅\u0006=\u0004𗝉6\u0010\u001d􏘭H>]𢡆󽼽v7􈗵󰴳󺳟.􀂌,A\u0008\u0012C-\u000bX𭄯9\u0010\u0000?\rK􍂶\u001bg_m\u001e\u000c\u001b\u0003<>d 2𩯮h.,\\㯨b􈔌\u000f'.j&巨'`\u001b\u0004NA\u0008",
+        "name": "T󾨣y+f󱭄Td>#N7P\u0012\tU:T#􊡏Ib\r􏺀\u001b7e󼎌􌪵\u000bTr\n寎7>Kp𘜺H#&\u0011-A+𝋪MD𒂉gbmyh\u001bzHtUH𫋝\u000bO\u0001茶\u0013b(l\u000fA\u0005UW9s\u0003㰚𢌊𣔡󹓡1󳆂䥒􁳺\u0017\u00110ᅖ\u001f𬴓f󴡃Y𠟯\u0006𗨫z7\u0004􋪻DY􉈟􍚡PT0\u0000󼩼\u0018𨍎a􋗌\u000ec\u0006%U󾵮Q0{4󶬀!\u0003\u001ahTV󸿊\ti𪞓4NX󴉍\u0006\\3􏈕q󼨯📑􏼖22^I\u001d*𗙐WK\u00071𗸾i6\u0010!𣴪\u0015hHfⵦ\u0007󲳕G\u0016⯨󸗌􆎀bXw􍾡󴆴\u001b]r{􂠂u􈄒󸾼󹈾G^^&𫛮\u0011l󲐦󵢁D?*\nz𭞬^𤡨󿮛𘌟[S󺎭󰷡𩖰t&\u001dxd$\u0005􄊀\u00080ꖻA􉵣󶡜s\u001b󵊡\u000b$𮪳4󶀳\u00182@\u0017\u001f8|"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_5.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_5.json
index 770a1e78789..8e82f596f7d 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_5.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_5.json
@@ -1,20 +1,13 @@
 {
-    "expires_in": 183097,
-    "locale": "io",
-    "managed_by": "wire",
-    "picture": [],
-    "name": "󹘘󴇎ｻ\u0019^<IuI\u0017x8s膔+\rA\u0014䢚LaI\"*\u0018\u0003􋧮6#\"𧔽^\u0011󽖒󳏒z2+啘􇗪\u0004\u0004Fv|\u001cU.o󰫲\u0011𭏔r􄓴3~408|X󹇕P𦟅󴧠I𩝂𧱵\u000e꧁p7\u0016\u000e\u0002*02WO06z🨹7􃤰\u000fp𐃸Z\u000c4",
-    "password": "O#\n␣sn\u000ec\t5󶴼\"\u001b|N@T\u00015\u000f&F霛𩢟~ﮠ􇑰\u0011O\u0004=\u000e𪜊l󼯞􈡑뢄\u0010싯\n𨵶􊾳n谪s?\u0015\u001eY1^\u0005<V𩪝}󵦄󾱣􁯗/I*cZkk𦜞;\u0018U\u00113Nz\u001d􋍇e󶌿 \"閥3'𒆕N󼼰ZirY쁆K|\u001ai\u00129\u0018P\"#\u00118E\u0002􏫶qX􏕏􄾈'-k08Hn\u000f%uVD3􄡏􃻷\tO\u0017\u000e;\u001e?m%JA_x*𪲉nA\"\u0010𠵼\u001d>쀚H-9o\u0018twv󲶺\u000c@6􀄸 𤱝\u000b\u0003b\u0015󼇻A* ~D)􆖺IX,^|e󻧳\u0014\u0014\u0006#\u001c\u0016􈻴𒌓󿛲O󱎊\u001cQt%\u000b-\"\u0011🍆g9\u0011Ss6n~Y$m'\u001e\u000b󰕀Mm.`亞\u0017\tYv燦:2fg'\u0001􀁠?\u0007km\u0004\u0000\u0004𐬄𦃔\u0006ie93\u000b\u000b󴁕\\U󻢋&irA/\u0014tdP𣔪l􃘑J!𗭣󼶏\u000c𡫔D+􁅝i\u0000Q8\u0000]1{\ttD恥{\u0002\u0007\u0000\u0008\u0015Y\u0008\u0000v􏯮􋿃᠑􇱉f~\u0007Gua(Q\u001c렕H🐟ݑ斌\u0003'Q\\39W~𠎝$&􋝌Mhp<\u0005󳠒8{c+uj𓉝LJ\u001d0.\u0000\"\u001a-䄯r􏜰R\r\u001b􉈝.]Ʌ󾄈\u0006\th[\u001eO󾷫Ꞑo\u0017󳗮iT\u0012\u0002F\u0003\u0018\u000065苗\u0004Y󼨡\u00023􄎔g\u0010kn;;󰬻[rGNM1\u0017➜y'#cw𘏛\u0003w8Xp\u0015Mv\ni\u001a􁑫\u000e\u0017\u0008󼆲j8ꁞ󴂩뗨=TYHq󲊢~'\u001e􃏖\u0000I9𬉏\u0008aoZ\u0007󹥥]\u0018􋛦J,g*N\u0000|ad詅\u0015H0IfuH?Y=^h\u0014𡷕'\u0017􁢴@\u0005􌯘퍷[_?p􌎯󿳭􌧃󺀟&S\u0013􄾮)弣\u00198Xb\u000c!,DL􏱆\u001aY>󴽨\u0011mg&󲏝􈷎$\u000f\u001e;|􆨥!y|𨙭\r\u001c󻥸󼧨󱭼l𑂻f\u0003鈏#P(\\\u0007\u0014ce\u0008Ieec2\u001cc\u0003K~\u00006𫕮杂V\rqV\u001c􍲪rz}l࠘\u0011󽼑*s𢚋􀡷\u001d[󷍡\u0001f𤴛?󵽆󵩒\u0014*BK𑀬󿱊w6C\u0019=>輩",
-    "invitation_code": "rSv20mRblPLCYnVt",
     "assets": [
         {
-            "size": "preview",
             "key": "\\fDs.\u000e;]𘈖\u000c\u0010🛉嘪+𬶇",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𫪼WlMjr$~",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -22,23 +15,23 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\n0\u0006",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "`E_󽵷gcy`La%\t",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􊽲g􆡖\u001c)甩M󿂸C",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": " \u0012yXO\u0004f9\u0002𘟍\u0001D",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -50,23 +43,23 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000e*㾉\u001f\u0001G`\u0010O+R`Q_",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􈑄_O&g*}",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "QLDr\u0016^gg",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􁏦條􂘋\u001dZ0RnH#e𠭈w\u000b\u0018󵒙",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -74,36 +67,43 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "/n\u001cSpZ",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "o\u001a/j!󻆔싱󱾼䩶",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0018𤹳\u0007\u0012𩄏.󿎟󹐬𮓛\u0018􀦕J􋥇7󸓛X",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "xv𪉵\u0010󸪠Wh",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "g9螮",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "CAi<ﰷGV󻃶}M",
+            "size": "preview",
             "type": "image"
         }
     ],
     "email_code": "rn0=",
-    "label": ""
-}
\ No newline at end of file
+    "expires_in": 183097,
+    "invitation_code": "rSv20mRblPLCYnVt",
+    "label": "",
+    "locale": "io",
+    "managed_by": "wire",
+    "name": "󹘘󴇎ｻ\u0019^<IuI\u0017x8s膔+\rA\u0014䢚LaI\"*\u0018\u0003􋧮6#\"𧔽^\u0011󽖒󳏒z2+啘􇗪\u0004\u0004Fv|\u001cU.o󰫲\u0011𭏔r􄓴3~408|X󹇕P𦟅󴧠I𩝂𧱵\u000e꧁p7\u0016\u000e\u0002*02WO06z🨹7􃤰\u000fp𐃸Z\u000c4",
+    "password": "O#\n␣sn\u000ec\t5󶴼\"\u001b|N@T\u00015\u000f&F霛𩢟~ﮠ􇑰\u0011O\u0004=\u000e𪜊l󼯞􈡑뢄\u0010싯\n𨵶􊾳n谪s?\u0015\u001eY1^\u0005<V𩪝}󵦄󾱣􁯗/I*cZkk𦜞;\u0018U\u00113Nz\u001d􋍇e󶌿 \"閥3'𒆕N󼼰ZirY쁆K|\u001ai\u00129\u0018P\"#\u00118E\u0002􏫶qX􏕏􄾈'-k08Hn\u000f%uVD3􄡏􃻷\tO\u0017\u000e;\u001e?m%JA_x*𪲉nA\"\u0010𠵼\u001d>쀚H-9o\u0018twv󲶺\u000c@6􀄸 𤱝\u000b\u0003b\u0015󼇻A* ~D)􆖺IX,^|e󻧳\u0014\u0014\u0006#\u001c\u0016􈻴𒌓󿛲O󱎊\u001cQt%\u000b-\"\u0011🍆g9\u0011Ss6n~Y$m'\u001e\u000b󰕀Mm.`亞\u0017\tYv燦:2fg'\u0001􀁠?\u0007km\u0004\u0000\u0004𐬄𦃔\u0006ie93\u000b\u000b󴁕\\U󻢋&irA/\u0014tdP𣔪l􃘑J!𗭣󼶏\u000c𡫔D+􁅝i\u0000Q8\u0000]1{\ttD恥{\u0002\u0007\u0000\u0008\u0015Y\u0008\u0000v􏯮􋿃᠑􇱉f~\u0007Gua(Q\u001c렕H🐟ݑ斌\u0003'Q\\39W~𠎝$&􋝌Mhp<\u0005󳠒8{c+uj𓉝LJ\u001d0.\u0000\"\u001a-䄯r􏜰R\r\u001b􉈝.]Ʌ󾄈\u0006\th[\u001eO󾷫Ꞑo\u0017󳗮iT\u0012\u0002F\u0003\u0018\u000065苗\u0004Y󼨡\u00023􄎔g\u0010kn;;󰬻[rGNM1\u0017➜y'#cw𘏛\u0003w8Xp\u0015Mv\ni\u001a􁑫\u000e\u0017\u0008󼆲j8ꁞ󴂩뗨=TYHq󲊢~'\u001e􃏖\u0000I9𬉏\u0008aoZ\u0007󹥥]\u0018􋛦J,g*N\u0000|ad詅\u0015H0IfuH?Y=^h\u0014𡷕'\u0017􁢴@\u0005􌯘퍷[_?p􌎯󿳭􌧃󺀟&S\u0013􄾮)弣\u00198Xb\u000c!,DL􏱆\u001aY>󴽨\u0011mg&󲏝􈷎$\u000f\u001e;|􆨥!y|𨙭\r\u001c󻥸󼧨󱭼l𑂻f\u0003鈏#P(\\\u0007\u0014ce\u0008Ieec2\u001cc\u0003K~\u00006𫕮杂V\rqV\u001c􍲪rz}l࠘\u0011󽼑*s𢚋􀡷\u001d[󷍡\u0001f𤴛?󵽆󵩒\u0014*BK𑀬󿱊w6C\u0019=>輩",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_6.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_6.json
index 3f72e6ad42b..8ff54e28046 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_6.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_6.json
@@ -1,30 +1,24 @@
 {
-    "expires_in": 217311,
-    "locale": "he",
-    "managed_by": "wire",
     "accent_id": 24037,
-    "picture": [],
-    "name": "b\u001a🜤5{})\u000bqe7\n*M,!i\u0019\u001e𧛲~\u0018𘅫\u0000@󾽶t𡊅Bb|/b벂󽦳'W𤟪[]\u0006󾐶W!]>l󳙅泳,\u000e:\u001f𗚄󷡴y󹇮Q+|`Q\u00156󱀵>\u0016k󴤈a6𭛔oCQ\u0019y󾕒\u000c\u001a\u0015A\u0016Z>W󹄗9\u0012 P\u000e0\\𩇻􍇘󱆎>\u0012m\u000f\u0013SC%C󾞴",
-    "invitation_code": "XYcMU-BCwqn3aNTQPp6q0KU09PhX",
     "assets": [
         {
-            "size": "preview",
             "key": "\n{{\u0018\u000c}-(k७H􎆵",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "m",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "7󸔩\u001c?R",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000bJ\t\u0015",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -36,18 +30,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "$P𥲲󷩴2\u0002b\n=󳿝\u001d/",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "t𔖯\u0000𣒦A",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000e\u00154x:m-Q5󹎡Xw𭺊􏝼<",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -55,36 +49,42 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "%􊒠N󷧺\u0011",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0010hB~㸾",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "4𣒣_\u0000O)oc9V\u0007",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\r8󵴱F@v󵇜r\u00138",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "mp\u001a𗥚n\u0015Q􄸦7{7W걣)8",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "宦z\u0008\u0012ﺊ􇹀",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "",
-    "label": "#l𧔱r𢘌9\u00111󲙘𬴳\u0010y_\u000epw􈢧4PowP\u0012- ;m$\u0006\u0015"
-}
\ No newline at end of file
+    "expires_in": 217311,
+    "invitation_code": "XYcMU-BCwqn3aNTQPp6q0KU09PhX",
+    "label": "#l𧔱r𢘌9\u00111󲙘𬴳\u0010y_\u000epw􈢧4PowP\u0012- ;m$\u0006\u0015",
+    "locale": "he",
+    "managed_by": "wire",
+    "name": "b\u001a🜤5{})\u000bqe7\n*M,!i\u0019\u001e𧛲~\u0018𘅫\u0000@󾽶t𡊅Bb|/b벂󽦳'W𤟪[]\u0006󾐶W!]>l󳙅泳,\u000e:\u001f𗚄󷡴y󹇮Q+|`Q\u00156󱀵>\u0016k󴤈a6𭛔oCQ\u0019y󾕒\u000c\u001a\u0015A\u0016Z>W󹄗9\u0012 P\u000e0\\𩇻􍇘󱆎>\u0012m\u000f\u0013SC%C󾞴",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_7.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_7.json
index 2a01de897e5..2d34192e6a6 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_7.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_7.json
@@ -1,13 +1,9 @@
 {
-    "expires_in": 406641,
-    "locale": "ig",
-    "managed_by": "wire",
     "accent_id": 30744,
-    "name": "IO󹧈K􏓲g􍔍J\tiZJ\u001e}0'A\u000f\u001f𓇝𠜊`𠪒zNo􈰃nb󳹝@\u0017\u00158ᇾyCz贛?!\\똼S\u000c󳛂H𡩕b\u001dv\u001d𠀛狽o扻}䡅'\u0008*M_}\u001f𝕍􌬳裕V\u000c*钬K2𝧞K_#77]-&𗋂𢏇뀱`𐭠􃯟L\u0002-󾎣>𘒲𥲴QC]+wqU",
     "assets": [
         {
-            "size": "preview",
             "key": "[z\u00179)",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -15,18 +11,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "{",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "r𒐔Y􍮅\u0014\u0006",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0017v8*C",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -34,33 +30,33 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000e􎘙P𪎆;t&g󹩽(",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "0i\u000c\u0008-E\u0005R睫2j",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0002BK𐐶#\u000b'䗜\u0018z𨒘󾁟$jH",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "@>r\u000c%",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\"9\u0015𢂿ci󼡆3\u0003ARh\u001eX",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ".",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -68,13 +64,13 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "FO5A",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -82,23 +78,23 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󽽘\\1󺺢d睾q\u0014𒎇",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ")RU1?󽫛r ^$Wq",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "h76F\u001b",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "'궦\t􍎰",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -107,6 +103,10 @@
         }
     ],
     "email_code": "pwYYlQn1WDrF_I02s6jDhkfLyudwpqrum063eTo=",
-    "phone_code": "0fz6tQ==",
-    "label": "cz\u0018*[|&󴓈\u0019E\u001dW"
-}
\ No newline at end of file
+    "expires_in": 406641,
+    "label": "cz\u0018*[|&󴓈\u0019E\u001dW",
+    "locale": "ig",
+    "managed_by": "wire",
+    "name": "IO󹧈K􏓲g􍔍J\tiZJ\u001e}0'A\u000f\u001f𓇝𠜊`𠪒zNo􈰃nb󳹝@\u0017\u00158ᇾyCz贛?!\\똼S\u000c󳛂H𡩕b\u001dv\u001d𠀛狽o扻}䡅'\u0008*M_}\u001f𝕍􌬳裕V\u000c*钬K2𝧞K_#77]-&𗋂𢏇뀱`𐭠􃯟L\u0002-󾎣>𘒲𥲴QC]+wqU",
+    "phone_code": "0fz6tQ=="
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_8.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_8.json
index a623fb219f1..d24f15fb0e8 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_8.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_8.json
@@ -1,19 +1,9 @@
 {
-    "expires_in": 419615,
-    "locale": "sm",
     "accent_id": 121476,
-    "name": "1Ox󼼎\u0011+z+\u001fqV\u0010",
-    "password": "z𠤲󴮁󲳗渿𝨗𨏟z𥬸\u0003\u0001e𬱗S𮈮ぽ\u0008\u001c𛀁𫑐\u00194(CD{𥵖𑃢8䓘/\u001a\u0003􆱰󷸓=\u001d􆕍#\u0013\u0004d0L,\u0017W.*􏭥Y(\u0014~L1J\u0003m{t=VRᏢ8yꘪ𭼟]Rv(Q\u0018􆾆\u0018\u000c5\u001e(u6OMe\u000b\u0002\u0017\u0008f)ᢃ]u􎪧⛲\u0000\u00147𨛓L𗂬%Gd󾡄h枃\t\u001d\\􇟊Y\u0004>RYX]𖭑W/[\u0010𝇕\r}\"􈽉W[$\u000f=Xr&࿗4󼠾\u0005\u0019^𤢒%4𗶈\u0016𦠡;:g\u001eo\u0006\npm\u0015Me􋘉𥁡;󸋺𧈘R~􍆃\u001eE8;%󹄕j𪳟𧢌\u0001󷃅kJ𫳀􎔢𡄇L󺦆~j\u0005\u0013g릎tP𗡦(qn4𡞏I𝕕nE\u00101g𦖱𤀦S\\\u0004搼H𠎩瞭f/_􁏴C-;r\u0019_6􌳥MQ|𡉘\\gY\u0017x𫁼TqT𠡫_b\u00165\u0004d􀰞](􌥣󿏽Ou\u0014d\tgvU𫒍\u0019k\u0016s\u000b2\u000cla􈾂\u000b\u001a{US%󻵥󸼫n\u0018燃<\")\u0001믵k\u0006H𮬩7\rl\u001a􀬙-𫩚\u001a􉮝󼾉2{T\u000cO𮒣Qd|𢂷>󰭨🕜\u0002)𡊊􆪸\u0003􀚩R\u000b\u0018𧐹𤬹u\u0007\u0007U\u001cOj` \u0008\u001c\u0001\"\u0010:Kw\u0018𣆝잊璐2F祂\u0005g𪕬􌅥u󰏮唦󵵞xk\u0006\rAE+$\u000f󲤓𘀻󹨌ja\u001chL􅶫\\T󴴺WD((bZ􎉵V}\u0004\u001d_?􊾱\"5A󹓲\u0003n􏹇hv<;rO*\u001achIS7[\u0016|\u001b)\u0006A_\\?vC!u\u0011錣\u001a\u0014컈􏕊K8\u0012\u001a<@􅕡􄙊󼊌vZ6\u0019\u0018󾑞*3\\𡈓\u0003\u000b2󼇵󸼀\u001a\u001d}\u000b𖧻\u0013P%ዢ*\u0014\u000cQ\u0004㆐􊽡\t󸨖{\u0001𫮒\u0000/{\u000eoJ3\u0001H5-}𥍙𨌜\ton\r𥦗𩣲OV\u001d)w𣐂t\u0007@d\u0016\u0007饡􄩓l嚽2`\n󴠔Q燷󰺯V\u0015\u0018𦸂󵱬XB󴠉I􋬲\u0019􉘚𫃾WwX􍍆\u000b~=m0EYY\u0001x\\'𒊼dI􄞸m=\u0011*𤆏e \u001d\u000f\u001b󱌼j\u0016\u000cAI-eDY󴃹𦱛]Y.􅛨Oﺅ\u0003;􀭮\u0004󾾬^꼽\u001b+:Z訅\u001bZp 7=L𩸹Ptx􉟖\"髎2KL\u000bM󲬣C7^Ⓜ𣍟Or*e󾥕dX,^f[\u000c\u00032X\u001f\u0007Fov`\u001a\rj8P\u0017`⪏8\u0018\u0000ྔ.\u0019􊗛𘁢+󽥷L\u0004A𦱳`t?\\j!𝝊e6\u0000f\u001b.`M\u0001퇾N\u0019\u0000\u00052󲾳䬿U氓𮤂)W􃩩􅢬2\u0010I\u0015zT􍝉@3#럎𮛱]NL?N􇚊&𘏗(?𣅻1\u001b􈗺􌚿\u0012F>Fu\u0019l￠5/\u0007𘚍\u00132Z",
-    "team": {
-        "icon": "\u0018MS\u00089U{Td\u000bPgKDy\u0005#(}GퟸDd/\u0014%;",
-        "name": "Id\n40hO󿳐＿z\u001a9섥;4\u0002[\nA\u001e𦩳󿹖_.P{\u0011%𤕮􊣴Cu\u001d[<쁄\u0013s6mZ\u0006B!\u0010᧘􀍘\u001f\u001b+󸐃󽝶A<jS\u001f'\u0004\u0010𠴫)v{􌙀􀚔h\" \u001c\u0003\u0004𤏎=5\u001d\u001e>𮁄𐊥T,`/\u0008坑𫺥*'\u00000w~k6`\u000b􆩍\u001e􋔾巄n?\u0005\u001a\u001b鱗p?-\u000c.Ba\u0010o\u00155.!𑄎􍀄𓏂T%󷜜\u0005\u0008C\u001fQ\u000f\u0002𗛊횎􍆷i$N􁾉\u0011\u0014\u0018𧯰􈨡鹨AX􋓜\u0006𗖫𒊞Vi4E+'t󽘜/𐎎󿀄6C`󲽦󹫕𝂪獛󳿝D3.\u000b&𪷻`𧝱*Ey$\u0013ᡪ\u0002\u001db=Uf\u0014𤁡\r㣢1p)􇮸cq9𢶟L#󲉂HF𬻊`󳆘𥝚􉹶af\ru\u0006oM*󽚱\u0003􀝊 (\u0012:ex\u0010.~9b.",
-        "currency": "AOA",
-        "icon_key": "B😺𨬀\u0014\u0005O%O㿾Q𬸋{\u0003m𔖞$A\n\u0006\".n󾩉s𪷟k"
-    },
     "assets": [
         {
-            "size": "preview",
             "key": "D􅅱3q\u001d𠣞z",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -29,21 +19,31 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "j>!i1",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "o\u0013w",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "ynbMi06R2nC6tta6KB4=",
-    "phone_code": "rQKyQz8TBUb9Klrb"
-}
\ No newline at end of file
+    "expires_in": 419615,
+    "locale": "sm",
+    "name": "1Ox󼼎\u0011+z+\u001fqV\u0010",
+    "password": "z𠤲󴮁󲳗渿𝨗𨏟z𥬸\u0003\u0001e𬱗S𮈮ぽ\u0008\u001c𛀁𫑐\u00194(CD{𥵖𑃢8䓘/\u001a\u0003􆱰󷸓=\u001d􆕍#\u0013\u0004d0L,\u0017W.*􏭥Y(\u0014~L1J\u0003m{t=VRᏢ8yꘪ𭼟]Rv(Q\u0018􆾆\u0018\u000c5\u001e(u6OMe\u000b\u0002\u0017\u0008f)ᢃ]u􎪧⛲\u0000\u00147𨛓L𗂬%Gd󾡄h枃\t\u001d\\􇟊Y\u0004>RYX]𖭑W/[\u0010𝇕\r}\"􈽉W[$\u000f=Xr&࿗4󼠾\u0005\u0019^𤢒%4𗶈\u0016𦠡;:g\u001eo\u0006\npm\u0015Me􋘉𥁡;󸋺𧈘R~􍆃\u001eE8;%󹄕j𪳟𧢌\u0001󷃅kJ𫳀􎔢𡄇L󺦆~j\u0005\u0013g릎tP𗡦(qn4𡞏I𝕕nE\u00101g𦖱𤀦S\\\u0004搼H𠎩瞭f/_􁏴C-;r\u0019_6􌳥MQ|𡉘\\gY\u0017x𫁼TqT𠡫_b\u00165\u0004d􀰞](􌥣󿏽Ou\u0014d\tgvU𫒍\u0019k\u0016s\u000b2\u000cla􈾂\u000b\u001a{US%󻵥󸼫n\u0018燃<\")\u0001믵k\u0006H𮬩7\rl\u001a􀬙-𫩚\u001a􉮝󼾉2{T\u000cO𮒣Qd|𢂷>󰭨🕜\u0002)𡊊􆪸\u0003􀚩R\u000b\u0018𧐹𤬹u\u0007\u0007U\u001cOj` \u0008\u001c\u0001\"\u0010:Kw\u0018𣆝잊璐2F祂\u0005g𪕬􌅥u󰏮唦󵵞xk\u0006\rAE+$\u000f󲤓𘀻󹨌ja\u001chL􅶫\\T󴴺WD((bZ􎉵V}\u0004\u001d_?􊾱\"5A󹓲\u0003n􏹇hv<;rO*\u001achIS7[\u0016|\u001b)\u0006A_\\?vC!u\u0011錣\u001a\u0014컈􏕊K8\u0012\u001a<@􅕡􄙊󼊌vZ6\u0019\u0018󾑞*3\\𡈓\u0003\u000b2󼇵󸼀\u001a\u001d}\u000b𖧻\u0013P%ዢ*\u0014\u000cQ\u0004㆐􊽡\t󸨖{\u0001𫮒\u0000/{\u000eoJ3\u0001H5-}𥍙𨌜\ton\r𥦗𩣲OV\u001d)w𣐂t\u0007@d\u0016\u0007饡􄩓l嚽2`\n󴠔Q燷󰺯V\u0015\u0018𦸂󵱬XB󴠉I􋬲\u0019􉘚𫃾WwX􍍆\u000b~=m0EYY\u0001x\\'𒊼dI􄞸m=\u0011*𤆏e \u001d\u000f\u001b󱌼j\u0016\u000cAI-eDY󴃹𦱛]Y.􅛨Oﺅ\u0003;􀭮\u0004󾾬^꼽\u001b+:Z訅\u001bZp 7=L𩸹Ptx􉟖\"髎2KL\u000bM󲬣C7^Ⓜ𣍟Or*e󾥕dX,^f[\u000c\u00032X\u001f\u0007Fov`\u001a\rj8P\u0017`⪏8\u0018\u0000ྔ.\u0019􊗛𘁢+󽥷L\u0004A𦱳`t?\\j!𝝊e6\u0000f\u001b.`M\u0001퇾N\u0019\u0000\u00052󲾳䬿U氓𮤂)W􃩩􅢬2\u0010I\u0015zT􍝉@3#럎𮛱]NL?N􇚊&𘏗(?𣅻1\u001b􈗺􌚿\u0012F>Fu\u0019l￠5/\u0007𘚍\u00132Z",
+    "phone_code": "rQKyQz8TBUb9Klrb",
+    "team": {
+        "currency": "AOA",
+        "icon": "\u0018MS\u00089U{Td\u000bPgKDy\u0005#(}GퟸDd/\u0014%;",
+        "icon_key": "B😺𨬀\u0014\u0005O%O㿾Q𬸋{\u0003m𔖞$A\n\u0006\".n󾩉s𪷟k",
+        "name": "Id\n40hO󿳐＿z\u001a9섥;4\u0002[\nA\u001e𦩳󿹖_.P{\u0011%𤕮􊣴Cu\u001d[<쁄\u0013s6mZ\u0006B!\u0010᧘􀍘\u001f\u001b+󸐃󽝶A<jS\u001f'\u0004\u0010𠴫)v{􌙀􀚔h\" \u001c\u0003\u0004𤏎=5\u001d\u001e>𮁄𐊥T,`/\u0008坑𫺥*'\u00000w~k6`\u000b􆩍\u001e􋔾巄n?\u0005\u001a\u001b鱗p?-\u000c.Ba\u0010o\u00155.!𑄎􍀄𓏂T%󷜜\u0005\u0008C\u001fQ\u000f\u0002𗛊횎􍆷i$N􁾉\u0011\u0014\u0018𧯰􈨡鹨AX􋓜\u0006𗖫𒊞Vi4E+'t󽘜/𐎎󿀄6C`󲽦󹫕𝂪獛󳿝D3.\u000b&𪷻`𧝱*Ey$\u0013ᡪ\u0002\u001db=Uf\u0014𤁡\r㣢1p)􇮸cq9𢶟L#󲉂HF𬻊`󳆘𥝚􉹶af\ru\u0006oM*󽚱\u0003􀝊 (\u0012:ex\u0010.~9b."
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUserPublic_user_9.json b/libs/wire-api/test/golden/testObject_NewUserPublic_user_9.json
index ccd6e5ea627..9dc19f0f5aa 100644
--- a/libs/wire-api/test/golden/testObject_NewUserPublic_user_9.json
+++ b/libs/wire-api/test/golden/testObject_NewUserPublic_user_9.json
@@ -1,19 +1,14 @@
 {
-    "email": "􆌸\u001a\u0008(纖\u000e􄱒8n󶤵F𨟣󲛉𗁱@",
-    "phone": "+14993214",
     "accent_id": 6550,
-    "picture": [],
-    "name": "\u0001𤎎~*'􊠛\u0012\u0017A\u001d#0\u0000\u000c8P@忊𘋗󷠙\u0000Ln\u0016![\u00054nU\u000c𝡵\u001c􎌰>%\u0000:𢜿\u0013a󾲛\u000f\u0018𠖹\u001bi\tI\u0003g~1",
-    "password": "8\u000e􂉐𪍶c􉛨\u00073_i\u0002𫐝󴡿sf\u0006*𢬦~􂠒cZ:聀\n􌊟􂶗󽄤I!Ḭ}zw%\u001e𒉯$𦮤𗀿i􈎚V𘥱'&/\u0017􎪇dU{:X韒N\u000bda<g\u0012\u0015𬼙\"𫷺I􀱰L!ᦸK雄sfᴾQ\u0006𣿥&&\u001c\u0000󰳶JdO\u0015mlk$㟢①󵕡>VjT󻖃M|T\u0016,𗰱I[!5%\u0019\u0004WDB=?Oe\u0005\u00110p\u0019\u00118D󰩉p6]몘-GOplF􏶾tcᐩ\u0011U󾛖\u0002=dVF\u001e\u000b\u000b𗒉\u0011A𠙐\u0012􁳦􄏬}o5􇕳j]\u001eF𦗸9\u001bl⪦2\u0007𢡗p󺲇𢂞𬵌LtJ7~])󹲡\u0015O2𠦶PJ􁘯J\u000bsb%𠀵NB1\u0006\u0014e\u0012'\u0010\u001eftG^k\u001b<r󺾓pN⩰􅽧0w\u0006L1bW󼘞\u0006dZ𮢮>🧩Y\u0019r𩎸\u0015􈐵B􂔉#6\u0015\t󿏱_𠹔󸐏m8럽9HIp⍹\u0001sh􀿮X\u001f+C\"\u0012󰊩F",
     "assets": [
         {
-            "size": "complete",
             "key": "𪌦(@Z􁲯𗨘(",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "%􄰦\u0014/",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -21,28 +16,28 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0016vQkm|𤴖&t-W\u0015x",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "|5􎦰\u0018|te[E鋔#S􃫈",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "{81􊜳.\u001c\u001b",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "@y\u0010k贊'jS*k!𬘤SQD",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "z틇z\r&'",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -50,63 +45,63 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􀰼b 􎥰gGz\u0006𥦡O\\",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "-9\u0003'\u0008s\u0018𣜇\u0015\u001f\u0007𤳕>;\u0002",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0008嗰삮ዷP\u000cX",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𘃣Lw~8",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0013Pd",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "Q𥆭Ǖ`",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "a\u000fS휡ׅo𗱲",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "R𮜬𠧻\u000b𪴒𫞐m\u0005󰢣",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "1󸓗",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "E%\n\u0012𩙷\u000c\u0000􉞝yP",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Xz􋔩?yV\r\u0013-訥Ⳳ󰳮E𥣻",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -114,26 +109,31 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "5r􍟓-c􇢡b䊸v9휬󻱔z",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "-󹏯E\u0012W\u0005}𗾮\u0011",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𦹍󵯈􃓾$U󳽳\u001b]􏻔𐣡𭕨$𭸎󼊖􅈜",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􉀤OMt􊰵􅜑􁼁x\u0011\u000f:i",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "email": "􆌸\u001a\u0008(纖\u000e􄱒8n󶤵F𨟣󲛉𗁱@",
     "email_code": "X4k8TiOW",
-    "label": "J􃒡􄳸d􅠎󷐲X𤬰9C?aA:󶵶)􁔃"
-}
\ No newline at end of file
+    "label": "J􃒡􄳸d􅠎󷐲X𤬰9C?aA:󶵶)􁔃",
+    "name": "\u0001𤎎~*'􊠛\u0012\u0017A\u001d#0\u0000\u000c8P@忊𘋗󷠙\u0000Ln\u0016![\u00054nU\u000c𝡵\u001c􎌰>%\u0000:𢜿\u0013a󾲛\u000f\u0018𠖹\u001bi\tI\u0003g~1",
+    "password": "8\u000e􂉐𪍶c􉛨\u00073_i\u0002𫐝󴡿sf\u0006*𢬦~􂠒cZ:聀\n􌊟􂶗󽄤I!Ḭ}zw%\u001e𒉯$𦮤𗀿i􈎚V𘥱'&/\u0017􎪇dU{:X韒N\u000bda<g\u0012\u0015𬼙\"𫷺I􀱰L!ᦸK雄sfᴾQ\u0006𣿥&&\u001c\u0000󰳶JdO\u0015mlk$㟢①󵕡>VjT󻖃M|T\u0016,𗰱I[!5%\u0019\u0004WDB=?Oe\u0005\u00110p\u0019\u00118D󰩉p6]몘-GOplF􏶾tcᐩ\u0011U󾛖\u0002=dVF\u001e\u000b\u000b𗒉\u0011A𠙐\u0012􁳦􄏬}o5􇕳j]\u001eF𦗸9\u001bl⪦2\u0007𢡗p󺲇𢂞𬵌LtJ7~])󹲡\u0015O2𠦶PJ􁘯J\u000bsb%𠀵NB1\u0006\u0014e\u0012'\u0010\u001eftG^k\u001b<r󺾓pN⩰􅽧0w\u0006L1bW󼘞\u0006dZ𮢮>🧩Y\u0019r𩎸\u0015􈐵B􂔉#6\u0015\t󿏱_𠹔󸐏m8럽9HIp⍹\u0001sh􀿮X\u001f+C\"\u0012󰊩F",
+    "phone": "+14993214",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_1.json b/libs/wire-api/test/golden/testObject_NewUser_user_1.json
index 03f4e6d0674..aaca16a50c9 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_1.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_1.json
@@ -1,14 +1,8 @@
 {
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "sn-LY",
-    "picture": [],
-    "name": "V~㛘钟\u0000w􍻃􇅡1𑵼󹄧%㥫]y*𝧑jqM\u0016𒈔/􎨑-*\u001f \u001eA\u000e}ﭛcv [󹦺t󷇵R𬌻Y󽃈6tg\u0016󿅷+\u0010𘚈;\u0006Oj\u0013뷑&aD:\nf󴯋!*",
-    "password": "𣉙%5T5'<IQtf]㔶\u0004󸳗\u001c+\u000c𘂽\u001c$\u000cY\u001eG=p𬜟V\u0012E_ni\\Q:𝀧>䎆᳦\u0005-􃭧𘨛7W@)!$%v{\u000c\n_I6􉱮츜]r􍶔\u0002Gi_L\u0005@tr<讃2Dr䂇\\\u000b8쁽\u0014􅈿e\u0008𮞲𑚜srN蜨旗Qk+赥󳼩O\\c6󼉭X󺩽􆓖VV\\󴀯^􍺔\u0014(P~y\u000f(\nrO󽖎U=$󽩻k󷀘7.\u0015[dn􃊾粷_\u0000󳞑\u000bNVd햲z󻓕pV6\u001e𨭗#/m􄊮w\u0015沐u𣎯\u000fs\u0011𡔱^A𗔌>\u001a#\u0019sC!3#`𧂅q𐅄\\VrnT\u0010\u0016􂹙\u0014\u0002𦍺󵅅\u0012d 󻆃#\u0018𫺦/k㤣X\"I\u000fO,`GU+\u0011\"\n럲n)\u001b􂰕x󸨾􋽯%\u0012\u000fVr\u000c󾾡H`🚇W\u001c\u0015􀛞vii\u001c\u0007\u0005󵙼&d\u001d𣶇󲅊.􊈄j󶈟$=a_s\u0010Q󹇪\u000e\u000c\u0003󸽌B\u0005\u0018L\u0002_ZX\u0015 h_sGj)󿬂|\u0000\u000f\rlUN)\u0006\u0011`8\u000c󸫲󳼍\u0008,A\u0011\tt/0lT􅪡\u0007}\u0016j\u000f\u0007z|\u0005𥕰J,26󹰅\u00039⮫0\u0019w'\u0000O&g\u001fF0󴞭kg\u0002\u0011|Q􀁨\u001aM𠌸󽣾vuPgVp𬆇)/<W􇋡R􅍑,顽\u000b𣥗y\u0010\u000bS\u001a(\u0014!\u000f𬒅\u001e󱎲U*(兤4rX\u000eⅼA󼬲\u000e\u0014z9􀡽􈧵{^􁍿𩏕\n\u0008􍿜rYL糷h𨵞?J\u0017n45X.L􌈏^{ot|\u0019q蜡\u0007(𡞛I\u000b\u001b𩍙𠔇\u0005.䖗y0a胁I\u0015Kk𥴟\u0015蝗􃮃\u000fM`𫝹릆N\u00159`󺬤\u001c@Y~\u000eL󸱲􌆆o3𗓯;󶺊󶫧\u0013fz\u001a󺕣(}.)[!'2LJS\rBK๓\u00035<u`\u000e\"ミi󸪔H&\u0010P􎎓#𮄖t1\u0005{\u0005􈛚\u000cS\u0000=\u0016􇹘\u001b眥\u001b$󿂈3ڗ@GKvG/󴌿𦗡,𫊌i󺿙9TW\u001boe\u000c\u001cf􏂽S\u001dꚊ󳯌g􁌍{\u0012fg\u0010􋚻\u0010bc󻭋󹶓f_}.@䒍{r~{\u000c[?`􀝥􅚟[!\u0012B7%",
-    "invitation_code": "DhBvokHtVbWSKbWi0_IATMGH3P8DLEOw5YIcYg==",
     "assets": [
         {
-            "size": "preview",
             "key": "ᏸ5\u0014󸾲𗓰`\u0007\u001aG{?",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -20,47 +14,53 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󸋳\u0016𗥓℆",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "bN\u001dj|z*dS7􌷪\u001e\u000c`",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "d\u0008,U",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󾜘4𓏡\u0001Z",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ",\u0010\u0017kd\n깬􉫖",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u001d轖󰨇2",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
     "email_code": "1YgaHo0=",
+    "invitation_code": "DhBvokHtVbWSKbWi0_IATMGH3P8DLEOw5YIcYg==",
+    "label": "𭤐15XwT󲆬: \u0011Z+\ty𗌉\u0001",
+    "locale": "sn-LY",
+    "name": "V~㛘钟\u0000w􍻃􇅡1𑵼󹄧%㥫]y*𝧑jqM\u0016𒈔/􎨑-*\u001f \u001eA\u000e}ﭛcv [󹦺t󷇵R𬌻Y󽃈6tg\u0016󿅷+\u0010𘚈;\u0006Oj\u0013뷑&aD:\nf󴯋!*",
+    "password": "𣉙%5T5'<IQtf]㔶\u0004󸳗\u001c+\u000c𘂽\u001c$\u000cY\u001eG=p𬜟V\u0012E_ni\\Q:𝀧>䎆᳦\u0005-􃭧𘨛7W@)!$%v{\u000c\n_I6􉱮츜]r􍶔\u0002Gi_L\u0005@tr<讃2Dr䂇\\\u000b8쁽\u0014􅈿e\u0008𮞲𑚜srN蜨旗Qk+赥󳼩O\\c6󼉭X󺩽􆓖VV\\󴀯^􍺔\u0014(P~y\u000f(\nrO󽖎U=$󽩻k󷀘7.\u0015[dn􃊾粷_\u0000󳞑\u000bNVd햲z󻓕pV6\u001e𨭗#/m􄊮w\u0015沐u𣎯\u000fs\u0011𡔱^A𗔌>\u001a#\u0019sC!3#`𧂅q𐅄\\VrnT\u0010\u0016􂹙\u0014\u0002𦍺󵅅\u0012d 󻆃#\u0018𫺦/k㤣X\"I\u000fO,`GU+\u0011\"\n럲n)\u001b􂰕x󸨾􋽯%\u0012\u000fVr\u000c󾾡H`🚇W\u001c\u0015􀛞vii\u001c\u0007\u0005󵙼&d\u001d𣶇󲅊.􊈄j󶈟$=a_s\u0010Q󹇪\u000e\u000c\u0003󸽌B\u0005\u0018L\u0002_ZX\u0015 h_sGj)󿬂|\u0000\u000f\rlUN)\u0006\u0011`8\u000c󸫲󳼍\u0008,A\u0011\tt/0lT􅪡\u0007}\u0016j\u000f\u0007z|\u0005𥕰J,26󹰅\u00039⮫0\u0019w'\u0000O&g\u001fF0󴞭kg\u0002\u0011|Q􀁨\u001aM𠌸󽣾vuPgVp𬆇)/<W􇋡R􅍑,顽\u000b𣥗y\u0010\u000bS\u001a(\u0014!\u000f𬒅\u001e󱎲U*(兤4rX\u000eⅼA󼬲\u000e\u0014z9􀡽􈧵{^􁍿𩏕\n\u0008􍿜rYL糷h𨵞?J\u0017n45X.L􌈏^{ot|\u0019q蜡\u0007(𡞛I\u000b\u001b𩍙𠔇\u0005.䖗y0a胁I\u0015Kk𥴟\u0015蝗􃮃\u000fM`𫝹릆N\u00159`󺬤\u001c@Y~\u000eL󸱲􌆆o3𗓯;󶺊󶫧\u0013fz\u001a󺕣(}.)[!'2LJS\rBK๓\u00035<u`\u000e\"ミi󸪔H&\u0010P􎎓#𮄖t1\u0005{\u0005􈛚\u000cS\u0000=\u0016􇹘\u001b眥\u001b$󿂈3ڗ@GKvG/󴌿𦗡,𫊌i󺿙9TW\u001boe\u000c\u001cf􏂽S\u001dꚊ󳯌g􁌍{\u0012fg\u0010􋚻\u0010bc󻭋󹶓f_}.@䒍{r~{\u000c[?`􀝥􅚟[!\u0012B7%",
     "phone_code": "z1OeJQ==",
-    "label": "𭤐15XwT󲆬: \u0011Z+\ty𗌉\u0001"
-}
\ No newline at end of file
+    "picture": [],
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_10.json b/libs/wire-api/test/golden/testObject_NewUser_user_10.json
index fddd4beaf4a..74e362ebf77 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_10.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_10.json
@@ -1,18 +1,18 @@
 {
-    "phone": "+97450398211",
-    "team_id": "00003fd3-0000-6075-0000-09cc00002b7a",
-    "uuid": "00000000-0000-0000-0000-000000000000",
+    "accent_id": -2576,
+    "assets": [],
+    "email_code": "Ofo=",
+    "label": "",
     "locale": "sr-CO",
     "managed_by": "wire",
-    "accent_id": -2576,
-    "picture": [],
     "name": "nz\u0003Z\u00184>󻚶𮡛ocxZ'ngJn,u𥿨󸡙.󷠥\u0013c\u0019G󽅆􀘠 󸣘t=\\|>@bc􂂥༹\\𬝑*#󵎜\u0015EuR\"𠪷\u001f~'\u0004뚻(A8m􊱙𠇓F._􉏍\u000e\u000f~3.\u001e𠚙􋊽\u0011o\u0007S@4\u0011VT_k􅫠𡥖D\u0010:ギ>UⰑ󱞔YkzU󸢔𪈯uejP􅄾᳒󰺮n\u0005\u00189~f&",
     "password": "g]:󸥴𤄚\u0000􅼺\u0018L􇿷\u001d`L+i⒓,&Y\u0000*\u00173En5C\u001eI(\u0015𢽧=\u0007&B󶈓c\u000bj\u0015C5\u001c*𣀟迦h2󱍳(筃󱼑6r\u0012\u0010Q𡞷m{􌙸𫞡Y#󻎪L\u0003줲᮲􈈪署𬭍l'7/竈\u0015R\u0001T#InO:F|j\u001f+<\t}j`6𖡚wl\u0014-a]󼔍 O(\u0017X󰙌?!𫚵\u0012,Q󶛅𑂍\u001cO儶󵟿{+\u0011\u0015\u0012눡\u000clk\u001b5u󿾥{B\u000bg\u0017걸\u0015+􊣝􈒟\\*mUn$\u0012m􎄩𠄘誤03􂤥󳏃𢄇2\u0010BE\u000ek𨱐b󺏓{🔆jv󷺛_ཹ􀊊?/V!YoY󽠩\u00057P􁎼(nf􉡪+\u001c\u0002/\u0010ᯊ;􃄷\u0010f𪱗_Qsvt}DFm\u0013_􈝈\u000c\u0007_;=E,6|cAH\u0007ᤂ𐨢y&𭀶𩍛敶\u0017o\u0008\u001a8/=!\u001a廘\u0019GD9+󴃭'y㎦\u000e\u0010\u0016\u0013\u0000Z5\u0017殚\u0010\u0001sMf5KAO\u0017{J \u0007꾸𢯔]g|\u0014󸃫,4\u0012𡨞𘆎ⱽ3􌾠az㚋e}𦆥<MDg1^\u001d)\u0014r7-\u0008E􅲭70󼲺v&\r\u001b0R+􋐼k#`\u001f&)w\u0015dn\u001d\u0015Y\r캛v\u0012",
+    "phone": "+97450398211",
+    "phone_code": "g5W5rIJFTLUrJkd9j9W3BzbyLEnW",
+    "picture": [],
     "sso_id": {
         "scim_external_id": "\n\u0002"
     },
-    "assets": [],
-    "email_code": "Ofo=",
-    "phone_code": "g5W5rIJFTLUrJkd9j9W3BzbyLEnW",
-    "label": ""
-}
\ No newline at end of file
+    "team_id": "00003fd3-0000-6075-0000-09cc00002b7a",
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_11.json b/libs/wire-api/test/golden/testObject_NewUser_user_11.json
index f875b7798fd..f6d0dd51aeb 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_11.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_11.json
@@ -1,45 +1,39 @@
 {
-    "expires_in": 378975,
-    "managed_by": "wire",
     "accent_id": 20313,
-    "picture": [],
-    "name": "󼤘\u0008b\\󲔐𫓜C􌏎$'𩫗wG7\u0016\u001e'\u0006\u000e\"0)뛠@\u001c󾿣\nay󹝕𪚳󾍣\u0016)𬴀\u0017􇙛h𨵽􊕣🡒:\u0007󿖺\u0006u\u0000t􈮴EK鳢\\𥖵𪫉e=F-􅆬<E𮈲ov",
-    "password": "ZJg𨸾𢴎𦰗uY\u0013~gq󷺋\u0019놊n*\u0013jE\u0005\u0002GUQ\u0002\u0018𝛲(/\u00076%FD􆮟|]\u000c\u001c󴖱<e\u0016MVBu䃰M;\u0000\u001aW WaI]\u0002a鯖\\Rw\t\u0001h'\u0010's\u001b_\n1E󿻗a\u0000O𩟮銡\u000e\r􃭔\u0000_\u0016\tDJb𦄅[𫮜􏗃\u001e#/foa厝앍B黷\u0010󲖞-+󼽿NṫL;𡃡𧲕L􇥾𡋻ktE\u000bj𓏽*􃽦V\u0000𦣦wn.(d`zIER4𥿱⿌W𠆤󼄹Jl𡋁󻙊sy𭺗จ\u0010Y\u0019\u0016𧁌S|d=@/qSjX\u0011.\u0012F<𦠥\u0001!8􆔬/v>󱠍F3e𤉺\r𦹞h4\u0000%]𐒡,c2S𗍍h𢰿𪡎\u0005_􆯊_偏\nQ\u0012fHy_\u0019pB􋛊E\u0010%\u000c\"􎭧*Y-\u00121𪯕o=4A<4􎯏&t]󽈮kDM\u0012Q[󰪍\u001e -yq|𦐇zIt_\u0012mRT9󷅛$l􁸂\u000e`MQ𓁑􀪂_\u0005k~N𨲥h_\u0004o􌍊Ub\u0019\u0007_\u000f󷐲f6'XKDLq󾸑8􋟟\u0000`󲰄\u0005kQ6Gf\u001c󸉶\u0012<pi𝅾 #ﻪZ鐊\u00023y\r]RH\u0012v􇄷\u000fC\u0005C?W􅻁𪳄e⋕W󰖩붭~]jB𮈽V莚\u0016?aP^􌠏\u0005󻘁,𪡊aD𪒇\u001d󼊒/ I}\t 匵󽾋\u0012O\u0008['?|wH1􅽓OUS+🥗\u0004IU􎊦\u000c\u0014\u0015[<𧠹𪋃\u0019=s􅀢\u000bZl\u0016\u001aBhbY󷘲]\u0005𬠊N\u0000-60@딒󶛟󷋴E\u0014c瘼𤷣𢼴LPM\u000e]X 𦁻\u0016􆠆󼊁t󺨞𘨊\u0004󼲞'&\nꈮ슝b\u000c!<|_\r옎\u0013𭳦\u0006{5\u001d<\u0000J󿡦OH𨩧;sy䢯LK𐒧h󱿗f\u001c!􍅸]\u001e,N𭿅\u0003ꨬ\r󷼇𩀋󹢼\u000bYVk\u0017",
-    "invitation_code": "hYCkzvFW6QzlqvDBJwPh",
     "assets": [
         {
-            "size": "preview",
             "key": "Up\u0012􇐗Z0\u0000􆤷Eꖘrn󿷧",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "g08",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "ᐷ",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "T\u0008󸕮\u001caiS",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ":󰎎􎕲\u000f,𝇙]",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "S^6􉍻烶\u000f1\u001dRd🚸䜌",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0015",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -47,33 +41,33 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "g",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "0\u001c氾334l",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "꼓C",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󽛁觡)>\u00191ﾹOr􍻔􊦞􄫱v\u0015",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "Z\u0001𑲙/\u000e漇s\\H\u0004E{\r",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "eb挀o󺔙\u0018\u0008󸪃\u000f󳂠n,",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -81,23 +75,23 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "W듨B}􂂪􈙙](𘌏I󿋇",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u001cHb<𧤡􄼷Z\\",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u001d\u000c\u001f𗙘\"􄚁+",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -105,22 +99,28 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𩋭j\u001a匨󵡣󾰨󼤮\u0018\u000bN^𤁴n",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "X8&r",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "H𭄳awcA􅊐3/",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "GBV8H4iTzUI=",
+    "expires_in": 378975,
+    "invitation_code": "hYCkzvFW6QzlqvDBJwPh",
+    "label": "󲏙󴆦􈿿\u0016u\u000e4M❲\rS􋀶o<9wHa嫡pxst",
+    "managed_by": "wire",
+    "name": "󼤘\u0008b\\󲔐𫓜C􌏎$'𩫗wG7\u0016\u001e'\u0006\u000e\"0)뛠@\u001c󾿣\nay󹝕𪚳󾍣\u0016)𬴀\u0017􇙛h𨵽􊕣🡒:\u0007󿖺\u0006u\u0000t􈮴EK鳢\\𥖵𪫉e=F-􅆬<E𮈲ov",
+    "password": "ZJg𨸾𢴎𦰗uY\u0013~gq󷺋\u0019놊n*\u0013jE\u0005\u0002GUQ\u0002\u0018𝛲(/\u00076%FD􆮟|]\u000c\u001c󴖱<e\u0016MVBu䃰M;\u0000\u001aW WaI]\u0002a鯖\\Rw\t\u0001h'\u0010's\u001b_\n1E󿻗a\u0000O𩟮銡\u000e\r􃭔\u0000_\u0016\tDJb𦄅[𫮜􏗃\u001e#/foa厝앍B黷\u0010󲖞-+󼽿NṫL;𡃡𧲕L􇥾𡋻ktE\u000bj𓏽*􃽦V\u0000𦣦wn.(d`zIER4𥿱⿌W𠆤󼄹Jl𡋁󻙊sy𭺗จ\u0010Y\u0019\u0016𧁌S|d=@/qSjX\u0011.\u0012F<𦠥\u0001!8􆔬/v>󱠍F3e𤉺\r𦹞h4\u0000%]𐒡,c2S𗍍h𢰿𪡎\u0005_􆯊_偏\nQ\u0012fHy_\u0019pB􋛊E\u0010%\u000c\"􎭧*Y-\u00121𪯕o=4A<4􎯏&t]󽈮kDM\u0012Q[󰪍\u001e -yq|𦐇zIt_\u0012mRT9󷅛$l􁸂\u000e`MQ𓁑􀪂_\u0005k~N𨲥h_\u0004o􌍊Ub\u0019\u0007_\u000f󷐲f6'XKDLq󾸑8􋟟\u0000`󲰄\u0005kQ6Gf\u001c󸉶\u0012<pi𝅾 #ﻪZ鐊\u00023y\r]RH\u0012v􇄷\u000fC\u0005C?W􅻁𪳄e⋕W󰖩붭~]jB𮈽V莚\u0016?aP^􌠏\u0005󻘁,𪡊aD𪒇\u001d󼊒/ I}\t 匵󽾋\u0012O\u0008['?|wH1􅽓OUS+🥗\u0004IU􎊦\u000c\u0014\u0015[<𧠹𪋃\u0019=s􅀢\u000bZl\u0016\u001aBhbY󷘲]\u0005𬠊N\u0000-60@딒󶛟󷋴E\u0014c瘼𤷣𢼴LPM\u000e]X 𦁻\u0016􆠆󼊁t󺨞𘨊\u0004󼲞'&\nꈮ슝b\u000c!<|_\r옎\u0013𭳦\u0006{5\u001d<\u0000J󿡦OH𨩧;sy䢯LK𐒧h󱿗f\u001c!􍅸]\u001e,N𭿅\u0003ꨬ\r󷼇𩀋󹢼\u000bYVk\u0017",
     "phone_code": "DjbUAo-oR5c59MDxSrR2TA==",
-    "label": "󲏙󴆦􈿿\u0016u\u000e4M❲\rS􋀶o<9wHa嫡pxst"
-}
\ No newline at end of file
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_12.json b/libs/wire-api/test/golden/testObject_NewUser_user_12.json
index 7dbedd8d62c..ac1d78c1399 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_12.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_12.json
@@ -1,29 +1,29 @@
 {
-    "email": "]󸼰,\u00177%\u0004\u00145^5𗨙𣾿\u001d䍕@xW)\u0006",
-    "phone": "+504111413588",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "bo-IL",
     "accent_id": 23561,
-    "picture": [],
-    "name": "㕔\u0017Y\u00146B^Ds 𨺼&\u0010𢦫_\u0017i/\u0003𦶑𣀈Z}9aj鎷V\u000cZ\"\u0012 \u001a\t󿁦1fx𬜅󹉉\u001b𣅙UQU0𭚾\u0017vRS𘆙\u0012h\u0004x𡵦\n󻭶x#-􄥽󰪏_\u0002󳓏\\\u001d𢲫􁙅𩥗saBlO\u0012J.p\u0004noU2#\u0012\u001a􇂀`\u0000@\u0011\u001a",
-    "password": "\u0005k𢝚􇄇𦓯𥨿[\n SW'\u0007뜦\u0014\u0007󿾨3􈇜(h􃣻􆰥\u0001\u0000\u0014^1$\u001a#XO􆭓𠔏뮷fJ㌯Nuo\u0007冒9𥭒xL[l󱮑k 쯑\u001de/E\r g\u00108liG􀪶\u000c\"􏺾󿣜raLD,􀐱!={\u0017[\n􎹱L))\u0004\u0017\tT𢋆􄑶󾱭\u0002L\u0016𤗒=c~\u001a\u0013V𐴤5𨋟\u001d􉀪\u0010WZ\u0002gLh&hఘ\nb\u0008ￔ\u001d{gfR\u001cp\r\u0010\t\u0018󼧴[\r𩾊􁄲\u000e\u001aJ𖽙\u0011F[2c𨒳$󵻾cwB6P􇝡𪩗9B}:𬀱3還[7\u0013OM\u0016%F頩.h𑲱𞺧(\u000c𫫊N{\u001d&*\u001a\t\u0011󳽤󹝑􇊍殱$DO2룟󷚐󶀎콱<pUO\u0018m\u0017󷡥\u0003D\u00032\u000cL$拘Zi?Z8N𤽉E\\D󻬧XS]\u0012,t(𮠘𗈷^W\u001e􆜪A󳮻\u0013l_􄫲󻓱HM\u000e\u0013S󹤶c#\u000e遚𮄌󾂻󵐝|𓆇\u0004𩳿󵯬󾿼Z])x㽥l\"nFY'PI2M\u0002fO𮈪\u0016^*>􃺬\u0015$8r𡚔u𬴦b 2󻑧\u0016𥖹}A\u0001Y󼣟S󶁊#\u0003\u0001(u\\𧹱T\u001a!􂓱h\u00120Xx'𠔹!\u0015\u0010A9%\u0005\u0012p𤾹𬖷󶏩%S@@!d㋖=l\u0019$@% h𖡤@6;U󿢶@1b􄓬?g;s{'𩂉*v󵁋{+.┫Q𠖰u┈:Vg4]:𡳤5\u001cz4紏􏇬篇󱽈2!x3J󿷔Sd#X\u0000xJ􅓍O5\u000c𣷖f\u0019\u0008A\u000cU𧀢$\u0002C󸐗\u000eL\u001d\u001f\u0014.12𦦃\u0011𥦀豕eA\u0002\nX󾻋\u001fW?\u0018􃱲pSCi0軳峔^\u0016(\u001d뿞\u0014􉚃\u0016\u0017󺴍\u0008Z⣺13d󺑝S􇷉7𗫫󳊶*LQ𭣟nS\u001a\u0003L\u0005v\u0008(􅜽S𑑗\u001a󸄅)BT𩦹\u00129\u0017;𫩈𠴈'󿷐&刡󹩝\u0018d􈎢J􌙛ZdoMR+~<𮭧laS𑻤l󻹣\r𨭝:􍉯f>Fe􆬯i\u0016V/L@󾱙e󸞲7\u0001v\u00119󺛗!L\u0010X%\u001djx\u0018􆭺\u0016]w7W\u0001+󻛈E\u0014:渧𦕂ᔿ\u0018\r\u000f\u0005㿓\u001e\u0016Xb1\u0012Et𭹿㕿Ez􀦉\u001fo\u0010󹹊䫿𪼨e𮟩8\u0016\u0018󶓆{\u0000䢾jF\u0017,􏙾𮢥𫣆U\t􍴼Ku􍁌I?𝄽p\u001f\u0006MS*𦚬𡵼魈󰄥 􃌰ڇ󺣋𣮡\u0007U?𮙞V^\u0006/:l-.Uzz\u0016\tm#􄅻XcY*􍣜\u000c􃨛+\u001f𘩸Y󲫙7\u0010\u0001rL<+K􂖫􎗼󷵝$eᦞ(A\u001c\n",
     "assets": [
         {
-            "size": "complete",
             "key": "\u0011c𪇨\u001a󱪍!𮙏\u0008;\u0014u",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "IDVH􄠕G$kZ",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "ka\u0013\u001fD􅧫쉰_",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "email": "]󸼰,\u00177%\u0004\u00145^5𗨙𣾿\u001d䍕@xW)\u0006",
+    "label": "\\󳎶󷇆tn}<ꑕ幘^\u0010rAi􂉮j",
+    "locale": "bo-IL",
+    "name": "㕔\u0017Y\u00146B^Ds 𨺼&\u0010𢦫_\u0017i/\u0003𦶑𣀈Z}9aj鎷V\u000cZ\"\u0012 \u001a\t󿁦1fx𬜅󹉉\u001b𣅙UQU0𭚾\u0017vRS𘆙\u0012h\u0004x𡵦\n󻭶x#-􄥽󰪏_\u0002󳓏\\\u001d𢲫􁙅𩥗saBlO\u0012J.p\u0004noU2#\u0012\u001a􇂀`\u0000@\u0011\u001a",
+    "password": "\u0005k𢝚􇄇𦓯𥨿[\n SW'\u0007뜦\u0014\u0007󿾨3􈇜(h􃣻􆰥\u0001\u0000\u0014^1$\u001a#XO􆭓𠔏뮷fJ㌯Nuo\u0007冒9𥭒xL[l󱮑k 쯑\u001de/E\r g\u00108liG􀪶\u000c\"􏺾󿣜raLD,􀐱!={\u0017[\n􎹱L))\u0004\u0017\tT𢋆􄑶󾱭\u0002L\u0016𤗒=c~\u001a\u0013V𐴤5𨋟\u001d􉀪\u0010WZ\u0002gLh&hఘ\nb\u0008ￔ\u001d{gfR\u001cp\r\u0010\t\u0018󼧴[\r𩾊􁄲\u000e\u001aJ𖽙\u0011F[2c𨒳$󵻾cwB6P􇝡𪩗9B}:𬀱3還[7\u0013OM\u0016%F頩.h𑲱𞺧(\u000c𫫊N{\u001d&*\u001a\t\u0011󳽤󹝑􇊍殱$DO2룟󷚐󶀎콱<pUO\u0018m\u0017󷡥\u0003D\u00032\u000cL$拘Zi?Z8N𤽉E\\D󻬧XS]\u0012,t(𮠘𗈷^W\u001e􆜪A󳮻\u0013l_􄫲󻓱HM\u000e\u0013S󹤶c#\u000e遚𮄌󾂻󵐝|𓆇\u0004𩳿󵯬󾿼Z])x㽥l\"nFY'PI2M\u0002fO𮈪\u0016^*>􃺬\u0015$8r𡚔u𬴦b 2󻑧\u0016𥖹}A\u0001Y󼣟S󶁊#\u0003\u0001(u\\𧹱T\u001a!􂓱h\u00120Xx'𠔹!\u0015\u0010A9%\u0005\u0012p𤾹𬖷󶏩%S@@!d㋖=l\u0019$@% h𖡤@6;U󿢶@1b􄓬?g;s{'𩂉*v󵁋{+.┫Q𠖰u┈:Vg4]:𡳤5\u001cz4紏􏇬篇󱽈2!x3J󿷔Sd#X\u0000xJ􅓍O5\u000c𣷖f\u0019\u0008A\u000cU𧀢$\u0002C󸐗\u000eL\u001d\u001f\u0014.12𦦃\u0011𥦀豕eA\u0002\nX󾻋\u001fW?\u0018􃱲pSCi0軳峔^\u0016(\u001d뿞\u0014􉚃\u0016\u0017󺴍\u0008Z⣺13d󺑝S􇷉7𗫫󳊶*LQ𭣟nS\u001a\u0003L\u0005v\u0008(􅜽S𑑗\u001a󸄅)BT𩦹\u00129\u0017;𫩈𠴈'󿷐&刡󹩝\u0018d􈎢J􌙛ZdoMR+~<𮭧laS𑻤l󻹣\r𨭝:􍉯f>Fe􆬯i\u0016V/L@󾱙e󸞲7\u0001v\u00119󺛗!L\u0010X%\u001djx\u0018􆭺\u0016]w7W\u0001+󻛈E\u0014:渧𦕂ᔿ\u0018\r\u000f\u0005㿓\u001e\u0016Xb1\u0012Et𭹿㕿Ez􀦉\u001fo\u0010󹹊䫿𪼨e𮟩8\u0016\u0018󶓆{\u0000䢾jF\u0017,􏙾𮢥𫣆U\t􍴼Ku􍁌I?𝄽p\u001f\u0006MS*𦚬𡵼魈󰄥 􃌰ڇ󺣋𣮡\u0007U?𮙞V^\u0006/:l-.Uzz\u0016\tm#􄅻XcY*􍣜\u000c􃨛+\u001f𘩸Y󲫙7\u0010\u0001rL<+K􂖫􎗼󷵝$eᦞ(A\u001c\n",
+    "phone": "+504111413588",
     "phone_code": "AQmcp-TSIeo05ixCVAzzxMGsAtTH7l0=",
-    "label": "\\󳎶󷇆tn}<ꑕ幘^\u0010rAi􂉮j"
-}
\ No newline at end of file
+    "picture": [],
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_13.json b/libs/wire-api/test/golden/testObject_NewUser_user_13.json
index a65ff403986..47700208af5 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_13.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_13.json
@@ -1,19 +1,19 @@
 {
-    "uuid": "00000000-0000-0000-0000-000000000000",
+    "accent_id": -32104,
+    "assets": [],
+    "email_code": "8XW3_eppEXD038Pz14guN-pLnL6rR1538NZxVA==",
+    "label": "^\u0010􊘑󸯿\t𣻨6Th𘗒􍴷I<UgH𫕶𪦶C",
     "locale": "uz",
     "managed_by": "scim",
-    "accent_id": -32104,
-    "picture": [],
     "name": "􍢟mx0Dꅼ􃄁󴳥\u0012\u0007\u0008W\u0011PY\n𥞞A_𥭱jiL\u0015󾬬;~_\u0011y|\u000fp\u0019=\u0019𤍝𨍞K\u0019\u0008VV\u0003l\u0001p󴩝V\u0011𫱹0`xPp:d􆛆\u0003󶔱\u000f􄦂Kb󲚘󻔤\u000c𢡲k􏁔𧪴+\u0014\u0007c𮃫𭺚G𛅑\rC0;gKQ痖:Sl\u0000\u001a\u0001\u001c\u0012TBm$\u001dO\u0015BRw厦\u0018󸺬㷠",
     "password": "K\u0008U󰇪W􇓛i%\u0016i\u0008􄷿\u001a\u001bP󴛧N\u0008󽯞\u000e\naqJ𣝶eH\u001fH좁􌉡􌀎x􁧗󷞡\"}: 𬑤\"𥚀󷎫7lZ.􃧝H\t𬚟l:rt4x4𩲏,󱂟`",
+    "phone_code": "byyj1Wn5lFbsGpe3VZ7pERkfpOujdm5UzTIy2ok=",
+    "picture": [],
     "team": {
-        "icon": "KH\u0010繯\"󱘱\\k$l𮋤\u000f5[rG?􏵂첼g^󼾐kW󷒷7+􍖿\u00123W,bἱ#W)\\󵵭󼌆󾇻K]s\u000b𧏥\\92\u0013\u0002L坱\u0013O󻐽\u0015谽[􎛳E􄦬媑",
-        "name": "[3Y\u001eF$r9,/1\u0014쨊*弉\u0011􊥝蓯I]\u000c#\u0018\u0019ITc𧍷󶱙􁡾\u001b#\t󾡄ic\u0008U􂖓\u0016'􏶱谢0xC󿔦\u001b𦐵1U뼏</i2\u000c\u0013\u0018)\u0004\u000bB􅩮Gv𪭸L🐈@5\u0017嬞M\r&oٌHBKᕉ𤚘\u0004+\u0004}󷛨\u000b\u0006\u0005􏽨\u0002\u000e\\􇞜\u001amN🞍\u001e~􎷞󱅧8J\u00105I𭒦O󼝄\u0003\u00182FZ󹘭B\u0011\u0016聰\u001fh𔕉潏ゝ+\\V󼍚D67􎧫C𨥤R\u0012\u001a󺒥pJTN]䤰\u0005j𤳛jAy\u0013r\u0019zLH쀼en[F𗮎aቘ9I*\u0019x󴹃n\u0011ZZ\\\u001d_ wwM7\rMប2M짔󸨔y\u000c!唢\u001bV\u000b;󿁁\u000bq}켷J\u0001.S󺻏8觯",
         "currency": "VEF",
-        "icon_key": "󺰝𨙮@\u0010𫍍>'𨛬/\u000bV<^zu\u0019\u0003\u001b>𪢗𗛇A"
+        "icon": "KH\u0010繯\"󱘱\\k$l𮋤\u000f5[rG?􏵂첼g^󼾐kW󷒷7+􍖿\u00123W,bἱ#W)\\󵵭󼌆󾇻K]s\u000b𧏥\\92\u0013\u0002L坱\u0013O󻐽\u0015谽[􎛳E􄦬媑",
+        "icon_key": "󺰝𨙮@\u0010𫍍>'𨛬/\u000bV<^zu\u0019\u0003\u001b>𪢗𗛇A",
+        "name": "[3Y\u001eF$r9,/1\u0014쨊*弉\u0011􊥝蓯I]\u000c#\u0018\u0019ITc𧍷󶱙􁡾\u001b#\t󾡄ic\u0008U􂖓\u0016'􏶱谢0xC󿔦\u001b𦐵1U뼏</i2\u000c\u0013\u0018)\u0004\u000bB􅩮Gv𪭸L🐈@5\u0017嬞M\r&oٌHBKᕉ𤚘\u0004+\u0004}󷛨\u000b\u0006\u0005􏽨\u0002\u000e\\􇞜\u001amN🞍\u001e~􎷞󱅧8J\u00105I𭒦O󼝄\u0003\u00182FZ󹘭B\u0011\u0016聰\u001fh𔕉潏ゝ+\\V󼍚D67􎧫C𨥤R\u0012\u001a󺒥pJTN]䤰\u0005j𤳛jAy\u0013r\u0019zLH쀼en[F𗮎aቘ9I*\u0019x󴹃n\u0011ZZ\\\u001d_ wwM7\rMប2M짔󸨔y\u000c!唢\u001bV\u000b;󿁁\u000bq}켷J\u0001.S󺻏8觯"
     },
-    "assets": [],
-    "email_code": "8XW3_eppEXD038Pz14guN-pLnL6rR1538NZxVA==",
-    "phone_code": "byyj1Wn5lFbsGpe3VZ7pERkfpOujdm5UzTIy2ok=",
-    "label": "^\u0010􊘑󸯿\t𣻨6Th𘗒􍴷I<UgH𫕶𪦶C"
-}
\ No newline at end of file
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_14.json b/libs/wire-api/test/golden/testObject_NewUser_user_14.json
index 7bc60bb7bf2..acf1017731f 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_14.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_14.json
@@ -1,24 +1,18 @@
 {
-    "team_code": "hhaIkzK5fTdyr4CLcPzJg9oj1G2WpaOQ5Q==",
-    "expires_in": 143078,
-    "locale": "li-UM",
-    "picture": [],
-    "name": "U씢󼭏\n{\u0005APw𧋚\u0012󲞚󺾰𗔂𬜖\n\u0012\u0004\u0008{P\u0014𛇸7I󽡡^I2M랆K󲃹嵤.k\u0018\u0010#:b\u0006|i.M=\u0005o𩰛\u0012l\u000e",
-    "password": "#\u000c\u0000*0󿥌􇄤h,[쎙EvR]j(󸆁$ F\u00181􎙫;u(H=蓪35E󵏖\u0018Py$^;[\u0011{\u0000df\u00031ꓓ$D􄍵\u0017􄏢!@뼰})vF\t0q뽟c𘘥\u001c\u000b$0\u000f􊟎􇘓h\u001a{󱉴u𢳟⩝\u0010\u001a셶􅘎}🂡P\u0014z\"0𓐝󼉜􇜄,\u0007,1𤁟s𡲭 呖\u0000􈅥𦗆8𧿙􏠿8)\u000bEzph􆨼Z<𫻀𤇣eM\u00145\u00135,>W\u0008\u0014>􀳥u\u000c9\u0010U𝗔W8/;[f1\u00183.𑆮Fw1\u0008\u000e=󿷛Q\u0019lgZPCjAFm𭤍3X\u0003&󺫿\u0005u􁟎𖢠􈓅󴡩CT!+st#%󲳂'W1~\u001eD󺹸h𣱪㾧\\\u001c􍁀C𘂥R_(\u0008𠗿&>\u001e;H@v_侔󿋋Hg+m󵟺w`􎙯\"􇃈B106Q󱔯X𬊋󼡥𨘧󷏌P\u00141ꑌX􂚨󸭐?VD𧉞䛊\u0001ii􅳆\u0004nD䈖S1𐎇\u000b}􌖆훒>?𩟺T=\n\u0018BAi疉𩝡\u000c,&=󻔇g󺳎f9\"􀼬\u0015pe󰤘\u0017􏪯𦔵󸴆𬴋,\u0000j𤙜1䜩I󷊆[<*S]<7oḄ󽮧d뚗􃐗6y7릠\u000fEeE.S:_$LBG𥼟*ci5俖PFl𪣉\u0014E0b\u0002㈉/;潚p\u0011𐹺婇;m\u0008\u0012P@YBve\u0008\u0004􀷚v_6/ⅾ\\op駈H$0󻚉\u0019$Y\u0007P􊴔󻝸*\u0004fj{\u0012'3*ﷂv𣩺UW\u0001m􁡵䈅i\u0017\u0008未!S`w\u0006hJ\u0008󵚼/Deu𬑀􆦊\u0018z[",
     "assets": [
         {
-            "size": "complete",
             "key": "6𡾮\u001a󰨭:\u001b\u000bҐ\u001a󾝉",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "R+䩊䈖\r,i\u0013Y\u001f",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -26,28 +20,28 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "*𤧿\u0017",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "9~|e({\u0006",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0012𝓨L\u0013W􃴧􍣅2k􍙒~*/u",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "O\u001eO`",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -55,13 +49,13 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "[\u001bj󿃻F)FH󵱠Z􍤟􂶬1\u0017\"",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "P󼶭B\"|梟𬋇𠢋.dy&􄞤7,",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -69,25 +63,31 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0012Uw\u0017\u0004Z󸗟\u0010y",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ":𡭋󴯙\u0019\u0016S",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "aXP𠐵",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0017^ 󰠽W<0녜=",
+            "size": "preview",
             "type": "image"
         }
     ],
-    "label": " U󶁌>\u0005Rd􏗕𡜬\"$p𫡲G[\u001a<U\u00125r@v\u0005n𭖱_}"
-}
\ No newline at end of file
+    "expires_in": 143078,
+    "label": " U󶁌>\u0005Rd􏗕𡜬\"$p𫡲G[\u001a<U\u00125r@v\u0005n𭖱_}",
+    "locale": "li-UM",
+    "name": "U씢󼭏\n{\u0005APw𧋚\u0012󲞚󺾰𗔂𬜖\n\u0012\u0004\u0008{P\u0014𛇸7I󽡡^I2M랆K󲃹嵤.k\u0018\u0010#:b\u0006|i.M=\u0005o𩰛\u0012l\u000e",
+    "password": "#\u000c\u0000*0󿥌􇄤h,[쎙EvR]j(󸆁$ F\u00181􎙫;u(H=蓪35E󵏖\u0018Py$^;[\u0011{\u0000df\u00031ꓓ$D􄍵\u0017􄏢!@뼰})vF\t0q뽟c𘘥\u001c\u000b$0\u000f􊟎􇘓h\u001a{󱉴u𢳟⩝\u0010\u001a셶􅘎}🂡P\u0014z\"0𓐝󼉜􇜄,\u0007,1𤁟s𡲭 呖\u0000􈅥𦗆8𧿙􏠿8)\u000bEzph􆨼Z<𫻀𤇣eM\u00145\u00135,>W\u0008\u0014>􀳥u\u000c9\u0010U𝗔W8/;[f1\u00183.𑆮Fw1\u0008\u000e=󿷛Q\u0019lgZPCjAFm𭤍3X\u0003&󺫿\u0005u􁟎𖢠􈓅󴡩CT!+st#%󲳂'W1~\u001eD󺹸h𣱪㾧\\\u001c􍁀C𘂥R_(\u0008𠗿&>\u001e;H@v_侔󿋋Hg+m󵟺w`􎙯\"􇃈B106Q󱔯X𬊋󼡥𨘧󷏌P\u00141ꑌX􂚨󸭐?VD𧉞䛊\u0001ii􅳆\u0004nD䈖S1𐎇\u000b}􌖆훒>?𩟺T=\n\u0018BAi疉𩝡\u000c,&=󻔇g󺳎f9\"􀼬\u0015pe󰤘\u0017􏪯𦔵󸴆𬴋,\u0000j𤙜1䜩I󷊆[<*S]<7oḄ󽮧d뚗􃐗6y7릠\u000fEeE.S:_$LBG𥼟*ci5俖PFl𪣉\u0014E0b\u0002㈉/;潚p\u0011𐹺婇;m\u0008\u0012P@YBve\u0008\u0004􀷚v_6/ⅾ\\op駈H$0󻚉\u0019$Y\u0007P􊴔󻝸*\u0004fj{\u0012'3*ﷂv𣩺UW\u0001m􁡵䈅i\u0017\u0008未!S`w\u0006hJ\u0008󵚼/Deu𬑀􆦊\u0018z[",
+    "picture": [],
+    "team_code": "hhaIkzK5fTdyr4CLcPzJg9oj1G2WpaOQ5Q=="
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_15.json b/libs/wire-api/test/golden/testObject_NewUser_user_15.json
index 2205a8284c1..d15beaf4da9 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_15.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_15.json
@@ -1,65 +1,57 @@
 {
-    "phone": "+430123790",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "uz-RS",
-    "managed_by": "scim",
-    "picture": [],
-    "name": ")\u0016V%9X,%𥤊\u001eX:\u000f\tEt󽭑C{\u0016\u000e𭦳X)!ns\u00008Pf>PW1Il@Koo􆍰\u0019;󰘫H7\t|],C!lf~_󴬼U!􋲙󷗚!\u001c\u0012s;\u0010 𩨷󸖊𩌇\u001f\u001e&[\u0015\u0007\u0012󲧚S'W\u0013.~\u000e􃔌󷜪Q𐭜FFxnmc<q𒆦􃰊/",
-    "password": "Tf;󼸣t}\r\u000f\r씱n\rl𩥽T鐐,1󼉺\r(~\u0016K>y\u0004Lxrᯖ`:󷦕] x᭶\u0013赌% =\u0015\u000c6S\u001d󺳕p!\u0007𡊱(;!$\u000f]\u001f`5\u0012󹿾􊏹􆄶}9=O𡧨󵠚(I\u0018\u0019\u0018𮁀󽺟]'奚\u0012􍼆􈧪@R\u001a\u0015𘔺326\u0006􍾤sy𦛇聆Kp\u0006B~M󼹅􁘯ty0pJK\u0002zv eWY􌱬v\u001bG\u0018=󶊆\u0010[TZ􄶇𫝠󱽛`𗚻\u001b󿡐d\u0019\u0008\u001ed~\u0019󸆑𭗧爑L\t,A𠡈\u000f))Z\u0017{𡫱A?\u0015%hS+𤭌ᔌ_𤊚:dR,j𢛿(_'j{O𠡑\\X󶪩S􀊮wTD󼓣𧊞R寢\u0011\u0011􌝫:L􉇋p>\u0013岘󺿷\u0000󹃉􇒸A􉾉\"g+PD\u0001tk?N󷗹쭡𩯡_AdL2󸒤./b\u001b\t)\u001c\u001c7:\u0017󺚒P\u0007GEwk􊹟-)\u0013p0\nUG\u0005PV=齰\u0004M􄚆_js\u0003$2^YaP󽬶僯H@j䟸r𮇧Y\u0012*u𨪯󸽼-𧶔\u001cf~ZI[5\t\u0006𫪱󰻀𣘐EH𡡤J⇊Tun􉫊\u0006uO:`(0𧝅󱅉]_󳽢󵛳\t\u0002\r鲡v𩓠o􆇈󽽂h󵗽􏬾𣪹! \n\u0016'J.󻒠󳊖\u000b4\r{\u0015\u0015bPQ~􊦮3\u001f􇋻<󱘒o`q J뼲]c\"󵫅\u000b󺇾Q󿸞𤘑󱪹軈N>;}\u001d=TO\u001f 6\u001d\u001aWy8CZN둓I\u000e􎤽涚P낃I7l?\u00083\u0002v㘝㶉\u001e􋎰\u000e\\􍱑\ne뜚𧇦0mS\u0018󹈇𦗼ng􋊫xTt/옑Id}b跺𢡒v\u0005|;CसZ𐛞\u000b&C\u000eE9O5\u001b􊨾w*}\u0019Q𫥭\u0006􆰷𤟔󿕜w~𔒓7TL_\nH􂔉$𛄐􇰟\u0005UPQJ㲤\u001eS􄥙\r$\u0018U󽊭wT~:쉀/🕽`&𡞎(𫆉\u000bn\u00101𢭝\u000e􀛚)M󲡉􅫻<'=d\u0011G𨮕\u0008;\u00038g,;𮕠Z󺓅\u0011󲀢{trA𫦽5Xe.𢲶,'R\u001a<iﺈ\u001f󱥏\u00052^ s𞄊uL𖠿6sꉹ1t\u000e\u0018+U{D,U􍯩뇸Wka$󽱀d4r\n>聹N􀗤𤙎𡓯􃂭󴎓\u0017mW􋆙\u0003\t󶶊dQ𗮭d]#\u0019E;𠙃Y1\u0000󻝛\u001a\u001e󿻤⩼\u00073𣰏\n냡󶪟a𢜍s\u0005LZl8Dq\u00173Vp5\"\t\u0004󶹆n~󷉇􏑧HD-󽱹󰍑𬋔\u0006uQj􇌆\u001cx秨\u001b\t$O\u000b󱤓BI#4󳡎\\􆦝􀪶/D\u001b􉆙pX󴧞f]%S2𝗏z",
-    "invitation_code": "fzNEyAxbDTJfagCaVbatNQwszvNSxwsW-A==",
     "assets": [
         {
             "key": "ۣ􌎔󱽴͎F\u0019󹏿A8󵕨t~K\u0011",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "}ei𧍏",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "{rF_\u0006􆟏\u000eu\u0019-6",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "`q",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "%泃\t􊅣\u000ePb",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􂩂\u0000\u0005𝀴cdCD'",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0014\u000fw",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "lC\u0010\u0006🇹􎴦󳬠02􁥉T𗴎\u0000􃽜",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "i\t",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𠠐FŤ􀣉4p~\r",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -67,18 +59,18 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "d\u001ae\u001c\u0017󰌀4\u001f\u001e\u0005",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "O謴G𘢶/~TYE\u0005󼅒K",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "6K.^󰕵",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -90,52 +82,60 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "O𩝬5𪦤H󸻱\u0018𥺇",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󵇲󲎈󸸂iMl󷔲g\u000c\u0004蕌􍍨",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "h~惞le󰞕╌8\u000baV~",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "2!􉯭\t\u000f\u0006𪈂ᘾo",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "a􋲩[mz@?P^",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Y\u0014c󺪶",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𢓢𨤨\\\r\\󰾵z\u0010v\u0005R\u0000\u0004m𐌵",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0007L󶁋LhVA㋀𬝿<b",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􇁦",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "pFdCBFBAtFfC",
+    "invitation_code": "fzNEyAxbDTJfagCaVbatNQwszvNSxwsW-A==",
+    "label": "󵎇E`\u001e󳶟GjC]YD6\u0010HZ",
+    "locale": "uz-RS",
+    "managed_by": "scim",
+    "name": ")\u0016V%9X,%𥤊\u001eX:\u000f\tEt󽭑C{\u0016\u000e𭦳X)!ns\u00008Pf>PW1Il@Koo􆍰\u0019;󰘫H7\t|],C!lf~_󴬼U!􋲙󷗚!\u001c\u0012s;\u0010 𩨷󸖊𩌇\u001f\u001e&[\u0015\u0007\u0012󲧚S'W\u0013.~\u000e􃔌󷜪Q𐭜FFxnmc<q𒆦􃰊/",
+    "password": "Tf;󼸣t}\r\u000f\r씱n\rl𩥽T鐐,1󼉺\r(~\u0016K>y\u0004Lxrᯖ`:󷦕] x᭶\u0013赌% =\u0015\u000c6S\u001d󺳕p!\u0007𡊱(;!$\u000f]\u001f`5\u0012󹿾􊏹􆄶}9=O𡧨󵠚(I\u0018\u0019\u0018𮁀󽺟]'奚\u0012􍼆􈧪@R\u001a\u0015𘔺326\u0006􍾤sy𦛇聆Kp\u0006B~M󼹅􁘯ty0pJK\u0002zv eWY􌱬v\u001bG\u0018=󶊆\u0010[TZ􄶇𫝠󱽛`𗚻\u001b󿡐d\u0019\u0008\u001ed~\u0019󸆑𭗧爑L\t,A𠡈\u000f))Z\u0017{𡫱A?\u0015%hS+𤭌ᔌ_𤊚:dR,j𢛿(_'j{O𠡑\\X󶪩S􀊮wTD󼓣𧊞R寢\u0011\u0011􌝫:L􉇋p>\u0013岘󺿷\u0000󹃉􇒸A􉾉\"g+PD\u0001tk?N󷗹쭡𩯡_AdL2󸒤./b\u001b\t)\u001c\u001c7:\u0017󺚒P\u0007GEwk􊹟-)\u0013p0\nUG\u0005PV=齰\u0004M􄚆_js\u0003$2^YaP󽬶僯H@j䟸r𮇧Y\u0012*u𨪯󸽼-𧶔\u001cf~ZI[5\t\u0006𫪱󰻀𣘐EH𡡤J⇊Tun􉫊\u0006uO:`(0𧝅󱅉]_󳽢󵛳\t\u0002\r鲡v𩓠o􆇈󽽂h󵗽􏬾𣪹! \n\u0016'J.󻒠󳊖\u000b4\r{\u0015\u0015bPQ~􊦮3\u001f􇋻<󱘒o`q J뼲]c\"󵫅\u000b󺇾Q󿸞𤘑󱪹軈N>;}\u001d=TO\u001f 6\u001d\u001aWy8CZN둓I\u000e􎤽涚P낃I7l?\u00083\u0002v㘝㶉\u001e􋎰\u000e\\􍱑\ne뜚𧇦0mS\u0018󹈇𦗼ng􋊫xTt/옑Id}b跺𢡒v\u0005|;CसZ𐛞\u000b&C\u000eE9O5\u001b􊨾w*}\u0019Q𫥭\u0006􆰷𤟔󿕜w~𔒓7TL_\nH􂔉$𛄐􇰟\u0005UPQJ㲤\u001eS􄥙\r$\u0018U󽊭wT~:쉀/🕽`&𡞎(𫆉\u000bn\u00101𢭝\u000e􀛚)M󲡉􅫻<'=d\u0011G𨮕\u0008;\u00038g,;𮕠Z󺓅\u0011󲀢{trA𫦽5Xe.𢲶,'R\u001a<iﺈ\u001f󱥏\u00052^ s𞄊uL𖠿6sꉹ1t\u000e\u0018+U{D,U􍯩뇸Wka$󽱀d4r\n>聹N􀗤𤙎𡓯􃂭󴎓\u0017mW􋆙\u0003\t󶶊dQ𗮭d]#\u0019E;𠙃Y1\u0000󻝛\u001a\u001e󿻤⩼\u00073𣰏\n냡󶪟a𢜍s\u0005LZl8Dq\u00173Vp5\"\t\u0004󶹆n~󷉇􏑧HD-󽱹󰍑𬋔\u0006uQj􇌆\u001cx秨\u001b\t$O\u000b󱤓BI#4󳡎\\􆦝􀪶/D\u001b􉆙pX󴧞f]%S2𝗏z",
+    "phone": "+430123790",
     "phone_code": "8VeH6NTGEGaO1xqt2kUhVxoO",
-    "label": "󵎇E`\u001e󳶟GjC]YD6\u0010HZ"
-}
\ No newline at end of file
+    "picture": [],
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_16.json b/libs/wire-api/test/golden/testObject_NewUser_user_16.json
index 21ec8a6fd39..a8af7c36757 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_16.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_16.json
@@ -1,34 +1,28 @@
 {
-    "email": "R𡭷쥢􊿊\nTAS5z|q﨟z}㊟;\u00178\u0010@𐐒𠀘ZBqrtK\u000ct􀦁h\u00088iU.&",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "xh-TM",
-    "managed_by": "scim",
-    "name": "\u0002nH󠀯\u0013􅊎\u0014\n𤧠󺋠𤡖\u0019`I~Q{\\:󲬆\u0013H\u001dem􂕵!󵕣\r\u000f\u0011B􊓲i\u001d\u0015\u001bY𧘒􀝡軝G𩚆UOB*Q\u001d]M\u0016",
-    "invitation_code": "krEHX0N2tg==",
     "assets": [
         {
-            "size": "preview",
             "key": "\u0013󿴱\u0006!FC",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "f{\u0005",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Hl\u000e\n8\u0005~\u0019􋨱B",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􎺞mᢎ𨓙x\u00114c⚨o%:",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\\57FFJ􄘤8F",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -36,13 +30,13 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "(E哈hxM\"_",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0016Q\u000f7z.zs𐨗Z",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -50,13 +44,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "h\u0005R󴽃𠤑w]sc󻙏쥒\u0011`!",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "p\u000f𪖀",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -64,8 +58,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "I(",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -73,23 +67,23 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0017􉡇㇢𤀣󳃢#2{6Gwz",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\\󿱢8n[m𝆁𖢑󺰎L𩌤\u0016Yᴀ'",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0000/dn\u0010",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󿛏𦵱8i\u001a",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -109,27 +103,33 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󿷇v5󳞳'",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "3\u0008\u001f󱗈𦏞󴷻\u0018\u0001?𪿼\u0001",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "rZ𠪹l𭤫k𥥤\u000b􉰋繩Jt\u001d",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "2𡨘-",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "email": "R𡭷쥢􊿊\nTAS5z|q﨟z}㊟;\u00178\u0010@𐐒𠀘ZBqrtK\u000ct􀦁h\u00088iU.&",
     "email_code": "sQZw_A==",
+    "invitation_code": "krEHX0N2tg==",
+    "label": "𧳡ਉ\u001b`c&𦷐캻9b\t",
+    "locale": "xh-TM",
+    "managed_by": "scim",
+    "name": "\u0002nH󠀯\u0013􅊎\u0014\n𤧠󺋠𤡖\u0019`I~Q{\\:󲬆\u0013H\u001dem􂕵!󵕣\r\u000f\u0011B􊓲i\u001d\u0015\u001bY𧘒􀝡軝G𩚆UOB*Q\u001d]M\u0016",
     "phone_code": "5dy6ya1yHl7TyDF03xClFXFT",
-    "label": "𧳡ਉ\u001b`c&𦷐캻9b\t"
-}
\ No newline at end of file
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_17.json b/libs/wire-api/test/golden/testObject_NewUser_user_17.json
index 135154c63ce..8f9aba0b6a7 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_17.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_17.json
@@ -1,16 +1,9 @@
 {
-    "phone": "+479088519197",
-    "locale": "rw-EG",
-    "managed_by": "scim",
     "accent_id": -657,
-    "picture": [],
-    "name": "A6\u0013𩑇𨾲O\u000eDu5C󷋣\u0016󽸕K3R𖦞󷥯\u001dl󼓐\tl\u0007Rm-󶷿\u0001𖨫&z宎8􆼺Ho𥼶,3운s",
-    "password": "%\r\u001d䷑F\u0004(􅠶𒔈􍩏𥿌\nqc\u000bWiYNwG𗧚\u0006/\u0016d\u000f`9 _𫌖󰱹􈰀47􇈜O)\u000c􄠑w􍆜+lf𩎖rE\r\u0016\u0011󴠋E󽠕𥃪Vo\u001e}H\u0013􏖼\\[\u0001\u0003a\u0001e󶠜\t'hg+r7h\u001cY[<q\u000c􂢡􃝌Vd{胁𥉃OG0Kw􏯘梡\u001d󻨿Y󹩚\u0011\u0008𢋴𤱇#𦀬\u0012ZZ􀞤𫏋쾆\u0018􃾹6\u001eY>\u001d2􃟩uw􍾬𥅳f~󽒕\u001d\u0007󳾸󵊆'1Yr󿹜7𫃙䃱魲y]𢣩~/쿘$󴫻u5JF󸂀\u0007\u000f<\u0016n\u001f/\\\t𠘨k\u00157]d>?i\u0003􇪰,=Hok$q𫴯\\=L:𒅷􅡁*𗄉*􋘴F󹙔Hk\u0001jPPsA\u0001/c󲊔]\u0000}|V7N󾐀7C_\u0013􆤯{B;E2t\u0015\u0008\u000foK󵱔􊚔\u0008ᛯ㘇HQ#𤃴􈶓$u7\u0008ꁮJMT>󶚗\u0012*R󳔒?p\u00101E𥍠󶶄k􄜱B;\u0017Sg;O:\u000eyW~\u000cb 􆭜W\u001a 𭞛%PU2o\t{<Z{`󰧝G5\u0005𔓶fH􎄱\"q鏑🅹82\tG嬖rfkrHN%L)=\u001f\u0001a'ygS\u0001𫻳􋯏Z􌠔ᩬg+sFt-H\u0019JA\u0011<\u0016􀸹3󰚑\u0000ꕔ\tp_\n쑀'gm\u001ec𦶪INN\u00072[mg\u0013􏑜󻩞󼾉4!h𒆅􋅘KiL 𗡨엱\u0011𘈉et\u0013devxX\u001ddS􌲺iX}酣󱍡𪌧􌷋K*pd\"5kdzZ󼽻KᘆQ\u001f􊃭\u0007\u0016𡷄;N\u001cRQ7{{d􀮉􀪇#G􊂳Q\u001d}竹􈆺*yJ\u0002flpBg𘤆L𤛞󴃆\u0006#\u0010x@W/𧈡녶/HV+𦧑\u0011嵦`?\\\u001c\u0008/.]󲌓𨴘󰜿\u001eet쭌h<$\\𬖮 􃼯moG輷\u000c𤀥󻖪􁦬qHv󾅏al4\u0007𠔂fx􁕉\u0004O\u0010P󳃏𐆠􍈡yO􊱝Pꇳ*󶆹\u0006𫎖\t𥀟\u001d󼅬􅠯 \u001d=0Lf\u001bJ\u000c>Q\u001ec&r𗌗%V󲾞살󱖩d\u001fb}`M𪼕dw@󾣎꡶9eI๛󷴪|BRW\u0000􆴏ug󴮬#\u001d1󽥛O|᭷\u001e\u0019D\u0010􀧸9󵷪*𪌍O𧀼􄴗\u001aUi;\u0003心>\u000e7{C琕I𬖠vg5ﰫ_5m~\u0014e嫖\u0012󿭚𤺉0Cz5k\u0016𠷟\u0018뼲\u001d>\u001a:?#U􊜪0𒀦\u0002>=z\u001f󲢞𘓸wࢫ\u0003C􇦤\u00027\u0014𫖉\\ e멤e(oT",
-    "invitation_code": "fq-V3UW3vm5d",
     "assets": [
         {
-            "size": "complete",
             "key": "􁣑􍬞󺧟)D􊝪N􌞶?",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -18,33 +11,33 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "''@\u0017K\u0019i*YcomF.\u0004",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "$VX\u001f\u0017M:)f/",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u001a󳥛lkaU\u001cy󷀥s",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "$}\u0014W)\u0019🍓3s",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "w`틀\u000f󹨴\u0016]P>J",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u000b=d󾅡𪄯<eL6",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -52,18 +45,18 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󵧰g",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0008疚𓄀}𓅪\u001eKL t𔔇VJ",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "p[g8t\u0013Z_",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -71,43 +64,43 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􋶺\u000f",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0016UU)笌\u0014.y􉉨󷌐",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000c;1AsB\"􌠼􇵕\r\nꍡ\u0006",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "uq\u000bT",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􏷶󶴦o`L\u0012",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "e",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Uk-:U􇦤𣩰\u001b*.;",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "N󸷭q5Bf \u0008q1",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -115,13 +108,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𥸪S",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "a\u001b\r𠈗sG\u0001@",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -130,6 +123,13 @@
         }
     ],
     "email_code": "iyxSVsuGh0j1N_E=",
+    "invitation_code": "fq-V3UW3vm5d",
+    "label": "2+\u0000󳜊󽲔\\V+:RR0\u001eu$:爅1-<f",
+    "locale": "rw-EG",
+    "managed_by": "scim",
+    "name": "A6\u0013𩑇𨾲O\u000eDu5C󷋣\u0016󽸕K3R𖦞󷥯\u001dl󼓐\tl\u0007Rm-󶷿\u0001𖨫&z宎8􆼺Ho𥼶,3운s",
+    "password": "%\r\u001d䷑F\u0004(􅠶𒔈􍩏𥿌\nqc\u000bWiYNwG𗧚\u0006/\u0016d\u000f`9 _𫌖󰱹􈰀47􇈜O)\u000c􄠑w􍆜+lf𩎖rE\r\u0016\u0011󴠋E󽠕𥃪Vo\u001e}H\u0013􏖼\\[\u0001\u0003a\u0001e󶠜\t'hg+r7h\u001cY[<q\u000c􂢡􃝌Vd{胁𥉃OG0Kw􏯘梡\u001d󻨿Y󹩚\u0011\u0008𢋴𤱇#𦀬\u0012ZZ􀞤𫏋쾆\u0018􃾹6\u001eY>\u001d2􃟩uw􍾬𥅳f~󽒕\u001d\u0007󳾸󵊆'1Yr󿹜7𫃙䃱魲y]𢣩~/쿘$󴫻u5JF󸂀\u0007\u000f<\u0016n\u001f/\\\t𠘨k\u00157]d>?i\u0003􇪰,=Hok$q𫴯\\=L:𒅷􅡁*𗄉*􋘴F󹙔Hk\u0001jPPsA\u0001/c󲊔]\u0000}|V7N󾐀7C_\u0013􆤯{B;E2t\u0015\u0008\u000foK󵱔􊚔\u0008ᛯ㘇HQ#𤃴􈶓$u7\u0008ꁮJMT>󶚗\u0012*R󳔒?p\u00101E𥍠󶶄k􄜱B;\u0017Sg;O:\u000eyW~\u000cb 􆭜W\u001a 𭞛%PU2o\t{<Z{`󰧝G5\u0005𔓶fH􎄱\"q鏑🅹82\tG嬖rfkrHN%L)=\u001f\u0001a'ygS\u0001𫻳􋯏Z􌠔ᩬg+sFt-H\u0019JA\u0011<\u0016􀸹3󰚑\u0000ꕔ\tp_\n쑀'gm\u001ec𦶪INN\u00072[mg\u0013􏑜󻩞󼾉4!h𒆅􋅘KiL 𗡨엱\u0011𘈉et\u0013devxX\u001ddS􌲺iX}酣󱍡𪌧􌷋K*pd\"5kdzZ󼽻KᘆQ\u001f􊃭\u0007\u0016𡷄;N\u001cRQ7{{d􀮉􀪇#G􊂳Q\u001d}竹􈆺*yJ\u0002flpBg𘤆L𤛞󴃆\u0006#\u0010x@W/𧈡녶/HV+𦧑\u0011嵦`?\\\u001c\u0008/.]󲌓𨴘󰜿\u001eet쭌h<$\\𬖮 􃼯moG輷\u000c𤀥󻖪􁦬qHv󾅏al4\u0007𠔂fx􁕉\u0004O\u0010P󳃏𐆠􍈡yO􊱝Pꇳ*󶆹\u0006𫎖\t𥀟\u001d󼅬􅠯 \u001d=0Lf\u001bJ\u000c>Q\u001ec&r𗌗%V󲾞살󱖩d\u001fb}`M𪼕dw@󾣎꡶9eI๛󷴪|BRW\u0000􆴏ug󴮬#\u001d1󽥛O|᭷\u001e\u0019D\u0010􀧸9󵷪*𪌍O𧀼􄴗\u001aUi;\u0003心>\u000e7{C琕I𬖠vg5ﰫ_5m~\u0014e嫖\u0012󿭚𤺉0Cz5k\u0016𠷟\u0018뼲\u001d>\u001a:?#U􊜪0𒀦\u0002>=z\u001f󲢞𘓸wࢫ\u0003C􇦤\u00027\u0014𫖉\\ e멤e(oT",
+    "phone": "+479088519197",
     "phone_code": "G1SWE8oSdxfc7Es1vzzLBkAkCFGDjxo5",
-    "label": "2+\u0000󳜊󽲔\\V+:RR0\u001eu$:爅1-<f"
-}
\ No newline at end of file
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_18.json b/libs/wire-api/test/golden/testObject_NewUser_user_18.json
index fd2e0041e09..96fd94b9342 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_18.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_18.json
@@ -1,23 +1,23 @@
 {
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "expires_in": 228513,
-    "locale": "qu-PF",
-    "managed_by": "wire",
-    "picture": [],
-    "name": "\\`O7𒒌󻣳g􂫴2*a'\u001e;x v󵙓j\u0000䴓\u001e\u0015E􂎩󹞲G!bB􇽖𢘌􏩡\"t􊧥\u000f.􈧂|\u001b𗌜]R𐜌O󰭆\u0017F𘑘泔d󷻝yLN䱟\u0010&훀I\u0004\u0000T'>>\u0007g-'|ꥇ\u0006蔦\u000b",
-    "password": ",S𧯃\u0004ῳ\u001c*R\u000blulO㨎󺔉󱀄]\u0005y:㠂M?󺭍X𐤐l%@\u0004\"4􃐦(\u0001\n-󿀥\u001a]𡼗\u000b\\\u0011gJ𠆜솮𞴊G(&\u0014\u00111􁓜@\u0004\u0014ze\u0017\u0017\u0015:\u0007*!x5\u0000J\u000f>F\u001cS>P]𢬂|kLmi\u0012*[⏎e\u0008\u0015󼛸n󵺫p&<2j\u000b\u0001FZQY\u0017>@uin\u0010cu3\u0019%󲙁\t-\u0008\u0019/mpW\u001f@Hb7:\u0013\u001c􎖭\u000c`4zI󵧉y|\u001f0\u00195y瓉\u0015𬆿\u001e𧈕\t5O\u000e𭩎𬰞{>􍆡ﹱ뿎~𫑂脷gt󻯻P\u001aqY\r[OO!􆨆#󵭥O􏂌_'v5O𢗦\u000b𑦴#]\"I-𠀟a𫖆:q䔟ꃂKK􃆹au/b \t.\u0007K󷒇N\u0018󿣊󶽗\u000bꟂl\u0002u\u0000PiW.u𖡸\u001d\u0011*ꂲYT𬸛𐦭+ᓱ\u0012~dZY\"p\u0019I\t閪\u001e矺{\u0006@D𠒈􂝖V\t37䓚𣦁,c􋚔ᔼ𢹏\u0008\u0016?ꀳ󽖞\u0016󴲞-􌌿󺦃?\u0006􍷩o𩴵+𣾄4US􁐇􀐪\u000c7/󻩏2𗔿\u0006|6&􆏖\u0010u󺝖0+1M",
     "assets": [
         {
-            "size": "complete",
             "key": ",",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "&vJ`!R\tVt-=i",
+            "size": "preview",
             "type": "image"
         }
     ],
     "email_code": "_Q==",
-    "label": "V]#X󼋈\u0013n􃧨󴽔u&HV\u000c\u0002:Ah. 9\n\u0000"
-}
\ No newline at end of file
+    "expires_in": 228513,
+    "label": "V]#X󼋈\u0013n􃧨󴽔u&HV\u000c\u0002:Ah. 9\n\u0000",
+    "locale": "qu-PF",
+    "managed_by": "wire",
+    "name": "\\`O7𒒌󻣳g􂫴2*a'\u001e;x v󵙓j\u0000䴓\u001e\u0015E􂎩󹞲G!bB􇽖𢘌􏩡\"t􊧥\u000f.􈧂|\u001b𗌜]R𐜌O󰭆\u0017F𘑘泔d󷻝yLN䱟\u0010&훀I\u0004\u0000T'>>\u0007g-'|ꥇ\u0006蔦\u000b",
+    "password": ",S𧯃\u0004ῳ\u001c*R\u000blulO㨎󺔉󱀄]\u0005y:㠂M?󺭍X𐤐l%@\u0004\"4􃐦(\u0001\n-󿀥\u001a]𡼗\u000b\\\u0011gJ𠆜솮𞴊G(&\u0014\u00111􁓜@\u0004\u0014ze\u0017\u0017\u0015:\u0007*!x5\u0000J\u000f>F\u001cS>P]𢬂|kLmi\u0012*[⏎e\u0008\u0015󼛸n󵺫p&<2j\u000b\u0001FZQY\u0017>@uin\u0010cu3\u0019%󲙁\t-\u0008\u0019/mpW\u001f@Hb7:\u0013\u001c􎖭\u000c`4zI󵧉y|\u001f0\u00195y瓉\u0015𬆿\u001e𧈕\t5O\u000e𭩎𬰞{>􍆡ﹱ뿎~𫑂脷gt󻯻P\u001aqY\r[OO!􆨆#󵭥O􏂌_'v5O𢗦\u000b𑦴#]\"I-𠀟a𫖆:q䔟ꃂKK􃆹au/b \t.\u0007K󷒇N\u0018󿣊󶽗\u000bꟂl\u0002u\u0000PiW.u𖡸\u001d\u0011*ꂲYT𬸛𐦭+ᓱ\u0012~dZY\"p\u0019I\t閪\u001e矺{\u0006@D𠒈􂝖V\t37䓚𣦁,c􋚔ᔼ𢹏\u0008\u0016?ꀳ󽖞\u0016󴲞-􌌿󺦃?\u0006􍷩o𩴵+𣾄4US􁐇􀐪\u000c7/󻩏2𗔿\u0006|6&􆏖\u0010u󺝖0+1M",
+    "picture": [],
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_19.json b/libs/wire-api/test/golden/testObject_NewUser_user_19.json
index f19a21a2d33..d1d8543fbb8 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_19.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_19.json
@@ -1,14 +1,9 @@
 {
-    "email": "󴲧󹼖🛒U+\u001a􇾤]x󴞦Rz\u0004p􆶟U󿎥@5𥛅\n>\u0014l\u0007ᬘ􊕕\u0015U󽖒𠥣3tj\u0001DnWz􁘬\u0015􍪳",
-    "locale": "pi-CC",
     "accent_id": 28218,
-    "picture": [],
-    "name": "=5^QR$\u0012iꗭ𤴜\u0011󵑣\u001b𮠨#􅡩m\u0004󵿅𞡉+\u001ca\u0016􁘻溄T-",
-    "password": "\u000c󶼂\u001b\u0011U󸻂\u0007[Zn |𩅻>\u0003蟲𪥢􃒪Qq0U7\u001b*e\u0014@[)#􀳿&N-N􆂼J𫡰\u0006<\u000b5>^\u00193𥨎🐟M\"Q@_7Y𘡍oO\u0007#x\u001bsU8\u0017f􄬪𘥗{ \r&􈧦@緝'<,X𩩬<\u0001䛢>󶳷DP\u000b!놧[󾴨\u001e􄄂󴧟+&\u001f{𬛂󳗏t=Dm􍞂B󶹳t𪔊\u0010\u000cs\u0003`O\u0008\u0006⣑:󸉵\n􃆽HXJ~\u001d\u001e𬻌d𬱧󹈲󿳢F󾄘&F\u0007\u0004􋭕H]\u0000*􇷠\u0007]󿺌V!\u001c⓺EyK1𬖭\u0002v𬛋)f\u001a􍠦)#F􅣪:𤷝\u001f Nw󷩀𮎸\u0004󾖋\u0006V\u001e@<jJ3\\Z\u0011n𓆺'Q8Q􇱊G0\u000b𩬒b\u0007~\u0011H􁻳􉖬eR󸄧~>k\u0017.𘂀F☶B\u0003\t𘗂 SF𬀶oy􇪩)婖\u000c\u000cM鶩퐱zw\u001f_I8j钚\"􏊮\u0004}汐m~ヮoea32?諚d$\u0004\n5\u000crGK?誮c𤹎\u0017Si弳]\t􄵊1c{:_e'S\u0014\thf\u0000Gയ!\u0008sjmf\u0004\u0013󳽗f^\u0011Z]A󺄪\"뼦􉾏p𭷌𪧍𣍉Ax􃷩O\u0014W;\u001e肻H𥾡Y\"E􋶭𤳷F/H8cV3\u000f1A\u0018\u0014\u0019i&EZ3Ka7s󿼢yB4𭴌𫬳MXSQ9𣔮𭗗q2\t􀩕H𣴍g󷑓󴑗(\u0001'\u001f𣹂𤼃\u0019eg\u0005,󰞗\u0014dF-DnZ;\u0010jz𞅀.m~o\n\u001a󽝞~y􉱞\u0005s\u001d\u000bX|}J\u0002\u0015$K\u000b[W6왊C􇇐C󸳬KA\u0010mL3*\u0005;C𮂲\u001az\u0011\u0006|⺾%e^􍻨𫝾\u000br󴹍\u0010`泱~􀤐R!*󷪆g%P2𭀤𬇃ugo햝\u001a𗧠󷛅􎀕\u001a\u0013",
     "assets": [
         {
-            "size": "preview",
             "key": "\u000c\u001b1,",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -20,28 +15,28 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "7羇#.E\\陼i/9.",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\\!A",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󽘻+U\u001f𐤛Pp^",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0011􈾗\u001e󰕳Q\\2\u000f`{𦡡W􍕶",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -49,13 +44,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𢀠}M𠤀\u001b􎒓l\u0002Ku,A",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "1\n𣊦-J\u0017",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -67,18 +62,18 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0005l;w",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "0󿡋𧲭m𞅉Z\u001fr-",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": ">%?]V􃽹q얅\u0002\u0013𦰎",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -86,8 +81,8 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "鷮u5孁3",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -95,28 +90,28 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "x\u0014𘀟",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "l\u001eC󿜍\u0005\u001fO\\",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000e朰>G\u0002𤉽\t",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": ">F{^s􋵙\u0017",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􆟪0ᐆV3:l'ZuA󶡑s",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -124,12 +119,17 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "?b)`𐲠-c\"􈆋􊓶T",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "email": "󴲧󹼖🛒U+\u001a􇾤]x󴞦Rz\u0004p􆶟U󿎥@5𥛅\n>\u0014l\u0007ᬘ􊕕\u0015U󽖒𠥣3tj\u0001DnWz􁘬\u0015􍪳",
     "email_code": "xW2K",
+    "label": "\u0006\u0008>􍯓󻿧73]杻7󽣍&H\\",
+    "locale": "pi-CC",
+    "name": "=5^QR$\u0012iꗭ𤴜\u0011󵑣\u001b𮠨#􅡩m\u0004󵿅𞡉+\u001ca\u0016􁘻溄T-",
+    "password": "\u000c󶼂\u001b\u0011U󸻂\u0007[Zn |𩅻>\u0003蟲𪥢􃒪Qq0U7\u001b*e\u0014@[)#􀳿&N-N􆂼J𫡰\u0006<\u000b5>^\u00193𥨎🐟M\"Q@_7Y𘡍oO\u0007#x\u001bsU8\u0017f􄬪𘥗{ \r&􈧦@緝'<,X𩩬<\u0001䛢>󶳷DP\u000b!놧[󾴨\u001e􄄂󴧟+&\u001f{𬛂󳗏t=Dm􍞂B󶹳t𪔊\u0010\u000cs\u0003`O\u0008\u0006⣑:󸉵\n􃆽HXJ~\u001d\u001e𬻌d𬱧󹈲󿳢F󾄘&F\u0007\u0004􋭕H]\u0000*􇷠\u0007]󿺌V!\u001c⓺EyK1𬖭\u0002v𬛋)f\u001a􍠦)#F􅣪:𤷝\u001f Nw󷩀𮎸\u0004󾖋\u0006V\u001e@<jJ3\\Z\u0011n𓆺'Q8Q􇱊G0\u000b𩬒b\u0007~\u0011H􁻳􉖬eR󸄧~>k\u0017.𘂀F☶B\u0003\t𘗂 SF𬀶oy􇪩)婖\u000c\u000cM鶩퐱zw\u001f_I8j钚\"􏊮\u0004}汐m~ヮoea32?諚d$\u0004\n5\u000crGK?誮c𤹎\u0017Si弳]\t􄵊1c{:_e'S\u0014\thf\u0000Gയ!\u0008sjmf\u0004\u0013󳽗f^\u0011Z]A󺄪\"뼦􉾏p𭷌𪧍𣍉Ax􃷩O\u0014W;\u001e肻H𥾡Y\"E􋶭𤳷F/H8cV3\u000f1A\u0018\u0014\u0019i&EZ3Ka7s󿼢yB4𭴌𫬳MXSQ9𣔮𭗗q2\t􀩕H𣴍g󷑓󴑗(\u0001'\u001f𣹂𤼃\u0019eg\u0005,󰞗\u0014dF-DnZ;\u0010jz𞅀.m~o\n\u001a󽝞~y􉱞\u0005s\u001d\u000bX|}J\u0002\u0015$K\u000b[W6왊C􇇐C󸳬KA\u0010mL3*\u0005;C𮂲\u001az\u0011\u0006|⺾%e^􍻨𫝾\u000br󴹍\u0010`泱~􀤐R!*󷪆g%P2𭀤𬇃ugo햝\u001a𗧠󷛅􎀕\u001a\u0013",
     "phone_code": "zRaFKSA7mqei2mjV9w9ON4OLeA==",
-    "label": "\u0006\u0008>􍯓󻿧73]杻7󽣍&H\\"
-}
\ No newline at end of file
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_2.json b/libs/wire-api/test/golden/testObject_NewUser_user_2.json
index a07ba1a1701..d44de129a5d 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_2.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_2.json
@@ -1,20 +1,13 @@
 {
-    "email": "\u0010_\u000b*]\u0008\t󴹀 @wE즷Y$\u0017\t\u000c\u0002\u0014]u󰢽[<𓆓\rd\u0019𥗀𡩮:r􂊤\u0000\u000f",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "managed_by": "scim",
-    "picture": [],
-    "name": "\u0000`)\u0007|>}\u00195z𑈣\t>w\u000e󵾱",
-    "password": "𫩏\"-ꗃ湔Og'}𦬌\u0013Sz`}^\u0019𮘆SS𭈝𨃁\u0013p\n[䷪芖.l󷤆p\r\u000e\u000e󺄚$\u001a[󶣱􎒐𥠒fV\u0013[\u0013􏾻Rc󹶹H\u001f󸸶𨎽𭩳qO󳖄\u0007𦊳\u0000<􃔁\u0019󼯰𗂟\u001f\nd莟\u000b[2󿒮s\u001eb+E𪎂W&􃬸f3\u0013[#,\u001f=f𐧉}󻭠\\@􂧄}n",
-    "invitation_code": "RnoP9ThWPcujkA==",
     "assets": [
         {
-            "size": "complete",
             "key": "\u001dg",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0018",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -22,18 +15,18 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Σ[E\u0003‛\u0015\u0019R",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u001dQ\u001e𬾠*[OCr􊫕",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "_\u000e\u0000👙p󶪿7n𫋠\u0016",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -41,23 +34,23 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "*󽉠f",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󲝗8'e4\\\u0014𩛶W\u000f&f",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "x𣀨\u001d\u001cF",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -65,13 +58,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "S",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "'\u0001\u000e",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -79,10 +72,17 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "㘹\u0000Uᄼ1A𝗰㕃T\u0001x$P",
+            "size": "complete",
             "type": "image"
         }
     ],
-    "email_code": "XJbRdz2tmf7rgAU="
-}
\ No newline at end of file
+    "email": "\u0010_\u000b*]\u0008\t󴹀 @wE즷Y$\u0017\t\u000c\u0002\u0014]u󰢽[<𓆓\rd\u0019𥗀𡩮:r􂊤\u0000\u000f",
+    "email_code": "XJbRdz2tmf7rgAU=",
+    "invitation_code": "RnoP9ThWPcujkA==",
+    "managed_by": "scim",
+    "name": "\u0000`)\u0007|>}\u00195z𑈣\t>w\u000e󵾱",
+    "password": "𫩏\"-ꗃ湔Og'}𦬌\u0013Sz`}^\u0019𮘆SS𭈝𨃁\u0013p\n[䷪芖.l󷤆p\r\u000e\u000e󺄚$\u001a[󶣱􎒐𥠒fV\u0013[\u0013􏾻Rc󹶹H\u001f󸸶𨎽𭩳qO󳖄\u0007𦊳\u0000<􃔁\u0019󼯰𗂟\u001f\nd莟\u000b[2󿒮s\u001eb+E𪎂W&􃬸f3\u0013[#,\u001f=f𐧉}󻭠\\@􂧄}n",
+    "picture": [],
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_20.json b/libs/wire-api/test/golden/testObject_NewUser_user_20.json
index 0454f0375e3..69a6c3b4b80 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_20.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_20.json
@@ -1,26 +1,19 @@
 {
-    "phone": "+60997378240829",
-    "locale": "kw-LU",
-    "managed_by": "scim",
     "accent_id": 13678,
-    "picture": [],
-    "name": "\u0008󺟤z\toeq􇔙}i\u0002*RI/B(\u0016jS/L𧆹n2\u0010MAﭵ0\r𪗪jS\u0007\u001et\u0016𢾴5:*6𪕉\u001d]\u001b􀹆)][F􇛳)\u0017u{ 𫑠mC\u001dI󳜱vp\u001d*ᾱF].\u0001)\u000f𗞕p\u000e隷!B!N3'e陈󷟵2\u000b.3t*IW%\u000ec",
-    "password": "󵝚A酼9ﻘ \u0016󵐄]􆔛=􄀉i0󷫆.\u000b.)_$QYz󶂜s𩃅𧺮󴨹,f𗶘M7ଠ􅭩mcO\u0001\u000c\u0002󵃣DQ\u000cEq={\u0010d󲞡𠩒\u001ez\\𮤊5.F\u0019i<萯\u000fP$\u000ei|d,J.ݒ\t\u001a􉊏]UA`*\u000ch\u000b\u0002@K.z\r=𩘼\"TG\u0012=X\u0000W􋯞x\u0000V𓀺;𦔓}{hRc\u0008\u00120􉮗:𦱝\u0006$6n𓍮􄝠䄣􄪀6^z{]\t􏑬輊#W;\u001csp􃥩t􈫋󽶩\n\u000e厤󼪢𘨓󲫅𩏇TW𦽏k󳦷,J\\!􊆨󱝐bs\u001c\u0018e󱝬𭜞=\u0000\t\u0002\u0000s)A\u0006+6z𣜃=\u000f\u0007]5\u00181[O=<Ls𩧬e󿔔t󴯶\u0010v\u0010'<\u0007S􆑶\u001d9].6\u0012`\u0007C𣏟?󼎝\u0018\u000e>. ,\u0013RF\u0000󻑸𞡉>\u0001kc5Tvp4'u𫜇\u000f🗁Y꣗\u0013$\u0014q亜I8阂GJ𣸁6\u001a\u0012𭎯<ᢆi𪽲􈙍XR[G\u0004:\u0011\"ꊮ󴡦\u0008$𛄘⡺󷕒\u001a􂷞Ga󰍟󲫻\u00076\u0000𨰆\"M\u0018Uz\u001c􏫋\u000e \u0011󶱃=\u0019챓\u001d X?p\u0001]3V<PZ󶗚Y\u0004{𭎒𨢹MmഖM\u0011;di2𓐛P\u0014\u0014;󿳺5󻠷\u000e\u0007*\t\u001d,\u0002𠸩𦊃􍎂3W\u0016{𝣥Zx#}[1𦿃 􅏛S\\Se?&~|4􀆫\u0017M{\u0012\u0012󸐦􏽑\u0015\u000f^\u001bA𪹚J􆼄f=eU\u001a@얛䧧\u0017g\u001a)@\u001d󾔶\u001fF􃪍XA\u0013tec\u0007y-󻎷g%荟$et 1󼔥𣿼/𥅿?\u000c\u000b\u0015U\u0004\"q􅂠𐨩𠦙\u0013\u0001ERd|d\u0005UF^􀨀y􂳷{𤁤1󼁞K\u0015}W\u000f\u001a\u0018S89\"𛁗𡦢bV!W鮛E@t55\u0013\r𮀛\u0016t3埝ꛋkoK\\dLg𖿡\u0005𧪺.\u001a賆dq\u001c󳳈O뒯\u0017VQ􌅤l\u0006浜\u0017bLm|~Q\u000e6􊃊𬙿ቛc𧘼|m\u001d[C\u001a𦲿f\u000f2p𡠷y,󺮋=c\u0011N큲3O>􈼟l[ts;P뼍ye􉮵\u000f凈]􅺭\u0014|􊟚>󰾋p󱍙𨬭𡗋N<{t𭊽􋒮}源\t0&\u001cuz\u0018m葸􅃿󳖒q~S\u0003}KsYVN\t\r8pZ$.p#攚Qad5慈𫫺n<󺰖􎟛o!􅍬𩮁\u0012;?Y\u0015:\u00129{}'\u00138𔔖\u0003c𤭼\u0019\u00073aQ~\tl&\\8`\u001a\u001e,篼\u0004󼷷󴠎뒱s󼳾󴝚e􋪖󳈐J{`;]􂁘𬔐2u⿴󺟮\u001esS􊴑x鵅􌎡%z𔑛\u0010􏟮N\u0011tSL8]\u0006Yiꗈ\u001cz\n\u001f\u0018\u0017\u0017'鱣OH󲳬M}<蛩󸺛􂀋a\u000b&$k𪍌WP󿿊\u0018𘋀4oRjU\"\u0005􉥮󺔉#C𡅖'~􂲛􆜫3\u0003C􁺅(.T\u0018i\u0010wᡶ𨄾Rp",
-    "invitation_code": "529Eo7BC6CKbsX0i9lKIvOFyuxhHig==",
     "assets": [
         {
-            "size": "complete",
             "key": " })$",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "=(@S\u001af4#",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "[P󹯀\u0015X󾪥墣86!Lg",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -36,18 +29,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "r\u001e􅵉\u000eR𑅭b󰪳$#𢪬R",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "=󲛕N'7I󿡪\u000f%",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "X<#$\u00000𥧽􅤂*󸴻",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -55,21 +48,28 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "5p᷋",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "j\u001aG0󽄻\u000fd𮔨:Ɍ",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "5H\u001e􆭸;",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "v2-GQHZFYfDD7eV7gj3dtTZ2RDAqMLpBntdMHg==",
-    "label": "#+EA7"
-}
\ No newline at end of file
+    "invitation_code": "529Eo7BC6CKbsX0i9lKIvOFyuxhHig==",
+    "label": "#+EA7",
+    "locale": "kw-LU",
+    "managed_by": "scim",
+    "name": "\u0008󺟤z\toeq􇔙}i\u0002*RI/B(\u0016jS/L𧆹n2\u0010MAﭵ0\r𪗪jS\u0007\u001et\u0016𢾴5:*6𪕉\u001d]\u001b􀹆)][F􇛳)\u0017u{ 𫑠mC\u001dI󳜱vp\u001d*ᾱF].\u0001)\u000f𗞕p\u000e隷!B!N3'e陈󷟵2\u000b.3t*IW%\u000ec",
+    "password": "󵝚A酼9ﻘ \u0016󵐄]􆔛=􄀉i0󷫆.\u000b.)_$QYz󶂜s𩃅𧺮󴨹,f𗶘M7ଠ􅭩mcO\u0001\u000c\u0002󵃣DQ\u000cEq={\u0010d󲞡𠩒\u001ez\\𮤊5.F\u0019i<萯\u000fP$\u000ei|d,J.ݒ\t\u001a􉊏]UA`*\u000ch\u000b\u0002@K.z\r=𩘼\"TG\u0012=X\u0000W􋯞x\u0000V𓀺;𦔓}{hRc\u0008\u00120􉮗:𦱝\u0006$6n𓍮􄝠䄣􄪀6^z{]\t􏑬輊#W;\u001csp􃥩t􈫋󽶩\n\u000e厤󼪢𘨓󲫅𩏇TW𦽏k󳦷,J\\!􊆨󱝐bs\u001c\u0018e󱝬𭜞=\u0000\t\u0002\u0000s)A\u0006+6z𣜃=\u000f\u0007]5\u00181[O=<Ls𩧬e󿔔t󴯶\u0010v\u0010'<\u0007S􆑶\u001d9].6\u0012`\u0007C𣏟?󼎝\u0018\u000e>. ,\u0013RF\u0000󻑸𞡉>\u0001kc5Tvp4'u𫜇\u000f🗁Y꣗\u0013$\u0014q亜I8阂GJ𣸁6\u001a\u0012𭎯<ᢆi𪽲􈙍XR[G\u0004:\u0011\"ꊮ󴡦\u0008$𛄘⡺󷕒\u001a􂷞Ga󰍟󲫻\u00076\u0000𨰆\"M\u0018Uz\u001c􏫋\u000e \u0011󶱃=\u0019챓\u001d X?p\u0001]3V<PZ󶗚Y\u0004{𭎒𨢹MmഖM\u0011;di2𓐛P\u0014\u0014;󿳺5󻠷\u000e\u0007*\t\u001d,\u0002𠸩𦊃􍎂3W\u0016{𝣥Zx#}[1𦿃 􅏛S\\Se?&~|4􀆫\u0017M{\u0012\u0012󸐦􏽑\u0015\u000f^\u001bA𪹚J􆼄f=eU\u001a@얛䧧\u0017g\u001a)@\u001d󾔶\u001fF􃪍XA\u0013tec\u0007y-󻎷g%荟$et 1󼔥𣿼/𥅿?\u000c\u000b\u0015U\u0004\"q􅂠𐨩𠦙\u0013\u0001ERd|d\u0005UF^􀨀y􂳷{𤁤1󼁞K\u0015}W\u000f\u001a\u0018S89\"𛁗𡦢bV!W鮛E@t55\u0013\r𮀛\u0016t3埝ꛋkoK\\dLg𖿡\u0005𧪺.\u001a賆dq\u001c󳳈O뒯\u0017VQ􌅤l\u0006浜\u0017bLm|~Q\u000e6􊃊𬙿ቛc𧘼|m\u001d[C\u001a𦲿f\u000f2p𡠷y,󺮋=c\u0011N큲3O>􈼟l[ts;P뼍ye􉮵\u000f凈]􅺭\u0014|􊟚>󰾋p󱍙𨬭𡗋N<{t𭊽􋒮}源\t0&\u001cuz\u0018m葸􅃿󳖒q~S\u0003}KsYVN\t\r8pZ$.p#攚Qad5慈𫫺n<󺰖􎟛o!􅍬𩮁\u0012;?Y\u0015:\u00129{}'\u00138𔔖\u0003c𤭼\u0019\u00073aQ~\tl&\\8`\u001a\u001e,篼\u0004󼷷󴠎뒱s󼳾󴝚e􋪖󳈐J{`;]􂁘𬔐2u⿴󺟮\u001esS􊴑x鵅􌎡%z𔑛\u0010􏟮N\u0011tSL8]\u0006Yiꗈ\u001cz\n\u001f\u0018\u0017\u0017'鱣OH󲳬M}<蛩󸺛􂀋a\u000b&$k𪍌WP󿿊\u0018𘋀4oRjU\"\u0005􉥮󺔉#C𡅖'~􂲛􆜫3\u0003C􁺅(.T\u0018i\u0010wᡶ𨄾Rp",
+    "phone": "+60997378240829",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_3.json b/libs/wire-api/test/golden/testObject_NewUser_user_3.json
index 08a2a170181..356f8b32d4d 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_3.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_3.json
@@ -1,25 +1,13 @@
 {
-    "email": "𐏒𣥇iC􋲲`@*",
-    "phone": "+08713477",
-    "team_id": "0000519f-0000-2c2d-0000-26150000010b",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "sq-SI",
-    "managed_by": "scim",
-    "picture": [],
-    "name": "􄵞9爈F.G\u001fn\t\u0018.K?B첵􊲢󲱫&󱊂降􎯅NijZ󴚛zr>\u0018y󺮑􀍐𗺵𪡜𢤡胔󵰚rz\u0001󹑍\u0014\r\u0014\t𭧌%\u0005jK󾳥F𐅱5[31\u0012H`𢳱l&%\u0004󴈫R*󱛓",
-    "password": "󵱚&1`􃀯/j𣇈\u001b@󻏨𤆵ael𢞼􅾲𭟲(ᅣ󳆔\u0016kSCY􃍻nA\u000fv3NT\u000e󺭒F\\]9<W\u0010𢰎`j\n0lD[N\u000fW@:􅳆{\u0012IZCצ\u001f~攮뻈󶨼u=􆬿y7\u0007A[􀕳(\u0014\u0018𢤂\u0016\u001d,\u0004h6O\u001fbK |d;0oE\u0015\u0004;􉂦\u0012󹚥\u0005𢞺\u0008/Tl,W&t齘@$󹗍\u0003'19 􋨦􄟠|8;M2`lהN⒞󳀈k􂅿\u001f𩰳x 9!T\u0007\u001b0\u000f𣐑,􄂦&e𑜼Y.f.9\u00163*^\t놆𥑏R*-N\u0008Kk􆞻!\u0003;nMCFt+\u0011􁋿🡑堺\u000eF= t\u000b=}>\u0002\"\u0017\u001b8\u0000:\u0011󻝑s\\O#\u001as\u0003ZN\u000bN\u0019\u0014Iq󸠖w\u001f􊐾壢\u0010\u0003h0\u0001\u0014G_,8\u0001󾳈*MX󷍽(H\u000b2\t􂠈M%J(󴝴󵒧@\u0000󱰧\u000b𭯥dAm&~𤒻썜󺃧𐰢S􂫆Oo'\u0007𮌎󳿹)mGV𡄡𤀄$(+>(ok\u001e\u0010\u0014x\u00149ୋ`\u000e󹷹]\u0007\u0013[\u000c暗h􅍡Lg\u000bK?h\u0005'\u0005ER\u0018hG1q7Hw0󼍤𨣒R􆹎􎩘Xq\u0012􃍔/􂰘2􎞄𩄪𮪡$\u0018.󰮲\u0002\u0007X󳌿\u001b]󺳤r󸬳^,A豵􄉻!\u0017➮\u0013>\u0006h\r~{N\u0002𥨻p􏷍T􈥄hs\u0011=s>5\u0000^Bh𬜟􁁿~\u0003/\u001ay\tPs􊶘m7h9𠜸󱫎𠏌r󺡚4?o􂎶+󼂳󸳥󳝙\u0015\t|\u0010G𧣎𤽌褨q$󰴽𨻹頜𛇃\\\u0019\u0006rI1A󾀦YpW\u0012ef𮩖fg\"|梜󠁆\u0018􇗰)􍚑y󼈵SZ󸖥82\u0016a^#e뜼󻘗a-}uYX􊩡<纕\u0015殼I\"\u000b\u0010\u0000\u001b󱿉f𭍀\\止[􍀌=%焠Ea󰞡􋿁􁅙e􉹃𗂣I􇬙􍁖ꤤ\u001b3ၸ\u0019U|\u0016jtQ`󻰵rW\u0013\u0005Z\u0015/kHL\u0018(\t\u000f-s-􎙞'󹊚n󳪛5ހ/󵉳􌽭q􈎌􌀇p𡿾6\nZY\tq%ꬫ󶐫\u0012m\u0013𭌄䝉𨲏1\u0008:F A𐅵􈲂󷡠~vk􈌓􏀃􃗪,Z󺜚\u001ck𐊗𩹈P5_m{\\\t哷,􎗊A\u001e)L0)+\u0007\u001f'X17U\u0002#벇>\u0013|P􅎇po\u0019Rf󸶞\u0007\u0001𬸴x𣞆iL⮪h􎦘\nq𥟑\u0002@𐧃c㌇j󱇂9?R皴\u0013 NB`\u001b𨂙深\u000e\t'/k\u0013w9eFy\u0000t\u000e􌱔X/m\u001f\u0004ᗾ:&\u0018\u00184\u000b[k/f=􅾇bC\n-X㢅O6\u001e><a吱\u000e\u0010\u0014㶤\u0007_|v𑌷􇗂☷Q:\u001f\u0002'Ჺ8󼽔v 􁢒Hl􍡣󴨈9\u0008a\u001fuq0Ra\u001e#\u0019\r󺫨\u00194Y8𦟈\u0019􊶜nBz;iim𨖶惹V\u000e+𣰱󴨅󻞟𭜈=\u001b(yxl?]𩢬pe􃓷ᠷ\u0000􃻜{H&󳬽S5𢠛\u00167I|𓂩%<\r)\u000b⍀XQ<􃓉G\u0014<\u001e\u0015?󱪨J\u0007^󽪨\u0015𘂥\n􁳈)0\u001f\u000f󰠼\u0013|\u0002Ц\u0010e󰸄󾁼𮡺Jr\u001f\u0015j9.T'7㾑𧤌裄?\r9$펜 )",
-    "sso_id": {
-        "scim_external_id": "_{3𧁧"
-    },
     "assets": [
         {
-            "size": "preview",
             "key": "s~\u0007",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "/=sG\u0008𒐬\u001dKx",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -27,18 +15,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𥶯SM6V4w",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "e",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󹦕𦇷[0RX",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -50,12 +38,24 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􀠶\u0015\u001b7뉂\u0018 􌊗􇇗",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "email": "𐏒𣥇iC􋲲`@*",
     "email_code": "kLnw_0l8qwKitd6ZFiCd_A==",
+    "label": ")!􅵉!",
+    "locale": "sq-SI",
+    "managed_by": "scim",
+    "name": "􄵞9爈F.G\u001fn\t\u0018.K?B첵􊲢󲱫&󱊂降􎯅NijZ󴚛zr>\u0018y󺮑􀍐𗺵𪡜𢤡胔󵰚rz\u0001󹑍\u0014\r\u0014\t𭧌%\u0005jK󾳥F𐅱5[31\u0012H`𢳱l&%\u0004󴈫R*󱛓",
+    "password": "󵱚&1`􃀯/j𣇈\u001b@󻏨𤆵ael𢞼􅾲𭟲(ᅣ󳆔\u0016kSCY􃍻nA\u000fv3NT\u000e󺭒F\\]9<W\u0010𢰎`j\n0lD[N\u000fW@:􅳆{\u0012IZCצ\u001f~攮뻈󶨼u=􆬿y7\u0007A[􀕳(\u0014\u0018𢤂\u0016\u001d,\u0004h6O\u001fbK |d;0oE\u0015\u0004;􉂦\u0012󹚥\u0005𢞺\u0008/Tl,W&t齘@$󹗍\u0003'19 􋨦􄟠|8;M2`lהN⒞󳀈k􂅿\u001f𩰳x 9!T\u0007\u001b0\u000f𣐑,􄂦&e𑜼Y.f.9\u00163*^\t놆𥑏R*-N\u0008Kk􆞻!\u0003;nMCFt+\u0011􁋿🡑堺\u000eF= t\u000b=}>\u0002\"\u0017\u001b8\u0000:\u0011󻝑s\\O#\u001as\u0003ZN\u000bN\u0019\u0014Iq󸠖w\u001f􊐾壢\u0010\u0003h0\u0001\u0014G_,8\u0001󾳈*MX󷍽(H\u000b2\t􂠈M%J(󴝴󵒧@\u0000󱰧\u000b𭯥dAm&~𤒻썜󺃧𐰢S􂫆Oo'\u0007𮌎󳿹)mGV𡄡𤀄$(+>(ok\u001e\u0010\u0014x\u00149ୋ`\u000e󹷹]\u0007\u0013[\u000c暗h􅍡Lg\u000bK?h\u0005'\u0005ER\u0018hG1q7Hw0󼍤𨣒R􆹎􎩘Xq\u0012􃍔/􂰘2􎞄𩄪𮪡$\u0018.󰮲\u0002\u0007X󳌿\u001b]󺳤r󸬳^,A豵􄉻!\u0017➮\u0013>\u0006h\r~{N\u0002𥨻p􏷍T􈥄hs\u0011=s>5\u0000^Bh𬜟􁁿~\u0003/\u001ay\tPs􊶘m7h9𠜸󱫎𠏌r󺡚4?o􂎶+󼂳󸳥󳝙\u0015\t|\u0010G𧣎𤽌褨q$󰴽𨻹頜𛇃\\\u0019\u0006rI1A󾀦YpW\u0012ef𮩖fg\"|梜󠁆\u0018􇗰)􍚑y󼈵SZ󸖥82\u0016a^#e뜼󻘗a-}uYX􊩡<纕\u0015殼I\"\u000b\u0010\u0000\u001b󱿉f𭍀\\止[􍀌=%焠Ea󰞡􋿁􁅙e􉹃𗂣I􇬙􍁖ꤤ\u001b3ၸ\u0019U|\u0016jtQ`󻰵rW\u0013\u0005Z\u0015/kHL\u0018(\t\u000f-s-􎙞'󹊚n󳪛5ހ/󵉳􌽭q􈎌􌀇p𡿾6\nZY\tq%ꬫ󶐫\u0012m\u0013𭌄䝉𨲏1\u0008:F A𐅵􈲂󷡠~vk􈌓􏀃􃗪,Z󺜚\u001ck𐊗𩹈P5_m{\\\t哷,􎗊A\u001e)L0)+\u0007\u001f'X17U\u0002#벇>\u0013|P􅎇po\u0019Rf󸶞\u0007\u0001𬸴x𣞆iL⮪h􎦘\nq𥟑\u0002@𐧃c㌇j󱇂9?R皴\u0013 NB`\u001b𨂙深\u000e\t'/k\u0013w9eFy\u0000t\u000e􌱔X/m\u001f\u0004ᗾ:&\u0018\u00184\u000b[k/f=􅾇bC\n-X㢅O6\u001e><a吱\u000e\u0010\u0014㶤\u0007_|v𑌷􇗂☷Q:\u001f\u0002'Ჺ8󼽔v 􁢒Hl􍡣󴨈9\u0008a\u001fuq0Ra\u001e#\u0019\r󺫨\u00194Y8𦟈\u0019􊶜nBz;iim𨖶惹V\u000e+𣰱󴨅󻞟𭜈=\u001b(yxl?]𩢬pe􃓷ᠷ\u0000􃻜{H&󳬽S5𢠛\u00167I|𓂩%<\r)\u000b⍀XQ<􃓉G\u0014<\u001e\u0015?󱪨J\u0007^󽪨\u0015𘂥\n􁳈)0\u001f\u000f󰠼\u0013|\u0002Ц\u0010e󰸄󾁼𮡺Jr\u001f\u0015j9.T'7㾑𧤌裄?\r9$펜 )",
+    "phone": "+08713477",
     "phone_code": "SuKUHXzNTjI1FqdQiBjh5b92HrcebYYq7Vif",
-    "label": ")!􅵉!"
-}
\ No newline at end of file
+    "picture": [],
+    "sso_id": {
+        "scim_external_id": "_{3𧁧"
+    },
+    "team_id": "0000519f-0000-2c2d-0000-26150000010b",
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_4.json b/libs/wire-api/test/golden/testObject_NewUser_user_4.json
index 84af7cd11b6..80b252dc16f 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_4.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_4.json
@@ -1,24 +1,17 @@
 {
-    "email": "K}V􁑕t\u0011₤\u0004}nR𥅞􍮩s@\u000cI֬\u0019\u00012P\\𡏺x\u001d􌁢2!󽬌{󻒆𨊍掩􅴱4",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "cv-IR",
-    "managed_by": "wire",
-    "picture": [],
-    "name": "藍􃯔\u001a󿓝\nN󹖰\u0017󰺲\u0005\u0014G\u000cN?󳪤p\u0008𓍀􆬽1\u0017r\u0001𘞩?\u0003|􍚢{Z\r\u0004",
-    "password": "\u0010\u001e圧\u0018\u0007󷉧K\u0008􀕼S/尔\u001dH󸘳D\"\u00181y:\u00191g\u000c~􌐊\\\u0005i􍵝S}앙􋯧𡃛\u000e𗆚A󲿽\u000ft\u0007N\u000fQJg6kD\u001b󹸈\u0018󾉵QU$PN%𩣧'`􍰋k\u0013Z<\n\u0019u]𘋠6􄴫🌋P𐠡(\u001a\u001a79\r𮍘\u001b\u0014􎁨􆀸=狳\u000b@晪\u0004F{𬪭<]󸵐6e8\u0006\u0004稨[\\m\u0001R>\u000b𫤅􅌋Lꂲ(,5)[s]W峝N伌浌&}\u001b@*p%'~s$o􌡿P\u001b\u0006\u0003/.&\u0016.\u001bڟ⠟𗪠\u001b.嗩t𡹬𤈛𬢆\u00197\u000czO-$K𘓈\u001b\u0010l=gcx𣅏$h\u0018B\u0011xT+ ?f+'dH􏝋󹉟2Gu𠞼𬒩4ar[+P\u0017똡vU}\u0011~\u000f\u000eWMi6\u0018_~􌪂\u0002Dಣ^\n~Zf:\"o󿎶3󽒔>|G5𔕴\u0002'=%\"\"|5\u0000y\n:5\u001bG츧}|屍C󿁸􅟮e\u000bi![?𢦜\u000cw*xIV\td F}X;􆱗𠿥\u000c=\u0018%\u001d𨑹(󰣓䆺嶚i=y6t\u0005󸳐\u0011󲄟 -5F6G\u0011󹳸NO.𠁳ly􂄭e,c\"f\u001d%\u0016\u0012󸉦<g:R\u0003k}𤇘~?G먂╪\u00176gメ&\u0011\rA􆎚k\u0012+R\u000b􀱔􋩇c7󱘸\n𤹴s%Bs\u0010󰉂\u000fn[aIRFg5K􍀀\u001e\u0017#^z󰡛󳪭J𭩒󲌖𥜻D/󾋟𪿏􁼧𑲒􈟂𪁚\u0019\u0014𭈖󵀙3𩍇na{𬼩aZ\u000b\"`싡hZﳧ𝘨:(@FG6N0I\u0010|o󻴭$V릖+\u001a􂧎󰫋𡻎𡍤sMV𗬭𘛴 𫀈󹒷䩂Bษ싊8PZP\u0006𧒆W𬪌H'{<󶊳䮐H'\u001f띘\u0004\u0006\u0003nQ镔x󶥟𤸁YC\u0005吿\t\u0013󱉔^u%;\u001cS_\u001d<Mw\r𪗮$𔔻9/𒁄51\u0007\u0000 J􅳒\u0019'Kᑤ𫌢󵞴}<Zl湉C>71Pⶔ󷜨\u0019󸮇􀼗1\u0012|\u0006",
     "assets": [
         {
             "key": ">A\u0019\u001f\u0008\u0008,􍏹_m􇛺G'",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0004\u001e􎳱U*󻄠Ꞻ𥘟z{o\u0008",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -26,73 +19,73 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󹃁N\u001f7WkL􃋷G1놤𩕃􌣏",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "=ntM2\n7=:\u0016 󼈂",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0005𪇸J􊫝\"쐈\u0004E",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "B\u001d\u0003􅯒\u001a9𨍹nQ􎿞,Ps",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0013rR",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "K\u000b{O\n圸􍥜@G",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "MT\u0019\u0008\u001bC\\i(2쮡(l",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "h􉼟􇁖\\\u0016苏𒅾",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𤅢\u000b$E+Uu]",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "[Y",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\\P`􈙇",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "'\u0000\u0002)G\u001d",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -100,7 +93,14 @@
             "type": "image"
         }
     ],
+    "email": "K}V􁑕t\u0011₤\u0004}nR𥅞􍮩s@\u000cI֬\u0019\u00012P\\𡏺x\u001d􌁢2!󽬌{󻒆𨊍掩􅴱4",
     "email_code": "uqc=",
+    "label": "\u001b󹁶U<󽶈\"w\u0007<9s􌵓\u0007(?A󷤡\r\u001b󵃩y,@",
+    "locale": "cv-IR",
+    "managed_by": "wire",
+    "name": "藍􃯔\u001a󿓝\nN󹖰\u0017󰺲\u0005\u0014G\u000cN?󳪤p\u0008𓍀􆬽1\u0017r\u0001𘞩?\u0003|􍚢{Z\r\u0004",
+    "password": "\u0010\u001e圧\u0018\u0007󷉧K\u0008􀕼S/尔\u001dH󸘳D\"\u00181y:\u00191g\u000c~􌐊\\\u0005i􍵝S}앙􋯧𡃛\u000e𗆚A󲿽\u000ft\u0007N\u000fQJg6kD\u001b󹸈\u0018󾉵QU$PN%𩣧'`􍰋k\u0013Z<\n\u0019u]𘋠6􄴫🌋P𐠡(\u001a\u001a79\r𮍘\u001b\u0014􎁨􆀸=狳\u000b@晪\u0004F{𬪭<]󸵐6e8\u0006\u0004稨[\\m\u0001R>\u000b𫤅􅌋Lꂲ(,5)[s]W峝N伌浌&}\u001b@*p%'~s$o􌡿P\u001b\u0006\u0003/.&\u0016.\u001bڟ⠟𗪠\u001b.嗩t𡹬𤈛𬢆\u00197\u000czO-$K𘓈\u001b\u0010l=gcx𣅏$h\u0018B\u0011xT+ ?f+'dH􏝋󹉟2Gu𠞼𬒩4ar[+P\u0017똡vU}\u0011~\u000f\u000eWMi6\u0018_~􌪂\u0002Dಣ^\n~Zf:\"o󿎶3󽒔>|G5𔕴\u0002'=%\"\"|5\u0000y\n:5\u001bG츧}|屍C󿁸􅟮e\u000bi![?𢦜\u000cw*xIV\td F}X;􆱗𠿥\u000c=\u0018%\u001d𨑹(󰣓䆺嶚i=y6t\u0005󸳐\u0011󲄟 -5F6G\u0011󹳸NO.𠁳ly􂄭e,c\"f\u001d%\u0016\u0012󸉦<g:R\u0003k}𤇘~?G먂╪\u00176gメ&\u0011\rA􆎚k\u0012+R\u000b􀱔􋩇c7󱘸\n𤹴s%Bs\u0010󰉂\u000fn[aIRFg5K􍀀\u001e\u0017#^z󰡛󳪭J𭩒󲌖𥜻D/󾋟𪿏􁼧𑲒􈟂𪁚\u0019\u0014𭈖󵀙3𩍇na{𬼩aZ\u000b\"`싡hZﳧ𝘨:(@FG6N0I\u0010|o󻴭$V릖+\u001a􂧎󰫋𡻎𡍤sMV𗬭𘛴 𫀈󹒷䩂Bษ싊8PZP\u0006𧒆W𬪌H'{<󶊳䮐H'\u001f띘\u0004\u0006\u0003nQ镔x󶥟𤸁YC\u0005吿\t\u0013󱉔^u%;\u001cS_\u001d<Mw\r𪗮$𔔻9/𒁄51\u0007\u0000 J􅳒\u0019'Kᑤ𫌢󵞴}<Zl湉C>71Pⶔ󷜨\u0019󸮇􀼗1\u0012|\u0006",
     "phone_code": "FYKXjOe_umVeNz8oszsuHQ4S",
-    "label": "\u001b󹁶U<󽶈\"w\u0007<9s􌵓\u0007(?A󷤡\r\u001b󵃩y,@"
-}
\ No newline at end of file
+    "picture": [],
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_5.json b/libs/wire-api/test/golden/testObject_NewUser_user_5.json
index 7b43af7ac03..43e21ce4aad 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_5.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_5.json
@@ -1,24 +1,19 @@
 {
-    "phone": "+8057919910",
-    "locale": "hu-CG",
-    "managed_by": "scim",
     "accent_id": -20961,
-    "name": ";􌞇𘣣\u000f𣺗\u0001",
-    "invitation_code": "EXZtnNu96rBu0DQCJ_vGdZkjhH1SSzT2MAHgTQ==",
     "assets": [
         {
-            "size": "complete",
             "key": "\u0003󼙩8pq",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "鄬c9}+}T",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "7𢁻ui%4􈪳𢘅",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -30,18 +25,18 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Q􏄏𦇯𤇧\u0004x}$",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -49,38 +44,38 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": ">\r塀)",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "?<󾒣\u0015r𩉖\u0016Qi",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ",-&b𤰒1cw<={",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "x7\u0008#",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\\\u00068p\u0006",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -88,61 +83,66 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󼗷\nlᕻ\r?",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0019u󹚬",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "8𡷪\n8:\u0006W%M",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "!\u0014\u0001\u000f𢳵\u0007𭼈\u0017|",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󲷾\u001a덣􎡋􇿬:𫖆",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𘊊饩Ub",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "v}\u001a跳􁲼\n~y\u0008\u001fk",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u000fX^􀍷f",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󷽼𡄼󸩿f6f)S𠛾􆨺\"",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Xbj\u000c\u0010",
+            "size": "complete",
             "type": "image"
         }
     ],
     "email_code": "RZICMcCOzqyRTB0d17Rbsw==",
-    "label": "𭔀"
-}
\ No newline at end of file
+    "invitation_code": "EXZtnNu96rBu0DQCJ_vGdZkjhH1SSzT2MAHgTQ==",
+    "label": "𭔀",
+    "locale": "hu-CG",
+    "managed_by": "scim",
+    "name": ";􌞇𘣣\u000f𣺗\u0001",
+    "phone": "+8057919910"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_6.json b/libs/wire-api/test/golden/testObject_NewUser_user_6.json
index b15199cc07d..802b1f431fc 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_6.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_6.json
@@ -1,35 +1,24 @@
 {
-    "email": "@S{󹅨",
-    "team_id": "00000d6f-0000-2269-0000-6bf4000062f9",
-    "locale": "mh",
-    "managed_by": "wire",
     "accent_id": 30946,
-    "picture": [],
-    "name": "T+u𣛔fe01`)S%{󿆓}u帞o8-W󲸢\n\"q]B\u0007U㑸F𡕹\u0003n\u000737\t󳕭J4*_󴊓=f\u0013獣2󹣉Go}𘑍LhA蛲\u0016PM1v􌫚\u001c\u0005󷢩,󿚤\u0019􃰞\u001c9+9,1YT\u000et𨌨𭒠\u0015\u0017\u0002󶖝\u0017%\u001d𧼪G0{􎒅🇬\u0019y󴞬.Q",
-    "password": "+':l➄𫢸\nk|}@Z`D.\u0000Z𨵷;\u000e\u000c\r𘁔*l{&|\u0015o8镔)+\u0002󿴢𢻧\u000fF\u0013󳞌\u0013R찙<4N󷮤􏔹z@;󵱐#􃠆$}\u0011sAXuIWoB[N󹫙X\u0008e\u001b\u0002ꕮ$4𥀽󼶠S)\u0018#w}3p\u0001\u0010\\?\u0011S7􂾾E",
-    "sso_id": {
-        "subject": "󿸰",
-        "tenant": ""
-    },
     "assets": [
         {
-            "size": "complete",
             "key": "l󵵒zuLAm",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "l*+}􄲦􊁁䄋%Q\u0011\u001dns𧓨\u0012",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "􅶘\u001fd;\u001a󹇬􉼹s\\fo",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󻿍ty󶫾v􇧎8𮉎_Pc󽪡5",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -37,13 +26,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\te:q",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "8]󹨴9􆲤\t𗋥\u0015{uc",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -51,13 +40,13 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𬌰ﮑ\u000b",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𧚅'\u0008m􅳃腰",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -65,7 +54,18 @@
             "type": "image"
         }
     ],
+    "email": "@S{󹅨",
     "email_code": "ZTf52SPQ5jk=",
+    "label": "`r}\u0014m􊐈/h𥲸EP(-u9?qU)􂜅\u00071",
+    "locale": "mh",
+    "managed_by": "wire",
+    "name": "T+u𣛔fe01`)S%{󿆓}u帞o8-W󲸢\n\"q]B\u0007U㑸F𡕹\u0003n\u000737\t󳕭J4*_󴊓=f\u0013獣2󹣉Go}𘑍LhA蛲\u0016PM1v􌫚\u001c\u0005󷢩,󿚤\u0019􃰞\u001c9+9,1YT\u000et𨌨𭒠\u0015\u0017\u0002󶖝\u0017%\u001d𧼪G0{􎒅🇬\u0019y󴞬.Q",
+    "password": "+':l➄𫢸\nk|}@Z`D.\u0000Z𨵷;\u000e\u000c\r𘁔*l{&|\u0015o8镔)+\u0002󿴢𢻧\u000fF\u0013󳞌\u0013R찙<4N󷮤􏔹z@;󵱐#􃠆$}\u0011sAXuIWoB[N󹫙X\u0008e\u001b\u0002ꕮ$4𥀽󼶠S)\u0018#w}3p\u0001\u0010\\?\u0011S7􂾾E",
     "phone_code": "7dJcoVoTKFo=",
-    "label": "`r}\u0014m􊐈/h𥲸EP(-u9?qU)􂜅\u00071"
-}
\ No newline at end of file
+    "picture": [],
+    "sso_id": {
+        "subject": "󿸰",
+        "tenant": ""
+    },
+    "team_id": "00000d6f-0000-2269-0000-6bf4000062f9"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_7.json b/libs/wire-api/test/golden/testObject_NewUser_user_7.json
index 3ee7edfcbf5..94b564f400c 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_7.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_7.json
@@ -1,12 +1,5 @@
 {
-    "email": "%'\u0003\u001a쭩\u0007􇺛Ow󴲠耊󱾟@",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "gv-CH",
-    "managed_by": "scim",
     "accent_id": 18148,
-    "picture": [],
-    "name": "\u000e#KrlW\u0004󴻠󴢝wzLN.*BR\u001cJ􋴵/zi[𧔬In\r.)󴍜󸄣sﴀp8\"i\u0000􎳈\u001a󳐻\u0016k弢𣨕n\u0019󼑱\u001cS󸓿L随i=\u0011\u001e$\u0005𩌕E_䣉\u000c$u𦛝`\u0001􁔖\u0011󺂖󹃟󳅩𫍡tl須P\u001dޟ&<\u001b0\u001f:\u001abm(![\u0002~l.\r􀹮𨺯)z𡃴O􄪞\u0002􋸂`􀭇|\u0004􏵅o3iy𠚑\u0019tSd󹮳",
-    "password": ":Y􃵘@T󳛜􈋤\u0001𩖂~󿳇\n\u000e\u0017\u000c󱉶$}􍰯\u0019􋊺𩟖𮩀𮭈Al󴦽𗦭􎖜\u0008,])^\u001esz?󼤞9S,M)\u0007s=hmpCp\u0016wS󴓲c)z\u000b=梲-dU𧈧|\u0010@\u0016\u001a\u0007\u0017,\u000c㠌𢏾(L𦧼\u0016\u001b1~B\u001a􉂈+P!{@ﾮ󻥀\u000e4:G_\nI8\u000b󸅇g|􀯙Re\u0004E\u0018󺹸Dob3\u0002\u001bA2\u000e뎤&\r?㪉0M5􍨙,&ey\u001a󺋭QB\u001e{\u0015ᓧ76󰡬D􂪹J$􇫙qZYgd0i\u001d\u000cbZ\u0004𖥧􈴮D&m\"rM⠴𗰏\nhKg=7%Il􌢢g󵽱C}뭇䩢v󺩗 7!\u001erK c\u0018 %A\u0004𣽹\u000b\tIb\u0013W8\u0001i𪧡􎧸|OfiJ@@j󻊵xO;`󼄅\u0017c#\r{𭟸󳶘󴧨𩀿n \u0003IP\u0003Y-\u001b\u0010Ev\u001f􉠣\u000b\u0015zgx\u000fE\u0002󺕹'\u001a\u001d/󰀽DCD\u001cj\u0011\\𣙐뛁􃗭{1A\"\u0014-󵕹1􀅏􆯖wT\u001dB-q1a\"$S2x;<X\n{(QN䈽d$P>󳸭y󻸁\u0000t􂥚􁤏J䶪\u000cꜚ]0F( d􋠸~hﷰzt/Eነ3痝W\t-󿡻Lh<󳀊󵽈\u001d\u0012B\u0010𧍇𮙁􄩎a𗾈􈟏99呂\u001f\u0013f\u0002J\u001cc㽰F\u00188ਿv\u0006m􀷪k􆎞U\u0014bYm\u001fIV𨲼\u0005,n\u0008x\u000cl\\e󻀢;𤶐󳵏􉞮\u0010\u0011󲬈o󵝌KF$\u00028\r\u000cZ\u0013Z𮦛\u001c􊽯_󱵒:,\n 􇩎 AM𦽭\u0012w飌WB󷵿\u000cCS#𥛙=􎖮󱍯pC-.𨚈C~q?_O\u001b􏰙)𤝋\u0004\\\u0001\u0017-胾)\"la\u0004𤗪HAf􆼲􋄚숨l\u0002d\t)`.>󾳯u𧵮􋻎c󴂱\u0002|LiP􋐷L=󲦟ä́􄠶EE􎃀󷢻\u0003󴍥hQ\u0017W􇳛𗇣G\"ꩬD\u0014_􁺍\u0002#􉢽$𣪍\u000fL(􆼡\u0002t󸜉$IQX]p\u001b4&0􏍜\u0014􂴙m\u0016\t\\(^\u001b𝀢,D]􊆑𨆏\u0004\u0011IAd萅0N󻗾\u0008g6\u0013\u00137\u0015k\"􃿮)pI𤢭\\M𝔥\u0015砉\u001f𤺤6~T?\u0005\u0019s륀-[𡪿wጶDq𦞙\\󾕸%b\u00069󴖭2CCଥ󾡁ojGT g틓󶂞xSeL\u0018㪢\u001a󰨺'0:j4𑢹q7󴋃m\u0005s\u000e󻘭\u0005錪iG𐭇𮜌ᐓwv𮂜n\u001b\u0005\u001f\u0019􇃍󳛂\u0012Ce) U􆒑\u0006fo􀭟􎘹c􂜞L4\u0011-\u0016􂽾L󹪷𭖔\u0017|oW\u0017\u001b>bD\u0000𘉣dm𐛜vW󰹫(2\u0018z󺧐汋?n󰦚󷜅w𡀮\u0000\u0014}􌳉|H<횡U퉶\u0016󽥪𢯏\u0011W𬤏TM\u0006+LT\u0015;-!E>$\u0014j.\u0012q^\u0015ᖡIN􂮠>V\u0002𬼶󽎽OA🆪\u000bvCf𩕱n\u0000𐌋\u0005?^\u00166\u0017\t8:at\"w`􏡕rl䳹𝅆𪡨J󲣦~􋒨Q󳗴Lm?c\u0012v\u001di~i\u0014\u000cG%I\u001f>l!\u0002L\u001d\u0004UW\u0003􁏩\\Bg㋻\u001a⤢0EQM\u0015􈮕>匳\u000bY쇫𥉴𗻘L%^󴍃r𨌤%>\u000b0z󲶭m\u000bEh(𬁮u2\u0011v󽮶Q\u001eB𑰇I+\u0003kaR󴮝=)\u001a_󼂹Tv\u000e%𬭧M:𤊈&\u0014\u00070\u000c\"\u0004👫{󵄤\u0005)\u001aF\u0010N`08𭴦\u000e\u000e𤧢󽵦k􅉔𧀙Q\u001f\u00191[/󶾛𫓤Q􂡤𐲓re𠆔du*󸱠\u001c~∹a*4\u0012cr󳜕b",
     "assets": [
         {
             "key": ",m1.I7",
@@ -17,48 +10,48 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "sO\\\u001d㥎",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "$.A>Z",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "7r􃟳󿪝",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "%𮀕󿰑iW\u001ff􂜏􇊱\u000f\u0017\":𦛛󼤱",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𩓄󺎛p",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0017𥷭o*",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "Bbt",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": ">^\"􀪤𝙠\u0003[􍆩𫳳",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -66,22 +59,29 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0010A숇Ue󶸳\u0019K$",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "Lj\u001d?\u001at𣥪􈶿",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u000cL𗤩?Pa\u0002󸢚R\u001e\u0006􉝳\u0007=",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "email": "%'\u0003\u001a쭩\u0007􇺛Ow󴲠耊󱾟@",
     "email_code": "34dAzMrB0CunAvR9",
+    "label": "n󱣈2",
+    "locale": "gv-CH",
+    "managed_by": "scim",
+    "name": "\u000e#KrlW\u0004󴻠󴢝wzLN.*BR\u001cJ􋴵/zi[𧔬In\r.)󴍜󸄣sﴀp8\"i\u0000􎳈\u001a󳐻\u0016k弢𣨕n\u0019󼑱\u001cS󸓿L随i=\u0011\u001e$\u0005𩌕E_䣉\u000c$u𦛝`\u0001􁔖\u0011󺂖󹃟󳅩𫍡tl須P\u001dޟ&<\u001b0\u001f:\u001abm(![\u0002~l.\r􀹮𨺯)z𡃴O􄪞\u0002􋸂`􀭇|\u0004􏵅o3iy𠚑\u0019tSd󹮳",
+    "password": ":Y􃵘@T󳛜􈋤\u0001𩖂~󿳇\n\u000e\u0017\u000c󱉶$}􍰯\u0019􋊺𩟖𮩀𮭈Al󴦽𗦭􎖜\u0008,])^\u001esz?󼤞9S,M)\u0007s=hmpCp\u0016wS󴓲c)z\u000b=梲-dU𧈧|\u0010@\u0016\u001a\u0007\u0017,\u000c㠌𢏾(L𦧼\u0016\u001b1~B\u001a􉂈+P!{@ﾮ󻥀\u000e4:G_\nI8\u000b󸅇g|􀯙Re\u0004E\u0018󺹸Dob3\u0002\u001bA2\u000e뎤&\r?㪉0M5􍨙,&ey\u001a󺋭QB\u001e{\u0015ᓧ76󰡬D􂪹J$􇫙qZYgd0i\u001d\u000cbZ\u0004𖥧􈴮D&m\"rM⠴𗰏\nhKg=7%Il􌢢g󵽱C}뭇䩢v󺩗 7!\u001erK c\u0018 %A\u0004𣽹\u000b\tIb\u0013W8\u0001i𪧡􎧸|OfiJ@@j󻊵xO;`󼄅\u0017c#\r{𭟸󳶘󴧨𩀿n \u0003IP\u0003Y-\u001b\u0010Ev\u001f􉠣\u000b\u0015zgx\u000fE\u0002󺕹'\u001a\u001d/󰀽DCD\u001cj\u0011\\𣙐뛁􃗭{1A\"\u0014-󵕹1􀅏􆯖wT\u001dB-q1a\"$S2x;<X\n{(QN䈽d$P>󳸭y󻸁\u0000t􂥚􁤏J䶪\u000cꜚ]0F( d􋠸~hﷰzt/Eነ3痝W\t-󿡻Lh<󳀊󵽈\u001d\u0012B\u0010𧍇𮙁􄩎a𗾈􈟏99呂\u001f\u0013f\u0002J\u001cc㽰F\u00188ਿv\u0006m􀷪k􆎞U\u0014bYm\u001fIV𨲼\u0005,n\u0008x\u000cl\\e󻀢;𤶐󳵏􉞮\u0010\u0011󲬈o󵝌KF$\u00028\r\u000cZ\u0013Z𮦛\u001c􊽯_󱵒:,\n 􇩎 AM𦽭\u0012w飌WB󷵿\u000cCS#𥛙=􎖮󱍯pC-.𨚈C~q?_O\u001b􏰙)𤝋\u0004\\\u0001\u0017-胾)\"la\u0004𤗪HAf􆼲􋄚숨l\u0002d\t)`.>󾳯u𧵮􋻎c󴂱\u0002|LiP􋐷L=󲦟ä́􄠶EE􎃀󷢻\u0003󴍥hQ\u0017W􇳛𗇣G\"ꩬD\u0014_􁺍\u0002#􉢽$𣪍\u000fL(􆼡\u0002t󸜉$IQX]p\u001b4&0􏍜\u0014􂴙m\u0016\t\\(^\u001b𝀢,D]􊆑𨆏\u0004\u0011IAd萅0N󻗾\u0008g6\u0013\u00137\u0015k\"􃿮)pI𤢭\\M𝔥\u0015砉\u001f𤺤6~T?\u0005\u0019s륀-[𡪿wጶDq𦞙\\󾕸%b\u00069󴖭2CCଥ󾡁ojGT g틓󶂞xSeL\u0018㪢\u001a󰨺'0:j4𑢹q7󴋃m\u0005s\u000e󻘭\u0005錪iG𐭇𮜌ᐓwv𮂜n\u001b\u0005\u001f\u0019􇃍󳛂\u0012Ce) U􆒑\u0006fo􀭟􎘹c􂜞L4\u0011-\u0016􂽾L󹪷𭖔\u0017|oW\u0017\u001b>bD\u0000𘉣dm𐛜vW󰹫(2\u0018z󺧐汋?n󰦚󷜅w𡀮\u0000\u0014}􌳉|H<횡U퉶\u0016󽥪𢯏\u0011W𬤏TM\u0006+LT\u0015;-!E>$\u0014j.\u0012q^\u0015ᖡIN􂮠>V\u0002𬼶󽎽OA🆪\u000bvCf𩕱n\u0000𐌋\u0005?^\u00166\u0017\t8:at\"w`􏡕rl䳹𝅆𪡨J󲣦~􋒨Q󳗴Lm?c\u0012v\u001di~i\u0014\u000cG%I\u001f>l!\u0002L\u001d\u0004UW\u0003􁏩\\Bg㋻\u001a⤢0EQM\u0015􈮕>匳\u000bY쇫𥉴𗻘L%^󴍃r𨌤%>\u000b0z󲶭m\u000bEh(𬁮u2\u0011v󽮶Q\u001eB𑰇I+\u0003kaR󴮝=)\u001a_󼂹Tv\u000e%𬭧M:𤊈&\u0014\u00070\u000c\"\u0004👫{󵄤\u0005)\u001aF\u0010N`08𭴦\u000e\u000e𤧢󽵦k􅉔𧀙Q\u001f\u00191[/󶾛𫓤Q􂡤𐲓re𠆔du*󸱠\u001c~∹a*4\u0012cr󳜕b",
     "phone_code": "1Yzr8-Lo2FnYwYYaJFeGEh3yaODV8pFYx3E=",
-    "label": "n󱣈2"
-}
\ No newline at end of file
+    "picture": [],
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_8.json b/libs/wire-api/test/golden/testObject_NewUser_user_8.json
index 0c6823423be..cda1db966b7 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_8.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_8.json
@@ -1,31 +1,31 @@
 {
-    "locale": "fo-FM",
     "accent_id": -26710,
-    "picture": [],
-    "name": "\u0002O.岾𗳬\"\u0012k\u0004󳈓C<|𘉊𦵛蕃2\u000eu+`9\u000eb#A7n\u000edr􏋐w\u001b􍩿x8𫽾x𠆲󲞲O𣮛󲹂ฑ\u0015\u00004<q𗅕<z{K𨣗Z`\u0000􋭚\u0019,󼵊sw\u000e\u001a\u0000𝘰1􇃿2mM\u0012O󶑧L8\u0018L\u001bY𥦠􋡮,Z\u000cl\n\u001b;g\u0017=8y\t􅔍\u0004\u0014\u0005Q\u000bE`\u000c\u001dq􁔊s\u000eS7J?T𒅴󷩔!*2]\u0011",
-    "password": "󻀂\u00068pS𡴴\u000b𤹬G\u001c\u0016'Z𤡁𩠐`𐧯\u001a𡇞􋉖L8(A9!)脷n\u001dz\u001at\u0017j[%\u0003\u0017， G@h7~㌼X~\u000eanPf􄰷!t𑪋㹪\u0017Hy\u0013",
-    "invitation_code": "1579",
     "assets": [
         {
-            "size": "complete",
             "key": "\u0004󺵈􁍶/􍠥uIXl\u0005b𨍛􅻿",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0010&",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "FP𮭗4@",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𠃌𦫚𮄠9~\"\u000f",
+            "size": "complete",
             "type": "image"
         }
     ],
-    "email_code": "OXIgclTUyV_J5am0ZDqm7eLN-c8ecvk4"
-}
\ No newline at end of file
+    "email_code": "OXIgclTUyV_J5am0ZDqm7eLN-c8ecvk4",
+    "invitation_code": "1579",
+    "locale": "fo-FM",
+    "name": "\u0002O.岾𗳬\"\u0012k\u0004󳈓C<|𘉊𦵛蕃2\u000eu+`9\u000eb#A7n\u000edr􏋐w\u001b􍩿x8𫽾x𠆲󲞲O𣮛󲹂ฑ\u0015\u00004<q𗅕<z{K𨣗Z`\u0000􋭚\u0019,󼵊sw\u000e\u001a\u0000𝘰1􇃿2mM\u0012O󶑧L8\u0018L\u001bY𥦠􋡮,Z\u000cl\n\u001b;g\u0017=8y\t􅔍\u0004\u0014\u0005Q\u000bE`\u000c\u001dq􁔊s\u000eS7J?T𒅴󷩔!*2]\u0011",
+    "password": "󻀂\u00068pS𡴴\u000b𤹬G\u001c\u0016'Z𤡁𩠐`𐧯\u001a𡇞􋉖L8(A9!)脷n\u001dz\u001at\u0017j[%\u0003\u0017， G@h7~㌼X~\u000eanPf􄰷!t𑪋㹪\u0017Hy\u0013",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_NewUser_user_9.json b/libs/wire-api/test/golden/testObject_NewUser_user_9.json
index 13bffd4141f..248a950f49f 100644
--- a/libs/wire-api/test/golden/testObject_NewUser_user_9.json
+++ b/libs/wire-api/test/golden/testObject_NewUser_user_9.json
@@ -1,31 +1,19 @@
 {
-    "phone": "+71827573",
-    "team_id": "00007c3b-0000-1728-0000-6e4e00005f30",
-    "uuid": "00000000-0000-0000-0000-000000000000",
-    "locale": "mn-NP",
-    "managed_by": "scim",
     "accent_id": 24261,
-    "picture": [],
-    "name": "\u0016<h󰦆z\u0010af󾗐􉂎u\u000f􄍧+󼾽!h𫳻J𮕩>𗨧􁮢b\\#􂲰oC2-=+𗸢L5\u001c\\*L\u001e@F𧳸/\u00069m4)\u001d\u0007t`\u0010󷗖8)s\u0007o􆫶n",
-    "password": "(\u0003V󷬘󽵣\u0008𧖌􁣵$~&󽡿o󽻚MTfC.󹠠;WO􋴞6#{\n􅊷z􂀔K疶6\u0014󵡨𡙄(𦰤\r?Lc\u0018xNE\u0005h/JeS\u0006\u0018𪙊+60W3ySv\u001f@\u0013w􊔶\u0008B\u0016^%\u0019󱚗𣵠iodDm%🄸\u0011]m\u000b_啷𬏚$\u001d𮄎𡷔yt\u0004fm\u000e'@#\u0014)𬨖|\r&$*!%\n\u0017r]{v\u001c\u0018\u001c󴨉\u0008>𩆈d@X0\u001d8𦩺>\r8{𘕠\u0010􅌻󺢤C\u0000k󺦖\u001bM^:􅅴WF\u000f\t5Qi;}\n􍹜㧖󴠩\u0010\u0006*Pk\u0001𑁀*𪼤mNp徱@O\u001e&󺚥F󲼢tx𗅓?󾏘Ps􅐎r󶹴{E\u0003\u001d􍬹𮠃zcn󸗠e\u0001kr=󽀕z~e\\Dꀤc\u001c[J^\u0013𓈹\r𮈮ᯮw1􍦺󲅋\u001c𫻵\t󷛣󹅦;𪜀 \u000bM􎦱IF2\u001b𮭙cbvP\u00080脇q>󵮾#%k𘡛Zw󴠚󶫚y捡x\u0012|􀖣\u0016@\u0018>\u001dR\u0015\u001a3%\n􅺐\u0002􇲓\u0011uOs􎞂􄅝𡱪u􆃜a!\u0012𠗄fWgk5\u001d􈐿\r󸫆ꞔ𣤭\u000c\u001eydAs=󺃙z쇻\u001c\nxR\u000f Ng\u0006C:X𣲿7\u000c[󺉐k\u000b}\u00175\u0012Wm%􉡕𨠠,𤀾\u0010Gr􆜓ZvO砀B󵘩hjYZiGd\u0008P\u0001GHG-\u0014\u001fy\u0017r9$󽪣Kmh󠁦8g3ㆪt󸁮󰦠󹚓\u0008\"►\\sn\u0004>\u0011𮠫6𠱝\u000f8k󷝀6F🤲&\u00189\u000c'Bn앲\u001c땼\u00150H=\u001fe6𐨨\u001f0􃘠L\u001c𧺛o9!󿑵􋔝􈜷r\u0004:折Ǭq1\u000c􃉃Ꮧ\u001b5u5𧌡>U󰙋$蘆i\u0008P<b\nbw󳵂\u001bx󷕈𨂪\n𝝍\u001eZ:뷅U횳􆥐\u0011b8ᖑlE_s𢯧bJ􌨯D\u000f\u0016#\u0007 RK\u0015\u00150.𖺇*\u001e𡗨\u001e\u0017􄌄𨵗𒓘NtgtA\u0011󺴗Zjv󽻾$\"\u000fP\u0010J攆]\u0001u𫪻\u0005i8\u0015)XHM5^𣦠𬛢c>偁~𐦑\n\u001b󾹟\u00052\u0010_%𧍶󳳱\u0012b^\\_􉣖CD[Rg𡀗l🢤*󰰫🙏\u001d􏹝\u001fX\u0005`\nM\u000e􄰾0H*i\u0005󺕀\u0003#qꘒx\nOaE*U󶊍GRw󰊊]􎩐/#)E󸥝z\u0016􊒬\u0014\u0013\u001bS\u0019o𫥿U\tK􉕈𐧞`\u00016풹𩯟􍖽🃭:D䑺풓󸡝7𩼉y󿾪/S\u0015z\u0004}7HRV􎰾􉁡.FQ󵐩調􎋉𐐠a;􁤚󼚂\u0017A떆􇖋\n𑊓𣎻V𦋍󿒑S\u001e\u0008S%󽑆S^d\u0019\u0008󴤰.gd\u001d1!(\u0012(DE𭆦\u0014󳇠􎒣@󿼟m󾙏F=\u0014󰻞𔓰噀aAp𡙅\u0015f󷦓󱨕C官𠊌􆆶(@\u0018-𢚰𐰠4/]󴏣\u001d􉈝9/E𤰭<𠡽`刜#L\u0012\u00042J\t\u000fj@w\u00179OoyN\u0011\u0005棱[d􈁌􋰓\u001c󽠷F[\u0001\u0012𣵔uE󶗎H2仇H%5]\u0008𨽮\\\u000e\u00138Nr\u0019e\u0007cE􌾄S\u000f􆬆\nt\u000cI𔒡{󹏜.E*𧵚z𛅹#]zԤ6GM\u0008󽚥lb\u0008\t|RJ\u0013󼸁􃾋𩙚|^\"E\u0004mc󺷿ﱊ\u0012@􌱛\u0008󵟾􄴐󳶌\u0007x2w痳􂮊􏎉\u0006O􈑝󻝀\u0015fp\u0006S,P&\u0018Vw\u001fqI^:\u000e46m𐲙rJyiᾛ=D􍬅&\u0016Uij􂓣\u0018vi\"f\u000cX|\u0006󸰾A밌􈚎󾩻YE\u0013\u000eoh𣜼􉱔\u000c깱u&%\u0006v𘫱k#􎧺`􆴪\u000c{\u000e,\t\u0018\u0003= 􋁜 ?􄵫\u0011\u000e𨳮7U縰Y\u001c􅲄𦍴𫀃g\u0016s5B&\u0016\u000c\u0000\u0019𫐩\u0005\u001f󾀁+L\u0012iE^.􏔸|l\u0001b]i(h",
-    "sso_id": {
-        "subject": "󶃪",
-        "tenant": "L𩵖󶃲*"
-    },
     "assets": [
         {
-            "size": "preview",
             "key": "<%\u0012인",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u000f",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0012􊩰𩼬K<\u0004F",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -42,6 +30,18 @@
         }
     ],
     "email_code": "EGk4BobXeO_5YaLyYwCxuZv6-A==",
+    "label": "d󺘻􊵍0\u0018𦊖\u001dZu552@𧘬\r4/􂇊\u000co𭭊N\u0018\u0016&󹛗",
+    "locale": "mn-NP",
+    "managed_by": "scim",
+    "name": "\u0016<h󰦆z\u0010af󾗐􉂎u\u000f􄍧+󼾽!h𫳻J𮕩>𗨧􁮢b\\#􂲰oC2-=+𗸢L5\u001c\\*L\u001e@F𧳸/\u00069m4)\u001d\u0007t`\u0010󷗖8)s\u0007o􆫶n",
+    "password": "(\u0003V󷬘󽵣\u0008𧖌􁣵$~&󽡿o󽻚MTfC.󹠠;WO􋴞6#{\n􅊷z􂀔K疶6\u0014󵡨𡙄(𦰤\r?Lc\u0018xNE\u0005h/JeS\u0006\u0018𪙊+60W3ySv\u001f@\u0013w􊔶\u0008B\u0016^%\u0019󱚗𣵠iodDm%🄸\u0011]m\u000b_啷𬏚$\u001d𮄎𡷔yt\u0004fm\u000e'@#\u0014)𬨖|\r&$*!%\n\u0017r]{v\u001c\u0018\u001c󴨉\u0008>𩆈d@X0\u001d8𦩺>\r8{𘕠\u0010􅌻󺢤C\u0000k󺦖\u001bM^:􅅴WF\u000f\t5Qi;}\n􍹜㧖󴠩\u0010\u0006*Pk\u0001𑁀*𪼤mNp徱@O\u001e&󺚥F󲼢tx𗅓?󾏘Ps􅐎r󶹴{E\u0003\u001d􍬹𮠃zcn󸗠e\u0001kr=󽀕z~e\\Dꀤc\u001c[J^\u0013𓈹\r𮈮ᯮw1􍦺󲅋\u001c𫻵\t󷛣󹅦;𪜀 \u000bM􎦱IF2\u001b𮭙cbvP\u00080脇q>󵮾#%k𘡛Zw󴠚󶫚y捡x\u0012|􀖣\u0016@\u0018>\u001dR\u0015\u001a3%\n􅺐\u0002􇲓\u0011uOs􎞂􄅝𡱪u􆃜a!\u0012𠗄fWgk5\u001d􈐿\r󸫆ꞔ𣤭\u000c\u001eydAs=󺃙z쇻\u001c\nxR\u000f Ng\u0006C:X𣲿7\u000c[󺉐k\u000b}\u00175\u0012Wm%􉡕𨠠,𤀾\u0010Gr􆜓ZvO砀B󵘩hjYZiGd\u0008P\u0001GHG-\u0014\u001fy\u0017r9$󽪣Kmh󠁦8g3ㆪt󸁮󰦠󹚓\u0008\"►\\sn\u0004>\u0011𮠫6𠱝\u000f8k󷝀6F🤲&\u00189\u000c'Bn앲\u001c땼\u00150H=\u001fe6𐨨\u001f0􃘠L\u001c𧺛o9!󿑵􋔝􈜷r\u0004:折Ǭq1\u000c􃉃Ꮧ\u001b5u5𧌡>U󰙋$蘆i\u0008P<b\nbw󳵂\u001bx󷕈𨂪\n𝝍\u001eZ:뷅U횳􆥐\u0011b8ᖑlE_s𢯧bJ􌨯D\u000f\u0016#\u0007 RK\u0015\u00150.𖺇*\u001e𡗨\u001e\u0017􄌄𨵗𒓘NtgtA\u0011󺴗Zjv󽻾$\"\u000fP\u0010J攆]\u0001u𫪻\u0005i8\u0015)XHM5^𣦠𬛢c>偁~𐦑\n\u001b󾹟\u00052\u0010_%𧍶󳳱\u0012b^\\_􉣖CD[Rg𡀗l🢤*󰰫🙏\u001d􏹝\u001fX\u0005`\nM\u000e􄰾0H*i\u0005󺕀\u0003#qꘒx\nOaE*U󶊍GRw󰊊]􎩐/#)E󸥝z\u0016􊒬\u0014\u0013\u001bS\u0019o𫥿U\tK􉕈𐧞`\u00016풹𩯟􍖽🃭:D䑺풓󸡝7𩼉y󿾪/S\u0015z\u0004}7HRV􎰾􉁡.FQ󵐩調􎋉𐐠a;􁤚󼚂\u0017A떆􇖋\n𑊓𣎻V𦋍󿒑S\u001e\u0008S%󽑆S^d\u0019\u0008󴤰.gd\u001d1!(\u0012(DE𭆦\u0014󳇠􎒣@󿼟m󾙏F=\u0014󰻞𔓰噀aAp𡙅\u0015f󷦓󱨕C官𠊌􆆶(@\u0018-𢚰𐰠4/]󴏣\u001d􉈝9/E𤰭<𠡽`刜#L\u0012\u00042J\t\u000fj@w\u00179OoyN\u0011\u0005棱[d􈁌􋰓\u001c󽠷F[\u0001\u0012𣵔uE󶗎H2仇H%5]\u0008𨽮\\\u000e\u00138Nr\u0019e\u0007cE􌾄S\u000f􆬆\nt\u000cI𔒡{󹏜.E*𧵚z𛅹#]zԤ6GM\u0008󽚥lb\u0008\t|RJ\u0013󼸁􃾋𩙚|^\"E\u0004mc󺷿ﱊ\u0012@􌱛\u0008󵟾􄴐󳶌\u0007x2w痳􂮊􏎉\u0006O􈑝󻝀\u0015fp\u0006S,P&\u0018Vw\u001fqI^:\u000e46m𐲙rJyiᾛ=D􍬅&\u0016Uij􂓣\u0018vi\"f\u000cX|\u0006󸰾A밌􈚎󾩻YE\u0013\u000eoh𣜼􉱔\u000c깱u&%\u0006v𘫱k#􎧺`􆴪\u000c{\u000e,\t\u0018\u0003= 􋁜 ?􄵫\u0011\u000e𨳮7U縰Y\u001c􅲄𦍴𫀃g\u0016s5B&\u0016\u000c\u0000\u0019𫐩\u0005\u001f󾀁+L\u0012iE^.􏔸|l\u0001b]i(h",
+    "phone": "+71827573",
     "phone_code": "ohTCWvY5M-J1AbWoFfqtjg==",
-    "label": "d󺘻􊵍0\u0018𦊖\u001dZu552@𧘬\r4/􂇊\u000co𭭊N\u0018\u0016&󹛗"
-}
\ No newline at end of file
+    "picture": [],
+    "sso_id": {
+        "subject": "󶃪",
+        "tenant": "L𩵖󶃲*"
+    },
+    "team_id": "00007c3b-0000-1728-0000-6e4e00005f30",
+    "uuid": "00000000-0000-0000-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_1.json b/libs/wire-api/test/golden/testObject_Offset_user_1.json
index 56a6051ca2b..d00491fd7e5 100644
--- a/libs/wire-api/test/golden/testObject_Offset_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Offset_user_1.json
@@ -1 +1 @@
-1
\ No newline at end of file
+1
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_10.json b/libs/wire-api/test/golden/testObject_Offset_user_10.json
deleted file mode 100644
index 3cacc0b93c9..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-12
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_11.json b/libs/wire-api/test/golden/testObject_Offset_user_11.json
deleted file mode 100644
index 8e2afd34277..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-17
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_12.json b/libs/wire-api/test/golden/testObject_Offset_user_12.json
deleted file mode 100644
index 8e2afd34277..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-17
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_13.json b/libs/wire-api/test/golden/testObject_Offset_user_13.json
deleted file mode 100644
index 3cacc0b93c9..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-12
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_14.json b/libs/wire-api/test/golden/testObject_Offset_user_14.json
deleted file mode 100644
index 25bf17fc5aa..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-18
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_15.json b/libs/wire-api/test/golden/testObject_Offset_user_15.json
deleted file mode 100644
index 8fdd954df98..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-22
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_16.json b/libs/wire-api/test/golden/testObject_Offset_user_16.json
deleted file mode 100644
index 8580e7b684b..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-30
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_17.json b/libs/wire-api/test/golden/testObject_Offset_user_17.json
deleted file mode 100644
index a5c750feac4..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-27
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_18.json b/libs/wire-api/test/golden/testObject_Offset_user_18.json
deleted file mode 100644
index 3cacc0b93c9..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-12
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_19.json b/libs/wire-api/test/golden/testObject_Offset_user_19.json
deleted file mode 100644
index 2edeafb09db..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-20
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_2.json b/libs/wire-api/test/golden/testObject_Offset_user_2.json
deleted file mode 100644
index 410b14d2ce6..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-25
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_20.json b/libs/wire-api/test/golden/testObject_Offset_user_20.json
deleted file mode 100644
index f11c82a4cb6..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-9
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_3.json b/libs/wire-api/test/golden/testObject_Offset_user_3.json
deleted file mode 100644
index cabf43b5ddf..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-24
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_4.json b/libs/wire-api/test/golden/testObject_Offset_user_4.json
deleted file mode 100644
index c227083464f..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_5.json b/libs/wire-api/test/golden/testObject_Offset_user_5.json
deleted file mode 100644
index 978b4e8e518..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-26
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_6.json b/libs/wire-api/test/golden/testObject_Offset_user_6.json
deleted file mode 100644
index 25bf17fc5aa..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-18
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_7.json b/libs/wire-api/test/golden/testObject_Offset_user_7.json
deleted file mode 100644
index dec2bf5d619..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-19
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_8.json b/libs/wire-api/test/golden/testObject_Offset_user_8.json
deleted file mode 100644
index 301160a9306..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-8
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Offset_user_9.json b/libs/wire-api/test/golden/testObject_Offset_user_9.json
deleted file mode 100644
index bf0d87ab1b2..00000000000
--- a/libs/wire-api/test/golden/testObject_Offset_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_1.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_1.json
index 3bc99a00505..dbe5d78d90c 100644
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "conversation_role": "vvbanmrrrf0kz7y"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_10.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_10.json
deleted file mode 100644
index f3336862ad8..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_10.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "qcy9otfo7rl0d9oa1kq7iobys1i59_gxrhiuv5l_w4b2j9r6x6ua441ad99i"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_11.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_11.json
deleted file mode 100644
index 12de7639432..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_11.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "akw_p5mqagi0klrhzd0ukj1mlupvhno"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_12.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_12.json
deleted file mode 100644
index e9d5606ac1e..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_12.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "io75ieiijh_xvq4igfte583a1ox2b_w8stske45y0gungrsywu5yn0j1c97a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_13.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_13.json
deleted file mode 100644
index 82ca3800d9a..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "4y2w1ji0lwwll4ty19phctezkakazwql8hlc4ybxn95rr62thfgjf75_s239p5bn70m5zaym2hlpdo2wg72sd_jznqgeeo0yym7wy7bif3i3k0fpjwqy9xbcwmdqmo"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_14.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_14.json
deleted file mode 100644
index 1492e2f3ed9..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_14.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "adzhpxx407p2r4777be9tmaa_qwkuzjt1y90n1jyoo9g8221wmy3x7es"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_15.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_15.json
deleted file mode 100644
index f85b16dc879..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_15.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "026y8leagl0cp664oyxw9oz4w67q3sxrr6ub9p_d6m0yrt7oi8i1sjvjc24wm_jhan"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_16.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_16.json
deleted file mode 100644
index 336302324ec..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_16.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "0g0efe2d96tn3vnit9olsqlc261g0t0fs97lo1rgssw0ya1jlp6"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_17.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_17.json
deleted file mode 100644
index d62531a0a6d..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "453nrxunikcpx531hzey3_2z1hx4syssy2xuoqw1qhkly96wr3vzce2xtqg7dixfli0bunl63i1h87598wan1iy_qm0s5e3osw6nsyaqt84citc622um7363o01dpx1z"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_18.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_18.json
deleted file mode 100644
index 5f1638760b5..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_18.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "7cpb0bypyoji"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_19.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_19.json
deleted file mode 100644
index 5cf34593f7b..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "l68mk17rc__bb79q6pzj3kpwxmllg0b2sw241un60ar"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_2.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_2.json
deleted file mode 100644
index 86781abb144..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "or2kkb9cwydq4axsiqakr7jl8s4h_9a2oo_qz7"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_20.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_20.json
deleted file mode 100644
index 7b3eb6c254c..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_20.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "33f9cfma5eqtaf3q0qal6gd2n_ushf3cfi96s2yfgmj09syiun4tlvr15qfktum6fcdu8oscojjqmkrmb4thylztgzzpsb7v40s7_z1c1"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_3.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_3.json
deleted file mode 100644
index 95c6a8b8cb7..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_3.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "99nln_ajv7ozy9n1rry4si2kqvx_o4pannusi6x59g1y7sm1aq86y2l7a6denfdtj793yjo8hbbiyyg6ob1zqlz"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_4.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_4.json
deleted file mode 100644
index 9bb5d5d62a1..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "hmhit7b2l4_li9cfvq2qwj692fo6xf8mkbroq1ndmwkg0y316rl"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_5.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_5.json
deleted file mode 100644
index 30793a80a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "kajmr9qw2h6wl8tyj_yvbr03gv3cqq27jnu1xxtd85o_udx5e0d5g14dak0ki3t61sjgze5zakev_1zyn91u9pmxu"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_6.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_6.json
deleted file mode 100644
index 6762d8437d8..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_6.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "jgdrtk3a_xeb2dhnq2boov"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_7.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_7.json
deleted file mode 100644
index 35afaa1ed12..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_7.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "qco7881pfhkmlkv6f9sxemk5mwubcpe5pmixn0sbx0fpmjnhnnyxh11mp3et"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_8.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_8.json
deleted file mode 100644
index 8fc5fe2b346..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_8.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "_xlywnzi1vn_bmxe3dnqjl0mpywx4er4jk1g0ps6um11n3l6w469gs77fm1qmmlz3a4nk5d6yjvwwzjcu_klim2y9iji3sc"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_9.json b/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_9.json
deleted file mode 100644
index bee7c0ed035..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMemberUpdate_user_9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "conversation_role": "bhzmbkr_z1w3wirenhrwygzl57vthdsqketvpgormegz7"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_1.json b/libs/wire-api/test/golden/testObject_OtherMember_user_1.json
index 3fe294bf370..b9feee59255 100644
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_1.json
+++ b/libs/wire-api/test/golden/testObject_OtherMember_user_1.json
@@ -1,13 +1,13 @@
 {
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0000-0000-000300000004",
-        "provider": "00000000-0000-0000-0000-000200000002"
-    },
     "conversation_role": "kd8736",
+    "id": "00000008-0000-0009-0000-000f00000001",
     "qualified_id": {
         "domain": "golden.example.com",
         "id": "00000008-0000-0009-0000-000f00000001"
     },
-    "id": "00000008-0000-0009-0000-000f00000001"
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0000-0000-000300000004",
+        "provider": "00000000-0000-0000-0000-000200000002"
+    },
+    "status": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_10.json b/libs/wire-api/test/golden/testObject_OtherMember_user_10.json
deleted file mode 100644
index dede9d5652c..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_10.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "status": 0,
-    "conversation_role": "uneetc9i9j3",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000005-0000-0020-0000-000b0000001f"
-    },
-    "id": "00000005-0000-0020-0000-000b0000001f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_11.json b/libs/wire-api/test/golden/testObject_OtherMember_user_11.json
deleted file mode 100644
index 3cd3a9e701b..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_11.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000001-0000-0004-0000-000200000001",
-        "provider": "00000000-0000-0001-0000-000400000003"
-    },
-    "conversation_role": "j_0wepobygx3ejil7wdiinpmgp16d4n6lp2chqdtk64ic5lspht_4m0y83o9zltergmkhiisc4rk6lauh7s",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000004-0000-001e-0000-001d0000001a"
-    },
-    "id": "00000004-0000-001e-0000-001d0000001a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_12.json b/libs/wire-api/test/golden/testObject_OtherMember_user_12.json
deleted file mode 100644
index 5ff709b82f0..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_12.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000002-0000-0003-0000-000200000002",
-        "provider": "00000002-0000-0003-0000-000300000000"
-    },
-    "conversation_role": "s0cumbx6k0vnriouzagmjk5vl9r7k6mw7cp1rrdx8_kcybuo5x9m6wp7a98pzfio6s",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000016-0000-0019-0000-001200000013"
-    },
-    "id": "00000016-0000-0019-0000-001200000013"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_13.json b/libs/wire-api/test/golden/testObject_OtherMember_user_13.json
deleted file mode 100644
index 1c93b4c5214..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_13.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000004-0000-0004-0000-000000000001",
-        "provider": "00000001-0000-0001-0000-000100000001"
-    },
-    "conversation_role": "clxtcuty2d1g_clojjevjpb5ca4a1",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000008-0000-0009-0000-000d00000011"
-    },
-    "id": "00000008-0000-0009-0000-000d00000011"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_14.json b/libs/wire-api/test/golden/testObject_OtherMember_user_14.json
deleted file mode 100644
index 0aade59674d..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_14.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "status": 0,
-    "conversation_role": "gxe_4agkvb3",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000016-0000-000c-0000-000e00000016"
-    },
-    "id": "00000016-0000-000c-0000-000e00000016"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_15.json b/libs/wire-api/test/golden/testObject_OtherMember_user_15.json
deleted file mode 100644
index 442dc0fb0e3..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_15.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "status": 0,
-    "conversation_role": "vp25612u_4o84sy2rigmst6j7zd54d6502f0zogeb2zm93b5vcdcf5z8mm_0by9syvet_u_7a",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "0000000d-0000-001f-0000-00180000001c"
-    },
-    "id": "0000000d-0000-001f-0000-00180000001c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_16.json b/libs/wire-api/test/golden/testObject_OtherMember_user_16.json
deleted file mode 100644
index 72b7d4d51f9..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_16.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "status": 0,
-    "conversation_role": "89u0cp528kwlognk222yl5epk322mwjgip8k4atbko1u_q_3mmlalbdxtbrfdysnp0mii7dugiujclxbil1cjq1",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000014-0000-001e-0000-000600000008"
-    },
-    "id": "00000014-0000-001e-0000-000600000008"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_17.json b/libs/wire-api/test/golden/testObject_OtherMember_user_17.json
deleted file mode 100644
index e82ba2778a8..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_17.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000004-0000-0002-0000-000200000004",
-        "provider": "00000003-0000-0001-0000-000200000003"
-    },
-    "conversation_role": "vi4v4en0v5vnq7nohnqqr18rfh82_tz3kndf38p8_vfr8ogae54h9nbkt0_ysm3isafx6dz57kfzkxu6f73gfkc9",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000016-0000-001b-0000-00110000000c"
-    },
-    "id": "00000016-0000-001b-0000-00110000000c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_18.json b/libs/wire-api/test/golden/testObject_OtherMember_user_18.json
deleted file mode 100644
index 4d2e6e1bd79..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_18.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000004-0000-0004-0000-000200000000",
-        "provider": "00000001-0000-0004-0000-000200000000"
-    },
-    "conversation_role": "htfohjl1uoehr8upvg_eete17sr304vqbm9imt_l_znz_rd1cq6n",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000017-0000-000c-0000-001a00000000"
-    },
-    "id": "00000017-0000-000c-0000-001a00000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_19.json b/libs/wire-api/test/golden/testObject_OtherMember_user_19.json
deleted file mode 100644
index ce59bf2ee3c..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_19.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0003-0000-000400000002",
-        "provider": "00000003-0000-0001-0000-000400000001"
-    },
-    "conversation_role": "lm96_nocxpxllzob9onqrzfawv5eru442jrri387wol1o4affst6zfga9mmxdr3_s_ote0np2dfc4w4otqls3nozgne6frclb",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000003-0000-0000-0000-00060000000f"
-    },
-    "id": "00000003-0000-0000-0000-00060000000f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_2.json b/libs/wire-api/test/golden/testObject_OtherMember_user_2.json
index 6849561a1f1..f1202ef7a90 100644
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_2.json
+++ b/libs/wire-api/test/golden/testObject_OtherMember_user_2.json
@@ -1,13 +1,9 @@
 {
-    "status": 0,
-    "service": {
-        "id": "00000002-0000-0000-0000-000100000000",
-        "provider": "00000000-0000-0000-0000-000200000000"
-    },
     "conversation_role": "y9z93u3kbwt873eghekqgmy0ho8hgrtlo3f5e6nq9icedmjbzx7ao0ycr5_gyunq4uuw",
+    "id": "0000001f-0000-000c-0000-001c0000000f",
     "qualified_id": {
         "domain": "golden.example.com",
         "id": "0000001f-0000-000c-0000-001c0000000f"
     },
-    "id": "0000001f-0000-000c-0000-001c0000000f"
-}
\ No newline at end of file
+    "status": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_20.json b/libs/wire-api/test/golden/testObject_OtherMember_user_20.json
deleted file mode 100644
index b79948ed169..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_20.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000004-0000-0002-0000-000400000001",
-        "provider": "00000001-0000-0004-0000-000100000000"
-    },
-    "conversation_role": "3nzv9edmf6rv54vgw3xl5fxrwzwm38u3vu2gpyx786hqjimctl7l9aqq01af0_h6nix6111vcm4dujjufqxvlx7f84j8koumw8ws0u5xe8u7al1ba1wj31ob381",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000007-0000-0010-0000-002000000001"
-    },
-    "id": "00000007-0000-0010-0000-002000000001"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_3.json b/libs/wire-api/test/golden/testObject_OtherMember_user_3.json
deleted file mode 100644
index 9a749308d08..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_3.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "status": 0,
-    "conversation_role": "224ynn27l35zqag2j8wx3jte0mtacwjx5gqfj8bu6v6z4iab5stg5fu4k7mviu1oi5sgmw3kovmgx6rxtfrzz72",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "0000001d-0000-0012-0000-001f0000001f"
-    },
-    "id": "0000001d-0000-0012-0000-001f0000001f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_4.json b/libs/wire-api/test/golden/testObject_OtherMember_user_4.json
deleted file mode 100644
index af3b5180d6d..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_4.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0004-0000-000300000000",
-        "provider": "00000000-0000-0003-0000-000400000000"
-    },
-    "conversation_role": "y_yyztl9rczy3ptybi5iiizt2",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "0000001a-0000-000f-0000-000900000008"
-    },
-    "id": "0000001a-0000-000f-0000-000900000008"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_5.json b/libs/wire-api/test/golden/testObject_OtherMember_user_5.json
deleted file mode 100644
index a43b7652300..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000004-0000-0002-0000-000000000004",
-        "provider": "00000001-0000-0000-0000-000400000002"
-    },
-    "conversation_role": "osr9yoilhf5s_7jhibw87rcc1iclohtngeqp7a9k2s4ty8537v",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000015-0000-001b-0000-00020000000d"
-    },
-    "id": "00000015-0000-001b-0000-00020000000d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_6.json b/libs/wire-api/test/golden/testObject_OtherMember_user_6.json
deleted file mode 100644
index 0821816b8cf..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_6.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000002-0000-0001-0000-000300000000",
-        "provider": "00000002-0000-0002-0000-000100000001"
-    },
-    "conversation_role": "46c5d6qq5s5act5gzme7z1q5w9vhep",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000002-0000-0014-0000-000f0000000d"
-    },
-    "id": "00000002-0000-0014-0000-000f0000000d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_7.json b/libs/wire-api/test/golden/testObject_OtherMember_user_7.json
deleted file mode 100644
index 06460744e82..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_7.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000002-0000-0000-0000-000400000000",
-        "provider": "00000003-0000-0000-0000-000300000003"
-    },
-    "conversation_role": "p0hv86628m_rzt4ganpw2r3",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000003-0000-001c-0000-002000000016"
-    },
-    "id": "00000003-0000-001c-0000-002000000016"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_8.json b/libs/wire-api/test/golden/testObject_OtherMember_user_8.json
deleted file mode 100644
index 84d8266365a..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_8.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000000-0000-0004-0000-000200000002",
-        "provider": "00000003-0000-0002-0000-000400000001"
-    },
-    "conversation_role": "wzjf8x1tw3e6m7e2zrle1teerh9e9bzba",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000011-0000-001f-0000-000d0000000f"
-    },
-    "id": "00000011-0000-001f-0000-000d0000000f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtherMember_user_9.json b/libs/wire-api/test/golden/testObject_OtherMember_user_9.json
deleted file mode 100644
index 0514dc11968..00000000000
--- a/libs/wire-api/test/golden/testObject_OtherMember_user_9.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "status": 0,
-    "service": {
-        "id": "00000004-0000-0004-0000-000100000003",
-        "provider": "00000003-0000-0003-0000-000200000000"
-    },
-    "conversation_role": "vfd81bco01v07l2gsgg9c5bolm759sicys0epfrb",
-    "qualified_id": {
-        "domain": "golden.example.com",
-        "id": "00000001-0000-0016-0000-000f00000010"
-    },
-    "id": "00000001-0000-0016-0000-000f00000010"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_1.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_1.json
index 1caea61f417..4fb62f6ae30 100644
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_1.json
+++ b/libs/wire-api/test/golden/testObject_OtrMessage_user_1.json
@@ -1,5 +1,5 @@
 {
-    "text": "􀴿󿵘􌶝|",
+    "recipient": "0",
     "sender": "4",
-    "recipient": "0"
-}
\ No newline at end of file
+    "text": "􀴿󿵘􌶝|"
+}
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_10.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_10.json
deleted file mode 100644
index b95f8ade74a..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_10.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "㯚#d",
-    "data": "v",
-    "sender": "7",
-    "recipient": "9"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_11.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_11.json
deleted file mode 100644
index a83a590c2dc..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_11.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "𡆒W\u0007A\u0008",
-    "data": "M􉹆6\\>𪳄𨿝",
-    "sender": "2",
-    "recipient": "20"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_12.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_12.json
deleted file mode 100644
index 5051578b937..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_12.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "'rX𩑰\u001cY",
-    "data": "%",
-    "sender": "1f",
-    "recipient": "10"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_13.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_13.json
deleted file mode 100644
index 67864350283..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_13.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "",
-    "data": "P􇚜",
-    "sender": "2",
-    "recipient": "14"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_14.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_14.json
deleted file mode 100644
index ece8face66b..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_14.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "m*I",
-    "data": "",
-    "sender": "19",
-    "recipient": "14"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_15.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_15.json
deleted file mode 100644
index 1279d465835..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_15.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "󶷜H闧\u0011toQ",
-    "data": "\u001f𢜽BG𔑏<",
-    "sender": "19",
-    "recipient": "20"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_16.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_16.json
deleted file mode 100644
index d1d7aec02c5..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_16.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "text": "sl󲚀󵷏3",
-    "sender": "5",
-    "recipient": "5"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_17.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_17.json
deleted file mode 100644
index f7da4520290..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_17.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "K䋳",
-    "data": "\u0006y\u001aY:킶",
-    "sender": "1",
-    "recipient": "1a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_18.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_18.json
deleted file mode 100644
index db16ec7d3b1..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_18.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "-\u001d\u0015y",
-    "data": "󿙁𘝲i(0",
-    "sender": "14",
-    "recipient": "1c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_19.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_19.json
deleted file mode 100644
index 5ae41701239..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_19.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "<",
-    "data": "𣃎󶧕\u001e",
-    "sender": "19",
-    "recipient": "11"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_2.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_2.json
index 2c98d6ee5b9..aa03c77092c 100644
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_2.json
+++ b/libs/wire-api/test/golden/testObject_OtrMessage_user_2.json
@@ -1,6 +1,6 @@
 {
-    "text": "⸌t",
     "data": "\u001b\u0015Jj",
+    "recipient": "a",
     "sender": "18",
-    "recipient": "a"
-}
\ No newline at end of file
+    "text": "⸌t"
+}
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_20.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_20.json
deleted file mode 100644
index 57f4cd6af3f..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_20.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "text": "𗀡p\u0010",
-    "sender": "13",
-    "recipient": "3"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_3.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_3.json
deleted file mode 100644
index 8b4746d8f61..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "𐂿5I\u001f󹠾\u0018",
-    "data": "H\u0015ȵ窱",
-    "sender": "9",
-    "recipient": "4"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_4.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_4.json
deleted file mode 100644
index 3abb2076ef6..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "􃲊O\u0008K󼔣",
-    "data": "#",
-    "sender": "10",
-    "recipient": "e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_5.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_5.json
deleted file mode 100644
index 92b72b45895..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "󰦔qB+\u000e侌",
-    "data": "w\u0001",
-    "sender": "16",
-    "recipient": "8"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_6.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_6.json
deleted file mode 100644
index 5b4671e1353..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_6.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "61",
-    "data": "􅅌4跚y",
-    "sender": "1c",
-    "recipient": "9"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_7.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_7.json
deleted file mode 100644
index b48cd92f280..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_7.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "􅂫",
-    "data": "𘔗𗟤\u0019㛰-􃮬\u0010",
-    "sender": "f",
-    "recipient": "b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_8.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_8.json
deleted file mode 100644
index e1808b8ce63..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_8.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "text": "􍭆",
-    "sender": "4",
-    "recipient": "18"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrMessage_user_9.json b/libs/wire-api/test/golden/testObject_OtrMessage_user_9.json
deleted file mode 100644
index bed324c1416..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrMessage_user_9.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "text": "\u001fbW\u0010",
-    "data": "rD󲾗x'",
-    "sender": "1c",
-    "recipient": "2"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_1.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_1.json
index 6e8d4bc9da9..9b836c5b38a 100644
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_1.json
+++ b/libs/wire-api/test/golden/testObject_OtrRecipients_user_1.json
@@ -1,11 +1,11 @@
 {
+    "00000025-0000-0031-0000-003e00000001": {
+        "10": "q",
+        "4": "\u000c",
+        "b": "𔕟"
+    },
     "0000002c-0000-0078-0000-001d00000069": {
         "1d": "\"𩄢l",
         "3": "{Pu^1"
-    },
-    "00000025-0000-0031-0000-003e00000001": {
-        "4": "\u000c",
-        "b": "𔕟",
-        "10": "q"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_10.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_10.json
deleted file mode 100644
index bb6f22fe6ed..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_10.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "0000001f-0000-001f-0000-002000000001": {
-        "6a": "󲋄颎󴵷j"
-    },
-    "0000001e-0000-0011-0000-00070000000e": {},
-    "0000000e-0000-0005-0000-001e0000000e": {
-        "0": "5",
-        "1": "\u0011"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_11.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_11.json
deleted file mode 100644
index cce91ef765f..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_11.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "00000004-0000-0004-0000-000300000004": {
-        "0": "",
-        "1": ""
-    },
-    "00000001-0000-0001-0000-000000000000": {},
-    "00000001-0000-0000-0000-000000000001": {
-        "3": "􂊡⣻Tf"
-    },
-    "00000002-0000-0003-0000-000100000001": {
-        "8": "C"
-    },
-    "00000000-0000-0000-0000-000300000002": {
-        "7": "A\u0014"
-    },
-    "00000002-0000-0002-0000-000000000002": {
-        "0": "",
-        "1": "󷋒"
-    },
-    "00000004-0000-0002-0000-000300000003": {
-        "1": "\u0017󳈷𘒙𐕏"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_12.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_12.json
deleted file mode 100644
index e27bfa7099a..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_12.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "00000001-0000-0000-0000-000000000001": {
-        "0": "f"
-    },
-    "00000000-0000-0000-0000-000200000002": {},
-    "00000001-0000-0002-0000-000200000000": {
-        "4": "(`|"
-    },
-    "00000001-0000-0001-0000-000000000001": {
-        "0": "",
-        "1": ""
-    },
-    "00000000-0000-0001-0000-000000000000": {
-        "0": "s",
-        "1": ""
-    },
-    "00000001-0000-0000-0000-000100000002": {
-        "0": "",
-        "1": ""
-    },
-    "00000001-0000-0000-0000-000200000001": {
-        "0": "",
-        "1": ","
-    },
-    "00000002-0000-0000-0000-000200000002": {
-        "1": ""
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_14.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_14.json
deleted file mode 100644
index babb622dbbe..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_14.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "00000007-0000-0019-0000-001f00000005": {
-        "3": "㏯\u0010𩟻D"
-    },
-    "00000007-0000-000f-0000-001d00000008": {},
-    "0000001a-0000-0002-0000-00070000001a": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_15.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_15.json
deleted file mode 100644
index fbddd560b7a..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_15.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "0000001e-0000-001b-0000-00080000000e": {
-        "1": "󲣤􌯈",
-        "3": "6\u000f"
-    },
-    "0000000d-0000-0017-0000-00100000001a": {
-        "0": "",
-        "1": ""
-    },
-    "00000001-0000-0019-0000-001e00000003": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_16.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_16.json
deleted file mode 100644
index cc8daa300d7..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_16.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "00000001-0000-0000-0000-000000000001": {},
-    "00000000-0000-0001-0000-000000000001": {},
-    "00000000-0000-0000-0000-000000000000": {},
-    "00000000-0000-0000-0000-000100000000": {
-        "0": "",
-        "1": ""
-    },
-    "00000001-0000-0001-0000-000100000000": {},
-    "00000000-0000-0000-0000-000000000001": {
-        "0": ""
-    },
-    "00000001-0000-0001-0000-000000000001": {
-        "0": "𣬖"
-    },
-    "00000001-0000-0000-0000-000100000001": {
-        "0": "",
-        "1": ""
-    },
-    "00000000-0000-0001-0000-000100000001": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_17.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_17.json
deleted file mode 100644
index 968ea6a92cc..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_17.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "00000001-0000-0000-0000-000000000001": {
-        "0": "",
-        "1": ""
-    },
-    "00000002-0000-0000-0000-000200000000": {
-        "0": ""
-    },
-    "00000002-0000-0001-0000-000100000002": {
-        "0": "q\t"
-    },
-    "00000001-0000-0002-0000-000200000001": {},
-    "00000002-0000-0000-0000-000200000001": {
-        "2": "𨃒󵙍"
-    },
-    "00000002-0000-0001-0000-000000000002": {
-        "0": "􊿝\\"
-    },
-    "00000001-0000-0002-0000-000200000000": {
-        "0": "q󼶍"
-    },
-    "00000001-0000-0002-0000-000000000001": {
-        "0": "\u0018"
-    },
-    "00000002-0000-0000-0000-000100000000": {
-        "0": "",
-        "1": ""
-    },
-    "00000002-0000-0001-0000-000000000000": {},
-    "00000000-0000-0002-0000-000100000000": {},
-    "00000001-0000-0002-0000-000100000001": {
-        "1": "𦚔"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_18.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_18.json
deleted file mode 100644
index 17d9df9f67b..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_18.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "00000000-0000-0001-0000-000000000001": {},
-    "00000000-0000-0001-0000-000100000000": {
-        "0": "",
-        "1": ""
-    },
-    "00000002-0000-0000-0000-000000000002": {
-        "1": "@䷅"
-    },
-    "00000000-0000-0002-0000-000200000000": {},
-    "00000002-0000-0000-0000-000200000001": {},
-    "00000001-0000-0001-0000-000100000000": {
-        "0": "",
-        "1": "?"
-    },
-    "00000000-0000-0001-0000-000100000002": {},
-    "00000000-0000-0000-0000-000000000002": {
-        "1": "!"
-    },
-    "00000002-0000-0001-0000-000200000002": {},
-    "00000000-0000-0002-0000-000000000001": {},
-    "00000000-0000-0001-0000-000000000002": {
-        "1": ""
-    },
-    "00000000-0000-0002-0000-000100000000": {
-        "0": "`"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_19.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_19.json
deleted file mode 100644
index e930d846d88..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_19.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "00000006-0000-0000-0000-000500000008": {
-        "0": ""
-    },
-    "00000007-0000-0000-0000-000700000004": {
-        "0": "",
-        "1": ""
-    },
-    "00000000-0000-0007-0000-000300000006": {
-        "0": "𢽀",
-        "1": " \u0001"
-    },
-    "00000004-0000-0002-0000-000200000001": {},
-    "00000006-0000-0002-0000-000500000008": {
-        "1": "㶝9K",
-        "4": "\u000cy"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_2.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_2.json
deleted file mode 100644
index 3a7062ca122..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_2.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "0000001d-0000-0000-0000-000a0000000f": {
-        "0": "𡷌",
-        "1": ""
-    },
-    "00000011-0000-000c-0000-00000000001f": {
-        "0": "",
-        "1": "o"
-    },
-    "0000000f-0000-000b-0000-000200000017": {
-        "0": "\u0017",
-        "1": "{"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_20.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_20.json
deleted file mode 100644
index 24a18e1380f..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_20.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "00005c3f-0000-157d-0000-1bf200005f06": {
-        "aa3": "N􋗉𗹺h􊪪dc",
-        "60c": ""
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_3.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_3.json
deleted file mode 100644
index d5ab7cad6ac..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_3.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "00000002-0000-0004-0000-000800000003": {},
-    "00000004-0000-0008-0000-000600000007": {
-        "0": "\u001f"
-    },
-    "00000006-0000-0008-0000-000000000005": {
-        "9": "𠞳\u0008Z,$]"
-    },
-    "00000005-0000-0007-0000-000400000004": {
-        "0": "",
-        "1": "󿞁"
-    },
-    "00000006-0000-0006-0000-000800000001": {
-        "4": "6W"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_4.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_4.json
deleted file mode 100644
index 459dde9c92c..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_4.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "00000001-0000-0001-0000-000200000002": {
-        "0": ""
-    },
-    "00000002-0000-0002-0000-000100000001": {
-        "0": "",
-        "1": ""
-    },
-    "00000000-0000-0001-0000-000100000000": {
-        "1": "󰾞"
-    },
-    "00000002-0000-0001-0000-000200000001": {
-        "1": ""
-    },
-    "00000002-0000-0002-0000-000000000000": {
-        "0": ""
-    },
-    "00000001-0000-0001-0000-000100000001": {
-        "0": "",
-        "1": ""
-    },
-    "00000001-0000-0002-0000-000200000001": {
-        "2": "d"
-    },
-    "00000001-0000-0002-0000-000100000000": {
-        "0": ""
-    },
-    "00000000-0000-0000-0000-000000000002": {
-        "0": "",
-        "1": ""
-    },
-    "00000000-0000-0001-0000-000200000000": {},
-    "00000001-0000-0001-0000-000100000002": {}
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_5.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_5.json
deleted file mode 100644
index de7164fe151..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_5.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "00000d61-0000-23d4-0000-0dd100006f7f": {
-        "4c": "󼡰\nc",
-        "85": "6\u0017\u0002",
-        "4d": "G.4\u0013"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_6.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_6.json
deleted file mode 100644
index 7d0b2a2bb23..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_6.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "00000003-0000-0008-0000-00060000001d": {},
-    "0000000f-0000-0008-0000-000e0000000c": {
-        "f9": ""
-    },
-    "00000002-0000-0008-0000-001b00000010": {
-        "0": "􆻰",
-        "1": "􄲵"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_8.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_8.json
deleted file mode 100644
index 08318f41650..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_8.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "00000004-0000-0001-0000-000800000003": {
-        "0": "",
-        "1": ""
-    },
-    "00000004-0000-0008-0000-000500000007": {
-        "0": "",
-        "1": "5"
-    },
-    "00000003-0000-0005-0000-000500000006": {},
-    "00000007-0000-0000-0000-000800000007": {
-        "0": "",
-        "1": ""
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_OtrRecipients_user_9.json b/libs/wire-api/test/golden/testObject_OtrRecipients_user_9.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/libs/wire-api/test/golden/testObject_OtrRecipients_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_1.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_1.json
index e8ff53b236b..ab3adc86484 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_1.json
@@ -1,4 +1,4 @@
 {
     "new_password": "l󲌑jfd]\u0018OG󽒈●E-FGb\u0013c𩄆𫶀\r\u0019𗽎~\tW+\u0006芦,􈙈M🔧s󴓻M'\u0002\u000fz\u001b}\u0019𥨬\u0018~;k쿠t\u0003x𤛨𠓑y𗥄\u001b𢭞#O\r\u0008JacD\u001d}}M\n\u0007Y󼎦01C\u0019$E/\u0015-B𪻮I󹿤􅒉៱󷘳𬽓83$E󶣇噃0\u000en[T\u001dB\u0010-󵸠cZ돿𪭡陬󰞾𪒰\u001b7􏍻'/2┅B$SL\u0000^\u00192\u0015G􊽝2H\u0006\u0010ꨓXR􇯏h,𓎜𪪯􁘟󾗌Y?\u00018DF\u0004Ch#;/x\u0010-\u0019\u0008A\u0010𦿷\u0008kX\u000e𭻽g𗄺𪈋\u0000:2<𨯩󳯑􈨕zp\u000f#󹥬뱟\u0000\u001b𢥜􉽇T欻0bAẼ\u000b\u000b$&qMQD󲺬⾖}\u000eZM\u0003𫼅.\u0005喙륄𮫟f=j{뫌􏞲􆅅𘨱􆌔@\u001b!u􇇯RᷕEJ󸌃󸎻\u0010􂚗\u001c_@􆲏V󵜍j1Z\u0000󵎦>t6􇛟\u0005􈮕$\u000e\u0013𗼐𡥕묮M\u0006\u0017𪊷r\u0008􌩭)\u000ew\u00033󶩗\u0014􄞩w5>󼳵𗠄Ga\u001fz󿲎n\u001a>\t'𖤝\r𤋻 󺐳;(4!􅿕,\",\"x\u0004yf \u000c\u0007RW'z𠫙􀁢巤\u0003Yx%􇴊ꖚ󿑺n㐗[/'\"2-2jR{=󷌣E;󺧮\u000e0+𢵯H󱂛廨@􎍀%\u001aNnZVt-k1\u0012𦀻bTV\u0011k󵄖a􅤆(%*h#󻧅\u001aL\u0002a",
     "old_password": "\u001e𤗂<7jc~MQ\u0001\u001fᲥ[􈫤Lz\u001f󹬏?q'p􌞉\u0017y\u0010\u0004\u001c􎜒x\u0017$<lPN~J䌼탭䥿󰊸\u0000\u001f􂇰b󽢦_Iw􌯑𠯡M𭄺􉆌uj땲L􈒞'W@𧪆󶡝r󴕫9>􂸑\u0010㕼󲡔\u00089\u001ciU\u0000z\u000cb堡bPf\u000e^\\󶇳\u0000\u001b\u0002d\u0010>󽽜􍞾\u0016OIc𮌬l^l]󻮗JY8J󽁝t𑈛AcI\u000fi]Bh󱡱\u001b𢖪R\r\u0000z\u0006􉱕' A\\feuBiG󲜣SDoWa\u0010\u0006W'\u001b!\"erY7Y`\\Iፔ\"`y)󿒤iN)Z󷓂T5Q􆻫𤂋󲥺g|)\u001f󴻥\u0003J鬕􎌸\u0015Y_\u0007\u000bJL󺰋\u0018 P\u0017􇎁+%.BF𥣊Ay9M𘀪󶑬􍨉s懒pI󵚣_󴶭\rM\u0018駚EZZXS􎀈\u001e5\u0014b𗱛\u0001􎂷𭁦b𘡩\\X\u0002𣒪;l숞xQo\u0015𡭖\u0001J󱣗XE0^&𩀠\n_1\u001fS^\u000e?W9~􌘷\u0013=\u0012􄸔@*𥷉yLc\u00069㶴􂰣\u001e𘆋bV􍾣W󵥭o􅵦\u001c󴉠Bmr>􁐧󻞸𦠷􁹠m􅶄𢵑G\u0002'󷔮3K\"%Hk]f𫫔\u001e[\u0006􏣢vq7n𣲝}F*m\u0012\u0003󽤰w$R?%󿽕󱾚T%􉌈o\u0011𢇨G􅙋\u0016|􉃇𛇜􄴾B\u0007\u001b􃪴􉫂T󸿔@\u0001,1􋓄?\u0013\u0005,)ipt𣩔NXed󷷮\u0012 6󰚣󽍋14秤p\u000c尓𠷥q|\u0004h!\u0014z\u001d\u0015󿛿\u001e0𝝶\u0006\u0008\u0011􂋯\u0005N噻P𢁬?\",λa\u0017\u000c\u001b+\"JpO顝󾳪틲\u0017\u0005􋁦\u0018󵡢\u0001\u0010८Iퟮ'=I\u0004N \u000e{Vtdy\"𧿳邗hC,􁆆i\u0015!o\u001a􆠡(u&\u000cz􀓡\u0017A󿕚𪹾\u001e\u001f~A鱄:D<C\u000e衾*Wb􈩒Y􄌘\u0002Y뜇'}\u0018j🝳􃾵V𣫸4\u000fPK\u0004>-\u001b~A:p^􇤌𠿤:𤻎w󺑭m>᪰:.M􆋣⠌'\u0018􅢰徰R󵂟P󺊵*\u0016q\u001dUX􅷛|\r\u001f.􃓝\u0015􎶍W~5O󴗝\u0002𭉡s󵯥𤪲\u0011r\u001a\u0008􂋛ZN\u001a\rf儅\u00015\u001dJe𐓓􄭧b:z\u000f!\u0010\u001b\t\u0015d\u000b@'C/6\u0014h󰋮@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_10.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_10.json
index 147dbeaed81..7bf13ce9000 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_10.json
@@ -1,4 +1,4 @@
 {
     "new_password": "ݯ\u001c2pfHg󴭑@hB􍨹𡐥ae\"@𫨝\u0011[;F?􂫧{<yBC󳚦􄺭aFI껺qw@V]𨆯P\u0001X\u0008菏\u000e~􀴞@Q)聫u;\u001d>\r.~Q8q^^󼆸p~핥A\u000e8epx\u000b􊗽貽9Q<!|󷮈ACom𪨨8椨v\u0007􊤃𧾜.1듏\u0015+䣇􎺻嘾\u0003jWꡐ\u0000{n𗅚8󰱻\u000c\u000b\u0013LE^#󼾠`Dt􆴫󸙡\u0016b\u0013􂏡j0\u000f\u000b􃟖\u0007󺏎\u0019𗛍R\u0015|M[L&7?X􊷼>#`B>\\\u0002\u001b]a\u0007H\u001d󸗃=𠫺\u0010\u001f|K􉻙SU\"`TOG)E􎘂\u0019\u0005􌨽V\u0013\u001a𠉴讶11eL𡎒.􇊥\u000c疁𡿥\u0003󸪍33༑󹁵@\\56/RC▒VomQo𮕏􊊲퓬|b5󶕔\t隍𤕍W􁂘u𪆍䭏􋺏2\u000fHs󶜝'\\\u0008t)A\u0014|\u000bh𢟬\u001f9K󵰽􏰅wY\u000e􅔞鴾䓒4u󳥛'􅢚Wtl,󻆻𬊈c\u0016𩚕p5<󱝖\u000ed􌊺(P\u001641.!􀧺(\u0014L{m\u001a􎰵dYlO\u0005𬈍l汽r󷵉tS\u0011d􍘏\u001e𤭵\\U𡞮)􄳿\u0004Rc\u0014N\u0017\u0016rzEm˻#q39󿑰lY\u0018Hr𦔗栰:ͭw𡄸\u0012\r:CA甓𛆈􈘭\n\u0013VE,od{J@]匞P煹\u001c𢋚􌧑􍂵!𡑦󸗵H娌5\\\u0011𤕘%𬏗𨠲-p\u0008N{Ky(N쮼B\u0007󱴁u𝆺𝅥𝅯\")㧄Q󻮍.𬸂J𧌄a䦁\u0019`c\u0010h3𤭍\u000f>󱍓L7II@C%𩧨b>\u0015gl*\u0004zI4Vc𓃬壁+)\u0003,\u0013:ꚙ5􁝼\u000e[UL\u0016CQꊛ(ㅃ\u0006-;O|𝘿\u0001扡;VBv[\u000cj\n$jq\"\u0000uYx\u0004󾞼9:F𗅎􍕝omPG6\u000cX$\u0011\u0003\u000e\u0004-𡥨Yk𤈂M`\u0014K0\u000b?󾌟t\u001bT􄲺碸Z\ta󿊺\u0001\u00190tfჷU\u0000z 𘂻~jq􇏈\u0003V𪡲=롍vn𢼵oly\u0012i\n~_R$8;fbOK\u0000z-?CM*\u00025!􍵂𬏧𘆁i~𮕳!\u0013𠷿+􌲬􉰝>\u001f􈚏󱔄'75K\u001cf\u0018Y\u000ezC^b2w-uD􎋙p",
     "old_password": "1\u001e✼\u0000v󱉸z􁧄|%􄲘n𤱜-g𣵢𘧪a𠓝\u0004%?𗮷􄽌AA\"Hmj-\u0019琦8騈,\u0004P>`L\u0002:🅂\u0006hOh*퐝md\u0013\u0002𣊕􌓖LJ+\u0006\"𭝄+􇝗󻿻􊉃\u00169𤆤`X9(i빃𧻲6󾧡dn~\u000c>\u0012􂩨􃌯󶢖gq>!󶙌󿨆珞R&|/󳔚fC(D𬅪𨁫p\\0D$G宩(J\u0008tdn􂎶u\u0016\u0015:[gvX염\u0000A\u0013T |@A)\u000c;⤙R-q?fi𢴉蛮#𠁭𐪛\u0000F􂀤\u001e􉸢?*􋑑iy 󵗟𞹰EJ3𥞺F\u001aཻ2㽫󷷶\u001a􄘘X($}aH𝂹!M􇁯\u00013])\\\u001b􀓅h4sn\u001c⧯ztNR\u0002xt~:Rbㅃ󳕖\u000f\n􏮛\u0008𥵇C𔕦+\\K󼯘\u0002s\u001ea렾+d􅾨1Z9g\u001e)𖭦&)󾯶,EIg?K\u0004m􊓿9\n𪼙\u001f.u쩂\\𩈚^\u0011|\u0012\u000e\u000e*LJVVT󼙐WO\u001fWmOS􄙯\"Z.\u000e􏴠C-8\u000c\u0012miZ\u0006􈸇~C𥣾sbIc\"\\-x⡠L𧱎\u0015\u0004󶺂\u0014􄁬 \u0011I;쑇;\u001c\u00029gU]𤻨𥫔;𠍝v\u001b\n9?QY\u001a𫂌𡢪Y𓌫󽐛Y\u0014󵡡@ll晋\u001c-\u000b􂣡l􋧤􈶓\u000fWrw\u0006U:𠾠{\u001d\u000e󸁋*\u000c@n.𑐞f~􉥥󿐔u0y\u001a􂅈fX\u001a󸭼#e~V\"/[\u001b\u0018𥋾4洆_6 q􊵌P<8.MdP\u0018V\u001e󿥐󲄞\u0000\u0003y<\u0018!\u001f,\u001et`\t\u0018~2E\u000bs6E焢􎀥J\u000bo󼡲O?h7\u0000Q>􊟡6\"V𡶧s.<\"􉭏Myg\"􍖔}>O8\\N\u001c\u0004u\u0013\u000eF/\u001e\u001dO橫?t𫕌p$<􊆝VrW+𤉦\"Ss\u0018``\u000b\u0013j@\u0015keV\u0008E𨅷⺑\u001c\u00151􃇡~aQ\u000c\u001e\u000e􈢛~\u001e􃼊\u001d/t:\u0012\tH󸼊𫉧'2𓀇\u0003\u000e\u0018D\u001a䴣ux\u0012􈽥\u0008@b#\u001f䓾\u0000S>\u0005p\u0011\u00192\u0000𣜧\"\"Z𠨖1, Isn\u000c𧌪\u0019R-RsaR\u001cu\u0008􁦉>O󵕬\n𡘂\u0012F􈻆y\u000eZ𖹼\u001b𦪒\u0012 뗹\n􎄧J!\u0002g\u0003󱛿􄇵rba\u0000_ꖏ\u0002\u0002\u0017#\u0007AqacXF1b.$\u000cFvU𪙉\u001bAa:𥬳𐦑"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_11.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_11.json
index 300700d993e..09df58104e6 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_11.json
@@ -1,4 +1,4 @@
 {
     "new_password": "P7ὛgJ󺘾􀡨\tb󿦘s𫮺\u001c*\r𨀹~yj𐜱qm)Y\u0019􈕊k]SS󱶵~;\rp\u0005\u001am􎱙QAT\u0016e:󽗧໖\u0007=nU\u0012n2𗶏c􍸸|\u0001\u0015\u0004L\u0002󷱀>\n\u000eN\u001f󱭕\u000f\u001d`JOJ󱽯v\u001fY꠵\u0000p(S󵳁<󶠂\u0012j\u0017􆗛􏑍s샱𨲁J.,OGU󷷟󺤹.􈒬71U􊶜8/􁌉󾱿T\u0004\u001d c=퇲t}RiOL\u001eUsY*h𝖭_| 󺓭󲄋樁s2redy󼍇V<A\u00057Y\u0012|'n}\u0005v\u0016\u000cvOፖ\u0001ML𡢮􇼒B鬰:󺱫.TP􀳴\u001a^@]絰$WR󿔗U룰𡇂\u0006𘔈􍭩P𥘂w螗𑨁u󽐰x􉞾.\tlV#󱠶+\u0000WZ𑄷,i \u00013\u0016\u00082󸽢w󹧼\u0016󷢓'\\\u0003Y'󸆢$\u001b󺡜I:~􄃯𡇞*Hp.􇋄\u0002`𝆮𭑥n󽷢mn;\u000b 􀸦𝈑)?⺁G􈴪R\ryw𭟈\u0003󳇬􄲑\u0000𠰈\u0013*[v󲥖⌂wU􃽞A𫃳5H.\r4TbV@\u0014𗣕G\u0006𢗇rMi\u001dZoR>gᦲ\u0004𦄴bdQ\u0019􂾻-􇨯􇘌\u0019\u0017䞽𩯎ᐉ􈵃(Qw!\u0001h󿑡N쵱\u0002bꩠd1􈅧{󼜧\u001cBE+\r\u0007󾢳I󱎿Rbat=\u000b􉟠𡽔󴭱oA$\u0003\u0004{o|\u0011Y6\u000fleK󰓿c\u0012\u0015⛨H\u000f𗲖5󱜳8'𢬧\u0001/ㄑ\u0008Ko6+Iw𫷼䢰\u000b\u0016N􃎶\u000fLuF𨈊J󽒏1􀥅0𩃻⾩/i\u000e󱰾󳎡6g\u0012eR;\u0006𦺅􋛬𔑤􂅥\u0001ꓐ_=󹗘",
     "old_password": "󹏿󼅣/~G!t3\u0017pT(lfd󱃭Uv\u001f󿬣n/󽍭\u000b󴒎4P\u000f􂹢gP􎒰3𠘚𤃬0o~􈇡4.p𥾻xg𩖠􈫇yGDY􄲮\u0019x^𤼘𢛷u*R\t21=|\\2ẃ\u001b⯁W𤄹\u0002&\u001fGu􋸯+#&\u0006]m𦷓>𗉑𭢼6W\u001b;w󸕸b\\\u0005qz\\|𗙇o`\\𬽋1\u0005&@\u001aFC]G[G𨊊$z􏪓󼀀\u001b󾹙\u0019􀂥\u0000>d󼓫󷳿􆊓\n𨭀𬁩P&s/!qt𧱯@\u000bP\u0011p\n.n_N􏢎\u0010V~􌺧$h𡸊Is󵇹`!堉$󳓈\r\u001e􌒂@㽺Rd87䄪𑀈󾗈Zo_Ps?\u0017敯wU\r [t𪤗/\u001d.\u0017𫩌}UyN{w\u0000󽉫:u\\\u001f\u0016𫭠K􅹏ᬡJ>%.𤅰'䶭𭃫Z?ႇ\u0002jg𣩅G\u0014\u000e郶\u0006ꬑ\u000fv𠽏\u0000𪥇ei\\]\n󳵕f/a y󴲙F\u000flm󳇈󴓯𢞜\u001b\u001e\u001f$|󼮎1\u0018;6𤵤6rxN𡌿RVa\u0002(\u001d\u0005*pSX2-\u001d턵\u0011x\u0008\".阂\u0017M\"􈔴𫦠\u0014g\r􌱙)\u0010k𮙨t󾷽^0󶍩\u00136\u001f\t캑m\u001a;OV󻤭p]-p\u0010𥇆D鎐䱮>d\u00134@/󲰣𢩞c\u000f+dol\r{\u001e\u0011󸕜􃸂\u001a1>\u001cy&#𩗢>?x[~^dAc\u000c\u0010W\u000f1󳇮0S\u0003_󿨈<US􎧷F󴜉*\u0018S~/'\u00157cZz􃧚Cd<󴬌󾱲k\u0000\u0016Ei𘨒H6\u0002N8\u0007\rM\u0015\u001f9뎋\u000cR2@\u0010󰧹\\Ql\u0019Q*uU5𛀪\u0013pY?P`\u001f𪸟B\u0019\u0012R\u000e9^帠VY\u0007R/󻳪𫘅􀢾\u001b#1\u0005kFDv\u000c\u0010;\u001f\u0017=p~􇏬\\l\u0008G'2^Y\u001d𪞒󽔞鳬􇷋𫐟Yz􌻧\t\u0017\u0003`7𣡸f}\u001b\u0003:&na@MQ8-y\u000e\u001a󱐣\n𤆒%2BH3􄈻󴚴\u001a󱏡\u0008o/(󹀔\u0013ni8,󳞨󽪺\u000b𤘐􏂬`~M\"'>#9𪯎wfVhc󾡫󹌩L#J7GBX(ቡ􀂡󱢕/W5\u0001􏬟@gv\u0002𧯡Z\u0006w^\u0018k󰵻HyU@I#}Xc?󺿻淛\u0013\u0012)5+􂱦h\u0011\u0015[>\u0005#\u001e󳢉\nG𡅾3\u0018\u001c2:M서\u0005􆘆󹷖􅾬􊂀>pne𫟾s\u000ed􊣵𡬭1弼_󽊓PM)\u0019Gb󰸈$z따\u0003v'\re\u00182ゥNA\n󼑲H:𤑅y\u00174\u0017m𠖒𭌲\u0013󶯕c\u0007t𬾷^\u0008\u0017􋶫*\u001a􆢨Q}􎕩r%󰗾gdAS\u0019X\u0017\u0005\u0000\u00173\u0000\u0011𘍱k\u000cJ.󻳆뻒A\u0012𭗹i5V󿁐󳗳:)*\tO\u0010"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_12.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_12.json
index 5faa7bf0bf7..168c44b37cd 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_12.json
@@ -1,4 +1,4 @@
 {
     "new_password": "󻜵𬟀*쓦𣑟mqK=\u0016\u0000gྒa^U !𨋰󴘓F􊗂J𡨀ꦵ\u0005TB𥕍=N[/5𭮎\u0016T\u0001\u0000p󿋫8𥹍q\u0017\u000b\u001bA!w=x\u0011\u001e瑈Z\u0019\u000bpx\u001f\u0008(𣈪mvW6~'\u0012n&\u001e\u0017^]􊰞\u0008|􄒬d\u0001v-􊮪T\u0008\u0017𦧅x뗳 Mo3)\u001c_5𬨩Mf𦐦VFG\u0002OEC𢮭(\u001b<1bYVMM7h.:n+\u001bXB~juz{<\u001d1媲􅽵v􉇂Ge\u00169X\u0002󺹶<\u0005x>\u0006^􎢃􀌲𢙃P\u0003uh\u001b0㫔?R\u000e\u0018cT󺕥󺢯C\u0012\"8BY*8𝥏XO1\u000b?z\u001f9RR𢃉\u0015dG𧅁\u0014/k􌼀􋽚띋\u0005k𑋳HNx𢋐#󳢭 \u0007pU愫𧚄E~pe󺀛罨%(\u0004/𨙡Oa􄽪:9'b\u0008뽈bSw􉼄\u0012pQ\u0014\u000e󳧝G𣆮(A+!\u000f\u00019O󹗄\rWZ\u0017HVe󽠒\u000e\u0016>􈯊\u0001}Bcj󽻩\u000eDC8𬋓F\t􇙠yrR𞸀|󴭮\u0018⚕e𧋩\u0016\u000co\n#M𢗙􀢥u:j\u0014\"颷\u0001􊥏Iﲃ`tpdU\u0001@\u00035󷷱𩟔8􈭻C\u0019I𑑅\u0019\u0012M𪅮􌒊20䕹\u0005zq\u000b=KLK󺧙𧈯𮫗\u001c󹮸&󾻐\u0004;e􊳜,59~\u0014􋝒s04[C𒇟YbmD\u000c鱽\\\u0003\u0019𥥶𩞁Z\u000c~:.\r^?#e􁡊du_I\u0017Hy\u0015\u0013C@]Q𩀔ﺒa\u000b􄉄<􌁞zRr\u000bA󵘇󾣾%]\u001f!𘖏.dfV\u0002R항􈙿CJ3\t􌦽d=\u0014b0𗞻\u0017\u0002c\u0000紳B(\u001esx\u0010\u001clYr#@􀁭𣤔󼅗󳆦\u00007Py𫊓aL?7\u0001'󼁯󺦋𨤃;\u0005􍂘𫪮􃷁CP\u001dy\u00152@h4D𒅎𘂇𘇦;󲈢+%𢯍󼌉V\u0010+Af\u0003r*}v𒍁\u0004\u0008\u0016\u0010\u0001\u0018\u0000\u0010lI􍙯Kof\u0014\u001b𭏛O󺚝fr/\u0002q{\u0016@􆟋p􊭕mvx:fk􋰾\r4􇞈⓲\u0003\t\u000cP􄱏%c:\\4Ɠ􅴁A\u000f􎟠𮃡𥰦?1\u001f-\u00195j<F\u000bj\u00034V:xin\u001ea\u000e\u000f\u0010(횖1\u0015[􀇍$u)5tWk\u000e􈏝\u001dwZ^\u0008\u0005W\u0018bV\u000bV?X\u0008qបa5𤔖􆕍0`&o\n퉋J%.Z]󼲉􎳆?fSi\u0010w󷹗>[([齦\u0007QWI1󷍆󷛳H3Xf+A#YF\u001a_<o𣤯&󳠰\u0006{\u000bKV𘥕;響𮑉􆾿7q㹽\u0016쭥\u001eQ&󷿒􊍎\u000f􁦪C!f 3􆊤-w^Sz\u0019o󴾍􀂶\n􁧂5􅉑b쑗󶮒.\u0015󽭇!z𩪐]\u0011@e8Ko\\Eta\u000f𤣨?𛉋Lv𑋑H𬪦\u0013\tr+]𧋦􍸑\u0005\u0014𐊐e\u001a^)􁂍QZ㨢\u0019\"b𝜾\u001cl)\u0011=t2R\u0008󲮢#𤨭Sm\u0018햼녭F\nN\u0007QI𢻙\t:\t􊡑\t\u0008eD󰦩瓤qPm\u0004$0C󼀎􊩏􎸢ꆴ1\u0002\\󷢶ZB\u000f9\u0004\u001bx9\u001a\u0001\u001b#&V楠e\u001d\u0002D𘋞\u0005_\u0005#o𢡼\u0012\u000b \u001e[m%{\u0008| ꌸXn\u00136Vj󾶅^Q􈂤􋝵🇼\u000fc\"}찫\u000b4~H𬞰so2􆃬5Xጲ#\u0010I~F􎈭\r􊭐6𗰽𖣫𩖒=𐂨\u001bV􉶣혚썋\u00080Xd飤Y󸧜L\u0011𖤵􏱭1\u0002Y\n𤝩&\u0019)􊃿𮃿*b􎠹\u001apPY\u001dF􆈟OF;cH𥍝f+9𢼆􎬉\u0016\r􀪽gﴩ\u0003r\u00032j􌃭𦇺𥷁b󼁐𑀡\u001d *O\u0016Y(f 􁮓qw;}􂫅\u0019xvr2`\u0000LK-B",
     "old_password": "t𪾏z\u001e󸴝𑧆􋑦􉚦Z\u0015B􄮝+\u0003Xj`3.Q󻽧\u001aK􎲿r󸖀𢛩\u0004󸍗캜f=\t\u0008\u0018\u0001鷯\u0017\u00071𭪘J4n2eUq𨛦\u0002󴴑𗎨\n\u0011\u000b'P K\u0005C쌥6󳇴\u0007bB\\\u0016$E\rCp(\u0005󳣉Z\rᝆ􃺊ឤ𩑋(2\u0013\nwz\u0019􂐞`[,\u0007(𩁴\u0017n󺋥𩮝3𨯾-\u0015Tp26!\u0019%􄪫󰉍􍾒X􈫩Ww𧋮.S\u001a\u001es5\tS/𭾡\u0002𫹱㧟E𣅨ᕻ::Y%\u000f𥀥iV𡿴BU}]*\u001dp'쟊𓁏黴󼃀\u0019}㥮k\u0004󿾭a󺏕8<X`􃟘⤉E\u0000>E柦\u000c󸊕\"1uT\u001f𗵄􉍩hC$ND𘍮\u0005J\"S\u000bCyu\u000e\u00109𡝞b꾦\u0013Pe到l곋u􋁀࠱VSM\u0007\n􎘜9\u0014(\u0007𫕑𤱁>-\u0015󻠡Mr􀟃8\u0013汎𢞝PiK9\u0019m\u0006W\u0001vIFX󰝨\u0007c4<\u001aU'\u0005\u0016𦃔x⍘Y>@󾎟\u0002p5C\r𨂙!z$󷴓\u001d\u001b?# UW􀸶0&w\u0003􍆻H𮚰>-[9z犚󶑉\u001a@\u0004iA􏺳n1S𡙐\tG\u0013\u0014RT*"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_13.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_13.json
index 629b1aed26a..2ea23e54070 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_13.json
@@ -1,4 +1,4 @@
 {
     "new_password": "4I󰏧𣤙Sfof\u0012c<7ꥬ!.Y𤩢N^\u001a\u001f}v􆯴H둏g.*\u0001\u001c􃑅宒?􂔌󲍻輄\u0014Q?gN\u0013𠴢)^Y% 蝸𝁑.dM$󿀱9M0E\u0010𥘫\rR7y󸀸XT\u000b%-yJ\u001fTt_#Qo\u0004\u000e'QQ.i탎Eu<l󶙻M\u0001\u0016𭧢駹]I4k^n\u0011\u0014\u0011=HW`𭴶X\u0010Q㲒,u}圌2\u0005a|􂽬𭚘*Rq~za𥠲ep\u000eU󶓑\u0018E𡶼\u001a}ZJFGиyI\u0002\u0018􁋞\\r컵L\u0012I󵣉1釦G\u0007)5^\nG蚹=\"\u001dG\u0013\u000e驻w\"􏌯\u0007`\u001e)Q󿙷1eBe\u001fR\u001aN􊏛\u0018E\u0008륓v\u000f쑈;#\\OtYp𬎇7󷪙r󽚰􊭭$󽽄ujG𘋶󻋢\u0012C/1ab({\u0014(/L􍨺\u0005j󺠔-⥱䩮Wo\u00138uWyq󶢋4𪗎=w\u001d\u0011&Vho𗊲m\u0002󶏔S/\u0002Av+\u0006\u0014\u001fM\u0015\u000f?󵺀)FB\u0002I\u0014󱟈𐂝\u0003𧏔$PA\u0014𝜦a\u001e󺻀_\u0019!ON6>8!Acu\u0007\u00176k\u0016>\u0019-埱g𤠠S\u001e󹵒􋩮jyZ􄛶􅏯U1G\u0016(𬈂\u001f󵳙\u0001􏾵M𪃦\u0007$CT\u0018;iezO𤴣!􍶒t<􁩴𤙔oogs\u000f\u001bO\u0007~\u0011\u0007\u0013󸩀𧁕t㸦重|\u0018%󶧵9i𦆷5𣘝k􀛳삸⯋𪞴􀮽\u0011K:\u001eE\u0003ᝧ:f􌑨䯋\rN뾗:t\u000f􁒀󽢁z𤦢V^?D\u000b\u000bki\u000f\u0017󴞡?u\"4L󹒷&󱃝呦B2H𪕎褣5F薦\u001d\u0013\\􂣷4",
     "old_password": "YhSb䚜􋮶\u0019.㚦o@uV\u001a<c[􂅕 {쳇*䨅􈳐𨆍$_ &昈􈤲\u000e󼡘吚\u0004𦨞\\󴽙7^T􎱢%3_F\r1𘆩\u0019􀽙D󱔍lJ-\u0004]_lJv􄖜󶸏hW 􏿯𭼂RH쏒UH&􍕅􍫒it󼡟𗷝𨙐\u0000𑌫\t`S4QPvE_󳐳=>lIo𩑰󳤔󳸊X㔌X􊼹<x1W\u0001닧7􋑵\u001a]!\u0016\u0016}[fj/𣓳n\u0014\u0003bw􍉿m󽱗\u0010FpPT𡉄\rm󼙿\u0003𢓄a:\u0011D+5'2􇼂LE<uk4`M􃊬+󶬳BVbeࠄ\u000cMy\tM\u0011\u0015\n}-Q71#󴚇Pm0|􂡂䛒𭉑\u0005D☃􎩭􃭹WU𢓁𧏍#􂣗\u001cL\u0011_\u0015\u0007\t\u0011\u0007u]}h!wBXKH(\u0003)?𡟷^\u000cea_A􃣧K󲈣𦭄e𡫔𓄰􋹇{􅙠h\u001e(b[􄨟w{u$vKawo\u0004󴰎RE\u0014\u000en\u0006#}𒁄X󹅨\\J_p\"PZ󿲥\u0018-U𥚵􌭊\\󻴤𐓶𠔓𡩻󲼟(u0\u000c𡫐𭡹5\u001flzFe(`!XA熬f􌃞`\u000c\u0010cGJ\\8b\u0016𐮑𤯦m\u00133\u0019􅕀𐐝鲺U𘕂\r𫬹z󷺅~\u0008I􈄰\u001ax𩄌;L𣤣g1\u0015/AiES)uYj=\u000c􊳗ygc􌥹;\u001d|;\u0013e\u0011}􂋀⣈@oV{n\u000c􋯤\n%󼘦\r+|31j􌐄q\u000b2\u0019\"􆶸6)52w\nOj\u0016\u0016U&\u001fU\u0001\u0003\u0001Ab\u0015v\u0002v􉘳\"H9TJ\u0010-nq\u0014H\u0008^I\u000fs/-\u0012:ay:>\u0001󼆂󱣿)P𪂣0󷦲d\u0007\u001e|𪪘$Eu \u0001\u0003F8 a\u0008󹩂􄞘/]\u001f{3E9Sf𡮂\u0007_:V\u0006􏏫QWU3􌐕௫OS XdA[𬭸澚.糃(b\nL#􎝌[\u00027l*C󼑰󰑈\u001d1.Z󳴼\u0004뛷H\n􅬶􇟈\u0001(l\u001e𢺽\u000b韧>􊏺:-\u0000j?%F􈯧I[6v𩤡埦𘛭쁺~7G𨣑ᆧ\u0019!'\u0003闾Q?,\u001dUu@%(H(I\u0003~>\u0014K\u0013>𑨶\u00195󹢆 􊓄O\u000c􏔒2\u0013敋󲷜G9󳹿󱵾*%󴋘\u0015-󰁷\u0016\\\u001f;𥕉JP0$􎂁鎾]\u0010`󼾉:0K󳛲hkB𣑎\u001eH􍄍芮\u001e󱦄􎛺:A#]R\u000fXFW\"8\u0002HW0󰯂뇵j鐼󲿸􌬩A󼵧}l싹􊡌\u0003g&?\u000eH􁚵􉸺\u0015L𘉬RG􌾪76ᘇ􇼙@\u0004\u000ev:猂*\u0012xph𡔅\"F\n3lu\u0002uf\u0011A2M𥧱􊡶\u0006tXj\u0010􋭋fT𩃛𧐆Q\u0003􆆐ah:󿉥ctrC󶕌&:\u00051󰏓𑨾_,}􂣣Y9`:\u0010\u0013d􍡢􋥃􍐲*Z!𭭢𤏭\u000b찭7\u0001'\\TOs!%?\u0001􋃕Z>\u0014Ҵt^P\u000b\u0007蜙`𤈕_\u000eE*󶻎\u000f𧦭<\u0014\u001fW{𔘦[􁟕1􀉵duWR扞􂯃9l\u001c\u0007\u001f\u0017\r󽅦J$Ea􀾙𪖡\u001aLpR2汲A𨸣\u0008\u000eUJao󺘽@䐄h`\u000e𧵓\u0014􄕮E𦖔o􏎼dZPjbt횉󰨽k{􍍒0|\u0017얈Q\u0001𥇼5\rfAj􃙠T󰁍U N祪u􆪯\u0011𦖼\u0011IP>󲾊'\rz󿠅A􄞩\"𬒺8𨑻|wXC\u0000􃿐?,X󸼓m\u001f\u0004𗥽N𭘛_:d\u001fU𨶈A􎎶*'`w|6󿐙9+𨣚mjC:v􁍋饲􋀆<C𠮿ҫP!\u001c𭏒X3MO鬿𦑣K'\u001b󳍈𮨀h\u0007𥚇E7wmXm\u0004F𐊤\u001aeL<\u00154"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_14.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_14.json
index 753cf0c7c0a..cbebe951cea 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_14.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\u0012\t!' czxpt𭠮}󽇘Z|􍾻3􌏶9cE9;qlI🝞0d󾗦􅟖\u0017\u001a㏫C(q\u0018\u0014𖠒r󲌭\n鋵\u0001*旟3xLD𗯎<iz\u0008􌢰a\u001bz&\u0010ㅧ\u0007a􈯇軋hslodj[󳌧􆛫,4mN0}\u0010ҮN\u000bi{2\u0017w􂼡j\u001f󾉩\u000c\u00081l𐤐Pg𩐁躂󳖑󿬍s\u001c􎓯育Z􆌬􂍭O@b3\u001f'{W󵍕􁮩\u001ek|𫢄&-臞𣉥􊃊\nNf!ᚠc=]\u001e􆍊Ha󴱁􏂞]mr~󽏈8DBsgMI\u0013q'󾅱n#;\\I2,􈌜RlR2\u0015\u0016g𐊳l􁖊l{p散챖k{QТ󱒃􃨒HW\"\u0010x.𦭆p\\di􊪄/*󽖬7x_L\u001dsuY𬫋2ῲ'|󽚪<􊿀^`u􂊞uq七!\\Jp📣/􇽇\u0004\u0008V\u0016㰧𢝵J13\tMJuu\u0000󾁂c>\u000f/AS\u0018X\u00140\u0000C𠶔\u0010^􏻏P\u00166U\"2N\u0002v%􇕍} <e5\u0008j?\u0006􌆽,􁝿\u0016㲕􈸤\\\u0018󴑕p<\u0005󵒎b𝜵ᒎ􎸅i;ꝌU\u0004rr#y\u0008\u0015~󱸈@\u0011@\u0011us󳓦yb\u0002󼿥\u0017󱬣2\u0005[]𫦱H\u001fs4𠗆F8E\u0010􀵖𩱦\u0017𡏊'Y@\u001f)A󴒤풑𮋰{|2\u001fゔ\u001c\u0011Y􋢘𠁵\u001f󶎾\u000c\u001a\u0012󵆱x%`-\u0006\u0006/𥱰9\u0004𔕈zUl\u0018􍎣󱕩𡝩ov𡆌𫶮tV?~y􋈧4󴨻aE𤊎n 𐔌\u0000M󵔓\u0013\u00017𠂸𥺖\t\u0008_\u0010k󴌑ORJP󴢖\u001eb)jpl`XF*F\u0017\u0010}󷽦7zsM뢪V8\u001c𒈰󷽨Q𔖫􁐍tH󼲆쏵P_\"AOYo-\u0015a\u0004\u001e\u001cM\u0002󷐓x<𧃖2𧐉󷹜󻌈a/禼r\u0002𬡞\u0007\u0011􈘁%􍑹􆹆:叝|\u000b열?\r5g5\u000c4n\u0011T\u001dj:\u00138~􀳨s90@\nwOhtᛪ󹳱a𥁠/evB\u0011𧭐󱇼\u00087Gb^`qPe\t*d<X(fmo\u000f~󽇚(W9J@5\"\"𘜜  \u0003E󻹝,\u001b󠇇PT\u0016?\u0013..:8V􎭝L𨖢\u0014􏭦?[󺿗𬓺󴼋-\u001c箵lgiJb\u0006W馌v6^;0\u00199OȀ绠靛𤫆먉Km\u0010^e\u001eX(E^\nUqzzZE9􅠕􂗫~􌇦\u001b?\u0001@\u0005\u000fCTA矒d\u00160󳮓)\u001bq𛃐􆕡e󷝰",
     "old_password": ")󼿸s𡠀'`\u0002_\u0018𫼪D\t\u0005zJ􃧞󿋱`D^𛊠>𠕘\u0015\u0013𫌤삫l\u0001𘕸󷚜8􌈔\u0013&>ꦢ砗x𪙋.o𦳷=6١􌄦P1M𧬬\"RG\u001a󽛉\u001c\u0002\u0018:\u0014\u0017u\u0018x􉻔􃅃@(E󴵢4~\u0003\u0000젦4X\u0000H\u0012pll\u0004\u0012𫚏􍥉\u0010䌡[K|W\u0010;𣎊z,C\u001fD󰌈O\u0000\riV\">=^oX#&L􀌬Kq敷YW󼓑t􁫃墒\nPF~􈘺;42%b.;t 󾇲󽬗𨔌\u0011􃿞PV楙z_xZ\u0001)Bz\t1f\u00109/\u001c7􊿼,J蓎𑧑&Q\u0000e=\u001cK+\u000f挧󻊴󹢸n𗮲\u000e𪐠8p\u0010\u0003𛈶|,\u0002󼓴􍨴d􀣴o`C\u000e𠏊\u000c?Hy&軪A뒓𢛎e\u0015\u0011wJ[\u000cc\u0008􅕖l𢞮\u0014流W\u0014R󿋞t$𡒎v~r􃀢f􅧢3\u000f󸺿\\D\u0017>𨇔b\u0019𠣠w)􁊟_(􂕖[ra5U\u0016𫞠𑲝fC𢝠6󶼧\u0002y𘠬Ii􎷅\u000c𬼕z0𨍷~𓎝D\rhqu'\u0010\u0001\u0014𣦠V\\\u0001+Mu󾑅S;w𢧲Z󾖀\u0004\u00155mo\u001fZ􇩫𪀲􅄉􊊘/\u0017]\u0007<or]\u0015]W𥘚N\u001d⊸󵨥xopL󽺚 +\"\u0013U𬎶d󱭶𬑢tz\u0017󾌂%𢋫1\u0010Hm4LC\t󶤶X\u001fX*oB\\e\u001d\u0016𠯢\t\n'\u000c󶘰K\\\u001f󻀛)E\u001e[f\u001e\u000f*;\u000eiC:bE|@䴸'𖩁\u001d\nX寁𦱋!6e@5+󳭐r4_*U􏆶n_)jds\u0003;s>D'\u0000x+\u0002\u0005I\u00008\u001e􁱚gcU7􄜇\u0000ᵎ\u001e󳊄T-"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_15.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_15.json
index 967fab02921..b3e41a818b9 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_15.json
@@ -1,4 +1,4 @@
 {
     "new_password": "𥔔s􄾼Df{􎽛>\u0010N􋲧:,􍢶 𠺚ಭ;L𠧤uN󱣚-\"A9t􉹋f\u0018;q󿛵遡R<&3\u001b𑨾\u0000q\n9e\u001a[d􃙭^\u000b\u0018U䧡BM)\u0011r\u0001evfz\u0004𝀵k𥕶8zn![nE鵒\u0007𤌏𣬅󼢤\u0010\u0015#󹞊\\᳗\u000c)We<x􈵂0􈾱H%𫘨mm\u001coB\r󹻨􅤷\u0007󼪇<{󽴇\u0010\u0007O\tLN𝝘\u0017𩝾e:\u001aVg᷑􋰁\u0006c𒆉O\u001a=󹿢󹖼7􋟵\u000f𣭒󽮯M]\tV+F =󰯺!ꛭ'[᜴𡶈b\u0005C+RO􃗒\u0019rWcB^\u0014i\u001b08;@\u0004zL\u001a`KaW\u0015󸌾󹛄9󴍧􋣟U\u001b@󻷦w𧄝\u0004𭕪􄂔74󶞬<􄄉ZXg7𢺸vnsdL蒉O/게UMleG󱱴\u001aH6*9􅣷]Dk󻮮Z.\u000bh8V􇑣-秤s1iu\u0012(󻨻vx\u00086.K󸱐ꇞTR\u0015Ph%R5󶥮I=𠙒A𑄗ACi𭩤􅻜󷾇􊈡􊮑\u000e99l#V船𧔥ySJI\u0004X𨐋Ju\t%Ab\u001c\u001d$`6HB㼎𗏎c\u001c\u0018󺶙𡷼􇮵J𢅭\u0011\u0006\u0007f걦𢧋8𧑍,𤍮\tzUY\u0016Gh\u001b殝>𡋯\u0005󵆝󾛑Y􈡈W𭆸󾮨3\u0010\\\u0008/􂔇<<Sἃ󷻳𥳐M􊏎􉢙䉡󷃌l]Z-夒-JS\u0010B\u0002|;𬣐`U;K\u0013竰^mU❘( 􇅲k\u0019W\u001e#(􈢄󶊿{\u0012e嘎\u0003`<󵤬m_)\u0016𑒞V𬩌𮝩(X\u0006I=塪􇰒𣬝_s`u!Tlq\u0006M[ꀓtn2Ip\u0018)\t'􄝊3􌄧nl챃U.zG+LNJdvI18\u001e)𠼓𥯕c\u0005n􏺟^\r𫰯\n\u001f𮖓E𝑭*𦫮 yứ𤥰FEQ􉲊7\u0013󻳩\u001c\u001aF\u0015Vm\u0019\u0007h<􋙉[r\u000b𮍞pq]㌯\u001f\u000co\u0014\u0011𢬽-􌎚!-.J=8󾁯\u0015P(p;*s\r\u00183~\u0000𡾤\u0011\u00020O1\u001b\u0002\u0016nQ嗝oUqG\u001a\u0004􆒑'p>JXk3𓈦󱆭𥅛𣼾橸\u0005Le𡹱V3>𢫾繵4􄅤裟<zOu\u0019O󳯟\u0002m\u0006HI\"Q\u0013F_󲥭=-\u0008飘yꭝv\u0018L-7\u0011+CHJR󼲃\u0014􂊧摔]\u001f\u0017􁔼~\"b󽿷~Xv𠼓\u001f󺖹􄽖󸚅𑈸𨭯\u001eW?_𦾆\u0014樁蚺I\u0004\u0012쌨~(6 𭳾􁏉\u0019\u000c𫕋:⒉Zxn\u000e.9i,𭒍7􄇴ae\u000ez𥇧𫙐𦜺fB꼐Vn\u001ch'\u0011\u001c8Y󷨞[>F\\$k1\u000c\u0012f \u000b𝥑\u001c_􄒱b-ᩇ&󳉗'X?Jb,㊾𦱺⏴-\u0006/󰇞􌮣`\u0003*☄!f2&/\u000e𓊷\u0005󵬦\u001bU􎧯󲩽\u001fJq𥷳R𠫨2Q@\u0003q痛sM\"\u0012{b\u000b}i=𝁃\u0014p98sa􏂉 NiV󸏋f@𧲴􃒽F+Z𥩔\u0011􊸄Zd𐇪gh^\u000eK%𢯊I",
     "old_password": "nvS󴼓􊆟촲:J􂖀\u0008\u0019*[]E󱋥0c\u001f\"Pu\u0012rh󳂾󾽓Pe*\u000e\u0008I+ἴ\u000f5󾻸n:Y\"'\u001bL\u000c󵅟\u0006DŽ\u001a@󳯡`\u0008\u000err5a\u001adT󾠡\u0005im0a\u001c󷏩1>䊒ቯ\u0006B\u000b\t󱬔s𡯠5\u0010#퀏􉬘\u000213H𪚼#@t)𮀳BEV\u0006LCX\u0016]\u0012P𬒽\u001cN𤠊𭥞?塌(􊕮㰵􄊥\u0019O毁\\r\u001c\\\u000f󼱒䢅󷚻vU\u0007t#􃔟\"\u0004\u0001{pEゾxJ\u0012g]\u0003\u0013c\u0001\u000cPX|􄞳wEAe!󲦑R\u0006u􏸎..$􄻹檴9(\u0016c󴱫\u001ew!\u000ei󻬎>qPl\u0006\u0002XmG-\u000b𝜠`􉳻B\u001c%gW\u0005\u0014\n\u0002(􆘏\u0008\u0012N􎼉7H\"k\u0019ty\u0017𭸺A󹆩.:\u001bj\re\u001d𧣇󼡑-*q\u0003􊽁Y%A뛇hf\n𢝈\u0013J𦖽\u001a}4\u0004𧗕\u000b 8$d%\u0008淠n󱪠Kf\t\u0000|;X\u0006𢵋*\u0018\u0016廯\u000bጎ۠Yj\u000byyk󺡄'i􇱿?U]\u0006b\u0003뱑&\"照󽲥}P㎪%\u001b\t󿶞􌇨\u0005\u0006\u0000@\u0005􎂎%Dꏰ𗀀C\u0015~p\u000f;\u001dz&\u000ej\u0011\"7𐋤􈅙\u0004󱹉\u0008diX@[%}􅶨􌉠6K]S\u0005󷅙T󱺭𥪲24g\u001fe\u0002pS𔐣E\u001c\u0006𑖣􉦐o状'\t\u000fv󳄽7,\u0003\u0001!i󻵭􇿃43XW\t4\u001c7􌳘􎣁穄?􈧯@󿻭g\u0010\u0013􄩰Mn\u001d;󿀻*k𤄤1\u0010W􏥇􍡸*\u000bB6𦥮\u000c𐫔=P!􏬪녒|9Qv\u0014q􃮼􍱺󵍅Z\u0014􋼴;9J𧄵+\u000cLa\u0014󶲇2􀔴<􁪷\u0019􁈼M\u0006DO7NUa薳󾌝[ 𬙹\u00071\u001f\u000bc.󷊵\u0006hi)𧭵豭nG氟;𠜱󺢸f𬠷#t󺳈B=𥎂`𬅽4\u0000󵬇*􆤑\u0008\\*\u001b𫑀\u0018;\u0007o%pAH|\n\u0019\tC𢾻ZrZ𤺂IF\u0017O6=bh\u0002zV󷡦P􃸉\\𦶵:,U)\u0014󷗽􆦮\u001dg\u001ayv𛃄l\\\u000b\u0008^粏Ii\u0005[ﺫy􉳃8a\u0018\t\u000bDeb󵽐i{t;oR]"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_16.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_16.json
index 2ba9a7a506c..55c6f0289cc 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_16.json
@@ -1,4 +1,4 @@
 {
     "new_password": "s/\u0013\u0007󹀏;𭜨\u0011\u0006L\u0015\u001a𞋷0\u00105󱜆􉇶\u0005]y\n􉲔\u0004%#o𬐣k'Nᛣ𨆗󷌁.U+D\u0006\u001f7^􎅾\u0014&𑶁\u001f46zmN􇔔EX􌰟&hV𤀑2#B,EY􃕚`\u0010󰵐揞\u0004\u0004v􂴣󶺇ᦺ↞[H89oS𢢇\u000b(Isb\u0010󶥀󴁭Dv>S\u00058\u0015󷟫籁CBi9C\u000c\u0005<􂿥\u0019󴮚\u001e,/g󹔠6S$\u0018\u0018Tc𣦀+~\u0018阨<b)\u000b|5}󷢨\u000b󹠿K\u001bgSo0\u0018􌁲0Ch鱰Q󳟫\u0014`\u0005𢏒q􁩹s:R(\u0012\u0016YdXT𤠝[I\u001cpyP\u0007:󹒬d𡨪\u0008k𫯿󻁟`z󹽲5.󿸇\r>;P\u0004h\u0001󱰏\u001d3}j {p󵴝𩑁𦬃D`󷩨mN-\\V\u0002􎌃{\u000f\u0017 \u00151#6p󲰓~󲖥󾯰6􂲊Q\\8\u0005\u0002󷂾]ynrf~>n&ᣬ𗂦 m_`􇳣D@\u0012k1,>􌅓v𠓋6?\u0006󷎮\u0011\u0001jL䃀6\u001fld󶆥𮔪5Ệw$l\u000c57\u0000ﰌ􅿔sg\"Mf\u0017uKPsa𮜋zLTtY𡍐2\"R䧻𐑚\u001cw\u0008𨵱\u001f􄂯옥W/𞸫𗃴}S𨈤;X\u0019e`𖾀\u0000Z-󳁉ꭒ\n\\\u0004y𭸓f?􊕂!\u000f3\n\u00030󿜂S鮼T𮊂\u0005\u0001B_{&\u001c:\u001c\u0018󱓊┢k􁕃N\u001dWR_>J?,(􌶌r󼲡􉱾󵀱ꥤ)󳤝󻙀q4U{喛uqQA/󽄔󻂭 ]4L𘣉煫扴m\u0003𫹈bﴷ􎈐\u001d𤹋\u0014F󵖩G0@6􇉍\u0010𡨐BV􈄢l􈇻C􄐎Q*<\u001a4\u0005𘘽\u0011dh􉂎􌭠V🐖\u001c󷄹oZ6>憋I󿠺2@I^\u0014B\u0017\u0006mD.𡨍`sB䱦𬵔L2\u00132;\u001d1L;𢦚p/\u0008Cj륢G櫊SXe𗬱Z\u0005fꢒ2_ᣱ\u0016r\u0014/C1R\u0012",
     "old_password": "gB[\u000ea𡖕4I_􅖺$\u001f-E\u000c\u0008D𭈇l텲j𣜬􃤕e𗤙*􁈻g(hJ+E\\\u0002𘠺/\u0005b.Ḻ􏰻\\橎Ⓩ\u0019u)-\u001cRh\u0011G>\u0010\u0005#𧦋𗅈\u000b&\u0010d[57U+wZ~e􄁠RT󷹐~롦􀍁\u001aL~\u001b]𪯮KpHWu_􋁈uN=\u0008󻚖\u0019\u001f󾔐\u0013\u0010d47󸇃􋏺\u0016ZOiXM\u0010\u00114󹸖ퟒd3h>Jw<\u001a􍿇$*)𪑓5\t~蹣U\u000b󵻷8nb\u0010XH𡥣\u0011Q7kP𭠎L<􇖱$+􈄿#\u001b韊*K𫼩%𥵋𐃊\u000c2\u000b~A󶽟\u000c}􌨮}(%\u001a󳩥PA\u0000􇽮o􃶾\u0016V\u0000v𦸧\u0003퐧􃺪os-􊡣\u0000E\u0002cl0𡝬f􀣰𭧑𪪚\u0019扆sQ􅪷ᑌk^=_l􄖘f;O|􃧥YO\"P\u0000𐹮\\谖\"\u0006\"~𢤐X󽝜\u0017$𗛜\u0018櫵%UQ\u0015y󻏊􆆱-W󹅄z~\u001d垲􏷟J~\u0014-?:􏈈\rf􄎺\u0007𭹔􌆸^.晕T!*󽋤~􆅪\u0001F\u0007m橹𦥾𪯕\\\u000f𣽘Vk𘍼w􊵕𭨱_D\u0010q􉊎r𠅁\u0015y2\u0003\u0006{Pq)󽏑𘑠󲦬t𩖱e\u0000\u001f󱛗`𦺑\u0019󴳽\u0002Y!웚\u000cY\u0005􇔑ERU󱴏>\u0000:ZT󼷼.3\u0018􋯷J\u001aN\u0017Z𥞉\u0007㻘\u0012m\u0005\u0006Dzhd(<\u000fF9-N^|󰀸;3󲣱%𨊀|\u0001􇵎綕Ls𑰀/G𧚬6󴙕T<\u001f\u000e𫁪\u0008𠛌}􁺥ᵐ<I𮘰jXr\u001e􃶊󴜰)<f23gZQ\u0010;'쯍>k䬔\u0015[t\u0012U\u0001IX(􅀿E?9*|-/)3U\u0003\u001bo\u000e􌡔\u000e\u001e󶠒E\te#\u0014m;\u0010fx\u000fm󿠊\u0007𗸸𭶴1𡫳Kd\u0018󾙸%\u0005𪚧;󺻏:4kcX酒!>j𥗫hT\u0014𧺋~􂳲󳇉󵠙𮢙􏼙Ç(6r\u0013𣥋\u0019\u0005x\u001d9E\u0001,6􃻆󰐚5Zv\u001f𑈊)dssy(\u0000co.#\"\u0015XW𝄍gS_筍O*𢭲\"􄩦&Xt\u0012\r{Fi뺊 ]ZZq󲭊:𫎦:􀷫U\u001b$zN\u00169\"⨉10b}X'`𮥉C󾮆}\r􏕉󹙇*\r\u000fk􃠮`E?=`돆𓊰l􄱷*j躦M󹂡醼;𦹏j&\u0014?#𮭔\u0006s[iF:\n㻚󱾣􂮴v!b􏭚􄳆\u000e󰢐𢦻􏠔j\u0014A\u0016T\u0000NY1􇙢\u0007𡓴􉪙blf_n\u0013\u001dB\u0017ⱴ쒤q󱼽-B/B㾍j<g𗾏W\n4bQך3KG􂑪{\n\u0007\\ᙐ󼔶俵A`B􇽗蒕𑵺󰕜\u0017tGK)\ny^@7/\u0018𦞑6WErO𨶐𑂴-\u0003\u0016\u0008󹀾\u001f\u000f󿞙q.=􆀍󻸡\"g󳍬vV}\u001f>𫝣\u0006􇝳rr7x.x~𤼶\u0010cIIK l~\u000bt8z!)/廗~?yP1BY\u001bД'#7\\(p𦿥Xx}𤶻𣠁x㲢X}8\u000fw$􄥉Dy𐴰SR᭼픽􉔤R'\u0004󸊞 􉑿>􅺉65\u0010+\u0004m􋶁*vMO,4怘R􀔡W󲉙\u001c\u0019𥭱\":H\u0016_K\u000b1(孯5g𮑆=\u001bY\u000b||]A3􊎠8fI\u000c􉻡d氡dw:켽:e\u001cX𢘌&朏󹐠𥟠6\u00037?Z8\u0013i⧧聐U󱁵'D>\u0006􌗿𨶆n􈮼\u001aeᕅ\u0014=F\u000f\u001d,!jSM󽋛_\n"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_17.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_17.json
index 28146b303ec..e911bc16d56 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_17.json
@@ -1,4 +1,4 @@
 {
     "new_password": ":z󳯁7qH?\u0012󲉒W󿒀=眺QqᛇI)\u0003W𢛥 ?<ld$󴥊T󶝑{B,􁠵_𨷶\rm󲷫m\u000eT-\u0003𧲥B)REnd%\u00184\u001e\u0013@P\u001a7S󶟏瘪\u0004\"-t8\u001fn\u0010|`M󰢈󺤪<\u0017\u000313VcZ󰖎xJr\u0013;𡘏D*~j⒑󺉭e\u000e􍗛<#ڄ~!\u0006\u001bnIg\u0005\r`Wh}E󼸱?\u001d􇟙󹙟𧰼l#󵌉`v𗐰⽃a^S\u0007~1j􂶭5dsh𗞟\u0017\u001fl'0\u0007\u0003􃳥\\\u0017>]J!p\u001a!Y\u000f8m(cS,𫂕<𩇆􂍁􈖖'􊫙z󱨥\u0017we󷟟\u0007a\nFb>A􉴤|\u0016-\u0002Xz&/'~(cy)hIF𬍁\u0010-/XyR𣼇󼴋𘘆\u0005r[\r􀿢Q􁚞u/r󳉢\u0000\u0003\r\tTj𮞺𥾕d󿦩m\u000bb'<􂫚늅@v켞T5dlF\u000c𦠒gRJ󽒝󳉮􊊷\u001fj\u0008F\\\u000b\u000c]}4[􊖼1J5􍀨fM󴳉P}􎿂]xd껆rn\u001fi🍤zuK2行qwmc\u0016\u001a\r55w5q|󵌳\u0014󴒄\u0015\\;𗸠(d\u0002􅄨𞲚#\u000feP󷬲pc\u0008󵪅𓈟C𝆣\u0008\u0014#C𬯨M_\u0014 EY 𢕱\u0002g\u001f\rq.𘕩._깉E\u0005\u0002匭󲰪.󶯒𨘂s 7p?I\\󸊀NG󸇏\u000bH.󶶙4Hz\u0013a􏮅􌙿LSμ\u0000nx\u001bK]\u000b󷳔\u001b󴤹\u0011<􂬗M)􍙔M츣o\u0010\u001c)6촹𓄖YfQ@F𢏅W\u0015+𦥏\u000c_b󴁚_p󺡯N\u000bF\u001e\"f0\u001c?#v{􃙐\u001d\u0003_p\u0002[𩪅Qb鉃5􇦂b\u0008􏰢O󰾡\r瞽z\u001d󼞖I`\u0005􆜯\u00054\u0000|\u001d\rt-\u001cY\u0003ea𨅹'\u0003|攄qY𡩭\u00049Gyz$ME󷊘HF8􍁰\u0014󾆝4\u0013d鞗w\u0019􉢲PY6$aKV\u001ekHNh\u00057\u0008𥩺;I-J󶴃rSDa죧C𦟷\u001a\u001f\u0001V%\u0003B\u0012NGq#Q𪝽>􀉎\u0017&\u001a󺶘6c{:\u0000󺣤{\tq3𗩶󷧺n\u0012C󲢑䖘nLR<2bXS\u001be[l􋺬\u000cjjZ󵋨w,a𣇋\r\u0016L􀑧K\u0004\u001c\u000b(x𢣾󴯔싓l{󰮾cp\\\u001d>DA*𭠟𮊚v1`[I􉡕f𧒼8j\u000e𣌵n\u00047jx \u000b\u0014\u0001-\"􀫒+`\u0002F{y56𭨸T䘪D𛋁^C:F%5B􏸈𬵡eU",
     "old_password": "I{A􇼛󽽴WH\t^󺊨\u0002]~D\n9:\u0015\u001by󾀉$%7?􀃁>bm\u00126V􄆂䅁\u001bQMle,󷿑唆􍷋\u0000󹌖\u001d\u000b@K󾶩aC􋆸GI釸􆟳􇛷@W󽟯󴞓󳠰𦞯\u0019a}\u0001㇔􇽑RP􉦢\u000fmNi𗻸.6㟜褬\u0002e2S:X\\y󺳙R1𧼓}󷇞􏊆𝑝d𣯉Xi_􂔐z 𭗎룀滲f#\u0006\u0008󸣥\u000cDK>􊮈AV=6\u0008\u0010\u001di\u0011\u0016􎣷=W$M􍃵\u001b \u0014u󱲖Q\u001c𓎘u)􁻗Qf\u001f\u0001-\u0002,nCr\\[摢\u0018\u0005-G\u000e7⏘m\u001es5\u0018\u0015\u0015􈈭`-fY󻁦\u0017L洛\u0017X2[X$B\u001c\u001b|\n\u000ec􊿫X\u0015W󶫽q󿥠^`CD\u0013SMJ\u0002/wR\u0015mB(\u0019-󼪀xI\u0014A􇗑􍚯􈧡yw\u000cn􂓁E􌷣cP1𮗧𢦪󶻞j󽖎_\u0000b>&^\u0004<\r\u0008\rr#hu.LY,\tS}\u0003=Jz􏼊𓄏B[\u000c(yR󳞢\u001a3𢕖l󸒄\u0016Ia^앞*󱕖3z⸱%<\u001bx뼼=H&u=\u001cs5_X/󹠘Q􂤔dJ𪉁ghu긓\u001bE>3􅳅𮒾Wls=)'NG􋊻r\u0016\u0011%}8%&𥰡8:\u0017KQ@?>k󺳆\u0000b⚧+Xmu󶼲\n茎-\u000c샱쥖6􁤡\u0018w70*;Q􅺄}y#\u0006}\u0005u+2𧻬𩱽\u000bTF\u000b.Pq\u0012`M𪞵𗧥1\u000e\njL^sg7􇼯C*􍐧o􉵵{y켆\u0003|󹻝\u0019F𡁻vxdQ𡧣:\u0016]e\u0013^\u000erv\u001af[5\u00006x1E󵤟􀅰􇬧\u000b󲧴\u000b\u0011\u000e󱐛<S􆖢y뿥%.(󰇘^\r􅢧p`wYXp󺢀q_\u0013\u0018+􃵩\u001c􃧫\u0011􏾩G&z栱 𨡹𥉘􊩄_6\u001aS,l'|\u000b&(F󼵟=-?v􀠠A\nYVc:o􋻱Ho𫇎p\u00002ho󼫦󸮉\u000f􆂌\u0006⺹N|G\n'hv\u0001E{\u000c;.Q[u\u0012lL􎱖,lj%𩮕@Nr!;wN7G]K􏜋󲘼9l\u0008T𨶨;?𐂎y*󶔃\u00068k𫃐\u0010𪀕cz=8\r蠪}@\u0000Pa\u000fⷚ3𨫄&=\u0010􅬖\u0000󻼳4􋃥蛅9𣩈긙𤟥󵟬2ᛈRlI𠮀B𡬩l\tJ#𘄯nZN\u0018_􇱭\u001cv5tL􎛭𬀶mN\u0013s!Y%s_\u0011H􆋇dSq𧥟`\u001e:𣟊f\u0003jge\u001e\u001eML솯#󳻙o󶨄\u001d-P$T2k󷨅m깛Q𢽚;D\r\\󷆅#zYz!Z(谕P:tmxqb󽩟􎦎m󳲪wq>\"p誕k]^/=+􄫻\n􆎛\u001a}A_8\u001e62\u001b\u0012Bk瑗C~S\u0019-`\n𭡎\u0019\u0015<Z\u0014r\u0017A@\u0002X\u0001圏m6'\u000eZM𢋶faꥲ󺧽\u001f\u001f􀩡w\u0010󼱋?%椹\n\u000c\u0005C\u001b\u0000+@U=.if𛋋𦮨am\u000eW㙎\u0007\u0013Nj𣽽㨼\tza,v#ꝸ󷞕𢡖Q妈\u000e叮p􃅎\u001ad\u000c\r*슲j􇠁အS\u0002#@8𨱲b􊌨\u0008~X\u0017@+[A*岠B"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_18.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_18.json
index 78289341b62..878c6759b05 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_18.json
@@ -1,4 +1,4 @@
 {
     "new_password": "3􉫙铣@\u0003cW#󲓧\u000fV3W\u0014󽏗VGgf}_R󼢒󺜺󼪌􏊦S=0d@􉁏\\JfQ􉛉ꜶV鳎2앃\u000c\u0015@0󼊛󴓒3󺗹/\nM\u0012Qp𭝹𪼘S|.*Ul𭖛󿲰\"k􏙹YRQ%-\u000c&$&+󳞇Ha󵱅𨆝P^eA\u0019_r\u00001󷹗䃺\u001d}\u001b!yY󹵠󺲴>􊭴/\u000evZw`JB>\u001eu}􎘓󽉈讳%𭓔n5\u0018js󽸂􇎝𡉴uvW\"涏h󾴋P\u0010􌃦S-<𭹀蚠𭥖/wb(柗3\n*kt+𬉲\u001a󹛊􄳂x󰂃@\u0013\u000f\u001f\\0\u0000RA?\u000e\u001e𮐇LuW:Xh1\u0001T\u0010𗋄 VOG\u001eO𮑊kே󺏸;l`g?q_ 󶿟𖭁󰑫~\ny\u001f󿏪쵡N󻜙\u0004\u000fA/j\u0002􈴕𪾡𡖠m\u001d#z(🂹jW[󽞞􆇞\u0007􂾳6\nnn𣛱𮂆\u0011􄲎󱞝t(l;󸟦Sm`tO\r\u0000􌼋|`x􅞤t𥡖\u0019𧼡/\u0012yuB􅰒s_𬮬UrcO𘕝􇻓\nꊶb܅\u001d^𠗸𢲕}Q􎻻\u0013G!󼷽9L鱀yক*\u000fU\u000bk?T􃷳;\u000c\\Q\u001ek􉄞𪎖𭼟|ᭀ􏾱Z𥺛\tl\u0000b%WA숏r}u2􂪪I\u0013V'i0𦴇/Icz𒆄􁣖\u00105L2K.\u001bKLr\u0014󿤤􀶘\u0002\\\u0016+\u0014G>𠗙>N%R\u000bR\\L􈐿*D\u000f4u7\u0013AW\u0002G𣕬e2%y\u0008w\u001f\u001aZ4x,\u001b𐤱\u000c뤽\u0012r󵈪r]%ws\u0014]y0󷨥I󲠐n󶰁.l\u0015LAv\u0004J3z@d樝ꝵ\t",
     "old_password": "\u0005>$;GNS\u0015q𫪺$-𐬎|𥁓𑓔GG􅁠+N󲵅igAv𐫂\n󾇨\u0012Tl\u0003\u0018𪙝\u0003𧟇Nꖳv𤠺𗾃9$v$R/𑂅U,\u0007唆\u0018\u0017󽺫-O\u0011HY\u000cK􄦹aS6V\u0015󽽝󳘲͒D혠Ke\u0006j!|!\u0017o]Xg)X8P=\u0003\u0005\u001e.b\"xp􍾳3i?kTDu􌇬T'.􅧟x%0\u0011+GA$A넁\u0007\u0017\u001ba󻆍􋪉+󸴯􏖤\u000e\n\u0001\u001b︒𦅝\u0002(]󿥾GL\u0012a𤸹F\u0007𩉐\u000cdB\u0017'𨚫+\u000bTf󲓻I󿗆4r𪰶%\u001e󴅅Xq_*g󲲡q\u001e\u0016.󷡑 \u0016zQ\u0015󰶺:𬑆(d0i󺒐Z􂑟\nn󱑪sa\u0016x𩬇A󺹂?LZ\u0018O󽮶8\u001e\u0004󲔊M:unvs\u0006co/􍠑:$󸕸O0l:ኣj􅫳\u0000B\u0014𨠻e|􍮕𝅘𝅥𝅰`BCH𖣋42󴂖%Y6󽄞\u0008|𝃚n󶔞\u0015\u001cb\u0004so`y7HѸ\u000f0》B`!\n\u0004#L짎􍒞|\u001ba󽧃\u0010\r􄪵0Y𡉃#NKj􎅫ꕽ\u000e,9\u0003h\u0010w🟓R\"(\u0004V\r㣌1󱦵\u0011yq-e\u000c󼭑r1YU2􉣏𩾰\u0012\u000e􍹩􃠝[󸻕_Za췇\u0012\u0005\u000b󿙽\\#􆳉\u0007\u001c䄒b5<kh}d󵧇1𫐹A𫃁𨿏[𪤝팬𨋝;e𥭻󳉣\u0002; S𥪛飖8\"Sy\u0008\u0014\u001e𥌨6𗄪C\u0008'w*a\rb󷱩p𧁟~yn\t̲Pywa􈴂F0n$󻄑nK\u0005䫬􅄉}\u001b\u0004V\u0000\u0000<P􊏻\u0015|\u0000 뢖^jn\u0006Iwu1\u001c𢭨𪫳`󲔑􇂉3@\u0001]EN􍡦!q󷀪Y\r𩞭㎶훧x(X![5\u0014󼻑󴟽_𬩐+tV􃠍n\u00007􍛗7􉖠S\u0006h)\u001a󲐼rF.󳍙\u0006\u0014(\\\u001a4OOv\u000c\u0011\u0019ua􀥭\u0014&n.𒆕𪿵𩤔\u0019􃢡b𝝗󹄇M\u00180\u001e\u0015f(󶕹𐙥󼍸\u0004S𛉑&ꖄQcxr,𝨻\u000eHz\u000c𮔍\u0014𥶹J􇛖v=@ꡫ5{\u0012`a\u0017#Wq𫜁6;\u000e\u001a잝󾭁L𢂤\u0002􆆅\u0000>C&>dt~y)𐎔\u0003g𢣬@\u0013𬧏\u0017*$\u0010ԡUnKs:vVS􋡶m󳟗㴂X5f)}@{ha\u0012\u000c󾑮\u0017-􁢓\t@\u0002,􌢃󱵫\u0002D􉢇\u0001 Cm󵐲sDY#YL􊍶;F𦌇\u000b\u001d n\u0007\u000b𦛤c6+,󵊭\u0004H􃢕艇\u000bf􄃪-ZS\u0006B\u000fFd\u0008uy)😠􆘭i<vb39\u0019q\u001b+\u0006󼢬\u0003L!0?􀴊14𦄉󱇀\ry\u0005􊯒󿥉T鯚< d#9\u0014hP\u0017\tw\u001b\u001f\u0014=\\ezX\u0004ᦼ7 𤾸\u0011𓅖\u001a\u0000𢒗-𣎎'G`􀀼󹧘\u001f\u000b\r𬷫V꠸%C㴚I#𤫰󾁙\u001e\u0012\u001d󼱋瓇􍗩@d#\u0005,B}`b@\u0016Aj)\u0001}{\u001e\u001c𛃂􄆊\u0000󱔇􆏂.█\u0011r𧄜!\u001d@?@িc󻭶fX7쥱Q\u001c􃧥𦪑%\u0019:(-\u0003i~pc!Xh51]\u001a𔘩7𬍢"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_19.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_19.json
index b522a563b90..94a18bfcdce 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_19.json
@@ -1,4 +1,4 @@
 {
     "new_password": "4)N`WV1t𩼍cC􃽓\u001ai\r𬔭K.󺧹\u0004pO\u001fm𪃖4JS𝇦\u0000)bL>\u0005DBd!\u0016c@\u000f,Y界`M멠M\u000e⋛{󺐿\u0003k.甾\u0004􄝉`𝙹Zu𩗸;>􇢒\u0018􎉻􏞤\u0017죊%􎶆,Zp+\rM~Q\r)Hv#l𩏟\u001cDHS𪨤󴃓j󱌩𧽬eWG𦒛\\7\u001e􀽷9\\\t\u0011t􏤌􆅺`𣄽N󶬘h&𭻞󻦓bᩥ󺱡􄥈𬹞[U𡓌󲅈>\u0018%\nO𓅪徽\u0008􀷩3Za.u𧐬T\u001f󼐙\u00186VR>P𮁆􃔽󽻂!n(󹵟sWSekN@愮t󰦽V𣙭􋤛\r+󸖙B*K\u0006􆗨]Ani&\tsuX/a|,,𒈉^🩀\u0001ty\u001bf𣸇\u0015𤨢\u0013E\u000cS󼈚\u0001༐\u001a:7=\u0008gux(Q}s侔]\u0010\r귈(󷳗𤑅2E`yqv;=\u0011󰢰#{\u0004=l4PE5𬓰D󼳤𡶼:_a.{\"F[\n#~􃣂50K>\u0008Tp\u001f\u0014K􈫐/zT𭢯󲆸7𤧷􏐟X)\u0011\\,塄%\u001a1\u000fA\u0002\u001e⦨l𠿮󾿶:e\u0016𫳚a䘒v蠒\u0005j\u0015[􋟺f𫒆W𦵕䩸𬁫\\]𧲊&\u0004,6\u001d\u0010\u000b&g󽸔&36𝞃􀳮[IO􄘿<s\u0015s󠆗𭁣\u0006}󼻘\u00072\njA-Bh;/\u000e𦤓s4􇰷\u000bYc\u001c\rY2\u0003󴿧x2󳠶\n\u0014D􁰚YX)\\.\n󾶏:𝖪𠍿󼋯tK(\u0014/\u0005='U\u0016\u0014\u0006\n1浳1\u0014I󰌒󺠔\u000bd뗧\u0006x\n>\u001ed\u0007\u0008Z\tAVn<m\u000e7EV !\u0013n\u0013\u0012&\u0016`ncs\u0010\u0014|𡦢𗹓0{Z􍷹\u001e8x>𡶎\u001864𨒑B]wi#!C\u001fv󲊙\u0001𨙲lwaI_.\u00136q[􌌮6\u0016!5\u001b\"\u001dj\u0006>󽉨^sW􈻵􌺨\u001f\\􃋷4\u0019\u0019S*G􈄪\u0010h` w\u0011BIW\u0006\u0001􂜐;80󼼌",
     "old_password": ";𖭥ﵒk{\u0019\u0017𬭒'\u0006`{2䇂\u0017\u00117\u0008\u0007Q}P%O!_^d Tf\u0002𫛧sQDd\u0011?}\u0008\u0015ﴡ!7T𬉤L\u0005砗\u0002\u0013\u001d\u0007\u001f󶷲\u00121EEV(x'\u0011\u001a􃈟\t\u001d\ri􌭩4*􂵨Fs<3\u001c>}Y:\u0012)8+4+\u0002󰣨󷈐𠴅\u000bl\u0000$\u000b]rZ~Dy󿈊MF\u0018lw󳆮x􆹯-I*bE􄌢A𮍺5쎉c:R^f\\G)꾠9\u0014$|\u0002\"y󹋹骴AW =佢􊣥1􎪊'􀨞x颾6U_󳟘\u0005욹<􄒵*\u0005󻗰z𭝑U\u0011:4a𤊭纵@𡌩𫒫5p􏌴\u0015$[\u001f𒅝.󱉵7\u0000_󱜶8\u0003\r\u0008g+'R󺶚󻔣~E\rP󼥗\r𬎷뗐S\\&.^L􍥇L\u0007𣏭G:Wiws\u0015Qc\r𨐥\u0008𢠱;󴄐|Q寽4󽂁𑲫y玶\u000c_&fGgH[󻗴u􀶥嶂$\u0006\u0002}M2y𘚑Z&𮋾\u000c􏌕nzK&􄐠w\n\u0000!-U\u0001\u001b7\u00036󺮎so$󱾣\t𡳗\u0011A泂M1\u0013\u000e3.Q[Uy󵳏e󵠷\u000cl𣬚𩰕W􍰾C\u000fk𑗀p@$+\u0005r5󻙹\nB(X)Y>𤧁%'𬄶H𭪒𠿱s⺡A2MqW/䠒$#I]𡨀8sv싴\u001b􃏸t􍞷sB󱖗5\"\u0007🙽{t宺oJA($\u001e;􄮴:\u000e𘈚📠\u000b𢝨c󲐘\"󽏷𗑎oQ>\u0002yD𭚮󼱏𭜶g@&\u0004𗙹{x0R6󱞣tn⼭x􎂂d}󸌡m\u0014bHo{\u000c\rM𭃅\t𡩙𤃺<\u0015𫱖;dz\u0004C9.\u0018㷜V\u001a;󲒂\u001e꺴Ho\u0012𖹭/􌧽𢣞\u001e\t󸅧c\u0002󹱦󼡽󿥀DavSJ\u0001\u0002k\u0015.\u001c{Z4󼳎0j󷢟{𧚛{𤊑\u0019IW𣃮𣻪_["
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_2.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_2.json
index 977b53f216e..39458e00fe9 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_2.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\u00025{IYj.N􌃖󼤙]}l~\u0017+\u0012XU줎pB𝤎撛\u0006H)V\u0005{}\u0006\u0001󲊽\u000e~YZ󴊴`vCT\u0018Uತ<\u0000\u0017􋹻\u000e\u0001gfBz\u0000槯V+q\n툄 󺓨\u001cG𣤡𭈞~+]A𗰾𑇀N4r3ly$\u0004􉱿Mv󴭠􀥵$\u0018\u0014姸\u0003\u0007\u000ei+L󸉏Q4𘋕c󸸚\u0019>z?'\u0018O\u0001𓂋l2\u000f-nZ\\\u0015𭳚7'VHQ\u0006f𬪅\u001f􈣫H.1\u001f*\u000f谿\u0016w􊇼\u0004R(Z𨠝􈸤t􈿴\u0003V𭅣\u0008\u001ebU>󰻆\u0000\u0010Z)X𡪛堲*n󼲿a\u001e\u000fvZ\u0018\u0006e?eB󳪥󲂕~\u0018(\u001b\u0007󶀝;𝩥q󾨱􅛤{\u0016k\u001dA\u0010@8#sG􋣜O𓏓oKfrR*\u000f)'囶L褏I󻞉;LR󱎻\u0002󠅽𖼐b󼕛󰶾3SJ</󿀊+1\u001e`\u001c*\u0013🪕e\u0001𪱋js󱞬]|%COiv󼝦hbM?\u0000𪼰$[󽋤\u001b𣠌𣷮𡋩󳚲󽦃%􌅗%\u0011𪻗n𪟂怊\nQ􉸲ig9/E=㩾𮨦x7\"l\u0000I󾈑-\u000c𒁾􈾅_􊕼􁈶{K9\u0003r󸳭78\n\u001dM7v󼲡[\n<J\u001fRh.`*􏞼𮯗᧡𞋬\u001fx6[􁌺{\u001a󵠶K󰸍\u000b\u000e󴆿,~\u0000_\u0014\u0005\u0006\u001aREY􄨴\",𣐤!euFjDF\u001c]P𘜶*t\u001b&,)\u0007𩪢Rj0􀒪Ꮤ>|E핲(}<G;`t\u001e\u0013\n\u000b\nM_𧁚^\u001es󷖄󼸲𡭜\u00002󾳳A@/숵\u000e!_\u0018v\u001f)\u0016:uxY0U?P{󷾧\u0003ஷmx𦥪\u001b\u0019Q􀥭pZQ\u001c䔻C\u000f󻮐\u0016f=𤵗쁪𧽒{#d🄓:󳉱\u0003[.\u0014J𗾌9𧊴\u001e\u0005r1\rk;\u0003鬈ibE\u001eDLma\u000b23Z􆇣󶙀󵥃X,/j෧Q0𭠚Gk􀸬ἳ\u0015Q8텼70FQO􉀹S苃\u001dvJ9y\u0016I4&􅅼𒂻臉8_WPsV\u0016\u0012TV\u0000fJ\"󱭃WQQN𫙗𤔨}\u0017\u0016䲻僯o\u0011\u0006\u0005LF𖧵-􍊈!󱢵\u0018a􀛧D􏁛=/\u001c.⻏Nf\u0006\u0005f&􊹰V\nt󲳲\n🡪@A$􅛠;X\u001a󰧀\u0010􉅛0􂙱oz𥯧􁰢r󻘳Urb𡘉\u000e𓁲\u001e蟴*\u0007읩=\u0013\u001ab𡒵ANR\"雴\u0001u-:c\u001c⽋=f>󰢇J+\\ED𭵩𬤞󱆟7*6\u00039V5mm79s\u0008<5𣩞\u0003e􅚜\\=1|>J \u0010\u0011#󼿙𪫅\u0007𝄌\u0014\u0005ᰮA􂋱󲄦\u0017􋫱𦵈=B\u0010\u0008\u0004𘌄mR7\u001d\\_{||o𮯔)􇁨SJA5",
     "old_password": "J6􃨦\\\u0017􇙭󲡮\ru.# ?_\u0014=􃲛E\u0007􁔆-𤧰L􃊝3􀃄`'\u0012I\u000f禰,0K\u0000\\G}];𭫏\u001e𫀮d𡗛􆺆\t󿮒볏.𥈄㯩{𑆳a\u0019{9W􃤃\u000e}'U\u0016B0a\u0001I\u0019:^~\u0011𣩮]\u0003􄳳E\u0005\u0004\u001a\u001d陳-,d􉘠𣶣:󶚝\u00103\nn*4U8\u000c\u000c/𨊱_Jq<姸j𧺬*e0𥒞\u0013v{'^3;\u0004&yY\u0000~璅𗄲ct菪o}󷿛󶆸?Y/<\u0001􆹐iJV$\\\u0018d\u0018?\u0013n}󴛫\t󸔹𢊈􏉰\r\u0019&C\u001c(A!Ke\u0010V]iB𡜧𡞁]𪕂~󳀳9\u0015/sY\u001c5𨕟𢸂3􆜓\u0017X\u0012𖢉\nzeKE\\\u000b3💈\r\u0003\n􏃓Mr:M:\n-#'L𢱇𝤏7eo󾴳!L$#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_20.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_20.json
index dd9ca4426ea..fd205ccc4f8 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_20.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\u001dATD~\u001d\u0019K$󾥿h󲪦PO\rPp6}vL}Q\u000fO?\u000e\u00162!%𢚠𘂘㩵IQ\u0016\u0013T\u0019b\\n.\u0019\u000b6G)j\u0015o*G\u000bn\u0011q\u00104􂆞𮝇\u001cG\u0007􇑗\u0018\u00025\u001f\r\u000e&JH\u000b\u000b\u001d\u000ey\u001cZ􉘤*􁚡C36Z𘟃I󵵏d𨳘𡚍X\u0015}\u000bX㕗\u0017E@󿧚}S\u0011꾷:nS󼗥y󼁳6\u00071\u001eF𥂾;𓏤|\u00150󿢺\u0006-\u0013'􀻔\t\u0011J󻲪\t\u0006􌨒<P󳣑SjS.BI\u001f🌀\u0016`8鷇lV􍭈[E\u0012􋢠\u0015DL𡪌`Q𭴪𘎒@\u0005􈨈CW6󱶢j􌣮\t􃩙𓅽\u0004\u001a!󷸬◤}󲺊8z=F3Hg>&\u0004\u001ffx􇋸󳪐ev\t䐇^p\u001bꆤ=1de]󱚣zK\u0003t𩏧\u0019_𠪡\u000f🔩A\u001d",
     "old_password": "p􈛶\u00058F<􀷍\u001a[𡂛zK𝅘𝅥𝅯\u000b\u000e\u001d>𭶥\u0006􅖎{#󰅝\u0003\r\u0017\n`􂉙\n>\u001c𒌭zg𣘋b󲬔K.\u001cdP禞𮄛\u001a*n\u001bU嫗𬹙𡼛Eꆋo\u0006\u00130ZUGAၶESꛃ衈\u0004t\u0015vy𧞜kL𩊹Z𫪝6桀pU 6\u0017(\"2\u000f\nf\u001b]糛󵃗a𡏣 nO+􅐇*,R\u0016󽞬O}#)%\u001bb;;\u0017ZmE\u000b\u0016⟢\u001eUy<僎6\u0010\u00170%C+Q\u0004\u0010/능z\u0008EGJG\u0006x=\u001d\u0012𐴵[rI\u0017J\u0013\n\u0014\u0000\u001d!2G\u000c\u001cw\r%*L􅠳酫Jv%l\u0011v\u0011UX𫒭Y!􏦀\"\u000b𭫛a\u0016776'8FsDn2\u001dx%!cE𫹪t$𝩤bDC\u0008캼\u0007G`1\u0003F􎷟𘎞?\u001aD*𭋦&\u0004\"T\u001bWFlY`Tof􀆅𗤽 \u000c<TK\"𨣴(\u001d_􎊗􍘅\u0005;\u0004󲨻󲛳\u0014\r\u00141\u0008􁮤e9􍿏󿰨^>\u001b\u0014sS󶴴_a><\u000c󹂏(.Y}%7z\u0012Q\u0000\u0018􀢳v󻆑\u001f\u0013J\u0019\u0011dEh'Em𠠊󴆃\u000fH\u001c𝙫E\u000b􀠝,{<cKS(Z\u0010n\u000f竽\t*?󼀌\u0001\\\u0014\u001d?\u0004y󸎀?5\u001fl􆉂𮙣X􏔆󿲅𐒊#\u0012Si}󵳩뒆\u0001\u0010L4w\u0003󵲞P*ST#|󵦽4􇛝󾸑𗣦IWQR\u00012eUl1𧠐s&;_>𮠺iQ􋷺𨙡k\u001c􏬔3}6#󴽼 𗀇􏡹\n{\u000bY\u0017𑒑󸹁\u000b|~W{󼮗Ό󿗇'\u0010O!\u000e[\u0010Uk嬠)􌽙*􅌞B7#󱛢`󲕈$C\r\u000f􁩹􆨼i𝣾􋥃e{N\u0007\u001f\u0016ᮺ􀏰\u0011\u0016𨑭󵠀^\u001f􆑌􂂘\u001c𬊃^6\u0016WPe\nx󹯥:^\u001a[\u0004~u杜7\u001e 궏\u0012嬠O\u0005}zi􈅓d d𨤸t󳑜\u000ck𩿠r0󿅚씠*󲸲1)$j*<즯󶌤v|F~󹆍\u0015m#^l\u0004𤔚𢁙\u001f\u001dW㲈^j\u0013􇺞\u0007A\\.=3J󲿱>𗛮}.u\u0002󱬮:sk\u001b􎚴E\u0006BR2o)\u0002ᷳS(V\"\n썪dvp󳟩f\u0011\u0013߲\u0006~KH4K𖣼'h􀣤<S\u0003\u00119I󿕒$𭓊2>k󿈽i&\u0007~凅W󼗯{􂙧mp%􊢑H󶶪i\u0010dZ􍢘W\u0015Yb%\u0008XwgAa􈴝/􂼣\u0006\u0014W+h􉺑S~\u0004QzZ~\u000e􋈞E􃏘\t*𘣜v\u0002#\\K<P嬾HnF󶰾@!:c@<󿩛973U\u0003co􇬈󿛟q𦁘M\u00002JUU&󴙣lEu𮕱􃜎5d汫{􍬸𐎲􍸳C\u0006A\u0010>\u001e󿈶𛉃\u0019𤡀O'\u0012!4]\u0012𧲸\u0006\u001b:\u0015>Y|禶\t𤥩\u0000uv􉥛\u0007V\tb\u00027􋕶~#𭀸𨓕ꌎ󼴳\u001f\u0010㖓\u000b􇜽\u0000\u0004􃻒𡍜\u001b`󵞈V?􅈶{x\u000e)\u00124n*󳞺nsI L\u0012\u0018vo\u0019\u0007p_P\tJ-Pk#ui􀉃𧁎b[􄦴Yd𫿾谲ꐝV|쁀q􋽝\r\u0018(yW?#+E\u000e?Y猗索\u0013\u00103Q$\u0007'1􏌤%\r𥣧@W栣-\u0014첒v\u0011󷣭a\r\u001a\u0000󶙢Jz󰍕n󰻐𠧂᛫𧳔O\t\u0005󴁷8\u0010链A\\$ᕂ\n)􂕒t𫢳𨦽CE𧴸rpj \u0014O|}𑩒𤧰&1󷅷)𘊐𡺑𠫱턉"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_3.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_3.json
index a7b1d34230b..a87aaed9ceb 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_3.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\u0006b𐂚.zS\u001e󾯿|@ou6\u000f)^#Nv𪚙\nK (쉇\"+𬁝r𩄺hgU_\u0015>.~ꑛ\u0019\u0013rNA󴾍􃽮O􇬾f𩫖@Mj\u0011\rd6𦜴)<\u0000ZN\u0002\u0004]𨃪%Ki\u0003;􆑼1lkk:Mk󼉕{􈽔Hq􋗡󲂿[󿢰􅊟Y;(<<\u0015Gs *􃹐\u0016Gz+\r_f𧪽\u0019E𫺥\u0001o\u001dA%'+v𣟂:lQ𬷚𝞙󶏰퐽~똵a䢆h\u001e\nEX=*~\u0008青k뢡斜Y,r=\u00012〡9\u001c\u000c𣫆􍀡ꄭ_𫗑~𤰸􌶴rA􂅟JA\\~\t𐚁\u001drIk%3𫬿%\u0004=%㎵􇩻b\u001c􇫐`}\u000f𩀹`@\u0015󽔅\u000c𫲺{󰖫b\u0014𮬟\u001a`\tV\u0003$衁\u0012FH\u00034E🗯􆗑𦃖\u000c SL𫆵{A&\u001c@\u0013q~p78<󻖆t􅰮&&􃻁WT𤏝gn^K󻽼􆋺TK-󼁘t𑃧*B\u0015\u0006}G3W𝌄aj𡌮0谠빤O1\u0004[o>\u00165w\u001d\tEd\u001b.}毒1{'󹶷󶅠a|\u0007m𬒛\u0008uo5$07\tK􌾧*\t\u0008v@F\u0006\u0005rQx\u001e챛\r\u000c䚐󾩊Ꜿ􈋔䃗p,*\u001e\u00106\u001aH_󲰮\u000fi𣥚䋃󴙽\u0000Uq𫁲\\􈂧[j󹑄PN1<w'y2$􉕦\u0017N^𡧠\u0012|\u0018􈕫S󲌛𥒑󺡀\u0003@\r&nw🕼h5Gd􉐬\u000f􃁟𦨻-􇔞\u0011歷\u000c\u0016\u0007􋜐\u0011\u000b7􎒥-F}𮌙\u0015#+\u0013m$\u0013\u000brrj>\u00115+!􄦜.蜁+7mLuRk󽆚)N)dlu.^􎻦\u0004zU󸶾#3􁨫V/\u001a6^\u0010q𥤵j1\n\u0005𣈾\u0010C􋓼𪨾w)\u000f􋕫䕻𥹄\\y0/@_󼿴\\;󾼕U+\":|󶌼L\\",
     "old_password": "􊑏\u0002𠖌\u000f/𬷯|9\\\u0008_􏓙E䢀󺦩鄻O-9\u00161L⭨𥠌SYM6`XP𭙈x􊦁BP\u000fV􋏥􌜞3Dt􀯊 𭐮🏲\u0002󲣥􅸠\\P𬤿\u00065\u000b6\u000fW;𫬙1\nE:[𬢔𗨳a>􄕣䔼rv⽀OvI'-􃠼𨯤\u0003\u000e\u000eu{󴆊𨎲\"_󰚯~_u󹽗L\u001e?󼈯L𗱣m󷓕\u0008𮑣H\u0013್Zd8\u0018𪙝j\u0002\u0002U\u0008􂞻\u0004飶a(\u001b\u0015\"\u0017c_?95󿼈\r\u0016pa\u0015\u0008\u000f!\u0010;\u001dI\u0008@儓D􂡈 \u0010}f󺝐󱣑*\\\u0010\u0014l4sG#{𪵲O~3!n􅘦󿞼`X>n\r%\u000bR%ピ\u001d\u000e\u0008 \u0015J\u001ce6y:)T!𨀗䪡(p\u0002\u0003S󼸂g.v7\u0004U\\\u001b{9󻔰7􋬽𬢂 ⲥ`3\u000b'󶵂ᡡH\u001a𐢁`􍏺\u000f\u0005輿XSLᑀ𒎇i6*H[`bk𭳲DB|􈗰tF\u0002􋜮鴨帤W$\u0016|AjF\u0016􂽚\u0003󴯆𤷻s)$.U++'\n\u0013C􊰺.k\u001bgAo?,􌊮\u001a(sBt󲱶X좕C!􇟉<󴸁)5𣾞[懩\u001e󲥶󱜕~(8:􌔚𗃿𐠿M\u0015\u0002Fs\\𧯆u|<j\u0013\u0019𠸣\u0017|D^x.巭\u000b\u000ea􂈈Q􄓽E𪦃_c\u0003uf󿹑󱟉𡺲FB4㒍\u0003\tb\u0017N\u001fR;𮯙K\u0003eQ\u0014\u001b\u0016\u0014u\u0005@i󹭣)𧲹R𤳤sZ~󳉀𢞀𥁲ip㸣󰿾􌄄<\u0006𧥠]𧑟\u0001𧤢􎗖'\u0005糂~􀃒!1<g5域󽦿􋴕\u0017V\u0015Dhp9\u0011O\"fZ\u0018?@P尹Z\u0012󸗛\u000e給~HjCw~w􋧜\n\u0002􎮩iZ\u0000\u0018/v㝽Ur󴡑\u0006􏗍\\𡶪\u0005\u0004r\n췂Asv:x􆏽K/S\u0000U󽴩􋩉_􌕒k𩎥r`핂{>~\u00122@D鮷?L\u0001\u0004\u0018𓆬_𗑱+\u0008󿲲)f\u0013𣻴r\u0016+=8䙆+𠆘k\n󵑌kv\u0005%zD􉙛Q\u0004<\u0014U\u0004𘁀$\u0018w<+𞤭*𩼜/\u0007z[q[\u0010\u0006𠕳d\u0008v\u0011\u0011{Q]𥽏\n\rokp\u0018\u0010𬊧\u0004Nn𣼵.!𐀄z&|󰎠W𨐻󸁃뤮\r%B\u00000󱩤jn\u0004g1󻩋U|􄿉.Z𤂟-\u0010UdT\u0001P\u0005r:󲜡@J𪃨r+奼f𮕣󶒳ㄕ􂪃?!rR𭄏􂫔d󶫜𥡑􉞪\u0017ms𦟶SQ\u000e󷜾𦾆\"S8aV\t\u0003𑀊\u0000󸭔\u001dj>0!f􀄒𪇋d<􊎫c-!+\u000b𦙃\u001fB\u00180u\u000c􎴩@n\u001f=\u0004&;\u001c􋇯𤁩Sc1\tkL\u000c\u0017.V.m􍌵NZ󺑚𩰭=⚬w\u000f=p)󰂜𛀣\n*\u0004ႨS𢱷c`h􃿉\u0018\u0011}U䀜\u001e(.\u0003BQ\u001e\u000f|2\u0012\t楣J􂦖\t\n:1􆹘\u0014乧\\?AkiJ&\u0007x^0\t\u001e󶇒𣠹'\u000bEB*\n𠢏C;EZh*􋩟\u000b𩿧27nR󻢯'7􄫬\u0017V􋮌\u000fC懋\u0000\u0006cl󷽸a\u0012􁠡_X3􉘼3𪬾mvT&\u000b`r>󶑶_.炁o*\u001fR@!gᏈo6'~⯳􁩁Rv𗝗"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_4.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_4.json
index 60adb91bd79..e89a7428c23 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_4.json
@@ -1,4 +1,4 @@
 {
     "new_password": "=:kk󸱥8-\\HYms@'?v\u001b𠡎𣽵\t󶑷.\u000b󼕋R􂾛\u0011Z1𗚷\u0018SmD𣈼󺈴\u0005\u001c\"Z󻪩@n?zS𝐙\u0010󱘽bz𮑢􈐭\u0016Sv1(𠗻\rQ\u0019\u000c𤘜'.9\u000f^|v`\u0007󽷪+\u0010lBv \u001e岶觩􎸽\u0012\u0008Jm􉄅􋙀?_rXd󸼧T𡡌\u0002𤅂VK0𠴊H?.H3H|􊂄5󹏠\u001etKw1k󿥜e$A󿠻𐕈􎈴w埲\u0007RYT󿼓T{|!􆳪업;*􏙭𩖆󶗛􌫠6B^辇Hbz\u0010K.w\u0002]m􍹲ྐ`3@󼮮/𛲈Y#󿹵{X𒒃?^aYz)\u0002:$𤓄\nd:\"Q\u001c1􈨳\u0014}s*}%^CWY\u00015w<\u0000laﺲ󷴬\u0002a1􆉛L]\u001d\u0017V8\u001a𠫌󶵢rS𥕒􎷰}\u0016l}󸤩p?Yi􏗣7v}reh󲞜w\u0013\u0011k\u001f`)\u000c𬑓bSd𭇘A6hx󸤞#n<~V-󰾯h𣁪LT퉦q\u000c7\u0016\\92𡡻\u0005\r\u0018U􅠨%lYedK\u000bGHs?rN𫗿9𘘌츱FV囸🁤𥪝`.Xv,􉃩4\r*𮬇𡉤𥏗6/\u0004;V󿉬.Z\u0013􆋁\u0016%\u0017TVv\u0006ᑹ40c\u0002\\:_T샇0D=𡹗\u001bg\u000e2䉇\u001e0󶙓b\n\u000fe\u0000]=Ir\\[,;\u0005􎻻E]\u00083􂄛𘧉c\u0000ya􃝌\u0015/t\u001f\rS 􀺭QQYH쾩㯘\u00046󿓅pY-\u00044ᷪL󽪴𦁒kB𪌔\u0019$,8𝟨[􉜙DGgn@\u0006䆎+@𩛶[\teJf$G/B⋵\\&k)bT<􆗧iE2h`𮖢&p2\u0013r4g*󽺋M\u001a󼟚.㪁房󲭿􇸣\r𦏐6V𨀑?ZᲰ(\u0001F(z􉅌\u0019@r.󾔳\u0019Bi_󹵮!I\u0010j􅍿\u0000Hy?\u0016󺍋R􃌟J4kQ\u0014\u0016`1\u0001Nnp𨻫\u0017赜\u00066p[.q\u0010ZBF\\\u0008\u0000|\u000c,󱞕𧕟𤪔z1𭱴M\u0014!󾋎\u0011󼟣c~􉇓\u0013􈾯V󺌶\u001aJ/#'U4t𝅸􌽅\u0003W]\u0019󴹻V\u001c},󸨔z淋nOj<%7\u000fk^\u0003iZ^*Fz\u0002\\g.\np\u00104o\u0015\u0011,􀁂4L\u0004\u0013]𔑦[\u0013y􏖟\u001e\u00170L\u001f;\\𧔻󽡷𨞱VOG𗭮 R/􄱴𡖽J󶍔\u000ei籋Qm9\u0013P𫡱􃟛m;芩𤿸􏡥g%𝄅\u0003\u0001♙U\u00179M𐪚\u0004ヲ3:1⋩s\u0017\t􆊇𧇓󷝮𘎕Ycje\u001f󹖙\u0008C:<m𬱦 Bc􈷛H㼷𖨑y𢌩oL𧯎𭡊\u0014ey\u001d󸙼o\u0015R4\u0001d𖡆d󶑨r󳾔󶭑+5}[󳤣􎮼\n􄹜L\u001ac󳛒􆎿􌙳Dw\u001d\u0012)C\u001f\u0015\u001c{.\\𫄰􄷘Ep;p枝,󴟸􈶕\u0016\u0002[m眔\u0016\u0010𭐨󴣵s鍄J􎄛5cZ􀋣}\"\"OuL𦎄|𨚄𑆑䈬HmDlK\u0018\u0003eS𫨐Dv2/vH󻇧=n'\n􎫶\u0000􇋾)WXd迃\u0015Lﲞ􋏒#󶉀-􀞻𝢴M5󸿾+`\u0019􃓿k廃\u0017]2󾝣𥰆}󴱯\"󲔀)黗'\u0011\u001fbZM𘦚\nJP􏝣e0q␌\u001c)tB\u0003]xq\u0014 \u0010j3Bm􄙙/9떑🐩f􈚔[6󺶏.􃮾\u00141r5*&𪀓21|-𫏹𗻋mx|5k%󾹝}矠)Zx<􂊴\tz%*LP􏃄|C",
     "old_password": "󵜂~=N\u000f\u0001\u0007 alq\u0005\u001bj𨂎U𠪶*f\"𑲫\u000f󷴊􅰼첹𫘋M@0\\􂾅s\u0008𠍊4\u0015{\u0004𞡎\u001b7󾡚\n\u0013\u0006ꋭ\u0018&\u001e󰙎\u0012󽰓\u001d\u0015bHZNbM,콌\u0004\u0001􉋱Qw>56\u0015F\"Q6\u001fp0\u0006_􅩁如\u001d+􏲱󼚙1XL􂎜\r\u0008,l􊒘UrQ3) \u0010󹆙I{\u0005𩆮\u000b&\u0002𬦼k􇊇zs􌚡 𝝲G(gf􂷑O鞒\n􁕡􄉱j>|Kg{.V𨀜\u0005L𠊭[􋯃@;=zg𠴤𬷲𦥋biF𠗑6ZPA\n𡁖\t󼄣\u00150\u0018\u000e\u0001aE􂲥\u0004}Ys )\u00025𪈔\u0001󺛰􂕎􂒽Tx#\r\u0008\u0011Lc5#󼯜Y􊿕/B-Sv𦷀𧖸\n󻹇S驮\u000c\r-𨱚Gq:;𩈝4T𗫞󠁌,ST\u001c􇩿&c\u0017@<C􀣀>+𬋩\u0011\u0000d𩀿𢻄\u0018P󹙮󱏞󹐗􎥌z\u0006U\u001a?UV𤎓p5𧝒D\u000c\u001fo𨙺#x#_􁛦󲄅H􁓘􌴹$m􎥵,$󻆥(Ց\u0019\u001cr{(\u0012軼:Hr02Z\u0018j\u0004_C\u001e\u000ft𣅣{(-\u000c𬼦2q\r\r𦄉Z󾤦Ko\t\u0005Y􍾢}\u00077h鶫39\u0011鴱}1P L\nj\u001d𞋥'𗀭Q􋉨%n𣊒\"$R'S=W\u0004\nr\u000b%O_𭵢Pz(&v\t8V!𤫉O􉧳􎳙G𝕿'~qᤡb;\u0008腧6ᭂXNr\u0005~K\u0011𭀿O\u0002ꢀ𭡑q,~A\u0002󳀿f=JwT\u000c-Z0\u0011\u0002J𡄘\u0016)\t滑󱤗oI`'s\u0007G.ggB\u001a􊀐sᮂIv󳉐f\u0014.NGl𨽭\u001a6\u001b\u000efJpG2\u001b𥃰J𨞌􂶋\u001e9𨉜@pMICAP\u0007\u0002*_ꉽ^e(M\u0004\u0007\u001duYl󺷉\\*\u0017󴐧GSnZO𭂹\u0007𤼹D<v'WA󠀤sD3\u0003]^\u0019\u0015em>o𭓣S,\n\u0003[󺁽㋂%󿼏𦮰\u0008$fmJYdZSTOY󶺽󴔍嗶K-~n𘫫Us<꘡r\u0001{󴡐}󼰐𣆖-\u000f𮨟0矨􄢁􌳆y袴3󷆘,d\t{􂷧󹽍H\u0004V.\u0018u􉤦A𓌤r"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_5.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_5.json
index 7914426e9a6..55f17c0668e 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_5.json
@@ -1,4 +1,4 @@
 {
     "new_password": "连􃾛􉷕ZkYFN󹤅\u0015s𗬈\\WB/p됎lWY`U䫢𤕢󺾯\u0002y\nQ􄗠􆌮U\u001d젼]|󶚊_F\n\u001b\u00193Zox{-귴𨜓L𨆎𐠔4\u001b>\u0007\u0004󽹴W죭c\u000e􄁮*av𗿑'𩬅 ;c󳊬.𠋐~ዦ𬥧􁳏a𠾶I\u0006􀾍\u000c{􅯽1毊Jd􃤛|ὅ\u0001󺊓\u0019\u001b8𝗗󰼽,HPp໊\u0003=𡁑\u0001D.\u0014\u001dwi󾄇\u0018\u0001;󹖦!|^\u0011\u0003\u0006􃨞~y<8󶷒=|𠯿q\u000c\u001cE𤥜\u0008nT搯I\u0015\u0002YB􏘏􊧱Gp)􂑈\u0002j\u0004Bi󷷸𑨧􍽄\u000bzO\u0004)󹜦IRz󼽭Ty[\u000etj󲳖q\u001b\u0011\u0005A𓌳`󼎴\u001a􉑆𝆟pUM𒄰U5\u000eE>i\u0014󺢖H\r\u000c\u0007\u0003\u0016\u0019#\u00020m[\u0014Y\u0003\nY󾊝󼈋2xROJP_􅎮\r[𢋚o󽤁󹧧-\u0018\u001c􁒴𧩳\u001dI􏾥􌡩\u0012\u0005=\u0011]㝐𫧜ee\u00003𨛒CA$􋮠>,Sc\"\u00124$𘂜\u001f􍨇|𤎐vh\u0019\u0008􏂞\u0001젾EC[7Kh\n棾󽌱qWk𢹓\u0000Q7i~gM\u001ep\r^\nJy-[ꏜ\u000b􉪞!𨄘4\u0014ꆚ􈛧􌪕󺸧gln%\r7q2Ῠ\u0012!\u0019\u0015𪲿Tl6􅬞\u0002钘+<m~T2#\u0014𬓺0OU'2Tꏠ𫜛\u0003 䵛<WBg\u001ai󶢘🙓𩱬l*\u0010'!\r􂦻.숙L)H𑵣\u0005镰\u0000\rm\u0015J\u0006Iw\u0006\u000f\u0005\u0003𮅀[c\r\u0007v0󺫑}\u0002#B柩𮫠𫜎穦'@;󹽇\u0013~\u0018\u0004@汆!.;t𣐉<ꢇa\u000eV-<0W-gyA\u0012􃪏a`M\u0015\u001584mo\u0012\u001e􅅒x󸁒􆸝VS3D4b\u0006\u001fw\u0002MO\u0004t𭯆g43短%꿃#\nuo6\u0013^p\u0001OE󵂷gS^a𒈆\u0006𤯮󰷾윃&hn像@b\n\nK\n\u000eb[\u001b}􈃙󠅪𓐟S5DBxr1󶘗\u0016􊫟M𩈽Uf\u0012R\t􈼏MpA4^\u001bB/\u000emu􇡖]篏馝领H􈲃\u000cT\u0004󴆃.󾉟\u000eAFDU\n1\u0005|?BW_𠢿\u001e\u00101\u0018𞄆b􅨊q𣥿鄬z󳄢\u001bZ\na𩽭5􂚂|\"\u0012𑋇\u001a$􋩐\"q􈘸)f%+m􀓅*=\u0013Z늍|\u0007󹰨d＜𡝡0觪𤛘4Ms𢩶𪈏@!6ddfxWEXN\u0012sP{\u000f󲨮:󻜫\u000f𥴏􊂊\\\u0019r鿇,iO\r5,螥\u0005;\u001f;7o/􃨕[!\u0011=\u0003`𝚤󺺉⨡~􍿌ᑧMa|\u001a󾣲Q\rYvk\\𘑐𣘐󸌊8x.W]\u0013S𪪨\u00120􋭨󽮖\u0012)濪\u001dk􊑮\u0013\n󺸃f𬡴+\u001e𦷠󷜯\u0001.U𝘝𒅘\u000f\u0014\u000e𡣠𫑱\u000f5e􃉊`M4Z뷭1\\&rv1|a𤦆-8{􋍃􍒢􂡈𥬡\tB4E􂓒𪛄s?\u000b(􆗒}R0l\u0012󵷱􌩢<N𧶇􀍘\u000fux􅨡ਫv􋠳$xe䎛6Sဘ󲙙𦦏a󿭀絤􃶀eqz\u0012{ry(\u0001ⅴ9;]㐑􋲂 ꗨ󻜌\u001a􂬘%􎗘\u0014󴱿z󽀋\u000c\u0001\u0001y𭤛9z𠮁􇓇􀸇t\u0000\t𤵿u󷢡\u0006!땲%\u0012u􋧬K\u00014M\u0016\t\u0010s\\􊩝9🏒\u0019.",
     "old_password": "H𔗩fK𞢗\u0001\nKPF+Y]1y_獍𡚿𥴨\u000e󱞪*𢊑=V𗁞j nmB\u000f\u000eXX E\u0001;.B\u0006Rr\ng\u001eU\u0019Q\u001e;2𢗨)🖁 \u0005􆭉𗺸e􃭎@3u靊|0y\u0010E燡􀕄󻦍4s𦻕q0K𬆯\u0007\u0010\u000cYx𦽵\u0012\u0006𪠟㐞躢㒂;󱋂6󿂼A\u0016\r𬉵\u000b!z󸏗𨴟~C\u00052\u0006Wc3UoG嶾\u0013K𫴫𦋲4ir􄌣󷏄&똸表/E#]+􍙟oZ􎒶\u000fUL呀\\S壸y󿊊_lUBMG#\u0015\u000eod􌭋&`󳅸b|iV\r􋖮9>S\u0019\u0013\u0019􇱉0;Y󵮈unM#\u0005s3(󷌂\u0017\u001a$􎭞\u001a\u000e\u001b󶺍9xk#\"􎑪o𥍻`leDo?\u0004𨨛'𫡲<BE𛁓05C7j𫚕:X𫏮J􉬒熋朣3C𦕱\u000c\u001dJRW\u0016\u000c\u001c􊍦/<?\u0011𦛖󽓒\u0012\\{\u000b6i\u000e𨑁-Y,[u󺕚:V󵜳嶘\tlj4b𣺢\u0017v𝘅-%Zd9\u0000'kp*\u00072𤎇@\u0005>􈥷KWa\u000f󰇡5N􃠟\u0003*􅌱E𗖓슑B0~\rG𣵋Pkj𠶀C󲴅􏥙\u001c𓂪\u0010\u0010􈙽G􇞭q􇐈\u000e)\u000e`󾿞\r,\u001d;𢣕㖽\u001fO5𭇕󺊢􁄪a\u001a5G\u000bN)􃍥\u000fi\u0004􁇗`𬏡\u001e]VL\u0008󷗊0<Qi槉P-𣝸􂻓\"䵦󷍖4XIh\u001c`\\tW)\u0014ER􆹊#e2}p𨪊𐢘\u0017󳗣\n𥔯􏶖(\u0015S:lO0C㣬7\"bKJ𦓅\u0011🂮􌶓e􋿆k\u0016𤒐v 4咹Z\u0018𤭋M^`\u000c𑇞\u0003\u0019[v󿔐\u0013\u0002K\u0005(􂂘\u0006􄉴䤬𐫵:_𩉱|\u0008􌕝쀗Jr󿶯󻟊sI~el㭶KO~L/\u001cT셲1\u0016🚃𡴚@ThB'J}N!\u0012\u0019\u001d_৪J.\u0002E\u001fLA;9옵;􈧱x)𥿺𒐪d󰻤󶩩󰥱\u0017𩋵\n퐁􉶤𢾙\u0005\u001dx􆃵%:\u0019뛦􆜔o`w\u000c\u000fi\u001bJe󽌞􁂜􏁣<<􄺦 \u0013墁(FY󴣫\n\tL⸹\u0018\u0013󻼂<𪖷\n􈥡𪛕\u0011㈇0\u0006NF_v𦜣󵙜󴵌\u0012\u001b0\u000f\u001d\u001f+󴦧3󵦭y0􉿧􌉿􌛉\u0013\u0001􎽧\\A\u001b=**􇥎%_8\n󳕥\u0013𧅘\u0003(S𩩞󽣀Dc\u0016\u001ak􀄍l悔v􈳞\u001a\u0016\r\"T\\𫤯m\u0004𣏊𠮵\ru𬢥Q8𧤈\u0004􁷫󷏩\u001bA\u0012\\'V2VHY\n\u001c\u0002𣑐ၳ\u001e(p󷗩𭺾'󲻲I\u000b砆FO󻫀FY-@l#\"\u001ab㚺󳄿\n\u0014\"􄺵MO\u0006YfFW𠪚!$?\u0013"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_6.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_6.json
index ff0be846a91..eaf4a437b46 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_6.json
@@ -1,4 +1,4 @@
 {
     "new_password": "𠋈𡴒𦣋#Jk\r􎉩K\u0014RP~\u001b𤳛􋁗\u0000_􅒭F\u0004*a\u001e3we+u𧿞\u0016[𬭐BlK\n\u001cF\u0013\u000f󻰡쪻􊖸󵵤y\u0008;𔖮$=\u0004$𘦣\tJvs𥿧2H􋶭<3쇠䧎7&L'W𩜏9􌪯󸆱\u0013\u00191󳲜V\u0013Spzv\rZ𗽹M\rgd\r}󸜷ᤢ",
     "old_password": "牬|𭂆\u0013o𩥗`y-偵7}1z󼠼\u0000𤩀O𭷱W󳴓󹮟ꎛ\u0007꓄\u0001\u0016𒊺J~\u0018\u0003f:\u0001-l?6\u00137󺸘𧥾Ix􍴔W%}&pm𮡫xb+\u000b~㾵𬉖􉣋2h\u0006L􅊹􏪼I\u0011k\u0015H𬇰f!\tur\u001b󶫠,fTv%𐂃𬬛󲤤,y\u0012ᝲ!$X󰕊\u000fo\u0017⠽\u0018\u001bWp\u0015\u0012l\u0008Z>mo`VuL!\n7<*\\𦝶>𐧇ﲰ\u001e\u0018鄍\u0005#\u0011zi(3OU\u001b\u0015\u001b%𡫚􀏰[8.G􏖣-E􏂲􈭟􂡌\u000b􃷌􃘨9M𘕡v\u0016l=\u001f㯏󿩳&􁎡\u001b\u0001󿩊􅭍𪈗$H\n1Y졺\u0018Lg먉\u0003(;\u001dlZP|E\u0006-8\u001d~\u0005\u000b𮗃􎖢zv\u0008Q\u001fbkv𗊼*S\u0010s􆩁B`]󿜔\u000e켆I:０D𨿩\r醺𬣌P-wN𪘼\u001e\u0008D4WD?\u000e􏻟󹳤𤞵\u000cI6,6h\u0008󵒧nP9!G殺-\u0010.\u0016F[𧑭%Q􋼺^\u0002H𦣕}\u000b\u001f:hx{󽢅+􊔚|󷩳M\\;G烆􌿗붒\u0019\u000e𧫇zq\r%\u0016CUS!+%{🍶'w󳓿q􍤠^!XSCAa[N'Vm\u0011\u0014~𮗜P+w𨋄ᙌ#LI-k𝂿V!𝧤􏰒md:\u001a\t\u001c4󵎑z􇍀Zg:^\u0000󳀰Qs𭅄o􋛚\u0001𦰃\u0004󹘫lPb\nBT@}ৱ'&e\u0000􄏕,X0𡀹c\tu\u0018|`4󹂉t*wK\u0013\u000c损RD\u0008\u0016GZ󵰯g0F^n\u000c􍸰R>f􌩹􌰗\\;`\u001aoh9\u0006\u0013􅬷K\u000bⷊ\"􂾀𘎰\u001d󾀦‬h辞嵘+T{캏󶏿\u0017󰾼6\u0014󳯻99\u000e􌇕􌂔\u0002R􊓿\u0019Qb𨓽a|c𤵸~\u001c\u0000𠛝\u0013㪠V\u00107K𨲣\u00116=E\u0003\u000cTv󼤀<;\rLEGuZY𝀷iNm\u0016J\rI𮠊2􋖊lI\u0005\u001d󼡯凉\u0002aPo\u001c=8DtkQe\u000e𤅦0vQm𥛝􅬧x🖑𨃕󶇣$o-(t\u0012z\"AQ󹉟e;\u000f𑇬C\u0017H爒#􆘡nCh'#􋆓'􃷺詺Nx5=鈟𫝎𗉖숊\\Y謾Bec􋛮􀥽\u0011r|*\u0019镣}.A~􇞎󾛟\u0017\u000f{Pt󷁢\u001bS8𧄠\u001b塣\u000f𥤆h󳲎dZLu Aᲃ𤜡+jcש<^𦛎\u0014:􈧻\u000c󻵋]\u0008l󼿠😈雺d􂃍\u0012v󾼼󱄃r\u001b#R󹫷Xr槉儘R|f􊧺?󷢫+\u0006􎝌M\u0018󹁪;\u001fJ\u0014󷑋󻄿>􁒝\u0002j_)cWt B䧸f󷍷p-\u000bJ8쩘m7𨿲R\u0000𩲧􂌚\u0002k󹂰(9\u0013%x虿\u0012}(dMC1<k|\u0007B>\u001b["
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_7.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_7.json
index 564e37bccee..a59c7a3bbc4 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_7.json
@@ -1,4 +1,4 @@
 {
     "new_password": "_90󸖺=𪱎\\eIq\u0019犇@\u001f\u001b\u001fr\u001d{\u0008q\u0016X{k󳵭􏸢#>\u000b🄇\\L4z^뫃+N􏵕\u0002?9C!^􅽅𦂋􀩫f\n𮒛\u0010\u0007\u0005󸿶웰&\rJw\u0018ZE𫟕jc\u0017b%염vaⲎ<\u001f*𓂁9?P\u000c",
     "old_password": "o城􋾥\u0015􋳽q;鴱𓃬@G7os\u0006&\u0000\rb􃻌\r!\u000b\u0019h\u000ff󶣸\u001c􏐭󲹞/m􋢬zr呿70p\u001bxcNP;>ah󽣅<o\u001f𓄇j%c%eAt𤜑}2\u0001y\u001fJ𩐹0>􉱖?s\u0012𧔼+l=\u0016tKk􏬓\u0015<%Wy\u0012\rdO\"wl\r􆋕&P[ x\u00044􅜾𗀵k𛃅\u0004O२CJ\u001ch\u0018,j\u001c􀬛8𣥹\u0019DM=?󾺋rN'uaGQD\u0013c\u0011\u0016썦\u0016\u000f𮫗嬁_\u000c\u000c}(lT󴝷-<e\u000fk\u0011𠄙\u000e\u0011󹄲\u000c;}𬯪d~𣐞煉e\\)70\u0000A$]GgG󽲌\n󻲞 \u0019\u0001Uv퍭u\u001d⮻Be\u001d8i􋮾\u001b􈮲`\u0006𘚗𓀖󿀇\t𦄶󳬙.%\tc\u0006O넗B𣎐hKh\u001aZ\u0018pL\u001bm\u000c&\u0005𐭫/\u0007E𝕢\u001a@\u001e*H\u0003Yi瘰x]󼉵F󶋁*\u0015􋷧uT\u0001?U(ob􇒲􇈑􌼧󹞔\u0005􋡈r`󱖦#󺟉$\u0006ER\u001cFY􆖮52ImCLS垘/P>􍌙􁥳an\u0003\",S#𬧵\u0003hx\u0003\"S甅𠣁결$Gpk𡆕𒉍澩]Dx\u000eVr]􎂪㯢\u0019t][𮤔e#B ;#\u001ewWZ`'-K󻰞􇩛𤧢'G:I<\u001bgN79G5􆷚𠶘󴢔4k𫨡Z\u0005\u0012A(@ScQ󽈋\u001eS.􈨖?&54N/S𧦮􈹃74w𩴳𫈶箏𠏶\u000c0l\u000bn󾒚22.󳃾𧪇𫡼\u0010\u0018\u001d?!\u000f丈usZ8sJD󸆟A]ExUW䙜tdEm𧄅{7\u0008{\u0017<.𭱻曵󹰖!<\\\u001bGPS%b􌾄㔂\u0004_X6\\a~u.E,𣝰𤻮B,􏁴𫤎!𣬝}jw􋎋wAOIN𒑣suE󶽾LH왵􆟧.8g,4\u0008󲭏𦫿A\u0002O\u0018YgM_<𠰆`2tᗘ/𬽂\u001b󺛐\u0007\u0004@\t\n6\u0016􀯣𥗔\u001f愝\u0015qOwDI;𦳗\u0002𢭓T𥡶\u0004#EZVVq\nj*w􌙇*\u000f@[5󶯂\n\u0014\\1\u0014[\u0018}\u0000BUTcW\u0010;-D-\u001d[\u00048o/枓\u0008\u001cU\u0014}\\𢋾~\u0001.%r慒臫\u001b=aoY𝣟z𡁽𬅕t:䡖NUy󰻃o\u000b%󻳠\u0004_􁽵󱼐Vv𗣮􆀴>%E@H\t𩲖*􁭣W𠅽U#p\u0006:󴣤{?.Dv'\u001f4VZR𢗒𡲇㨑\u0006=󶦚\u0007?\u0013\u0011􍭉F􋈧%\u0000⭍\u0000𝑜윈􊢖􋱔Z𠄗􅤭K\u0002$H\u0008戹\u0016𡦎}Uu>􂦸QJ}􊭽c󵦉f?􌊱dP\u001b􏨚eA\u000c3q\u0004\u0013􉆋\u001aP$\\󾴋𤉎x\u0019$J^ I[\u0006gl@k9㞳oq8f%\"J􂈥𑿙󾘉t\u000e\u000ci\u0000'tD38k\u001b*z\u000b\u0014'铁i2}}K󴐣\u0015 ]=\u001dzA\u000f\u0002\u001d𐃸@5絔\u001eJ'I􃈓\u0005C𠗠k遈Bde𠔨S_]e妧K\u0002h􇶽9w󻺔􇩣\"􆪣x]\u000b\"󵍠󼤽\u0007㚂X+!S𮅱k9Ը\u0002L*Z󲍬E󱎧E𦠭􂢺샧l&M𓋔𐲭􂩍1󺂔𗽬4JY\u000bb󶞴\u0018󷊔Xqx\u0014\u0002\rWஹRRPX\u001d\u001e^m\u0007􈐢\u001f󱵨QD􄐴\u0004AzaVl\u00000[[󳝏󲕐SJ𘝱Io K\u001f\u000f?'.𘟩Zv晳𬯧9?C\\\u001a􁳠5x{"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_8.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_8.json
index ade7efefcc2..070054f5e6f 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_8.json
@@ -1,4 +1,4 @@
 {
     "new_password": "x􈜌\u0003+:􇫜wSH\u0001􍎉N6𬧪a.$󲔛𝞫GK𦴋%𡍫\u0012S󽒧Ym󶔵\u0000_Fe\u001d\n4󱯌馰󶭠9\t\u001bEZ\"\u0007E\u000fO]󿒍􇠗mZv㡷4Ie𨩊iF$\n5\u0019\u0006􆫀􏷯F\u0001G|\u00024g󴷤XHN󱪩?􌕛𪖥3엱𔗙ⶇ􌙳B\u00171\r󷞂Tn[\u0004$&}'}𢠊3_m􆾫WྀPt\u001b􅠶6f􄱿=𬳇:󽈈\u0010/p󵍌:\r􈽪\u00179`􇬁󰞈h󺱁kOs7\u0000(t⣹􄲐,G@C󺇽𭧨𮟷B􏯺\u001a\u0018QjW󶈦~U(󶝋5􎲹佼!􆼫Eϭ&Mj.(\u0013y𥕗𪊝\u00038p)'1ep\n~&{𨿗\u0012*7󱮴𭏜<\u000f􌎚)j-abs\u0018\u001dL拠\u0013Pl쫂2`$bh\u0016_􉌬+>h#􁵥RE\"{n.wh\n都𥨌c􅍂\u001d𩧓􆱥N#I􃛵\nX\n3S0+\tr\u0018鮼\t9󻺃`/󸴟󼿱(N\u0006D5􋩶a5\u0012Tf=}\u0017􎥻_yHue0\n􊴩􌚤H\u0008'􊟿T+:𬱱${􂐓\u001dE0\u001e󾫓ly\u000fobfRk\u0005\u001e𣣓h`\\𗖊\u0000>rV1\u0017fXk=cyaI\u0004\u0003!_\u0018桵xR\u0014󽠇<%􆁙,`TXaz@^\\^s𬇢Y\u0000􈁧𦔹\u0012c\u0004&\n\u0013S꽚\u0000E@㗷0`B\t󽫓N\u0018罩𨲮󴇙蟁B𤜉\u001fp[\u0016𭝅\u0003󾇔<o)󴤥`\u001d:u𝡩M5DO펁MoB'&𫯘6m\u0000H&&z𝘮\u0013\u001d[f]\u000e\u0004 𥑨i\u000c󿵳𘣆\u0005H󱁽Z𐣱􄄭t\u000f烍\u0007s$a#,oguS\u0004o\u0003\u0010 󻜑\u000fA𮪲\\\u0013Ky\u0001BWObo,􊜙󱟐xHm%C\u0007󵾥󶎧\u0008-\u0012\u001e\u000fVI$r)󰃧􃗶?\u000bY~d.󿬿@6󸩍\u0000𠍄b\u001c\u0003󵷒`􋨥T[kU\u001d󶒸~𥚼󶂧\u0003󼘩𤗻bs\u000c􊃦\u001c󽶕Q\u001cg𢕶]Nu_\u0001\u0015\u000b𣰧m/PS𠔫<n䎊K󾯌𝚥+肛",
     "old_password": "𬉒[@\u0004O\u0004r\t0h𥲻􋾓Ls,\u001e𫑦󴜕\u001f툧!𪡦i苾gi㊴Ul\u0012c\"Q!h􇖠\u0017綨j<𣄠\u00168𝢥3z􎼘𢌬‥\u0019L\u0014)L􉎃hE\u001cYD v3:\u0008🄱~\t\u0012|\u0000\u0002>󽚤9캙\u0017%2TZ􂊞󸳴蜣Ba遲5\n\u000c𐐏M'.HktRZK\u001f\u0008󿏪\u001aQfa:NA.(\u0007z𠍤Jviu\u0016t𢤟$5b];W\u001aPM􃧇􃩥𡋋,䌷W2L~_\u0012᧧@DJ;|a\u001b.h􀷙􌓞󼚷p􉤕\u0019^\t1X<15#N󺥫􈭷8G!R𤄺2t;\u0017\u001b􃼟d~\u000b\u0000􍃉\u0014B1T\"􎼖}x;!no\r􎁙\u001et䞞uj\u0019#r.W'}@b)\u0002𧲈i\u0016𨴤Y\u0015 g.xlL􈶺5𭠖𬨶󱱸\th\u00114晁Np\u0005RLe􈋉5k\u0001󳩡􃗍D;KY𮍜A|\u0003&t:7$\u001b\u0015X𫇵&\u0017,S\u000f䦍獦K;\u0018𭄋,RWVP\u001e6C恣\u0007𭳳󲔊𥩪ꎜ\u0008\u0002\u0005X╠$\u0016K"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_provider_9.json b/libs/wire-api/test/golden/testObject_PasswordChange_provider_9.json
index 1ed60dbaebd..57dca4d3901 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_provider_9.json
@@ -1,4 +1,4 @@
 {
     "new_password": "릴𮁟0\u0002\u0001F!v\u0005Ɑ l[\u0016𡪦4R㳝7􈨫rK㰶+\n𡉆􄍴\u001a\u0007fb'|\u001e\"󳀹􊉧\u0014𠚝/\u0001𥣥P荅B=𑴧\u00071󸡅F􀭧k\u0003mF󸕖#𫜊𤓚b𩃍ZG$􏦖dbB\u0001󰎡𑰔\u0004!󳌃7\u000f􄔱{\u0017󺉤\u0011\u0015Sr$o4<𨂅q􂸪\u0000XX\u0011;#%fM[dR\u0019󿅑N𢀈\u001f\u000f􅾫󰢝d\u001e\u001d\u0012EbQ𮫋l󻊱r`Tf𮪨0\u0006HJ󸎚T6X\u0011cypE\u0006y \u0013\u0012揝\u000f7Wv\u000f󿚰Z\u000bY\"\u000b𦈬􎇳󳀻/\u0010+D?\u000c;B𧵴(\u001cyI􂺳Zi􀧫~󲠈XN㋨M\u0010PzB\u001f6靇gj&L_􃇸\u0019j9󸯯V8*Hf`?25𥨽Y\u000e!dS󼓐O'􌟇`\u001d_T󷉸붸\u0015􀷖\u0008 'ss𫹑Ug\u0005\rQ:NVc뙜\u0003𣹡$腝K𗱩]rNq􉴗㞵5g􎢾>i􂵴t@=Io/nm\u0005E{􀪶\u000b𬍞Yk:\u00169o\u0000\u000b䁻 [K%J𗺣\u000cM-􄗅rvqm$^b9mkM󽰪2;\u00032󾫊\u001aU䠝]\u0001D\u001bF\u0013<\u0018u:\u0019𪤵\n\u0010憘𢬩yXK󼜽쯟\u001cA4(K,𩈣\u000e%gE/B1D􎟬\u0012𧝺C\u0016\u0004\u0010\u00189O5De珌seu*9k~B\u001b\u0010-\rT?t@󴉆𤺾;6\u0017$󵂈\u001c󾎛ɽ􉂉󵡳u包{>6\u0011E뺱kO􅡬60𬶻9wk𫏩\u0013𦊛VX󸆏C𢦟\"𦁹N𥣇\u0018T\u000f\u0002􀐕󰦺Rl1Qr哱eC\u001d\u00162z\u001ei𧙗D6s1y􋟤F&󾂅lTt\u0005$p\u001dRi􀅵-\u000fu剷v䱺P􇂵l:IZ𬚳䒞V9e.p\u000b_6)|q󼪖{\u0005甃MXK􁸲ax󴺁_󵧨#0\u001f\r\u0018\"\u0014`O􀔃\u0018<E\u0016󶻒󲷶끜\"󼵥㓟[𤈷K󷈩􆺳-g\u0017\u0005󳮕\u000f\n,_eq\r\\;Q\u001d}ey\u0019!r+𒆣:Z􂚥𢴀-\u001bE\u0001Z𤘬!>~w|f\u0019𞺏Oi󹰧\u000e\u001c?h/('\u0011^颙i𭒭J`a3\u0005\u000b􂵗ⱑg\u0013뮿X熼Ya\"6\r 𠐧Bb􃛠\u0011&㎤\u0019\u0005y8anV7y𠻢T󿰊\u001acn\u001ak𩉞\u001f_a\u0019?􎁠􉱠\u0013I.Z􅁺\u0003\u000frX )!p􄤪Y𬰾07\u001d􉉤?𩝵#m\u0004uZegqUxW{𘠉藆脱辥L\u0004g𥨫󳶥]\u0017\u0007􂩨\u0005z-𗹗𭷐j4\u0006\u0002M\u0002%4\u0004{s",
     "old_password": "\u0018Y􇮡\\\u001d􉐡w𢴎x6隵􅔝YB𪹃\u0018d\u0011H6𭏼3V\u000bJ:􈭵󼾽􅝫2i\u0007RIml荝Y\u000e\u0006𥽸\u000f9󾈻\u0001\u0019􈒻,LK􋛨\u000ca󴅵'󳬨󲂔g8\u0004k=;K7\u0015㸀㜐I9N\u000f+\u00120w\u000b𣨉霔󿬢\u000e)vO. ^'N\u001bⵏ\u0011실i9q\u000c]2\u0008\u0016\t𧡀{h𥹮<\"󱋌<􍿿{\u0005x+􈒵\u0012Q}L$]􈉵F#\u000e=󱽼Y󲄌󺜨#􄼶S𡎁+󶻞+5L󾃳􇞉󹬵ᐌR𠂕AgU☝+KA𧢜矉Zj0􅵿𖼝\u001aJ𦍂6\u0014\u0013R\u001aY􊞡gC\"\\Jz󠁇1y=󾻫L\u0019\u00042􁓿2Cj󶪦u󶗵:-b𦠴 J<p|\u001e~󻎠󶭧6\u0000^\t\u0006􈜯2I8`\u001cY􂘕𦺥lh~䕡f\u0011 \u0002󰟐뭈\u001aO𝗅7𣆲)</􎼮\u0006@wO\u0003h󽨦u󾍃\tZ$u{qg;a󳌫>=;\u0005+$\u0007#󹐦\u0006c<􎌤\u0015\u0006\u0018#ꌍ𐑚\u0012^\u000c􊁔!\u0005\u0006C\u001a+\u0015􅖪f}\u0001>\u0008z𭀯-{錞z🚺𮯍G\u0005\n󽇡O􏫻\u0005Ps}T'q􀏄􂥣+\u001bW9U\u00171m\u0003󾾌􏃨󶹽􆼹\\􅒚}z^f\u000b8pu\u0011Dn@7\u000e𫢢y'\t\u0018X𡷏꽥𛉬Mz􃂆5\\\"🚽>\u0004NZdWO*𫗓\u0013NV􍻣꽪vyM뉼𣟸z\u0018J\u0014\u001e\u001b-FY]`k\u0010\u0010\u001d\u001f4l\u0013(Ot\u00011𦎯\u0011Daok𠉷􁌦u󿰮\u001e=ES?􍹟v𝃭􇁚􎩋􍾲!\u0004ICQ禍𨵈󺳏\u0017u?%􊿨v/럋e!M\u0008LA\u0001N\u0002Wi󷛛𫁜*\u0007U+\u000eAiO-(\nἆm_󷵀khe^:\rQ\u0008ZS?󾵵k\n8eh󰝼\u0017U𣮊k#]\u001b納,\u0003\u0013.3\u000f}矷=8\u0015󹾌o`TI(󲎐-\u0005UR?𥕌\u0010􏀓􎃁?VYfS\u0019\u001a􋚓茑􋯏\u0003C\u001e8j0\tKC𮠝[_&둜􂿒\u000el}:\r\u000f8(x𡄅?8𘄜7)R󰬾Q\u001b\u0006(z\u0001.􎖙2Y\u001f\u0001󼷴||3&\u0013𗀿Q'D{\u0000??\u00037HDW𭃊]`f\u0008PO\u0005x?腗A\u0012|hP@;We褃;􂆿R\u00068\"$!A3.[\u0007g󳛢󸝝.\u0002I􎟌􊁋䮔U󰀈Y󶑍)G\u001eY􎟲\u0013+u/\u0012\u0010$\u0002N\u0010𭑸(>[\u000fH㉃'KOC\u0014P閸.𐃆M\ns\u0003l\u0015j\u0014M󿙘=v\u001f\u001c󼙥=p𦘅s\u0016\u0014T𛰱e\u000fXhO\u000b0\u0016𧁘\u0001>!𧝚\n\u001e󴁽𡊆쁍􀱭.\u0004'(,f8NT+J󵶈O􃒰\u001e𭳠ĵD𥔮<N8J4h􃁗􊔬n􁵽\u000e𐄩\u0001n\u0011y?9\":𫻔An媒|𘋗d#=\u0019􉖔d􂽕\u0006󸹳!b󸄇\u0012rR􄔙4\u0016,ምtjjVd䆟𮬷𢾉\u0004;~:jI𔐶XYnH􎎭𧄰􇆇\u001f1\u0003􋖃+I󰶐𫫴;휨h傗[NqS\rTW\u0002\u0012\u0012RKq#󿓲*󱣲wﰱVK\u000e𗾪H𤲈n\u0004\u0007\u0002rLOi\u001e󳝑𤽟𥫭𦅾\u0000\u0000XkV𠿯-t[􍟱K5A󱶓𪴍v{>\u0008\u0019g\u000b^奖\u0016󺭦\u0006f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_1.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_1.json
index d727868ffe1..efc8fa9efea 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_1.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\u0001f;0B+CKY󾃹W\u0005𫧻𐑹􇟚󽀰f\u0001&𨫳􀟘󹪊􊤍𣧚\tX𮥥\u001chl󹏂^A𥠮=𤻆\u0019_ow?\\h4𥼫𐬤\u0016⹋4O\u0015nJT\u0004r\u0018~\u0006\u0017R'󲏴sX󴤦mlCHvg􏥩ba󵂐R\\󼝬o󱢀􁹎*k\r)H𬂳􀧘\n#㠞~\\9Q|\u000b;\u001fd.􄙔0SHP%󸹆囇'!󾺴N\u001a!Kz@\u0000𒅟􉤛\u001aVp􌥏鞴\u00023#\u0014}}􋉝N𝙺`𩖂7󼽅\u0010𥱥^\u0002{`i:\rUT!\u0013􏚔𥏟\u0015WK\u0000􌋍􍅦eA𢚊\u0003𩿡󼣩t@?󷭺\u0001J􆔶7\u001eg{𓆲5R_\u0013u\u000f𥝛􈑉`}𐔔X\u0011𪱠D懷b𫋄6T𢨐𨳔p*7\n\\'\u000bO#\u001c𪫫(H\u0015n𫪢󷾡}2s𣀩8GA&󵏡\u0018􄱤d⍠\u001a􂤠t @􂀰I/𪻢痰\u00135烙c\u0004󿜉塂Uk\u0016\u0010􌕟8\u001d󼞚𗁬R-x󴇝󶁑󶏺\u0010O,Z\u0003􆌧f*\u000c^>\u0004D\r\u000f_AQPO33𗣃/F\u001e𭍙y𓀞|Fn󶬼E<󿩫9\u0003[y`e𩍈ｺL\u001a@4i/*󷂯􍋍⍮Ih\u000fC1󻴈\t%?kFt\u0006\u0010\u001f\u001dN𩰟\u000c􋆋:\u0007V\u0003j䙞\u0016\u0016𤨷\u0019K􈤚𧥃鸶Uez)􇹨\u001c)8vT;\u001d呭ay\u0003\u000f\u001d{C=\u0019,\u0001\u0003O𧰫\u0003&\u00012%<2s\u000c\u0016\r6ivo{󺿷WN􁓱R󽸖󻟱󳆅𘉋[ :\u001fu𬆺^f􉤮\u0018𡪧𬰥N\u000f𣝶\u0019@pK􇖌9\r@Ze𥐣f\u0012xM痽;j\u0016珥K_~:v&Dpx~_\u0002:b;bv\u0013=㧜6\u001aꄚ\u001by0Ho.B\"u*{󸪴Vw\u001aW𡰗𪞫rbY쬎I{q󾏞\u0005&_Pt𬪎'󠀷5\u000b𤵫谺觻Ue@YM𨌙)\n\u0019\u001dn\u0004Z\u000e\\\u000c`f3T+_\u001e@\u0007\u001e𭤦}",
     "old_password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_10.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_10.json
index d3acc52e8b6..80701bc37eb 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_10.json
@@ -1,4 +1,4 @@
 {
     "new_password": ";\u0002W๊9e󶩩u􁡩;z􍅹.\u0018m\u001d8HiR[􊒡𛰏h皱􌔿P㗚ux\u0004=\u0004@-\u0015U~瞞nm𬗠\u000b\u000f\"87xzsd\t/\u000fABdv\u0016􇦩陴ov\rC=|EJ.I1ZH\r􎽚A𦕟I\u0013h,𤬌𦚜鶗\u0011􌻎\u000fvxV<𘢁\u0018󲔁k79ᤧ7􍷦猋쪐\u0006w(d.\r󰺉tHWFI\u0008ࠏ|c𡿉.ZR\u001b󾰈XOH\u0008􄊃𭋕<o\u001b儮2\u000e\rꜬy𬖬F4󰗅崙J适\u001e=􊻓\u0018+Wg\u0018N\u0015z\u001f?󻃾\u0016F\u001c鄋_:h󹅀󶶊C􎐩$\u0010\u000c\u0004􉄞󶤞MMZ\t𤌂1􌽳r􄆯+b󿀧4Dd(XGEDU𫝭@𭓨(R^/󱀅0y됱eCw\n􃔽𗧝㧸\u0010*酦?􎭠kl1=k勽2",
     "old_password": "^g𨕄𬰝!D􅪴8I\rv4MC%k\\X\u0015@]󱳋\u0004kKg뚓h\u000b-\u0019󵆥d\r\n뛢𨊾\u0011Yf󻼋𘤵SN\t_q蝧󺋰nn,9󴯾𠼦;vL󵠷?\u000bL#󵔆𦹗󵢻Y쁰k𭙲\u0004t횧8\u0016\u001d\u0011W\u0006xK𘜊Dc󻇴k:􉴖\u0014󺃀2D?pHS@i􁭈5\"A!🄙\u0014M+CS\u0004K\u0010?y􌇅𧪾뫺<ꈹy\u001ck\u0016${\r󵙚𮙴/\u0010Y偟\u0008󽷩A&\u0002\u0008󳰐E\u0007󼂫J2𝚪󸭾\u001da+\nL\u0017E\u0015nAd\u0017>\u0005O&\u0008󶶫@:I~-a\u0016k}\u001fE)C\u0010)ts\u0001&🗪f󻶚O)8𔕆e9O\u000b\r \u0008t𭾗\n󷗾돶l\u000fWGb󶎯@􂩕囓u󺢦B󻔻t􎹡Sx4bL\u000c𩲶^:6\u0017\u0004z5x\u001c\u001e_\u001b􍳀\u0013􏔤|(w󻤖\u0005:뉀𑲱k󼾟\u001ewC𭨳E􎃢\u001e\u0015J󾵹)𝕟󹸋a􄺥S\u0010-p𢷍Y8~\u0006\u000c\u0016q\u0016𮪣􃍶Vq\u000eWh\u0019៸\u0004A\"}P^M1 𤮮;\u0005[𔑃𓋮cG]o\u0019):r𭐁􌞳bCeS􋟖E\u0016鬔ꑢ<\u001b糌𔒤𢺋0(`\u0001\rr%Y\u0006+􈐾𢬹\u001eK韂󾡊2ZK\u0019c\u0019\u0015\u001f𐼾졹\tyI~b󰊶4\\t\u0018u􅑹W\u0016콥O\u000fwT/􁞮Q󵞬𦛘0\u0007󾃢a?𗖿\u0015\u000fpZiઋo\u001e}R\u0008m?𡧆}𑅰ꗑ紥\u0006`\u0000\u0017踼zO$\u0018o\tX,gCWQ\u001c𡢽X\u0007iI国􌡨\u000f􁷦"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_11.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_11.json
index c1c4da0eae5..cce181f583a 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_11.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\\2~\tLsG󶪎N𒂥䷐\u000fN\u0008A􈰞𤥌\n𗧓3󵙦%튫F\u0001?2󰠀󾱺H𬾢\tWe(B椇\u001aU\u0005\u000b𮉃\"|턁U󾫁QJ\u001cN􌅣􂂢eN\u0011pc\u001aY)\u0002R,w􄽝q_\u0016\u0003M𫶄\u00175䫨*𬜙\u0007ig2\n-\u0007u",
     "old_password": "𫾾𦖞A\u000b𠧇I\u001aY)𐠚6Ry856􀾧)RX\u0011Ev\u001a\u000fLL㻄1Bd];䲾𭉬.]𗒔th􇰹\tw󹵺x\u000e\u0012󳳓\\\u001a𔒟Xg}\u0013\u0005𭹵\u0017\u0018􇃿I0\u0002\u0012\u001ay$P)𠦿{o9iq5􏓬4𦦺;􂹙A􏒮o\u000bnu2\u0001\u000b𧯳􍃡\u0008\u0000'︭q\u0008bk唒fbc󸊷\u0002]D\u0010\u0010>KC\u000ee\u0005b\u0002twM;􃪢Qb\u0019+C\u0007*󲋷\u000f𐭎#DEv𑊗5p\u0004󸞍~&𖠥ᥢ?\u0013A%4𛉊\"v\u0000g\tmD󲄩?𤒳\u000b\\7\n\n\u001f􀺺EbL\u0015!` 󳐓\u0007]􀛼:𘑜o𘇋󽝁\r\u001f}nre𮟾=\u001e!󺢬\u001e_\n\r^+􏟵𥷪j𣒭h𨅥\u0004ְ􇮸4jpQ\u0017v􂞉6XK\u0010{X𬠠|\u001c瞟c?\u0006W[\u001c)_~,𭸤c𠩶Ihm𐧔\u001d\u0000J\"#\u0008ꁀ0Zh𤆬󷖔F&\u0017J`O𮮔H󠅃&'Ox!4\u001b\u0011󽠌+DgC𗔦d\r'\u001f{􃜈뫎?z\u0012䒷~𗡨𥼙􄵱l㧖r\u0000N6<􁭽𢣉]Hp8􃧡0WrR(扉䴲'gc#_^󳜦粕娦𫶧E$zk\t\u00154g\u00026)󲥛]\u0013𭰥蔾p󷏪C􇑊Z2\u0014M\u001cJ68E錑H6\u0019&𠂲/\u0013ovwm㣝&m𥈀M󺸗F𣪃>\u000c卒\u0000G󲶏l1*bd\u001a.\u0017Wy𥪏yo􈂩 zbzr󼧠聋\u0004󴉂㻹A𠡂\u0008twr(t\u0003\u0000󽟗?9\u0018~j󸮞E𫉁$<si^_>\u0019(&\u0014f#eP\u0019~\u0018CT0i󵻰e󾑿.󹶣u=u1𪔕=\u0015YL"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_12.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_12.json
index 4b056354a80..c3a0906fff3 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_12.json
@@ -1,4 +1,4 @@
 {
     "new_password": "*~\u0019\u000f󼰡𐆄\u0003Si󠄗ua\u0010\u0014\u0001gPRF앷}J\u0001?.训昆S𘎬Wb\u001f{𮫭\u0013PD6z;bU\u000ec𩌤{\u0015C|!𠭼w广_㰡'XFa>Ds󼈒6&𧓦BY􍹦󱆡u/𣴩𭵍\u0000\u0012>A.>󺠐4~􄝬󰉀􄍕旣ꋆn\u0015e4`v#폩𥲬+L\u0007u[𝑖H󵂟^􁁅PIo\u0019/R\u001e\u0013𤵘>\u0007󶺮8}ahwE3󶠛k䫅􋰋屠𠄐\u0001>BwWU#𡂒} \u0008\u0016K󼬹𦞇槧98-󳇛𩀫Y\u0016RkE~MQr.릱\u0007\u0004𘛢FE\u000f2re&eE1\u001a\u00183疽eKHFCl6𭍈;/k\r\u001a\tꂉ@&𦻚 뢙\u000bM\\r\u0016$\u0015鲎n󰊹􌤝u?D>vA𗖈CnF󱞤(𑗇𫅃RhM[\nB>*A\u001agDpp\u0000𡩤󾾾\u0013mQ\u0006􉰎e𨏐r\u0000🨎ൌ\u001d-lk𢗧/󻱡>\u001e\u0017\u0013🖖LFAs𫀸*M􉇅\u0000pt\u0008𘜟JN4QU{Jev\u0004\u0002􎬝E\t𥘡󼑦I4K\\𧺒L )RYPBk ~\u000b\u001en󷡜Xxv6#􏞊|􄬫\u000c𠷿󱉝\u001bY礵z\u0000\u0007c%i< \n,🜺l\u001e󵉆𝇘𗈸󰳈P􀰩V-p\twc\u0018V𭙀;4ꌻ󹄧.\u0008_󼯐)\u0014K\u0019,IX\u00113\u0000󼷣9h\u001f:\u0016\u001781𧉎1遣\u000f\u001eC`𢪎\u000cn\u000c𘞌(𨏢𫽡-\u000f\u0011$g󿤨x\u0011𘌌~𬏚ADm\u0000󼔿黇z󴇯Q[\u0002\u000b𮅞)q\u00114𠶒j\u0011$󽨕𫠡󹌲\u0006i󲼄6by󰳢E5箺􁒦=I\u0017\u001cD@C0`\n􎧊JR𗳨j\u0002󶾚𠓨q9ㄫ􏀕%\u0005\u0011)\u000f 𠢋S\u0004\u0007n?L䖐\u0005i#6:駊󰗐$VZ\u0017.{m􍸅\u0017􋨾\n󻎸yP?CQN\u0012c󸎏漎鎡󹟢󽍳b@<\u001c0T\u001as\u0000:\u0004+\u0015e\u0019v{u谻aS5ztr􋙫T􆸠􄧘􁨚\t𡯗p广!溜𬿃W'/t'󳪊Zf?Kaa cX[\u0010@K\rP\u0010\u000f6F.\\􍲯\u0019$\u0017𭐄󳆐􏑊􁸲{\u0018𠊙\u000eF\"+J3g㡫W|󺐷gsE\u0008\u001e𣫆󾽨eZJ\rN3\u000b\r\\\u001eTp?󿯾l?|􁀍H\u0002I󾕣f𝋤>)𤵎󵑷v󳝃\u0014E\r\u0000:i<\u0017\u0015󼠏\u0001yq𮔿鬖𘏌􅋵`\u0001t\u0012󺳦􈁻 ^I8\u0014\u001a\t럼>\u0010󵿹-𥬵\u001f;&󳑮jK\\%Bg𩯕:\u0007%󻬋QF*0𪗆􎎯HW츍\u0003s󺢴aASݼNbLWp􀪮^{T琄𫯏YL+~\u0012Zv,}􏛂𩀳\t霂v𫆋\u0003M챸,\u0013􏓨~\u001e?_y_\u0014u\u0007瞼\u000fOiiFo􀲁\u0010O\u0013{鱫o󿭁\u0017泿\u00137S'\u0005;|󿣊Eq!􆅐𧄚󵨽It𪻹Z􄍎\u0011h#𡳘ủ'\u0006𩓩ei\u0002s􍢑􃾜sf-󵴸󲕾\u001e8\u0006\u0001\u0018𣭢GJ𢛸\u001dHp\u001d\u0004𭞷z\u0004\tp\u0002\u001c\u001a𗜦:)󻓍ꖼ\u0016\u000fg$𡿉M󷧐\u0014\u00068^\u0015t☙e􊸢󾱺􇡼[\u0015i𐊋Q볝3IV3𩿋\u000b\u0013\u001axDHJ}MT\r\u000e𫸯𣜬\u000c**Zﯛ􂁎]7R<u\u001c\u001d뾧TRqfo!\u0018㽙\u001fj􏉩𘑹|%佇􃂇_𭃄U`%EWlJ\u0001󽉲_𓄟W󱬖\u0014M`f(󲏀\u0011E􊫶_E\n\t󽤎󼢩󴫺tK𧝜\u001a=]y*RuE)0A^_𐢍`󻉠\n􏳁𣢰_p\u0007 \th𭋘v\u0010\u001a\u0007;jy>\u00172Ez\u0012$𫄷󴔘BM'9\u0003Ea\u000f􄍹I􌄰𘂰",
     "old_password": "cA󷡴}1󰽛`⬟gQ(6O𤐵\u0006\u0005𣊔􌂪S\u0008󺫠𭏼􆺝󽝯.tZ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_13.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_13.json
index 34d879c2055..7ce0b18e5f7 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_13.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\tY6b􅟘\u0018J0\u001e\u0013\u000cg]Ⅼ^\u0012󻏡S<\u0003n\u0010𧔞\u0000󶜅\"\u0000𠾿\u000fU󻄡K;la\u000e𠜻`쎩$0#䷉\u000c~\u001e􀙓kyBx\u0007\u0005<bY%􎆪{𣖓\u0005󵪒\u001a\n􏛶=􈊯\nl󺱶쌴\t:Z\\덧7,\u0017\\󾱀󽼁m^\u0005+\u0003epC\u0018VO2:!𦂲\n\u00186g}􌪂q6􁵋6<𩺐\u0001%yP𪳿\u0002\u0006o𫵞g􅨘p󵮋T󸬔\u0005\u000e0'F#^IVd\n𦗔𢞫A,@􁊙C-𬒓g``𨤳\u0000ṹ􀎏𡱼5}q쑜\u0016􉿉𠴦u(P芷\u000eP뤘e\n\u0011𨃁6􈤲\u0016M𩂹7󺻩\u00149󽭑O9 ,Op󰂺UR\u0013\u0000뮽􀔭>(󺙦\u0019_Nn8\u001cb𖩅r[p􏹻za1\u0012w\u0011慧\u001a𩛅\u001c_\u0018\u0004N6Vyi&)󷋢^𡈴\u0004\u0018ꂦBuJ\u0012`𓈢)qq^@$*\u0016𝅘𝅥𝅮P\u000bể\u0006g𠸹Mg}\u001b\u0019󲤜󼾦w󰍴-e窓p&\u000ed󹭘𒄔a㮰󽼋􁸞\u001e𢾀􁵈'E𬌖𗽈9\u0014\u0014A$𬆴h/A`\u0011l]3Qv㧗MR3W\u001csn] a\u0000:3`𗐴{`罕\n\u001f\u0012.𪂺:?y`\u0014􈼒_%S𥻲:\u0000𩷛\u0019k\"\u000cWYu8-jr)¸?D〴c􎘍􋲹􉽙^x\u0001{b3Sl:&0xgT321𬄏FU􄵹N􏽊P*L𣣿ﱔi:뻜\u0016𨏇0#\u0006뺗0v􀐍n\u000e𦴧P:",
     "old_password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_14.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_14.json
index 9e23908b53c..9ecfcc28252 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_14.json
@@ -1,4 +1,4 @@
 {
     "new_password": "6go<􂵨fꃽY􈳇*KE󽤥])9󻆯􊕞K।􄉎1𘗢>qb2`\u00157*al\u000b3I*𦒁\u000e􊉪\u000c}\u0010𢁞~🩏@jjd\u0001O\u001a\u0001𗌗lv䃂B\u00083􄔙?Ih1bv\u000b\u001az\u0001\u001c😈0.\u0005b윮\u001cR<􏒫\u0004\u0011l\"E𞡊X6\u0015S󷂒?\u001b\u0004EKÒh팥䄰\u000c6󠁸>\u000b_Zd n<\u0012k􉖈s􅌻~\u0001󶹅\u0018r\u0010G󳶒\u0000`.)lj\u0010Rr/𤞸\\𫈘󴆴𭵝𗨦kI󾁓9\\.!\u0002pj&X?=r􅸤A5𩚏䤜\u0000ex`\u0001{ 𝩌\u0003󳽯^𘊏D􀩬𧵼𠐲m裠61JU\u0000tn@pCF3\u000cM𥸢ZrHM󺉄i𡔰zhn󶧼󰂧\u0005\u001b\u000b\u001f\u0003􇓚󺹼\u0014lU\u001d⥴[\u0011B\u0004 Y𧰏&cnLev俏awe\n𪵑+O𑀎N󽱴󰻦=x[7\"B\u001e\u0013\u0011\u0008Qy\u0010Nq~􌩔G*󾈲C𮨹Ho[𗜷9'󸤖6𭡑e#\u0017K샥W\u000e􎡥&kH7MQ\u0003\u0019,v2\u0001N/󾹍\tO𩑥\u000e󶩐b𭒦􈂫𤐕q󽖍􊙲ww}=$D\u0003w\u0010b􅀦\u0019~𢱜T\u001b\u0018𒑅Y~{\u000c{p𡱱*w􃑶Juo\n0𤵺sYXHT\u001fK\u0007󶡄\u0005\n%q iF𗙾\u001b\u001d.c\u001d󷪉􄞵\u001fW\u0019%x󵄢\u0015>\u0013􂟈",
     "old_password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_15.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_15.json
index 22930086ab7..42b10ab581d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_15.json
@@ -1,4 +1,4 @@
 {
     "new_password": "𡩝\"AZ~;􅦛sK>󴹖義rdU\u0016Z\u001c󷖲|~𐳼{W=X9*􋍏^]h\u000b󽍻\u000f􍼤\u0003y\u0008𝥕\u0004B\u001e\u001a\u0017􉝳$􉔠4V\u0010*,JI\u00193d𩞮8`0&𬩜r*T\u0003𥁎_\"\u001aT\u0004\u0016ywꦒ𘦆\nP􏛿\u000bJ\u001d;'\u0007󸾘b}\u001fu㫭\u0008\u0001\u0011>f\u001b𭗝\u0016\u001b狖6B\u001c?*HjHc􅱿􂙻}٘h\n:𥬞\"􀵗􌠽9d🝲AXf.Y𢋎2>3󰦽~\u001eaL\u0012!\n}\u0010\u0007V\u00085󵑇w각\u0005\u0002󰴰oe룞9\"󷎬\u0019\\Z稊\\􁞱\u000eu󾡩\u0018-\u001d`7&aJP􄕴󴁹_Di1\u0007p \u001a\u0002v2;𩢏Fmg\u0001X􍒔;d%\u0003x𘘸\u0019Or\u0004\u0012𧫌\u001dvo󼷹\u0003쫹8M\u0000~bI􋨒L{p\u0007q󺭇W{PVOSq𠑅𗣿!n\t䂋U\t\u001b󷤐!\u0019-IFP􋦗𗶍G􁴏+l\u0007\u0019.􀪞\u000c󻲨H􀒀\u001b$f\u0018\u0000*\u0008nr􀕈􆪩(𮔩^\u0013𘇯B^𩥨[F󴇀\u0003\u0015J9;y\u0006\u0016𐎚!51wﬓ?Y\u0019\u0014-1(x1?(:\u000e𬚋P_氿𧼢Vx\u0003uN\u000b􁲶r\u0018\u001c\u001a\u000fu{󺬡𡛾{ \u0018. 󵑶􈁷\u0005\u0001D@𫰗J\u0006:𨹃Wy㪍𤀪j0(\u0005􍈥󷧠7\u0001TI\u001e.𝃎#\"𧩗/tg ,󸶌􅂽1m𭤬i4𐣲Di:\u000eU3M𣕩􏭢󵨖7A1B뭚𧃳\u001b[O}󻀬󼏾􃋛󴍑G?~\u000e􍾖\n峱\u0018𠜞K􎸡𦟸4\\C'𩻰t􊨉􄿤^𥩟\u0000&aW9OlY%1\t𧺣bT\n𠪉_DO𑊏7\u0019(z_B㢷𥣎Fg7\u0016\u0019E􋲯' 􍾮\u001b2\u000cm(WW􊣼we?􉭌枑\u0018𥽽LZJ\u0000\u001cYIk}𝙮\u0004ም+kZ\u000f𦓣x\u001a_\u0014%𫙟􂊦VC􋹢􆏩􅴂Oqn\u0007\u001e􁾎\"䛴%8a漴𠘥Tb\"C3􍡕vG􊆙LF#{𗟒󳭦𧒨i\u0002 :𧸋i|\u0011󶻴T\t2\u001e2?IHPdw@fhLKXq󿥼qz󽡱z(𮍳,\u0008\u000eV\\8C\u0014ᗇ1>\u000e\u0003!𠉙&O%}XKMLꤘj6\u0015􇲪\u000e9t9Ku𢞣𥱧\u001e:󹭲df\u0017󳗕s㾬\u001f𪐥󰽭\u0017L2\"靖󿮐\ta\u0008Z𭗒,u􁝶󹨀󲃔\n\u000f􊕦\u001b.B󺃚B$\u0001\u0001v嬢yD􈎶UZ󳑊Zy󻺏oX\u0004\u0001𪫑'\u0007𞡮ub",
     "old_password": "n\u0010\u00011\u001b󻡒%􅅒\u001e𬩳Guy󽲳+􏽣󹾩@\u0015ᖹU-dZ'\u000cB􁬣癟\u000f\u001f\u0018;V\u0016=\u001cz\"􈹟#`\u001ft]KYs{\u000b녟\"←􃿹󵬟PP\n\t粵󾐉굦5uO瓏\u000ey\u0001􀨇𬼵j2󻧂㞭K𘦺\u001a]A#VL\u001e[\\󿂠F\u0008$UXg5](A\u000c#b%􉉻\u0000󾍓?냊􆌢\u000ef􋕣\u001d𢌂b􀹈1󳩷󳍕>뿯rnE \u0017\u000c\u000c\u001cM󰑙DQ\u001d"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_16.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_16.json
index 7f1fcbf4d1e..97819dc4f04 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_16.json
@@ -1,4 +1,4 @@
 {
     "new_password": "5􍔀\u0015󷧈?M\u0017j`-瞅𬏄󺥓Z􋏄[􊰒\te=󲉘E\u0011'RlS\u0010ZJ&L􎗧~G\u0018$\u000bd6 5\u001f󵰄\u0005d\r\u0008\u000e􌨎􏇹i)jc@S𦏘󴭝\u000b7徵tU\u0007􀇵\\hD􏃅\u000b;P0\u0016\\q:\\I󱳚Ty􌁫wk𥳩zC遝\u001dూ]Z䁆\u000e\u001f)𠞽g\u0010\u0010\u001d\u0017|깠-\u0002~󺄄\u0007󴐄{\u0017K\u0013 ~.Z3\u001aC󰳚f(_/􏍋􁮒󴼏7·j-𩵜zX\u0002+;zT@?\u0007mp\u001a!賹h\r󲔪\u000e\u000ft?\u0008혓/ y\u0000𗌻􆼤%􌔽\u0000􃰺\u0012\u0012!|!\t;D\u001bD󾕅OT􃈑UJWf􏶡𫝨\u001b𥲏􀙯\u001cX󺟠󹍬\u0018|ix􊢏jZ𭭹b\u0015\u000e󻭄r\u0011)􁓃:𧹷꿦9<{e􇜵瞄L\u0000\u0002󹀸;~󰠜}􀻺?+&\u0000z𣔢􉓡7󻞴%x\u001c󽀒~𝛺\u001e\u001f*\u0003p󼣞1𤦃㚢􁬶\u0002@7yY+\u0003\u0000􃕂$J􄠁T:\u0004zl,!\u001a\u0011%O\u0013\u0001X\u001c]󷚗$𥈹􍨼\\𢁍PX40\u0018\u000b_,yU^R%\u0013e+-g𪂾\u000f%f+h&W\u001b9,Jg,'x|쫰/{Y\r\u0015􂏥\u0012[󽠜\u000f炲Nl뙊ݝ\u0015\u0015'\u0012/H<𫼫]\u0006􊏈@9🅊Y𤪇(\u001f8큉󲜶c\n'8]\u000e𭩇q7RH5L󺿺¥@⊵疃NB2x-󷲟󰥾{7o𗃉)󻹿#\u0003Ɦrid_^Wy7󻒈i􃜵\u0016𘕕\n=嗋5↿󼺟􄤤퉟\u0000\u000bO<𪻟6𐣨\u001b\u0017\u0019JpG\u0003}\nM𫜉𗢁\u0005\u0000[󵾮\u001f􉇁\"bl6\\`6\u0004\u001e\",6?>Jk󿂽𧌕󲝝!?4\u001c>,\u0011%?y_\u0003󸉃\u000b\u001c\u0010UQ樤𭪤𑶍巋\u0001𩑑\u0015󿁙aK\r)f\u001a~N󹎻\u0013k󷏣$B\u000e\u0017\u0006\u0019𑵼~tVD\u001e\u000f\n\u001e󽋳G<첐󶄐o\u001bftC𭜮\n距\u0008,~\u001bM!\u001b𪬙𠯋`󿛹󳴕b}k𐜏􇈓`]1^-\u0000O󷙫r微𤞨跷`🄵\u0006W􋻐󳔲3.tS=󰍗\u0006s6p[󱧣\u000eb𬄅􆸈W\u0018dO😝da􃮓=􏷙n;𫽍8Wn=\u000f)󺞄%\u0004j󾪖\u0000~D#W%\u0015\u0008 ﵞ\u0012jr櫴tb\u001d󷳇r\u0008D\u0006𪱝oH႓lJ쫠󸕨󺅉L<=\u000b𓐆*퓎 97q󷡐nS'{->/t'􄃑Xq󠅌tmel󺞡󶭵󷕭\u000e\u0014\"$\u001f\u001a􌌣䙠\r\u0013𢘍𗐇s瀑omb\u0001􍆡P_&𐛶X\u000c*lfw~n!\u0016\u0006\u0007󷌜U􍧭Y-d𞹵􄺄\u00155\u0011\u0016O􂾫z:\u001e)𮂆\u0015󺮵ᘦn\u0018h􅰖F╗\u0007𠡟𨞮\u0015*C/꾒.)\u0016\u0007P􎓙󾬚\u0014􉘬ȃ𐦄\u0010L\n𬀧y5a𣫩헚Iy⳩a(\u000fv\u000e!GW#g4\u0004b\u000f$(\u0006\niKxu\u0010Q>󽣋wGc_NKl\r㎦x𔑷z\u00137\u001e􋳴\\\u0000B\u000bC𢧲\u001d𩗝C?&q󶜘)+PhcHd𭚩\u0010A/F󼴜Y륥㛶J󷏍jIQ>yߞ􂡘N𘄳y\u000e~斞@e􃋨&x𮌸􇮍\"Yh%g\u0016$􅁙󿡥|\u0004T\u0019P󶷬􈷶v\u001e-.e8\u000f",
     "old_password": "S+OT靟b\u0010/B[𘢃3몐\u001d𫽣O#o捺5T,8M~\u001dT#󱋷U{y"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_17.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_17.json
index 8f10bd8c31e..079dbd79a9e 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_17.json
@@ -1,4 +1,4 @@
 {
     "new_password": "󿞫X2cZf\tI\u0010.3樑ꊩ󱊝\u000e𨳮糽𦡈U峖𦿤\u0012󲪍xy􍘒DB􋣨\u001fP!≈3뒗\u000c㤈.1󹇚󾭏ji𡆁C𗍮䉇酖䪛\u001f\u0000~BYB\u001eUYc\u0003􊘨e🈨𭱐ᄻ\"cN&\t.9􌉽?\u001d^\u000b\u0001\u0008\u0018ꊛ&㔋􎭙a󷪠)z6Z𫴦􊱴\u001bX\u000f㗿xJ\u0016֔\u0019-\u0011I\nB=󾉏n!l𠆗~U􅅖;𛰔X𭱩\u0004𦹁󹷹uY鴇z􁚺D󹃹\u000cFbZtt\u0018:\u0018YQ\u0001h󵬙W􏄺\u0010𩌧!1}k\\􁭿z+\u0015􎉯\u0001􋇸%䑂?v􎡃h\u000cN\u000c\u0012\u0000\u001a𮒗󳏵<i顀𝒹6Yzu􀖩I\u0019s􆪿M,ۉ\u0005󹛎d\r\u0014j䯯\u000bX$k\u0000f\u0018]]f/\u00079aLV^b𩀩!D􋻋2􍏢5𢵱s CeM_6\u0018𫃾􍲪<c󷧔(4ꢯ@r7\u001fi #:\u001a\u0018\t𬞏IZ'3}󴭬y@[\u0008KO\u0002)C`I\u0017.`Y\u0015^W87󹌝\n笕\u000eCf𖫞P㠩𗅘􅻢l\u0014`d󿗋󸀯?A:\u0003㬠\u0005\u0002&\u0019~􆐓􄛈\u0016}3􅏎F􇋉Jc\u000eo􄪝%L𠳇𫛁􃹓뙫\u001dFwj𡶠t\u0016j?R󿀲uAk𨈌\u001a/\u001fgu\u001a1󱾚i<~,\u0003N\u001a\u00043r;\u0007\u001a\u000f:􋪡.}y\u000c6􀺹𤿃j6_;{󵌋\u0013W9\u001aui􀓭r%\r滒'\u0014}1\\\u0018𠝸􂍽X8R%,tw𩋾!B#0ឪ\\;\u0015𪨤9d𥋖l𡃂𣨹F\u0019XUJ􃓦L<\t寬볒?w,n\u0019\u0004>P\u001dbP􎜘>ie􌫲Ỵi𩃮-癈]4i-\u0002/\u001dA\u0008&\u000b󾶽<􍍵􎋯M\\󲇎-pG\u001c𩕵\u0010HEJO\u0007|\t(⏹D=x<\u0017 aV󷏱O󳺅n|mdg󾯸@􏌿f\u0007󺒝W𮨌䵨\u0010h𨯽􊨀\u0017~⦜K~􅴪\u001b|\rdi\u001dﱽ𗈵􇾁;󺩗8e^𢬼T/D\u001f\u0015󰌧hTTe|N8􇅇1􊮋tJR\u0007𥺘iJ2󳩶}赛瀩扱\u000e􎱴0ુ!y\u00011W\u001fzX\u00010󲄬s𝒳h𓊖𡈵#􆒳𡯮SR󱖟,V𬃧v\u0015𨑊1g\u001a\u001b𗶱􇻦\u0002Q):\u001f/E'𠆔\u0010z!\u000e@󹋾Hy5*R󶩿\u001a󱳖󾼹󷬼􃰇𫢬􃒛`솖\u0012.M􏺪W𩴰\u0006󺋆Imf#dHF\u0017c娛\u0013QcG􅝄B\u0000W<\u001eC􂭸󱔉󹡃L7",
     "old_password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_18.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_18.json
index 4431289f6fa..9b87cd015c1 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_18.json
@@ -1,4 +1,4 @@
 {
     "new_password": "$󾮝izIhＫE𥋌b\u000ci𨒼v=:\t9󻗨\r⣴!􀲃:󴽌&/#􊛋G𭿷$W󱲯>\u0019Do`F\nY\u0019L\u0004\t\u00005󳒈bC8ᑱBq󸢵$p\u0000\u000b┆R^\u0016GF&󷅀+]𦐧]壢鞈;:𠉵𦄍w􄉷\u0015\u0014\u0016􂾥󷺴gi\u000f\"\u000bqᢹvV󾃑\u0010Yya􍍕};,K3\u0010n\u0003\u0006\u0012+𭅵𢭯\u000e^q\u00134+Iby-\u0005􁎦𧮉_",
     "old_password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_19.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_19.json
index a4374d4eab2..c82189e2946 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_19.json
@@ -1,4 +1,4 @@
 {
     "new_password": "L`\u0004,Xp\u001f\u001a\u00139\u0001󰴢+\u0006Q󷀛𧺓\u0016(𞲥S8c\u0004\u0001=d𥒦\u001cL蛅\u0004\u001f]𗋕~6\u0010:󽠍됳\u001eU}dYj\u000bm\u00133\u001b\u0004\u001b\u0002\u000eho\n[P)\u0004\"r𤕪s𠜶6󷢳􁖘X%g^􏐳MDA\u001d=𠍵I8\r􂣟\u0014-􊻪𗚖󲐃𥶌\".𣲬~-巹]\u0008BLv\u0006-u5􌝜^st昼;\u001aq\u001c\u001bd󳶉3\u001dII\u0002S𫕿\u00120\u001aHy􎤩䝵>\u0011e4';\u001bv\u000c\u0016xF\u001eWD鲅\u0000㹀WB\u001c𣡨/v􋍡9\u001a[a󻹺\t\n𭫃y%􄍩5B,hyc\"!b#h􊰉XC\u001d7󳀿mZ\u0000ECj:O:\u000b/J\u000e􍈋󳔲9\u0019s\u0014\u0007􂧅d>HEz\u001c𩸢/n\u0000eC󵒾\u0018𐂱2𬑝\u0002\u0006󷘝v󴗼𖾙󰺈E`xtrZWt7𨎊wMA9r<󹖙㫹Ovo{􏣧\u000b#f󾈩󱼠\u0001j\u001cb\r󶻖\u000b\u001c9e𡐥?󹀕q󹑐\u000c𪃸/X惟\u0002\u0005l\u001c\u000b𒓜𠀐RC>Y\u0005􆆮2v\u001d\u0017\u001f-\\,󾕱e\nf󹠒\u001dA\u0011\u0014y󵽹􍈇q8\u0016#\u0015󰕵ꭆj.\n6Is\u001a􀐪\t󹂂tL􀖏T{𪜥􂥬Sz𐧗󱖉\u0019\u001f[\u0010빾\r<6CnyQ\u0010\u001e146􂫕J\u0014􂫗ceb\u0000r6(P󠆆(􅺀ic蠧/\u0005용䞋7\u0012^b\u0018󴕉\u000c\u001f#㮂r8-𥱐u\r󸎈\u0016\u0015H\u000e󰭜毐󶼃\"'땴\u001b'=\u0001䫴b_\u0011𭣃\u001a𪬯x`\u0007󾎍𢓪c\u0019|󰛪\u0007A\rQV?􂚷\u000cZ\u000c\u001b\u000f0D\u0001QI\u0003󱭌prt𧼭𗇓逕𩽨􋱩9뜳u\u0019􍈳\n㒺\u0013}h󻿊o\u0010􃰚tFT􋚕%Az􉏨3\u001f\u0001\u0019霚'\u0013^1㢾(>E\u0010(\n􄖡z[Wg􌤖ad󶃦Mnv⁢􊤣|e𮞉\\g\u0014쟗jIsn\u0012㺽𫡲0\u0010>Lr*Q:\u0003\"𬸥\u0010𗾇\u0002q",
     "old_password": "k\u0005\u000fW𢷑|YQ󳺹H)\u0019a貀gXC|&\u000cE`𫊱UQ􋲫\u001d󾦺\u0006j𗅢𢬍\u0005c\t󷽄\u0016/8\u0001L󰺐6𠕒􅩳蓬\u0001y& \u0017춬\u000ff󵘿5\t􂼈K6A\u0007 FxP楅i诚rc䙶𭢯𪅊𤾦H𤜜h[GU\nuX\u000f%~I𭁏Sv\r\u001494\u0013\u0001󱧂E~q\u0012󱭠𝛑\tR\u000f1$\u0015\u00031𨙩󶞥#\nD{󼧩@󿖾q󽂭J𗹟\u0007u\u001aB#4\u0004₽􉘘𧞄g󶽛q6(=\u001a\n㎴g%\u000e􄝙l󴾶󶿦󳧯𥙔\u0015\u000c\u0018~􀱔qs𥺛I0|\u001a𧛡􈶓\\Dq\u001a{z=\u0018KL킮\u001d\u0014􋙁G7ewkJ1詶J8 O𥓉𗞭V(\n\u0001uT𭂭𢴦4-󱏶0<z\u0017F\r\u001a;v\u0015\u0001~\u001d\u0002[󾪬~Ii󱶣𣆓@7뙃NᅳYm𖢈ꜘ1d\u001eࣴ%[m𮙶󰿵h􃁻JV6\u0002\u001b\u000c𢰳n瓻Fdᣯw)\u0016Oa_𥿨􄴈9\u0007𗐽\u0012\r3[𥚘\u0012)-𩭷\u0005~🜣町\"wi=`A\u0004X5E'$RT\u0018_󶦞  x\u001e\u0001𥵾󵾂Qx~C󻉾\u00059\"{\u001b9\"􉓫7N𭯍h_H6{c𖬯粧󺛭a\u0016􊥪\u0007\u0006\u001e茏l;?󺌌o\u0005T鄣唵𧹔dt\u001d𐬿J\u0000輋`-y\u0018󿃪􂹝G\u001b𘧳\u0013\u0007\u001a􄃉H\t\u0017󶑄.S(\u0018\u0002{\u0000h𤢸YW쌥\u000e0l6\u001d􎹴r󻮡^{\u0017恋+irf*6𝔞󴼑cmT\u0008\u000c*\u0003=R0􍦥LAC⥎\u001d5Li$Hy\u0016A䑲@KliR􍥰􎹱􍺱l𦪾C\u001d\u001d\u0019d\u001f\u0017RR\"\u0005L\u000fklJ\u0018𣐁𠙾q􏓻f.qolR􄪲\u001e5岔RL \u0017(.oL}\u0006u􋲹\n=Zd󱥂\u0015J𢶌w\u000c􇃬󺊊D~N󱚘Jfs>\u000b#󶒄$qO-\u0001/T1\u0000@큋󷒢\n2s8Bfh\"{vy\u0004G焆\u0017\u0012g\u0015xꀇ$􏔑:􋭴z󰒍\r􏸏얉󸊋􉹘z􂬃U󲎞ksD\u0012W,%\u0002}\u0016Y􃩵\u0019𤖴󺧊\u0016u􄱖a\u0010xoH\u0008𗤄ro^\u001b|㢼𡞱𪪶2󷾕!ReL.)\u001d󳇰a𠵞𛊱锦\u0003􁬘\u0010튓\u00105?\u0013󱚹Y:􇊴\t)𗡲봪𤅞*𦯺󾡟`\u0002\u0015\u001c\u001dg\t􈸛*fM󲴯󻖭,\u001bTL\u0002\u0000󰯚􋳹:\u0007_9iȌ𩄧󰸇Wxh%􍧶`t􃓹i𢅘mD盤\u001b䧼\u001ezJ󷬦"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_2.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_2.json
index 732cd45e7eb..8ee2ac96947 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_2.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\r]Gy3T󺢩\u0019󹂮|R\\@􂀠Xq𥽗t\u0019\u0015놊󻳮GU+p󻇧󽘠G46􏐇\u0007𣥂u\u0019\u000f)@ঔ\nk7󱡃嗵D⮪􆥀􍷙7,h𥵓\r󷫿3\u0007㏜ki\u000fuUB3=X$𡵞]󿥷\u0008SaAr8*t\u0010X:󹲨KA\u0016u$^rK~`􃚒)𪧥MJ􃖊󹋙\u000ek\u000f\u0004F]\u0012󳧤\u0008\u0018\u000c=p󾕞&S`\u0008^𫹿;S\\\u0014N:\u000e\u000c\u0000􆯛5f🌑~K/\u001b𡧳*:󼍆\u0005B5𦥈\u0000~m\u00102㈔􇥟\u0000%\u0011{H",
     "old_password": "7䈟K>𗷍𭤭m\u000bG9\tO]kp\u001aVQs\t󰘥􎬊\u0005󹑞!O󳫒\u0004=\u0007brgK_D󼘂<\u0016_􌪶􉒥\u0003H\u000e#w9"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_20.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_20.json
index a21eaaf3a79..03569e9d0d9 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_20.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\tNYm7k;󰡓|w~ue]St촱[\u001d󰊥e\u00121\u0019\u000f\"C􂯺0󵁶!󲾯|xiw󺲓~YT+\u001b'𭔉6󶫵(;\u0003!\u0008􅭳&Y9tW󰑉𑴜\u001d\u0006􈡿􉖺􎞑&a,\u0015禭􉩲y/d􇱘\u001a𩝇𤨞wOS\u0007tp󴗶B𬖨\u0017i\u0012􊔋􇭴ek=r𡶷\u001brfశUkFh\u00059YA\t]\u0000UJS@1?o_-P\u0017xW𩼩𢇔벣<􂺇𠤹&\u0014\u000e6na󴖣!Z}'H􀷧w\r0W*庙J\u0016Iwk␖AZ󹰜皁󷠦w󷻒\u0003>􇬉S𦫮􃋔o𮢱𪲑􅏒J\u0004u\u0002:(􄖜𪃼􁗥@󻞗\n\u0013xMJ砚𤆧Oxj@Np􄛊󴎝􉥀x\u000f\u0006\u001f󱚯T\u000b_w,)w7j\u0006󿣲󽧾\u001f'h篑4\u0015𡮠V錋g\u000c􌟢3🨘\u0003R\u000fPdc{a\u0002𮪲\u0010\u0003((\u0018f\u0004\u000c𮇏e~[+\u001eg=g#&MQ\u0012%4\r\r\u0003ﻓ<𩥙#􎲖5逊\u001fv\u0008pt\u0013'\u0019F\"2􏰒\u001ae􉝏$󶪰 􄵘bK>m>\u000c.􀷊m贈MvQ􄎻Q𑋀𫏩)/􁻣<\u0018y󳃙J!#1\u000b\u0007q\u0012􍆇\u0010\u0018􉷼D\u00067W\u0019w\"𥆳3\u0002v匸𞲂\u0003xW𮎻􁛛<^~󲥪\r:WGlhl-!|W.ฎ;n􇉐`<Rh\u0001j𧧱?뉳\"jcv&N\u001a:PX𫤕玲􈙼><\u0018􎰺;NJi\u0013퀀\t ]\u0010H𘜱_Z󳑔廳\"𭌻󴰥𑜍憧a\u001f􈫻𠑓4U󸘅v􌎂S𨨹S.賣i(\u0005B|VDꠔgW\"->N4𥥢R𮥩󲌍\u0011\u0015偕%𧅱[`𝚯@B𩇵qjKW\u0010m z󼟌𨸄j󻛩P%\u000f𘇑._\r\u0011(N󱵡\u0013\u0008\u0011􅷱eꈲ'olW\u0006>\u0016p󱑺H\u001ee{\"RN좃\u0017\u0012\">󶅏Q\u0010Yoj+~\u001cSMU\"ubD𢹩KtW\u001cT𘎫凲\u0001Qm:\u001e8)g󾀔\u0007yZ𦑵󹦍E𘍚j n83Hf𧾾\u0013룛/2C\u0014\u001c]A8-􄮇vp`<K\u001f}!?HmA󴭩𩩡K\u0011\u0000놁\"e󾧴t𩳉9\u0008\u0003󻘗a􍺡􌬍𩵋쀿U;\n𔒨\n\r\u0000󹜆Xj\u0004g\u001b팇t𥚉Xo󶥰𢔧m\u0014/`F~􇋠h\u0008􆳱h\u000eK􆚭𛂿N󾚋󼔊쟣L\u0003\u0015D+3P:𢩤z𦍴\u0002\u001evgvD/0\u0005󸅙\u0001ఛ}2_^w\u001dj\u000cv'󶦽\u0011DYtuu\u000b\u0003󷥄𪁞a\u000bP\u0017󳅲h.󽳝Eo󻈭wl\u000f𦘏kH \u001f嚡J􉏹(lKPSj􋆸𤔿\u001aK",
     "old_password": "{dNa\u001dEIDDNi\"&P\"Dx~𗥺s \u0015&\u001b\u0001e󠁌,/}}@󺍌G\u001fRi𫖄\u000bG\u0004􄰽\"dIcX🗈?킹h4\u001e8}E\u0008\u000cAI+𡹓\u0010N\u0017g'l\u00141lg}󴷘\u001d9u\t=𭞗)󿷦A)\u0017BD\u0005ۍ%\u00183\u0008+,𤾆G)0%𒒸𓇽t8􍲠\u0018󱎻oU\u0012N\u0000\u0011U~􌭾[𡵦􏆧6##𥀭<\u0007\u0016󰵲V6\u000bb>\u0000h\u0015q\u000c𫇚<5dHa\tg恠𐇩2=tZ􀘱L9M\u00072k󴝱󱌯vOkA\r)\rO lNli蠓\\\"b`G컝󽷵𧠤n\u0010P􇉿i0k󸀡w󾆒?\\\u0005g󵥕\u001e[Z\u0001N\u0001\u0018𭣣:\u001c𭗓ꀀ_kBD\"C\u0010B4]w/JF\u0000?L9V\\9􋯎W􍢬'\u001c={e𥘦>􌊯𢂗D􏡂A\u00077G\u0003b󰊒Crt*Y\nhD𤬇5𤿱)F\u0000\u0017*󼷍yCu\u0003\u001a%\u000fbZ; G􇣋)\u000e󷋘_\u0015\u0013,~𪹗\u000e𥟚d􌳻􈴸4󸥅R􂩅䪷􌙬󵍹^𧞑聶1\u0013\u001fn􍐫*!\u001c|\r=𨪢[ql𮎖S\u0015r\u001b'\u001aE(\u0016\u000c{􏠉 |\u0008앏Ꙗ𥸂󶣋E\u0015𢉈4𥂁\t𐰉X󴑝\u0004􍭬.Z􉅻𫑞𫊊\u0014t\u0018\u0013娩5HV\u001b:$e,L\u0002󲌃7R󷐛.wq憙:\u0001\u0001\u0007𐢂Ὧ0*.󹭋􉤫𝖙P\r\u0008𨼡􋯴5𣺔𝦐𤥚\u0011\u0008sc-􈏾i\u0011ડ𬹌𥬴A\u0015$𮡮jNR󠆔\u000f𝟊䄬󱡈;ᘱ􂈫\u0016Rd\u0002I;\u0019\u0007K凅,\u0019%􆇠\u0005􊂭J􃇫nR$Spf􊼼Lsp󿝟[\\􍲷𗬭y\t\u0016bC7}|\u0010\u001ag5@]2󸟈S4E\u0008e[􁘮6\u001e4𣵨z\u0012d\nm𔖩/JqK\u0001Qf􈉃􇥶0𗌝\u0001Ha󷲐&8𛋯)~m𘪠\u001e\u000bG\u0016z(p\u0004􀸫V\u000c4\"^+?A|󽗼\nŔr\u001fF&\u0018t󽖼r\tP\u0016DW\u00102\u0011E|PgQ/􁲙󼞽P\rNH\u0016S磘􀝟猗"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_3.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_3.json
index 1dc63f2e83f..cb74d7aac4e 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_3.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\u0019\u001djg\rcpq\u0005ydjzBvM\u0019-𬔸xqO[p\u001eF󾭐2\u0014𧉬󸲺\u0019'L+z\u0016-K𗂱0\u0005\u001f\u0003P\u0010\u001b&h8𢣬􈫠c𣂅󶥀 \u0007~=|hx󻱕)V𥕠J󱼮!@;*_\u001f<S􇣯\u001a󼈽\u001aY~\u0012\u000c󻡫j@N𘦓\u0014_\u001e7\u0004t0Px>]\u001bd\u001cI_\nK[\u0011\u0008/dS󹄡v1(h\u0003𥕌-UL(U\nm􃛤\\􀖁\t>\u001c\u0019𮢂~*$􁷦秫𤌄󲈽$ch\u0006yCFOIo\u0010vHeF%𩃀8w3I-𓀏(𫐝𧘒r.󳲁s>𦄅@\u0006b\u0004a\u0010f𐰽_;[-.􂚋q\u001d9\u000f𣨋U􈿴\u0018\u0003\u0016bfMq3]N𧊆of?󱅗2QU#cY\u0012\u0017\u0007𠹈8c`\u0014-󼵐0_,d^M􈕧3\u0000\u0016\u0012`\u0012(z􆇎R􆅧𦱾Vqn𖽑\u0018𭝃Ap,𐰯~:>9\u0001󰻂L|柞󰚖6󹐒c笙^􇂶\u0000#𐴋ᲽSD\t0\u001d^P\nmg,oVnT%􆛚#􇜌𭓠f繋\u001cG\u0000\u0007Pl_\u0004 􅩴x\u0010Z\u0019\u001a\u0010􈑌\u0018⎦\u0015nSq^lw",
     "old_password": "\u0011󶈃\"iQg2?.V\nR\u0007d#NZu\u000f𥧫\"B\u001fm􄒺\u0014?_-%\u000e,\u0008\u0016𓋎􅖐%U\u001e𗐞%1च\u0002#\u001aV-𧸣J𢵞O\u0003V\u0012Ga\u0013,􋊭O3J􌓚n0􁄆j|嬫cF?󸲝x-􅌟􋏬160jp^𫯑\u001c>\\&\u0005\u0004g]􆃫\u001e𩝒\u001f%󱰰󾤚$󰮀R󾺬'-^I􈡋 kT\u0008Z󳺇F\t􈵎F8R7\u000fYN\u0004:N\u0016\u000f\u000bdUo󸚁􁄮\u000bi/KA/󵕻􀯷\u0011e-맼E<g%5RX,\u000e;𫟞o𤼧\u001d+|\u001d6`c|z\u0017VK:𘠟M'6w8\u001c\"\u00127V|00􆦘\r󾶮w훩6wP𘖤󲼶󹭎&􆱪󻰅\n&󽝡󼈙0𗤘􃱰􁂼􀏎𥪧n\u000c\u0000𬓓<A7X\\􎂁L@)^\n)@H𩠷𨽫5􀂨􆬉y;𨼁9=2J𪴼 %챜󱡐􉜔\u000b􃈢\u00154\u001cq\u0001✭𣺇\u0014\nnxVc𭹻𤿻𧔮Kq􂑁🛐,\u0016󵦂r\u0000p\"ꖁ\u000c\u000c൏S\u0001x;p\u0006⓷Gh\u0011\u0001􆰤@\"Ῡ\u0003\u0001XGP:V7F\u0005\u000260*\t81f󸀣xIv𝠤eaq𭃗𤙫\u001f`gAY􂕬\u001f𬎕:􁙳2\u0007[퓴\u0003ye\u0017􎧛y/Z\u0011;aetDXb󱧸􈸊󲩟\u0000\u0019+?>\u0001\u000e\u000b\u001a􂄎c􊇣󵁢Z#󱽒e'\u001e𝙯\"\u0018\u0004\u0016?wO􈲤Iी󵡪󾓳gYJ𣿴9p\u0018𭰱Rn1𭫴A\u001d1x)𣱳k屆\u0011%<J6\u000e󶽯gdy+\u001d쌰Z\u0017\u000b󱹞𘫟Hi$]`룗𐽖󿉌\u000f\u0001煈􌬝^O\u001d\u001dd\u0015𗏿w^D\u000f\"8~琤𑚯sM\u0007N\u0011-c\\*StA􍟜<#Ih]\u0002'󸒤+󵃲,􊘋\r]􄁉\u001d\t\u0012𧷎\u001e䠚X'􈺅W.C􁫸\u00191ID\u001e~픇b=𫾕y~6DAo!Z䆃h󵆞􇲃B5\u0019􂂏\u001fe𫶦Qv\u000e\u0007#𩎠DZ\u0019\u0019Xf\u0014ds\"d|9?[*+Gᢒ􏉿ds?1rG |c\u001f\u001a@\u0001ሓ\u0010朡9.\u000fnD,\r\u0012󴻥𩳝\r+\u000c}b𓋒p\u001fk\u0000\u0017yPvZR\u0011\u000e󳭠=>S󸈉C>𠶺䲍G6󴿰\u001e𗹖~󳒌avKH\u001d<􈗪sNVeἔ𥈒\u0010𮆯\u000c\u0017mpc'Xi&𤳶E|V􅿋}\"\u00155𗞒&\t\u000c\u0014l|p\u0007󺅤󽇁UOM%a/9\r\n􋞦􁯜P*K􆈚%\u0015yXE𨓸󱃻L\u0010$f\u0003\u0011L\\l⯭쉨\\Q\u000f󴳓()w.𪌔\u000f.&稣nk\u000bF𣉨:󽤮ਮ󸄸\u000e\u001e^\u0005\u0014\u0008󼳗󿌩\u001e\u0004\u0019E􅲒I\"W􍥴l\u001b𠅚fB岗+R􏯧?􃑮^TD뎼{k𬚻n[|g;𑢭􋟡䠀𪑤㼤` ⒌􈑭𪬃dT󷾌p_㋶tN._󾦣\\쵬T%𘀚\u0010C𗞎󸲀⎼D\u0015rPk𩣣\u000ewLe󼇺仪󹡢Jj"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_4.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_4.json
index f3d3b5e0822..b8d5bfdd94f 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_4.json
@@ -1,4 +1,4 @@
 {
     "new_password": "6%CdZ\u0015:]a𧏵G􌰇\u0007HT_\u0003𭇱=􋔾H\u0015V\n𭽼ꨰ\u000f`\u001d4},m5C,)pOU-z,m)G􉄣:㐻𐬤\u0015VBlt:'\u0016r𧓴9\u0016Z~쿷\r𠄲\"\u0008`}l\u0005g슏x\u0019sO\u001a\r\u0006\u0017󷑾*𝅶\u0006'\u00150u􃦓+.N𥾰5\u0010󳓓􂪈􋡾OE[􄚊cJJZ.>#mY= \u000e󹎉𧢩Fi~8JT\u001e\t\u0012[E𑌧\u0016O\u000f@󷓁J\u0002=\u0010\u0016.􁼲#da􍂏\u000e\u001crCR\u0001_!\u0005-Wtm𢎾u\u0002􊿻1\u0016<􉉷Y𘒿F􊫂𪦶𨔄,H𥍯 󸈸􉗷Ｈ􇌝𘩈𧡘ﰲ\n\u001e07e\u0014.󸖬\u001fl-W󼽟𩘴_\rSidOZT%46Me]\u0008f3X\u001a磸\r]E%uW󽖆𝡻c`\u000f􈸻 a`/\u0013􄖮}\u00045\u0004CMY\u001aY󸢚l>xH\u001e𩛍桓}vy\u0016\u0011 A\u001c㪿59N琠󴊵\u001a@󵾑G𭴶!xi2JK\u001b\u0007^YMk\u0018Q\t0:\u0010zo\u0000\u0010x1gU\u000f󵥛8𢭂P3V&𣬧l)A𩃹>\u000f\tz龮R𩻄,\rLb𭴢\u0018󰃖_G󸾺󶏽EY;丶Nvs9fmb#􍠨딭g􉑲풓󰮞fJ\u000b󵀺𬇛SFA\u0002A$𭿉𡆞\u0000\u001eA􅄶E\u001a~󳧱t%.P\t\u0001N峤=􂗫\u0005*ꜸFm󱈹^gW\u0002BN?􃙀`AUpn\u000ei\u0017}\u0015诚8GN𑙠FAxE\\&q^al$􌜹\u0012`z𐘰𠆤f\u0003nux𤤳q\u001c\u0018y\u0006b􆬘\nWZ巓oFZ{to\u0004\u0007\u0008.𢛩􃊆/'\\bL\u0017{fp󰉇􆰾O똢\u001d8􁥑􉳑;Z|< 𥛮􉨻􏖝4aC\u0001𧛴\u001a.*K\"\"🦮Y𨵬v󰴣c($`\u0001K4d𞥁\u001c𞀑L󲚣\u0019􃭵/AnK𧺸4꽌:\u001c􅨥󿾢$\u0013/Ug𢽻iyBpz\u0018\u001b윬M𥛓\t)p?𧆪[{K􃶻C𭱻/i🨟󸂣k\u000eVyO\u0019󺮸_\u0016􊵲𡤾鈒\u0005{+𤯷\u0018p\u0019𝕞\u0013󽳺}\u0003\u0006\rpf&:\u000f\u0019{[롮𢤊Pj\u0012󾨃𪱏;\tz㓺57*\u0003𤞵\u0007􌞖`\rM\u0008􄉽\u0007􃍑W5𣭈v >Z🃧𫓔t\u0001𘐹 巰@Vd􌓣'6`/\u001ev\u0005<\u0019󿘷:74s[\u000f^rcI55&\u0014(󾾳}5􅯩\t\u001a󸴈g􁭽\u0003[􀈫󺲟\u000b[i􎊺\u001b$Ⱦ簟#\u0008q􉏯T@8𬸂󸪜􇹛\u0014.o`\u000c_27^6>󸰺倘s𪶑q[𧖃aeG󾞹HB[\u001cs𖠜t\u001e2)[Qc?-󵳥/z󲞇-\u001f.k緮\u0014Bc𑨀c \u00081\u0001CE\u00147𩰠\u001bw2.{󷤐~|,\u0004^􎉃}x􌛊\u0005L>>P𩈢,.T􀊠`􎐶b9u.(z=@&b|󽯩\u0012呍\u0003\u000f~\u000bz𧁷E`\u001ce\u001f㱺=\"QwNN🥉lzq𮙔eiq\u0016-d𡞣.-n\u0001?B( T=wf󳂋\u001e\u0012𫺠\u0016*|𣿙DM銿*:\u0002𮔺AS\t7oﬡ(󲯶O~kP𐦦z\u000c\u001be\u0007󱁠I\u0014\u0013!EL+G[\r[_􊣁╃W<𠄉􌋍iA𩏐'F\u001e(SE\u000f^㟖l􁟵\u001f\u0012\u0001\nꆜj\u0013𦊞c䌙DN%𢕊&󵈂\u0006~^袻\u0019󲇽&D𦔣\u0015P\u000e,\u000fk#\u0008b臆\t膌W햴\u0008𩗒li𥿣my\u001d𠨾f\u001fz7fFkx𬍡=𗥂\u0003󿐌;pk􍠙􋰍.\u00019j􎉄$􈟦\u0011oc",
     "old_password": "󳋊󷜄𡣢y8z𮇮cH@ge𗧮<z紴VB󰷢S􀴹􏎼\u0007q󹹣\u001b\u0011􉗓\u001b\u00101{󳞹혁󿏄8󻦾\u0000i^\u0007\u0000\u001cw\u0010b𝁓d󻙬B󽸅􌎕.󲂵]]I/|(,P d\u000b'\u00185sb𗭿_\u0006􋤨LY`o\u0016桵U\u001b𭂉Me\u0012\u0014p!+2/M+r󸖷#吡u𧱢囮\u0001Yd􅍜L?*\u0003󲄽n^𒋪c>\u0008J\u0017\u001e|Z5j\u000c\u001fJ\u0013泛#ᚾ =\u0003[[#ch1T\u001a􃠻𦼕Fr#\u0018􄤖=Q􏀦𧮭\n\u001eL-X%􅖥h􄁸􊁞xDM'ネaC@n \u0016\u001e6\"e󰩉􃚿\u0005E'H\u0013𠂞o%5󳍺{󶲤/KU\u0002[𥣆􏋍/#􏐇H\u0012_bNy􌡎\u000bH\u001e]󰼔wdg󵬪\u00054|󱿗%\u001dzgvb?QC3U\u000bOL􊉿󶙁𩳱Us󰢻󵿄<B\t𘒹O𫵁!\u0011\u0001\u001fG$𨄜=G\u00018􅕥􋷗!rW-\u0012b􉗷-󲫩!TN\"#*`\r]\"NO=Mb!\u0012󽱅&UF\u000e\u0015潠lxN|v꣗A\u000e󸎀OJ\u0004}\\6|_m􃯥{𤛍𢋵E􋸶=𗖷b\u0007@(9-\u0003vj\u0018\u0014􁈔𡸎-M'P[58􄔬絞!z1[􄽡\u0012\u0017xGwQ\u0007\u0011!Ⴋ󲖴\u000c]\u0019Sa􇴴V6􌚨馭\u0015]f\u001d\u001fY*8􍙲砤;⨎흵Lq*\u0005$\u0003+\u001e+Ay󶁃m\u001c!@󿨗𣮠b^\u0006o𪽃󹧶!𘏯t\u001b賦>􁴖y\u0003󵱊a􉾣􃸍IQ\u0015􍊋/󺜝[𣱝Y􏄁0hg\u0000~:xd\u000cZDQU\u000e;\u00079m\\~\u000c𨿛=*|0􉻑鶼R\u001c^𑍴B2\u0012󸺤y\u0007󰟢/🤷@>Vh麪󸺼\u0011h4\n;Q&P\u0012A,f(B\u0001󻀯 𡹹􀼋\u000c𢔚$3𦧽\t\ts𠦃Vp\u001anDA\nsv𤿄!'􌏖𣕖X\r2𡽭r𭧣!@쟝\u0012􆆣%󺟟o\"\u0008i􆨹tV*􉻭󴌁\u0016촧󺠊i\"+jB-g鼰\u001eL\u000b'􉺴Faf󱕉^󳦯𑄡E\u000co󾔂󼌤_󾡼'􅬐9 ,F𗒇d𝦣𧙲YẪ)\n\u001e(^\"L\u001d󲠃󻊩.@0\u0012,w𡍒\u0005:U\u001f3􆍥(时B>\u001aLh}8距􅪳1\u0013\u001c,\u0000󼾺𨑟\u0005􌵱:􍴵J􂳊\n\u0000 f0O󹽢m軗\u0003\u0008\u0002g>bl󻈏꺓p\u0001댊\u0006E\u0000:fQC!K󷛐翝(Va]\u001cT&B\u0004\u0008_#`󾋞o\u0011𨙝\u0018\u0011>𡱽H󸣆^󰆞\u000e􉵯􏦵H_a󸼷M􋈁taIx!c洞\u0006\u001d$i[𣿢r=\u0017皴Dbpc\u001dt𗧋좿挵􌏾H󶏻U..𧍊𡕓K𠊕M`u|V􈚖#sᯆv\u0019P󶐼h:H\ni=𤪞뿃\u0006KA\u000f3b\u0019d\u0004k.t\u001c]f𠜍\u0017壾\u0010\u000c󷕟}6䕭l\\􃥵D3\u0013\u001fa?FR sHm\u0003􎀡\u0008[\u0012\u0002􊙎𓈷O|#\u0002\u001d+𣦇􎿦Tfᤖ󽊯`\u0016NL\u001e𣕼9\u0016𗯏󱏺\u0019󸺡\u0005󱤠.DKMf󲀕}c0\u001f\rFZ󺙲.􄲱SK\u0013Isq$>🛬𤦉^+􌺬󷰐\n\u0006\"^𫑺N2Uo|\u001dM洮|nZ􇖼G\tQꅣ􄻜zzGp\u001c(y嚲㏊Wg􏂾㹵\u0017\u0007𢺖𔐹K󾓅𢍖𡶗󾻫G󸟈"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_5.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_5.json
index 7fe5bc21a15..4bb578f8f95 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_5.json
@@ -1,4 +1,4 @@
 {
     "new_password": "S󼤭[2𝑼0h!􃾐.󱇓*P:\u0015(\u001d\u0017庽$X𫱊K\u00009\u0008]𩦁󹋧􀮥K0𡸸\u001094_椀\u001a󲳮a𫅮((󳸪TXm\u0011_}󲮖m\\o𝟚yJ\u0003#\u0008.K,𤻉𞸍\r:bj𦦶.㢵[Dg뽷𥊖BH mH𬑹󱲳[QnJ\u0004o\\𘆰*r\u0018󰓹m𣭭s\u001aD䎽{A𓉳p[𠀚U\u001e\u0003\"%Y􊁥\u000b%咧􎀏e|𐠵\u0012\u0006,}𫆐u&\u000b􄩋\u001f@8+󠄤?shAqmaA\u0014I\u0015󱚤\u000f\u001al\u0007t􋽿㢅vd𭲇s\u0017\u000f1,󺟻􊯥𐧸✓U#\u0015\u00008󲪵\u0001𨔴𫦙25L7l4K\u0017\u0017\u001f𬰂(𢜴\u0018\u0016`!=d㺁鋧󱶰g 󶂃\"\u0011󼴟)\u0005G􆡄JZ3煡/𤄶\u001e\u0006濌\u0012\u0012i\u0013\u0015)\u0006\u0000Xs`㵋MUmZ!y3􎚡𮁫`n\u001fs<)n9󻭍\u001dB󻖄g􁰸\u0010z\u0017𛃫T3F𢎰3􉭛\u0001nx\u000707\u0014;H%\u000f\u0016sQS{%\tj듩czj&\r󾹹𨙩𮢄,ㅾL",
     "old_password": ".vT𤙉𦯤){𒌼g􏂾􊛥s󷎭𦕼\u0005,~\u0005𠝣\u0003\u0016\u0004􍙸𥹓=1o󱞦\u0005{}S;\u0011 \u0015󱂣Y🨋Z\u001dqPuPV=I\u001c\u0003󾰦\u000emRV` '-#\u001eGcv]뫽>~ \u0017N\u0010𥶄􎱇𬏻󴳌\u0015F\u0018u\u001fꤤ𓇫\u0013􆩮>z\\.k\u0016[?\\𘢶3TJWN󼓽\\宅=PJh1󲂰􇽫립\u0011󹙤􌥃辿𘚌yyf\u000f{%a\u0018K𨝥?Wl%𭑗;Y\"𫚯~\u0016𞠺n2*F󰃑0年Z\u0003\u000enp\t󶎪rz=x\u0013N씜*8\tj􉅃􅈒󹖴R>􋒟\u0006􀼢Q\u001f󸎵`kE [𗃯;𗃿c\u0008K\u000c󴹧-WW\u0001r\u0001ndW=s􃳇\u001c\u000fO𫇶𢯓󹯿l㨪<\u000eGx'Zꆺ曼􁘲\u0002W󿨱󹤦hS𣗒\u0019𠮂k`mW憼9\u0010E󳀦XON+\u0010`]\u000e~g󿆅,9\t;\u0013􀤆ണpD6s𦘀\u0005eem󿊌\u0001弹Lo􈒨ctA\u0010􏼽`B\u0019𖽮[1<:}7]&\u000b균R𫐅a\u001e6\u001c⨪f\u001b􆰎찉v!t\u0010G󷽄\\f\t^\u0001B\u0001𬂌_N+\u000b\u0003ux\u0000.d࣫\u0002%{𝞊􉄥𠺌􀁟uO􃎊\n\u0019\r\u0007\r跕\u00104󾴥Hp􊝰q􇡐bJT<\u0002Vw󰣰I+󼧕C\t櫰\u000eh.,􍓮:󠇍┈{\u0017󳆽zqY\u0002E\u001d짣8vF}𩡢XꙆ󰄕U\u0000WGiN*v𪒋𧦲𥯕\u000cR?i􀊫\u0013\u0007\u0013O(𭮸xa\u0000.𠪽􂖕􌐏j`\"ﲼV𫌢𑀇M+m\u0002Jx\u001c\u001drVs\u0016\u001dJ8Q>l\tJj\u0004DGHj\u0018$X\u001e𝑲D%V\u0019\u000e8󱔦Z%ah􆗅୧KB󽄥\u0003\u000fP󾊯B𢱸\u0006e􋄆Re2􆾱}Q:󵫊C\u0005󼡄<𩫔yS=qL\u001ad0{aࣧs􆧎R󸾁𠬜NS7\u0016G􀼩N6Z󺩻󶮊败mPO\u001e 3󵕃G𗪪:,󲈰\u001f󽾂\u0003pNgH\"i𮟋𩙂\u001850H\u001e쩡@jiHF䠸􉼮S=#\u0004恍&M𭩷\u0005𮀔sB\u0019\u0000VuJ%wk\u001f\u001fJY\u001f\u0016\u0014@[𠩎ਂ􍄤𩤕N|扬L/Fs\u0004\u0008~khlJ\\*􈢪tv3\u0002sg\u0005\u0012c>뺽X󰬋󺆃\nRg\u0015 ;젨'{~\\􅕴oSr3\u0011P󳰎K,􂔧zN\r8沾\\𨗬\u001a@\u0011\u0016\u000bF\u0012V\u0005U􆿡\u0005y􎀽alR_𒃫W<Z36@4忡A\u0018􏘪󰏁wegx􃉂\nCmX󹍂y\u0000𫔚/!b\u0000\u0005\u000evK􈃸\u001e𧇕pm\u0008\u00078\u00030\u0015\u001fo\u000f毅az높\u0013🌃\u0005􃬊\u00023\u001b􇎈+6y7󶙬5'!󺠕㗗g伐\u000c3m\u001f숿󱥔ꣿ}\u000f2m􈗽᪂V`w+#ᔬ\u0002\u0008|\u0014 z𭱝;𡛻\u001a𤾞e𦡵󷥛I𠥧W􆱷舉&Q􉚃\u0006KJ\u001e􄸁Ɵ\u0019x<\u0011\u001fK􅎫󲅁7%3u2፟w\u0012Zz𩡊C[!c^\u0010!􋇝𗱒𩹡\"\u0019\u0004IL\u001d𗆿\u0006𖩈\u0017\u001ex􋝣ⱫC\u001c:J𮆲􏏩\u0000\u001c\u0004顨\u0014LD>\u0016-V\u0013􂛑|\u001e\u0000㟧􅂧V0\u0007Ha𧱣?PXj\u0016󰬗뽽&t\"VhAꓺ\t8\u0000k.𮊎 􏪺\u0017𭔶U\u001dQ􃪍깋p􃃙\u001d\u0013􎠣\u0015KR`龴6\r𘫋io@o\u0006krla𪞹,􅏃0A6#\u0018=\u0012\u0012𧛙&\u001ean𤥕6y\u0016D嘢a\u000c𤙌h𧦪3\u0017𫡆#O*\u001by𩃎aᘀb\u0010L:\u0007xng61󽿭𬛬𐅮\u0017%𨇳\u0005tfJq󿒩2T\u000e𞸊q\u0000q#󷓝󴵤\\\r\u0012P󺀺(C􀝨Ph\u001dBthwz+'\u0019"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_6.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_6.json
index 4069e662e07..7ac778e2cb2 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_6.json
@@ -1,4 +1,4 @@
 {
     "new_password": "b𩣵n󸱛\u001a󰩞C{_𑑕&\u000bMo6gl\u0002\"8󻍟\u001d𨕠\u000f(𡸇\u0017\u0014𥑴1󳚀I]\u000b\u001e#\"􏩥&aGfR\u0005󸯟1:\u0005𬹾󿳏4J}\u001dtZ\u00131b\u0008y._斤𨜎bK\u000fE󼪴𤦒dq🔩\"\"𐦖L𖽕\u0001&\u0013AIx󶜫zⶉz_𐨖<􈣓=>FA5Q󺘠]\u001aS􄡃\t󺻐b!󶸂PY􂛐\u0016􌁕\u0007CK\u001e𤽦>٥;u\u0006\u0005+n}NzAP𑂭RXe3Q4+!5-{ꨒxEx𪑅\u001fU\u0005d𭷲,\u0013]c𨏘9YkkCUR􀾁zz\u0007_\u001f􁃱\u001ch\u0008X:􋽭\u0004s0DC5.UEt􈏴.~젠𭾍#󲠓\u0014LwU樣󷧇q(r_\u000fAq᭫\u001bg 󼟲G(\u001a\u0008/)K󹭏󵬌z𨩹6􆆢M(mHu􅳱B𢜁}^Xz@欅da]VDH=xZ`E|\u0016Er$P\u0008\u0001.睵;8/E􁾚𦆰G+\u001fF󿘠𮒖􇩗^􅼗/\u0013\u001a\u001a\u0002y\u0003l󷉠<\u000c𧂎\u0004뫈5󶧱 .u\u001b\u000c􈭷a5\u001f𘦘h󱔛兞_􏢦y#]R$a/\u001ag-^:,𠱢t\u0000\u0010Fd(\u000f_r=6&R駈t#/碎􈙾ퟓd𡽖\u000c\u0008LL\u0016rl(𗒲_jgp^B𤎇pZf𠁰!􌤸􇧝𮫳/S𦤡\u000fP!\u000f󻢄We\u0011Q]Mi\u00012𨆗s謁𫶵6_fIJ0-E즄饶 \u0008#𘓙쵫\u001d􃬐􋆉C󽳦\u0002[m|O-)햜𠗶𮔸\u001c\u001c笆\u000b^r,^PBK𪵵r,U;p&~O󵁼𥦙\u0011*/f'L)𣮯b1mmbu􅒴\u0014X\u0006|q\u0017𭠠i$󳫫Q𩡠\u0011:\u0000a𫳡v􂑢\u001b󿡉O?𣗨󴢒9 m&𭑋G\u0000'*k7>y𭌕)c󺠒\u0010\t,}I\u000fzT!R􀯁9u\u0019\u00142ixf\u0017h􊺝덋_\u0003&\t┤F􁞪K𤾙\t\u001b8\n{2􂼎IL\u001a􏾛dp}_9𐦖:Xd𐊌𠯑v\u0003jk찄0x\u0016i7y_\u0014𗆆La\tK\u000e.\u000e:#𦥕ZsIp6\u0013\tG品j@\u000e𢔽V𩼅󵎜􋞜\n-0x3􅕹JsH숵0.g}vU󰨱𪺅\t􎮄txWw$p-)NErg\u0011\u001e\u000bS𗯇eK~䛪􉡚7𢆀]:\u000eW\u000c+C\u001b􀼠𠇻􅛂pH􈒓g\u0005\u0012W77謊Il\u000e!<󻏷\u0003ꖀp)}`뢻}𢿢9\u001f=$SXcjkM𭜜Fp.8h󿫬['Ta)Zq𪰲ቾ\u000cW쨵C󺵚􍟼􌵯􀹸u\nc/􏨓𦋡󷴑c0I2]\u0001]g𧔉*g)\th󺏒G􁓲\u001dv\u001fXf5!U푡=#\u000bG\u0013\u0003?\u000eq%]𤅺7\u0016W+6\t&􏰏􌦸-l&\u001cv🧂\u0014􃖤􁈄\u0006󸒞a󺀶m󿟷\u0000@~􉛚RfG>𥨻q\u0018\u0005𐴥\u0014`o\r\u0010t\u0013𖫪􅆔󿼛쾾\u0002f􋈆􄰲i󷤡󽒍u\\\u000c(h,`󿳢m6\u0014f\u000ex𦢇",
     "old_password": "&􎚚,\u0019\u0011\u000e\u001d\u0000\\Q𣇛?&%e˯K󲆨g𢶏]6􅶸XDu󱩾.N-Y\u0016𝁖\u0015𫜩􈓧Z􄠫ꉣ\"IIzef𪋋𦗢􌲒\u001f+h􃡻𦉬@T\n\u0013e+ FG󽺿}󶄇p[󸼛~sW󴫱𠎒[h𧾪$󷦷d󴝖𡇓􈞾\r㬑9􁣇\u001a󼓬볋B𣳍􅞸g\u001e蠨\u000fpN(\n_\u0013\u0018\u0017󲰤u\"􁳰cq𤍄%𩉻@_vDc􅾟CW\u0005P𡚣\u0002Hfp;\nM􏀌𥩘)mg󴎪}l􅵂h\t\u0003㩸Q󹕯Tj\\b4\u001cK!J\\󳙗󽙞\u0003䉥[$󵫚f\u001f\u001c𗬁h`f#cq0t=4\u0013\u000b(n\u0018b\u001a\u0018\u001c\u001e\u001f𦞀􏧡W\u0017|\u0014来\u0001`𥑐O*E_󷫭_4Lrc􄠟𐭹\u001cE[\u001d𗏻vbvn𝩷𫅒WFW^􎺪2􊭱􌺙l=𮨱󹋷R􎑦p𮘯+T达\u000by$\u0004𭃥LpY}\u0004Zc𝀕zLS􌖎\\𝒵9Gzc𝟘􀣪_\u0012H!#𩔠\u0012d𫜈!229\u0015\u0006(􋫫c'𢫭\"{\u00087\tM,#IRi􊠬\n󲰖𥶙`\u0010 \u0005T|!􋺍p\u0018\u001c𡸥\u0002,𗁺\r2􈑿s􋸻\\|调\u001b􇗚o\u0012i\u0008⬭gkx󲰴kd􄟱\u0019i|㖨ﹾ𧓀\u001b/󶴭8􅄳:j󺾱\"RM!𗧓`()2𡆆.􀎩B𩻂E󸗤􅜽󻄓\u001eR\u0015Jn󼊜[VZQ🈚W\u0000iz`Ie􂜬IMY#)R6ﵯ𫩀2b6\tX\r󿻸􅅚N𩻼W=\u0002AS;q𞅃􈨚w\u0007\u0016ptS\u0000T\u000cj𢼼㩬T\u000cSp𐭠\u0006R*In=X\u0000𐊌\u000bM7𝧒s󺃘v!􈪊?󹫔I􈋼hQ􃖔.\u000e\\𥃊j𤂨\u0007􇉽\u0003􆏡bE􊘀\u0003'󹺶뱐\u001aK\u001dP\u0013􇾾\u0011􈹶𦿄\u0007𢇋n&􎬄Z\u001b𫷋 wA>𢝣\u0000-\u0000#\"|𨙜A\t\u0017󾓏_u)𨓅𣃜Le'%*􎚐Q\u000f\u001e𛋰\"2\u000bc3yVbV󾟛\\e𩉧\u0002􊕭esJYso𧵡o\u001c$I􊗼oz !\u0013𝄺r\u001ezt7X⁒%$-󿣰?\u001a\u0006A\u001akZk3E\t􄠪\u0017󸺃1D-G}􁶝2Y\u0010\u0007\u0007t\u001dᰠ\nQ𬣙􋊎et\u001fK\u0010v\tN@?}>\u0018z󱊨j>wc@\u0019w"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_7.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_7.json
index d6188255797..aeb51f98f69 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_7.json
@@ -1,4 +1,4 @@
 {
     "new_password": "􇎃7ﻂ\u001eA󴇌k\u000b\u001b\u0015g&:\u00006K\u0000n>\u001a𝒦$\u001b8B'z\"Yc󻾅6\u001bU)\u0000\u0010􌵬Zj굡𔓻bJ-\u001f\"𠋜L\u0007􄫓y\u0010s-}𢨂}\u001d\u0018\u0006\rR}R\u0018L\u001cqkZ\n\t𮉈1|\u000c5󰏵L\u00178gL䝴5⨓cf\\V~\u0011Ⲕ\u0019𝠁󱮄1n\"*\u0017\u000faTxUcZ\r#5/\u0008k\u000b[\u0007`􎉒\u0000R;(\u0018\rFMN>󳆴\u001bt\u0006{'(𢣤\u0003\u0000T􂄷m\u000c6綠B\n󱋢",
     "old_password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_8.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_8.json
index 368e0a0bfae..f04fe1168df 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_8.json
@@ -1,4 +1,4 @@
 {
     "new_password": "\u000c\u0018j?\u0005𘥂檞`\u000bS\u0007UZ<𮢌\u000b\n𘆡\u00168,\u000e`\u0017!󹾭\u001a󱛎 𤚮~挌7k:\u0001o,w\u001f`d􋤷E𩫎w<Lo\u0016\u0018Cp<𤵌e6(#\r\u001bH7YB\u0012 𫱣\u001b\u00172􂕔`kX\u0018siz.󹃮묌c\u0007靤#@㙕Z\u0001󲊔&\\u\u001c𨺩AQ\u0008fn󽳋\n\u000c}F\r'k􏔇YN[k\u0017+?aq䘷_k󱋿&!\tu!E\u0016=㓘谥u𝠘TT\tlG\u0004󲃱󳯬Ha6MU듕Iﺞ𩸖V랈zi9\"dd􍷕=󴩔󳑞mG'\u0002X5􈛀\u000f\u0005&첾={\u0004󱇃U\u001bx\r\u0003q􉤪瓴=樶p\n\u00057:S󾲁\u0013m\u001f󴠼𥗶󶛜\u0002FoB􏇷uz뾷𩖢^cM󺂯𘪿$ᇟ\u00140􎹠.ZS -|zI H􁳶]􄣋0\u0010󺩒􂄯d󱊛GX\u001db>\u0006l\u001cOUl\u0011r\u0011ቘ󵟟𫒬Y\u0000:*\u000e졞x?>O@mGy+Z,\u000f秜&\u0004Z㝺.w\\\u001d\u0018􃈲\u001c#!𘤻NFM/\u0008𩎉 T𬱎󷩒K\nG𗖿􅭭G󷩉!]\u001dN}􅩄m\u0018H󼋰Nk?K\u0019𠂸ov뺒V\r𭇇pL􉁺e𪮦\u001b𪒴\u001fr𡂃\u0015\u0016\u0015\u00133r^EꡖZ\u0008P<𡆶𡮅􄚆𫪥榅􇔽\u0006\u001a\u0000Ea'*W𫜁𧹫𫉪\u0004LV4栅\"-/𝃆􎣋3䱍\u001d\u0001/xiy󵕹稄Zm7s8l󼆢BT({bn\u0011𥰙vD𗚫r𐕆_#d螒~툏;BKF󲟌] 6f𞲙iN^𠑪\u0018eN􀙅X:\"+\u0002󴑇C\u0014*𨌷j5􉙦=슳𧹳8둢󵟁􉎖𐜚9}SK𠏣\\0𝢈#v~J mt3Xx\u001e\u001f􁅷\u000b3󳛧<bVwan%\u0005-𝠮\u0004\n7􎠼x󿼯M$Lf+𥓡𩩡\u0015P$䖓㩃𠔊Lu🙹|􂜯*\u0019󺰀n7NarTK󽩍P􂠏\u001f,UU󵏀\u000e󼧶􋴾6Z\u0003h3\n3􈏨𧚋𪑄󺷌\u001b,*ﶹiQ\u0019>\u000f\u0012Tc󳕫\u0014m,\u000fn!b楙'ac煓oV䢖W𘜓󻘁\t\u0001𤜖\u000e􁄷3%hmTnE+\\%C慼𡦉3󰲵$󶭠󰉟04|En(䋣\u000e𪠋`Xy􅈄󰛇 𠗂~􁟄]\u0013𨵵9Y𨥠3T/􂆫\tBS3;A]\u0013્P;.󿡚\u001f\u0013\u0015\u001d2[捃􃇌 ㍃𨛛\"Q^0\u0002T6䛋yB\u0011?\u0000v􈇰xd􂴨Y\u0010􋕈\u001e𩐇\u0007\u00014/R𛲜󻑁V\u0012A6󸅰(T\\O\u001fTu𥐷\u0005)塪R\u0003\u000bR{\r\u0002m󿂦𣲖\u001a𥭾縘􁋕\u0019\u000f\n]&<\u0015-=􀹻|S)𨟼ꬺRq5e/wH\u000eTh𣡬tjJ󼉉g\u0018\u0010\u0007e\u000fV3𖽑`􌧶s[KR|Y<Rh:􇉴h􏪩\u0017󰇤N\u001abc𞢌A&1\u000c\u0011\u0002𦵻V㕗L7KfEYsH󻩤\u001aqQvk\u0004?\u0007잯ꢍ\u000b󵗑~y8*􊂭󱡋~>\u0018􇛦!\u0017M􊤵𦢴U\n\u000c}!K-\u0006\u0006mp\u00128:\u001d\u0004\r􃡰󹷔)(\u0003󸗣󰊱^􌂏𘫪+e瞣\t𧏫N\u0019i\nfN𘊌𤟎4Q\n\r.3篯|H\u001b󱼇󳫞𧀅",
     "old_password": "b\u001f􍉭X󹄹\u0004.m\"\u0014\u0014\u0003:1c8󴼼>QU]\u0003Re󼆭\u000ee\u000f_~\t\u0019𬧜^BGb󲇄\u001a󼈫,4Ux긜\nA䵸􃠍\u000co\u0018󴝅#+@㞝J\u0016>\u0001[Q穚P-\u001b\u0013󸜤ﶬ\u0015QmD]\u000c\" 嫭梀\u0013F􉢱W2\u001d\u001c_𣢬S蘾/\u0001@󶇴u\u001f \u0014x󱟭𡵝5롙@󲻔u\u0013🇫𩓮g!𪣙HZM𫩒􎶉j_;鯖v_~󹋙U\nzDxZ1RNণmdb}𥐑b;s\u0007e|&\"䜶l\u000e􆤧𒀓𨗞Ƣ'j󲠁UB[㤩\u0015\"F􅬔𑠻9I􉋫\u001a,+𩓋\u0004\u0019BtZ}\u001aZRdmA\u0007hEj\u0015𨏌󿎛슐!i4𧆂,,-4T馟E#\u001c🤝\u000fKj<􎵔󸽌`R>𛆞𢅊\u0012Vq4\u0010𠄿1젱\u0005Mꔿav𬚦\u0002󸒙\u00005𨌛!&]嚮p\u000b`k𐝕6(GB󾢸\u0012L󳖖a'7L􋮜[\u0017R󹨫|󹌞bZ􂾘;6\u001d`\u0015􁳕\u000en🚧􇱵󴓣L𑒷Vn𮌾nw\u0019!*bw\r􍉆\u00063攽J􌱼\u0010􇜟\u001e;9\u0017즴Ts\n?l𩽈'y*{ G?>y𨦻4󻆦𣇀M\u0005@􎌉19:\u001dfI%%;p􂏿j\u0002쮼{7󿒑mR𩣄 󿕲`b+𮒢􋡧熴<󳡵b'􏰭G􏽄𭯥󸱕\u0010\t)\u0017_\u0002𭺋\u0017q\u0017D㣕𫦇8\u001d9S%t-;~A{􌋽󶠙t\u001e󳦥\rD\u0001\"󼼍􇮟R\r\r\u000e;b􇜆\u001e𗨕רּ/*m?~G󵠋Z󻒭)𢡑𠰞󵖋lL=􄔨O,,j;x\u0001𒒟\u0007\n2.+-䂍&bd𢲹.\u0000􍺉\u0011d󸈜q\u0006\u000b\"𥶯􀦁􏖪c\u0007(./\u0002⥔E􋞷P;\"􌪹h㭛{咆􎰅󴛿Wme=ny\u0012󳠔(𥤡󱸓 \rC\u0013?>ZD\u000f}j\u001a\u000f<cR)>\u001d𫎉􇽄 )V>􆇒􏄝)*l^ip&^\u0004󱿜&Y\u000e(L&\u001cs󺞡\u001am巢OR*􈢡󰘽UQ9a𪔭\u001e\"𩪋pt\u0013hxbnb𣐄\u000f􋮵M蹙𬸵fJ?}t󾚗T匪󾌙?\u001dg&V􎞙D\u0015M􈜰0U\u0008퇮􀒞󸺝hjT\"󿳀\u0004^\u001d#\u0015\tv+t\u001c\u001fL{󷃽𞸧x,󺏜\u0014󺭵<7􆑜\u0017w\rz𦿨󰢚\u0015\u0016q𐅠󹀜$󽥪|:\u000b\u001ad\n3]0P~Q\u001c+&@[\u000b𖥮M\u000b𡓼\u0010\u001f\u0007_S#H\u001b󴎭𫬑𐐵\\\"\u0008}8\u001fF\t\u00052|,\t\u001f逮󳋨\u0010+𨦀D:𤒟7 \u001de􈹸#'\u0014MpE_n𗔱~󸥢@􂦓&=1􂖯􈿟)R󼵇\u0001t餯?𗄤肵E𩴺\u0004zX􃈐/mZ7餦\u0003`m􁲵!$\u000b\u0011Z\u000f \u0013,㢮\u0002il\u0010᯼󺻛A~EU;:\ri􈢔l詇vc$\u001a_􈃑EP4􍟝l~|\u0007􀫠\u0005\u0016􋳸+􆕹J䵼\t\u001d\u0007A\u0004\u00004g!𤨝囯𬮡\u0002N\u0017rrpN5ks\u0008ZM\u0006*z\u0014(Pl\u0011\"𑐭􄮲K[󶓅RH󼂕\u0018[x.󿸷ac9􏒸<v&}󰪢<\u0006UK\u0004Lu~?𨑇r\u0005>$䲄\u0006\u000c𒇕Jy!燂"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordChange_user_9.json b/libs/wire-api/test/golden/testObject_PasswordChange_user_9.json
index bccfcd9d542..3da96764827 100644
--- a/libs/wire-api/test/golden/testObject_PasswordChange_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PasswordChange_user_9.json
@@ -1,4 +1,4 @@
 {
     "new_password": "<>f:;-RJqអx𧟙QT𘢙;X5.󺁼;1\u000cP={7𡘶𤾜v\u0014b\u0003󾗴\u0015V/R\u000e󵄏!\u000e\u0005v\u000eC\u000b\u001c[Q\u0017h\u0018X-𐎗嘉􉞚:BVj􍨅\u0005ꀩ𗲸\u0012\u0012zRZE\"\u0012\u00040𨉹+i\u001fE췠R\u001d󷹚\u001c\u0004𥴑𭒛\u001few𫠻\u000bR_=􍽼𓅝\u0017kB𪄕󲾈7;!?'ZN(n)󴻔|𤸸\u0013\n\u0011\u001b󿱜\u0019㤶wov\u0005;<a#\u001fh\u0005\r璪􍰕Jh􁎱𨨉B$jh\\\u0003\u0018zZ\u001fsd𑨓q\u0000􉉁x!\u0001kk𠝜p\"\\𗞙\\􈚸C󺃢{d\rZuR$?\t􇰞S󳈭♭W𡸆(\n𭆧R󿯱\u000f\u000bTأE:KH{:􎍻\u001f\u0005n\u0008􌧁*C􏜹𭔧e陵\u00111\u000en岚 L𞥞0𭇀\u0017𥺳%𗗴󵭮\u001a𪶱 (<ﱶ𒋞𭼈󷛥𡽊d\r\u0004I󴔧RrJp\u0019-^Zr𔘯󳷍쀚Gg\u000f\u0001[𭂌t󾱼0󳙨lup1,\u0001]%xn󽉩󻥁\r𪘬Hvd󱄖WN落AV_}w@\u0010_x\u0013g{t󼦐^60l󱊼\u0018\u001b歔S}\u0001ঋ󾔟𨮴𐔚\u0014\u00150ZNi<8\u001f𭜷UAC\n}\u0010TbXb6粉B󽃅\u0002a\u000b󰖺8h􈾿{\u001daAZr\"0I/c?\u0003|<󶵆󼅻􍋶@9󽵮頡}%R\n4󹄺 悡y\u0018J𦕎󸢁􁅭`汓䧇N\r\u0018𭷇\u00152s\u0007A^LEWF\u0016e\u001a\u0012\u000c\"󳃏𬟳-󹧊-\u0017{~󱡖V󾣈\u0012􄢵N􀀹𭪢PV&Q]*bM+_뵔h􆩿\u0002@pM􂘻\u0008'-kvi=􅞱 *􄘈\u000c駈dc\"LJ𤀄Oo\u001f용⩭j󿇤#\u000f􇂳d􏖣𡬉A\u000br􍓓6\u0001􌨔A k𠗍󻤁i>􈌜]𝁐󾖥𠍴4􉀛hꐱ?iD\u0012V𗢺t𓍫 %𫛋t}%𩈂􄴪N\u0019\u0008ᴵ(ᨮ9~𩏟*A\u0017诼􉛭\u001b\u00197`s󱐿G\u0018𩹍Q󼊒\"\u0019i|\u0006𥆀4솣1 ^󼠹雐􇸝BBO\u0017𮀬sz\u001d􏵘凟_PsX𥔮-)󷘦\u000cⱑZAT\u0003^􍓙$󴳀􍅠M\u0013􎂌􈥋箼𡌄󶨳}+p)H\u0004](fiL𒉶\u0002]m(c􌛼􂠫wN𡊉Zs;&;􌶷\u0002c?\nP𨈒R􆂹‚$󼸕'(v𗊦\u001e𠅣z\u001fV\u0011󳉛+J:󿆆澗<𧜜\u0004\t\u000f;L<wZ𩖌4O\u0013(S~􉾷󾂟綘𝨦@~#K%Tkﶴ\u001edCjb󾍍P󶓊X@甸fVdi%PꔝBk`\u0011L\u0010\r󺫯?dhu􅨳\u0012ef󾱯<嘆o󽎩&uc@\u0017\u0012l𑈁9X\u001b𤠖𡺂UUd@􉁓\u0011lb7[𗠭x`\u0005>l礹Bl󼺖g]\u00044yZ𢽭)Qs🅊b] 𤢲\u0015{\\\\]뼥󾆳b{􀍼F𬪣1\"O\u0015*怜\u001f󱬤쵼35>>|\u0018H\u001dZ_4}6􁿜Ty{?\u0018\"􃐑󵇪dM\u0007呸.@𝞔\u0013󰐃hX\u001299hs}\u001b\n$\u0005󿃘o+໙Z𐎡h7𪁗fa$gT\t󴒳􏐤􆢶X9!鿆\u0007\u0004H𘝃󸾸[\"\u000e􃂪|};󴦭흾D([N\u000e󽖞g𬇘四𢭣Bxq\r􎺧\"oቿ𨝢\u0006乪T鞥do\u0007u𥀇馷\u0001\u000eo",
     "old_password": "𝣃il𠯁)R{5\u0006Xm󾓟\\T\u000c\u0010p tq8􅏺5Q*\"􉦱@\u0014𬠢\u0018N,𧣪􏪣;3.p\u0002\u000cLA-𤤞j\u0008ON\u0005n󰘑U:\u00047@\u001d􍌭ky)𒉹eri5CF_􉓿Y抹^Q\u0016\u0015Q\u0013[筿\u001baY𬄟~\t𘛷'\u0014M^\u0019I󲭪4𗤦󽈨b\u0014r􇌾r\u001e𢗏􈰳\u000fuHc\rg\u0011\u0005d3\u0001=p%ry󵂲3mhoP􎎰\u000b𧮛yXMw<1\u000c󸈎\u001bතlL𐹵\u001d$\u0007󽮵w󰡠{)\u0015w82K)\u00136𥿽v:\u0001C9i󽫖䘆R􅸗/w𘒆㹷𭗳e30R@T𝧧_\u0015\u001b\\􊴜\n_􄿝\u0007iinb2I\u001e􌐱𡰪<V\u0005]<tIg-b,\u0014\u001dn\t􏞩􅥏\u0002I\u0015;kf\u0012𝝻𨾐2F'cN#)󾿎\u0016\u0001𓁆tRWc󳀶𠎐󰌟\u0000𡔜2^\u001e􅐲\u001a\u0001􆀽q69n5b𥹬󾛓W\u0002fn\u0014𬐹\u001f=\u0013ER𨉰|8Z\\PX1\u0000G>\u0001󲌞Zep>H􇨂uUC%\tS_fH \u000e􈶳OH\u0007\u0003x\u0007/\u0006\u0006󲠣𨗔𑫚𬵪b`%篇\u0013:UIj󹝃\u0003􁇖\u0015\u0002S[󻍂1Z\u001a\u001f􉨐h%\u0006w\u0004[yh\u0007g\u001e󲴾N^{g󵄼󲝭\u0012\u0007-􃌴\rrJ󽈆}~;8\u00060󹚁\u000f0\u0006\u0003fXG\u000e}H4\u0012zC\u001az\u0012\u0010z\u0011𤠮H25*Q􈧊⦰\u0000$h\u000e𠶶ꩍ$,ￏO)^\\nvK<󱡎1R ,k󰥻k&󷅖􅯾V𘆵𩮩E\u0017EP\u001eR[7F(H󵮫\u00040\\\u0018k\u0011􉂇ql𤭈,\u0012\u0000v\u000e\u0010p\u0016IqpU:$􀮴|+\u0011\u000fT󾳠v:픇𠠂\u000f𨲗𮢰\r\u0000􇴱--\u0000󴏿J𦬜G󾷥\u00057\u0000'o8􁮄\u001b5wuH"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_1.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_1.json
index 6792d45832c..f0eecb8e96c 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_1.json
@@ -1 +1 @@
-"qkRjzBBw5T15N03ATRzYOb7rbsiMZpvvs3CZ-aCr3X5E5VeW1xeefNWqTX2jQ7_4siC8baRtlvKdCSuwri_nuPtI1opZNpkEZmuN1gCWPritW_jNSTtjLsfZmo-H6aEem4A-Gljm2oq_m-lWx2LxF_fEg-N=-mYIsueLOOJm4wz_N4DqvGUQttX3pDJFhiZS_grUhGytHLGcMSjznQMJmVNELqLkKe7akS1ioWWHCo3dStn5qnb0N1WgJ=1JevpWnKxqY9IFOoes--iaifxYYeCpaClMmwVUcr_urk=lnCcFEklZ4YBygGOXBuFVkbJ5yvH1ihByJhKZODxbCQRVchO87=tInw_tiUll2Xo_OxXxMIx7Df9DlDm"
\ No newline at end of file
+"qkRjzBBw5T15N03ATRzYOb7rbsiMZpvvs3CZ-aCr3X5E5VeW1xeefNWqTX2jQ7_4siC8baRtlvKdCSuwri_nuPtI1opZNpkEZmuN1gCWPritW_jNSTtjLsfZmo-H6aEem4A-Gljm2oq_m-lWx2LxF_fEg-N=-mYIsueLOOJm4wz_N4DqvGUQttX3pDJFhiZS_grUhGytHLGcMSjznQMJmVNELqLkKe7akS1ioWWHCo3dStn5qnb0N1WgJ=1JevpWnKxqY9IFOoes--iaifxYYeCpaClMmwVUcr_urk=lnCcFEklZ4YBygGOXBuFVkbJ5yvH1ihByJhKZODxbCQRVchO87=tInw_tiUll2Xo_OxXxMIx7Df9DlDm"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_10.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_10.json
index 79c3c7c9553..68b715cba2b 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_10.json
@@ -1 +1 @@
-"jzUinT2hVYRkGj3lXaePbIZWdUem6zgm=nBe7N9oc6JEZrAtPMNneQ0CalcavpdwI_=3P5SrqGerOeO3UO57-pHZwr2ACL9exYEuSeU50B0SMX7GpdtqzK2wTZ_Hjb2K6OSmeXAgX4ZmAtDi-uLzC5DST4rDxA9wbaJ=57LKcu-1tY_9Z3tdXiReO2vMAAwc3gArD4jBblNpqeEO7Ku1qmEGIwJcZ=xE1=e2E0FQsdOat=uPi1-=u4PS2BEKjXIHjFeVm0rSG=-eLiabb_GbKGMj84We1gNzvNjqwhjgniFVEw7Z7TokhnkEXMzuf23ghIkIQ2lPBKTHlQ7AIflEKFfM4MY1ga=gycVbiW3rNFpRNJUYOKmG2rQvD4=eJgZtNdvBHH-rcCxAbl4UVJbg0gSgPfozOMbftEL_KOSopL76UEE=h=DXnc-MGdM_b_vURTgEr1Bk3DeMbOpHQKSXW3KhGylgeqrc6tNFTD2L_PXvS39poNhi38VlCK0QWxbJ8sw6TGcnPWUD4jo7ZL9yA_ps4Me6H0vWt=2IdgGGtTMUR-XlEKk8nweOgRNWcMdEp9v4csVnaTfYRK-QTy8GBS969RrhPWZbQbtfmhMBlFimVf6kmv5vntmtd86J5X69K_V4pjRuaTulHjkletviTtZzCEx4bTM3qScHJfBR35dJ8YiOTvfwF6u=UnV6exO-Y-SWKfu8SNZmd72rVByh0GJiANd28D73IVCsHW2UsrKO98wpmM_yZ1FdsagxqO03VVrRL9pOEX4TLfqAKCgtJ2ExwsKl1MzpAOSOxsn=PBcWY--2Wqg3c8tUmN4I9gMai0oU31Uc8c6AkY67u61qO6DXzQ7F0brTJ1af9H2o_jhUfHqv=JwHWJjngKiQzX599fAvXcny5nV_gm"
\ No newline at end of file
+"jzUinT2hVYRkGj3lXaePbIZWdUem6zgm=nBe7N9oc6JEZrAtPMNneQ0CalcavpdwI_=3P5SrqGerOeO3UO57-pHZwr2ACL9exYEuSeU50B0SMX7GpdtqzK2wTZ_Hjb2K6OSmeXAgX4ZmAtDi-uLzC5DST4rDxA9wbaJ=57LKcu-1tY_9Z3tdXiReO2vMAAwc3gArD4jBblNpqeEO7Ku1qmEGIwJcZ=xE1=e2E0FQsdOat=uPi1-=u4PS2BEKjXIHjFeVm0rSG=-eLiabb_GbKGMj84We1gNzvNjqwhjgniFVEw7Z7TokhnkEXMzuf23ghIkIQ2lPBKTHlQ7AIflEKFfM4MY1ga=gycVbiW3rNFpRNJUYOKmG2rQvD4=eJgZtNdvBHH-rcCxAbl4UVJbg0gSgPfozOMbftEL_KOSopL76UEE=h=DXnc-MGdM_b_vURTgEr1Bk3DeMbOpHQKSXW3KhGylgeqrc6tNFTD2L_PXvS39poNhi38VlCK0QWxbJ8sw6TGcnPWUD4jo7ZL9yA_ps4Me6H0vWt=2IdgGGtTMUR-XlEKk8nweOgRNWcMdEp9v4csVnaTfYRK-QTy8GBS969RrhPWZbQbtfmhMBlFimVf6kmv5vntmtd86J5X69K_V4pjRuaTulHjkletviTtZzCEx4bTM3qScHJfBR35dJ8YiOTvfwF6u=UnV6exO-Y-SWKfu8SNZmd72rVByh0GJiANd28D73IVCsHW2UsrKO98wpmM_yZ1FdsagxqO03VVrRL9pOEX4TLfqAKCgtJ2ExwsKl1MzpAOSOxsn=PBcWY--2Wqg3c8tUmN4I9gMai0oU31Uc8c6AkY67u61qO6DXzQ7F0brTJ1af9H2o_jhUfHqv=JwHWJjngKiQzX599fAvXcny5nV_gm"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_11.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_11.json
index b2fae2090d6..2080c7db41d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_11.json
@@ -1 +1 @@
-"4zmo3bi7rz967AZBNHCOypgyvoXDuYEbVzK0IJ4NhiB0K9B-DW9vhgUqlB_E5c_JOF5EyY=YYDkl7iQIUkE_wSqJdl_6xtDmfuOpTw45EE=aEYZrvr9TPQZmguBbgYFDsKXJJkp_5=00BZLSFpwgVp7CpWY9YAst5YS3jrxteEDg4LfhMnFXzwjEpXNgZIZNmgze32GTSJVYBfno7bgQjc-c9YUYCCS57Xq1sueg3MrbWwh=Sx9q2s4a-FNlty0RobyyB9VS__nWcdue1fDVfh91EUbap8piq50-3sZT3YIBioBXpkX1OV4aGcGqxKhoYcf9TwjzywEoOGVmxwKjbt5TJ7A=pb01elmbMXXqR-ZlR7T7umCBAxCFyHBQYcO2h7-fUnApIvO=Q-1tcH7jNtoSwvLI8jipPHTxhWnXRtj-NaIuBBmIcndtEXVH_dn8wJJPHZfjyZ6lAfdqYmUpkcj4ojIcPsdxQqO29dCWZ9rtGe4f13SzIiNR4A2BSmjVQyJ=2HZxUWBzwkKvIZkc3pFpoOHwJL1QOR2jgFvgm1Pirhpj2OhU9pgg7X6DF5I_-dr7bUJ_xKZmh9jkVyxwxxzmgylQz_cxp-J3__hryXHINaAB0khFgQ24r6p7b4zS8hoBuplO_vVIhdDMZrGFKv5POZXWMxIHC7QS045pmXxanFMPxZXNhrnHb8eAYNTzVRotD15v82JE5djNXK_h1mrIwkpcyREXJJdVokS=WBvc30Zo8MMumPyCoPWms_8-LzgfmkF6NiqQKErR9n_GWIIxA3mkGmoOf5t69oMLNOLKKpsRrIs2SVLBo1zBVJILSIncvfROeemL95=solpZUol7lKY-UWQSj38xkKGwM4OqQKLckFbf2DYkrD=aBNIx4ygdcGwOPHeYXqzxDOPy99ipzURywB3qpFSj8CJNSgjArkUPufApDyMngIlNyUXhvnwvQGGbPQDCu8WQ5bOexMOTPudP7BLax1zL-77WvHwKxjB"
\ No newline at end of file
+"4zmo3bi7rz967AZBNHCOypgyvoXDuYEbVzK0IJ4NhiB0K9B-DW9vhgUqlB_E5c_JOF5EyY=YYDkl7iQIUkE_wSqJdl_6xtDmfuOpTw45EE=aEYZrvr9TPQZmguBbgYFDsKXJJkp_5=00BZLSFpwgVp7CpWY9YAst5YS3jrxteEDg4LfhMnFXzwjEpXNgZIZNmgze32GTSJVYBfno7bgQjc-c9YUYCCS57Xq1sueg3MrbWwh=Sx9q2s4a-FNlty0RobyyB9VS__nWcdue1fDVfh91EUbap8piq50-3sZT3YIBioBXpkX1OV4aGcGqxKhoYcf9TwjzywEoOGVmxwKjbt5TJ7A=pb01elmbMXXqR-ZlR7T7umCBAxCFyHBQYcO2h7-fUnApIvO=Q-1tcH7jNtoSwvLI8jipPHTxhWnXRtj-NaIuBBmIcndtEXVH_dn8wJJPHZfjyZ6lAfdqYmUpkcj4ojIcPsdxQqO29dCWZ9rtGe4f13SzIiNR4A2BSmjVQyJ=2HZxUWBzwkKvIZkc3pFpoOHwJL1QOR2jgFvgm1Pirhpj2OhU9pgg7X6DF5I_-dr7bUJ_xKZmh9jkVyxwxxzmgylQz_cxp-J3__hryXHINaAB0khFgQ24r6p7b4zS8hoBuplO_vVIhdDMZrGFKv5POZXWMxIHC7QS045pmXxanFMPxZXNhrnHb8eAYNTzVRotD15v82JE5djNXK_h1mrIwkpcyREXJJdVokS=WBvc30Zo8MMumPyCoPWms_8-LzgfmkF6NiqQKErR9n_GWIIxA3mkGmoOf5t69oMLNOLKKpsRrIs2SVLBo1zBVJILSIncvfROeemL95=solpZUol7lKY-UWQSj38xkKGwM4OqQKLckFbf2DYkrD=aBNIx4ygdcGwOPHeYXqzxDOPy99ipzURywB3qpFSj8CJNSgjArkUPufApDyMngIlNyUXhvnwvQGGbPQDCu8WQ5bOexMOTPudP7BLax1zL-77WvHwKxjB"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_12.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_12.json
index 4dae2c75720..bc0d543c093 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_12.json
@@ -1 +1 @@
-"7B5RbyOOT8LTS7BPuwihZ8UjY8EhhJ29WTv6loe2iSvv=UXurtFgeBJPaRC15AwNMjZguDbldUjJUAAOMc7dcwcQn5PwvYbKHhz3apJfRfWidG1_VU3t=4655CqZd0oVIT4cXHSC8vtf=kftZbi=QIjoOc53Yxuci4uT0z5gsL3iD1bWizEjvA6txdvqzaftfkx=08UzBIe20l4uPPXhAfNAB0VBF8lYVPEO7_7VkflX8tyvF4Aq6e2R8Hl2mmQ=hUuYnBv_ArASVQblW49nkeTaTZBfxX-wugIgYD0Gk2-0sjId5VZrxwzfB0VZA5hxL52KzFWJXn-=W=1zdzROUd2Jd5jrTbW4ID3CuVceV5TeyejLnKTph7=dOxZwSwzpKb9z=91QhFBr=H6eVUAirSHhONThnoElBkFaGYYnfMtiaV9DmsNbBi3d7ixwNsPKoT1bKIOk6cTlZHB__ZhfE_dS34sEy520TP9rg9emlFyPz-Mip6a36FDr9SOgbb=eunv9QVcVsmTaSTGHC9iynJfSzBlsJIV1S8jOQV2=Ke=tR3uhyD-J0PRVWyLv85BMgRJK3uI2tPyWjmSK5Sf_f3oOcT_MHiJUE15UCl_MuhkbJ8G=mEJHunybzt6b=zM94JPanP=ALCsk4oFMKs067z=g4rMF=j41Twil--sacddn2CLZnDqGRqusjxG2Sy9eiyJvbGPmLB3OWR9Nw38uLOrBUV5ws9Lv4WOuuvavXl5qsOCY9k5Y_kTIZPPJGhvJq4ujPL4zji7P70LqYAGzO440yCJMwt4rQpnR3uxwM1qbXd-0cyM2XcsYPPEOzchqdNH0bK2JuxTipyrQdEY0YeHmhgqh2Ajk22T9ZHoRvbQGzgq7qm0DKSVGYoWM7rocK02AAN4ywcFE9qCrZIbWCRGGLW2mmpIR4GCDm0e=jzDir9fG3pbWqoMNc7NCxD4bIV_4kSaOfN31zly0SFpBTl-xnplSDY0G"
\ No newline at end of file
+"7B5RbyOOT8LTS7BPuwihZ8UjY8EhhJ29WTv6loe2iSvv=UXurtFgeBJPaRC15AwNMjZguDbldUjJUAAOMc7dcwcQn5PwvYbKHhz3apJfRfWidG1_VU3t=4655CqZd0oVIT4cXHSC8vtf=kftZbi=QIjoOc53Yxuci4uT0z5gsL3iD1bWizEjvA6txdvqzaftfkx=08UzBIe20l4uPPXhAfNAB0VBF8lYVPEO7_7VkflX8tyvF4Aq6e2R8Hl2mmQ=hUuYnBv_ArASVQblW49nkeTaTZBfxX-wugIgYD0Gk2-0sjId5VZrxwzfB0VZA5hxL52KzFWJXn-=W=1zdzROUd2Jd5jrTbW4ID3CuVceV5TeyejLnKTph7=dOxZwSwzpKb9z=91QhFBr=H6eVUAirSHhONThnoElBkFaGYYnfMtiaV9DmsNbBi3d7ixwNsPKoT1bKIOk6cTlZHB__ZhfE_dS34sEy520TP9rg9emlFyPz-Mip6a36FDr9SOgbb=eunv9QVcVsmTaSTGHC9iynJfSzBlsJIV1S8jOQV2=Ke=tR3uhyD-J0PRVWyLv85BMgRJK3uI2tPyWjmSK5Sf_f3oOcT_MHiJUE15UCl_MuhkbJ8G=mEJHunybzt6b=zM94JPanP=ALCsk4oFMKs067z=g4rMF=j41Twil--sacddn2CLZnDqGRqusjxG2Sy9eiyJvbGPmLB3OWR9Nw38uLOrBUV5ws9Lv4WOuuvavXl5qsOCY9k5Y_kTIZPPJGhvJq4ujPL4zji7P70LqYAGzO440yCJMwt4rQpnR3uxwM1qbXd-0cyM2XcsYPPEOzchqdNH0bK2JuxTipyrQdEY0YeHmhgqh2Ajk22T9ZHoRvbQGzgq7qm0DKSVGYoWM7rocK02AAN4ywcFE9qCrZIbWCRGGLW2mmpIR4GCDm0e=jzDir9fG3pbWqoMNc7NCxD4bIV_4kSaOfN31zly0SFpBTl-xnplSDY0G"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_13.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_13.json
index 9d70294072e..cb6c1853143 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_13.json
@@ -1 +1 @@
-"uLy6-eoNSfheQSUol2hgEpjCV8tPRESrxVC49FNE_98Qh0DvuPiXL3Qb0YToWC_azXVKeb34R63N7VRrpmb_pxNfOSLhNYrD2lwO=qMQVYDkxJ1LiPghXs5x2mPOOGTx4Xs1kRTySQ5TUNoPtLdTW1kbhRBLqg84fwP8W6PTbuOBQJh3QqM4gWDuMx3NrNY0RwtE6q7ydIHZOPjkE5IJGDMXP1WcCD6SlEx=yUMZ0_ke_N1ESDd8gwQk9XPoRzO=KNRyrM=1vVcY0tTJTB5IwZ8k7K7XOt9w52=u_v2lv3y6OZagm2a-ImiHrsCQoa1NsZzWfCRURWwuoOALttH53oNhOGQ0wCgW0K5LKUsZBX4q6adKTp_OTYAGQPFdzfTu=87zUvD-bOnqbZPvpOsQQ1_1Dr6CF1WhkbpqGiSyBGMjskcPGx=vYYhzp0mWNXJiEkI8Gr61CmT4vaTs7-5vfhhoQviE=MS=f=v13j3ySsWRlKqE_UTecoEXXbVg09KmQ-07teiHWnLnUvAp8s=HWI7N-q0akEGzHYjIUkxhdJmkoGH-POt0B9neh6A20csZNvdLN9Q9dUNrz7xho1Cn1YMJ3RPaR17VH2yrWy6yWuNsko7QQ4ADy6oFDaN0OLfXTl8D4d=JLRxbvvhjPnyrVWew3Qtp6T2cy6kRqYspx7VpkgCpudQtRj9167qBumroKecMC2qdmowfxtkkfn8E5dbB1euR-7ZIuBUoCaczABv7VCbFa_rFaLD0o24OjnAaG=tUK_tGX2TgR=xE0"
\ No newline at end of file
+"uLy6-eoNSfheQSUol2hgEpjCV8tPRESrxVC49FNE_98Qh0DvuPiXL3Qb0YToWC_azXVKeb34R63N7VRrpmb_pxNfOSLhNYrD2lwO=qMQVYDkxJ1LiPghXs5x2mPOOGTx4Xs1kRTySQ5TUNoPtLdTW1kbhRBLqg84fwP8W6PTbuOBQJh3QqM4gWDuMx3NrNY0RwtE6q7ydIHZOPjkE5IJGDMXP1WcCD6SlEx=yUMZ0_ke_N1ESDd8gwQk9XPoRzO=KNRyrM=1vVcY0tTJTB5IwZ8k7K7XOt9w52=u_v2lv3y6OZagm2a-ImiHrsCQoa1NsZzWfCRURWwuoOALttH53oNhOGQ0wCgW0K5LKUsZBX4q6adKTp_OTYAGQPFdzfTu=87zUvD-bOnqbZPvpOsQQ1_1Dr6CF1WhkbpqGiSyBGMjskcPGx=vYYhzp0mWNXJiEkI8Gr61CmT4vaTs7-5vfhhoQviE=MS=f=v13j3ySsWRlKqE_UTecoEXXbVg09KmQ-07teiHWnLnUvAp8s=HWI7N-q0akEGzHYjIUkxhdJmkoGH-POt0B9neh6A20csZNvdLN9Q9dUNrz7xho1Cn1YMJ3RPaR17VH2yrWy6yWuNsko7QQ4ADy6oFDaN0OLfXTl8D4d=JLRxbvvhjPnyrVWew3Qtp6T2cy6kRqYspx7VpkgCpudQtRj9167qBumroKecMC2qdmowfxtkkfn8E5dbB1euR-7ZIuBUoCaczABv7VCbFa_rFaLD0o24OjnAaG=tUK_tGX2TgR=xE0"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_14.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_14.json
index 2f17f3d1945..4f10a319ed4 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_14.json
@@ -1 +1 @@
-"aJvhrwwqoMevSVUhYAaS4xQJXZKbBtbsNCxdeE61CwGw34BsqURBD3J7oZmOdeI_-Hiedcr7rug=TBqmSVFmJ34DqJjM2AAk8IYs7fId7AA=n2gRY65J3p8kRn3yO2GyF2ek7i8SzGDojsyeV3upvmTHrwESRrbi3jI-lT8KmuiNy9xA4LY0O5JyIwsDzX73XgfQQbBvWcsIC=K2yHMLoZs6hkDv8uqLAb0pXGsitx6mN3ym6a99w-usMYoNsnwOKltIGMDgWNygvejdRFc1uf0pRAH8pfkmJ25HdgkREV5uuSTvfEk57bMCXKdrBh0bRGcs2nisUURLnLy3D-ji-R2-DW1s9YIRLuJCe9c1DCVei1BCL21uz1lvZ8nw2edwf=xZ9ytB8Rm34wfjP5YNpA70D42mPwuvy5eg3UjKj3bD2X5hGN-aOFVYqdA3CnLojKsEovZCxjINV4f-cZOY3lVhAmk0IpuO5=d_CRql4xH6lOcZFGCjjLmd8jgaqSw=3DdpiFGHj18ipyt2yR3EVoc08m1EegrrBRnMVHATnCOKF4EU53"
\ No newline at end of file
+"aJvhrwwqoMevSVUhYAaS4xQJXZKbBtbsNCxdeE61CwGw34BsqURBD3J7oZmOdeI_-Hiedcr7rug=TBqmSVFmJ34DqJjM2AAk8IYs7fId7AA=n2gRY65J3p8kRn3yO2GyF2ek7i8SzGDojsyeV3upvmTHrwESRrbi3jI-lT8KmuiNy9xA4LY0O5JyIwsDzX73XgfQQbBvWcsIC=K2yHMLoZs6hkDv8uqLAb0pXGsitx6mN3ym6a99w-usMYoNsnwOKltIGMDgWNygvejdRFc1uf0pRAH8pfkmJ25HdgkREV5uuSTvfEk57bMCXKdrBh0bRGcs2nisUURLnLy3D-ji-R2-DW1s9YIRLuJCe9c1DCVei1BCL21uz1lvZ8nw2edwf=xZ9ytB8Rm34wfjP5YNpA70D42mPwuvy5eg3UjKj3bD2X5hGN-aOFVYqdA3CnLojKsEovZCxjINV4f-cZOY3lVhAmk0IpuO5=d_CRql4xH6lOcZFGCjjLmd8jgaqSw=3DdpiFGHj18ipyt2yR3EVoc08m1EegrrBRnMVHATnCOKF4EU53"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_15.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_15.json
index 3bd50c1a278..6917bc4045a 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_15.json
@@ -1 +1 @@
-"pxxDsIykdeWTEOLEoBfHjEGu7XjeHDjSNVOpKMQvJu4oom0HWC0tlxlVRjtMuaRE0235jC2V8nx10Hk7wsGeGEF9LJrLZ=Sdo4kUapeL24THawpjXhGZCWgHpaJQ5T3nhtZ5eT1leeEn4TmRy3Bq-sBUkllDvZeYdrpMixua6ZPVXDppuwp2CYPbWtCML=TOiHlcrbIDJhrY4kV-vFBpQVoBFwAFgWHoEtg6HJ3Afcu2LbTAlKCdsqir1yMsTokyrF1XyouYpa=f3j-omVxfR78gRNeWMiilqwIzkzQ19PXdC_wltgRQPF1Xieu_99SqGwmFAaxkXleJL0Quxw=iN2wjEIl7U56YKnUv74-Eem7Xlcao13Wtpfqv465RmXOjt8Ik=aMvh4H9Jyl3-Kc99coVAV1p1MS9XiiWDQLMI4WES8k7y77QL1N1kO72qYiHg7zrLktdfP-ALuhynEfPnzELRXLeJJf6fA5kmBotJn=I=OUsNVqDhsnI5j-X24Kmra7f30WsaL_DWt6eIErHRJC3rvmEjwOmxy7tU=YLyxQfhOexYzH1gu5dK2Rjp8e-pGkbucRQk_avhJoWVSoBCQSFQhHTFdj_52816glriA6bQwdI6xxHERHlFcnB5aIwiAoD2Ao9_3S3A3djGsTqKYaHxMrUoj_9a_6M=TanHTLO9HWh77sR95yBmffmbdKGY_HnhbWwy8=_mD2eetLBcMiy4RnoGcGwRIKBc6v6d6idiiLybg=ClXql4sEU=m4Mr5I9l"
\ No newline at end of file
+"pxxDsIykdeWTEOLEoBfHjEGu7XjeHDjSNVOpKMQvJu4oom0HWC0tlxlVRjtMuaRE0235jC2V8nx10Hk7wsGeGEF9LJrLZ=Sdo4kUapeL24THawpjXhGZCWgHpaJQ5T3nhtZ5eT1leeEn4TmRy3Bq-sBUkllDvZeYdrpMixua6ZPVXDppuwp2CYPbWtCML=TOiHlcrbIDJhrY4kV-vFBpQVoBFwAFgWHoEtg6HJ3Afcu2LbTAlKCdsqir1yMsTokyrF1XyouYpa=f3j-omVxfR78gRNeWMiilqwIzkzQ19PXdC_wltgRQPF1Xieu_99SqGwmFAaxkXleJL0Quxw=iN2wjEIl7U56YKnUv74-Eem7Xlcao13Wtpfqv465RmXOjt8Ik=aMvh4H9Jyl3-Kc99coVAV1p1MS9XiiWDQLMI4WES8k7y77QL1N1kO72qYiHg7zrLktdfP-ALuhynEfPnzELRXLeJJf6fA5kmBotJn=I=OUsNVqDhsnI5j-X24Kmra7f30WsaL_DWt6eIErHRJC3rvmEjwOmxy7tU=YLyxQfhOexYzH1gu5dK2Rjp8e-pGkbucRQk_avhJoWVSoBCQSFQhHTFdj_52816glriA6bQwdI6xxHERHlFcnB5aIwiAoD2Ao9_3S3A3djGsTqKYaHxMrUoj_9a_6M=TanHTLO9HWh77sR95yBmffmbdKGY_HnhbWwy8=_mD2eetLBcMiy4RnoGcGwRIKBc6v6d6idiiLybg=ClXql4sEU=m4Mr5I9l"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_16.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_16.json
index 73d9dd2ee6b..104392a975c 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_16.json
@@ -1 +1 @@
-"f4qA-GZ_WLuHpcWPbgWo8N5g6g6WNLjEEXNOwPxdZx=LY6ulDwsz4Oix_C1gHpeY0m2Zkh_hjNiQS2FMF=d4vbG3GSByV_Ji84o2daD_MmIFW1ROmHdl2ld5SnVoLaq6qXMfKFkgwpH6u0d26ltymV9VKfl2c5uaqssRci-GNREWfR5IjNEYmEcPBOIHpLI6OA0qziJFsh4WpIEXw=f_HriQXEJsbcW_woeSxFwt8n0eKfr7_FpOL5bjXI8_E1RI1t8ITb-BmoYzlA-H2MK_6FOGdRfetzyQm0m9vt3IPpoIASVucr5hcpdzJcVDwFCbEsVDT3w_YXkHeiB-I5utNJzyd8JXrE46yZJ3fEJXTx99EON6rIYDBx1u12EP_RWCLZUDH2-PhyDa_a_8L8faaj8=zUzCcla6tPEAf9Z_Q=LmNr9zFI5Aj1S1SLePw5COfTeX9brfeCxZW5XR0KtoVgRgFsGTfihKoAN1d3keN9W1c_Dj8XAED_2xYwJMOQRy6zyAWijOBUse8UH2kngFK_DQ7-EGXvgXTkW57DDa1WFrgA0CdRvOzviIpP=MjXqFrL7uxPTFl=_29cTVjIxu4PRyoNr8du7PLe7PctN0NiFHszTAfM8wBDvRV3qYvlMSzWXmFGT3Pn2z6=wPue8pqPG5s-sr7DhzLpyq0_Y7G8PlzmqXJEdA96nkH2xpZB_Ds=khlnBpfY0zCW0m=s8oILcJuF3WU2_Q=wCzP9rw2TT0hr_d8fmhNvFcKme2zcTyb0Sbt6pF9V90TVTpZi=XS8Gh=6wWQFQgt=FM=kjWdWD4d=MeJDMjXQ2Z4n3uC9V00xe_uaq-rcfwQg5-WQU5Hn=kTq8-DoOzrUYFVTL2lrnMT9WFQtlYznWM0xQ6ROTnkL_dgR9bvYgt3REomQrpuzlcG0qvUO=K=JDzQAk8mN4Sh4yTakVGQ0UcnLanx9Y9Ucvzl4MdT"
\ No newline at end of file
+"f4qA-GZ_WLuHpcWPbgWo8N5g6g6WNLjEEXNOwPxdZx=LY6ulDwsz4Oix_C1gHpeY0m2Zkh_hjNiQS2FMF=d4vbG3GSByV_Ji84o2daD_MmIFW1ROmHdl2ld5SnVoLaq6qXMfKFkgwpH6u0d26ltymV9VKfl2c5uaqssRci-GNREWfR5IjNEYmEcPBOIHpLI6OA0qziJFsh4WpIEXw=f_HriQXEJsbcW_woeSxFwt8n0eKfr7_FpOL5bjXI8_E1RI1t8ITb-BmoYzlA-H2MK_6FOGdRfetzyQm0m9vt3IPpoIASVucr5hcpdzJcVDwFCbEsVDT3w_YXkHeiB-I5utNJzyd8JXrE46yZJ3fEJXTx99EON6rIYDBx1u12EP_RWCLZUDH2-PhyDa_a_8L8faaj8=zUzCcla6tPEAf9Z_Q=LmNr9zFI5Aj1S1SLePw5COfTeX9brfeCxZW5XR0KtoVgRgFsGTfihKoAN1d3keN9W1c_Dj8XAED_2xYwJMOQRy6zyAWijOBUse8UH2kngFK_DQ7-EGXvgXTkW57DDa1WFrgA0CdRvOzviIpP=MjXqFrL7uxPTFl=_29cTVjIxu4PRyoNr8du7PLe7PctN0NiFHszTAfM8wBDvRV3qYvlMSzWXmFGT3Pn2z6=wPue8pqPG5s-sr7DhzLpyq0_Y7G8PlzmqXJEdA96nkH2xpZB_Ds=khlnBpfY0zCW0m=s8oILcJuF3WU2_Q=wCzP9rw2TT0hr_d8fmhNvFcKme2zcTyb0Sbt6pF9V90TVTpZi=XS8Gh=6wWQFQgt=FM=kjWdWD4d=MeJDMjXQ2Z4n3uC9V00xe_uaq-rcfwQg5-WQU5Hn=kTq8-DoOzrUYFVTL2lrnMT9WFQtlYznWM0xQ6ROTnkL_dgR9bvYgt3REomQrpuzlcG0qvUO=K=JDzQAk8mN4Sh4yTakVGQ0UcnLanx9Y9Ucvzl4MdT"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_17.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_17.json
index de0f4052ac5..7933743a353 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_17.json
@@ -1 +1 @@
-"BIgADnGw9xXCxxBdZCME1T_FRhpurIQIJOQb_KdsO_6O2YdPGhunxTSKe36CUvB4FWzvk1qdEo-MZmNbjCrQSVuZZjppLbCiW4QKWQeVfsYus7QS=o7AjGS6-vBB6Cn_bHO0_lxJAvRzhIJ9ff9TtT_jHek3I1uNTL7E__Jw0D=OuZmaBN-EYhb-wMiO5VuLRyZiXTOIq54SkKurZ0Rngn3Z2xpecWTxhv5-xuvQB-8yoGEOaSgqMyyTUbXceCMxF9G0zWuCWsFnwLRa=4nO2KofovEGBz3B6Hrabi2sXkzoWJYIx"
\ No newline at end of file
+"BIgADnGw9xXCxxBdZCME1T_FRhpurIQIJOQb_KdsO_6O2YdPGhunxTSKe36CUvB4FWzvk1qdEo-MZmNbjCrQSVuZZjppLbCiW4QKWQeVfsYus7QS=o7AjGS6-vBB6Cn_bHO0_lxJAvRzhIJ9ff9TtT_jHek3I1uNTL7E__Jw0D=OuZmaBN-EYhb-wMiO5VuLRyZiXTOIq54SkKurZ0Rngn3Z2xpecWTxhv5-xuvQB-8yoGEOaSgqMyyTUbXceCMxF9G0zWuCWsFnwLRa=4nO2KofovEGBz3B6Hrabi2sXkzoWJYIx"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_18.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_18.json
index b8924224056..80e75932973 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_18.json
@@ -1 +1 @@
-"meLcIOikfNpisJ6XdRPSlAoST9LM0RlmUnPwN3kA0XK3bcPWLD8NDt8H66aHlzw6u3G1RMBUA1pPaDEWyYe47DXHIW67Qs9YEsAaULt-cazp3x108zgmnC7r05HgRNtEinpKrszH9mRs2Qmolek-hI3rBqsnHIXXjK77xD_Fyn0p1yY5eWkMgp3B6VDmCgZUN_Q9kp5ouSbrnSCIBmoMcpPXWmF4wFWOqqN2A0j4p-N6O7c4ptoT3WqPAFTmcDYqmKNfQSB0Kve=r_uuvXU5NNVYt08acM4UBwrPhFvhQZirnix8ynJL4fX38sdkSPt9Bh3-Y-6HEUowmcJ9hapHIcsvKf5o4h99N0HXhoFB9mUmbfpAo9Tfup2eTPWnsFk_uD2NG_-yqMiGMRxY5ba3A4-Pi_l6L4t8KVnRxy9XZm-yHuxwU2-dsQ3JHwRjPkrndCWwmEW1gqGnfGAA9xRpc2fYyMAHMjfD9NkiHaXggiYphtyqa_LOvLKUT1tbPDkXqr1jov-yM_8xIoeVeRonNBde_O_Qj7NgN2oSjwYpj1zZnWn=TzHbN-Xblj=sW=JM2Up1UNL7VmSG0osWy3H8NJjTHJPpKbb1m=oRF6QLelLVVhenQHZWFqjcGfeyieYDH3S5pnvPSUj53Xyrtsj7Vasf3Syi6Ym7Ps_f9vjzR=fbXG0O4WNpY_6kBQrx95cnCpQciPMTUG0Rh6JTEEmY0658m7_J3ywOeQBmibTCEDvgWMVGcpown1MndxdG=G8qHNJ80iPZc7zr0LXYsuK1BA_09hALN=rJVDruu1VleouhohGybe5ZTkweiFK-VlQqNBOmqR8KDroyTqrOc22pI40-3eP6S-q0kAmY54mmPuF-cfw79o=qdQGEjNt2KSUegP1Z2ASAm4i8DGTVrEoYl=nh2zejnDdMssLtBoPe4U"
\ No newline at end of file
+"meLcIOikfNpisJ6XdRPSlAoST9LM0RlmUnPwN3kA0XK3bcPWLD8NDt8H66aHlzw6u3G1RMBUA1pPaDEWyYe47DXHIW67Qs9YEsAaULt-cazp3x108zgmnC7r05HgRNtEinpKrszH9mRs2Qmolek-hI3rBqsnHIXXjK77xD_Fyn0p1yY5eWkMgp3B6VDmCgZUN_Q9kp5ouSbrnSCIBmoMcpPXWmF4wFWOqqN2A0j4p-N6O7c4ptoT3WqPAFTmcDYqmKNfQSB0Kve=r_uuvXU5NNVYt08acM4UBwrPhFvhQZirnix8ynJL4fX38sdkSPt9Bh3-Y-6HEUowmcJ9hapHIcsvKf5o4h99N0HXhoFB9mUmbfpAo9Tfup2eTPWnsFk_uD2NG_-yqMiGMRxY5ba3A4-Pi_l6L4t8KVnRxy9XZm-yHuxwU2-dsQ3JHwRjPkrndCWwmEW1gqGnfGAA9xRpc2fYyMAHMjfD9NkiHaXggiYphtyqa_LOvLKUT1tbPDkXqr1jov-yM_8xIoeVeRonNBde_O_Qj7NgN2oSjwYpj1zZnWn=TzHbN-Xblj=sW=JM2Up1UNL7VmSG0osWy3H8NJjTHJPpKbb1m=oRF6QLelLVVhenQHZWFqjcGfeyieYDH3S5pnvPSUj53Xyrtsj7Vasf3Syi6Ym7Ps_f9vjzR=fbXG0O4WNpY_6kBQrx95cnCpQciPMTUG0Rh6JTEEmY0658m7_J3ywOeQBmibTCEDvgWMVGcpown1MndxdG=G8qHNJ80iPZc7zr0LXYsuK1BA_09hALN=rJVDruu1VleouhohGybe5ZTkweiFK-VlQqNBOmqR8KDroyTqrOc22pI40-3eP6S-q0kAmY54mmPuF-cfw79o=qdQGEjNt2KSUegP1Z2ASAm4i8DGTVrEoYl=nh2zejnDdMssLtBoPe4U"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_19.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_19.json
index a7a623d4497..068ca3662b5 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_19.json
@@ -1 +1 @@
-"6rfuE95RuDaa7Kx3neuvC_Zb81Xe5ADzRP6QwHfon6Q5aiFtXUquRy3kl5E4P48UVPH5gIPkBNb_BskNUfiSYCfItGCOAIoiLITSJOX3rN2uTFTzDhW3QO2zjvFMSlgmT_Ew2rcCt"
\ No newline at end of file
+"6rfuE95RuDaa7Kx3neuvC_Zb81Xe5ADzRP6QwHfon6Q5aiFtXUquRy3kl5E4P48UVPH5gIPkBNb_BskNUfiSYCfItGCOAIoiLITSJOX3rN2uTFTzDhW3QO2zjvFMSlgmT_Ew2rcCt"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_2.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_2.json
index 7adae8bc9cc..e8e11bf3b0c 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_2.json
@@ -1 +1 @@
-"bXyG5XLFih2LcOjvgmaksGlSeqsrAgh2HcFVJYYl5WTN5CI31WlUijf=Q-JNoBdKtYZQVcVTWUQotMGl-olS9=GpyPoVX=JlzGjIAffi51vEMH6BC4B4=I5zjXZfG275ItEvOrsTeq_kU6Eb5kh42agWD=aGDz69x6wd4uoa6MGJsb7rolSD1Jucb3vNstHQgFwUefkTQW2dfPnjMrLVefZh0CMBL969pkpyE"
\ No newline at end of file
+"bXyG5XLFih2LcOjvgmaksGlSeqsrAgh2HcFVJYYl5WTN5CI31WlUijf=Q-JNoBdKtYZQVcVTWUQotMGl-olS9=GpyPoVX=JlzGjIAffi51vEMH6BC4B4=I5zjXZfG275ItEvOrsTeq_kU6Eb5kh42agWD=aGDz69x6wd4uoa6MGJsb7rolSD1Jucb3vNstHQgFwUefkTQW2dfPnjMrLVefZh0CMBL969pkpyE"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_20.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_20.json
index 15453f76a44..321938e4a05 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_20.json
@@ -1 +1 @@
-"i_v2THLu-oaTQDdbBLhfcTJrCPRiyGC=p40dGNfFMRJAJuLbv=RasCBzDYpTNkb7yIZMge1Uijc5KG3pWHAoavVJWJ9VtE-Pkf3Te-P1hp"
\ No newline at end of file
+"i_v2THLu-oaTQDdbBLhfcTJrCPRiyGC=p40dGNfFMRJAJuLbv=RasCBzDYpTNkb7yIZMge1Uijc5KG3pWHAoavVJWJ9VtE-Pkf3Te-P1hp"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_3.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_3.json
index a5907751284..fd3e70ae857 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_3.json
@@ -1 +1 @@
-"3y9hV_whpiLPPvrVcaHaGg5GuL-0yHG6cIk6-H2O6SOHy-XC6CeTatemT-3GpOT_q4UaZFBmGQA-9t5FqzQhq0gyvRCmXv6d0ofUeZGKTglS7Q=3ew5at-V_V1l8uAPSoYqqLxtT505YKA-MGi5Df4mE2ulsJ6_oMaxrfx=FJZX4h72kBknQJpLgdfpI_8uNUUl9GJVbsva=W35G4ACfdcsts2=VZ2P3qwuIs-EtuCNIujx78O5noZ=EBM0tpb3Mzwj6ZhH_iOnCXCaf89ybQsaS6=UgKSYdkUpbsU3N0ySM-6QOtRFysOMKWRshs9LYGDLRmVKioTbh5zRA7B7YVM-8j3AnyHpb52FIOagob=4Ht0vmDVMqcyFTIXZIYhvG8OiHmii9edPdkbb2ORXO51Xya1ogt=mwEJpqvZnjZi25ps=LQsBv6W8pGAkyv7Lpy896NkYjLCix6Pb=b_qL3Uf8yjBKnrwaxl8MFxQsjQHhD5skNNQrjU2oggk9PaLFALZWhABFGm1I4QkohfGn0qTLBWR1uF7BdsMVfstKHrSZv5j=hpD39H0NUs6xBZwOI7UrPpLwfLlCSk_ibf=A82LeWKazKVncAspiwFjXxW3tQrM=sXKzytRaLLYfrx69jMT0l0jnXbWH3t6f-SZ9TKqCPh5ge6lftZTkglbdb_VtOIcYIUWNel71Rv9MKNyjJd4I-U0qxk=CfkJOIhxncoAWKoTBRqVrUc8fgQfnpmABNsij2AXOV3sNHhmKsUSJiUXkDjGbE9EFzNkSiP2aUmfjXr9O4avm5yg8CO7=-C-hqflNHQ1TgqQWRXkm2Y-6M-7Rttap6jitzwIDjmwt61A2qfx-dONMVvfSYTxc79tlO6zb=CuR9hPpbNP=s_gcr6ugJmO4O3s0W6y=tRqcbqkPXmdl_Lp-vtykya2hEAUS-H_T2dd46cHNsUG5axJg7lzG_WuOLbpfEh0ch3_kI4sxy6o4fpQNf"
\ No newline at end of file
+"3y9hV_whpiLPPvrVcaHaGg5GuL-0yHG6cIk6-H2O6SOHy-XC6CeTatemT-3GpOT_q4UaZFBmGQA-9t5FqzQhq0gyvRCmXv6d0ofUeZGKTglS7Q=3ew5at-V_V1l8uAPSoYqqLxtT505YKA-MGi5Df4mE2ulsJ6_oMaxrfx=FJZX4h72kBknQJpLgdfpI_8uNUUl9GJVbsva=W35G4ACfdcsts2=VZ2P3qwuIs-EtuCNIujx78O5noZ=EBM0tpb3Mzwj6ZhH_iOnCXCaf89ybQsaS6=UgKSYdkUpbsU3N0ySM-6QOtRFysOMKWRshs9LYGDLRmVKioTbh5zRA7B7YVM-8j3AnyHpb52FIOagob=4Ht0vmDVMqcyFTIXZIYhvG8OiHmii9edPdkbb2ORXO51Xya1ogt=mwEJpqvZnjZi25ps=LQsBv6W8pGAkyv7Lpy896NkYjLCix6Pb=b_qL3Uf8yjBKnrwaxl8MFxQsjQHhD5skNNQrjU2oggk9PaLFALZWhABFGm1I4QkohfGn0qTLBWR1uF7BdsMVfstKHrSZv5j=hpD39H0NUs6xBZwOI7UrPpLwfLlCSk_ibf=A82LeWKazKVncAspiwFjXxW3tQrM=sXKzytRaLLYfrx69jMT0l0jnXbWH3t6f-SZ9TKqCPh5ge6lftZTkglbdb_VtOIcYIUWNel71Rv9MKNyjJd4I-U0qxk=CfkJOIhxncoAWKoTBRqVrUc8fgQfnpmABNsij2AXOV3sNHhmKsUSJiUXkDjGbE9EFzNkSiP2aUmfjXr9O4avm5yg8CO7=-C-hqflNHQ1TgqQWRXkm2Y-6M-7Rttap6jitzwIDjmwt61A2qfx-dONMVvfSYTxc79tlO6zb=CuR9hPpbNP=s_gcr6ugJmO4O3s0W6y=tRqcbqkPXmdl_Lp-vtykya2hEAUS-H_T2dd46cHNsUG5axJg7lzG_WuOLbpfEh0ch3_kI4sxy6o4fpQNf"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_4.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_4.json
index 239837a6df4..e89c60c0743 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_4.json
@@ -1 +1 @@
-"xyq4HKh19XywmKznhfk_qHop0Q28wvP-xM3ekfYpoV7F03B9pGoO7jZKAcgxf2jCPJ_YMT4KbPOJmZpl1LiDYxPwMrJM_6EQUghalFY1_=ZUUZdpLQjPdPqsgHquqrYNP==Riey=5UdqbTDPOhwG4PFDzMExV58W8WBVQJA6HsljJixe5Zx91FEodBWNw9O7vWQHTSQ1fwPuK6RS4vrjj1gU2OV1eAMTlb3xsZcCvbzmOgXSbtswkdubdQD8XsPKxuopHyrWzIQnnM38onnpvoxVjOMEMSWa-Qbw5IGrdXtbdzmi3gNcviLfMsw8541WVgjrvPaUNYU9leskXE4tz1FK=PWkoMNBtdV=cqzp-=hbvkN9FOxhaf4e7AVBKuGjVvHuWM9sjGCTQAm7kPQ4jIKIhMPyMb1N_FVKu7XAPRxBed3Wz3Y4_uVipNDTdQ6siWM4_jGRn9x8ESiPWaDMtRF5XLe-PSRjS8OqUzspjmE3Yzev8A4L2wQEx5pop4hdH0cny29Qq0qrXSe3wqse3P_gfw9x2WWfKV=seg6SSVEe3y9V3h3R4Z=MqboaUQDIvwgn7fYdGGtJmbYC4Mf5GwcHEhxUupZ4oCkT85bJ81RoA3eEpytHCltVsGCG2Rust_KeYR=9FWXE1Y4zCNo8TU1MbQ1HOz7hyl-SEYfzNoA1r0HFo2OCBqJ7KbkDV9_yImmBibKfA-kXfM_jpTZF2oQXkzyela_SrLbtXnmwsrzU2pW9sGWEe4ef_BO13JoEv-5tKmK0Rm-ZD4wOn3yZ18-559XKNzBA"
\ No newline at end of file
+"xyq4HKh19XywmKznhfk_qHop0Q28wvP-xM3ekfYpoV7F03B9pGoO7jZKAcgxf2jCPJ_YMT4KbPOJmZpl1LiDYxPwMrJM_6EQUghalFY1_=ZUUZdpLQjPdPqsgHquqrYNP==Riey=5UdqbTDPOhwG4PFDzMExV58W8WBVQJA6HsljJixe5Zx91FEodBWNw9O7vWQHTSQ1fwPuK6RS4vrjj1gU2OV1eAMTlb3xsZcCvbzmOgXSbtswkdubdQD8XsPKxuopHyrWzIQnnM38onnpvoxVjOMEMSWa-Qbw5IGrdXtbdzmi3gNcviLfMsw8541WVgjrvPaUNYU9leskXE4tz1FK=PWkoMNBtdV=cqzp-=hbvkN9FOxhaf4e7AVBKuGjVvHuWM9sjGCTQAm7kPQ4jIKIhMPyMb1N_FVKu7XAPRxBed3Wz3Y4_uVipNDTdQ6siWM4_jGRn9x8ESiPWaDMtRF5XLe-PSRjS8OqUzspjmE3Yzev8A4L2wQEx5pop4hdH0cny29Qq0qrXSe3wqse3P_gfw9x2WWfKV=seg6SSVEe3y9V3h3R4Z=MqboaUQDIvwgn7fYdGGtJmbYC4Mf5GwcHEhxUupZ4oCkT85bJ81RoA3eEpytHCltVsGCG2Rust_KeYR=9FWXE1Y4zCNo8TU1MbQ1HOz7hyl-SEYfzNoA1r0HFo2OCBqJ7KbkDV9_yImmBibKfA-kXfM_jpTZF2oQXkzyela_SrLbtXnmwsrzU2pW9sGWEe4ef_BO13JoEv-5tKmK0Rm-ZD4wOn3yZ18-559XKNzBA"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_5.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_5.json
index eef1107aef1..14e2e00b7a1 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_5.json
@@ -1 +1 @@
-"vrpuZROq=nohTjClGY07mpz_QnkiJU2-2xE4TFymIPo3vLE7fUGRDzFyp7VQdfOMnlGcGTencV4aUJvRyl0VhRbLF5AnhDmtZpp0_nRfFu48dreccQdyeHAFr1Kexx6Up5n=d0dyvyULLq-J0uZignbnAFy1R4HlSMpOfpE-JmtXlaXgmWtIq5G96qvNRdaz2m1-JogSJ5uWUNkrlEKiirfx1Kg422lV1ZwdQLjIDWW8MYA4m2ZqXkTDThEfeSSi0jN48kCulTDJcvIhOS38euVp6UdLr=dH9=jvx0D0ZRMFS3_WkMlSoiuP2PToVac4Q7M4JEtLgex5sDvx8uZ9jV-UBHCeKUJ9i1AZufheZ3TghdqdWbjMP7Yc521ln4PXtc4C_JDpWTuEplHWg84Bhyym=qwXl0i5P=A0eycc-HUxd8mFP6iyGzjJY4dYBCK4w_dbaf45Op_Qmz_B3S28mpXwQ=nxfzX0bmjpQujSYHTM53Q2sZbzDjMPxA8OAdh9W4K3VUfuwlHA8NCXtsLquOjHG_JFu4cOXCBgCIbnBfAyt0NdnBDQelZ37=b7hN_bUn3Q2X09HCYIf1BNXX8BdpH7YpwSBpp4f5iB_XevnLm8PKuffy0mxruk21Ker98ARTGG91ECleRbdv5teYMwXWao0IzxVij5sy4B3aDnWbyAS0P3iCLaE5QG4MA6qeaQjnRQIJSWXyvIQOGuZHdcBqVdIu3GQiFi4RdlMghz6_9vkOEECJR=VbR1ZW4yx5POCmzBvK_qjCN=pss4sDIQ7Oeo1RgwVWIm3mkESF72dNO2OhaneQVOguA5wOU_ubJZoC0H04OBD6UUdbdiI7gDYCjKusxqoD1y0qNN8xYmcbcw00jwlDi8YzVN3bB-Myw95X6r8XalM1nXLDFzfM8WeHujxMNwAltp7SSqO6u3KGmPVcX3Jhdj32Q7C7AXLZaD_9llXRtwbt_k6J9PwmOnplRsfmEdwMsGjRXBK_d6tSZNo5"
\ No newline at end of file
+"vrpuZROq=nohTjClGY07mpz_QnkiJU2-2xE4TFymIPo3vLE7fUGRDzFyp7VQdfOMnlGcGTencV4aUJvRyl0VhRbLF5AnhDmtZpp0_nRfFu48dreccQdyeHAFr1Kexx6Up5n=d0dyvyULLq-J0uZignbnAFy1R4HlSMpOfpE-JmtXlaXgmWtIq5G96qvNRdaz2m1-JogSJ5uWUNkrlEKiirfx1Kg422lV1ZwdQLjIDWW8MYA4m2ZqXkTDThEfeSSi0jN48kCulTDJcvIhOS38euVp6UdLr=dH9=jvx0D0ZRMFS3_WkMlSoiuP2PToVac4Q7M4JEtLgex5sDvx8uZ9jV-UBHCeKUJ9i1AZufheZ3TghdqdWbjMP7Yc521ln4PXtc4C_JDpWTuEplHWg84Bhyym=qwXl0i5P=A0eycc-HUxd8mFP6iyGzjJY4dYBCK4w_dbaf45Op_Qmz_B3S28mpXwQ=nxfzX0bmjpQujSYHTM53Q2sZbzDjMPxA8OAdh9W4K3VUfuwlHA8NCXtsLquOjHG_JFu4cOXCBgCIbnBfAyt0NdnBDQelZ37=b7hN_bUn3Q2X09HCYIf1BNXX8BdpH7YpwSBpp4f5iB_XevnLm8PKuffy0mxruk21Ker98ARTGG91ECleRbdv5teYMwXWao0IzxVij5sy4B3aDnWbyAS0P3iCLaE5QG4MA6qeaQjnRQIJSWXyvIQOGuZHdcBqVdIu3GQiFi4RdlMghz6_9vkOEECJR=VbR1ZW4yx5POCmzBvK_qjCN=pss4sDIQ7Oeo1RgwVWIm3mkESF72dNO2OhaneQVOguA5wOU_ubJZoC0H04OBD6UUdbdiI7gDYCjKusxqoD1y0qNN8xYmcbcw00jwlDi8YzVN3bB-Myw95X6r8XalM1nXLDFzfM8WeHujxMNwAltp7SSqO6u3KGmPVcX3Jhdj32Q7C7AXLZaD_9llXRtwbt_k6J9PwmOnplRsfmEdwMsGjRXBK_d6tSZNo5"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_6.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_6.json
index ece2dbbf4ca..6cd19a4fc40 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_6.json
@@ -1 +1 @@
-"3T58zkUPzOEui-YO4qpkRwNCbO9pXpnzeHntQulTD0-Z4Yv8DEXDgvWGlTPjUy8s07Zynj86gbNcOBsB0wP6FBBLIRRMjvz8PdcvYJB4z1kyBhjU9V24lGCvdTN6yWQKnPfmPRMJRValwKjEK=emFNF6TMfwnJX69TuBoK0tPpIX6LSTgQzEqf2sBCO3TbjEd1KUArpMA1ToGjrlfwP5qDEtRQt8pOLTJ=AJ82cm5Be7R0QG5h1D_9ZCodc6uOho=UeNu_pSkv9eHMV5kHIIWR=qJiI0aG1_pfAFPzX7W0=qy04-4m0Nb7d2glq=1vf5UhgjnjCbiwf3SnFTb8Pp8pnr"
\ No newline at end of file
+"3T58zkUPzOEui-YO4qpkRwNCbO9pXpnzeHntQulTD0-Z4Yv8DEXDgvWGlTPjUy8s07Zynj86gbNcOBsB0wP6FBBLIRRMjvz8PdcvYJB4z1kyBhjU9V24lGCvdTN6yWQKnPfmPRMJRValwKjEK=emFNF6TMfwnJX69TuBoK0tPpIX6LSTgQzEqf2sBCO3TbjEd1KUArpMA1ToGjrlfwP5qDEtRQt8pOLTJ=AJ82cm5Be7R0QG5h1D_9ZCodc6uOho=UeNu_pSkv9eHMV5kHIIWR=qJiI0aG1_pfAFPzX7W0=qy04-4m0Nb7d2glq=1vf5UhgjnjCbiwf3SnFTb8Pp8pnr"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_7.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_7.json
index 4e73c70f269..3b3f85bc132 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_7.json
@@ -1 +1 @@
-"ct5f42l4Gs1Et=b4jRn9JA=uWjAuwExxg8ALFl6DtECh87rZt1=bmRsx9_OCnoOpSv2P=OGkF=TdUgAo=LHhPp0eLiaDf4wTfbDg0h_hQM0sGf2gNTtiEDblBslbhkw9AzbqbPOihQWoGuc0yUtxUMRFlbUXzipTLan5eF6TQHU0o0mYgIFBAXbSceLoFjsxIQi0pFEHqbts9u70iw1czjSsvQfR7a2fE5th4K9rlNdM7G1b5q3FOkrVKN5ngm5-oc35uq0kb61-hOpXY1vSWCGXeNB-Pi4i9qvhDEoYl=K-xMwB4ef7CCNBUdpgcp9qcTgKKqdlfv3N0yaMq_MB6FCVFeFWHQoR-68MHGEn0l5YxclITf_2b_Fxth_oyOF=yhjN55c_XjUg5vx=H8vATzUNOYNGoYDDsV06oz3=-LIVYCujv1FqSlbjpbXkUjGOZoGXaJnaf=q3pPhno9_nI"
\ No newline at end of file
+"ct5f42l4Gs1Et=b4jRn9JA=uWjAuwExxg8ALFl6DtECh87rZt1=bmRsx9_OCnoOpSv2P=OGkF=TdUgAo=LHhPp0eLiaDf4wTfbDg0h_hQM0sGf2gNTtiEDblBslbhkw9AzbqbPOihQWoGuc0yUtxUMRFlbUXzipTLan5eF6TQHU0o0mYgIFBAXbSceLoFjsxIQi0pFEHqbts9u70iw1czjSsvQfR7a2fE5th4K9rlNdM7G1b5q3FOkrVKN5ngm5-oc35uq0kb61-hOpXY1vSWCGXeNB-Pi4i9qvhDEoYl=K-xMwB4ef7CCNBUdpgcp9qcTgKKqdlfv3N0yaMq_MB6FCVFeFWHQoR-68MHGEn0l5YxclITf_2b_Fxth_oyOF=yhjN55c_XjUg5vx=H8vATzUNOYNGoYDDsV06oz3=-LIVYCujv1FqSlbjpbXkUjGOZoGXaJnaf=q3pPhno9_nI"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_8.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_8.json
index d41e6463afa..b2ed5c5815b 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_8.json
@@ -1 +1 @@
-"xDVrK2upjM0ijbe-mTFMX4Oj2Xz9wczY7Gg27=9b6GeY4_bj6tY1Ofa3urdpRbAK9zw6Ro-xLZntJYNUpgsQKFdnwkZtEfxP9X5ddUD4Us_pf26NoYSRbbzM9ONbu0P88h2SfJ2oqPdf6xz500EYprE6a2R7xyNkmNbgSJf26lRqVkQCABTPrpbbbE_1ah5Oz-c3lXQph=nb"
\ No newline at end of file
+"xDVrK2upjM0ijbe-mTFMX4Oj2Xz9wczY7Gg27=9b6GeY4_bj6tY1Ofa3urdpRbAK9zw6Ro-xLZntJYNUpgsQKFdnwkZtEfxP9X5ddUD4Us_pf26NoYSRbbzM9ONbu0P88h2SfJ2oqPdf6xz500EYprE6a2R7xyNkmNbgSJf26lRqVkQCABTPrpbbbE_1ah5Oz-c3lXQph=nb"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_9.json b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_9.json
index c717c39ddc3..fe813fecccc 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetCode_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetCode_user_9.json
@@ -1 +1 @@
-"RAxVH7Nx9wLrjYlmhoz37XNTNzJ-BZ0Wqgr0K7JM_B8U5YEk5o6fGcjmPxSzQWBsEMFASQx=ZfUg4HGHHlYPln8ar_v4AiudJxC2L_vHb72_gpGNpMTqXPVf_"
\ No newline at end of file
+"RAxVH7Nx9wLrjYlmhoz37XNTNzJ-BZ0Wqgr0K7JM_B8U5YEk5o6fGcjmPxSzQWBsEMFASQx=ZfUg4HGHHlYPln8ar_v4AiudJxC2L_vHb72_gpGNpMTqXPVf_"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_1.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_1.json
index 3cc762b5501..e16c76dff88 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_1.json
@@ -1 +1 @@
-""
\ No newline at end of file
+""
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_10.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_10.json
index 0860b4557ac..1da925a8855 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_10.json
@@ -1 +1 @@
-"xuk="
\ No newline at end of file
+"xuk="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_11.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_11.json
index 2906fd44267..cc6aaec3c95 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_11.json
@@ -1 +1 @@
-"KDnmIKWtN05-lUhE"
\ No newline at end of file
+"KDnmIKWtN05-lUhE"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_12.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_12.json
index dfb478b315d..83d2b16e839 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_12.json
@@ -1 +1 @@
-"IGKDqfCYsFkOZw=="
\ No newline at end of file
+"IGKDqfCYsFkOZw=="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_13.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_13.json
index fd340d53e6e..166e8c1967d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_13.json
@@ -1 +1 @@
-"wFmjRzld-Y8KFP5n24viRe0K_6rP1pPMVfM="
\ No newline at end of file
+"wFmjRzld-Y8KFP5n24viRe0K_6rP1pPMVfM="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_14.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_14.json
index 3f2a13b0658..9103e76d80a 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_14.json
@@ -1 +1 @@
-"og7OvTf3bJiUgIZE"
\ No newline at end of file
+"og7OvTf3bJiUgIZE"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_15.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_15.json
index c5503edbb33..93a278590f9 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_15.json
@@ -1 +1 @@
-"EL9g"
\ No newline at end of file
+"EL9g"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_16.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_16.json
index 95a59f12563..27ecce45bb3 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_16.json
@@ -1 +1 @@
-"8fR1oMv9pfSM1ncA93eob_1y12WaDuXilb4="
\ No newline at end of file
+"8fR1oMv9pfSM1ncA93eob_1y12WaDuXilb4="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_17.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_17.json
index 3cc762b5501..e16c76dff88 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_17.json
@@ -1 +1 @@
-""
\ No newline at end of file
+""
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_18.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_18.json
index d1b74b2ff6b..92e44239f3f 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_18.json
@@ -1 +1 @@
-"W3RLTh1wbik="
\ No newline at end of file
+"W3RLTh1wbik="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_19.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_19.json
index ca5c266504d..6b63dc9d70d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_19.json
@@ -1 +1 @@
-"m-Zh-cCYzhYY1vLf4gW6"
\ No newline at end of file
+"m-Zh-cCYzhYY1vLf4gW6"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_2.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_2.json
index 8a563283f8f..8425ac552cd 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_2.json
@@ -1 +1 @@
-"g0pDhT2io2we8pT4P3SI5K1hEOuqhlgr"
\ No newline at end of file
+"g0pDhT2io2we8pT4P3SI5K1hEOuqhlgr"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_20.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_20.json
index f907cd0a8ce..d57297f6b82 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_20.json
@@ -1 +1 @@
-"2Ei3ppMzZm8Y23uKu9ta-ZT69CGG6kkH1w=="
\ No newline at end of file
+"2Ei3ppMzZm8Y23uKu9ta-ZT69CGG6kkH1w=="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_3.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_3.json
index 65c33e3ec62..57aabde8d58 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_3.json
@@ -1 +1 @@
-"sP9UlBCOng=="
\ No newline at end of file
+"sP9UlBCOng=="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_4.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_4.json
index 9668541da5e..004deae7080 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_4.json
@@ -1 +1 @@
-"cUigWYIeFro_uPJTq_Nb2DpiQHEARzMOjLRmJw=="
\ No newline at end of file
+"cUigWYIeFro_uPJTq_Nb2DpiQHEARzMOjLRmJw=="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_5.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_5.json
index 907791b40e5..d2530b5060f 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_5.json
@@ -1 +1 @@
-"lPJNfPNKQUdGHBnmfStc9CyX"
\ No newline at end of file
+"lPJNfPNKQUdGHBnmfStc9CyX"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_6.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_6.json
index 52952633264..2288dba1d14 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_6.json
@@ -1 +1 @@
-"5hytdEvbgEY="
\ No newline at end of file
+"5hytdEvbgEY="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_7.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_7.json
index ea39c4eb031..434ab3b6e3d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_7.json
@@ -1 +1 @@
-"NzCRCk-v-hxNW7ZM08D1lUB-"
\ No newline at end of file
+"NzCRCk-v-hxNW7ZM08D1lUB-"
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_8.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_8.json
index f968231dab3..ba68c1f129d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_8.json
@@ -1 +1 @@
-"CP8="
\ No newline at end of file
+"CP8="
diff --git a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_9.json b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_9.json
index e60e3ee4286..012f928418d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordResetKey_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PasswordResetKey_user_9.json
@@ -1 +1 @@
-"Vg9OYTx_vr8c"
\ No newline at end of file
+"Vg9OYTx_vr8c"
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_1.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_1.json
index 90c77afa1e8..584b108feaf 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_1.json
@@ -1,3 +1,3 @@
 {
     "email": "􉏬\r󷨎bW󾺓󱥥󷕕\r\u0003\u0001\u001bj𤯗@sC.\u0012PW"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_10.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_10.json
index 4d0bf4992b0..d003760ed45 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_10.json
@@ -1,3 +1,3 @@
 {
     "email": "@$y0=|\u001d󾡌E􇩯!tN:"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_11.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_11.json
index 49f19e0fbbc..e66d0a5948f 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_11.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0010\u0001𗬳黄K!z|𠽽0▖,1,􈨅4\\钉Q@>Xi􇔬\u0001\u0011:󽌤𬀶𨥔\u001a[\u0018.+uOgWp"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_12.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_12.json
index f418b7496c5..6842effbc48 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_12.json
@@ -1,3 +1,3 @@
 {
     "email": "􄵱𩆢🙖>@􄆤{]%\t\u0013n󱅶􆎎􃯵CD􊤽>󼓞a롿⿂𬩔n\u001b\"Xw$\u0007G"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_13.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_13.json
index 68c854f66e8..b28663d545d 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_13.json
@@ -1,3 +1,3 @@
 {
     "email": "󲶌5\u0006𠓫!􉄃\nVb󺴝nU&󽋡u𩟰@+I𫅗q􃾘\u0016􅊹#A𧿃\u0010}.\u0001u󷴓"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_14.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_14.json
index 94bb6cc383f..47cf254a683 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_14.json
@@ -1,3 +1,3 @@
 {
     "email": "v@􊌉"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_15.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_15.json
index 6eac2c91087..1cea568c611 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_15.json
@@ -1,3 +1,3 @@
 {
     "email": "+𤳡~􆅘VFc\u001e􍐴R\u0007\u001b4J_􉚂I\u000c󾵯Dj\u0011\u0004q@󹃹𡰨n􃙋Gh?\u000bPXOO\u000b􊱳\u0012"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_16.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_16.json
index f22965cd179..da903c0e028 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_16.json
@@ -1,3 +1,3 @@
 {
     "email": "]􏖌Dn\u0008\u0015\n䔟𨲌\u0005󺃬2\r􅃁󴯹󽦀@%L(\u0019􎼖\u0002k\u0004o𩯑B䣟O*/+<S\u001f󵋠u3#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_17.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_17.json
index 59cf2b37ee1..b79e9512d4f 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_17.json
@@ -1,3 +1,3 @@
 {
     "email": "ꯧ\u0001I\u0000\"CI'\u001b𡪀g%[lt󳋔Dfkd𭲂\u001a\u000e>@볡"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_18.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_18.json
index f509871fee7..54914a375df 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_18.json
@@ -1,3 +1,3 @@
 {
     "email": "\u001c󹮂󷆕^3𐭏*(󽗶𘕇@󽓵Y\u001b|=𡧿E.A.\u0000󴭝K>􄠭cZZ~\u0018􂟺i\u0010.rꡇ󴪩 𫍒"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_19.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_19.json
index 9ee6fc1cd75..d21c352e333 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_19.json
@@ -1,3 +1,3 @@
 {
     "email": "x|􌸆J8󵹛|%𢷎'9􉺫𩿺􉀀F􌌯xyP􁟃 4,@!]w6:\u0001d4t(􍠌􁂡$\u0001rl9⛉𝝥t8"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_2.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_2.json
index b6bc7db5234..4a7cac622ea 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_2.json
@@ -1,3 +1,3 @@
 {
     "email": "mh\u0011􏧜\u0007􏝯#e󲴔m𞀌𮓹𧛢D]@\u001dJ-0𞅀DU~Ẕ􉺓\u0015F$"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_20.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_20.json
index 0e2cb31a36c..7c18619be65 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_20.json
@@ -1,3 +1,3 @@
 {
     "email": "魳2\u0016)=Xd𥸩}o@4\u001a𮂬􁙭g\u0000􊫓󰗸Q`\\\u000eU󸝠"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_3.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_3.json
index 2d1550ccb58..0904742ebb1 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_3.json
@@ -1,3 +1,3 @@
 {
     "email": "-BP\u0018󵷒F䰯􌭱]W󽲘d𡹕􇈞\u0006\u001d𡳖Dy\u001bx\u0018𦯓uOU󱄌\u0018􆩶\u0006@󸷩e\u0011V-j"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_4.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_4.json
index 0548ca6a4b0..44b7a3501a7 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_4.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0003!\u0014]$Zp@R\u0002\u0010Q"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_5.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_5.json
index fc4fa47e1c0..7cca99e7318 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_5.json
@@ -1,3 +1,3 @@
 {
     "email": "󶆁Mm𣢰\u001c9` 𣫱󲫷\u0010𤲜\u0003꾡]󿶏歲2\u000f\u0017뀙@B󱩠{\n􀎙O\u0004,P"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_6.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_6.json
index 2e2416e296c..f26d931ed4b 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_6.json
@@ -1,3 +1,3 @@
 {
     "email": "ᒱ􂬛𥒗\u0003Lv 󽎁9@3J\"K'-Q𠂊P𗗖Q\rf􇇓6_kN􆉆\u0003$󳅍󹻌4𬐬k𠯣󹰶k"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_7.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_7.json
index d31720d504f..00efb9b2268 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_7.json
@@ -1,3 +1,3 @@
 {
     "email": "\u0001\u0003rra\u00014|]c&4%#Al\u0012*U\u0002𔐧m9\u0001󰧏UQꏘ󿤬@1G*𦂸f\u0018V󳒭㰒𗿫lR쥩"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_8.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_8.json
index 3ee6fb1bcdf..67b2e07f780 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_8.json
@@ -1,3 +1,3 @@
 {
     "email": "6􃨣C酵(|\u0000\u001e𠡓@襄\u0019饲"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PasswordReset_provider_9.json b/libs/wire-api/test/golden/testObject_PasswordReset_provider_9.json
index 2b1c9676819..cc41c9ba8d6 100644
--- a/libs/wire-api/test/golden/testObject_PasswordReset_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_PasswordReset_provider_9.json
@@ -1,3 +1,3 @@
 {
     "email": "ui0^p󸘴\u0003󲶬u<8\"YgWb\u0008x[\u001e},W\u000b󾮟耠\u0016@\u0008*󻥹0>*N`𠲧\u0013 t"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_1.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_1.json
index 6a15ce82956..196363e0f3f 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_1.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 2,
-    "code": "GZd\u0014)K Yi"
-}
\ No newline at end of file
+    "code": "GZd\u0014)K Yi",
+    "expires_in": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_10.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_10.json
index fe057cdf1ba..3a29b9919dd 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_10.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -1,
-    "code": "1vr*M|\u0014\u0014,焷Z"
-}
\ No newline at end of file
+    "code": "1vr*M|\u0014\u0014,焷Z",
+    "expires_in": -1
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_11.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_11.json
index 7febbb7191d..0b0a7509341 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_11.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -14,
-    "code": "b@|zB<"
-}
\ No newline at end of file
+    "code": "b@|zB<",
+    "expires_in": -14
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_12.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_12.json
index 9385003639d..d5ebff301e5 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_12.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 2,
-    "code": "of_􊍤%2䂥BP\u000f6󸥝"
-}
\ No newline at end of file
+    "code": "of_􊍤%2䂥BP\u000f6󸥝",
+    "expires_in": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_13.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_13.json
index 10bc8fa5f91..b4c389f79f0 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_13.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -9,
-    "code": "k፥:i'"
-}
\ No newline at end of file
+    "code": "k፥:i'",
+    "expires_in": -9
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_14.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_14.json
index e74a56478fe..58430803550 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_14.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -11,
-    "code": "o鰓G"
-}
\ No newline at end of file
+    "code": "o鰓G",
+    "expires_in": -11
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_15.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_15.json
index 322c200fcf0..04eb94f6c00 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_15.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -10,
-    "code": "I)#\u0007%㱜s\u0001\u000c󷽕\u0011!g"
-}
\ No newline at end of file
+    "code": "I)#\u0007%㱜s\u0001\u000c󷽕\u0011!g",
+    "expires_in": -10
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_16.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_16.json
index 55a9fab2e7e..a31f7460c7c 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_16.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -5,
-    "code": "%5\u0010𔘒􃡟F\u0007R𥥀\u0005"
-}
\ No newline at end of file
+    "code": "%5\u0010𔘒􃡟F\u0007R𥥀\u0005",
+    "expires_in": -5
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_17.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_17.json
index 792cb8b6a72..9b1b2984794 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_17.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 15,
-    "code": "Jx􈱐i󲎖\u0006"
-}
\ No newline at end of file
+    "code": "Jx􈱐i󲎖\u0006",
+    "expires_in": 15
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_18.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_18.json
index f6ead7ba29e..61a6438d33f 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_18.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 2,
-    "code": ""
-}
\ No newline at end of file
+    "code": "",
+    "expires_in": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_19.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_19.json
index 74459d76afc..03a840aef55 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_19.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -9,
-    "code": "u3𨥼\u001f𢵍E"
-}
\ No newline at end of file
+    "code": "u3𨥼\u001f𢵍E",
+    "expires_in": -9
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_2.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_2.json
index be9b09e5e0e..c2b65c845ec 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_2.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 3,
-    "code": ""
-}
\ No newline at end of file
+    "code": "",
+    "expires_in": 3
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_20.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_20.json
index 5dfc6a56604..4343aec2fd3 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_20.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 15,
-    "code": "e𓎀\u0000"
-}
\ No newline at end of file
+    "code": "e𓎀\u0000",
+    "expires_in": 15
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_3.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_3.json
index 9eaaf372771..541bdcc64f7 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_3.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 9,
-    "code": "\u0010󽀪?"
-}
\ No newline at end of file
+    "code": "\u0010󽀪?",
+    "expires_in": 9
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_4.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_4.json
index 978d6cc41fb..190a2f46899 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_4.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -14,
-    "code": "R;`n\u0000󵻍\u0017})1\r󺛮0􄏗𑱥"
-}
\ No newline at end of file
+    "code": "R;`n\u0000󵻍\u0017})1\r󺛮0􄏗𑱥",
+    "expires_in": -14
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_5.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_5.json
index 78388b0c85f..52b53ca16cb 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_5.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 14,
-    "code": "󺶄󹓝$bn R6"
-}
\ No newline at end of file
+    "code": "󺶄󹓝$bn R6",
+    "expires_in": 14
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_6.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_6.json
index fb86fa75305..ea2a75d8ce7 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_6.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 15,
-    "code": "\u0008Q𪊦h'v"
-}
\ No newline at end of file
+    "code": "\u0008Q𪊦h'v",
+    "expires_in": 15
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_7.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_7.json
index be9b09e5e0e..c2b65c845ec 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_7.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 3,
-    "code": ""
-}
\ No newline at end of file
+    "code": "",
+    "expires_in": 3
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_8.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_8.json
index 5b162a80e48..900f8ae9a0a 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_8.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": 6,
-    "code": "󲷽F\u0002􎓙H}"
-}
\ No newline at end of file
+    "code": "󲷽F\u0002􎓙H}",
+    "expires_in": 6
+}
diff --git a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_9.json b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_9.json
index b9ec93c8990..02b33e28eee 100644
--- a/libs/wire-api/test/golden/testObject_PendingLoginCode_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PendingLoginCode_user_9.json
@@ -1,4 +1,4 @@
 {
-    "expires_in": -7,
-    "code": "l0[Yv"
-}
\ No newline at end of file
+    "code": "l0[Yv",
+    "expires_in": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_1.json b/libs/wire-api/test/golden/testObject_Permissions_team_1.json
index 993bc4ad8b4..0764b4b6648 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_1.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_1.json
@@ -1,4 +1,4 @@
 {
     "copy": 128,
     "self": 128
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_10.json b/libs/wire-api/test/golden/testObject_Permissions_team_10.json
index e63bc1aaf3e..9f1a50bb3f5 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_10.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_10.json
@@ -1,4 +1,4 @@
 {
     "copy": 7327,
     "self": 7327
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_11.json b/libs/wire-api/test/golden/testObject_Permissions_team_11.json
index e561f922676..5ea3990b3cf 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_11.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_11.json
@@ -1,4 +1,4 @@
 {
     "copy": 1544,
     "self": 7754
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_12.json b/libs/wire-api/test/golden/testObject_Permissions_team_12.json
index ca020790e2c..74e383067c2 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_12.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_12.json
@@ -1,4 +1,4 @@
 {
     "copy": 4091,
     "self": 8187
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_13.json b/libs/wire-api/test/golden/testObject_Permissions_team_13.json
index d087f9fd7ef..bae07704815 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_13.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_13.json
@@ -1,4 +1,4 @@
 {
     "copy": 4352,
     "self": 4461
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_14.json b/libs/wire-api/test/golden/testObject_Permissions_team_14.json
index 53b2431ba71..5719f5fa84f 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_14.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_14.json
@@ -1,4 +1,4 @@
 {
     "copy": 5047,
     "self": 5047
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_15.json b/libs/wire-api/test/golden/testObject_Permissions_team_15.json
index c7992ead079..836f781d13c 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_15.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_15.json
@@ -1,4 +1,4 @@
 {
     "copy": 0,
     "self": 6846
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_16.json b/libs/wire-api/test/golden/testObject_Permissions_team_16.json
index c543e8b68dc..6b4e029349e 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_16.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_16.json
@@ -1,4 +1,4 @@
 {
     "copy": 5442,
     "self": 5458
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_17.json b/libs/wire-api/test/golden/testObject_Permissions_team_17.json
index 02c3eb357f7..69535b96940 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_17.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_17.json
@@ -1,4 +1,4 @@
 {
     "copy": 7982,
     "self": 7982
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_18.json b/libs/wire-api/test/golden/testObject_Permissions_team_18.json
index 13f32263167..3457074f270 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_18.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_18.json
@@ -1,4 +1,4 @@
 {
     "copy": 2709,
     "self": 6805
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_19.json b/libs/wire-api/test/golden/testObject_Permissions_team_19.json
index 372700afcc1..7fc73b45e46 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_19.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_19.json
@@ -1,4 +1,4 @@
 {
     "copy": 7327,
     "self": 8127
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_2.json b/libs/wire-api/test/golden/testObject_Permissions_team_2.json
index 540ee571777..02dbb177e16 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_2.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_2.json
@@ -1,4 +1,4 @@
 {
     "copy": 5502,
     "self": 7550
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_20.json b/libs/wire-api/test/golden/testObject_Permissions_team_20.json
index 630938bfaeb..f255a8c58ad 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_20.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_20.json
@@ -1,4 +1,4 @@
 {
     "copy": 6630,
     "self": 6631
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_3.json b/libs/wire-api/test/golden/testObject_Permissions_team_3.json
index 62a0c175909..a97311cb16e 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_3.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_3.json
@@ -1,4 +1,4 @@
 {
     "copy": 7708,
     "self": 7838
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_4.json b/libs/wire-api/test/golden/testObject_Permissions_team_4.json
index bf2c2296b4a..85087dc55c1 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_4.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_4.json
@@ -1,4 +1,4 @@
 {
     "copy": 64,
     "self": 6870
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_5.json b/libs/wire-api/test/golden/testObject_Permissions_team_5.json
index 8c101140d70..f15d438fa85 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_5.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_5.json
@@ -1,4 +1,4 @@
 {
     "copy": 2665,
     "self": 3949
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_6.json b/libs/wire-api/test/golden/testObject_Permissions_team_6.json
index 3bc641b45fd..2122de35624 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_6.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_6.json
@@ -1,4 +1,4 @@
 {
     "copy": 1917,
     "self": 2045
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_7.json b/libs/wire-api/test/golden/testObject_Permissions_team_7.json
index 5bcbeb3313b..54c67454263 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_7.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_7.json
@@ -1,4 +1,4 @@
 {
     "copy": 2128,
     "self": 3452
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_8.json b/libs/wire-api/test/golden/testObject_Permissions_team_8.json
index fe7679db1f5..6af4184c8ee 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_8.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_8.json
@@ -1,4 +1,4 @@
 {
     "copy": 4732,
     "self": 6143
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Permissions_team_9.json b/libs/wire-api/test/golden/testObject_Permissions_team_9.json
index b1d9457ec1d..ee1e29d1e5a 100644
--- a/libs/wire-api/test/golden/testObject_Permissions_team_9.json
+++ b/libs/wire-api/test/golden/testObject_Permissions_team_9.json
@@ -1,4 +1,4 @@
 {
     "copy": 529,
     "self": 531
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_1.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_1.json
index 87715b22b34..e2e0a54d510 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_1.json
@@ -1,3 +1,3 @@
 {
     "phone": "+059566184168"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_10.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_10.json
index d0e1eafb884..2edaeeb14c3 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_10.json
@@ -1,3 +1,3 @@
 {
     "phone": "+431000511612"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_11.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_11.json
index ebe52f55022..bad9e033264 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_11.json
@@ -1,3 +1,3 @@
 {
     "phone": "+1939668594372"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_12.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_12.json
index 253adaa26fe..22a44744353 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_12.json
@@ -1,3 +1,3 @@
 {
     "phone": "+156939434"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_13.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_13.json
index b56b389df2b..45f00e3be08 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_13.json
@@ -1,3 +1,3 @@
 {
     "phone": "+54660214"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_14.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_14.json
index 71226e16776..0993ecb56ba 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_14.json
@@ -1,3 +1,3 @@
 {
     "phone": "+17373888509447"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_15.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_15.json
index 04290c0cd21..119e498a1d4 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_15.json
@@ -1,3 +1,3 @@
 {
     "phone": "+817869255119807"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_16.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_16.json
index a7e6433b48c..2fe9ce33d37 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_16.json
@@ -1,3 +1,3 @@
 {
     "phone": "+541926748"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_17.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_17.json
index 6b1af3164f3..28dd8427d26 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_17.json
@@ -1,3 +1,3 @@
 {
     "phone": "+7836584019595"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_18.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_18.json
index 3d44946c83d..421b57587df 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_18.json
@@ -1,3 +1,3 @@
 {
     "phone": "+3488257402473"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_19.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_19.json
index 9f2943850aa..8ca748e27a0 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_19.json
@@ -1,3 +1,3 @@
 {
     "phone": "+1413522786322"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_2.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_2.json
index 1fd1d914fd7..41577586d99 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_2.json
@@ -1,3 +1,3 @@
 {
     "phone": "+030094397"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_20.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_20.json
index 9b3021d7f07..992bc694e42 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_20.json
@@ -1,3 +1,3 @@
 {
     "phone": "+64700149027"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_3.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_3.json
index d5e6604c5fd..932505249ea 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_3.json
@@ -1,3 +1,3 @@
 {
     "phone": "+39788099045"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_4.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_4.json
index e70d2a78fcd..b9a771478de 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_4.json
@@ -1,3 +1,3 @@
 {
     "phone": "+6060447691"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_5.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_5.json
index 05e9da3caf1..b7a95f7759a 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_5.json
@@ -1,3 +1,3 @@
 {
     "phone": "+27199438794"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_6.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_6.json
index 34c9274fc9c..a0a90e34009 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_6.json
@@ -1,3 +1,3 @@
 {
     "phone": "+403076793307922"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_7.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_7.json
index 5c4047fddc4..b1112e1e2da 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_7.json
@@ -1,3 +1,3 @@
 {
     "phone": "+58949773"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_8.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_8.json
index 471178dfa24..4e030e1182c 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_8.json
@@ -1,3 +1,3 @@
 {
     "phone": "+5689710422639"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_9.json b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_9.json
index b8764bea066..07de23169b0 100644
--- a/libs/wire-api/test/golden/testObject_PhoneUpdate_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PhoneUpdate_user_9.json
@@ -1,3 +1,3 @@
 {
     "phone": "+60751390"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_1.json b/libs/wire-api/test/golden/testObject_Phone_user_1.json
index 80674b262fc..a3724408313 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_1.json
@@ -1 +1 @@
-"+50797973398725"
\ No newline at end of file
+"+50797973398725"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_10.json b/libs/wire-api/test/golden/testObject_Phone_user_10.json
index 1e7fbde77b9..2d78f30dc75 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_10.json
@@ -1 +1 @@
-"+102469356765"
\ No newline at end of file
+"+102469356765"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_11.json b/libs/wire-api/test/golden/testObject_Phone_user_11.json
index fd8b7e19be0..a68796cb7d0 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_11.json
@@ -1 +1 @@
-"+55060638135"
\ No newline at end of file
+"+55060638135"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_12.json b/libs/wire-api/test/golden/testObject_Phone_user_12.json
index e78a052a86d..85b80a17597 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_12.json
@@ -1 +1 @@
-"+588730955259955"
\ No newline at end of file
+"+588730955259955"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_13.json b/libs/wire-api/test/golden/testObject_Phone_user_13.json
index d15276faf0c..a5f69de7c54 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_13.json
@@ -1 +1 @@
-"+2072442026"
\ No newline at end of file
+"+2072442026"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_14.json b/libs/wire-api/test/golden/testObject_Phone_user_14.json
index e50477154cf..8eebfef72bd 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_14.json
@@ -1 +1 @@
-"+692203804094831"
\ No newline at end of file
+"+692203804094831"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_15.json b/libs/wire-api/test/golden/testObject_Phone_user_15.json
index a6600eab120..ec54a50ed79 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_15.json
@@ -1 +1 @@
-"+5471562223455"
\ No newline at end of file
+"+5471562223455"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_16.json b/libs/wire-api/test/golden/testObject_Phone_user_16.json
index 3a1570554ed..699607f9c08 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_16.json
@@ -1 +1 @@
-"+3767234745"
\ No newline at end of file
+"+3767234745"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_17.json b/libs/wire-api/test/golden/testObject_Phone_user_17.json
index 7bd3cf584e2..711443d3587 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_17.json
@@ -1 +1 @@
-"+857847846836"
\ No newline at end of file
+"+857847846836"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_18.json b/libs/wire-api/test/golden/testObject_Phone_user_18.json
index 8c5ad761b78..186fbbbcb03 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_18.json
@@ -1 +1 @@
-"+92148623434201"
\ No newline at end of file
+"+92148623434201"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_19.json b/libs/wire-api/test/golden/testObject_Phone_user_19.json
index 35073b86e62..c513a9bf3de 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_19.json
@@ -1 +1 @@
-"+851735292622"
\ No newline at end of file
+"+851735292622"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_2.json b/libs/wire-api/test/golden/testObject_Phone_user_2.json
index aa5d0015af2..a40404a67ec 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_2.json
@@ -1 +1 @@
-"+324868524134229"
\ No newline at end of file
+"+324868524134229"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_20.json b/libs/wire-api/test/golden/testObject_Phone_user_20.json
index d5e66450453..9c0c3b10843 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_20.json
@@ -1 +1 @@
-"+543953708562116"
\ No newline at end of file
+"+543953708562116"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_3.json b/libs/wire-api/test/golden/testObject_Phone_user_3.json
index 89396285009..6cbe514e568 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_3.json
@@ -1 +1 @@
-"+476681824034183"
\ No newline at end of file
+"+476681824034183"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_4.json b/libs/wire-api/test/golden/testObject_Phone_user_4.json
index 1e38ef8007f..f06f5574a42 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_4.json
@@ -1 +1 @@
-"+84424141890561"
\ No newline at end of file
+"+84424141890561"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_5.json b/libs/wire-api/test/golden/testObject_Phone_user_5.json
index 1ef67f7ae1c..c18a6cc4ee2 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_5.json
@@ -1 +1 @@
-"+4094767235"
\ No newline at end of file
+"+4094767235"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_6.json b/libs/wire-api/test/golden/testObject_Phone_user_6.json
index 01e33be7248..ed36c124688 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_6.json
@@ -1 +1 @@
-"+08890892"
\ No newline at end of file
+"+08890892"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_7.json b/libs/wire-api/test/golden/testObject_Phone_user_7.json
index ce5cbcf8972..b12e8eabc15 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_7.json
@@ -1 +1 @@
-"+8514802391189"
\ No newline at end of file
+"+8514802391189"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_8.json b/libs/wire-api/test/golden/testObject_Phone_user_8.json
index b58359557ae..340e6267d31 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_8.json
@@ -1 +1 @@
-"+2284101925556"
\ No newline at end of file
+"+2284101925556"
diff --git a/libs/wire-api/test/golden/testObject_Phone_user_9.json b/libs/wire-api/test/golden/testObject_Phone_user_9.json
index 8a14ed40ae5..32a9f314e9c 100644
--- a/libs/wire-api/test/golden/testObject_Phone_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Phone_user_9.json
@@ -1 +1 @@
-"+101238097484"
\ No newline at end of file
+"+101238097484"
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_1.json b/libs/wire-api/test/golden/testObject_Pict_user_1.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_1.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_10.json b/libs/wire-api/test/golden/testObject_Pict_user_10.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_10.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_11.json b/libs/wire-api/test/golden/testObject_Pict_user_11.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_11.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_12.json b/libs/wire-api/test/golden/testObject_Pict_user_12.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_12.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_13.json b/libs/wire-api/test/golden/testObject_Pict_user_13.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_13.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_14.json b/libs/wire-api/test/golden/testObject_Pict_user_14.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_14.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_15.json b/libs/wire-api/test/golden/testObject_Pict_user_15.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_15.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_16.json b/libs/wire-api/test/golden/testObject_Pict_user_16.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_16.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_17.json b/libs/wire-api/test/golden/testObject_Pict_user_17.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_17.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_18.json b/libs/wire-api/test/golden/testObject_Pict_user_18.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_18.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_19.json b/libs/wire-api/test/golden/testObject_Pict_user_19.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_19.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_2.json b/libs/wire-api/test/golden/testObject_Pict_user_2.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_2.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_20.json b/libs/wire-api/test/golden/testObject_Pict_user_20.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_20.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_3.json b/libs/wire-api/test/golden/testObject_Pict_user_3.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_3.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_4.json b/libs/wire-api/test/golden/testObject_Pict_user_4.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_4.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_5.json b/libs/wire-api/test/golden/testObject_Pict_user_5.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_5.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_6.json b/libs/wire-api/test/golden/testObject_Pict_user_6.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_6.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_7.json b/libs/wire-api/test/golden/testObject_Pict_user_7.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_7.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_8.json b/libs/wire-api/test/golden/testObject_Pict_user_8.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_8.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_Pict_user_9.json b/libs/wire-api/test/golden/testObject_Pict_user_9.json
index 0637a088a01..fe51488c706 100644
--- a/libs/wire-api/test/golden/testObject_Pict_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Pict_user_9.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[]
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_1.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_1.json
index d3978f3ce2d..9572e11b85a 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_1.json
@@ -1,12 +1,12 @@
 {
-    "user": "00000046-0000-0011-0000-007200000022",
     "clients": [
         {
+            "client": "8",
             "prekey": {
-                "key": "\rOx",
-                "id": 0
-            },
-            "client": "8"
+                "id": 0,
+                "key": "\rOx"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000046-0000-0011-0000-007200000022"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_10.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_10.json
index fd4eda99863..4f75c692138 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_10.json
@@ -1,4 +1,4 @@
 {
-    "user": "00000062-0000-003a-0000-006c0000001e",
-    "clients": []
-}
\ No newline at end of file
+    "clients": [],
+    "user": "00000062-0000-003a-0000-006c0000001e"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_11.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_11.json
index 575d368447f..7571625d130 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_11.json
@@ -1,19 +1,19 @@
 {
-    "user": "00000025-0000-0061-0000-005f0000000a",
     "clients": [
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "4",
             "prekey": {
-                "key": ">",
-                "id": 0
-            },
-            "client": "4"
+                "id": 0,
+                "key": ">"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000025-0000-0061-0000-005f0000000a"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_12.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_12.json
index 2fa09d77b8a..0fad3d460c6 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_12.json
@@ -1,12 +1,12 @@
 {
-    "user": "00000073-0000-0034-0000-004c00000024",
     "clients": [
         {
+            "client": "a",
             "prekey": {
-                "key": "􊴡󱸵-",
-                "id": 1
-            },
-            "client": "a"
+                "id": 1,
+                "key": "􊴡󱸵-"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000073-0000-0034-0000-004c00000024"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_13.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_13.json
index 4c12b0f4329..c5bd2ac9c61 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_13.json
@@ -1,54 +1,54 @@
 {
-    "user": "0000000c-0000-006a-0000-00650000007c",
     "clients": [
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "0000000c-0000-006a-0000-00650000007c"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_14.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_14.json
index 9bce433e7d1..fc13b3c24a8 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_14.json
@@ -1,4 +1,4 @@
 {
-    "user": "00000012-0000-0024-0000-006700000016",
-    "clients": []
-}
\ No newline at end of file
+    "clients": [],
+    "user": "00000012-0000-0024-0000-006700000016"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_15.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_15.json
index 9ddecc74bf1..87d34e1f216 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_15.json
@@ -1,26 +1,26 @@
 {
-    "user": "00000079-0000-0057-0000-004200000037",
     "clients": [
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "2",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "2"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "2",
             "prekey": {
-                "key": "\u001e",
-                "id": 0
-            },
-            "client": "2"
+                "id": 0,
+                "key": "\u001e"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000079-0000-0057-0000-004200000037"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_16.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_16.json
index 95baec1c883..ff5b380e40b 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_16.json
@@ -1,12 +1,12 @@
 {
-    "user": "0000002b-0000-0032-0000-00140000006e",
     "clients": [
         {
+            "client": "f",
             "prekey": {
-                "key": "􄙈𤢝?",
-                "id": 1
-            },
-            "client": "f"
+                "id": 1,
+                "key": "􄙈𤢝?"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "0000002b-0000-0032-0000-00140000006e"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_17.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_17.json
index 884fb2508b7..77f7cb5efeb 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_17.json
@@ -1,75 +1,75 @@
 {
-    "user": "0000006f-0000-0036-0000-00560000002d",
     "clients": [
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "1"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "1"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "1"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "1"
+                "id": 1,
+                "key": ""
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "0000006f-0000-0036-0000-00560000002d"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_18.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_18.json
index 39f7bd61ffd..45b011ca913 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_18.json
@@ -1,4 +1,4 @@
 {
-    "user": "00000069-0000-007c-0000-000f0000004a",
-    "clients": []
-}
\ No newline at end of file
+    "clients": [],
+    "user": "00000069-0000-007c-0000-000f0000004a"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_19.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_19.json
index 0f9b3564f88..76e9b411021 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_19.json
@@ -1,40 +1,40 @@
 {
-    "user": "0000006f-0000-0072-0000-003e00000008",
     "clients": [
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "1"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "0000006f-0000-0072-0000-003e00000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_2.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_2.json
index e0476fe2760..b03785b5857 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_2.json
@@ -1,40 +1,40 @@
 {
-    "user": "00000043-0000-002b-0000-00550000002a",
     "clients": [
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "1"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000043-0000-002b-0000-00550000002a"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_20.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_20.json
index fa47cb7f669..ea8b3d193d5 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_20.json
@@ -1,26 +1,26 @@
 {
-    "user": "00000073-0000-0017-0000-00690000007a",
     "clients": [
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "2",
             "prekey": {
-                "key": "󷤘",
-                "id": 1
-            },
-            "client": "2"
+                "id": 1,
+                "key": "󷤘"
+            }
         },
         {
+            "client": "2",
             "prekey": {
-                "key": "\u000e",
-                "id": 0
-            },
-            "client": "2"
+                "id": 0,
+                "key": "\u000e"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000073-0000-0017-0000-00690000007a"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_3.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_3.json
index acca2361d0f..d3c6d6e12e3 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_3.json
@@ -1,19 +1,19 @@
 {
-    "user": "00000001-0000-002b-0000-002e00000010",
     "clients": [
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "\n",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": "\n"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000001-0000-002b-0000-002e00000010"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_4.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_4.json
index 4f4f57212a4..7c6abe5e9e0 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_4.json
@@ -1,4 +1,4 @@
 {
-    "user": "00000037-0000-0050-0000-005900000043",
-    "clients": []
-}
\ No newline at end of file
+    "clients": [],
+    "user": "00000037-0000-0050-0000-005900000043"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_5.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_5.json
index 541486c2f1f..e35a9ab9384 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_5.json
@@ -1,19 +1,19 @@
 {
-    "user": "0000000b-0000-0075-0000-00620000001e",
     "clients": [
         {
+            "client": "1",
             "prekey": {
-                "key": "i",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": "i"
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "L",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": "L"
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "0000000b-0000-0075-0000-00620000001e"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_6.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_6.json
index c9f0adcc5a1..fa205a6e2ad 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_6.json
@@ -1,47 +1,47 @@
 {
-    "user": "0000004c-0000-007e-0000-004300000034",
     "clients": [
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "0000004c-0000-007e-0000-004300000034"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_7.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_7.json
index 62d6923c073..30ed39da643 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_7.json
@@ -1,19 +1,19 @@
 {
-    "user": "0000001e-0000-0066-0000-000200000002",
     "clients": [
         {
+            "client": "4",
             "prekey": {
-                "key": "$",
-                "id": 0
-            },
-            "client": "4"
+                "id": 0,
+                "key": "$"
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "0000001e-0000-0066-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_8.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_8.json
index 04742a89c55..da790e4d0be 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_8.json
@@ -1,33 +1,33 @@
 {
-    "user": "00000050-0000-0050-0000-00760000005f",
     "clients": [
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "0"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "0",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "0"
+                "id": 1,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 0
-            },
-            "client": "1"
+                "id": 0,
+                "key": ""
+            }
         },
         {
+            "client": "1",
             "prekey": {
-                "key": "",
-                "id": 1
-            },
-            "client": "1"
+                "id": 1,
+                "key": ""
+            }
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "user": "00000050-0000-0050-0000-00760000005f"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_9.json b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_9.json
index 1d09eb7d9d6..3d066c099df 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyBundle_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyBundle_user_9.json
@@ -1,4 +1,4 @@
 {
-    "user": "00000024-0000-0074-0000-000b0000001d",
-    "clients": []
-}
\ No newline at end of file
+    "clients": [],
+    "user": "00000024-0000-0074-0000-000b0000001d"
+}
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_1.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_1.json
index 1ecdaa2cb1c..bd67d8097d1 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_1.json
@@ -1 +1 @@
-9918
\ No newline at end of file
+9918
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_10.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_10.json
index 91e23a0f870..38a92bb4591 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_10.json
@@ -1 +1 @@
-13545
\ No newline at end of file
+13545
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_11.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_11.json
index 104339a2e19..96529ebd0af 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_11.json
@@ -1 +1 @@
-10304
\ No newline at end of file
+10304
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_12.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_12.json
index 51460e6caa0..9a5b59edd03 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_12.json
@@ -1 +1 @@
-10519
\ No newline at end of file
+10519
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_13.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_13.json
index 10d7778ea7c..85ca3ac9725 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_13.json
@@ -1 +1 @@
-6794
\ No newline at end of file
+6794
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_14.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_14.json
index 9a5fb0a3dec..cb0c8b28f7e 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_14.json
@@ -1 +1 @@
-22226
\ No newline at end of file
+22226
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_15.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_15.json
index e4c5933d574..2a42ba91a99 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_15.json
@@ -1 +1 @@
-6782
\ No newline at end of file
+6782
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_16.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_16.json
index b2a26732afd..3e24568cd18 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_16.json
@@ -1 +1 @@
-17115
\ No newline at end of file
+17115
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_17.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_17.json
index fd3cf4ed4f3..2c4c8040af7 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_17.json
@@ -1 +1 @@
-15048
\ No newline at end of file
+15048
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_18.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_18.json
index 0973804c41c..065fd3e79c9 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_18.json
@@ -1 +1 @@
-137
\ No newline at end of file
+137
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_19.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_19.json
index 7de37874b9d..546b2455bce 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_19.json
@@ -1 +1 @@
-4899
\ No newline at end of file
+4899
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_2.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_2.json
index 26e3b9ba68b..38853c1dd94 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_2.json
@@ -1 +1 @@
-22170
\ No newline at end of file
+22170
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_20.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_20.json
index 220a1adb31b..802095f06c7 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_20.json
@@ -1 +1 @@
-25385
\ No newline at end of file
+25385
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_3.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_3.json
index 76ce19eff4c..f91abb4dc96 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_3.json
@@ -1 +1 @@
-2668
\ No newline at end of file
+2668
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_4.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_4.json
index 4370acf41b3..850021b9ac4 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_4.json
@@ -1 +1 @@
-26302
\ No newline at end of file
+26302
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_5.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_5.json
index deba8b306f0..bc5f4278f12 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_5.json
@@ -1 +1 @@
-8313
\ No newline at end of file
+8313
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_6.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_6.json
index 9b05c17b7f4..cef7e0c01f5 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_6.json
@@ -1 +1 @@
-13240
\ No newline at end of file
+13240
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_7.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_7.json
index e96b93478d3..f3f4e44752b 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_7.json
@@ -1 +1 @@
-18713
\ No newline at end of file
+18713
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_8.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_8.json
index 7a378b42d50..7f98e1c3185 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_8.json
@@ -1 +1 @@
-12297
\ No newline at end of file
+12297
diff --git a/libs/wire-api/test/golden/testObject_PrekeyId_user_9.json b/libs/wire-api/test/golden/testObject_PrekeyId_user_9.json
index dde3ac3c53f..684b2333cb3 100644
--- a/libs/wire-api/test/golden/testObject_PrekeyId_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PrekeyId_user_9.json
@@ -1 +1 @@
-25257
\ No newline at end of file
+25257
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_1.json b/libs/wire-api/test/golden/testObject_Prekey_user_1.json
index 036c4b24473..909f66d6123 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_1.json
@@ -1,4 +1,4 @@
 {
-    "key": "M󻆳yx",
-    "id": 79
-}
\ No newline at end of file
+    "id": 79,
+    "key": "M󻆳yx"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_10.json b/libs/wire-api/test/golden/testObject_Prekey_user_10.json
index 188b89d8608..53dd12a8405 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_10.json
@@ -1,4 +1,4 @@
 {
-    "key": "!@hb",
-    "id": 58
-}
\ No newline at end of file
+    "id": 58,
+    "key": "!@hb"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_11.json b/libs/wire-api/test/golden/testObject_Prekey_user_11.json
index 8c031d1d875..173c5a0a422 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_11.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0010Ba\u0002\u0000\u001f3",
-    "id": 109
-}
\ No newline at end of file
+    "id": 109,
+    "key": "\u0010Ba\u0002\u0000\u001f3"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_12.json b/libs/wire-api/test/golden/testObject_Prekey_user_12.json
index 4ea73d487f2..7b48776d254 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_12.json
@@ -1,4 +1,4 @@
 {
-    "key": "L94S]\u0008`",
-    "id": 74
-}
\ No newline at end of file
+    "id": 74,
+    "key": "L94S]\u0008`"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_13.json b/libs/wire-api/test/golden/testObject_Prekey_user_13.json
index 4ea6cc71b92..0dcac68074c 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_13.json
@@ -1,4 +1,4 @@
 {
-    "key": "𧮘峰$<I|k\u0016\u000eZx\u0002應",
-    "id": 128
-}
\ No newline at end of file
+    "id": 128,
+    "key": "𧮘峰$<I|k\u0016\u000eZx\u0002應"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_14.json b/libs/wire-api/test/golden/testObject_Prekey_user_14.json
index 5f96539a307..81a1e0c30fa 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_14.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u001e\"􏱍o",
-    "id": 88
-}
\ No newline at end of file
+    "id": 88,
+    "key": "\u001e\"􏱍o"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_15.json b/libs/wire-api/test/golden/testObject_Prekey_user_15.json
index 22f0e43a904..dd69e0b5734 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_15.json
@@ -1,4 +1,4 @@
 {
-    "key": "𮈉a\u0008ZS\u000e\",h󲩍j%",
-    "id": 23
-}
\ No newline at end of file
+    "id": 23,
+    "key": "𮈉a\u0008ZS\u000e\",h󲩍j%"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_16.json b/libs/wire-api/test/golden/testObject_Prekey_user_16.json
index 387e4af612e..ebe76e1f903 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_16.json
@@ -1,4 +1,4 @@
 {
-    "key": "",
-    "id": 109
-}
\ No newline at end of file
+    "id": 109,
+    "key": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_17.json b/libs/wire-api/test/golden/testObject_Prekey_user_17.json
index 112415ae941..8ac9403ce6b 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_17.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0018\u0011\u0016\u000c􆇹\u0014打䒲f",
-    "id": 0
-}
\ No newline at end of file
+    "id": 0,
+    "key": "\u0018\u0011\u0016\u000c􆇹\u0014打䒲f"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_18.json b/libs/wire-api/test/golden/testObject_Prekey_user_18.json
index c3dbacd6dac..c6e5c8e71cf 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_18.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0001m)",
-    "id": 121
-}
\ No newline at end of file
+    "id": 121,
+    "key": "\u0001m)"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_19.json b/libs/wire-api/test/golden/testObject_Prekey_user_19.json
index ef6b4c4b038..1d0e5526232 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_19.json
@@ -1,4 +1,4 @@
 {
-    "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-    "id": 52
-}
\ No newline at end of file
+    "id": 52,
+    "key": "󷞱+@􏴇'\u0003\u000b\u0006"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_2.json b/libs/wire-api/test/golden/testObject_Prekey_user_2.json
index d4e3c9e54bd..be4a3638593 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_2.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0004h",
-    "id": 18
-}
\ No newline at end of file
+    "id": 18,
+    "key": "\u0004h"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_20.json b/libs/wire-api/test/golden/testObject_Prekey_user_20.json
index 1a7c927b0db..2f8ed76bc24 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_20.json
@@ -1,4 +1,4 @@
 {
-    "key": "<o􈀗(n󿀕\tj󸤦w􍬕`",
-    "id": 82
-}
\ No newline at end of file
+    "id": 82,
+    "key": "<o􈀗(n󿀕\tj󸤦w􍬕`"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_3.json b/libs/wire-api/test/golden/testObject_Prekey_user_3.json
index 4a4bee04b2b..929b4e2713d 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_3.json
@@ -1,4 +1,4 @@
 {
-    "key": "",
-    "id": 68
-}
\ No newline at end of file
+    "id": 68,
+    "key": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_4.json b/libs/wire-api/test/golden/testObject_Prekey_user_4.json
index 3532a7316ca..c8c3df22422 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_4.json
@@ -1,4 +1,4 @@
 {
-    "key": "",
-    "id": 88
-}
\ No newline at end of file
+    "id": 88,
+    "key": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_5.json b/libs/wire-api/test/golden/testObject_Prekey_user_5.json
index 0ea5f5b10c1..afbd9436c3d 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_5.json
@@ -1,4 +1,4 @@
 {
-    "key": "突?#\u0014k",
-    "id": 110
-}
\ No newline at end of file
+    "id": 110,
+    "key": "突?#\u0014k"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_6.json b/libs/wire-api/test/golden/testObject_Prekey_user_6.json
index 872902805bf..8d8e6afa0f3 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_6.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0007\u001a\tA𭦢5q􍄴7",
-    "id": 110
-}
\ No newline at end of file
+    "id": 110,
+    "key": "\u0007\u001a\tA𭦢5q􍄴7"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_7.json b/libs/wire-api/test/golden/testObject_Prekey_user_7.json
index 4d7799ae415..ab9f8a1f47d 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_7.json
@@ -1,4 +1,4 @@
 {
-    "key": "\u0000\u0004Jn𧜘\u0006튺",
-    "id": 123
-}
\ No newline at end of file
+    "id": 123,
+    "key": "\u0000\u0004Jn𧜘\u0006튺"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_8.json b/libs/wire-api/test/golden/testObject_Prekey_user_8.json
index 99e7c4d0d98..bd2cf288b79 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_8.json
@@ -1,4 +1,4 @@
 {
-    "key": "n2LjT􋩮)R\u0010",
-    "id": 12
-}
\ No newline at end of file
+    "id": 12,
+    "key": "n2LjT􋩮)R\u0010"
+}
diff --git a/libs/wire-api/test/golden/testObject_Prekey_user_9.json b/libs/wire-api/test/golden/testObject_Prekey_user_9.json
index e55baa0e82d..8eeabbd37a6 100644
--- a/libs/wire-api/test/golden/testObject_Prekey_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Prekey_user_9.json
@@ -1,4 +1,4 @@
 {
-    "key": "9|j.Kp",
-    "id": 88
-}
\ No newline at end of file
+    "id": 88,
+    "key": "9|j.Kp"
+}
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_1.json b/libs/wire-api/test/golden/testObject_Priority_user_1.json
index fc1a498db4e..ade060b68b1 100644
--- a/libs/wire-api/test/golden/testObject_Priority_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Priority_user_1.json
@@ -1 +1 @@
-"high"
\ No newline at end of file
+"high"
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_10.json b/libs/wire-api/test/golden/testObject_Priority_user_10.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_11.json b/libs/wire-api/test/golden/testObject_Priority_user_11.json
deleted file mode 100644
index fc1a498db4e..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"high"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_12.json b/libs/wire-api/test/golden/testObject_Priority_user_12.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_13.json b/libs/wire-api/test/golden/testObject_Priority_user_13.json
deleted file mode 100644
index fc1a498db4e..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"high"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_14.json b/libs/wire-api/test/golden/testObject_Priority_user_14.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_15.json b/libs/wire-api/test/golden/testObject_Priority_user_15.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_16.json b/libs/wire-api/test/golden/testObject_Priority_user_16.json
deleted file mode 100644
index fc1a498db4e..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"high"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_17.json b/libs/wire-api/test/golden/testObject_Priority_user_17.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_18.json b/libs/wire-api/test/golden/testObject_Priority_user_18.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_19.json b/libs/wire-api/test/golden/testObject_Priority_user_19.json
deleted file mode 100644
index fc1a498db4e..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"high"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_2.json b/libs/wire-api/test/golden/testObject_Priority_user_2.json
index abc23399c40..35ca92914c9 100644
--- a/libs/wire-api/test/golden/testObject_Priority_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Priority_user_2.json
@@ -1 +1 @@
-"low"
\ No newline at end of file
+"low"
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_20.json b/libs/wire-api/test/golden/testObject_Priority_user_20.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_3.json b/libs/wire-api/test/golden/testObject_Priority_user_3.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_4.json b/libs/wire-api/test/golden/testObject_Priority_user_4.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_5.json b/libs/wire-api/test/golden/testObject_Priority_user_5.json
deleted file mode 100644
index fc1a498db4e..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"high"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_6.json b/libs/wire-api/test/golden/testObject_Priority_user_6.json
deleted file mode 100644
index fc1a498db4e..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"high"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_7.json b/libs/wire-api/test/golden/testObject_Priority_user_7.json
deleted file mode 100644
index fc1a498db4e..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"high"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_8.json b/libs/wire-api/test/golden/testObject_Priority_user_8.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Priority_user_9.json b/libs/wire-api/test/golden/testObject_Priority_user_9.json
deleted file mode 100644
index abc23399c40..00000000000
--- a/libs/wire-api/test/golden/testObject_Priority_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"low"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_1.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_1.json
index 54a42e916bd..3e195bce00d 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_1.json
@@ -1 +1 @@
-"\\#(pEr>=1=|[3U8#*-"
\ No newline at end of file
+"\\#(pEr>=1=|[3U8#*-"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_10.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_10.json
index 8a7611e803f..8f85954db32 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_10.json
@@ -1 +1 @@
-"{4JU("
\ No newline at end of file
+"{4JU("
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_11.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_11.json
index 26136b39e82..0b2a658336a 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_11.json
@@ -1 +1 @@
-"OHeuP_;raj|3E3p6L!gbXC&dz$~"
\ No newline at end of file
+"OHeuP_;raj|3E3p6L!gbXC&dz$~"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_12.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_12.json
index c12d4f0d55c..cba81d551d2 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_12.json
@@ -1 +1 @@
-"ubsV.n^Rg\"Sk_KtM="
\ No newline at end of file
+"ubsV.n^Rg\"Sk_KtM="
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_13.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_13.json
index 2c6b0b1b2b4..2aa056c6b43 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_13.json
@@ -1 +1 @@
-"K@\"B0-ht4]`)<BW"
\ No newline at end of file
+"K@\"B0-ht4]`)<BW"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_14.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_14.json
index 8b9554caa34..65736326f21 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_14.json
@@ -1 +1 @@
-".a}WC8fxMc+8{AEM6C1ba2c"
\ No newline at end of file
+".a}WC8fxMc+8{AEM6C1ba2c"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_15.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_15.json
index 45531a92194..21fc8b39cc8 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_15.json
@@ -1 +1 @@
-"LQ%Y:{w~X9;3sjHSoc/"
\ No newline at end of file
+"LQ%Y:{w~X9;3sjHSoc/"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_16.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_16.json
index fc24f81c80c..3615962ad41 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_16.json
@@ -1 +1 @@
-"w"
\ No newline at end of file
+"w"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_17.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_17.json
index 30ea1875d38..d55b47eca29 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_17.json
@@ -1 +1 @@
-"@[wt.MA[~~g%t#"
\ No newline at end of file
+"@[wt.MA[~~g%t#"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_18.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_18.json
index 3cc762b5501..e16c76dff88 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_18.json
@@ -1 +1 @@
-""
\ No newline at end of file
+""
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_19.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_19.json
index 0194aeee423..588911c43a6 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_19.json
@@ -1 +1 @@
-"/qUJ,5HHe=E3,z`+"
\ No newline at end of file
+"/qUJ,5HHe=E3,z`+"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_2.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_2.json
index f3b63a0c6ab..136275240aa 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_2.json
@@ -1 +1 @@
-".ir59 BUmxiD]"
\ No newline at end of file
+".ir59 BUmxiD]"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_20.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_20.json
index f605d1b2c6c..c7d3dfdfb4b 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_20.json
@@ -1 +1 @@
-":7)V]/Gc5Y~n="
\ No newline at end of file
+":7)V]/Gc5Y~n="
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_3.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_3.json
index 6060915ad30..6325c581be9 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_3.json
@@ -1 +1 @@
-"nk?o0R&)7>W"
\ No newline at end of file
+"nk?o0R&)7>W"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_4.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_4.json
index 9b4f8b37c77..0dfdb05a8e4 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_4.json
@@ -1 +1 @@
-"bv\"s1=]&\"^\\$05T=h$U.Qd:"
\ No newline at end of file
+"bv\"s1=]&\"^\\$05T=h$U.Qd:"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_5.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_5.json
index 439bc15443d..c782b380050 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_5.json
@@ -1 +1 @@
-"9$\\K\\e*]z[nPd|y.loOEHk"
\ No newline at end of file
+"9$\\K\\e*]z[nPd|y.loOEHk"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_6.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_6.json
index f7bd9cbdc9d..cd475c47275 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_6.json
@@ -1 +1 @@
-"&32zNqRJI.L:yD!\"Y(P"
\ No newline at end of file
+"&32zNqRJI.L:yD!\"Y(P"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_7.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_7.json
index c06189fba37..ff351b6cf93 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_7.json
@@ -1 +1 @@
-"to(YvZL!ukU8_lIvP4HD6G 5r.82"
\ No newline at end of file
+"to(YvZL!ukU8_lIvP4HD6G 5r.82"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_8.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_8.json
index 814427e1e7d..534a9abd6de 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_8.json
@@ -1 +1 @@
-"8Ki&S<z"
\ No newline at end of file
+"8Ki&S<z"
diff --git a/libs/wire-api/test/golden/testObject_PropertyKey_user_9.json b/libs/wire-api/test/golden/testObject_PropertyKey_user_9.json
index 355dd233d25..9c4a7f18999 100644
--- a/libs/wire-api/test/golden/testObject_PropertyKey_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PropertyKey_user_9.json
@@ -1 +1 @@
-"i&m.{ok6}b:9_]5{ m=] ,H,{;h"
\ No newline at end of file
+"i&m.{ok6}b:9_]5{ m=] ,H,{;h"
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_1.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_1.json
index 95ad34721b1..d264424f2a0 100644
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PropertyValue_user_1.json
@@ -1 +1 @@
-7.0e-14
\ No newline at end of file
+7.0e-14
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_10.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_10.json
deleted file mode 100644
index 02e4a84d62c..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_11.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_11.json
deleted file mode 100644
index fadd2df73de..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_11.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "0": -40000000,
-    "ͩ": false,
-    "􀅖𑖳𠭓Q3\u0001\"": null,
-    "􉸙n": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_12.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_12.json
deleted file mode 100644
index 77513805e2e..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_12.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-    true,
-    "\u0007󴡾",
-    false,
-    true,
-    "𦽕",
-    "",
-    null,
-    null,
-    2,
-    "𭻢\u0006",
-    false
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_13.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_13.json
deleted file mode 100644
index 82d180a4c8d..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_13.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-    null,
-    false,
-    "*\u0001O",
-    0.1,
-    "\u000ep々􆞚"
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_14.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_14.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_15.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_15.json
deleted file mode 100644
index c0bf923dedf..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_15.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "dN": null,
-    "0": true,
-    "": true,
-    "K": true,
-    "󺃃\"": null,
-    "󾻧": true,
-    "D\u0006": "\r"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_16.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_16.json
deleted file mode 100644
index ec747fa47dd..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-null
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_17.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_17.json
deleted file mode 100644
index bbc937f2c78..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_17.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-    100,
-    false,
-    "#\\󲥼`r􏉫"
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_18.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_18.json
deleted file mode 100644
index 77ea260d0c3..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_18.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "􇐒\u0001eD󲅿": 3.0e-5,
-    ")\u001bt➀": -4.0e-3,
-    "%9": false,
-    "": 0.1,
-    "\u0013": 400,
-    "{ *f~": -400
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_19.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_19.json
deleted file mode 100644
index c79a560051b..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_19.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-    null,
-    null,
-    false,
-    false,
-    "\r\u0003",
-    true,
-    false,
-    2.0e-2,
-    "e",
-    2.0e-2,
-    "K"
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_2.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_2.json
deleted file mode 100644
index 9e6299abd09..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_2.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "M\u0003\u0005\u0007f𫇤\n𥹭|n": "𫠠\u0008wS",
-    "䊸Z%󺓝rgT^": -100,
-    "fgH": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_20.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_20.json
deleted file mode 100644
index 2058562854c..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-1.2e-21
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_3.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_3.json
deleted file mode 100644
index fde90f58324..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_3.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "": 7.0e-5,
-    "/\u000bT": true,
-    "^}Y{Nt": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_4.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_4.json
deleted file mode 100644
index f483cfb488b..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_4.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-    null,
-    true,
-    "",
-    "7g",
-    0.2,
-    "t",
-    true,
-    true,
-    true,
-    null,
-    true,
-    200,
-    false,
-    true,
-    null
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_5.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_5.json
deleted file mode 100644
index 8a19cdb2fb4..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-    false
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_6.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_6.json
deleted file mode 100644
index 9d1a46ddf53..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_6.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-    2.0e-9
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_7.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_7.json
deleted file mode 100644
index 1b904597278..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_7.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "": 1.0e-5,
-    "\u0002y": null,
-    "r󼶌\"TD": "햎",
-    "\u000c]X": 2.0e-5,
-    "f\u0012􂮖": 1.0e-2,
-    "󱋏": "󳜚\u001e\u0018u\n"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_8.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_8.json
deleted file mode 100644
index ec747fa47dd..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-null
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PropertyValue_user_9.json b/libs/wire-api/test/golden/testObject_PropertyValue_user_9.json
deleted file mode 100644
index 38dad6a9901..00000000000
--- a/libs/wire-api/test/golden/testObject_PropertyValue_user_9.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-    true,
-    "F",
-    null,
-    "I\u0015",
-    "(",
-    true,
-    "",
-    true,
-    true,
-    null,
-    0,
-    200
-]
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_1.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_1.json
index 29913017c0e..46df516a4a8 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_1.json
@@ -1,3 +1,3 @@
 {
     "email": "䀕𣚼,kyz-\rᬙ󿰠[􌖨#mh>6@c\u0004;QAjc\u00042O\u000e%\u0005-󵄅\u001an$󶢴󰭵b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_10.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_10.json
index 99e2417a000..f37647d922e 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_10.json
@@ -1,3 +1,3 @@
 {
     "email": "䂨㢃z-\n\"T𫉦󴡈𑊒f\u0016u`\u000f󰞐35𭛯𭫨/[3ᚫm@{~3J\u0005\u0005\u0010(\u0004Y\u000b:l"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_11.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_11.json
index f0449e2f960..b0c9a2bb9e0 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_11.json
@@ -1,3 +1,3 @@
 {
     "email": "h\u001a\u0006󼯑倀C\u000e\u0003!𗣦\"󵌵pWN𮬒E\u0011EGZ$T\u001a@󲚨^[\u0019"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_12.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_12.json
index c12c0375892..58adaabfac7 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_12.json
@@ -1,3 +1,3 @@
 {
     "email": "{TC\u001a\u0005?\u0007u􄶍E󻂧@ꉥyMb\u0019\u0006|-eH(\u001d\u0004|B~㳊\u001b󰰢j\u001b=\u0008cs"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_13.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_13.json
index ea154b93f2f..8ebdc92778f 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_13.json
@@ -1,3 +1,3 @@
 {
     "email": "iA􀍭󽂴Y\ni󴭬WCU𪪞I\u0001+:f@./"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_14.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_14.json
index 7f8e2c029f3..4899a48978c 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_14.json
@@ -1,3 +1,3 @@
 {
     "email": "z𨁰xGh\u000c\u0017󸻵D\u00034\u0015S@5-)鯡C\u001aO􄒙-\u001e\u0011}%\u0002󿠐𤍷𫍶𠟛\u001c𪖹Tﮍ㾏"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_15.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_15.json
index 89039a8c04e..ae1bddc4161 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_15.json
@@ -1,3 +1,3 @@
 {
     "email": "𑂵켱ᐘ_(\u0015|􃓾@􍰗\u0007nt𪒫\u0000\u001cS𬪊󹅥-\u0003􌍴K}q􄸀O8"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_16.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_16.json
index 7e4b3fb7df9..727f4266a6b 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_16.json
@@ -1,3 +1,3 @@
 {
     "email": "@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_17.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_17.json
index 109b612aec9..21ed146bcaa 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_17.json
@@ -1,3 +1,3 @@
 {
     "email": "0\u0015􄵿3@󲛼1\u000e𦂋Z穰𓍓|\u0012fA%:\u0011D􂵹"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_18.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_18.json
index a34b52cd694..d6e1f452e1e 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_18.json
@@ -1,3 +1,3 @@
 {
     "email": "x:鉩𢏘m\u0015󹔵gJ_\n{_.b\t\u0004<𘝙lB0\u001e촹(@7/k\u0001𬁟쌐\u0006u:󷝍b~\u0010^\u0001􈛪"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_19.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_19.json
index bdb10d7cbf4..9363d0872cb 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_19.json
@@ -1,3 +1,3 @@
 {
     "email": "󺁩\u0000𞸤}􃼣󸞢K8𭹾$驒@L"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_2.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_2.json
index bc0d7e4a0e0..8908a1ad5be 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_2.json
@@ -1,3 +1,3 @@
 {
     "email": "􉽅\"K1\u0003;}\"n~X𠹸𧘖Fd\u001c1^fo}M􁌬q\u000b=𬲈xU@C\\"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_20.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_20.json
index e2bf5b8aade..b079e812221 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_20.json
@@ -1,3 +1,3 @@
 {
     "email": "2h/\u000f,\u001cl\u0012\u000f\u0000)@cu􋈜-\u0002iW\r"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_3.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_3.json
index 058a19367f3..f18b3365a87 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_3.json
@@ -1,3 +1,3 @@
 {
     "email": "J톩uv\u0004\u0016\u0000:<EF;w \u0006\u0013NF󰟷@g\t*>nO𬄓YF\u001ao>H𩉘0&Q\u0000󷏯\u001cU􆳳犂\u000fᚄ􌍣Kf"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_4.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_4.json
index 29e61badba5..90eb35f710b 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_4.json
@@ -1,3 +1,3 @@
 {
     "email": "b󺂈w\u0007f\u0017􀠥\u0015a􃔣\u00158@a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_5.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_5.json
index 9ab662a5477..a444b3baa15 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_5.json
@@ -1,3 +1,3 @@
 {
     "email": "C俵󰮩E\u0000'U󶖩@m􏑯\u001aGⱽ\r=P\u0015~􇜄%t㬸H󴥛􋤚Rn\u001a㓙亿󰛷[&"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_6.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_6.json
index 3208fa6cd61..b3c4728a8b0 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_6.json
@@ -1,3 +1,3 @@
 {
     "email": "{\u001b'໑DC\r󿣀|m4Z=|\u0001𥘡0\u0010\u001e􋍞󷼟OP\"𗼔𘀕@􈧎\u000b\\5"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_7.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_7.json
index 00d7f5e754a..2e474032e11 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_7.json
@@ -1,3 +1,3 @@
 {
     "email": "bl𧧖u󼼂g,}𐢍63@7󷈃!I"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_8.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_8.json
index 37f15e67c15..8039cca5390 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_8.json
@@ -1,3 +1,3 @@
 {
     "email": "_𒀇:󱸧F$'Q3\\󳛐@MGx$\u0003w)8C+𫷨\u000e\u0000"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_9.json b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_9.json
index 768424b2060..0f6bb5d78b7 100644
--- a/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ProviderActivationResponse_provider_9.json
@@ -1,3 +1,3 @@
 {
     "email": "~랹5QI3[$\u001c@Z\u0015\u001eওkv\u001c󹑣q𗸚\\𑐉􌃠"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_1.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_1.json
index f00c4afc8a5..ac6d7124f22 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_1.json
@@ -1,4 +1,4 @@
 {
     "email": "亴𬇛􃏗䷡Z\u0004𦙕􁤃𢟥@􍫠E􅰤Q|𤏶",
     "password": "\u0011瓲􍀏𘡸\u001e>XJ#\rA[􃰿\u00156r𝈑A\u0013\u0013𐃝󵂧p/􈉠\twP􅫏\u001eCq[\u0014(󴳔P]OL𮫮\u0000\u000f?\u0018\u001c􄭍O?*𠤑\"~𗔚\u00155\u00123󲜈􃝋GC \u0007:T􉒾|$r󺃢Q*US𝍲ἥ󱸃􊲨󷎧2\u000fXp\u0011l,{퉇$􊣮\u0016w\u001e󷤲p𧀦$6󴸕䍤\u0016𫤽7􋔴]𢤵\u000fi􆂾%\n\u000e9i\u0011\u0017I#\u0003\u0006z\"LJ+\u000c\u0004U\u000c!nSGq󾓪􇠪\u0008\n\u0016􌩲􎓑vkoE\\>L􅪃󲚽2㥆V\u001ffCJJ󾙊\u000c𬮓\u0011𢟊鑐S=􎒊v󲴼/jdg󴶕U󺖈s\tO\u001bD\u0012\"􂭈;𧯦`C#\u0012􆊊^j^q𠪂;`󾺒󽗻\u0010󰴖0Q󽮕𮄡𡍖\u0018􌂩99\u000b𠜾􇰽\"󸁗􌷔𗲩JW\u0013n󿸖\u001a'\u0017!\u0007;\u0018F󶌘:\u000f\u0018DNhu\u0017vWC]i󹹹]>mM𗥨󱫋ISK+𗺅\u0001m\"h8硳\u0002\u00143F/A𢮍󴬮𘆬M/궮󾔠`\u0005􁑑囶k\u001c+\t󶱅\u0011,6\u0007𐳔D󿔘.:$'P儍󸯥􈚱𨰲w6V\"I~\u000c`☒N2\u0013\u000e\u0011S􏝽/흝ZfjtU\u001d󹩲u%\u0017[k\u0016󽤶s+G\u0019h6\u0017k󾚒\u0002\u0015\u0001i󺆮P󲲘\u0011󳺉O\u0007\r;;𑲢󱎴\u0011y\u0012\t`\u0003{n\u0018#fb𦇂z􉿹@𤑮-𠸩\u0010_[)' r\u000eh\u001b󵡾4\u000fi\t𪑿􃠀\u000fEe𛱁y\u0001\u001c旺U\u0010Y\u0017[Wu𤊬󾲐\u0007􎪗d潑\u0008􄞕\\&F2F=L\rlk\u0015􂸍x꽞\n􀝠󸓆s\t󲛓]T\\󸏠􍞎𫕭z=^\u00062)Y]E\u0000<Zz3w}m']#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_10.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_10.json
index 0144b93061e..98fcebd1bd6 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_10.json
@@ -1,4 +1,4 @@
 {
     "email": "N􇪯C󸿈󱉮Q󸋦?𤉵X@􅉡ꖅl",
     "password": "-=绠w\u0006󱮋YN𭤾Mx\u000cz凿\u001caƠe0ARM𨶳\u0010{ⅤA\r@3䀬\u0013\u0003gA뫚0g𣾔\u000b뾸􉌙OQ@+󵷽kw=~Z=q􆩃\u0001q𫱽\u0001닚󷘄󶑳l\ne􅤚󶣿)Z]A󷎓_o𗍤𣬲󿗓Z;䠎M𠘄􏬶\\􉫳b\r왧󹂎%駯vLCFZ]f\u001d\t7􋧎uN? Y,hXW㼒\u000e⁙%[t7R뼝S\n^\u0004𤱈𮨢J󴊏\tj;P𮒬rw>@\u000f\u000e~ 뮀k7􍐞{m@󹸼}D*i\t|󵸞\u000bF􅗉+\u001a(qIOhI#\u0018󶡀󶔄7E𣗆/\u000fM_z󻌬ॠ⸢ڛ\u0015\n\u001f\u0016^)\u001aLVo\u001e쑃𫡯w⽞UeQi\u0006〴𗸎&캐3S$$𫮶\u001e6􇂜􄩚*𠈵Kkk&Ie\u0000{\u0018@}𐌛L𖬮𥈣L-\r6U$3wC 󲨝󶣠yf3􉈰u𣗯}}􍑟9\u000eX􍙍t󺷬{\u0012m􅲡o\u001cEzaDAZ忖T\t1\u0010鏦𣢗\u0000𒔺\u0014D|t0'W\u000f,l\u0007YI\u000e󶽙𬤱l,\u0001󸤙k\u0007B􀃶\u0016n󲣋\u0007EjoDc🍝EhKM|𦶥R𐳽\t\u0005\u0011q\u000f\u0016C3󶸟\u0019Uy\u000bB𠞅a蔜!8\u001b\u001d\u0000w黈xEV\u0005y\u00136􎎄䠋_𬾙\u0017𗟜7f􎡲v0顐\u00052*󺑠bW 󼁠\u0014𢕳,䝺zh􌨐rO󺽑\u0014N(\t󾓵\u000e뺘,D|􄔎󳰪)\u001d;q8{\u001f3\u001c)􉾑Z\u0002\u0001\u001a,:htBg6Qz􂯋󴪀􄺍G\u001eꅾ枕iS𪀜8cdr\u001b;\u0012nf38瀊gl$9\ngdX\u0015􃚨󼱚􉎧𣑬q6~\u0011d\u001b\n𥡤-5B󽠤/>M0\t\u0008VK 𐄡&\u0010<𧘜𠢹2Id󲥁0\u000cKg\u0018ZF𨑖rE𦆶󺟨l$𝒹\u0001f􃚀T(bH_e\"ᷛw뇋\u00029o^\u0016𣼍eM\u0003𮈗-𬐵􏜍E󴁿\t𝤥@(뗅m𤐲𤮅󰽀Q\u000c~󼋽8Dv1眰m/r\u001bYr‒yq\u000f 􈶩x𗞰䖍𤟱\u0014\u001e𦙠zR\u000f􁇴0\u0004󼨃𤁳kFꢘ@􋌌xqo/R𨘒\u0013G\u0010𫮭⥺𗵛\u000e@NL􌻾\u00130)uc𢆾9󴎳󴲉1\u0011\u000c\u0014󸢕􌴒|\u000cN.仆z\u0005r\u0001,;\u0019𧯏𡏭\u0017a𣞸\u0019d\u001dKvH󵆷3G(F\u0014)`􊶃O􃇾\u0018\u000f\u000cqL􋌳\u001c\tI@\u0001/k}`e~-\u0015o𝟊S􍽩ྗh𖥒^u>󲑖1𣁪%E\u0011o𬣣us󼕮\u001e녩􏀹\u000f􀱵ꆻ\u000cl\u0001t/󺶻U𮙗󿎿\u0000\u0007𧇏\u001e𣘱\u001bI\u0001\\\u000c𬃳Ni\u0012=>\u0014#𝩶*\u0013I\u0017O\u000eh{􉃘\u001f彙\u001cw!MY𬕺X뎧.\tf?a䏷􀯎=\u0016󽂁􈌽3<Ei94\u0016z􌓩%_.q\u001d𡒐\u0007󻿄焙u5sMZg\u0008P6\u0010𐬚ᐕEz􌓰.𩉮\u0017􍭹\u00073𨪤K\u00027\u0016s􆘟/𤐀\u00084+W:淓Fy7;掅beI_\u0015󱴙a(🁬\u0010\u0007O!\\𖧸󵻝\"\u001cPr!\u0011\u0013s\u0013Mrl!P𦻭K)\u001f禟UpjUgyM\u0004뻪L[\u001c@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_11.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_11.json
index dbd4ffe5326..a0d8401938c 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_11.json
@@ -1,4 +1,4 @@
 {
     "email": " 5VNckr𗱖\u0002:hv@\u0001s x>O\u0006􏭦􉅳r󽹸\u0000;}",
     "password": "𭱝By$󳢞#JH*k𤘴\u0007S鴊`Yi\u00165𐰌󷔴s𤂜F彄\u000fQ􆝬+n\u001dj:`\u0002𠻢9V)t󽹺\u0005n􁐼8󻚣􍾴n||\u0010𔕱\u001c焞󾠵(󲮯徐j(􈩷3\u001cwS;\u0003]􊄾*􁎣j-󻲻-\u0007;`\u0004N\u000f􊁁"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_12.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_12.json
index beea1e92fb9..7659f0df5a0 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_12.json
@@ -1,4 +1,4 @@
 {
     "email": "ip𘑩􇦢\u0005h:󵎱G\u0015󸾲@󱮟6􎟖k",
     "password": "h𩔟x^iBXW\u0007x}􈑶\u001b4J9􇝈󶀄􌙒.61x{c󵕔\nz韲8|󰠜\u000b\u0014k\u0014l'\u001b 𣚳},*Di鄡𫿏p𤵆%\u000fzoud\u000bU_y\r\"0󽛯<\u001c\u0001_;`w󰒯/x\u001d1r$Xnf\u0001l􇹌ana\u0005\u0005\u001ac;$\u00194􎺗l$L哅F􇖿󱟵Tq𤦓\u0015c1#SD󸕇v\t4kpS􍥮篏㤮G􂦴\u000f\u000ePT86H\u001b\u0007\u000f󴖭𠜮-\u0005OnJ䈶E\u001f.q\u0017𤑆`\u001a\u0013L蛌煒\u0015󹣾xY0\u001c\u001f\u0008sᆋg7\u00076𧲓 <=<􀵯\u0005􉑞󽁂aOrL󽲓0q􈗰g𭵟6\"#𡇋󼥅󱢓q\u0001V\u0006󾿱xO\u0005J\u0014\u001a\u0001𗏑\u0005:z#ﱇM\u0015􄽜4<2U!HWMMQ#𪍺h\u0012瑅}𝆝#\r\u000fL􈖨y#𗵲\u0001譫jS]!O􄝡脲󿍰o\u001b󼐕䍥$H0!DQ􄟨􌞧\"&J\u0011\u0018\u001e\u001d2󸏆S\u00020􁴸\u0001\u0017Q𡖚𣢉\u0002c9L􉘐s㑻4KFz󽩼\u0001䠋􃩨\u001d6ink>><󴽪Iw\"\u000f\u00182'@29\u0012옋\\􆽀\rპ\\4w󰄺%/6􍥁g~.g𒆤웟􉋇 Au\u0017P𢟎𩡆𪥯x􋏚􇹽袢􅂐?𘍳\u0006I :\u0002Zy$\u0019#􊯤𣳱jv\u0008𫬹<\u000f\u0004<m\u000b𢋟\u0018uQZ#P`yGy"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_13.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_13.json
index b163af84918..e8017634b24 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_13.json
@@ -1,4 +1,4 @@
 {
     "email": "QV]'p\u001c@􁀣󳡹a\u0017C&<v5󷦎(lH;E",
     "password": "𥇜>𦻼\u0013!󶿉<Md\t\u0001;u)􋁍Q<~􆔐7>a\u0007|悔])\u0011\u0000]K󽝳2qo6,𘢚z鉿􎯋Av󳄀v󱸕\u000b[e\u0018\u00124!)\u0007),@e?絠DAՌ%%F+󶅳Oc𪷁\u0007\r󹤟\u0000\u0004g4g*⊒AkKC\u001e\u0016g>=𩼅3󽲥\u0000\u0014􉋥p:2HH𡟯玚\u0013𤊦𧁈q\u000fk%𭾖嬐𢜸\\a𝓓E皌\u000f𬵟Nr\u0016$&󴱫􉭞i賉,𥄹\u001c7f𗻫<j4h\u000fx9\u001e\u000bT*\u0000/[󼖲󿩫շ;\u0004z7H\u000fn\u000c\u0015e\r\\m𧇃Bn<焼<𣸲NNz~\u001f/yD\u0017\"\\(𮩄\u0016󻆟(TIp氺w\" \u0008H󳳜\u0007\u0013(Wh9\u0008'G𦿚A\u0013􌄮FH𫉛l*X𩩚𠒬􌡢KNJLBn%C⤏Z󳔘9 \u0002􀊯l\u000e+#󷭅󱊖p;┰,`eM7>e<s뤃S󼵏\u0002MMN]N\u0006󽩝_V|(ㄝ^h󷙉B𘜄[rE8H\u000b\rw􂽨\n􏻽𢅗%\u0007D$y\r\u000b届􌜖󵃸𨯡+3\u001aU\u000b󲥪)xa\u0014`}\u0018?YP\u0019A𖫱\u000e𛋘𪨒I>\u0018L鬜\u0012󳹥>\u0019󼀲N뵽\u0019􁹶7p􎽺vP1?,c􄃄Xv\u001aN'\u0001󴕬lE\u0007𛅳J\u0010𫈢U󸠵kP󷫈`O瀪\u0015jjC󿚼  Me`06.\u0001\u0019s􎩥󰞥Z)ǹBw\u0000zKZ𩮘H\u0003F6yhu𛉙触d+𝞱y􁤯󿇫􏷿)𤺇|\u000e\u0004 􉪰󰴆,\u001a$.-7𣦄a\u0004􄙜R5g􂜧rM𣄼󸂀H\u0000M\u0016\rT𪭁Z\u0015󲥑𮥝\u001f󺝎-덖\u0005󷣜~h\u001epV\u0015MTRyE9\u0017t\u0004繣𭊖𭥻]$v𬎬𬤦ap󽬜; 􊮞\t\"Ww𘇫$􄲆y:`M\u0000/~Z\\eF6󿇸\u00008󳭻𔒜1\u0000⾶\u0000daS\u0011􂍾f𒋚E\u000bt🖪C\u0019%Q􄘎𠙾Xp*78蟊`𢆃<􇘭dJ􃷨􉉊\u000fb8u𤂵\u001b3𨩘F􋥉\u0008㚕𔑵E\n>컕q\u000bj\u001a\u0018\u000e􏯍󰑫Y\u0004􇌁X%𣣰in󷤎w\u000c9𐃃􇃋󹁵Ff􂫌c>\n$}\u0019捋Y햋)􋤯肓󸡀\u001aW+l\u0007b慎\u0014𣟏FmR]|u\u0017kR\u00077D쫏G텫𨋊@\u001a貲\u0017/kt.\u001f{􊲺#^(zcVm\u000c􋇩'6j$[\u0006\u001b/VOQ󳕏VLw􄡆#f\u001eC𣷢𗳅@s딃me2\u0006e\u000cs5g\u001f𣗯𗴆I$t핽\u0017\u000f􆉨&tPz󶬙\u001e\u0015𤯼&`x󵺑?:1p\u001f󲢃\u001eC𦡐㬑X􀱥ﻈ_ZZ\u000eaTW\u0014\u0004􏎙$\u0018p귡|(𖦭67㴳7瓮􂝜𗼇zLc-Y^󵇠\u000c薻\n𖡂\u0008|󿃼\\\u0011\u0000􄾬\u0019,W7`𬶶\u0010𢪾Jn󳾘Efa\u0019\u0000JLwN"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_14.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_14.json
index a171ae261a9..0e55bc0b7b3 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_14.json
@@ -1,4 +1,4 @@
 {
     "email": "q𘝔\u0011 3%Y+RO󹦸1@4`󼞏",
     "password": "\u001a1󶾝􁒬\u001e\u001dG􍼑.􅪫T\u0002\u000f🞸:𨕩8\u001b1aV\"\u0019G|g|7\u0003P1􏳅A{_귗⪶bufZ?𗡳퉷𭟻\u0013󸑇~g0󶴽B𭠅\u001bR|\u000e'4\t\u0017 􊸚𐡹\u0016炽鱨􂟯􋕾I󹗑9𛁺\u0013\u0004P+\u0016z@m䁞!-u}(\u001bG\\𭷩\u0008|3󼋇鏰e\"赫-\t􋠙\u0012"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_15.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_15.json
index 6cfbb87ab37..6f5ac6975c5 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_15.json
@@ -1,4 +1,4 @@
 {
     "email": "\u000c9a\u000clw\u0000,@i\u0012/d𦨥I\u0003\\𤰉t",
     "password": "':󵶌%칅|󰸬󻪘𡌹䘒󵍋\u0018o+!4T\u0008\u0006𘎗W~󻌢𥄮\"u(4l4nH2􌽪A㻘-󸢦幍𛈛K3@q#𧙅A\u0003z}𮙾 \u0017rⓒ􇑫C냋\u000f|􄣡\u0016x\u0005<󸮙\u001drj􅏯\u001a𮓌\u0019\u0006[\u001e𡬈!VP\u0007u\u001c92f\\\u001b𪌥 ^g󷷺㐙t\u000cvS󾭫\t\u0005F\r}\u001bP𣎨<\u0005)kD𘔼\u0015􄣇@P𦲜-Jⰶ\u0000\u0012R춟x󴏹䗔\u001b{Y\u000ck\n酪\u0007b󻽢u6熞?5\u001b`\u000f\u0005`_𦫖2d\u001e~61Sk𫦔􄾈K쐏\u0010󸶔􇱄􎓻\u0003₮𠷽v\u0011+\u001c􎥎c8ꚣछV􍭎\u0003\u0012h9䎸L뱀7𗷚𥪶)u#\u0015,)vl󷰮7Ogx\u001eS\u0007𪜖L~'g]𐦍xG󳅺j^􍐱🆊ZD('\n\u0010\u00135􏣌𭋷L􋭔􆦦-z\u000c]la􊨳=]n#a󽣎睳􈩐\u000bCPCRM󾚺𣮁=uh2:Z\u0003螾E􍻔Y[N\u0013\u001b􏈨􄕅_7\u001c􂪹7󰻴4x\nE𐣠璚S瑣\u0008e6\u00081 F\u0008l\u000b\u001a󿍋𥑯\u001b🝟C\u0006vX'/4􊤁寖𥆅+󳌜$;+\u0013𪣎/r'󺶜\u000b󰈪H􎉄_M\u0019UU^􆾎X=\u00190\u0003\u001b􈒻DQ\u0012㥼𠠛=rm5Bv*𑁧󹙯𩸿"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_16.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_16.json
index c9d8b5a1f70..872848275ba 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_16.json
@@ -1,4 +1,4 @@
 {
     "email": "􄣅bp\u0002.=d@y㯼\u0013𧔬ꋑ厲󹂹Zq😶𣉂",
     "password": "󽊭\u0010v<𗋹:C󵹱3\u000e1_!\u001bP\t𬊉JW?𗰎󸟶󿗙l􊡅=ￆct}sUS􅭼\u0019\u0004\u0016ࠃ|/HR~.􀅄/N\u000c\\𢩄4羇t=CY𫳩y\u0013􁖼p}_\r\rhEa􆩏c\u000c3\u0002^@\u001d🥒@\u0002[=\u0005w\u0011󻜮\u0011𘫇~􊰉𗝀.􊁥\u001bn贳.􉜣]6`A]􀢦pA\t𝣾\u0000+\u0004Mu𦘱\u0005\u000f󾶉\u0003?&\u001c\u001dX􌲐dh6Fpዽ\u0014i𡒹􄔿3Z7@8\u001b{\t\u0004Q4g𣣼ￛ)I𐁉[t\u00049󺥓w3\u000eF<\u00000􅬩~#俤m6I\u0018􍲉󱒮-\u001b:76\u0014\u001f/?suL􂩵)x~\u0003n\nHI@b􌷳iT󱘩%{a츽!%𗍬Key􉛙>󶎤h*𒈔Rs\u0005[!R\u0019\u000f🦨a4쒯b=r<\u0001AQy_u󰯸\u0015𑿝\u0010j9,\u001e󶈰􂲡[𑙄)\u0019汼O\u0004󻙓\u0015􄭠\u001am\u0017m;~!Nqx\r<%?\u0018\u0002K[KxY5M?\u0013nS;󽫘􂃁@𢺾1lb鴛-\u000c\u001fJZ󳥶Ki\td􊛨i𠓓[𘣣~$#\u0016\u0001gށ􃵽g\u00169];|\u0007𮗨b<o􍡘iC\u000e󳽉\u0000󹉸\u0014󸑄𗲿􅠳\r䇓8P𑘴a(\u0017\u0016󷜩𦙶@𭇮󴄿󴑌𭱤K𘖗3XqS|34h\u0005颉\u001fg<\u00020􅍛𑪄ꢰ,𑅅_#V\u0015\\M^n|󼐛\u0008l􉅪M󲉽\u0004󹸘MX[􊜓{h𠽺:w󺇠󸭤?\u0016hTS􀦲~𩪇dYn𪊧댧P􆀯=_U􇯞𭤉v\u0019|v\u0007E%6'𧣎dP\u0010𤨧󸸥鰒jQ󸞏􄍬mW𣤔f{Z\u0018^J󿥣o4렞:\u00189K=󿎠\u0003|m󱛪튣􏾨$\u001dG[;JR3\u0015~(􅥑\"~𒌹\u001c\u0017\u001cis\u001fJ[hu鸫M\u0019􀠷􎕵b$Bj&G󿼳􏍛󷄈\u0002󸟆𭿟4b9"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_17.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_17.json
index 5d2bd4dd6e7..0b506a5d31b 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_17.json
@@ -1,4 +1,4 @@
 {
     "email": "􊭝do󰣖@󹔄`C\u000c",
     "password": "x`\t8,?󲖸I\u0015I^~𢰎x(\u0005X2S𪪍O\u0013屮P􂥩%\u0008\u001cޏ@$J/vq􋧿󴢘aꀃ$\u0011|\r^a椔3􋚩[&𘎞f>R\u0018햜𢾨󼹶誽AlfL0<P+ꚄGtq󸋩RL褊v\u0019\u00197𥔁 |\u000f|8]{\u0013IG\rYN迂t_4􈉚x<U붵𥜈􄂭_𘠦8LI\u001b-􌉠<\u0008J􅁳\u0019D𖺙F\u001b\u0017󹄥3I(󽦠𪷙G𥞅mYbD􏝷\u0015\u000e4di\u0010s뻲\u0007\u0010R𧘅f𝢐h\u0015a$:\u000b 󳯼s/5\\\nꐕh$D\u0019W󸱲`H\u0011I􎅇\\\u001f󶙸*C_3;r\u0012𛃲\u001c^􌟤I\u0014󵘔uh\u0002,rR󿈩󰳗poA)6hH雪4~N\"f􃌖!辺ST󸛍\u00139\u0003p&O:0ZA\u0008aiy\u0016+7x십[5\u0005\u0006{^M󻈅𘧐\u0003,I󴸞𫂷Ậ\u0001$\u0003𠉝n􂂭`󿬘􁐟󳟫{󳂁𭪗B𨅄egB*Vni􍁥󹚚)󵗰#/DZ2ft\u001dz\u0000\u001f3􏷆􌠘\rsi\"\u001a)t\"󽜊\u0013\u001b𦳟M𝚣-\u0012\u0015ORi􋢧FqOw镃{\u001a@\u0013Ewh;\u0012\u001a󰸧/2c^H8󸣬L^Z2𨽝\u0018/eD󻭛|􈍂$!􈉶,+\u0015+\u0004稢\u0006o󲏊𥶸\u0010𪿇`󶜼𫀳𣗳~\u0002\u001a🩈%`:OcK>8𝥐\u0010\u001f=.0\u0008%yk6n𩕭\u0005[\\\u0015󼈛놢R𮘔𫶞[f󽚽5\u00004f㋟𫇇t􌰋𦄅*\r/V$󽝞껢8<𐓻𠔷-\u00082􄖥6%f_-􎰒3a\u001b_􏍫\\u3XZ9 𭶙Y5􂮇(󵴩R\u0008󶍹f\u0008󻱍z}\u0008\u0008Y6UOz=ᚇ󾯇W,􏔟\u0014󾽦𐇴\u0016>􂬬𖢸\u0018􏾘Z􆹇󸵥g\u001a􈯣Z\t!Q46\u0012𐳒jM\u0003c􁙬EZ\u0007𗒸rcDK\u000f\u00029ⱬ􇣣\u0008s\u0018}:􍂌쯸!gp\u0015z\u0015𝑷\u000eL󻕜\no𗹦;*E\u0007㵀gST\u0008j~􅟲d􌩣V󸂙Qf􄸿L\u000ei\u000cY𮢄6\u001d<6N\"\u0007],s9􋮖􅛼M\u000f󱴾k\u001f缤E􉯌\u001eTJkEc\u001c󷒩4􄷲QE󷒯慲8𖦝󰤾'𤇼\u0016􉚥\u0007>?\u000b\u0007\r{rW,󽏠d\u0005$2FA􂂲\u001fwL疯!󲩅\u0010\u001ecf𢙘\u0015)uSz􂟫O#B3;󼷸rC\u0002DA5\"\u0006 \u0008j\u0011^\u0006𣱺i\u0004􎬗BM]\u0018!􏘩𮗕\rA&\r;GTE\u0018z\u00196tQu𡕖Rn\tT[\u0001\u001cQn>愮L𖦝􍢚\u001c#𫽌&n󼚬󳷐\u0005K\u0000H#\u0010npu􂐌Bt{X\u001c2je@5󿧳󼯽􅢒;\"􌦍Q\n𘘙􉀀흝\u0011U~@:\u001f~锯\nRLiD󶁑q󲮹{9d🗤.퐏\u0015\u0008]HlZ𥛇\t柑쟷\u0018{3󻏟E;F8G0g󹯼&'󹹮C􁘋\u0014i@v\u0018%[_g󴖽5􉥛+;.DtH૨z|􀫰󿊥\u0014􀼴Z\u000cS󻐸\r💣r~r^[𩦪䘷o\u0001掯_H+;\u001d🌱\u0007&m󰏯U8f%\u001c䗮銜Z󻛩8},P􇳰H\u001a\u0008􁙸H^𠱎`gRf𠬶􊰁+V\u0013\u001c\u0001🖭#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_18.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_18.json
index b4594aebe81..799eebd86dd 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_18.json
@@ -1,4 +1,4 @@
 {
     "email": "1+dHm*𑘍b@",
     "password": "N𦄸\u0004C9\u0014\u0011\n𩤬裚堽/p􊠏8\u000bg\\\nYGz|/\u0007Nd󻕺\u0012%툶o\u0016\u000f闬r􈶵󱂾d􎲀o􊻨\u0010l5&}i\u001bg􍤵ᦫ'`8N􌂽@𡖨󶎄Q[o\\\u000c􍦥Ꮜ\u0007d~ꝼ\u0006Kꞃsnr]pLA\u0006􅀊\u0006𒁾Xl,;wz\u0019󳳼􅀌\u0016c\u0015A7q\u0013\u001d툃ft𬰣f𬠀\\󸈦􎒉\u0001፼9F󽄮𦍥D􄔂\u0000z󻡔𥄚4\r􅯼􅣿󽅊\u000fO\u0018\u0004Y9븲C0|8𩉛]n𢍦\u000f󺉪ra\u0005􆯖\n]J\u001dBﱲ\u0003gT𗘠P\u0004>tﳨ\u0007\u0018r\t󶥍;Yy\u0000\u0019􅥯Qz\u001a-'\u0017*\u0001;J4]9𬥼\u001b𡫀[z鵺=cpG_;\u0004u􇏎ic\u0004\u000bkz\u001a|}󷂕\u000b]儼G3\u000c\u000c0\u0010d\u000b,􇱜䍜[#~8OG`n)􍼫5𢻤\u0016𐠧wK\u0001;\u0011+[􊖢'󷘅మ\u000e母-\tB􃃓h\u000bVl\n$\u001e\u0017\u001bw^!\u0010􍤩\u0013󰯽3j\u001c𤛹8oj𗜂\u0008󶧡t4>:裞_\u0004\u0018𡇔F󺶤lup\u0003+n\u0001P'yV;:𩧱V\u0011~ 1󵻽􍒽A-\"&8}\t=\u0019\u0001\u0015\u0013F󰮹􌁈\u0015픓/BIᎿ,#\u0019,󽉌gp\u001ew][\u0012>\u000b*b퇹,\u000e\u0019\u0002𑅥ŅCuTd𫬦27B󸝚oRm$𦢵Y3\n'?\u000f\u000b\nf𪵤K\u00016\u001bl]`U)m䣪"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_19.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_19.json
index b7e387a7fa6..8ac508be50f 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_19.json
@@ -1,4 +1,4 @@
 {
     "email": "W󽅄`)SR\u0002,Zw\n@",
     "password": "yMlﳹ0~􀠺󹑎a􋆛\u000cQ𗆨~\\y􆎛\u0019\u0003rqFsvG%So\u0006aTH,\u000c\u0002P𘞅\"\u0014o;UE\u0007\u0016퐃\u0012r`\u000bu1)2\u0013j*\"c9󱐿􄔾)h#𨊼m*j\u0013껮~v+@\u000b\n5*ui䎙uS󴼵􀸍sqM\u0002󼈲\u001c𭭳𦌨fG𦈯tv}걡?V\r􀬥]󷤅\u0017\u0010*E+V}𦃡9\u0019*󷿣[o䗚􎐂\u000br2\u0007􄩐\u0005 륅@O痔^􂭝Rꘞ!HLT󸭑.󿧅􇢯\u001d=+D𧈐4|󹾞T\u0000𛊢\u0017󻉘􁛀w􋃑#󽣊b\u0019F\u00073k\u0018*#󱟮3YKs\u0006\u001a\u0006𢗨D\n􉼼(\u0004􈥵&/u㑕W@)pLY󱆶)<{\u001d[LkCU|\\\t\u0018\u0013Q\u000f\u001dS\u0012􈐅􁥁\u0002\u0010󵢳3655H%\u0017󴯌\\k𤰟xl\u001dAf\u0018y\u0015ն𦡤󵊝\u0007uH\u001by0(㛓󰼔q𘏚\u0005󷼨\u001a6l\u001d􌶜H5\u000fX&a1j#e\u0004gf6􌟗{􌩁\u0006a{\r􆝞\u001a󹞬Ih\u000b4㙃􄋠\u0007Sq풼𡁳B #󹮁󰛘%1&ᙲ􌼤\u0000W\u0000󵥀\u000bハ,@p󳕠_s󵟌鱀:􁇫棁3m􆌹\u000b_󻟴\u0016L>\u001cq_1\u0003󷤑I6L\u0005𓅐󲾐󲭛YﯓzH\u001fu􂴦󶈀n\u0016vA\u0017G(\t~\u001dT闍N\u001f􁫇bju\u001e𨋍Z𠢄P ፱\rq\u0006\"K\u0001\u0014\u0007qcJ\u000f{𩽶􂄌K\u0000𪶚F􃮇,蠞\u001a\u0003W\u0014쉘\u0006N\u0004LAE#􁃧hIWO\u000bj𞥂:cP~q󵾵\u0005U4绝॒*z\u0004){\u0000.T􄁆=𫍌𮄾􏡉]\n쎚4s\u000c󷃵𢐦+층\"Z\u0011oN2𪡥\u001coee\u0011wD\u001c\u000eZ𨖯4\u0008\u0000\r󠇁𡨝\u0014:7󼫢"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_2.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_2.json
index 7c4def3e4e9..d0a40ab6719 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_2.json
@@ -1,4 +1,4 @@
 {
     "email": "莟^Oz􏽿􀖮NG󸵚\u001djꦧ\u0000i𨙻@0&\u001bi^i\u0003G\r\u0016",
     "password": "􋥵OY \u0000􆀲\u0001X昵}􁏀\u001a0@쁑N󿀾\u001c\u000c.+v1n{F'󷏺u𣮶.v=𭵷ᇎ\u0010af\r\u0015e\u0000\u000e\u001d􊞽𡫳\u0001)􈏘hw\u0001\r\u001c\u0013Z6僭X􋽭h]0%no\u0011󹦌 JEJk􆾒󺽣􌱹dTrtvuz􄥱𬁹f󱫿8\u0008$W0\"\u000e􄝑􌴇~3𔔀~f\u0005z\u0010f\u0003𡧶`1\u0006t􈯅<b\u0015𠂁^,bA\u00111s\u000e$'\t􏁂q􇾹G_𠧸􍷵13Zd\u0006\u001a3\u001d9𤑛\u001a=󹑔\n\u000b󿸲=𮠡ၤ􏧇Mm\u0000/\u0000󽔮 \u001c􏒸H\u0019𩆷_􄊭~Kg\u0000<𗋘`󴈟fq覝𤥋n􊸜]/3\u0014H󰭶]@%\u0010[\u0003𣾪Z먵p=i_2K𘀙𨠵\u0008\u0011𡞖𤭖\u0003𑆰􏹮C󺮡<E𑄎M􋎪I􎗒󾹫F+󻱏OX,奈\u00157\u0019%\u001f🉂㶨\u001d,@RJ\u001f\u0000\u0011O\\Z\u001a\u001dJU/d􈿣\u0005k\u001a$󺥑\u0001x\u00169\u0013_􅌃𐼔T𭽩7𢱐p\r\u0008N`l+h\u00044?hD𓃅ZS􈕅篾wt\u0007𣶗\u001bq\u001a_\u000b\u0003l:𧑐[@顖;H\u000bUH\u00086$G\u000fG\u000c\\D\t鞖``=}$9&ttQ𠇋D\r\u001dWK\u000f?[>@󺌇_󶞾\"]󺰹󸮍𥢡o0>Qd\u0006`GD\u0000󷙦p쥚JF\u0007w\u001cCo𨛚\u0012\u0005\u0008q\\;\u001a󰺊to/Q/3⢺F𓋂j𤁫}yi_/\u0008j*y󶮴&\u001c#KG󾈵\t{\u001fn󶛵󲮖|\th;CJ|S𦮤D􌧩rh󾰤\u0013\u001e5VV󸕦ux9\u000eu𢛮?􍰨_\tx>4󲵔䑿-d:y`*T7𨫧_7\u001d\u0016迯bkb\u0019\u0002􀱓\u0014$󹭉i\u0000𫢓𨻿xUT󴿦a\u0003𠯎V^\u001dvz?;E𥡬𐘷炙\n8X𬳲󳠖\u0018ot\r\u0017\u0000V9>𞹮`c\u001a𐍱W𧚎졳𝝳rh\u0013&𢊂􍌣RC\u000b&=2\u0008􉒙\u0003󲲷)⇿7Uj󻛸A,ckL\u0018𦁑o27𤲅\u0006L\rucW\u0013𮎶Bw_=\u0008"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_20.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_20.json
index 2b2141f5460..dd21aa39c15 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_20.json
@@ -1,4 +1,4 @@
 {
     "email": "#႑|䤉􆨕@\\\u0003􊘆A \u0003DT\r<",
     "password": "y\u001aWK􏯩\u001f:d󳕈1󾴚d\n]煚\u0001󼍉Q\u001a\u0010􀋏\u0018󰖝#7$􄧙'i2/%u84\u001e*󱧻󽫠4^BB?OxꄨsW\r􏗬2\u0015F.􂓒I㎐8\u0002\u0003`\u001d!􀴭<5Y􁌨d󻕺P􈽷P􏎁?1􌦺n\u0015a𮫲-𩛄╭\u0001c\u001cne_􉿗􆊛c7⓮Yoe\u0000_>𫦈\u0015\u0000N𝖺󸓅J\u001a⎎OkZ~yV$\u0001R\u0000Q􈷼[􅳱􍟏?\u001e嬣󵬡t`๏}t^p\u001d偣􈞡qA\u0008R^폗􅔮f𠘢qZr\u0003K\u00051\u001a$󿺞󾐰􂉗󸂝\u000b_C\u001ab[g𦉇i􃢕j%jZ9L\u000f6􊭶l~\t{}>N󺿆􋄆;\u0018󷒚#\u0013:\u000c\u0004.󼢨|󴇆%iMr𠒭:\u0003\r􂱰\u0017B󻡲;\u000eT_KJ=b0󴰃/u\u000eq\u000ccV[h𣫻}`\u0015N\u0010P🠇H\u0018:F쉧󱔃+󽋯%2}|s1숓[Rp\u0001O\t_E\rK\u001a|\u0001\u0013x$󹉼􈞅.ﲻ\u001bZ𑄦\u0001U`\t^\t0'8\"O\u001a􀆌\u0002nbGo3_􁾈􈥫󳇍\u0016.%\u001e瘿􊠾Q\u001dD:gJ=Q-0􏽟q\u0002x\u0003r\u0005T?\u0003+$獶>􍙎㼘ƌ\u000c𣰹Qj\u000f􄭖Fs.\u000e𝁼Y.󹾊J荥\u000c𥲐A𦑤ᏽP5\u001c\u0005𝂓\u0001\u0001􂤣􃴕䎬􃉉/x?\u0016I𭓍\u0015U<!􁁗^J\u0000\u0011s{􍁗@\u00053呩\u001aKfnl\u0019𬟊!z\u0016󿳙J\u000c𠷢:W)JVD\u0011𠴝󾺣`1\t\u0000􏉉E{`'N󼌀웚<\u0004r{f𤜹𐑜󸶺\u0007\u0011RH𑴪젽\u0015@􂀠a󳶋󳵙𤤭\u001by둤\u0004\u0008쬱q\r㷐t!􈅏󳖵󵗱󾽉dsQ\naq嵳􄗅𩢋cec8􈐗\u0013𫁝\u001f𧥇1>󵾰㜧Ig𣛦L]^.𨯉}&(𭿟𮂌vGg3󺢃\u000el\u0004𢱠\u001e\u000cs𨎁p5LS󳮊\u0001|\nvm6#􍟀􍝒\u001d\u0011\u001e\u0008𦣯󵫎\u0001\u001b𬻒􁆽bE\u001e\u0006`wj#󷦙>Q\u001f􀭜ss𤶴􊵩ck%>QຶB$\u0002&澪%\u001fT\u001f\u0017:B\u001b󺓍\u0008C𭔙h;O:?\u000b󼯿j𡜘j󶺇;t􇲢\t\u000e@ዷ󼯥p𮠏\u0007󳍵㷲@,𩒝duBfR\u0010𑲯!\u0005<\u0012\u000ej􇷠XFs󽒇'W\u0000@SDA􉨥"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_3.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_3.json
index f76d0ea5ff6..decd3266f04 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_3.json
@@ -1,4 +1,4 @@
 {
     "email": "h)샓Z􃮐􅣒@𭦧\u0019上󳉅f\u0008",
     "password": "K༁|􉄞HU\n\\Qik\u0019\u001f𥡰xG𨘵1g鐟9􍩩v4􈙇\u0008\u0005􄪒􉀚2\u0018􈀏|󶐴\u0015&\u000f;2\u0011\u0008󴮏A\u0007=u\u000f鲣\tz!pwH1\u0014\u000e.lexJ\u001e􂍦3\u0019&s𫑾󵋈\u000eN􊻦\u000b􀧎쁨􊞆#n\u001eY􉧦\u0010#%ObL=s(\u000c\u0019󰤹􇯭y@i\u0018/o\nof}Z𝩘V\u0000DqD<\u0004󱀁𖡐 ;\\\u001dJ)\u001b𩤤Sth\u0002^'󲞛󲶃𩵝/ct9\"\u0005$s*􏡋󰉓T󴌮\u0008\u0018􁉕󼁤9Drm𒄠$3𓉽j鉉y*R@󿏲􆣙mGM󺈅^~\u0003\u000e*\"2#􋘰S\u001c\u0018|Y]\u000eWy&N𦾐Dw\u000c\u0013Y팀%^+􅖘s􈍛\u000ee􇖙\u0016󽦄𑚫잙o\r𭈵z\"jn2\u000c'(<P\u0007i~􌍜1Q;\u0003`𫖯=j(𧰪𡽧K젲RP𥤈54.9*A>B\u0016?s#*d\u0005\u001c恘\n𧋛\u0005􉴊$f)n揊}&N\t􆏞\"1􇝈u_QCU\u0016eR`󷀔N\ty􀇡㶶\u0011􎏏k;􉬬𣐧t~JX=vN6\u0007_~C\u001f󴚶\u000e􉿣?$b󻷡\u0019A\u001a=vm\n\u0004󻵊'g@\\𧨥AhVW銶𣆎𠂹󿹀ဲ\u000bO)U󾚢󻩣\\Ly髽eA4ꎍ\ni󲭧ꫨ\u0004_𗶱n\u0014𢙎\\S%쏻􇫬e\u0018u󳪋􀨿'V-D󻍓X,q\u0013\u0014𩘩\u0005$땯ﬢ.e2l􃊡\u0015\u0003{TW\n칀ԱH􀋝􂨲󲸢􋔋\u000f<\u0015M;[d\u0014\u0008}y3Jt𘝵%l.\u000cU󾳱H\u0002-.#\u0001\u000c𥂺!\u0018Y{\u0017d𥊑[(󾇘]j𬐻am!Z[w\u0002'*Tv𪨝PM~󼚕0\u001e!b😒\\P}3v\u0019n􃽻9F2gW4𡾪󹦃\t𫇘𤀃𪷬hR\u0005%鑎z󰕥󷚐?*㘈(#\u0019r\u0014\u0008r𧡝WN[ N{􋞱\u0019v틈\u001a󱠨􌭋􁛙\u0011[S\u00138\u001e?􁴏\u0007A\u001f󿳐A\u001db𘊨􂐆-\u0018(jᮬt\u0005;}\u000fHX\u0017]_,􏅩xVY𖡊\u0004H󶟹i𗛽\u001duu'>S\u000f\u0001灋䯲󻒦\u001db󰨀𧙰/\u0019􆌋7\u0011/X\u0014oZ󴿝𩴑橤|FN'􉨃\u0011􋖬wB\u0010]뺝 V􆟅􃪕\u0007n􌚟\t1􀉊 [}C}gG􏧭#o󱲻kF\u0003\u0008K􄝬g<\u000fn\u0018Z𗔷$}h\u001f\u0016𣺺5m𓐛󹫟<󺍝隴h\u0010鋬󰅖\r#_􇾑fD\u0016`󿽼_{n~I\u0004#7\"K\u000b{溃L􆵑\u0010󻅨󱾍濾]l x\u001f􂲹𬃪U\\\u0006𡟿鐵\u0008>\u001e$Y􍷋\u0004\u0014𡀅𦿦𐋸gE[Z🢇󻤻\u0016@\u0003􉼢uὨ뛫(.\u0005"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_4.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_4.json
index 7250ad236c7..d8e2569373d 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_4.json
@@ -1,4 +1,4 @@
 {
     "email": "𭿈%𡉋𩞄@wY0nE뎟d,",
     "password": "󳠀`h𠻃[/\u0010\u0016􂉌𮤺c\u0010𣔼\u0002$􀕶V\u0012}\"􁸤1蕹K\u001fC𬫻\u0005'󳫓70\u001ee󼁅\u0012w_꒫\u0016"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_5.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_5.json
index 87ad414d80f..4e3d168c6b3 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_5.json
@@ -1,4 +1,4 @@
 {
     "email": "􊔞􆵆\u0006f?􃱘\u0011R`@稺c?\u001d󶑤bOP",
     "password": "K𑘭\u0019r쵦s>qsz􁙱􍞑㤲\u0019<*󼞒鎛\u0018^&💱9N <􊬐YR.𧺍A\u0006)u3􇋂6]𠬦IwBZ\u0002󲂩󵫐mA}2㊞y𞠫𩐘􅟏󼃡/Q%E\u0008L<\u0002I\ra/󷒉q-얤 ]U:^YR0){\u000c{g𩽦\u0006F\u001f<:𦵧]ICꩢ𘘓𗵰O($h󱼼\u0011<iz\u0003CG\u000b󹄀qD\\@\u0019R\u0014𣎂e5📵s<\u0004DP\u001d\u0008o􌲐𪸝o\u0001N󵅮4g\u0007|R9B;𫺹q\u000ef2\u0001+Oz\u0019 􌑶}Yh3>\u0001e\u001c\u0001xQ)􂴟􅜖𫘡􀙴OZ􁧲\u0015\"󱦉/\u0013x[𥥯𭵑\u0010V𭪋𘎿\t𥺾E)H\u0007cIsa\u00184\u001a敖8𑑃\u0007i\u0003DD4w𬡠\tEjf\u0013h􂒹􂝘aߑ\u0006<s\u0016qx\u0001=OM􋻣𐀓\u0013\u0015댽I󿃱󴳒\u001a\u001aGR\u0019_\u001d鹙>痕𠓙𝀉\u0016<,󴎲+Q2'o\u0019\u0002]\u0019%\u00123PQ&H󶓭􀤄\u0016\u001f󴾲YR󻘿䝌\u0000Ex\u000b\u0001𛀂𥬛𠏐O\u001f>FG\u0019ី󼹀(𭔲B4,𧢜􈒘\u0005󷁇HUJ\u0016􅎮*􌭹w;j7󾗻1TJx\u000f󿇞􌛧Pn\u0003*O\u0000t>a_X|_MmL៓\u0011󰒺󰭹:􋔽Cu[r>󵛘vp\u0014"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_6.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_6.json
index e4ad1329c41..c8274a44a88 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_6.json
@@ -1,4 +1,4 @@
 {
     "email": "z_󸷴\u0012@𬊩VDG",
     "password": "R\u0015䬧m侯|𩋹|&\u0014펀_/􇦤Te𫸁"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_7.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_7.json
index e63886f0efa..77fce9a2b0b 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_7.json
@@ -1,4 +1,4 @@
 {
     "email": "R􎛏􌸽Tk뫀4\u000cm1r@`O|Q%",
     "password": "AV$\r:\u000e􂒅\twBe#aP\u001df\\D􊸋\u000c\"􃙊\u0014􃩫N\u000bW󻿥𤹨; O􋤉󽱏𧿮􁉀󳙇𦩔𬀃*a󼁴w,9⺜芽󾞷Q$\u0015\u0015pv󲚺(Cl\u001b\"cg&2j\u0017𘢢|\u0005v&e븈gfK'j{F\u001e𪪻zn~棣a?󱞒\u0006 桸Z,#🞒:/􆌳󳽇/sGF\u0017i;{|⏺?np慗_pCi;1j􆩨w𠕊􍁦\u001e&􋉷q$\u0012p\u001dC\u0005V\r𫲎g\u001als,𨮳d\u0016C 󵇂<}􊎒)x>~𛰠VV󽧢\u0005m𫖰\u001e\u0012𣪐\u0002ykNo􎴹]\u001c\n\nZ\u0003p􊺵󾄼㦿𑐻oy!%m􁳺Pg煳Mz𤹿𢴥\u0005\u001doiO􇞷R\u001cHG(𥻡󾲨<[nAlz'\u0019N\u0007X^J-腭\u001a`ubS2a\u001c􊆡I\u0010\u0015􄖸u8rSJT蝝󰂉􍙏|\u0008󳥙V\u001a\u0018K.(𞲱\u0007􏙛􌕿y&t(픒𢊴Y@t\n]\rlJ-𐂇H\u000eEp_Nv<=^鐣\u001e>A\u001et\u0015L􈜵消t\u0004󹝹|/똱\u0000s50\u0004𨿈􁊛\u000f1􈈈\u0007󵕂\u001eᾲW𦗮vsqz\u0018耧m󰮙~j󿍯󻼇l𩒕Zd󻞀\u0001lKy\u0000ITt僥𭀈\u000eS(蚺K눟*\u0000n灼^𮄆0󽽸\u0013􎱧𤤾􈩵\u001c\\坚f􎈽&N(*𤹣󼊵\u0000~*_\u0015󼥹󹹭6s󿞀ꄡz\u0000s8!0m\u001fb𢲙\\1lu2?>7x2^t3퓙L􇴤盅|j[Hi\u000e75&\u0004!郫_pFu;'ᰍ(𩕑Jk\u000f;\n𖭯@mꅊ~\u0016\u000f长\u001c󾐞\u0006(qh%\"\u0016\u0017C􉼍C臘8Ff,O\u001bks.q阴J+W󲫼3/\u0007ͲQ/🏐&\u0004l\u000555]5\u001a<`\t\u000c[#\t7!YI\tei𐓷鐬1yUS􋢨X2o󻠚\t𗫥{\t\u0003Op\tf$B\u0002?\u0000xv󻓂P-u:CW?󷩺z\u0004hO&𗹺𫸇\u001b󿏖z\u0012𫦨7\u000e㹶@|𩺝5"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_8.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_8.json
index d05e2eaf61f..42dbd8365af 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_8.json
@@ -1,4 +1,4 @@
 {
     "email": "\u0007@z􄏊㘒V:𫩆\u0014𡙺",
     "password": "󼉧,+柃:􅪤%G\u0015󳨌/\u0010@󺵖搷l7\u0010w\u0004e\u0003\u001fV󻆘i􍆙\tJ󹸺𭺳k𢻲Hz%|aG󽮼\r쮫Q\u001f&\u001d\u001942\u0006C{t䇣]g\u001cdO뻈`.𭀚`m[\u0003􇊡-\u0005㽕x\u001b􌿺N𢺒\u0010K8𭼹[󱜼󶎋k|e\u0000}\u000e󲋋<\u0001g󻹊G𗯂K|^􋙭\u001e𩀞M𩌲/i􋂔!#𭠔}ṡ\u00190􎞈2 B^\u0011e@,I\u001a􃁼𖼥v󶦰\u0000]\"c𡭼릶\u001e\u0001B\u0014;+N􎫘UI:\\Zc􄒉zm|+{W󱖆IৢMU\u0019󲙪\n\u0000H\u001b!n󹉝q.8{󵓌𧦻T>🎡􂤜_ \u001b\u0015Z\u00049𓅫󱸙r\u0017|\u0001𔙂'#ැ\u0003{|=P𥤷VTH\u0008󲊎℄'𗙥\u0001vSk󾜜컛瀖K#^備O!'_}􊾃󾩽\u0010\u0002Qp}\u0010fd🝬(\u0007;󵀋`_\u0007&𛃙LI\u001d\"𦵴\\71\u0007\u0012F󳬵𬪍L􅗔a@\u0016\r􆸃𗭩h\u0006P;_YjဪCH~V9\u0003\u0012M\u001a􎝞􂛡%5;\u0001d]"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_9.json b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_9.json
index 9778d365447..2127624ac43 100644
--- a/libs/wire-api/test/golden/testObject_ProviderLogin_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ProviderLogin_provider_9.json
@@ -1,4 +1,4 @@
 {
     "email": "?!@\u000c󿱚v睽\u0006炬",
     "password": "𮩥R\tF3{7󰳃Qᎌ\u001b𮕾h[\u0000V_m8\u0003:K\r󴺞(􉮗\u0014􄓐\rKz\u0017𗪁^o/&!6\u001aV\u0008UῚ-1n-󹪡r\u0003觼F\u0007􉧒+󱲍,\\Xm\u001b̕􎠎|텐加\u0019=\u001a􀊺fR\n󻄌cC>jhZ-\u000bBnq\u0005\u0006\"\u0012L􊄎\u001f;Q󸫀D\"Q@󺳴Qq儝"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_1.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_1.json
index 84bb4ab31e7..39865211232 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_1.json
@@ -1,7 +1,7 @@
 {
+    "description": "3즽)S",
     "email": "OR胆c@\u001e\u0005r",
-    "url": "https://example.com",
-    "name": "딂\u0014",
     "id": "00000002-0000-0001-0000-000700000006",
-    "description": "3즽)S"
-}
\ No newline at end of file
+    "name": "딂\u0014",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_10.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_10.json
index fd876febafc..cf3dadd23ee 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_10.json
@@ -1,7 +1,7 @@
 {
+    "description": "󺔣隬E\u0001",
     "email": "gd󿡐􅶲e@",
-    "url": "https://example.com",
-    "name": "󺴓|\u001f𭰔-C:\u000b\u0018󵹅;|\u0013d\u0006>@𗛳𨠏2\u0010𡱷\u001aM7/􅂢b\u0006O3m[{",
     "id": "00000004-0000-0008-0000-000500000008",
-    "description": "󺔣隬E\u0001"
-}
\ No newline at end of file
+    "name": "󺴓|\u001f𭰔-C:\u000b\u0018󵹅;|\u0013d\u0006>@𗛳𨠏2\u0010𡱷\u001aM7/􅂢b\u0006O3m[{",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_11.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_11.json
index 64b99f0946d..d28c998398a 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_11.json
@@ -1,7 +1,7 @@
 {
+    "description": "𓄃ME\u0011[",
     "email": "@W",
-    "url": "https://example.com",
-    "name": "T襶nJwq𐆗[\u001cV\u0012I𫱃\u0001\u0005J:\"ay󹕌󳸲󺟖L\u0001&%lT[l/?󾿛_\u0010rW󷑇󸕑]𡧻􈐋𔒡wM\u0014#颷",
     "id": "00000001-0000-0003-0000-000700000004",
-    "description": "𓄃ME\u0011["
-}
\ No newline at end of file
+    "name": "T襶nJwq𐆗[\u001cV\u0012I𫱃\u0001\u0005J:\"ay󹕌󳸲󺟖L\u0001&%lT[l/?󾿛_\u0010rW󷑇󸕑]𡧻􈐋𔒡wM\u0014#颷",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_12.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_12.json
index a1c17fd6ef9..1de307dbc97 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_12.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u000cE󽇵󿚪f\u0005",
     "email": "Z𤕓@!󿕫𑀡\u000c嬾",
-    "url": "https://example.com",
-    "name": "h-\rE,𤋍 􉪺t\u0013S\u0019㟏&8Nf\u0004E$;;𧽷\u000e\u0016𮬲D,pE\u0002?'X*\u0002\u0011>&􍕂WCGM=Ey􉫺,귅$",
     "id": "00000007-0000-0004-0000-000100000000",
-    "description": "\u000cE󽇵󿚪f\u0005"
-}
\ No newline at end of file
+    "name": "h-\rE,𤋍 􉪺t\u0013S\u0019㟏&8Nf\u0004E$;;𧽷\u000e\u0016𮬲D,pE\u0002?'X*\u0002\u0011>&􍕂WCGM=Ey􉫺,귅$",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_13.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_13.json
index 782718df215..4b7f555698d 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_13.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u000bY/\r",
     "email": "\u0001#𠶗@u\u000e䮙",
-    "url": "https://example.com",
-    "name": "r􋭯\u0012%_izF腯e딬\u0011/\r`u󹰖\u0007\u000ff􌅛f􆃯oP\u0019&𠀬\u001a􂧦􎯧jY󲓅􏚣\u0003d􃰊e󴥟HK🥏\u0003y􎋊TE\u0001?𤎅 \u0005\u001b󷿣q#\u000e\"(Q^𬰩&\u0016䥴PI]Q\"X\u001a㩚𣡦x '",
     "id": "00000006-0000-0005-0000-000800000004",
-    "description": "\u000bY/\r"
-}
\ No newline at end of file
+    "name": "r􋭯\u0012%_izF腯e딬\u0011/\r`u󹰖\u0007\u000ff􌅛f􆃯oP\u0019&𠀬\u001a􂧦􎯧jY󲓅􏚣\u0003d􃰊e󴥟HK🥏\u0003y􎋊TE\u0001?𤎅 \u0005\u001b󷿣q#\u000e\"(Q^𬰩&\u0016䥴PI]Q\"X\u001a㩚𣡦x '",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_14.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_14.json
index 76af177d761..5688761f5ee 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_14.json
@@ -1,7 +1,7 @@
 {
+    "description": "-)\u0005/\r",
     "email": "<@M\u000f",
-    "url": "https://example.com",
-    "name": "\u00014\u0005\u0006>\rx~J$k!~\t\u00114󰢆\u0010\u0017\r\u0017y!9",
     "id": "00000007-0000-0006-0000-000700000007",
-    "description": "-)\u0005/\r"
-}
\ No newline at end of file
+    "name": "\u00014\u0005\u0006>\rx~J$k!~\t\u00114󰢆\u0010\u0017\r\u0017y!9",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_15.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_15.json
index d52ac359fcd..df1f33f905d 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_15.json
@@ -1,7 +1,7 @@
 {
+    "description": "$\u0013\u0003E",
     "email": "ळ\u0018:c5@G􀐎E`",
-    "url": "https://example.com",
-    "name": "uU1;袙b \u0005%􊇛쫏פּ2f􁗰\u0008􆴉\u00140({󰈩􋦲󳨤}z𩍖Lq\u00025.\u0002􊬡s󺉃[\t\u0018E𐠑𗏠W􍹱'󽆒_􍚸6g\u0007𧉏󼚱X5j󾒲Q𘩼텵o/<\u0013wm􅋾'𡌤F=𨲱d𨈦da󶯠6fbnN\u0017=􃟍\u0017x\u000b?{3됐u𥳩K𥣷朻",
     "id": "00000001-0000-0006-0000-000300000005",
-    "description": "$\u0013\u0003E"
-}
\ No newline at end of file
+    "name": "uU1;袙b \u0005%􊇛쫏פּ2f􁗰\u0008􆴉\u00140({󰈩􋦲󳨤}z𩍖Lq\u00025.\u0002􊬡s󺉃[\t\u0018E𐠑𗏠W􍹱'󽆒_􍚸6g\u0007𧉏󼚱X5j󾒲Q𘩼텵o/<\u0013wm􅋾'𡌤F=𨲱d𨈦da󶯠6fbnN\u0017=􃟍\u0017x\u000b?{3됐u𥳩K𥣷朻",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_16.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_16.json
index 6a2f1d9e8b8..6c3a2697049 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_16.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u000b",
     "email": "𬊣@蕉z䇋'",
-    "url": "https://example.com",
-    "name": "sl\n􍣷\u001a󱬙\u0007𢼩󸝷></Ak𪹀x\u0004\u001b(\u0015mE􈼣\u000cU\u001d𢣖\u0015𥶖[󵹚l\u0003E\u0000 r?󲽊hL%\u0013䋎\u0001\u001b:>\u0014\u000e󸇗𧅢7m7\u0000誐\u001e퍚uXwwA􃚆!𦌸\u0019N􈖆𨌉ᑞ\u001bEZa󻞿𭤷ZWY𮋜|&唙ikM\u001a􃆓􁷔𧇹󱚺󹊤K\u0001Y:\u001b*Wzc\"\u0006󽣕􊯎\rWB8jSl\u001d\u0019󵁂屋\u0002f`𠓤LN\nje",
     "id": "00000008-0000-0001-0000-000300000001",
-    "description": "\u000b"
-}
\ No newline at end of file
+    "name": "sl\n􍣷\u001a󱬙\u0007𢼩󸝷></Ak𪹀x\u0004\u001b(\u0015mE􈼣\u000cU\u001d𢣖\u0015𥶖[󵹚l\u0003E\u0000 r?󲽊hL%\u0013䋎\u0001\u001b:>\u0014\u000e󸇗𧅢7m7\u0000誐\u001e퍚uXwwA􃚆!𦌸\u0019N􈖆𨌉ᑞ\u001bEZa󻞿𭤷ZWY𮋜|&唙ikM\u001a􃆓􁷔𧇹󱚺󹊤K\u0001Y:\u001b*Wzc\"\u0006󽣕􊯎\rWB8jSl\u001d\u0019󵁂屋\u0002f`𠓤LN\nje",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_17.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_17.json
index 37537a72cd3..8b71f3c17fd 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_17.json
@@ -1,7 +1,7 @@
 {
+    "description": "𡪥5䁫",
     "email": "X􀜨J1\u0016@󺇢%",
-    "url": "https://example.com",
-    "name": "鄚|_;􊋼뱾\u00024/㍄yqDttZ\u001a􄍳y䔳𫓚",
     "id": "00000008-0000-0000-0000-000400000006",
-    "description": "𡪥5䁫"
-}
\ No newline at end of file
+    "name": "鄚|_;􊋼뱾\u00024/㍄yqDttZ\u001a􄍳y䔳𫓚",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_18.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_18.json
index be805238488..c6b3ce84320 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_18.json
@@ -1,7 +1,7 @@
 {
+    "description": "$󽋼3􄺁 L",
     "email": "@\u0008<u𨔇",
-    "url": "https://example.com",
-    "name": "~\u001f;@􇿄Oa𭉏\u0012\u0001nw0\u0013Y󾽈.Qn􏚁􇙄\na>\u0005<󶔈g\u0013󸘺x􀧹*8-T*\u0006'\u0015[/󾫄g𢪸VT\u0004。,𫰪􄿖kC𘄴s\u0010+\u001dz𓇑󾄗`l",
     "id": "00000007-0000-0006-0000-000600000008",
-    "description": "$󽋼3􄺁 L"
-}
\ No newline at end of file
+    "name": "~\u001f;@􇿄Oa𭉏\u0012\u0001nw0\u0013Y󾽈.Qn􏚁􇙄\na>\u0005<󶔈g\u0013󸘺x􀧹*8-T*\u0006'\u0015[/󾫄g𢪸VT\u0004。,𫰪􄿖kC𘄴s\u0010+\u001dz𓇑󾄗`l",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_19.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_19.json
index 6c8fa07074f..4e2c8c153df 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_19.json
@@ -1,7 +1,7 @@
 {
+    "description": "^ﭠo",
     "email": "뒭`kmI@􍤻",
-    "url": "https://example.com",
-    "name": "\u001e\u00161𭯇,%7\u000e􏭎\u000e\u0014󸩴k0*󴚍j\u0016㢎W󸽪]za粥𝢋\"9O-o",
     "id": "00000006-0000-0005-0000-000200000008",
-    "description": "^ﭠo"
-}
\ No newline at end of file
+    "name": "\u001e\u00161𭯇,%7\u000e􏭎\u000e\u0014󸩴k0*󴚍j\u0016㢎W󸽪]za粥𝢋\"9O-o",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_2.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_2.json
index fbf120dc4b9..b8e14f08877 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_2.json
@@ -1,7 +1,7 @@
 {
+    "description": "}[N",
     "email": "@\u00027𘐄",
-    "url": "https://example.com",
-    "name": "?􀜟ヽ$?𤰔uTY􌸥fH\u0017\u0002\u0005\u0008\u0010%:!Y\u0017𖢍튑􋥤󷅺*<x2|\u0002\u001c5-@]=w󽷢0_3m`󾣲󠆹I𪧃N:v",
     "id": "00000000-0000-0008-0000-000000000004",
-    "description": "}[N"
-}
\ No newline at end of file
+    "name": "?􀜟ヽ$?𤰔uTY􌸥fH\u0017\u0002\u0005\u0008\u0010%:!Y\u0017𖢍튑􋥤󷅺*<x2|\u0002\u001c5-@]=w󽷢0_3m`󾣲󠆹I𪧃N:v",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_20.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_20.json
index dbcc705392c..58091d08f6f 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_20.json
@@ -1,7 +1,7 @@
 {
+    "description": "|N󻦼",
     "email": "%)Z'@󹵐f",
-    "url": "https://example.com",
-    "name": "q􆇉𡳨T,$",
     "id": "00000002-0000-0005-0000-000400000004",
-    "description": "|N󻦼"
-}
\ No newline at end of file
+    "name": "q􆇉𡳨T,$",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_3.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_3.json
index 38c56db1e53..8613ca08026 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_3.json
@@ -1,7 +1,7 @@
 {
+    "description": "K\\\u0016",
     "email": "@_ 􂹺󱮭",
-    "url": "https://example.com",
-    "name": "𮐏ur놃\u0013U\u0003~[𩮊x\u0010󱄫\tN\n<9ZE\u001a󸯈x󴘦@𘎻􁹗􅕶\u001dC\\ml􏱐\n󸟶𤲁}r\u0005{asS󽩧𢾡/CE𗉰`𩒕\"mfI2\u001c𗳠c~􅢚il󰼒T<h\u0001󰕆𦀶Ky𩓃𣜃n]\u0016𝇐>]/Z􀗭>-\u0004󾌗󺘧!_*--7\u000ftEg\t󻍦\u0013􇪚\u0018vE\u0010𠼌?=\u000e󺡆齭𩀩O恁k\u0000󸳠纏.\u000f",
     "id": "00000004-0000-0001-0000-000800000000",
-    "description": "K\\\u0016"
-}
\ No newline at end of file
+    "name": "𮐏ur놃\u0013U\u0003~[𩮊x\u0010󱄫\tN\n<9ZE\u001a󸯈x󴘦@𘎻􁹗􅕶\u001dC\\ml􏱐\n󸟶𤲁}r\u0005{asS󽩧𢾡/CE𗉰`𩒕\"mfI2\u001c𗳠c~􅢚il󰼒T<h\u0001󰕆𦀶Ky𩓃𣜃n]\u0016𝇐>]/Z􀗭>-\u0004󾌗󺘧!_*--7\u000ftEg\t󻍦\u0013􇪚\u0018vE\u0010𠼌?=\u000e󺡆齭𩀩O恁k\u0000󸳠纏.\u000f",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_4.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_4.json
index 058fd20ccc9..b48c1863fd2 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_4.json
@@ -1,7 +1,7 @@
 {
+    "description": "𭃲j>W",
     "email": "h𧟨\t􋽒G@𠼫/\u0014",
-    "url": "https://example.com",
-    "name": "\u000e󿚃n󸑏7f􇉐i\u000f8|\u0002e\nN~$[vAUr1`\u0015\u000c/\u0008~􈵉PEhV={󽑌𧎸\u000c\u0019􃫟}}ుx󲹀󲹾􅇱%\u000coA씚𘉄~t𬢴⼰\t􆋲\rWA𭣅􍧟t",
     "id": "00000000-0000-0002-0000-000400000004",
-    "description": "𭃲j>W"
-}
\ No newline at end of file
+    "name": "\u000e󿚃n󸑏7f􇉐i\u000f8|\u0002e\nN~$[vAUr1`\u0015\u000c/\u0008~􈵉PEhV={󽑌𧎸\u000c\u0019􃫟}}ుx󲹀󲹾􅇱%\u000coA씚𘉄~t𬢴⼰\t􆋲\rWA𭣅􍧟t",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_5.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_5.json
index c0f96700e5f..0a523adb34e 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_5.json
@@ -1,7 +1,7 @@
 {
+    "description": "T󻥮]\u0016/o",
     "email": "%>@􆧊䋈q",
-    "url": "https://example.com",
-    "name": "ᬋgr\n詥-鄼f\u000cJ9\u001el)\u000c倦_H^Xh\u0008A;O|",
     "id": "00000003-0000-0007-0000-000700000003",
-    "description": "T󻥮]\u0016/o"
-}
\ No newline at end of file
+    "name": "ᬋgr\n詥-鄼f\u000cJ9\u001el)\u000c倦_H^Xh\u0008A;O|",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_6.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_6.json
index cdb556ab16b..6bf3095beba 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_6.json
@@ -1,7 +1,7 @@
 {
+    "description": "r",
     "email": "󸳘@_q[w\u0000(",
-    "url": "https://example.com",
-    "name": "\u0013 &3\u0010\n𧾋'ￏ7᷂\u001bEwP\\𞢡\u0012^\"󹽆󴳐\u0013-g珖<\u000bფhAjOZ)󿊓W_𥪔𡋁s|+󻤌\"~D<!󷠦󺧙𬐶kotW*\u000b𬻽)(ds]",
     "id": "00000008-0000-0000-0000-000600000008",
-    "description": "r"
-}
\ No newline at end of file
+    "name": "\u0013 &3\u0010\n𧾋'ￏ7᷂\u001bEwP\\𞢡\u0012^\"󹽆󴳐\u0013-g珖<\u000bფhAjOZ)󿊓W_𥪔𡋁s|+󻤌\"~D<!󷠦󺧙𬐶kotW*\u000b𬻽)(ds]",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_7.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_7.json
index f2f8c909fd2..421c651dad0 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_7.json
@@ -1,7 +1,7 @@
 {
+    "description": "𩿴J𬝆r𦳱",
     "email": "􋟔󲾫b^@\n󶅮l",
-    "url": "https://example.com",
-    "name": "Jꥍ󻚓\u000c𤇼?=\u0012\u0004\u0006𥟭\u001e\u0015K(\r󻙰!􍍶\u0016K魹ge M#󲵳\u0016󹘴째",
     "id": "00000003-0000-0006-0000-000800000001",
-    "description": "𩿴J𬝆r𦳱"
-}
\ No newline at end of file
+    "name": "Jꥍ󻚓\u000c𤇼?=\u0012\u0004\u0006𥟭\u001e\u0015K(\r󻙰!􍍶\u0016K魹ge M#󲵳\u0016󹘴째",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_8.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_8.json
index bae7426eb75..87693804865 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_8.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u0013\u000b",
     "email": "\u0012,[@穑/0",
-    "url": "https://example.com",
-    "name": "45\u0001\u0003^真d\u0016𥜼󷢋:\u0001=*Nh/𫱺랧2J\u00065_\u001a룶]cn\u000c\n􃴍\n謒\u000c[kux\u001d𫸻{bt*\u0008*o\u00159|x􇟜\nl𒇓\u000e",
     "id": "00000005-0000-0004-0000-000700000008",
-    "description": "\u0013\u000b"
-}
\ No newline at end of file
+    "name": "45\u0001\u0003^真d\u0016𥜼󷢋:\u0001=*Nh/𫱺랧2J\u00065_\u001a룶]cn\u000c\n􃴍\n謒\u000c[kux\u001d𫸻{bt*\u0008*o\u00159|x􇟜\nl𒇓\u000e",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_9.json b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_9.json
index 65abe970963..f26fd5ae7ab 100644
--- a/libs/wire-api/test/golden/testObject_ProviderProfile_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ProviderProfile_provider_9.json
@@ -1,7 +1,7 @@
 {
+    "description": "*󷎘󸁇",
     "email": "𢮹.\u0019k󼭢@n}𮤵\n",
-    "url": "https://example.com",
-    "name": "\n)􈧙󸒅B󿄇􃤶?\u001byKyrZ*􎂗a𨷼𦞓\u001cR\u000b5HP𞡕\u0005𒇮?􏷦h$`X\u0017\u00056#\u0003\u0018){YhC𧄝\u0015\\􃍩J5MK\u001d>󽬴C\u0010\u0003𗐑\u0017w\u0001\u001191\"\"6D\u0008\u0010\u0000.PC\u001e\u000e􋒾󾽝<𩻦iuN𬢤􉬅U{wgq\u001cD\u000b󼨦\u001a\"\nw{Rl\u0006Ua3\u001eNx\u000f",
     "id": "00000004-0000-0006-0000-000100000002",
-    "description": "*󷎘󸁇"
-}
\ No newline at end of file
+    "name": "\n)􈧙󸒅B󿄇􃤶?\u001byKyrZ*􎂗a𨷼𦞓\u001cR\u000b5HP𞡕\u0005𒇮?􏷦h$`X\u0017\u00056#\u0003\u0018){YhC𧄝\u0015\\􃍩J5MK\u001d>󽬴C\u0010\u0003𗐑\u0017w\u0001\u001191\"\"6D\u0008\u0010\u0000.PC\u001e\u000e􋒾󾽝<𩻦iuN𬢤􉬅U{wgq\u001cD\u000b󼨦\u001a\"\nw{Rl\u0006Ua3\u001eNx\u000f",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_1.json b/libs/wire-api/test/golden/testObject_Provider_provider_1.json
index 477ac28e0e8..c646977db3e 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_1.json
@@ -1,7 +1,7 @@
 {
+    "description": "=󱶚",
     "email": "@Mk\u0012󻎹c",
-    "url": "https://example.com",
-    "name": "󰩉j\u00028'\u00145;QDq,z:4􂑎TQdrz齞r󲽝 o&\u000b쭂pVe􃡭x𧀷쑧'w#ﮜX􈌛􎞬𩇞󷒸)𒈜ꅓU[{bK\u0010\u0018狡󰻃𨋈\u001f,􉋟Inu茼E󵁰,󺴋\u0017\u0008\"\r󻫷\u001a@y􋥲𐊎m􃯹epM3Q{\u0015䧛8g2b\u0000􁏔\u00191\u0011\u001c1􆵸Ov𬺲u󱔩󵲿\u0001=\u0005$𭧄\u0015􍣷冯l\u0014/K)Y'⫨M\u001bX\u001e",
     "id": "00000000-0000-0003-0000-000700000002",
-    "description": "=󱶚"
-}
\ No newline at end of file
+    "name": "󰩉j\u00028'\u00145;QDq,z:4􂑎TQdrz齞r󲽝 o&\u000b쭂pVe􃡭x𧀷쑧'w#ﮜX􈌛􎞬𩇞󷒸)𒈜ꅓU[{bK\u0010\u0018狡󰻃𨋈\u001f,􉋟Inu茼E󵁰,󺴋\u0017\u0008\"\r󻫷\u001a@y􋥲𐊎m􃯹epM3Q{\u0015䧛8g2b\u0000􁏔\u00191\u0011\u001c1􆵸Ov𬺲u󱔩󵲿\u0001=\u0005$𭧄\u0015􍣷冯l\u0014/K)Y'⫨M\u001bX\u001e",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_10.json b/libs/wire-api/test/golden/testObject_Provider_provider_10.json
index f2b766890d0..8f42c362751 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_10.json
@@ -1,7 +1,7 @@
 {
+    "description": "E🍺:\u001cJ󺵘",
     "email": "i􎈈V@\u0006w0\u0003&",
-    "url": "https://example.com",
-    "name": "U𠑇2uXTV\u0012􋤕\"\u000c=K7}ws𛂑𒌥*1􂷗_\u0014⨫\u0005^4xt.􀅺毱m󺆜{\u001bt\u00192󼞀\u000cs\u001ai1⊹T􈼱=e輽횙1",
     "id": "00000001-0000-0008-0000-000400000007",
-    "description": "E🍺:\u001cJ󺵘"
-}
\ No newline at end of file
+    "name": "U𠑇2uXTV\u0012􋤕\"\u000c=K7}ws𛂑𒌥*1􂷗_\u0014⨫\u0005^4xt.􀅺毱m󺆜{\u001bt\u00192󼞀\u000cs\u001ai1⊹T􈼱=e輽횙1",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_11.json b/libs/wire-api/test/golden/testObject_Provider_provider_11.json
index e0fd172d6b8..1c12be8affb 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_11.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u000e\u001d􉵦\"'",
     "email": "@\n\u000fX倉.&",
-    "url": "https://example.com",
-    "name": "-\u0012\u001d\u0001q=~ 𨸳d𨙝HF9\u001fxT;x|2@a\u001e|\t,;Z\u0015󺌾嵑󿞌\u0018玨l\u00154\u001a\u00031b𢁡TSP謘\t\"𝃐;P𖡷\u0016\u0005 S\u0006EkM轳h𣌥󴣺𘑤w\u000c@\u0003O\u000c~P\"E6\u0007\u0013[7yu􏴴\u0012-\u0004󿔆2",
     "id": "00000006-0000-0007-0000-000100000003",
-    "description": "\u000e\u001d􉵦\"'"
-}
\ No newline at end of file
+    "name": "-\u0012\u001d\u0001q=~ 𨸳d𨙝HF9\u001fxT;x|2@a\u001e|\t,;Z\u0015󺌾嵑󿞌\u0018玨l\u00154\u001a\u00031b𢁡TSP謘\t\"𝃐;P𖡷\u0016\u0005 S\u0006EkM轳h𣌥󴣺𘑤w\u000c@\u0003O\u000c~P\"E6\u0007\u0013[7yu􏴴\u0012-\u0004󿔆2",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_12.json b/libs/wire-api/test/golden/testObject_Provider_provider_12.json
index abafa845b7c..839f5aefd30 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_12.json
@@ -1,7 +1,7 @@
 {
+    "description": "x䍉@I%\r",
     "email": "@m靐첇E\u0014󴆟",
-    "url": "https://example.com",
-    "name": ",U5>pD󸉥O𩕽Rbk\u0019\u000f'V\u0011􂈜-]󴣏Q\\r-􅽥\u001a󺠄E󰵚\n!\u0006󷫭F|\u001bz󽯡s}h꣹O󷅢(v󻍓,C6쫃p\u0008󿋏5\n\t䠚􉼢㢿1\u0013}󷥋􌲒h󵿟𤬅>뻺7󼩀LI㊝Ck󳾚𧥋@\u0019\u001f󴊢`&zd7b􃈞Qܫ􏂧",
     "id": "00000006-0000-0007-0000-000300000006",
-    "description": "x䍉@I%\r"
-}
\ No newline at end of file
+    "name": ",U5>pD󸉥O𩕽Rbk\u0019\u000f'V\u0011􂈜-]󴣏Q\\r-􅽥\u001a󺠄E󰵚\n!\u0006󷫭F|\u001bz󽯡s}h꣹O󷅢(v󻍓,C6쫃p\u0008󿋏5\n\t䠚􉼢㢿1\u0013}󷥋􌲒h󵿟𤬅>뻺7󼩀LI㊝Ck󳾚𧥋@\u0019\u001f󴊢`&zd7b􃈞Qܫ􏂧",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_13.json b/libs/wire-api/test/golden/testObject_Provider_provider_13.json
index 4b850b256f8..09edc9f7510 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_13.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u0012$=l\u00114",
     "email": "y@\\",
-    "url": "https://example.com",
-    "name": "뵀\u0010􃫻\r;\u0011T􉽸\u0005\r\u0004jtW󲔋S샎z𤣼(\u0011v󶀁𦬦QOl􉊯󽿤i#\u001a{􍆜(i\u0017J\u0003/s쥴?rre\u0004uf􅐷~\u0019𐀆􅾷E󿵙?-𨚮W6|A\u0019䩘@दp\u0010\r𨬆Y5\u0015p=,\u000e𨞰\rY\t𐩤\u0010𤣮r\u001b3XO􋧣!\u001d<\u001a2\u001e\t\u0006󻛌\u001b6\u000ca\u0013􇞲\"\u001dU|􄢗\u0001\u001b?5EO=4\u0010󽠋+e",
     "id": "00000004-0000-0002-0000-000400000008",
-    "description": "\u0012$=l\u00114"
-}
\ No newline at end of file
+    "name": "뵀\u0010􃫻\r;\u0011T􉽸\u0005\r\u0004jtW󲔋S샎z𤣼(\u0011v󶀁𦬦QOl􉊯󽿤i#\u001a{􍆜(i\u0017J\u0003/s쥴?rre\u0004uf􅐷~\u0019𐀆􅾷E󿵙?-𨚮W6|A\u0019䩘@दp\u0010\r𨬆Y5\u0015p=,\u000e𨞰\rY\t𐩤\u0010𤣮r\u001b3XO􋧣!\u001d<\u001a2\u001e\t\u0006󻛌\u001b6\u000ca\u0013􇞲\"\u001dU|􄢗\u0001\u001b?5EO=4\u0010󽠋+e",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_14.json b/libs/wire-api/test/golden/testObject_Provider_provider_14.json
index 8f1b4e11083..3d1641cc6ae 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_14.json
@@ -1,7 +1,7 @@
 {
+    "description": "HY",
     "email": "*\u001b\u001a󽅋@M/[O+",
-    "url": "https://example.com",
-    "name": "uo;)𫘣/KN\u0006_#D{󼥙𬧩6X􅺉]<󿘴*%#􎁽uHJ󸢵q\u000exu󿶢􃢢󵗝􂈯􆃯M𝥑v<􋫀z覙M𗮚:t:I`Q3Vx䜽𤎉U~ᔒ\u0014`\u0003~󽇈󽮞\u0019`\"{VL툅@􋎇󿗌\u001a",
     "id": "00000006-0000-0002-0000-000400000007",
-    "description": "HY"
-}
\ No newline at end of file
+    "name": "uo;)𫘣/KN\u0006_#D{󼥙𬧩6X􅺉]<󿘴*%#􎁽uHJ󸢵q\u000exu󿶢􃢢󵗝􂈯􆃯M𝥑v<􋫀z覙M𗮚:t:I`Q3Vx䜽𤎉U~ᔒ\u0014`\u0003~󽇈󽮞\u0019`\"{VL툅@􋎇󿗌\u001a",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_15.json b/libs/wire-api/test/golden/testObject_Provider_provider_15.json
index ca689e5abe6..df8f252a809 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_15.json
@@ -1,7 +1,7 @@
 {
+    "description": "",
     "email": "@𣕎\u0013&",
-    "url": "https://example.com",
-    "name": "󼢁㽨\u0016;\t􀋐ln5핽z\r\"hdPTT㵨9S}oV?x>U\u001a𤋶G\u001c\u0010K긷tO􎹌i\u001d_v\\\u0018󸣸\u00118<t\u0002[|𨆝/󾎼a`x\u0010fZ\r@\u001b𥠧uG",
     "id": "00000000-0000-0001-0000-000300000008",
-    "description": ""
-}
\ No newline at end of file
+    "name": "󼢁㽨\u0016;\t􀋐ln5핽z\r\"hdPTT㵨9S}oV?x>U\u001a𤋶G\u001c\u0010K긷tO􎹌i\u001d_v\\\u0018󸣸\u00118<t\u0002[|𨆝/󾎼a`x\u0010fZ\r@\u001b𥠧uG",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_16.json b/libs/wire-api/test/golden/testObject_Provider_provider_16.json
index f03c21c0df4..e35fa34b334 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_16.json
@@ -1,7 +1,7 @@
 {
+    "description": "J4󵔃",
     "email": "y\t󾡩󻟤a@v\u0018\u0006",
-    "url": "https://example.com",
-    "name": "􇤥𫿋\u000b􃁑𖨕󵬃G𩍙󼙘\u0011ᲂv_eIxC𪭲(\u000c󿖢 C\u001fT$dgFS;d`\u001cJL\t[󹶶{)|R~z#𝜅󲛹2ym3𣘥",
     "id": "00000004-0000-0005-0000-000700000007",
-    "description": "J4󵔃"
-}
\ No newline at end of file
+    "name": "􇤥𫿋\u000b􃁑𖨕󵬃G𩍙󼙘\u0011ᲂv_eIxC𪭲(\u000c󿖢 C\u001fT$dgFS;d`\u001cJL\t[󹶶{)|R~z#𝜅󲛹2ym3𣘥",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_17.json b/libs/wire-api/test/golden/testObject_Provider_provider_17.json
index fb51546589b..30bbfb28e4e 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_17.json
@@ -1,7 +1,7 @@
 {
+    "description": "4",
     "email": "\u0010J@\u0015",
-    "url": "https://example.com",
-    "name": "𥚌𤔽`\u001f𗙟󷌖;\u0013堥$w󴬋\u0005~h2%]??.󾰉,􅣾*팉\tV[􈆍􋰐􀊡e󲗴5(㇣􉼸\u0002?􎌪􌑟6%U\u0004d\u0012𦇪󽧡􆑛𢳌BI雟Ԣ\u0001\u0015*&󿥁󳆮",
     "id": "00000005-0000-0005-0000-000500000001",
-    "description": "4"
-}
\ No newline at end of file
+    "name": "𥚌𤔽`\u001f𗙟󷌖;\u0013堥$w󴬋\u0005~h2%]??.󾰉,􅣾*팉\tV[􈆍􋰐􀊡e󲗴5(㇣􉼸\u0002?􎌪􌑟6%U\u0004d\u0012𦇪󽧡􆑛𢳌BI雟Ԣ\u0001\u0015*&󿥁󳆮",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_18.json b/libs/wire-api/test/golden/testObject_Provider_provider_18.json
index 1d567f2449a..1e71f959795 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_18.json
@@ -1,7 +1,7 @@
 {
+    "description": "",
     "email": "@􋒻",
-    "url": "https://example.com",
-    "name": "􌣎䖰bj𫷁'n\n灊􏊆q,PY\t}pF󰸟赹􉪼2b8𡒏r󱵸[\u0016\u0014\u0013Y𮦔x󶞃\u001d𢧋Q&b=􈫤f􌰌u$쪁󺙂\u0006􌌫\u0015G𡤁/9rp;􇉊\u001eso0P~\u00028󶮒q󳑋fsV󳭄W\u001d􀮑,\n;#Z\n_C\u0003Y㙊mNL\u0000lJ6߿",
     "id": "00000008-0000-0005-0000-000600000007",
-    "description": ""
-}
\ No newline at end of file
+    "name": "􌣎䖰bj𫷁'n\n灊􏊆q,PY\t}pF󰸟赹􉪼2b8𡒏r󱵸[\u0016\u0014\u0013Y𮦔x󶞃\u001d𢧋Q&b=􈫤f􌰌u$쪁󺙂\u0006􌌫\u0015G𡤁/9rp;􇉊\u001eso0P~\u00028󶮒q󳑋fsV󳭄W\u001d􀮑,\n;#Z\n_C\u0003Y㙊mNL\u0000lJ6߿",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_19.json b/libs/wire-api/test/golden/testObject_Provider_provider_19.json
index 8f4d4746df8..60bbe87d146 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_19.json
@@ -1,7 +1,7 @@
 {
+    "description": "W'󺳛\u0011",
     "email": "@\u0012󾄇XSS",
-    "url": "https://example.com",
-    "name": " 󶃨?\\%\r:<7,\u001b\u0003kw&\u0016𗯰E㖿'~R󹅬gL𫤧&􋔒AN\u0001ri\nl\t\u0007󱤳.JD𝥆Z㓲\u001c\u001aw笸􏜰}\u0016M][=󴷊9􏻺|틧k􄈐MV?󻓉\u000bY:\u0008K'\u000e􎦦7\u0003\u0014QQt1",
     "id": "00000003-0000-0005-0000-000800000007",
-    "description": "W'󺳛\u0011"
-}
\ No newline at end of file
+    "name": " 󶃨?\\%\r:<7,\u001b\u0003kw&\u0016𗯰E㖿'~R󹅬gL𫤧&􋔒AN\u0001ri\nl\t\u0007󱤳.JD𝥆Z㓲\u001c\u001aw笸􏜰}\u0016M][=󴷊9􏻺|틧k􄈐MV?󻓉\u000bY:\u0008K'\u000e􎦦7\u0003\u0014QQt1",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_2.json b/libs/wire-api/test/golden/testObject_Provider_provider_2.json
index 74698bea63f..96f8d915402 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_2.json
@@ -1,7 +1,7 @@
 {
+    "description": "􈨥mU𬟑.",
     "email": "Q󻃷@\u0017\u001a?􊑡",
-    "url": "https://example.com",
-    "name": "X\u0000ci-⠡)󰵰(kt󻞃F󺛓\u0012[ja􀆞!𪵡𥾝@1\u0000\u0014.B57!_5s\u0012쫑􃇠􈢠9\u0017 \u0013\u0000Ox􆩂󶋨\u0010㽐F𬦒\u0019a󾓒_\u0005\\D곕F-&A]M|𭐯\u0012M\u000c\u0008󾉪 \u0005H\u000e鉱𤝮5*PVN\u001f|j|󻗝O\u001d\u0011a𫭪ki叩󸅱!\u001a􌨾3g󳑥􂇤\n@🌟Ⱋo𭏸]-\u0015𣟚󱼧Z$\n}'B绫栂\u0000",
     "id": "00000004-0000-0008-0000-000300000006",
-    "description": "􈨥mU𬟑."
-}
\ No newline at end of file
+    "name": "X\u0000ci-⠡)󰵰(kt󻞃F󺛓\u0012[ja􀆞!𪵡𥾝@1\u0000\u0014.B57!_5s\u0012쫑􃇠􈢠9\u0017 \u0013\u0000Ox􆩂󶋨\u0010㽐F𬦒\u0019a󾓒_\u0005\\D곕F-&A]M|𭐯\u0012M\u000c\u0008󾉪 \u0005H\u000e鉱𤝮5*PVN\u001f|j|󻗝O\u001d\u0011a𫭪ki叩󸅱!\u001a􌨾3g󳑥􂇤\n@🌟Ⱋo𭏸]-\u0015𣟚󱼧Z$\n}'B绫栂\u0000",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_20.json b/libs/wire-api/test/golden/testObject_Provider_provider_20.json
index 9e649b6fb2f..38c5a1083e2 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_20.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u0001}傧uT􎔎",
     "email": "\u0001{sc@RtP􆮷 ",
-    "url": "https://example.com",
-    "name": "\u0002鿝\u0000Y<\u0011\u0012Z3􊟨\u0008􍅇󴨨g?𡖸xHZ*\u001c𣫨LxQ@{􆅁\u0003DC.a􏰛$􂼨𬱪\u0006󸹙󳊢\u001aS^q𡧗/b\u000b;j\u0012\u000c\u0015𧐩GK~\u0013DPM\u0014+􊻪𗮚󳲢o󷃥/牺\u000fz\u001fc'z\u0010{㹿x\u0013ｙ󶹴\u000b1'[G<􃈟L\u0017𫮽4\u001a",
     "id": "00000003-0000-0002-0000-000000000005",
-    "description": "\u0001}傧uT􎔎"
-}
\ No newline at end of file
+    "name": "\u0002鿝\u0000Y<\u0011\u0012Z3􊟨\u0008􍅇󴨨g?𡖸xHZ*\u001c𣫨LxQ@{􆅁\u0003DC.a􏰛$􂼨𬱪\u0006󸹙󳊢\u001aS^q𡧗/b\u000b;j\u0012\u000c\u0015𧐩GK~\u0013DPM\u0014+􊻪𗮚󳲢o󷃥/牺\u000fz\u001fc'z\u0010{㹿x\u0013ｙ󶹴\u000b1'[G<􃈟L\u0017𫮽4\u001a",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_3.json b/libs/wire-api/test/golden/testObject_Provider_provider_3.json
index 40980bd3acc..45332f764ff 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_3.json
@@ -1,7 +1,7 @@
 {
+    "description": "\u000c",
     "email": "\u0010e혦􇵊@%#*",
-    "url": "https://example.com",
-    "name": "\u001f\u000e𦗯r/y$SCws_g\u00025\u000cq􆲚&\u000e2􅆄Tqu󴙲Z>󸩚G",
     "id": "00000002-0000-0008-0000-000800000006",
-    "description": "\u000c"
-}
\ No newline at end of file
+    "name": "\u001f\u000e𦗯r/y$SCws_g\u00025\u000cq􆲚&\u000e2􅆄Tqu󴙲Z>󸩚G",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_4.json b/libs/wire-api/test/golden/testObject_Provider_provider_4.json
index 095948c92b1..b00cf53ab52 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_4.json
@@ -1,7 +1,7 @@
 {
+    "description": "/㕐",
     "email": "󱰹@'x􏑐#.U",
-    "url": "https://example.com",
-    "name": "p󿾼q\u0004JO󳗥󲕦[=\u0018\u0017󳸫D\u000b|{𦯯n",
     "id": "00000000-0000-0006-0000-000300000003",
-    "description": "/㕐"
-}
\ No newline at end of file
+    "name": "p󿾼q\u0004JO󳗥󲕦[=\u0018\u0017󳸫D\u000b|{𦯯n",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_5.json b/libs/wire-api/test/golden/testObject_Provider_provider_5.json
index bc5b7146307..341a08dcf52 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_5.json
@@ -1,7 +1,7 @@
 {
+    "description": "",
     "email": "l\\@o:j\u0015",
-    "url": "https://example.com",
-    "name": "𢅷粪#𫭶\u0015<􇕴\u001e㣕罉M􆒇~\u0006Z)x@_\u0017\u0001\u0014𣧠􁃑~b\u0008\u0016\\ꈉᡋj󽒌Cp>󼣳\u001a𞸟{=\u0010C𠵑𢛒\u001a]󴯌􏣷[釤;\u0016\u0006TpXQT|-獵󺯊0\u0018􀬉h]󷂀}􆓤DH𦠁\u000f~\u0013^",
     "id": "00000007-0000-0003-0000-000800000005",
-    "description": ""
-}
\ No newline at end of file
+    "name": "𢅷粪#𫭶\u0015<􇕴\u001e㣕罉M􆒇~\u0006Z)x@_\u0017\u0001\u0014𣧠􁃑~b\u0008\u0016\\ꈉᡋj󽒌Cp>󼣳\u001a𞸟{=\u0010C𠵑𢛒\u001a]󴯌􏣷[釤;\u0016\u0006TpXQT|-獵󺯊0\u0018􀬉h]󷂀}􆓤DH𦠁\u000f~\u0013^",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_6.json b/libs/wire-api/test/golden/testObject_Provider_provider_6.json
index 8e0804682a6..dd922fd5645 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_6.json
@@ -1,7 +1,7 @@
 {
+    "description": "j#G\r",
     "email": "􀧊쭫4AC@5",
-    "url": "https://example.com",
-    "name": "OT;/hR𔔼葙!~<󰐾𥟑FP\u0010pW.0짃f󶹪\u000f8\u0004ZIy𠿥𐁃|du#k\n2\u001b}W\u0014嶔TI5G\u0013􍞟\u0016)>&?􄰦~\n\u000c",
     "id": "00000008-0000-0005-0000-000300000006",
-    "description": "j#G\r"
-}
\ No newline at end of file
+    "name": "OT;/hR𔔼葙!~<󰐾𥟑FP\u0010pW.0짃f󶹪\u000f8\u0004ZIy𠿥𐁃|du#k\n2\u001b}W\u0014嶔TI5G\u0013􍞟\u0016)>&?􄰦~\n\u000c",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_7.json b/libs/wire-api/test/golden/testObject_Provider_provider_7.json
index a4989414804..ef066b2d5c0 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_7.json
@@ -1,7 +1,7 @@
 {
+    "description": ")m",
     "email": "@Z",
-    "url": "https://example.com",
-    "name": "좺\u0018𬍥1\\\u001cV󲝕𐫙\u0012􌾇𥎌\u0016㰶Y\u0006}.b𧀛\t;𦋤u%0گ}f\u0002𡢔𭉲I]􇻲c",
     "id": "00000001-0000-0003-0000-000800000001",
-    "description": ")m"
-}
\ No newline at end of file
+    "name": "좺\u0018𬍥1\\\u001cV󲝕𐫙\u0012􌾇𥎌\u0016㰶Y\u0006}.b𧀛\t;𦋤u%0گ}f\u0002𡢔𭉲I]􇻲c",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_8.json b/libs/wire-api/test/golden/testObject_Provider_provider_8.json
index e26b2cc9fc2..c0744a404ca 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_8.json
@@ -1,7 +1,7 @@
 {
+    "description": "𭂕2􇞫4",
     "email": "\u001f?h@|^󸪛h𐚠",
-    "url": "https://example.com",
-    "name": "x􍄃\u0013cQ\u0017w󸅙k}\u0017ᤎ8\u0008`폒􆗸JC곡,1\u0013^𧙓{\u0010:c\r+\u0005",
     "id": "00000008-0000-0007-0000-000100000004",
-    "description": "𭂕2􇞫4"
-}
\ No newline at end of file
+    "name": "x􍄃\u0013cQ\u0017w󸅙k}\u0017ᤎ8\u0008`폒􆗸JC곡,1\u0013^𧙓{\u0010:c\r+\u0005",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_Provider_provider_9.json b/libs/wire-api/test/golden/testObject_Provider_provider_9.json
index 0494a01a968..5db37c2a993 100644
--- a/libs/wire-api/test/golden/testObject_Provider_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_Provider_provider_9.json
@@ -1,7 +1,7 @@
 {
+    "description": "",
     "email": "@siw",
-    "url": "https://example.com",
-    "name": "+QH􆄋2$DH\u001d𠳉oz&SQ󺪏Apl󾦣Dai𫖠`~ཝG\u001d@$i􏀹b\u001flBR\u000cIg󰢭𡵉4Pg[h\u0003\u0012􁚑4𣪢\u0003M*\\`(U&?yinFa(𪔗J,<\u00115R@󷼝\u0007AH􌩟\u0010\"𬊺𣖮\t",
     "id": "00000002-0000-0005-0000-000600000006",
-    "description": ""
-}
\ No newline at end of file
+    "name": "+QH􆄋2$DH\u001d𠳉oz&SQ󺪏Apl󾦣Dai𫖠`~ཝG\u001d@$i􏀹b\u001flBR\u000cIg󰢭𡵉4Pg[h\u0003\u0012􁚑4𣪢\u0003M*\\`(U&?yinFa(𪔗J,<\u00115R@󷼝\u0007AH􌩟\u0010\"𬊺𣖮\t",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_1.json b/libs/wire-api/test/golden/testObject_PubClient_user_1.json
index 7d373510da2..7a4713761b5 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_1.json
@@ -1,3 +1,3 @@
 {
     "id": "1f4"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_10.json b/libs/wire-api/test/golden/testObject_PubClient_user_10.json
index 046f81cbf8a..137d22ef61c 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_10.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_10.json
@@ -1,4 +1,4 @@
 {
-    "id": "4aa",
-    "class": "phone"
-}
\ No newline at end of file
+    "class": "phone",
+    "id": "4aa"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_11.json b/libs/wire-api/test/golden/testObject_PubClient_user_11.json
index 5af1a8ea559..669f0f2d97a 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_11.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_11.json
@@ -1,3 +1,3 @@
 {
     "id": "599"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_12.json b/libs/wire-api/test/golden/testObject_PubClient_user_12.json
index e8fef9cf173..8f7af7698c9 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_12.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_12.json
@@ -1,4 +1,4 @@
 {
-    "id": "dcd",
-    "class": "tablet"
-}
\ No newline at end of file
+    "class": "tablet",
+    "id": "dcd"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_13.json b/libs/wire-api/test/golden/testObject_PubClient_user_13.json
index d0415db85e0..fed4ce3c4c7 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_13.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_13.json
@@ -1,4 +1,4 @@
 {
-    "id": "fdc",
-    "class": "phone"
-}
\ No newline at end of file
+    "class": "phone",
+    "id": "fdc"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_14.json b/libs/wire-api/test/golden/testObject_PubClient_user_14.json
index c86ecfea128..a84d1a9268d 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_14.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_14.json
@@ -1,4 +1,4 @@
 {
-    "id": "a98",
-    "class": "legalhold"
-}
\ No newline at end of file
+    "class": "legalhold",
+    "id": "a98"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_15.json b/libs/wire-api/test/golden/testObject_PubClient_user_15.json
index ea1f5ccf7d8..fc8642b7f98 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_15.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_15.json
@@ -1,4 +1,4 @@
 {
-    "id": "f7f",
-    "class": "desktop"
-}
\ No newline at end of file
+    "class": "desktop",
+    "id": "f7f"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_16.json b/libs/wire-api/test/golden/testObject_PubClient_user_16.json
index 515c393fb65..053c995871b 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_16.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_16.json
@@ -1,4 +1,4 @@
 {
-    "id": "5b4",
-    "class": "legalhold"
-}
\ No newline at end of file
+    "class": "legalhold",
+    "id": "5b4"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_17.json b/libs/wire-api/test/golden/testObject_PubClient_user_17.json
index 9355297b3e1..29206ae9655 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_17.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_17.json
@@ -1,3 +1,3 @@
 {
     "id": "a83"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_18.json b/libs/wire-api/test/golden/testObject_PubClient_user_18.json
index af201a4b13f..37c64695864 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_18.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_18.json
@@ -1,4 +1,4 @@
 {
-    "id": "3d6",
-    "class": "phone"
-}
\ No newline at end of file
+    "class": "phone",
+    "id": "3d6"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_19.json b/libs/wire-api/test/golden/testObject_PubClient_user_19.json
index ec6e85098e6..ae101e78790 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_19.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_19.json
@@ -1,4 +1,4 @@
 {
-    "id": "4c7",
-    "class": "tablet"
-}
\ No newline at end of file
+    "class": "tablet",
+    "id": "4c7"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_2.json b/libs/wire-api/test/golden/testObject_PubClient_user_2.json
index 1996cc4e8b6..7727dc62f9c 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_2.json
@@ -1,4 +1,4 @@
 {
-    "id": "502",
-    "class": "tablet"
-}
\ No newline at end of file
+    "class": "tablet",
+    "id": "502"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_20.json b/libs/wire-api/test/golden/testObject_PubClient_user_20.json
index 1f444f41144..c0fb16dd32a 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_20.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_20.json
@@ -1,4 +1,4 @@
 {
-    "id": "787",
-    "class": "tablet"
-}
\ No newline at end of file
+    "class": "tablet",
+    "id": "787"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_3.json b/libs/wire-api/test/golden/testObject_PubClient_user_3.json
index 0684b373f35..7ddec9cb040 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_3.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_3.json
@@ -1,4 +1,4 @@
 {
-    "id": "376",
-    "class": "desktop"
-}
\ No newline at end of file
+    "class": "desktop",
+    "id": "376"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_4.json b/libs/wire-api/test/golden/testObject_PubClient_user_4.json
index 1b8e2d75ff5..dd1ac42eb17 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_4.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_4.json
@@ -1,4 +1,4 @@
 {
-    "id": "47f",
-    "class": "tablet"
-}
\ No newline at end of file
+    "class": "tablet",
+    "id": "47f"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_5.json b/libs/wire-api/test/golden/testObject_PubClient_user_5.json
index 30fd48b0fa7..13d18d9510c 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_5.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_5.json
@@ -1,4 +1,4 @@
 {
-    "id": "377",
-    "class": "legalhold"
-}
\ No newline at end of file
+    "class": "legalhold",
+    "id": "377"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_6.json b/libs/wire-api/test/golden/testObject_PubClient_user_6.json
index 61a73f20535..044f29db1d9 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_6.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_6.json
@@ -1,4 +1,4 @@
 {
-    "id": "e4f",
-    "class": "desktop"
-}
\ No newline at end of file
+    "class": "desktop",
+    "id": "e4f"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_7.json b/libs/wire-api/test/golden/testObject_PubClient_user_7.json
index 375f2c29355..7bd79e2a8dc 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_7.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_7.json
@@ -1,3 +1,3 @@
 {
     "id": "8ab"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_8.json b/libs/wire-api/test/golden/testObject_PubClient_user_8.json
index dbcd306c7e3..25335466e13 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_8.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_8.json
@@ -1,4 +1,4 @@
 {
-    "id": "69b",
-    "class": "phone"
-}
\ No newline at end of file
+    "class": "phone",
+    "id": "69b"
+}
diff --git a/libs/wire-api/test/golden/testObject_PubClient_user_9.json b/libs/wire-api/test/golden/testObject_PubClient_user_9.json
index b60fd349814..349398cc63a 100644
--- a/libs/wire-api/test/golden/testObject_PubClient_user_9.json
+++ b/libs/wire-api/test/golden/testObject_PubClient_user_9.json
@@ -1,4 +1,4 @@
 {
-    "id": "357",
-    "class": "legalhold"
-}
\ No newline at end of file
+    "class": "legalhold",
+    "id": "357"
+}
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_1.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_1.json
index 5d244727e2e..3cecea77a67 100644
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PushTokenList_user_1.json
@@ -1,64 +1,10 @@
 {
     "tokens": [
         {
-            "token": "MK8p\u000c",
             "app": "pU2r",
-            "transport": "GCM",
-            "client": "4"
-        },
-        {
-            "token": "\n𧼵`􌋰>𮬇",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "1a"
-        },
-        {
-            "token": "𬖅",
-            "app": "\u0019\u0003",
-            "transport": "APNS_VOIP",
-            "client": "0"
-        },
-        {
-            "token": "",
-            "app": "玆Y􋬭O",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "13"
-        },
-        {
-            "token": "\u0002󺖟\u001bW󺈞2\u0001",
-            "app": ">8C9E",
-            "transport": "APNS_VOIP",
-            "client": "18"
-        },
-        {
-            "token": "􀵒阼㈽􈨹􆘺\"",
-            "app": "\u000cn\u0005E\u001e",
-            "transport": "APNS",
-            "client": "16"
-        },
-        {
-            "token": ")\u0008 v",
-            "app": "H>8\u0003",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "12"
-        },
-        {
-            "token": "",
-            "app": "V",
-            "transport": "GCM",
-            "client": "16"
-        },
-        {
-            "token": "\u00193",
-            "app": "􋄪\u0017",
-            "transport": "APNS_VOIP",
-            "client": "1a"
-        },
-        {
-            "token": ">",
-            "app": "`B𡛪\\",
-            "transport": "APNS_SANDBOX",
-            "client": "1c"
+            "client": "4",
+            "token": "MK8p\u000c",
+            "transport": "GCM"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_10.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_10.json
deleted file mode 100644
index 66329911fad..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_10.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "󸪨\u000e𧞿",
-            "app": "\u0013\u0006𧩇􌶥O\u0007",
-            "transport": "APNS",
-            "client": "18"
-        },
-        {
-            "token": "s\u0005Vun󵗫",
-            "app": "ᾚ󴎜%",
-            "transport": "GCM",
-            "client": "7"
-        },
-        {
-            "token": "V|𩧩\\",
-            "app": "I^1",
-            "transport": "APNS",
-            "client": "13"
-        },
-        {
-            "token": "!w났󴣮",
-            "app": "P𤄢钅\u000c",
-            "transport": "APNS_VOIP",
-            "client": "9"
-        },
-        {
-            "token": "\u0008沿y\u0000_\u0019",
-            "app": "|8V",
-            "transport": "GCM",
-            "client": "f"
-        },
-        {
-            "token": "D󾎛E",
-            "app": "\u0003\u001eC",
-            "transport": "APNS_SANDBOX",
-            "client": "17"
-        },
-        {
-            "token": "`ൊW\u0015f",
-            "app": "t𞸬\u00048",
-            "transport": "APNS",
-            "client": "b"
-        },
-        {
-            "token": "r㺞󲡨쩹󿾋",
-            "app": "",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "8"
-        },
-        {
-            "token": "\u000b(-}#U",
-            "app": "?畜~i:\u0001",
-            "transport": "APNS_SANDBOX",
-            "client": "10"
-        },
-        {
-            "token": "a@",
-            "app": "]",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "0"
-        },
-        {
-            "token": "",
-            "app": "B\u001e",
-            "transport": "GCM",
-            "client": "1d"
-        },
-        {
-            "token": "",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "14"
-        },
-        {
-            "token": "vp%2\u0003\u001b",
-            "app": "M𢎰#\u000b#",
-            "transport": "APNS_SANDBOX",
-            "client": "1c"
-        },
-        {
-            "token": "𠥱o\u0013aK",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "1c"
-        },
-        {
-            "token": "l",
-            "app": "\u0016zezn",
-            "transport": "APNS_VOIP",
-            "client": "1"
-        },
-        {
-            "token": "鸕n<𓏀",
-            "app": "y􈳙\u0019\u0008SF􍞘",
-            "transport": "GCM",
-            "client": "2"
-        },
-        {
-            "token": "z",
-            "app": "T\u0005",
-            "transport": "GCM",
-            "client": "8"
-        },
-        {
-            "token": "􃜄󶤽\u0015縢",
-            "app": "S􏀴E",
-            "transport": "APNS",
-            "client": "12"
-        },
-        {
-            "token": "y󿷌cE\u0011",
-            "app": "\u0003qയ􊪔𗎓",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "3"
-        },
-        {
-            "token": "`𠷕o",
-            "app": "U7",
-            "transport": "APNS_SANDBOX",
-            "client": "1c"
-        },
-        {
-            "token": "",
-            "app": "D-",
-            "transport": "APNS_VOIP",
-            "client": "0"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_11.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_11.json
deleted file mode 100644
index c4457c1bfb4..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_11.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "䃢RP~\u0008",
-            "app": "\u001cO#uoH",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1e"
-        },
-        {
-            "token": "𡊊퉪!\u0011\u0005",
-            "app": "b􂇟\u0008Z&\u0016",
-            "transport": "GCM",
-            "client": "10"
-        },
-        {
-            "token": "",
-            "app": ")Di\u001a",
-            "transport": "APNS_VOIP",
-            "client": "6"
-        },
-        {
-            "token": "󺟓~",
-            "app": "5[#*􆟸m",
-            "transport": "APNS_SANDBOX",
-            "client": "6"
-        },
-        {
-            "token": "\u0010𗼔\u0015V/",
-            "app": "",
-            "transport": "GCM",
-            "client": "15"
-        },
-        {
-            "token": "\u0005X􊿧MF_",
-            "app": "4",
-            "transport": "APNS_SANDBOX",
-            "client": "f"
-        },
-        {
-            "token": "M",
-            "app": "b󻸅:𐌺R󾎍􇁰",
-            "transport": "APNS",
-            "client": "16"
-        },
-        {
-            "token": "\nBaP9\u001c",
-            "app": "U",
-            "transport": "APNS_SANDBOX",
-            "client": "20"
-        },
-        {
-            "token": "􇯽𐂯f󵉃",
-            "app": "⑸",
-            "transport": "APNS_SANDBOX",
-            "client": "6"
-        },
-        {
-            "token": "X\n1wv",
-            "app": "Y\u0012",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1f"
-        },
-        {
-            "token": "\tx",
-            "app": "𦧹Z",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1d"
-        },
-        {
-            "token": "vZ ",
-            "app": "#!G􎺱.",
-            "transport": "APNS",
-            "client": "7"
-        },
-        {
-            "token": "T󿯃\u0011x=",
-            "app": "Mꖀ$\u001aV",
-            "transport": "APNS_VOIP",
-            "client": "11"
-        },
-        {
-            "token": "G",
-            "app": "𠧄e<4P",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1d"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_12.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_12.json
deleted file mode 100644
index 77063c4ae3a..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_12.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": ">#",
-            "app": "`O8&㻽",
-            "transport": "GCM",
-            "client": "1e"
-        },
-        {
-            "token": "7u𨸔",
-            "app": "t2;b𒀯[\u0017",
-            "transport": "APNS_VOIP",
-            "client": "2"
-        },
-        {
-            "token": ":\u000bY",
-            "app": "",
-            "transport": "APNS",
-            "client": "15"
-        },
-        {
-            "token": "頂,u󾳁",
-            "app": "\u0014\n􇸉_",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "4"
-        },
-        {
-            "token": "𩪠6",
-            "app": "\r",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "a"
-        },
-        {
-            "token": "YW",
-            "app": "7bVc",
-            "transport": "APNS_SANDBOX",
-            "client": "f"
-        },
-        {
-            "token": "\u00070@",
-            "app": "\u0016Ol\u0010􈍰\u0008",
-            "transport": "GCM",
-            "client": "1c"
-        },
-        {
-            "token": "􃰬\u0012􄢖쥨y3",
-            "app": "P\u0017t",
-            "transport": "APNS_SANDBOX",
-            "client": "8"
-        },
-        {
-            "token": "X󸳇󻘷,",
-            "app": " 󱋍P",
-            "transport": "GCM",
-            "client": "2"
-        },
-        {
-            "token": "\u001ds孂\u0018󿿟;",
-            "app": "\u0008𭜶ட%Ye",
-            "transport": "APNS_VOIP",
-            "client": "11"
-        },
-        {
-            "token": "𗥀",
-            "app": "q3",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "5"
-        },
-        {
-            "token": "\u0014",
-            "app": "b",
-            "transport": "APNS",
-            "client": "15"
-        },
-        {
-            "token": "T?[",
-            "app": "钫|􈍍A𒊚",
-            "transport": "APNS_VOIP",
-            "client": "4"
-        },
-        {
-            "token": "󰞁賡",
-            "app": "𫼑",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "12"
-        },
-        {
-            "token": "#",
-            "app": "%箽",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "16"
-        },
-        {
-            "token": "𤝤󾻪\u00016F7",
-            "app": "󵉑%",
-            "transport": "APNS_VOIP",
-            "client": "6"
-        },
-        {
-            "token": ",􀊪􃵳𥫰D鞅|",
-            "app": "!NS𩃒",
-            "transport": "APNS",
-            "client": "16"
-        },
-        {
-            "token": "|\u000b-\u001a]",
-            "app": "󴅟dJ",
-            "transport": "APNS_VOIP",
-            "client": "6"
-        },
-        {
-            "token": "@\u0007𓁥.\r\u0013\u0004",
-            "app": "\u0001VX𒇺",
-            "transport": "GCM",
-            "client": "3"
-        },
-        {
-            "token": "󸝡7]𘡋",
-            "app": "\t𥨵gA",
-            "transport": "APNS_SANDBOX",
-            "client": "0"
-        },
-        {
-            "token": "𩁧\u0018\u0005-𧖽",
-            "app": "\u0005Sk",
-            "transport": "APNS",
-            "client": "9"
-        },
-        {
-            "token": "2\u0000G_{",
-            "app": "\u000e\u0001\u0004o\u0004",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "11"
-        },
-        {
-            "token": "\u0011",
-            "app": "𐁄\u0008X",
-            "transport": "GCM",
-            "client": "3"
-        },
-        {
-            "token": "c\u000e",
-            "app": "c\u0003b􏄚",
-            "transport": "APNS_SANDBOX",
-            "client": "3"
-        },
-        {
-            "token": "",
-            "app": "Ej\u0007\u0001",
-            "transport": "APNS",
-            "client": "14"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_13.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_13.json
deleted file mode 100644
index 5a1ec666252..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_13.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "󼹟\u0011]",
-            "app": "!J^l",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "b"
-        },
-        {
-            "token": "􇍄􁰳f𮈕\u0012Pc",
-            "app": "\u0017f",
-            "transport": "GCM",
-            "client": "15"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_14.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_14.json
deleted file mode 100644
index 6f0a53ae7c2..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_14.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "\u001d",
-            "app": "as\u0003W􂇂",
-            "transport": "APNS_VOIP",
-            "client": "0"
-        },
-        {
-            "token": "",
-            "app": "􋌄\"x",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "16"
-        },
-        {
-            "token": "\u001fVq\u0015\u001a⢾",
-            "app": "Y_\u0019뽬8",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "16"
-        },
-        {
-            "token": "d",
-            "app": "",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "7"
-        },
-        {
-            "token": "6^5P뉷􀰵F",
-            "app": "nq6󷻤0U􃗵",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "18"
-        },
-        {
-            "token": "􋲼\u0003",
-            "app": "?;r",
-            "transport": "APNS_SANDBOX",
-            "client": "6"
-        },
-        {
-            "token": "􎊒9",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "3"
-        },
-        {
-            "token": "R􁉘𫫋",
-            "app": "\u0014r􎕂\u0008;",
-            "transport": "GCM",
-            "client": "9"
-        },
-        {
-            "token": "\u0002",
-            "app": "bIv",
-            "transport": "GCM",
-            "client": "c"
-        },
-        {
-            "token": "",
-            "app": ":(#\u0008",
-            "transport": "APNS_SANDBOX",
-            "client": "b"
-        },
-        {
-            "token": "B𗴣Q}",
-            "app": "{\u0000\u0007Zb!~",
-            "transport": "APNS_VOIP",
-            "client": "19"
-        },
-        {
-            "token": "盬YL4[O\u0010",
-            "app": "🍘𭢉Z󵃥#",
-            "transport": "APNS",
-            "client": "f"
-        },
-        {
-            "token": "ROqs󴐻_𪘎",
-            "app": "B\u000f?",
-            "transport": "APNS_SANDBOX",
-            "client": "10"
-        },
-        {
-            "token": "Ejl;Zgc",
-            "app": "E\u0012\u0018𖹅",
-            "transport": "APNS_SANDBOX",
-            "client": "19"
-        },
-        {
-            "token": "1<",
-            "app": "\u0018G",
-            "transport": "GCM",
-            "client": "14"
-        },
-        {
-            "token": "w!",
-            "app": "!Y",
-            "transport": "APNS",
-            "client": "13"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_15.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_15.json
deleted file mode 100644
index 5341865a725..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_15.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "􂈼R􈷬\tVẙ,",
-            "app": "𬏵\u000c𠃦/l!􏍉",
-            "transport": "APNS_VOIP",
-            "client": "1c"
-        },
-        {
-            "token": "f$PT*|\u000e",
-            "app": "\u0003󿋓󴞫:}",
-            "transport": "APNS",
-            "client": "8"
-        },
-        {
-            "token": "x%4k",
-            "app": "",
-            "transport": "APNS_VOIP",
-            "client": "14"
-        },
-        {
-            "token": "\u001c\t",
-            "app": "J5🅟i>r",
-            "transport": "APNS",
-            "client": "1b"
-        },
-        {
-            "token": "󷻓〖r@\u0003B\u0012",
-            "app": "[\u0016󴪲v",
-            "transport": "APNS",
-            "client": "14"
-        },
-        {
-            "token": "_\u001eg",
-            "app": " c=D\u0000g2",
-            "transport": "APNS_SANDBOX",
-            "client": "17"
-        },
-        {
-            "token": "",
-            "app": "q",
-            "transport": "APNS_SANDBOX",
-            "client": "1d"
-        },
-        {
-            "token": "C!(",
-            "app": "=",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "e"
-        },
-        {
-            "token": "'",
-            "app": "퍋",
-            "transport": "APNS_VOIP",
-            "client": "6"
-        },
-        {
-            "token": "EN󺛨󸰧",
-            "app": "d\u0018:`j;*",
-            "transport": "APNS_SANDBOX",
-            "client": "d"
-        },
-        {
-            "token": "",
-            "app": "𢆸W_𗹳",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "15"
-        },
-        {
-            "token": ":^􄓆7\u0017[",
-            "app": "vr/+[",
-            "transport": "APNS",
-            "client": "a"
-        },
-        {
-            "token": "\u0010H",
-            "app": "Z􌢅󹌺\u0000􉢴l",
-            "transport": "APNS_VOIP",
-            "client": "17"
-        },
-        {
-            "token": "5𡙺F􏤩",
-            "app": "V𬈒$\u0004VJ",
-            "transport": "GCM",
-            "client": "20"
-        },
-        {
-            "token": "'S",
-            "app": "𨁹",
-            "transport": "APNS",
-            "client": "3"
-        },
-        {
-            "token": "w",
-            "app": "󶛰𬸇\u0011y@",
-            "transport": "GCM",
-            "client": "0"
-        },
-        {
-            "token": "𡕊",
-            "app": "\u0001S\"𘞦?s",
-            "transport": "GCM",
-            "client": "e"
-        },
-        {
-            "token": "f󼫇<Gz",
-            "app": "/\u0001F󶃘o斤",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "4"
-        },
-        {
-            "token": "l嬯􂇝x\u0000",
-            "app": "'𐐒",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "11"
-        },
-        {
-            "token": "L\u0015﮲",
-            "app": ",􍽖H*󶩛𣪋􉟑",
-            "transport": "APNS",
-            "client": "0"
-        },
-        {
-            "token": "0𠟯\t+􍅉",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "4"
-        },
-        {
-            "token": "oO𘡟",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "2"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_16.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_16.json
deleted file mode 100644
index 8201fffee5f..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_16.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "",
-            "app": "T𨾰騏󷻠",
-            "transport": "APNS",
-            "client": "c"
-        },
-        {
-            "token": "/",
-            "app": "r|",
-            "transport": "APNS_VOIP",
-            "client": "b"
-        },
-        {
-            "token": "귈i牢2\u0015",
-            "app": "",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "a"
-        },
-        {
-            "token": "",
-            "app": "\u001e|d#w\u001a",
-            "transport": "APNS",
-            "client": "f"
-        },
-        {
-            "token": "\u001e",
-            "app": "y\u000f\u000c{",
-            "transport": "GCM",
-            "client": "e"
-        },
-        {
-            "token": "=",
-            "app": "\u000e󷷶J",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "20"
-        },
-        {
-            "token": "䋗\u0008𩠠\u001e𗾲Bz",
-            "app": "x",
-            "transport": "APNS_VOIP",
-            "client": "0"
-        },
-        {
-            "token": "",
-            "app": "\u000f",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "13"
-        },
-        {
-            "token": "FoT7\n𢪏􉷪",
-            "app": "\u001b苂ug肄\u0017\\",
-            "transport": "APNS_SANDBOX",
-            "client": "d"
-        },
-        {
-            "token": "#-NY𮆚\u0006",
-            "app": "8q揂k\u0019𭍁#",
-            "transport": "GCM",
-            "client": "13"
-        },
-        {
-            "token": "􄳲!N*\u001fi",
-            "app": "𠭗EwvK!z",
-            "transport": "GCM",
-            "client": "a"
-        },
-        {
-            "token": "􉯌+",
-            "app": "\u001bꭘ",
-            "transport": "GCM",
-            "client": "19"
-        },
-        {
-            "token": "𡬣#<󻬎",
-            "app": "0\u0001n\u0015",
-            "transport": "APNS_VOIP",
-            "client": "e"
-        },
-        {
-            "token": ",fkyy􄥀",
-            "app": "-퐌󼹝\u001c\u000e",
-            "transport": "APNS",
-            "client": "1d"
-        },
-        {
-            "token": "\u0001kr韷󹍿",
-            "app": "\u0001\\",
-            "transport": "APNS",
-            "client": "2"
-        },
-        {
-            "token": "rt",
-            "app": "􎺍\u001ar",
-            "transport": "APNS_SANDBOX",
-            "client": "1d"
-        },
-        {
-            "token": "\"\u00046",
-            "app": "𢒀𗑨",
-            "transport": "GCM",
-            "client": "1c"
-        },
-        {
-            "token": "􆆌]𭷭c􄑡M",
-            "app": "9^y5",
-            "transport": "APNS",
-            "client": "2"
-        },
-        {
-            "token": "Y:\u0005\u0013\u000e",
-            "app": "s",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1a"
-        },
-        {
-            "token": "7",
-            "app": "6𩪌𩔄󺫮N嶃A",
-            "transport": "APNS_SANDBOX",
-            "client": "1d"
-        },
-        {
-            "token": "􋋚𭅄𪣵O?;",
-            "app": "􌾶{B;\u000f",
-            "transport": "APNS",
-            "client": "16"
-        },
-        {
-            "token": "q<;%",
-            "app": "𮉰~r􉁾i",
-            "transport": "APNS_SANDBOX",
-            "client": "7"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_17.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_17.json
deleted file mode 100644
index b674acd1bb2..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_17.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "q\u0004􂻅G\u0007𗖰f",
-            "app": "0\t",
-            "transport": "APNS_VOIP",
-            "client": "10"
-        },
-        {
-            "token": "\u001aZ󳧯[",
-            "app": "󰐌𫮜󴔗h\\:",
-            "transport": "GCM",
-            "client": "0"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_18.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_18.json
deleted file mode 100644
index 43210763e17..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_18.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "ͬ7",
-            "app": "",
-            "transport": "GCM",
-            "client": "11"
-        },
-        {
-            "token": "󹬯\u0010\u0010q\"g",
-            "app": "x",
-            "transport": "GCM",
-            "client": "8"
-        },
-        {
-            "token": "q<\u0010",
-            "app": "\u0015󾓱|0􍊿\u0002",
-            "transport": "APNS",
-            "client": "18"
-        },
-        {
-            "token": "",
-            "app": "7;𧣭",
-            "transport": "GCM",
-            "client": "18"
-        },
-        {
-            "token": "<D\u0014h",
-            "app": "?𢴑*􁼚",
-            "transport": "APNS_SANDBOX",
-            "client": "c"
-        },
-        {
-            "token": "H\u001a#3",
-            "app": "\r;",
-            "transport": "GCM",
-            "client": "8"
-        },
-        {
-            "token": "C,",
-            "app": "妺𘇧𪗅/g",
-            "transport": "APNS",
-            "client": "20"
-        },
-        {
-            "token": "",
-            "app": "",
-            "transport": "APNS_VOIP",
-            "client": "1b"
-        },
-        {
-            "token": "4",
-            "app": "\u0006",
-            "transport": "GCM",
-            "client": "1"
-        },
-        {
-            "token": "n\u0019f饏U",
-            "app": "\u0016:r=",
-            "transport": "GCM",
-            "client": "b"
-        },
-        {
-            "token": "r\u0018",
-            "app": "",
-            "transport": "APNS",
-            "client": "f"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_19.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_19.json
deleted file mode 100644
index aa246ebc118..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_19.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "􃿙+󶟱",
-            "app": "2󼉔",
-            "transport": "GCM",
-            "client": "1a"
-        },
-        {
-            "token": "U",
-            "app": "w",
-            "transport": "APNS",
-            "client": "19"
-        },
-        {
-            "token": "\u000c\u0007",
-            "app": "\u0011",
-            "transport": "APNS_VOIP",
-            "client": "c"
-        },
-        {
-            "token": "",
-            "app": "\u000e\u0015",
-            "transport": "GCM",
-            "client": "8"
-        },
-        {
-            "token": "𓇳%",
-            "app": "j\n𛆳>_\u001e}",
-            "transport": "APNS_VOIP",
-            "client": "16"
-        },
-        {
-            "token": "󴌛􍎌z􎺆YY",
-            "app": "󺒶$㬑\u0019Qw",
-            "transport": "GCM",
-            "client": "15"
-        },
-        {
-            "token": "\u0004𤾷nUJY",
-            "app": "tu窭@󼉓",
-            "transport": "APNS_VOIP",
-            "client": "1c"
-        },
-        {
-            "token": "d𡋩\u001aL",
-            "app": "󿕼",
-            "transport": "GCM",
-            "client": "11"
-        },
-        {
-            "token": "]\u0012",
-            "app": "\u0005𦥧4",
-            "transport": "GCM",
-            "client": "6"
-        },
-        {
-            "token": "􍽳xf(",
-            "app": "뷹\u0016󰇦1⏌@",
-            "transport": "GCM",
-            "client": "17"
-        },
-        {
-            "token": "i!l)E\u000eg",
-            "app": "\u001e",
-            "transport": "APNS",
-            "client": "5"
-        },
-        {
-            "token": "",
-            "app": "+~?lH􃨰4",
-            "transport": "APNS_VOIP",
-            "client": "1"
-        },
-        {
-            "token": "`􅈇",
-            "app": "􉉛𫌒L枣󾦘",
-            "transport": "APNS",
-            "client": "b"
-        },
-        {
-            "token": "_􆢕Bm",
-            "app": "j`8?\u001b^",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "5"
-        },
-        {
-            "token": "\u0001𧯾<",
-            "app": "t \u001fE[",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1e"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_2.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_2.json
index 83ffcb9e918..532be2880b6 100644
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_2.json
+++ b/libs/wire-api/test/golden/testObject_PushTokenList_user_2.json
@@ -1,118 +1,3 @@
 {
-    "tokens": [
-        {
-            "token": "\u0017a􃦌8󽭏",
-            "app": "",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "c"
-        },
-        {
-            "token": "wO+",
-            "app": "\u0013",
-            "transport": "APNS_SANDBOX",
-            "client": "8"
-        },
-        {
-            "token": "󴊻)X\u0014",
-            "app": "\u001b",
-            "transport": "APNS_SANDBOX",
-            "client": "1b"
-        },
-        {
-            "token": "􊀒𩧄ZgJE",
-            "app": "\u0007(𧬠",
-            "transport": "APNS",
-            "client": "1f"
-        },
-        {
-            "token": "_lB#󱞥",
-            "app": "mY",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1a"
-        },
-        {
-            "token": "7#k\n\u0000e",
-            "app": "#𪷽+",
-            "transport": "APNS_SANDBOX",
-            "client": "16"
-        },
-        {
-            "token": "🞎\u000fY;aw\u001e",
-            "app": "㤤\\Jb𦝼",
-            "transport": "APNS",
-            "client": "10"
-        },
-        {
-            "token": "\tfS󿛺𬵦*󻇆",
-            "app": "c󹴞",
-            "transport": "APNS_SANDBOX",
-            "client": "0"
-        },
-        {
-            "token": "~",
-            "app": "5\u0018#a\t󹙟",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "d"
-        },
-        {
-            "token": "\u001aDS𣅼",
-            "app": " \u0003:",
-            "transport": "APNS_VOIP",
-            "client": "6"
-        },
-        {
-            "token": "p7",
-            "app": "z\u000e>䌵l𧋶􆖌",
-            "transport": "GCM",
-            "client": "b"
-        },
-        {
-            "token": "(}]\t⾥?",
-            "app": "\u0004j󲖎",
-            "transport": "APNS",
-            "client": "4"
-        },
-        {
-            "token": "鎏+[",
-            "app": "\u001fT5\u0017G",
-            "transport": "APNS",
-            "client": "3"
-        },
-        {
-            "token": "\u0002罿\u001f",
-            "app": "4󷘣󽸟\u0004\u0002.",
-            "transport": "APNS_SANDBOX",
-            "client": "3"
-        },
-        {
-            "token": "N\u001b罡*_",
-            "app": "]C",
-            "transport": "APNS_VOIP",
-            "client": "4"
-        },
-        {
-            "token": ";\u0004\u001b\u0018",
-            "app": "㓵B븢v\u000f)",
-            "transport": "APNS_VOIP",
-            "client": "9"
-        },
-        {
-            "token": "y􈇀",
-            "app": "\u0007<!<",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "20"
-        },
-        {
-            "token": "뗑a􁇹{㜉A",
-            "app": "~󲬲",
-            "transport": "APNS_VOIP",
-            "client": "19"
-        },
-        {
-            "token": "ZIW",
-            "app": "\u000e8.󺠑3C8",
-            "transport": "GCM",
-            "client": "e"
-        }
-    ]
-}
\ No newline at end of file
+    "tokens": []
+}
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_20.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_20.json
deleted file mode 100644
index aebf86281e5..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_20.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "즨\u0012$\u0012w",
-            "app": "󷬗",
-            "transport": "APNS_VOIP",
-            "client": "e"
-        },
-        {
-            "token": "M",
-            "app": "50",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "c"
-        },
-        {
-            "token": "\u001bl􇍅<Z\u0006",
-            "app": "",
-            "transport": "GCM",
-            "client": "e"
-        },
-        {
-            "token": "*\t",
-            "app": "􇅱,\u0012X\u000e󺝃",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1d"
-        },
-        {
-            "token": "\\𬰥&\u000fq",
-            "app": "➖$",
-            "transport": "APNS",
-            "client": "12"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_3.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_3.json
deleted file mode 100644
index 057dd7b9848..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_3.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": ",|\u0003",
-            "app": "/𦺌",
-            "transport": "APNS",
-            "client": "0"
-        },
-        {
-            "token": "[\\iS",
-            "app": "\u0010",
-            "transport": "GCM",
-            "client": "6"
-        },
-        {
-            "token": "NEUoxG",
-            "app": "\u001d􏑜\u0004S𫕌",
-            "transport": "GCM",
-            "client": "1c"
-        },
-        {
-            "token": "𦾹R",
-            "app": "]ᴮ􇺓}",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "10"
-        },
-        {
-            "token": "\u0001!􄀦𢣥\u001e",
-            "app": "󸡁l𠑑􆳅\u001e䰇",
-            "transport": "APNS_VOIP",
-            "client": "14"
-        },
-        {
-            "token": "E\"7𡊄\u001f",
-            "app": "",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1"
-        },
-        {
-            "token": "'",
-            "app": "􁶉K!",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "1a"
-        },
-        {
-            "token": "\u0000󸢮",
-            "app": "c􄃚㼉␔\u001e􈌴",
-            "transport": "APNS",
-            "client": "1"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_4.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_4.json
deleted file mode 100644
index 85d5df2fbd5..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_4.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "G\r,i,Gk",
-            "app": "2R&",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "11"
-        },
-        {
-            "token": "g\u000e$S\u00175\n",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "2"
-        },
-        {
-            "token": "'ᆸmt?,",
-            "app": "_O",
-            "transport": "APNS",
-            "client": "1a"
-        },
-        {
-            "token": "4eP=nj",
-            "app": "P}~\u000e:",
-            "transport": "GCM",
-            "client": "e"
-        },
-        {
-            "token": "",
-            "app": "",
-            "transport": "APNS",
-            "client": "1e"
-        },
-        {
-            "token": "GwoD􏊂\u0004𒊋",
-            "app": "B0S􉒛",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "c"
-        },
-        {
-            "token": "+$\u000c",
-            "app": "\u0014󱣲",
-            "transport": "APNS_VOIP",
-            "client": "16"
-        },
-        {
-            "token": "]𥎏F󳈁",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "18"
-        },
-        {
-            "token": ".",
-            "app": "\r󰠔D_",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "8"
-        },
-        {
-            "token": "q",
-            "app": "ov",
-            "transport": "APNS_VOIP",
-            "client": "19"
-        },
-        {
-            "token": "\u001f\u000f4\u0008",
-            "app": "L",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "d"
-        },
-        {
-            "token": "w6x",
-            "app": "呈a",
-            "transport": "GCM",
-            "client": "c"
-        },
-        {
-            "token": "{\u00046to놉",
-            "app": "NsGq",
-            "transport": "APNS",
-            "client": "9"
-        },
-        {
-            "token": "Pi",
-            "app": "q\u0018I\u0002z0",
-            "transport": "APNS_VOIP",
-            "client": "1c"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_5.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_5.json
deleted file mode 100644
index c43b8d8533e..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_5.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "=\\󾢨p]",
-            "app": "󿝜󷂓􀵂\u0007t𣉳f",
-            "transport": "APNS",
-            "client": "d"
-        },
-        {
-            "token": "\n)$\u001d",
-            "app": "=\u001f6󺘣\u0011Wn",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "a"
-        },
-        {
-            "token": "i\u000b[^opY",
-            "app": "\n:a𣟿\u001b􃌏7",
-            "transport": "APNS_VOIP",
-            "client": "1c"
-        },
-        {
-            "token": "𮑅󸠙\u000c󷺉𢺧sd",
-            "app": "싦",
-            "transport": "APNS_VOIP",
-            "client": "12"
-        },
-        {
-            "token": "\u0016L󽬨e\u0005",
-            "app": "놶xIM",
-            "transport": "GCM",
-            "client": "1c"
-        },
-        {
-            "token": "]󵫰f",
-            "app": "v\u000f",
-            "transport": "APNS_VOIP",
-            "client": "17"
-        },
-        {
-            "token": "\\",
-            "app": "6\u0002",
-            "transport": "APNS_VOIP",
-            "client": "0"
-        },
-        {
-            "token": "F\u0001􎤧\u0005􌾝3",
-            "app": "󴨬?",
-            "transport": "APNS_VOIP",
-            "client": "c"
-        },
-        {
-            "token": "󲨤G󻲞􄯎",
-            "app": "􏺸􍋬|𝀼\u0019&",
-            "transport": "GCM",
-            "client": "9"
-        },
-        {
-            "token": "\u0018E_\u0003\r",
-            "app": "G!-(gD",
-            "transport": "APNS_VOIP",
-            "client": "1b"
-        },
-        {
-            "token": "",
-            "app": "S𨱬U󷦔􈷶[",
-            "transport": "GCM",
-            "client": "14"
-        },
-        {
-            "token": "",
-            "app": "⫛濺k",
-            "transport": "GCM",
-            "client": "7"
-        },
-        {
-            "token": "F3𨦁&KZY",
-            "app": "",
-            "transport": "APNS_VOIP",
-            "client": "17"
-        },
-        {
-            "token": "!3􅷜)\u0001",
-            "app": "𦡐􅔸󴅲𨄐",
-            "transport": "GCM",
-            "client": "1c"
-        },
-        {
-            "token": "",
-            "app": "#𬳪",
-            "transport": "GCM",
-            "client": "e"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_6.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_6.json
deleted file mode 100644
index 55b3b7a82c8..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_6.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "#",
-            "app": "",
-            "transport": "APNS",
-            "client": "1"
-        },
-        {
-            "token": "m",
-            "app": "NJ㘀",
-            "transport": "APNS_SANDBOX",
-            "client": "19"
-        },
-        {
-            "token": "",
-            "app": "\u0011",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "3"
-        },
-        {
-            "token": "",
-            "app": "貲Ipi𫐈䛇",
-            "transport": "APNS",
-            "client": "2"
-        },
-        {
-            "token": "􈋞`\u001cx\\X",
-            "app": "'[𠫜𘤼c",
-            "transport": "APNS_VOIP",
-            "client": "1c"
-        },
-        {
-            "token": "~Z\u0004t8",
-            "app": ">",
-            "transport": "APNS",
-            "client": "6"
-        },
-        {
-            "token": "T𔒛E􋔞\u0014\u0011𢮢",
-            "app": "f5e",
-            "transport": "APNS",
-            "client": "6"
-        },
-        {
-            "token": "",
-            "app": "\u0008+3I漢􋷍",
-            "transport": "APNS",
-            "client": "20"
-        },
-        {
-            "token": "𠑭\u001b4󶊒􊻿𒌼",
-            "app": "",
-            "transport": "APNS_VOIP",
-            "client": "1f"
-        },
-        {
-            "token": "b",
-            "app": "f􅰗3^y",
-            "transport": "GCM",
-            "client": "d"
-        },
-        {
-            "token": "uJf",
-            "app": "𮀿>^\r",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "11"
-        },
-        {
-            "token": "\u0007虛P𩸧󸊆",
-            "app": "𠥺Q\u0007Y",
-            "transport": "APNS_SANDBOX",
-            "client": "c"
-        },
-        {
-            "token": "\u000ef\u0013\u0005",
-            "app": "𭂼􈸮𐳤;1N\u0013",
-            "transport": "APNS_VOIP",
-            "client": "1e"
-        },
-        {
-            "token": "",
-            "app": "",
-            "transport": "GCM",
-            "client": "20"
-        },
-        {
-            "token": " d󺘩跂",
-            "app": "[\u001f\u001d~`",
-            "transport": "APNS_SANDBOX",
-            "client": "d"
-        },
-        {
-            "token": "m0\t5",
-            "app": "󻄿",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "18"
-        },
-        {
-            "token": "]",
-            "app": "CO3\u0013󶯆\u0000􉸮",
-            "transport": "APNS_SANDBOX",
-            "client": "5"
-        },
-        {
-            "token": "尋\u0018𐍇M)颩O",
-            "app": "4",
-            "transport": "APNS",
-            "client": "2"
-        },
-        {
-            "token": "𨷢󴊞h\u0019m\u0006",
-            "app": "\u001c3\u0012\u0017䁛t)",
-            "transport": "APNS",
-            "client": "20"
-        },
-        {
-            "token": "",
-            "app": "5",
-            "transport": "APNS_SANDBOX",
-            "client": "1"
-        },
-        {
-            "token": "\\\u0012e8",
-            "app": "󽆦c\u00084픚X",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "10"
-        },
-        {
-            "token": "\u0017b7~}",
-            "app": "\u0007y=\u001a8\u001a",
-            "transport": "APNS_SANDBOX",
-            "client": "7"
-        },
-        {
-            "token": "{",
-            "app": "잱􍺩兹\u0018U𝢃m",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "f"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_7.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_7.json
deleted file mode 100644
index a8e8e400bf3..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_7.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "㫿q􁽲󼣶<\u0011􀇄",
-            "app": "oB\u000e",
-            "transport": "APNS_VOIP",
-            "client": "6"
-        },
-        {
-            "token": "",
-            "app": "6\u000f.",
-            "transport": "APNS",
-            "client": "1d"
-        },
-        {
-            "token": "𝂫:e𮈩",
-            "app": "\u0012Y󰯹n𡗢\"",
-            "transport": "APNS",
-            "client": "1c"
-        },
-        {
-            "token": ")\u001a\u000e\u0019.X",
-            "app": "5s\u001fB",
-            "transport": "GCM",
-            "client": "7"
-        },
-        {
-            "token": "sd􃣂",
-            "app": "r \nr>",
-            "transport": "APNS_VOIP",
-            "client": "9"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_8.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_8.json
deleted file mode 100644
index 27638353118..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_8.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "]-",
-            "app": "􊹿4 𠻓",
-            "transport": "APNS",
-            "client": "18"
-        },
-        {
-            "token": "H5",
-            "app": "󰊅󹮄",
-            "transport": "APNS_VOIP",
-            "client": "3"
-        },
-        {
-            "token": "󿿨El",
-            "app": "􈃨",
-            "transport": "GCM",
-            "client": "10"
-        },
-        {
-            "token": "\u0014O%\u001ab\u0004T",
-            "app": "b&󲺌\u001b󵈛2",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "12"
-        },
-        {
-            "token": "󷫰o.",
-            "app": "𫨳\t#$G ",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "18"
-        },
-        {
-            "token": "A",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "18"
-        },
-        {
-            "token": "",
-            "app": "",
-            "transport": "APNS_VOIP",
-            "client": "d"
-        },
-        {
-            "token": "\u0016",
-            "app": "8ꨐ.e\u0013K",
-            "transport": "APNS_VOIP",
-            "client": "1"
-        },
-        {
-            "token": "8\u0014\u0001K",
-            "app": "\u001eA",
-            "transport": "APNS_VOIP",
-            "client": "12"
-        },
-        {
-            "token": "Q彿",
-            "app": "\u0010/\r%􇋿D@",
-            "transport": "GCM",
-            "client": "0"
-        },
-        {
-            "token": "\u0008",
-            "app": "\u0004􅟡􉹳",
-            "transport": "GCM",
-            "client": "5"
-        },
-        {
-            "token": "𭉂\u001fS𮋆",
-            "app": "q",
-            "transport": "GCM",
-            "client": "a"
-        },
-        {
-            "token": "l𨌘 m\u0011ob",
-            "app": "EN呶𬒝",
-            "transport": "APNS",
-            "client": "1a"
-        },
-        {
-            "token": "𛃝\u001839",
-            "app": "󲕽)􄆲",
-            "transport": "APNS_SANDBOX",
-            "client": "16"
-        },
-        {
-            "token": "\u000befi\u001dꓗ𡬸",
-            "app": "9􀤿􃸓퇛w\u001e",
-            "transport": "APNS_SANDBOX",
-            "client": "18"
-        },
-        {
-            "token": "􁮗",
-            "app": "𭝫/YS",
-            "transport": "APNS_SANDBOX",
-            "client": "10"
-        },
-        {
-            "token": "iv97퉖",
-            "app": "=",
-            "transport": "APNS",
-            "client": "4"
-        },
-        {
-            "token": "EG4pJI\t",
-            "app": "O軔a",
-            "transport": "APNS_VOIP",
-            "client": "1a"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushTokenList_user_9.json b/libs/wire-api/test/golden/testObject_PushTokenList_user_9.json
deleted file mode 100644
index c7972b61709..00000000000
--- a/libs/wire-api/test/golden/testObject_PushTokenList_user_9.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "tokens": [
-        {
-            "token": "r\u000f\u0008\rqN\u0007",
-            "app": "",
-            "transport": "APNS_SANDBOX",
-            "client": "b"
-        },
-        {
-            "token": "",
-            "app": "",
-            "transport": "APNS_VOIP_SANDBOX",
-            "client": "14"
-        },
-        {
-            "token": "o\u0010枉",
-            "app": "􋥙W[",
-            "transport": "APNS_VOIP",
-            "client": "5"
-        },
-        {
-            "token": "",
-            "app": "n",
-            "transport": "APNS_VOIP",
-            "client": "4"
-        },
-        {
-            "token": "<V",
-            "app": "𣟫pQ",
-            "transport": "APNS",
-            "client": "1c"
-        },
-        {
-            "token": "\u0005,\u0007B",
-            "app": "𦈃\u0005\\􃮆/Kg",
-            "transport": "APNS_VOIP",
-            "client": "8"
-        },
-        {
-            "token": "\\O\u0017@",
-            "app": "󻾺",
-            "transport": "APNS",
-            "client": "1c"
-        },
-        {
-            "token": "",
-            "app": "ො%\u000evy",
-            "transport": "APNS",
-            "client": "15"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_1.json b/libs/wire-api/test/golden/testObject_PushToken_user_1.json
index 8f9d101a1f6..a112f0ac4c7 100644
--- a/libs/wire-api/test/golden/testObject_PushToken_user_1.json
+++ b/libs/wire-api/test/golden/testObject_PushToken_user_1.json
@@ -1,6 +1,6 @@
 {
-    "token": "\u00048M\u0015Av􍯩",
     "app": "G󶊡",
-    "transport": "APNS_SANDBOX",
-    "client": "16"
-}
\ No newline at end of file
+    "client": "16",
+    "token": "\u00048M\u0015Av􍯩",
+    "transport": "APNS_SANDBOX"
+}
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_10.json b/libs/wire-api/test/golden/testObject_PushToken_user_10.json
deleted file mode 100644
index 4631434f111..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_10.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "h󳬝ZFt0",
-    "app": "J",
-    "transport": "APNS_VOIP_SANDBOX",
-    "client": "17"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_11.json b/libs/wire-api/test/golden/testObject_PushToken_user_11.json
deleted file mode 100644
index be89f075e2f..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_11.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "I",
-    "app": "󽏻ꭡꓗ",
-    "transport": "APNS_VOIP",
-    "client": "11"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_12.json b/libs/wire-api/test/golden/testObject_PushToken_user_12.json
deleted file mode 100644
index 24d5dc7055b..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_12.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "5Q璈⌼#\u000c",
-    "app": "4𦤒E$𫺤Z𥓤",
-    "transport": "APNS_VOIP",
-    "client": "18"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_13.json b/libs/wire-api/test/golden/testObject_PushToken_user_13.json
deleted file mode 100644
index b0f00c6acf2..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_13.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "os􇙈9\u0014{",
-    "app": "𛉅󹭒;𣿺;`",
-    "transport": "APNS_VOIP",
-    "client": "1b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_14.json b/libs/wire-api/test/golden/testObject_PushToken_user_14.json
deleted file mode 100644
index c6bf1226613..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_14.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "@",
-    "app": "寤䒑𣣎?L",
-    "transport": "APNS_VOIP_SANDBOX",
-    "client": "1a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_15.json b/libs/wire-api/test/golden/testObject_PushToken_user_15.json
deleted file mode 100644
index f03948932ed..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_15.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "\u000f⾜h𝙥픸\u0000\u0015",
-    "app": "",
-    "transport": "APNS_SANDBOX",
-    "client": "6"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_16.json b/libs/wire-api/test/golden/testObject_PushToken_user_16.json
deleted file mode 100644
index 6fd41f260e9..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_16.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "\u0018",
-    "app": "s打z𬦬",
-    "transport": "APNS_VOIP",
-    "client": "1d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_17.json b/libs/wire-api/test/golden/testObject_PushToken_user_17.json
deleted file mode 100644
index 86a68ec5725..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_17.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "\"-*4󴓣q󿋳",
-    "app": "$󾨌\u0001",
-    "transport": "APNS_SANDBOX",
-    "client": "15"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_18.json b/libs/wire-api/test/golden/testObject_PushToken_user_18.json
deleted file mode 100644
index e034538ae3e..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_18.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "#󰄯VH􁓰𗅠",
-    "app": "􂅯;𠺲v4\u00086",
-    "transport": "GCM",
-    "client": "1e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_19.json b/libs/wire-api/test/golden/testObject_PushToken_user_19.json
deleted file mode 100644
index e1528c85f83..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_19.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "n%\u0015⋿l\u0003",
-    "app": "󲖸􈺇󻠟🕡",
-    "transport": "APNS_VOIP",
-    "client": "1d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_2.json b/libs/wire-api/test/golden/testObject_PushToken_user_2.json
deleted file mode 100644
index 49642c16d18..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "𮆍\u0003𝃂",
-    "app": "G\rꛌ\r",
-    "transport": "APNS_VOIP",
-    "client": "1e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_20.json b/libs/wire-api/test/golden/testObject_PushToken_user_20.json
deleted file mode 100644
index 5c9806dea71..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_20.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "𖭫,/.pL",
-    "app": "jǎBPh&",
-    "transport": "APNS",
-    "client": "9"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_3.json b/libs/wire-api/test/golden/testObject_PushToken_user_3.json
deleted file mode 100644
index d6a63214b71..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "\u0003",
-    "app": "9\u000c",
-    "transport": "APNS_SANDBOX",
-    "client": "13"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_4.json b/libs/wire-api/test/golden/testObject_PushToken_user_4.json
deleted file mode 100644
index d4b2ad78781..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "\u0001$\u0016W",
-    "app": "C%\u0001\u000b􊡵H󹣎",
-    "transport": "APNS_SANDBOX",
-    "client": "b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_5.json b/libs/wire-api/test/golden/testObject_PushToken_user_5.json
deleted file mode 100644
index 84093db9dff..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "ǔ9󽕷mz榷\u001c",
-    "app": "<F",
-    "transport": "GCM",
-    "client": "19"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_6.json b/libs/wire-api/test/golden/testObject_PushToken_user_6.json
deleted file mode 100644
index b37f30d2508..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_6.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "_S",
-    "app": "󾬞",
-    "transport": "APNS_VOIP",
-    "client": "15"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_7.json b/libs/wire-api/test/golden/testObject_PushToken_user_7.json
deleted file mode 100644
index 81925099f9c..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_7.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "Z\u0002J",
-    "app": "󳦞",
-    "transport": "GCM",
-    "client": "14"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_8.json b/libs/wire-api/test/golden/testObject_PushToken_user_8.json
deleted file mode 100644
index b9ea8a9fcbd..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_8.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "c󲨆󻓂",
-    "app": "*/",
-    "transport": "APNS_VOIP",
-    "client": "1f"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_PushToken_user_9.json b/libs/wire-api/test/golden/testObject_PushToken_user_9.json
deleted file mode 100644
index 75d2a1b8f5b..00000000000
--- a/libs/wire-api/test/golden/testObject_PushToken_user_9.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "token": "󱯀Fm􉑙􀢳",
-    "app": "",
-    "transport": "APNS_VOIP_SANDBOX",
-    "client": "8"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_1.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_1.json
index 1ffba978c52..973793168a1 100644
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_1.json
@@ -1 +1 @@
-"APNS_VOIP_SANDBOX"
\ No newline at end of file
+"GCM"
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_10.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_10.json
deleted file mode 100644
index 52db5567852..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"GCM"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_11.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_11.json
deleted file mode 100644
index 1ffba978c52..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_VOIP_SANDBOX"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_12.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_12.json
deleted file mode 100644
index ec8e8ea66d3..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_SANDBOX"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_13.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_13.json
deleted file mode 100644
index 52db5567852..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"GCM"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_14.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_14.json
deleted file mode 100644
index 52db5567852..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"GCM"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_15.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_15.json
deleted file mode 100644
index 52db5567852..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"GCM"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_16.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_16.json
deleted file mode 100644
index 1ffba978c52..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_VOIP_SANDBOX"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_17.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_17.json
deleted file mode 100644
index 1ffba978c52..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_VOIP_SANDBOX"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_18.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_18.json
deleted file mode 100644
index 1ffba978c52..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_VOIP_SANDBOX"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_19.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_19.json
deleted file mode 100644
index 36d7535a5cc..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_2.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_2.json
index ec8e8ea66d3..c62434fc352 100644
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_2.json
@@ -1 +1 @@
-"APNS_SANDBOX"
\ No newline at end of file
+"APNS"
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_20.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_20.json
deleted file mode 100644
index ec8e8ea66d3..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_SANDBOX"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_3.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_3.json
index 36d7535a5cc..7519d36ac09 100644
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_3.json
@@ -1 +1 @@
-"APNS"
\ No newline at end of file
+"APNS_SANDBOX"
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_4.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_4.json
index 1ca884c8790..d177fe0e9d7 100644
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_4.json
@@ -1 +1 @@
-"APNS_VOIP"
\ No newline at end of file
+"APNS_VOIP"
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_5.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_5.json
index ec8e8ea66d3..fd689b4ac10 100644
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_5.json
@@ -1 +1 @@
-"APNS_SANDBOX"
\ No newline at end of file
+"APNS_VOIP_SANDBOX"
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_6.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_6.json
deleted file mode 100644
index 1ffba978c52..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_VOIP_SANDBOX"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_7.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_7.json
deleted file mode 100644
index 1ca884c8790..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS_VOIP"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_8.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_8.json
deleted file mode 100644
index 36d7535a5cc..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"APNS"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_9.json b/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_9.json
deleted file mode 100644
index 52db5567852..00000000000
--- a/libs/wire-api/test/golden/testObject_Push_2eToken_2eTransport_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"GCM"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_1.json b/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_1.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_1.json
+++ b/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_1.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_2.json b/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_2.json
index 92b7f161857..68dd80f79b4 100644
--- a/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_2.json
+++ b/libs/wire-api/test/golden/testObject_QualifiedUserClientPrekeyMap_2.json
@@ -2,191 +2,191 @@
     "alpha.example.com": {
         "00000552-0000-7ae9-0000-5c84000004dd": {
             "0": {
-                "key": "M󻆳yx",
-                "id": 79
+                "id": 79,
+                "key": "M󻆳yx"
             },
             "1": {
-                "key": "\u0004h",
-                "id": 18
+                "id": 18,
+                "key": "\u0004h"
             },
+            "3": null,
             "4": {
-                "key": "\u001e\"􏱍o",
-                "id": 88
-            },
-            "3": null
-        }
-    },
-    "epsilon.example.com": {
-        "00000006-0000-0008-0000-000600000003": {},
-        "00000008-0000-0008-0000-000300000008": {
-            "0": {
-                "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-                "id": 52
-            },
-            "1": {
-                "key": "\u0001m)",
-                "id": 121
+                "id": 88,
+                "key": "\u001e\"􏱍o"
             }
-        },
-        "00000003-0000-0006-0000-000100000000": {
-            "2": {
-                "key": "突?#\u0014k",
-                "id": 110
-            }
-        },
-        "00000000-0000-0004-0000-000400000005": {
-            "17": null
         }
     },
     "beta.example.com": {
         "00000025-0000-0025-0000-00660000001d": {
             "3": {
-                "key": "\u0000\u0004Jn𧜘\u0006튺",
-                "id": 123
+                "id": 123,
+                "key": "\u0000\u0004Jn𧜘\u0006튺"
             },
             "9": {
-                "key": "9|j.Kp",
-                "id": 88
+                "id": 88,
+                "key": "9|j.Kp"
             }
         },
         "00000038-0000-004a-0000-007700000000": {
             "dfd": {
-                "key": "𮈉a\u0008ZS\u000e\",h󲩍j%",
-                "id": 23
+                "id": 23,
+                "key": "𮈉a\u0008ZS\u000e\",h󲩍j%"
             }
         }
     },
-    "gamma.example.com": {
-        "00000018-0000-0020-0000-000e00000002": {
+    "delta.example.com": {
+        "00000000-0000-0003-0000-000100000000": {},
+        "00000003-0000-0002-0000-000500000002": {
             "0": {
-                "key": "!@hb",
-                "id": 58
+                "id": 79,
+                "key": "M󻆳yx"
             },
             "1": {
-                "key": "突?#\u0014k",
-                "id": 110
+                "id": 82,
+                "key": "<o􈀗(n󿀕\tj󸤦w􍬕`"
             }
         },
-        "00000013-0000-000d-0000-000600000007": {
-            "4": {
-                "key": "\u0007\u001a\tA𭦢5q􍄴7",
-                "id": 110
+        "00000003-0000-0005-0000-000800000001": {
+            "0": {
+                "id": 110,
+                "key": "\u0007\u001a\tA𭦢5q􍄴7"
             },
-            "9": {
-                "key": "n2LjT􋩮)R\u0010",
-                "id": 12
+            "1": {
+                "id": 88,
+                "key": ""
             }
         },
-        "0000000e-0000-001d-0000-00160000000b": {
+        "00000004-0000-0003-0000-000300000008": {},
+        "00000007-0000-0008-0000-000100000006": {
             "0": {
-                "key": "\u0010Ba\u0002\u0000\u001f3",
-                "id": 109
+                "id": 128,
+                "key": "𧮘峰$<I|k\u0016\u000eZx\u0002應"
             },
-            "1": {
-                "key": "M󻆳yx",
-                "id": 79
+            "3": {
+                "id": 88,
+                "key": "9|j.Kp"
             }
         }
     },
-    "theta.example.com": {},
-    "zeta.example.com": {
-        "0000007c-0000-0075-0000-006000000025": {
-            "8": {
-                "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-                "id": 52
-            },
-            "c": null,
-            "f": {
-                "key": "",
-                "id": 68
+    "epsilon.example.com": {
+        "00000000-0000-0004-0000-000400000005": {
+            "17": null
+        },
+        "00000003-0000-0006-0000-000100000000": {
+            "2": {
+                "id": 110,
+                "key": "突?#\u0014k"
             }
         },
-        "0000004d-0000-001f-0000-006300000073": {
-            "1": {
-                "key": "\u0000\u0004Jn𧜘\u0006튺",
-                "id": 123
-            },
-            "4": {
-                "key": "\u0004h",
-                "id": 18
+        "00000006-0000-0008-0000-000600000003": {},
+        "00000008-0000-0008-0000-000300000008": {
+            "0": {
+                "id": 52,
+                "key": "󷞱+@􏴇'\u0003\u000b\u0006"
             },
-            "2": {
-                "key": "n2LjT􋩮)R\u0010",
-                "id": 12
+            "1": {
+                "id": 121,
+                "key": "\u0001m)"
             }
         }
     },
     "eta.example.com": {
-        "00000000-0000-0001-0000-000000000001": {},
-        "00000002-0000-0001-0000-000000000002": {},
-        "00000001-0000-0001-0000-000000000001": {
+        "00000000-0000-0000-0000-000200000000": {
             "0": {
-                "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-                "id": 52
-            },
-            "1": {
-                "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-                "id": 52
+                "id": 52,
+                "key": "󷞱+@􏴇'\u0003\u000b\u0006"
             }
         },
+        "00000000-0000-0001-0000-000000000001": {},
         "00000000-0000-0002-0000-000200000002": {
             "0": null
         },
-        "00000000-0000-0000-0000-000200000000": {
+        "00000001-0000-0001-0000-000000000001": {
             "0": {
-                "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-                "id": 52
-            }
-        },
-        "00000002-0000-0000-0000-000000000001": {
-            "2": {
-                "key": "\u0001m)",
-                "id": 121
+                "id": 52,
+                "key": "󷞱+@􏴇'\u0003\u000b\u0006"
+            },
+            "1": {
+                "id": 52,
+                "key": "󷞱+@􏴇'\u0003\u000b\u0006"
             }
         },
         "00000001-0000-0002-0000-000100000001": {
             "0": {
-                "key": "\u0004h",
-                "id": 18
+                "id": 18,
+                "key": "\u0004h"
             },
             "1": {
-                "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-                "id": 52
+                "id": 52,
+                "key": "󷞱+@􏴇'\u0003\u000b\u0006"
             }
-        }
+        },
+        "00000002-0000-0000-0000-000000000001": {
+            "2": {
+                "id": 121,
+                "key": "\u0001m)"
+            }
+        },
+        "00000002-0000-0001-0000-000000000002": {}
     },
-    "delta.example.com": {
-        "00000004-0000-0003-0000-000300000008": {},
-        "00000003-0000-0005-0000-000800000001": {
+    "gamma.example.com": {
+        "0000000e-0000-001d-0000-00160000000b": {
             "0": {
-                "key": "\u0007\u001a\tA𭦢5q􍄴7",
-                "id": 110
+                "id": 109,
+                "key": "\u0010Ba\u0002\u0000\u001f3"
             },
             "1": {
-                "key": "",
-                "id": 88
+                "id": 79,
+                "key": "M󻆳yx"
             }
         },
-        "00000000-0000-0003-0000-000100000000": {},
-        "00000007-0000-0008-0000-000100000006": {
-            "0": {
-                "key": "𧮘峰$<I|k\u0016\u000eZx\u0002應",
-                "id": 128
+        "00000013-0000-000d-0000-000600000007": {
+            "4": {
+                "id": 110,
+                "key": "\u0007\u001a\tA𭦢5q􍄴7"
             },
-            "3": {
-                "key": "9|j.Kp",
-                "id": 88
+            "9": {
+                "id": 12,
+                "key": "n2LjT􋩮)R\u0010"
             }
         },
-        "00000003-0000-0002-0000-000500000002": {
+        "00000018-0000-0020-0000-000e00000002": {
             "0": {
-                "key": "M󻆳yx",
-                "id": 79
+                "id": 58,
+                "key": "!@hb"
             },
             "1": {
-                "key": "<o􈀗(n󿀕\tj󸤦w􍬕`",
-                "id": 82
+                "id": 110,
+                "key": "突?#\u0014k"
+            }
+        }
+    },
+    "theta.example.com": {},
+    "zeta.example.com": {
+        "0000004d-0000-001f-0000-006300000073": {
+            "1": {
+                "id": 123,
+                "key": "\u0000\u0004Jn𧜘\u0006튺"
+            },
+            "2": {
+                "id": 12,
+                "key": "n2LjT􋩮)R\u0010"
+            },
+            "4": {
+                "id": 18,
+                "key": "\u0004h"
+            }
+        },
+        "0000007c-0000-0075-0000-006000000025": {
+            "8": {
+                "id": 52,
+                "key": "󷞱+@􏴇'\u0003\u000b\u0006"
+            },
+            "c": null,
+            "f": {
+                "id": 68,
+                "key": ""
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_1.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_1.json
index 5c263e4b9e1..fd6fd3f79c5 100644
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_1.json
+++ b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_1.json
@@ -1,33 +1,15 @@
 {
-    "time": "1864-05-19T07:34:20.509238926493Z",
     "has_more": true,
     "notifications": [
         {
+            "id": "00000002-0000-0001-0000-000100000000",
             "payload": [
                 {
                     "": null,
                     "p": true
-                },
-                {},
-                {},
-                {},
-                {},
-                {},
-                {},
-                {}
-            ],
-            "id": "00000002-0000-0001-0000-000100000000"
-        },
-        {
-            "payload": [
-                {
-                    "": [
-                        "\u000e"
-                    ]
-                },
-                {}
-            ],
-            "id": "00000001-0000-0002-0000-000100000002"
+                }
+            ]
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "time": "1864-05-19T07:34:20.509238926493Z"
+}
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_10.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_10.json
deleted file mode 100644
index ed81610b443..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_10.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "time": "1864-05-14T22:59:36.632886313527Z",
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {},
-                {},
-                {}
-            ],
-            "id": "00000000-0000-0001-0000-000000000000"
-        },
-        {
-            "payload": [
-                {
-                    "": {}
-                }
-            ],
-            "id": "00000000-0000-0001-0000-000100000000"
-        },
-        {
-            "payload": [
-                {
-                    "": {
-                        "": ""
-                    }
-                }
-            ],
-            "id": "00000000-0000-0000-0000-000000000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_11.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_11.json
deleted file mode 100644
index f05b286791b..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_11.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_12.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_12.json
deleted file mode 100644
index 9496bab37ac..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_12.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "time": "1864-05-04T09:15:29.205195175891Z",
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "payload": [
-                {},
-                {},
-                {},
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0001-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_13.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_13.json
deleted file mode 100644
index b71ae905a54..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_13.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "time": "1864-05-01T19:33:18.971740786102Z",
-    "has_more": false,
-    "notifications": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_14.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_14.json
deleted file mode 100644
index b27d48b25bb..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_14.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "time": "1864-04-30T07:58:44.856820480203Z",
-    "has_more": false,
-    "notifications": [
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000100000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000100000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000000000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000100000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_15.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_15.json
deleted file mode 100644
index d340b4043ad..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_15.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "time": "1864-05-01T05:18:36.710631729776Z",
-    "has_more": true,
-    "notifications": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_16.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_16.json
deleted file mode 100644
index ba4f2c1afd1..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_16.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "time": "1864-05-12T20:30:51.221043991768Z",
-    "has_more": true,
-    "notifications": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_17.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_17.json
deleted file mode 100644
index 0caf0f9912b..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_17.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0001-0000-000000000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_18.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_18.json
deleted file mode 100644
index 22beb19ddeb..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_18.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "has_more": true,
-    "notifications": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_19.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_19.json
deleted file mode 100644
index eee318c7776..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_19.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "time": "1864-05-01T08:57:14.649508884242Z",
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {},
-                {},
-                {}
-            ],
-            "id": "00000000-0000-0001-0000-000000000000"
-        },
-        {
-            "payload": [
-                {},
-                {},
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "payload": [
-                {},
-                {},
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000000"
-        },
-        {
-            "payload": [
-                {
-                    "􃖺": ""
-                },
-                {}
-            ],
-            "id": "00000000-0000-0001-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_2.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_2.json
index 0b7f1a80b4c..0ac8ee67d78 100644
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_2.json
+++ b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_2.json
@@ -1,58 +1,4 @@
 {
-    "time": "1864-04-29T13:53:36.621523022731Z",
     "has_more": false,
-    "notifications": [
-        {
-            "payload": [
-                {},
-                {},
-                {},
-                {},
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {
-                    "": [
-                        0,
-                        null
-                    ]
-                },
-                {
-                    "": [
-                        "",
-                        null
-                    ]
-                }
-            ],
-            "id": "00000000-0000-0001-0000-000100000000"
-        },
-        {
-            "payload": [
-                {
-                    "": ""
-                }
-            ],
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "payload": [
-                {
-                    "󴴈": []
-                },
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000100000000"
-        },
-        {
-            "payload": [
-                {},
-                {},
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000100000000"
-        }
-    ]
-}
\ No newline at end of file
+    "notifications": []
+}
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_20.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_20.json
deleted file mode 100644
index ea413df7152..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_20.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "time": "1864-05-01T03:16:29.788087572971Z",
-    "has_more": false,
-    "notifications": [
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_3.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_3.json
deleted file mode 100644
index 6ef6ad1b545..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_3.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "time": "1864-05-16T13:53:35.281384700276Z",
-    "has_more": true,
-    "notifications": []
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_4.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_4.json
deleted file mode 100644
index 9709926e571..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_4.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "time": "1864-05-07T03:04:03.677917355524Z",
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000002-0000-0001-0000-000200000000"
-        },
-        {
-            "payload": [
-                {
-                    "": [
-                        null
-                    ],
-                    "Ṛc": -20
-                },
-                {},
-                {},
-                {},
-                {},
-                {}
-            ],
-            "id": "00000000-0000-0002-0000-000000000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_5.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_5.json
deleted file mode 100644
index dc2020af89f..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_5.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "time": "1864-05-04T20:04:00.385969583352Z",
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {
-                    "y": {
-                        "": ""
-                    }
-                },
-                {
-                    "!": []
-                }
-            ],
-            "id": "00000000-0000-0001-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0001-0000-000000000000"
-        },
-        {
-            "payload": [
-                {
-                    "": {
-                        ":": null
-                    }
-                },
-                {}
-            ],
-            "id": "00000000-0000-0001-0000-000100000000"
-        },
-        {
-            "payload": [
-                {},
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "payload": [
-                {},
-                {},
-                {},
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000000000000"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_6.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_6.json
deleted file mode 100644
index 632fe9d767e..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_6.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "time": "1864-05-10T02:08:41.125447101921Z",
-    "has_more": false,
-    "notifications": [
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000000000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000000-0000-0000-0000-000000000000"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0000-0000-000100000001"
-        },
-        {
-            "payload": [
-                {}
-            ],
-            "id": "00000001-0000-0001-0000-000000000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_7.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_7.json
deleted file mode 100644
index 4ac16a66e32..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_7.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "has_more": false,
-    "notifications": [
-        {
-            "payload": [
-                {
-                    "눑I𩶔\u001a": [],
-                    "": {},
-                    "'ὂ'V𪭜": null,
-                    "r": "蠷u𣂚DH"
-                },
-                {
-                    "": {
-                        "1": null
-                    }
-                },
-                {},
-                {}
-            ],
-            "id": "00000004-0000-0002-0000-000300000001"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_8.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_8.json
deleted file mode 100644
index c3443b03684..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_8.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "time": "1864-05-06T19:34:07.842851307868Z",
-    "has_more": false,
-    "notifications": [
-        {
-            "payload": [
-                {},
-                {},
-                {},
-                {}
-            ],
-            "id": "00000004-0000-0000-0000-000100000004"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_9.json b/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_9.json
deleted file mode 100644
index ea7773ef73d..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotificationList_user_9.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "time": "1864-05-19T05:14:44.883081744636Z",
-    "has_more": true,
-    "notifications": [
-        {
-            "payload": [
-                {
-                    "^e[􉒽i": [
-                        null
-                    ],
-                    "l": [
-                        "yv\u0008u\u0007"
-                    ],
-                    "B8+#": "\u001a`􉶹",
-                    "\u0000&k􈻶": {
-                        "e\u0019󱯸$": 4.0e-3
-                    },
-                    "c𡹴": null
-                },
-                {}
-            ],
-            "id": "00000003-0000-0000-0000-000100000003"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_1.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_1.json
index 767bb54457c..5e180b91eaf 100644
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_1.json
+++ b/libs/wire-api/test/golden/testObject_QueuedNotification_user_1.json
@@ -1,17 +1,9 @@
 {
+    "id": "0000005f-0000-007b-0000-001a0000000a",
     "payload": [
         {},
         {
             "𫲬3": []
-        },
-        {},
-        {
-            "\\": "􁘬󷷒"
-        },
-        {
-            "􄂑\u0014": null,
-            "􄣝U": "#퀤"
         }
-    ],
-    "id": "0000005f-0000-007b-0000-001a0000000a"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_10.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_10.json
deleted file mode 100644
index 9d2311c4964..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_10.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "payload": [
-        {
-            "|󺰙": "\u000e'𛆅􊣠\u0016>Y\u0014\n",
-            "\u001f2g\u001d\r": {
-                "\u0013\u0013W": "\u000c漋",
-                "h󰈸5": "{",
-                "𣊶<􎱀\u0017": "\u0008"
-            },
-            "S󱩬󻫔\u0015\u000b\u0007\u0002Fqb1E𫣤": -1400000000000
-        },
-        {
-            "䛧𫦴": false,
-            "\u000f󰚲󵅣(": [],
-            "/": {
-                "U󻙊>": 500000
-            },
-            "/\u0013\u0016": {
-                "w": null,
-                "\u0017": 10,
-                "": 0
-            }
-        },
-        {
-            "\u0014\u0008{": {},
-            "󾮱": [
-                true,
-                true,
-                null,
-                null,
-                null,
-                false,
-                null,
-                false,
-                null,
-                true
-            ],
-            "|\u001e𪏏": [],
-            "Yےۭ\t󺎓": [
-                true,
-                null
-            ],
-            "/1|~b": []
-        },
-        {}
-    ],
-    "id": "00000017-0000-0079-0000-007f0000000c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_11.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_11.json
deleted file mode 100644
index b63c65bd960..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_11.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "payload": [
-        {
-            "𫋋㷢\u0019\u0016⽐󺎖\u000b<M": {
-                "<": 0,
-                "f{": false,
-                "": 2.0e-2,
-                "p": false,
-                "\u0002": 0,
-                "Y": true
-            }
-        },
-        {
-            "": {}
-        },
-        {},
-        {
-            "󿃺": 0
-        },
-        {},
-        {
-            "": 1
-        },
-        {},
-        {},
-        {
-            "M": {}
-        },
-        {
-            "": 0
-        },
-        {
-            "𮗱": {}
-        },
-        {
-            "\u001f": {}
-        },
-        {
-            "": {
-                "": true
-            }
-        }
-    ],
-    "id": "00000006-0000-000a-0000-007500000067"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_12.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_12.json
deleted file mode 100644
index 571a4f47aff..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_12.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "payload": [
-        {
-            "2kv\u000cA\u0010I<": -12000000000000
-        },
-        {
-            ".": true
-        },
-        {
-            "": null
-        },
-        {
-            "s": []
-        },
-        {},
-        {},
-        {},
-        {},
-        {}
-    ],
-    "id": "00000034-0000-0039-0000-005200000071"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_13.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_13.json
deleted file mode 100644
index bb4b80396cd..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_13.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "payload": [
-        {
-            "7Ss\u001ej\u0013": "󿍡E\u0016솎^)0<9𦇭sG}ᶈk",
-            "": false,
-            "\u0003\u001e>𪓒eꎫV\u0001𥳢\u0002\u001e􉄷D": null,
-            "U\u0018􊎡": [
-                null,
-                null,
-                -2.0e-2,
-                3,
-                -2000
-            ]
-        },
-        {
-            "󽐎y": true,
-            "4u󽑫\u0002\u0007󻬔d2󺐺:🠢DN0": "\u0017bUR()X\u0011K\u0005K陮O𪻛",
-            "d%𐒃\u0010v𨱧~N𐮎p-\u0015": true,
-            "\u0014<s󳚻\u000cv\u0017D􋬳": {
-                "󸀥": null,
-                "N􉝽①\u0003ੈ􄖙": false
-            },
-            "h}𧇳": true,
-            "/\u0014砦": 1.5e-9,
-            "\u001fD.n\u000fz6f\u0004\u001aC7\u0003jF": 80000,
-            "oW𨈿": null
-        }
-    ],
-    "id": "00000043-0000-0015-0000-006d00000070"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_14.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_14.json
deleted file mode 100644
index 79644b321c2..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_14.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "payload": [
-        {
-            "L": [
-                "􍭕\u001d",
-                "",
-                -0.1,
-                "󵚯",
-                true,
-                0
-            ],
-            "\u0006gEE󹽽j4": 4.0e-2
-        },
-        {},
-        {
-            "T闋": [
-                "5l+eq"
-            ]
-        },
-        {}
-    ],
-    "id": "00000058-0000-0032-0000-00730000005c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_15.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_15.json
deleted file mode 100644
index dbb7db3b2e6..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_15.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "payload": [
-        {
-            "@": "{V",
-            "M󵻚": "R7;𔒖'",
-            "}x𠝨": {
-                "": null,
-                "詸": "",
-                "T": -0.2,
-                "䎢": false,
-                "u": true,
-                "S": false
-            },
-            "$ї@\u000e\u0003?\u00198\u0010􉍨𐐼󻛸V": null,
-            "CpD\u0010Vl3U\u0015\u0014W𗯭": {
-                "": null,
-                "䧊=\u001b\tLp": "\u000b"
-            },
-            "@-m k𠍍IB": {},
-            "w\u0013SW\u0010`󸧀󽫗5󷱴􏬍T\u0013󾣎": {
-                "\u000b𢧪󴻞𬸵\u0000": false,
-                "S8\"\u0001\t𭮗w": "\u0013𨵘"
-            },
-            "kz\t\u001aB+Sr9n%\u000fc": ">0􌤨\u000ev\u001aH(\u001a􋹧/𥼣"
-        }
-    ],
-    "id": "0000005d-0000-0059-0000-00340000007b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_16.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_16.json
deleted file mode 100644
index 382bcfb668a..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_16.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "payload": [
-        {
-            "􉃘Q큥󳱲l鼓E\u0012=I\u0005<􆾚\nL": {
-                "􌩧": null,
-                "": null,
-                "\u0012󷭖": 0,
-                "\u0015": null,
-                "\u0017Y": "|"
-            },
-            "􄺾I>􉿂㤂[\r鵻𢨔": 90000000000,
-            "\u001c1?12/~?DȮ󸟻R": 8.0e-4,
-            "st0綖I]쳦\u0006\u0010𝛶": 1.2e-2,
-            "%\u00045󿌝\u0003𗒰n\u0001}\u000c2": {
-                "𫗣\u001dJ": null,
-                "|\r􀶅": 3000,
-                "\u0019\u0016\u0010": null,
-                ">\r": "Q6\u0003"
-            }
-        }
-    ],
-    "id": "00000009-0000-005f-0000-002d0000003a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_17.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_17.json
deleted file mode 100644
index 8b89670357e..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_17.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "payload": [
-        {
-            "󱇿a𫺇\t\u0008uB\u00060": [
-                null,
-                null,
-                400000
-            ],
-            "": [
-                "",
-                "z;􉄾",
-                "",
-                true,
-                ".H"
-            ],
-            "󼝮6)": {
-                "": 0
-            },
-            "𥓄vk]c+y2\u0011乷:Isj": 70000,
-            "O𛇨󶗥 T\u0008\u0010x\u0011􃵾+": false,
-            "𤒝A𦅄󳾞a𭔠j": null,
-            "r\u0012Ny*~뎺|A𘢼RC^Ng": {
-                "{𠱊W􆍫\u0016\u0007Àa퉺#i+`7h": ">𡑝\u0015o𮪪8;󻺳\u0016󷈁\nf\u00150="
-            }
-        },
-        {},
-        {},
-        {
-            ">": {
-                "": ""
-            }
-        },
-        {
-            "YW󲳇": 30,
-            "": "w\u000f",
-            "\u0007거8": 0.3
-        }
-    ],
-    "id": "0000003e-0000-0010-0000-00100000005d"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_18.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_18.json
deleted file mode 100644
index f18635012ff..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_18.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "payload": [
-        {
-            "`ꋙሄ󹋜w\u000e\u001dS(E": [],
-            "[\u001d󿶚A\u000e<􋠍𤻖I#\u000c㜈S􀒰\u0002": [
-                "􊌬",
-                0,
-                null,
-                false,
-                null,
-                false,
-                0,
-                null
-            ],
-            ">ij\u000eW!rDk Sl": null,
-            "􁼼􅟬fMi\u0018qx𩛇^WK󰃄A": 1.2e-3
-        },
-        {
-            "": {
-                "": null,
-                "\r󺩌󸽑󶒻": true
-            },
-            "􏛿.䃮nD𬼜y󳷣\u000b\u0011C": [],
-            "\u001f9︆\u0019\u001b\u0019􋒁": {},
-            "?𧵏󶗷㖏􊋺\u0013\u0012s9󲤙`Q\u0013": "\u001a𘜿"
-        }
-    ],
-    "id": "00000019-0000-0012-0000-002e0000006e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_19.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_19.json
deleted file mode 100644
index acf8be74262..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_19.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "payload": [
-        {},
-        {
-            "cK<=Y(\"": {},
-            "": null,
-            "􃤲𢠣𡥘5r睹s": {},
-            "&": [],
-            "L4\u0012𓎺`": []
-        },
-        {
-            "O𨗟5🏡": false,
-            "0\u001a4󸘃=C": [
-                null,
-                "",
-                false,
-                true,
-                0,
-                false,
-                false,
-                null,
-                "",
-                false
-            ],
-            "r㏞M\u000b": null
-        }
-    ],
-    "id": "00000045-0000-005e-0000-007700000025"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_2.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_2.json
deleted file mode 100644
index de080ba6973..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_2.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "payload": [
-        {
-            "􂞿𬔆": 1500,
-            "\u0007𦌹": 90000000000000,
-            "y": 3000000
-        },
-        {},
-        {
-            "O>䂁󹪾\u001c": [
-                "",
-                true,
-                true,
-                null,
-                false,
-                false,
-                true,
-                null
-            ],
-            "󿃬P\u0011~": [
-                200,
-                false
-            ],
-            "􊇭": {
-                "F𧇁|": false
-            },
-            "/e效\u0001[@": null,
-            ")=\u001f\n": {},
-            "\u0010󻑭󳜔": [
-                null,
-                true,
-                true
-            ],
-            "B.d\u0003`": "n\u0013"
-        }
-    ],
-    "id": "0000005d-0000-0048-0000-00720000007c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_20.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_20.json
deleted file mode 100644
index 20b0ac05c08..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_20.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "payload": [
-        {
-            "": null,
-            "@+S\u000bq": 1.2e-9
-        },
-        {},
-        {},
-        {
-            "<": [
-                false
-            ]
-        },
-        {
-            "\u001c": []
-        },
-        {
-            "󳌹": ""
-        },
-        {},
-        {},
-        {
-            "": {
-                "": null
-            }
-        },
-        {},
-        {},
-        {},
-        {
-            "7": []
-        },
-        {
-            "": [
-                null
-            ]
-        }
-    ],
-    "id": "0000005c-0000-002f-0000-002800000002"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_3.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_3.json
deleted file mode 100644
index 8ae67b2e00b..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_3.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "payload": [
-        {
-            "𗌟P\u001d7𩮂l[\t": [
-                7000000,
-                null
-            ],
-            "": true,
-            "y_\"K􂹤𧈺\t\u0016\u0008g\u0004": null,
-            "T{k􎘆𮏓ᕯ⓴𠎰D": -9,
-            "5Katxb<3󱫩󽆙f\"f󽰏": -500,
-            "u#퓖􁪒N~W\u00187k󷴑g􅴨": [
-                "{",
-                null,
-                -1,
-                true,
-                "󻱦",
-                "u",
-                "\t",
-                null,
-                null,
-                0,
-                false,
-                -1,
-                false
-            ],
-            "0=󶞳;\u0001D": [
-                "衠!"
-            ],
-            "\u0008D9": {},
-            "츎q\u0004?F~`xL\u0013-w\t𭫦": "\u000bme𧱫\u0001\u001aL𬌯5#\u0016\u000f􅛴?",
-            "0i𗺌i}\u0015\u0011\u0017\u0017-􅃫篠1󷵑": [
-                7.0e-4,
-                "mUX|9uC"
-            ]
-        },
-        {
-            "": {}
-        },
-        {},
-        {},
-        {},
-        {
-            "g": null
-        },
-        {},
-        {
-            "": [
-                0,
-                ""
-            ]
-        },
-        {},
-        {},
-        {}
-    ],
-    "id": "00000009-0000-007a-0000-000e00000026"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_4.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_4.json
deleted file mode 100644
index afe8fe6d456..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_4.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "payload": [
-        {
-            "=3n?\u0005nD\u001c\u000e5": [
-                null
-            ],
-            "*\u0006𩑆\u0007ce\u0000": {},
-            "\u0001\u0007qy3_Q𥡹󰽡褚\u000c\u00185x": null,
-            "Bx󹿽\u0001": "4\u001f",
-            "bRe𪃢Y$#Aq3": null,
-            "悳󵕡\u0015,(\u0000 n": null
-        },
-        {
-            "": [
-                null,
-                0,
-                0,
-                true,
-                ""
-            ]
-        },
-        {},
-        {
-            "\u0012X": {},
-            "󹮆s㎕": 2
-        },
-        {
-            "": [
-                -10,
-                true
-            ],
-            "\u000f": true,
-            "X": []
-        }
-    ],
-    "id": "00000069-0000-0074-0000-003a0000001b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_5.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_5.json
deleted file mode 100644
index 8a5c039b862..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_5.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "payload": [
-        {
-            "내\u0005𞠜􋳪~\u0015󴂧􃑼H􊨿󸼔]AT󼴄": {
-                "t\u000cg\u0006𥺖󳫶􀀑𗮠U\u000e@L\n狢": 40000000
-            },
-            "\t􊿷\t𨗓": [
-                true,
-                "",
-                -0.1,
-                null,
-                "",
-                0,
-                null,
-                "𥋠"
-            ],
-            "": {
-                "": ""
-            },
-            "\u0004X\u0010d􎿈\u00142\u00187󼣟5v\u00153": "󼧌;\u0014wZ󳵲%",
-            "\u0013hj7\u0007hO/NoE𤝻y䰀": [],
-            "IFm A𡲼\u0015\u0011h麗\u0018": [
-                false,
-                false,
-                -500
-            ],
-            "\u0005\u000f\n\u0017#P󷼬𨧪=F": [],
-            "􎗐=𞄫\u001d": [
-                false,
-                1,
-                1,
-                true,
-                -2.0e-2,
-                0
-            ],
-            "\u0019gMH𥶿\u0011b\u000e􌢰FH\u0011GX": {},
-            "𗙋o\n4𧍴󷫣": [
-                0,
-                false,
-                "󻖏",
-                null,
-                -2000
-            ],
-            "G\u0018󼔚Jv\u001em7\"廙3\u001dj<ﳓ": [
-                false
-            ],
-            "B|R􈂱K8^\u0013􅿌<}": [
-                7.0e-10
-            ],
-            "\u0019\u000c\u0004z\u0003F,}􆥠BD𫨟m": {
-                "2\"": 0,
-                "#": null,
-                "𣠿\u0003": "",
-                "D2": 2.0e-3
-            }
-        },
-        {
-            "􈨚K/": [
-                "$\u001e",
-                "\t$",
-                "\u000f􌚼",
-                true,
-                "󴁑",
-                "j\u0011"
-            ],
-            "M+b<橇󷶅溁}\u0007": null,
-            "󿬦v": {
-                "L\u0003E\u0013󽇺^󾋜": 0,
-                "#  ffX": -20000
-            },
-            "N": {
-                "􇇢6;": " ",
-                "^\u0012󽜰j󹊴": false,
-                "h": "[玗q\u000f"
-            },
-            "\u001d-": [
-                "t􁄏",
-                true,
-                -0.2,
-                null
-            ]
-        }
-    ],
-    "id": "0000000d-0000-0019-0000-002600000076"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_6.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_6.json
deleted file mode 100644
index 1394ed591bf..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_6.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "payload": [
-        {
-            "𬶷\u0018ZdP_텮\u00163/1": [
-                0,
-                null,
-                0,
-                "\u0015",
-                true,
-                -20
-            ],
-            "D􅸒󵿅\u0010Ok􎓇": [
-                null,
-                2,
-                0,
-                -100,
-                2.0e-2,
-                false
-            ],
-            "/􍼨f": -6.0e-7,
-            "󵹑0W3挢8ZZZ9k": [
-                null,
-                " ",
-                null,
-                20,
-                -1.0e-2,
-                false,
-                true
-            ],
-            "5\\壶􏂵<짯Y": {
-                "": false
-            },
-            "YUqBj𣅐T\u001b𨈙V󸋶􎃧w": null,
-            "F192": [],
-            "S󼇷": {
-                "&<": 1.0e-6,
-                "%r`󶪙\u000e\u0003\u0017": -7.0e-6
-            },
-            "𮆛~SJ[u𥹽\u00012C㲥": "$.𖠱DO,\u0000%𤞼6",
-            "􎺼": [
-                null,
-                false
-            ],
-            "K#C": [
-                true,
-                null,
-                null,
-                -3,
-                "\u0014"
-            ],
-            "wGIB1z􁀻C󳃦󸣪𨨗􌜠": "줒􏘹𠟟1vxb󵌶",
-            "箰\u0005\u001c`󸳜􆫶)e,c]r": "J"
-        },
-        {
-            "𘚣`􂶬m%𫒓": []
-        },
-        {
-            "\u001f𩜵󹗔q": {
-                "; ": null
-            }
-        }
-    ],
-    "id": "00000016-0000-0025-0000-00720000005b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_7.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_7.json
deleted file mode 100644
index 85b3a3f151d..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_7.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "payload": [
-        {
-            "": {
-                "m": null,
-                "\u0010": null,
-                "": -10,
-                "+": -0.1,
-                "[": false,
-                "A": -1,
-                "/": true,
-                "6": 0
-            },
-            "l󱳗')􃔣v`\u0017𨍅f\u0004": {
-                "G": -400000,
-                "\u0002$=": null,
-                "$d!􄻌": true
-            },
-            "CIᘿi}\u0018𡜬f\u0012": {
-                "h7{󰧸 ": ";p",
-                "": true,
-                "c􁓿󻅽\u001f": 0
-            },
-            "r\u0010L󵙚7_C\u0003󴽾/N": false
-        },
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {}
-    ],
-    "id": "00000015-0000-0050-0000-00370000006c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_8.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_8.json
deleted file mode 100644
index e138c0e7256..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_8.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "payload": [
-        {},
-        {
-            "": ""
-        },
-        {
-            "": [
-                0,
-                false,
-                "",
-                0,
-                0,
-                false,
-                "",
-                0
-            ]
-        },
-        {
-            "\u001d": []
-        },
-        {
-            "󽻩M": "",
-            "𣗜󰓜": "⪪C"
-        },
-        {
-            "": []
-        },
-        {}
-    ],
-    "id": "00000042-0000-004d-0000-001800000054"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_QueuedNotification_user_9.json b/libs/wire-api/test/golden/testObject_QueuedNotification_user_9.json
deleted file mode 100644
index e0128373487..00000000000
--- a/libs/wire-api/test/golden/testObject_QueuedNotification_user_9.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "payload": [
-        {
-            "": [
-                null,
-                true,
-                null,
-                0,
-                -10,
-                true,
-                false,
-                null,
-                false,
-                -10
-            ],
-            "q=-྇We蝘\u0015l󳑚m𠟱": [
-                null,
-                -2.0e-2,
-                "𠱳",
-                null
-            ],
-            "e\u001bc\\啬0ᶎ\u0019􅧀𤕂": false
-        },
-        {
-            ";": 1
-        },
-        {},
-        {},
-        {
-            "J": [
-                ""
-            ]
-        },
-        {},
-        {
-            "J": [
-                ""
-            ]
-        },
-        {
-            "": {
-                "": false
-            }
-        },
-        {},
-        {
-            "": {
-                "": false
-            }
-        },
-        {},
-        {
-            "": []
-        },
-        {},
-        {},
-        {
-            "": false
-        }
-    ],
-    "id": "0000004e-0000-0040-0000-005c0000003b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_1.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_1.json
index 1f521a8211f..2024fd02b32 100644
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_1.json
@@ -1,72 +1,72 @@
 {
-    "ttl": 2,
     "ice_servers": [
         {
+            "credential": "KA==",
             "urls": [
                 "turns:a-c:0?transport=tcp",
                 "turns:102.223.53.51:1",
                 "turns:123:0"
             ],
-            "credential": "KA==",
             "username": "d=2.v=0.k=2.t=󱮟.r=y"
         },
         {
+            "credential": "vg==",
             "urls": [
                 "turns:11.115.71.116:0?transport=tcp"
             ],
-            "credential": "vg==",
             "username": "d=4.v=1.k=1.t=F.r=g9l"
         },
         {
+            "credential": "1Q==",
             "urls": [
                 "turns:64.166.247.200:1?transport=udp",
                 "turns:169.32.10.117:1?transport=tcp",
                 "turns:146.223.237.161:0?transport=tcp"
             ],
-            "credential": "1Q==",
             "username": "d=4.v=2.k=2.t=O.r=vkw"
         },
         {
+            "credential": "/w==",
             "urls": [
                 "turn:229.74.72.234:1",
                 "turn:200.55.82.144:0?transport=tcp",
                 "turns:30.151.133.158:1?transport=tcp"
             ],
-            "credential": "/w==",
             "username": "d=2.v=0.k=2.t=F.r=qv"
         },
         {
+            "credential": "TQ==",
             "urls": [
                 "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
                 "turn:212.204.103.144:1?transport=tcp"
             ],
-            "credential": "TQ==",
             "username": "d=4.v=3.k=1.t=鷃.r=b"
         },
         {
+            "credential": "1CM=",
             "urls": [
                 "turn:36.138.227.130:0",
                 "turns:a-c:0?transport=tcp"
             ],
-            "credential": "1CM=",
             "username": "d=3.v=3.k=1.t=6.r=1j"
         },
         {
+            "credential": "xVY=",
             "urls": [
                 "turn:39.3.236.143:0?transport=udp",
                 "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp"
             ],
-            "credential": "xVY=",
             "username": "d=0.v=2.k=0.t=D.r=v"
         },
         {
+            "credential": "9g==",
             "urls": [
                 "turn:126.131.239.218:0?transport=udp",
                 "turns:189.135.181.33:0?transport=udp",
                 "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=udp"
             ],
-            "credential": "9g==",
             "username": "d=3.v=3.k=1.t=\u0010.r=i3"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "ttl": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_10.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_10.json
deleted file mode 100644
index a201e2d3d36..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_10.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "ttl": 24,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:xn--mgbh0fb.xn--kgbechtv:1",
-                "turns:host.name:0"
-            ],
-            "credential": "Zh8=",
-            "username": "d=2.v=3.k=0.t=..r=ux"
-        },
-        {
-            "urls": [
-                "turns:host.name:0?transport=tcp",
-                "turns:007.com:0",
-                "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=udp"
-            ],
-            "credential": "Cg==",
-            "username": "d=3.v=1.k=1.t=\u000c.r=k"
-        },
-        {
-            "urls": [
-                "turns:host.name:1?transport=tcp",
-                "turns:host.name:1",
-                "turn:host.name:1"
-            ],
-            "credential": "Huw=",
-            "username": "d=1.v=2.k=1.t=H.r=9wq"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_11.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_11.json
deleted file mode 100644
index 6675482684a..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_11.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "ttl": 23,
-    "ice_servers": [
-        {
-            "urls": [
-                "turn:180.204.175.154:0?transport=tcp",
-                "turn:243.122.21.187:0",
-                "turn:007.com:0"
-            ],
-            "credential": "9Uc=",
-            "username": "d=0.v=0.k=0.t=􏍈.r=8"
-        },
-        {
-            "urls": [
-                "turn:140.96.58.16:0?transport=tcp"
-            ],
-            "credential": "",
-            "username": "d=3.v=0.k=1.t=H.r=v3"
-        },
-        {
-            "urls": [
-                "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=udp",
-                "turn:50.111.81.130:0?transport=udp",
-                "turn:host.name:1?transport=udp",
-                "turn:a-c:1"
-            ],
-            "credential": "",
-            "username": "d=0.v=3.k=1.t=\u0007.r=h"
-        },
-        {
-            "urls": [
-                "turn:123:0?transport=udp",
-                "turn:123:1?transport=udp",
-                "turns:123:0?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=0.v=1.k=2.t=6.r=z2"
-        },
-        {
-            "urls": [
-                "turn:a-c:0?transport=tcp"
-            ],
-            "credential": "kA==",
-            "username": "d=2.v=1.k=1.t=뇎.r=qv"
-        },
-        {
-            "urls": [
-                "turns:host.name:1?transport=udp",
-                "turns:a-c:0?transport=udp",
-                "turns:141.124.238.104:0",
-                "turns:220.161.164.44:0"
-            ],
-            "credential": "",
-            "username": "d=0.v=3.k=2.t=󸛍.r=q"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_12.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_12.json
deleted file mode 100644
index a801f1be414..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_12.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "ttl": 19,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
-                "turns:145.53.168.127:1?transport=udp"
-            ],
-            "credential": "H9Y=",
-            "username": "d=0.v=1.k=2.t=\".r=og"
-        },
-        {
-            "urls": [
-                "turns:123:0?transport=udp",
-                "turn:007.com:0?transport=tcp",
-                "turns:007.com:0?transport=tcp",
-                "turns:123:1"
-            ],
-            "credential": "74w=",
-            "username": "d=3.v=1.k=2.t=~.r=3s"
-        },
-        {
-            "urls": [
-                "turns:007.com:1?transport=tcp",
-                "turn:214.42.57.20:1?transport=tcp",
-                "turns:xn--mgbh0fb.xn--kgbechtv:0"
-            ],
-            "credential": "WaE=",
-            "username": "d=3.v=1.k=2.t=`.r=yyd"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_13.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_13.json
deleted file mode 100644
index a1ca8e60022..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_13.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "ttl": 18,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:a-c:1?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=3.v=1.k=2.t=\u001c.r=5c"
-        },
-        {
-            "urls": [
-                "turn:241.7.138.168:0"
-            ],
-            "credential": "9Uk=",
-            "username": "d=0.v=1.k=2.t=f.r=zac"
-        },
-        {
-            "urls": [
-                "turn:a-c:1?transport=udp",
-                "turns:007.com:1",
-                "turns:12.24.56.118:0"
-            ],
-            "credential": "",
-            "username": "d=3.v=1.k=0.t=\u0008.r=1vf"
-        },
-        {
-            "urls": [
-                "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:1",
-                "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-                "turns:123:1?transport=tcp"
-            ],
-            "credential": "Cpk=",
-            "username": "d=2.v=2.k=0.t=X.r=wt"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_14.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_14.json
deleted file mode 100644
index 78a2acccf24..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_14.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "ttl": 29,
-    "ice_servers": [
-        {
-            "urls": [
-                "turn:9.44.249.238:1?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=3.v=0.k=1.t=\u0006.r=0"
-        },
-        {
-            "urls": [
-                "turn:123:1?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=1.v=3.k=2.t=5.r=wp"
-        },
-        {
-            "urls": [
-                "turn:20.214.247.113:0?transport=udp",
-                "turns:a-c:1?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=2.v=3.k=2.t=\".r=te"
-        },
-        {
-            "urls": [
-                "turns:34.111.158.108:1?transport=udp",
-                "turns:123:0?transport=udp"
-            ],
-            "credential": "gg==",
-            "username": "d=3.v=2.k=2.t=\u0012.r=ew"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_15.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_15.json
deleted file mode 100644
index dbbb286b908..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_15.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "ttl": 19,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:16.13.64.137:0",
-                "turn:host.name:0?transport=udp",
-                "turn:123:1?transport=udp"
-            ],
-            "credential": "gg==",
-            "username": "d=2.v=3.k=0.t=𠧶.r=5"
-        },
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:0",
-                "turn:4.21.222.180:1?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=3.v=1.k=2.t=?.r=6"
-        },
-        {
-            "urls": [
-                "turns:124.52.236.64:0?transport=udp",
-                "turns:007.com:1?transport=udp"
-            ],
-            "credential": "7XQ=",
-            "username": "d=1.v=1.k=0.t=\u0002.r=zxk"
-        },
-        {
-            "urls": [
-                "turns:82.201.209.41:1?transport=tcp",
-                "turns:207.47.251.117:1"
-            ],
-            "credential": "xm4=",
-            "username": "d=3.v=2.k=1.t=\u0002.r=wq"
-        },
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:0",
-                "turn:host.name:1",
-                "turn:81.160.103.101:1?transport=udp",
-                "turns:host.name:1"
-            ],
-            "credential": "FA==",
-            "username": "d=1.v=3.k=0.t=\u0002.r=gh7"
-        },
-        {
-            "urls": [
-                "turns:47.173.209.140:1",
-                "turns:83.54.196.51:0",
-                "turn:123:1?transport=udp"
-            ],
-            "credential": "Ukk=",
-            "username": "d=4.v=0.k=0.t=겡.r=h"
-        },
-        {
-            "urls": [
-                "turns:68.110.78.163:0?transport=udp",
-                "turn:host.name:0"
-            ],
-            "credential": "",
-            "username": "d=1.v=3.k=2.t=𤼇.r=j"
-        },
-        {
-            "urls": [
-                "turn:159.210.176.232:0",
-                "turns:133.116.58.206:0",
-                "turns:195.3.162.153:0?transport=tcp"
-            ],
-            "credential": "4BI=",
-            "username": "d=0.v=2.k=2.t=R.r=wl2"
-        },
-        {
-            "urls": [
-                "turn:109.108.175.177:0?transport=udp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
-                "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=udp",
-                "turn:123:0"
-            ],
-            "credential": "",
-            "username": "d=3.v=0.k=0.t=󲃍.r=asq"
-        },
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=udp",
-                "turns:216.186.129.183:0?transport=tcp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=2.v=0.k=0.t=).r=1t"
-        },
-        {
-            "urls": [
-                "turns:host.name:1",
-                "turn:xn--mgbh0fb.xn--kgbechtv:0",
-                "turns:43.82.5.88:1",
-                "turn:148.225.106.7:1?transport=tcp"
-            ],
-            "credential": "",
-            "username": "d=4.v=3.k=2.t=j.r=t"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_16.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_16.json
deleted file mode 100644
index bec3002e406..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_16.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "ttl": 24,
-    "ice_servers": [
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:0",
-                "turn:a-c:0?transport=udp",
-                "turn:130.9.240.157:0?transport=udp"
-            ],
-            "credential": "wA==",
-            "username": "d=0.v=0.k=1.t=8.r=a"
-        },
-        {
-            "urls": [
-                "turn:a-c:1",
-                "turn:123:0?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=2.v=3.k=1.t=𥾧.r=z"
-        },
-        {
-            "urls": [
-                "turns:123:0?transport=udp",
-                "turn:123:0",
-                "turns:16.76.164.202:1"
-            ],
-            "credential": "",
-            "username": "d=4.v=2.k=0.t=L.r=mt"
-        },
-        {
-            "urls": [
-                "turn:host.name:0"
-            ],
-            "credential": "2A==",
-            "username": "d=0.v=0.k=1.t=\u000e.r=f"
-        },
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp"
-            ],
-            "credential": "",
-            "username": "d=3.v=0.k=0.t=$.r=0c"
-        },
-        {
-            "urls": [
-                "turn:007.com:0?transport=tcp",
-                "turns:host.name:0?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=3.v=2.k=1.t=N.r=url"
-        },
-        {
-            "urls": [
-                "turn:007.com:1?transport=udp",
-                "turn:171.81.187.236:1?transport=tcp",
-                "turns:host.name:0?transport=tcp"
-            ],
-            "credential": "OFI=",
-            "username": "d=3.v=0.k=2.t=𨌁.r=eeq"
-        },
-        {
-            "urls": [
-                "turn:007.com:1",
-                "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:0",
-                "turns:host.name:1?transport=tcp"
-            ],
-            "credential": "jQ==",
-            "username": "d=0.v=3.k=2.t=H.r=s"
-        },
-        {
-            "urls": [
-                "turns:a-c:0"
-            ],
-            "credential": "lBw=",
-            "username": "d=4.v=2.k=0.t=|.r=5"
-        },
-        {
-            "urls": [
-                "turn:242.239.169.126:0?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=2.v=1.k=1.t=#.r=q"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_17.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_17.json
deleted file mode 100644
index 98848885959..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_17.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "ttl": 21,
-    "ice_servers": [
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-                "turns:123:1?transport=tcp",
-                "turn:123:0?transport=udp"
-            ],
-            "credential": "sB8=",
-            "username": "d=0.v=1.k=2.t=E.r=jme"
-        },
-        {
-            "urls": [
-                "turn:host.name:1?transport=udp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:0"
-            ],
-            "credential": "w+c=",
-            "username": "d=0.v=3.k=1.t=#.r=r"
-        },
-        {
-            "urls": [
-                "turns:79.55.124.204:1?transport=udp",
-                "turn:a-c:0",
-                "turns:host.name:1?transport=tcp",
-                "turn:123:0?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=4.v=3.k=2.t=B.r=jn"
-        },
-        {
-            "urls": [
-                "turn:a-c:0?transport=udp",
-                "turns:xn--mgbh0fb.xn--kgbechtv:1",
-                "turn:123:1?transport=udp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=udp"
-            ],
-            "credential": "Ug==",
-            "username": "d=1.v=1.k=2.t=𨝵.r=vp"
-        },
-        {
-            "urls": [
-                "turns:123:0?transport=udp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-                "turns:123:1"
-            ],
-            "credential": "Sg==",
-            "username": "d=0.v=1.k=1.t= .r=c7"
-        },
-        {
-            "urls": [
-                "turns:254.2.228.149:0?transport=tcp",
-                "turns:host.name:1?transport=tcp",
-                "turn:131.78.13.4:1"
-            ],
-            "credential": "KA==",
-            "username": "d=0.v=0.k=2.t=o.r=kbh"
-        },
-        {
-            "urls": [
-                "turn:92.191.110.233:0",
-                "turns:a-c:0",
-                "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=udp"
-            ],
-            "credential": "og==",
-            "username": "d=4.v=0.k=2.t=|.r=b2"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_18.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_18.json
deleted file mode 100644
index 9a3ccda5387..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_18.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "ttl": 26,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:a-c:0"
-            ],
-            "credential": "a0c=",
-            "username": "d=0.v=1.k=0.t=A.r=q"
-        },
-        {
-            "urls": [
-                "turns:007.com:1?transport=tcp",
-                "turn:220.101.0.43:0?transport=tcp",
-                "turn:007.com:0?transport=tcp"
-            ],
-            "credential": "",
-            "username": "d=0.v=0.k=0.t=w.r=s88"
-        },
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=udp",
-                "turns:a-c:0"
-            ],
-            "credential": "dg==",
-            "username": "d=3.v=0.k=0.t=Y.r=sl"
-        },
-        {
-            "urls": [
-                "turns:123:0"
-            ],
-            "credential": "",
-            "username": "d=0.v=3.k=0.t=\u0019.r=c"
-        },
-        {
-            "urls": [
-                "turns:246.153.120.56:0",
-                "turns:host.name:1",
-                "turns:host.name:0?transport=udp",
-                "turn:host.name:0"
-            ],
-            "credential": "",
-            "username": "d=3.v=3.k=0.t=h.r=lkz"
-        },
-        {
-            "urls": [
-                "turns:a-c:1?transport=udp",
-                "turn:206.249.148.39:1",
-                "turn:8.107.15.99:1",
-                "turns:a-c:1?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=4.v=1.k=0.t=顁.r=i"
-        },
-        {
-            "urls": [
-                "turn:123:0?transport=udp"
-            ],
-            "credential": "",
-            "username": "d=3.v=2.k=1.t=}.r=7q5"
-        },
-        {
-            "urls": [
-                "turn:187.61.112.23:0?transport=udp",
-                "turns:a-c:1?transport=tcp",
-                "turns:15.140.51.24:1?transport=tcp",
-                "turns:16.22.166.21:1?transport=tcp"
-            ],
-            "credential": "AhY=",
-            "username": "d=2.v=0.k=2.t=u.r=y7"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_19.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_19.json
deleted file mode 100644
index 6d6e05a2097..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_19.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "ttl": 20,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:007.com:0?transport=tcp"
-            ],
-            "credential": "XA==",
-            "username": "d=4.v=3.k=2.t=\\.r=ku"
-        },
-        {
-            "urls": [
-                "turns:a-c:1?transport=udp",
-                "turns:123:0?transport=tcp"
-            ],
-            "credential": "9Q==",
-            "username": "d=0.v=2.k=1.t=󸵵.r=72s"
-        },
-        {
-            "urls": [
-                "turn:227.193.165.231:1?transport=tcp",
-                "turns:190.161.166.241:0?transport=udp"
-            ],
-            "credential": "Fg==",
-            "username": "d=2.v=1.k=2.t=󴢶.r=lis"
-        },
-        {
-            "urls": [
-                "turns:007.com:1?transport=tcp",
-                "turn:007.com:0?transport=tcp"
-            ],
-            "credential": "uw==",
-            "username": "d=0.v=3.k=1.t=(.r=kf3"
-        },
-        {
-            "urls": [
-                "turn:123:1?transport=tcp",
-                "turn:128.94.55.116:1?transport=tcp",
-                "turns:007.com:1?transport=udp",
-                "turns:a-c:1"
-            ],
-            "credential": "",
-            "username": "d=3.v=2.k=0.t=.r=0"
-        },
-        {
-            "urls": [
-                "turn:007.com:0?transport=udp",
-                "turn:a-c:0",
-                "turn:host.name:1",
-                "turns:149.38.204.147:1"
-            ],
-            "credential": "Rf8=",
-            "username": "d=1.v=0.k=1.t=𫅊.r=4u"
-        },
-        {
-            "urls": [
-                "turns:123:1",
-                "turn:227.57.188.192:1?transport=udp",
-                "turn:180.125.230.159:1"
-            ],
-            "credential": "ubQ=",
-            "username": "d=2.v=0.k=1.t=\u0004.r=fx"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_2.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_2.json
index 2493c095507..b014b0cae25 100644
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_2.json
@@ -1,84 +1,83 @@
 {
-    "ttl": 4,
     "ice_servers": [
         {
+            "credential": "2w==",
             "urls": [
                 "turns:225.27.138.155:0?transport=udp",
                 "turns:226.235.88.44:0?transport=udp",
                 "turns:235.195.120.46:0?transport=tcp",
                 "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=udp"
             ],
-            "credential": "2w==",
             "username": "d=3.v=0.k=1.t=I.r=i3u"
         },
         {
+            "credential": "VA==",
             "urls": [
                 "turn:a-c:1"
             ],
-            "credential": "VA==",
             "username": "d=1.v=3.k=1.t=z.r=x"
         },
         {
+            "credential": "4A==",
             "urls": [
                 "turn:xn--mgbh0fb.xn--kgbechtv:1"
             ],
-            "credential": "4A==",
             "username": "d=1.v=1.k=0.t=(.r=2"
         },
         {
+            "credential": "",
             "urls": [
                 "turns:007.com:0?transport=udp",
                 "turn:82.115.0.150:1?transport=tcp",
                 "turns:172.9.22.21:0?transport=udp"
             ],
-            "credential": "",
             "username": "d=2.v=3.k=0.t=\u0012.r=vp"
         },
         {
+            "credential": "Mw==",
             "urls": [
                 "turns:37.46.50.11:0?transport=tcp",
                 "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp"
             ],
-            "credential": "Mw==",
             "username": "d=2.v=1.k=0.t=􌳃.r=4h4"
         },
         {
+            "credential": "",
             "urls": [
                 "turn:123:1?transport=tcp"
             ],
-            "credential": "",
             "username": "d=4.v=3.k=2.t=w.r=c9l"
         },
         {
+            "credential": "",
             "urls": [
                 "turn:137.180.116.174:0?transport=udp"
             ],
-            "credential": "",
             "username": "d=3.v=1.k=0.t=􅛪.r=h8e"
         },
         {
+            "credential": "",
             "urls": [
                 "turns:007.com:1?transport=tcp",
                 "turn:148.207.99.149:0",
                 "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=udp",
                 "turn:102.41.143.12:0"
             ],
-            "credential": "",
             "username": "d=2.v=1.k=1.t=\u000b.r=cr"
         },
         {
+            "credential": "",
             "urls": [
                 "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=udp"
             ],
-            "credential": "",
             "username": "d=2.v=3.k=2.t=..r=ol0"
         },
         {
+            "credential": "",
             "urls": [
                 "turns:a-c:0?transport=udp",
                 "turns:123:0?transport=tcp"
             ],
-            "credential": "",
             "username": "d=2.v=3.k=0.t=\".r=a"
         }
     ],
@@ -103,5 +102,6 @@
                 "https://example.com"
             ]
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "ttl": 4
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_20.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_20.json
deleted file mode 100644
index 449b62b9964..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_20.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "ttl": 13,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:007.com:0?transport=udp",
-                "turns:47.244.178.201:1?transport=udp",
-                "turn:184.150.97.196:0"
-            ],
-            "credential": "NQ==",
-            "username": "d=2.v=2.k=0.t=𫡌.r=w5"
-        },
-        {
-            "urls": [
-                "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
-                "turns:175.240.38.214:0",
-                "turn:216.115.207.5:1?transport=tcp"
-            ],
-            "credential": "",
-            "username": "d=3.v=1.k=1.t=@.r=q"
-        },
-        {
-            "urls": [
-                "turns:a-c:0?transport=udp",
-                "turns:231.15.14.20:1?transport=udp",
-                "turns:214.144.196.143:1?transport=tcp",
-                "turn:106.250.39.172:1?transport=tcp"
-            ],
-            "credential": "fjs=",
-            "username": "d=3.v=3.k=1.t=..r=js"
-        },
-        {
-            "urls": [
-                "turn:a-c:1?transport=udp",
-                "turns:239.7.100.134:0?transport=udp",
-                "turn:007.com:0?transport=tcp"
-            ],
-            "credential": "NA==",
-            "username": "d=1.v=2.k=0.t=q.r=jq"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_3.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_3.json
index f356cebc319..e7d54f23e79 100644
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_3.json
+++ b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_3.json
@@ -1,119 +1,104 @@
 {
-    "ttl": 9,
     "ice_servers": [
         {
+            "credential": "",
             "urls": [
                 "turn:a-c:0?transport=tcp",
                 "turns:44.242.178.2:1?transport=udp",
                 "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp"
             ],
-            "credential": "",
             "username": "d=0.v=2.k=0.t=\u000c.r=m2s"
         },
         {
+            "credential": "",
             "urls": [
                 "turn:113.127.226.211:1"
             ],
-            "credential": "",
             "username": "d=1.v=0.k=0.t=醬.r=2b"
         },
         {
+            "credential": "Sjk=",
             "urls": [
                 "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=udp",
                 "turn:222.209.199.151:0?transport=udp"
             ],
-            "credential": "Sjk=",
             "username": "d=0.v=1.k=0.t=-.r=w"
         },
         {
+            "credential": "awA=",
             "urls": [
                 "turn:33.214.122.255:0?transport=udp",
                 "turns:007.com:1?transport=tcp"
             ],
-            "credential": "awA=",
             "username": "d=4.v=1.k=0.t=#.r=py"
         },
         {
+            "credential": "jw==",
             "urls": [
                 "turns:72.84.227.18:0?transport=udp",
                 "turn:007.com:0?transport=tcp"
             ],
-            "credential": "jw==",
             "username": "d=1.v=2.k=0.t=$.r=l1f"
         },
         {
+            "credential": "hQ==",
             "urls": [
                 "turns:75.117.151.157:1?transport=udp",
                 "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=udp",
                 "turn:host.name:1?transport=tcp",
                 "turn:007.com:0?transport=tcp"
             ],
-            "credential": "hQ==",
             "username": "d=2.v=2.k=0.t={.r=kke"
         },
         {
+            "credential": "mHw=",
             "urls": [
                 "turn:123:1",
                 "turn:53.242.117.37:1",
                 "turn:xn--mgbh0fb.xn--kgbechtv:0"
             ],
-            "credential": "mHw=",
             "username": "d=0.v=2.k=0.t=Z.r=8"
         },
         {
+            "credential": "",
             "urls": [
                 "turn:148.8.193.103:1",
                 "turns:host.name:0?transport=udp"
             ],
-            "credential": "",
             "username": "d=1.v=2.k=1.t=^.r=shf"
         },
         {
+            "credential": "FU0=",
             "urls": [
                 "turns:host.name:1?transport=tcp",
                 "turn:159.246.220.178:1?transport=tcp"
             ],
-            "credential": "FU0=",
             "username": "d=4.v=3.k=0.t=d.r=x5"
         },
         {
+            "credential": "1Q==",
             "urls": [
                 "turns:007.com:0?transport=tcp"
             ],
-            "credential": "1Q==",
             "username": "d=4.v=2.k=2.t=q.r=v"
         },
         {
+            "credential": "",
             "urls": [
                 "turn:243.183.34.181:1?transport=udp",
                 "turns:123:0",
                 "turns:host.name:0?transport=tcp",
                 "turns:123:0"
             ],
-            "credential": "",
             "username": "d=1.v=3.k=1.t=\u0008.r=8"
         }
     ],
     "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
         {
             "urls": [
                 "https://example.com"
             ]
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "ttl": 9
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_4.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_4.json
index e5483fa1fae..998290527c3 100644
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_4.json
+++ b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_4.json
@@ -1,14 +1,13 @@
 {
-    "ttl": 2,
     "ice_servers": [
         {
+            "credential": "",
             "urls": [
                 "turns:248.187.155.126:1",
                 "turn:166.155.90.230:0?transport=tcp",
                 "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
                 "turn:host.name:1?transport=tcp"
             ],
-            "credential": "",
             "username": "d=2.v=0.k=0.t=󷁝.r=tj"
         }
     ],
@@ -63,5 +62,6 @@
                 "https://example.com"
             ]
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "ttl": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_5.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_5.json
index 5d14b40c205..a30d0cef90f 100644
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_5.json
+++ b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_5.json
@@ -1,47 +1,22 @@
 {
-    "ttl": 12,
     "ice_servers": [
         {
-            "urls": [
-                "turns:host.name:1",
-                "turns:host.name:0",
-                "turns:80.25.165.101:1?transport=tcp",
-                "turns:a-c:0?transport=udp"
-            ],
-            "credential": "dvI=",
-            "username": "d=2.v=2.k=0.t={.r=5m7"
-        },
-        {
-            "urls": [
-                "turn:123:0?transport=tcp"
-            ],
-            "credential": "cCU=",
-            "username": "d=1.v=0.k=2.t=󴱴.r=x"
-        },
-        {
-            "urls": [
-                "turn:007.com:1?transport=udp",
-                "turns:007.com:1?transport=udp",
-                "turn:007.com:1?transport=tcp",
-                "turn:123:1?transport=tcp"
-            ],
             "credential": "",
-            "username": "d=0.v=0.k=1.t=\u0012.r=r5n"
-        },
-        {
             "urls": [
-                "turns:73.195.120.125:1?transport=udp",
-                "turn:a-c:0"
+                "turns:248.187.155.126:1",
+                "turn:166.155.90.230:0?transport=tcp",
+                "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
+                "turn:host.name:1?transport=tcp"
             ],
-            "credential": "Mw==",
-            "username": "d=2.v=1.k=1.t=.r=8f"
-        },
+            "username": "d=2.v=0.k=0.t=󷁝.r=tj"
+        }
+    ],
+    "sft_servers": [
         {
             "urls": [
-                "turn:134.245.76.176:0"
-            ],
-            "credential": "W/E=",
-            "username": "d=1.v=1.k=2.t=m.r=e1"
+                "https://example.com"
+            ]
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "ttl": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_6.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_6.json
index fec99e3654a..4cb2d490d7d 100644
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_6.json
+++ b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_6.json
@@ -1,60 +1,15 @@
 {
-    "ttl": 26,
     "ice_servers": [
         {
-            "urls": [
-                "turn:149.161.183.205:0",
-                "turn:host.name:1?transport=tcp",
-                "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=udp",
-                "turn:92.128.67.225:0?transport=tcp"
-            ],
             "credential": "",
-            "username": "d=1.v=1.k=1.t=Q.r=de"
-        },
-        {
             "urls": [
-                "turns:118.170.44.54:0?transport=tcp",
-                "turn:xn--mgbh0fb.xn--kgbechtv:1"
+                "turns:248.187.155.126:1",
+                "turn:166.155.90.230:0?transport=tcp",
+                "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
+                "turn:host.name:1?transport=tcp"
             ],
-            "credential": "N2I=",
-            "username": "d=0.v=3.k=2.t=萅.r=bi"
+            "username": "d=2.v=0.k=0.t=󷁝.r=tj"
         }
     ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
+    "ttl": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_7.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_7.json
deleted file mode 100644
index 74296b961c0..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_7.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "ttl": 28,
-    "ice_servers": [
-        {
-            "urls": [
-                "turn:44.1.165.236:1"
-            ],
-            "credential": "",
-            "username": "d=0.v=0.k=2.t=H.r=a6m"
-        },
-        {
-            "urls": [
-                "turns:host.name:1",
-                "turn:11.96.91.17:0?transport=tcp",
-                "turns:host.name:0"
-            ],
-            "credential": "",
-            "username": "d=3.v=0.k=0.t=e.r=lp"
-        },
-        {
-            "urls": [
-                "turn:123:0?transport=udp",
-                "turn:13.23.57.118:0?transport=tcp"
-            ],
-            "credential": "7w==",
-            "username": "d=4.v=2.k=0.t=&.r=8et"
-        },
-        {
-            "urls": [
-                "turn:007.com:0?transport=tcp",
-                "turn:host.name:0?transport=tcp",
-                "turn:a-c:1?transport=udp",
-                "turn:007.com:1"
-            ],
-            "credential": "0Ow=",
-            "username": "d=0.v=2.k=1.t=\u0011.r=7ap"
-        },
-        {
-            "urls": [
-                "turn:host.name:1",
-                "turns:135.209.223.40:0",
-                "turn:173.139.89.251:1?transport=udp"
-            ],
-            "credential": "ag==",
-            "username": "d=0.v=2.k=1.t=X.r=g9"
-        },
-        {
-            "urls": [
-                "turns:a-c:0?transport=udp"
-            ],
-            "credential": "ZQ==",
-            "username": "d=3.v=3.k=0.t=\u0005.r=xlk"
-        },
-        {
-            "urls": [
-                "turns:007.com:0?transport=tcp",
-                "turn:a-c:0?transport=tcp",
-                "turns:a-c:0"
-            ],
-            "credential": "Tw==",
-            "username": "d=0.v=1.k=1.t=B.r=h"
-        },
-        {
-            "urls": [
-                "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp"
-            ],
-            "credential": "yQ==",
-            "username": "d=2.v=2.k=0.t=F.r=x"
-        },
-        {
-            "urls": [
-                "turns:99.124.6.72:0?transport=tcp"
-            ],
-            "credential": "vWc=",
-            "username": "d=4.v=2.k=0.t=l.r=b"
-        },
-        {
-            "urls": [
-                "turns:86.184.243.74:0",
-                "turns:244.0.87.83:1?transport=tcp",
-                "turn:59.44.234.164:0?transport=tcp",
-                "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=udp"
-            ],
-            "credential": "wQ==",
-            "username": "d=0.v=2.k=0.t=2.r=178"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_8.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_8.json
deleted file mode 100644
index 086f71bb86a..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_8.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "ttl": 28,
-    "ice_servers": [
-        {
-            "urls": [
-                "turn:a-c:1?transport=tcp",
-                "turns:117.96.79.180:1?transport=udp",
-                "turns:007.com:0?transport=tcp"
-            ],
-            "credential": "",
-            "username": "d=4.v=0.k=1.t=ᴮ.r=ky"
-        },
-        {
-            "urls": [
-                "turn:a-c:1?transport=udp",
-                "turns:248.107.4.38:1?transport=udp",
-                "turns:host.name:0?transport=udp"
-            ],
-            "credential": "2g==",
-            "username": "d=2.v=2.k=1.t=V.r=2e"
-        },
-        {
-            "urls": [
-                "turn:129.183.147.71:1?transport=tcp"
-            ],
-            "credential": "",
-            "username": "d=2.v=1.k=1.t=+.r=ae3"
-        },
-        {
-            "urls": [
-                "turns:007.com:1?transport=udp",
-                "turns:007.com:0",
-                "turns:123:0"
-            ],
-            "credential": "gnU=",
-            "username": "d=1.v=1.k=1.t=~.r=081"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_9.json b/libs/wire-api/test/golden/testObject_RTCConfiguration_user_9.json
deleted file mode 100644
index 447bed928fc..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCConfiguration_user_9.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-    "ttl": 13,
-    "ice_servers": [
-        {
-            "urls": [
-                "turns:007.com:0?transport=tcp",
-                "turns:007.com:0?transport=udp",
-                "turns:host.name:1?transport=tcp"
-            ],
-            "credential": "X9k=",
-            "username": "d=2.v=1.k=2.t=𛊃.r=1h"
-        },
-        {
-            "urls": [
-                "turn:123:0",
-                "turn:007.com:0?transport=tcp",
-                "turns:22.129.108.184:1",
-                "turns:host.name:0?transport=udp"
-            ],
-            "credential": "og==",
-            "username": "d=0.v=0.k=1.t=窱.r=5ku"
-        },
-        {
-            "urls": [
-                "turns:123:0?transport=tcp"
-            ],
-            "credential": "ow==",
-            "username": "d=4.v=0.k=1.t=\u0001.r=ar"
-        },
-        {
-            "urls": [
-                "turns:164.254.14.80:1?transport=udp"
-            ],
-            "credential": "tNQ=",
-            "username": "d=3.v=0.k=0.t=\u0014.r=hc"
-        },
-        {
-            "urls": [
-                "turns:host.name:1?transport=udp",
-                "turns:a-c:0?transport=tcp",
-                "turns:007.com:1?transport=udp",
-                "turn:171.181.144.124:1?transport=udp"
-            ],
-            "credential": "7Ng=",
-            "username": "d=0.v=1.k=1.t=\u0012.r=vq"
-        },
-        {
-            "urls": [
-                "turns:007.com:0",
-                "turns:94.219.124.35:1?transport=tcp"
-            ],
-            "credential": "Qw==",
-            "username": "d=1.v=1.k=0.t=c.r=zc"
-        }
-    ],
-    "sft_servers": [
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        },
-        {
-            "urls": [
-                "https://example.com"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_1.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_1.json
index 9f18474a92d..66b8a66920b 100644
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RTCIceServer_user_1.json
@@ -1,4 +1,5 @@
 {
+    "credential": "ZtBPgUaUYg==",
     "urls": [
         "turn:118.129.179.126:2?transport=tcp",
         "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
@@ -9,6 +10,5 @@
         "turn:161.156.122.7:0?transport=tcp",
         "turns:125.103.68.5:1?transport=tcp"
     ],
-    "credential": "ZtBPgUaUYg==",
     "username": "d=38.v=4.k=24.t=\u0011.r=6vgzfba"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_10.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_10.json
deleted file mode 100644
index 503afe8a4b3..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_10.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "urls": [
-        "turns:a-c:1"
-    ],
-    "credential": "BaDPJOg=",
-    "username": "d=225.v=5.k=17.t=􊚗.r=ywvp0wy"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_11.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_11.json
deleted file mode 100644
index 310d3bf3cef..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_11.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "urls": [
-        "turn:xn--mgbh0fb.xn--kgbechtv:2?transport=tcp"
-    ],
-    "credential": "+DJTWlqizw==",
-    "username": "d=82.v=10.k=2.t=􃎙.r=um7wu"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_12.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_12.json
deleted file mode 100644
index b893844c01f..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_12.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "urls": [
-        "turn:195.42.42.234:0",
-        "turns:123:1",
-        "turn:host.name:0?transport=udp"
-    ],
-    "credential": "Bhm/vUAzRQ==",
-    "username": "d=195.v=7.k=8.t=6.r=50buvxyh"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_13.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_13.json
deleted file mode 100644
index f55267dbb1d..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_13.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "urls": [
-        "turns:159.6.46.79:1",
-        "turns:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
-        "turns:xn--mgbh0fb.xn--kgbechtv:2?transport=udp",
-        "turn:235.192.126.115:2?transport=udp",
-        "turns:a-c:2?transport=tcp",
-        "turn:host.name:1?transport=tcp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:2?transport=tcp",
-        "turn:007.com:1?transport=tcp"
-    ],
-    "credential": "y0JeDGJm",
-    "username": "d=98.v=10.k=17.t=𪾤.r=dur1kszw"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_14.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_14.json
deleted file mode 100644
index 5b8aaa021d3..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_14.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "urls": [
-        "turns:33.104.116.89:0?transport=tcp",
-        "turns:132.193.82.132:2",
-        "turns:78.0.56.210:2?transport=tcp",
-        "turn:a-c:0?transport=udp",
-        "turns:a-c:2?transport=udp"
-    ],
-    "credential": "06HqENnz",
-    "username": "d=129.v=0.k=4.t=/.r=5tjy"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_15.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_15.json
deleted file mode 100644
index 44eec4acd8f..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_15.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "urls": [
-        "turns:24.131.95.46:0?transport=tcp",
-        "turn:72.121.208.204:1?transport=udp",
-        "turns:127.13.25.233:2?transport=tcp",
-        "turn:123:1?transport=tcp",
-        "turn:240.77.56.253:2?transport=tcp",
-        "turns:48.254.19.119:2?transport=tcp"
-    ],
-    "credential": "uxE=",
-    "username": "d=238.v=1.k=27.t=v.r=ws"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_16.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_16.json
deleted file mode 100644
index f959e27202a..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_16.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "urls": [
-        "turns:host.name:2?transport=tcp",
-        "turns:143.97.234.91:1?transport=tcp",
-        "turns:175.19.223.168:1?transport=tcp",
-        "turn:007.com:2?transport=tcp"
-    ],
-    "credential": "Mw==",
-    "username": "d=54.v=4.k=11.t=탚.r=d0s3a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_17.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_17.json
deleted file mode 100644
index 8cb9eb43079..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_17.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "urls": [
-        "turns:123:2?transport=tcp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:0",
-        "turn:169.70.61.106:0",
-        "turn:xn--mgbh0fb.xn--kgbechtv:2",
-        "turn:40.231.247.70:0?transport=tcp",
-        "turn:a-c:2",
-        "turn:164.220.43.156:1"
-    ],
-    "credential": "f8wvNtPhU94A",
-    "username": "d=81.v=8.k=30.t=}.r=5nxg"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_18.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_18.json
deleted file mode 100644
index 8f193b0c1c7..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_18.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "urls": [
-        "turns:123:0",
-        "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=udp",
-        "turns:a-c:0?transport=udp",
-        "turn:host.name:0?transport=tcp",
-        "turns:host.name:1?transport=udp",
-        "turn:host.name:2?transport=udp",
-        "turns:a-c:2",
-        "turns:184.63.122.24:0?transport=tcp",
-        "turns:123:1",
-        "turns:a-c:1?transport=udp",
-        "turns:117.242.195.170:0?transport=tcp"
-    ],
-    "credential": "mQ==",
-    "username": "d=24.v=7.k=5.t=\\.r=jjx53c65i"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_19.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_19.json
deleted file mode 100644
index 4a0b2ab2a43..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_19.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "urls": [
-        "turns:host.name:0?transport=udp",
-        "turn:a-c:1?transport=udp",
-        "turns:007.com:2?transport=tcp",
-        "turns:host.name:1?transport=tcp",
-        "turn:a-c:1?transport=udp",
-        "turns:123:1?transport=udp",
-        "turns:169.100.145.5:0?transport=tcp",
-        "turn:221.45.182.44:2?transport=udp",
-        "turn:a-c:1?transport=udp"
-    ],
-    "credential": "eA5FI9S6Ow==",
-    "username": "d=249.v=5.k=29.t=쨧.r=a7hqal0n"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_2.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_2.json
index cdca3f68f70..31679569a86 100644
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RTCIceServer_user_2.json
@@ -1,15 +1,7 @@
 {
+    "credential": "d1VUzpxZ3TeM",
     "urls": [
-        "turn:108.37.81.160:0?transport=tcp",
-        "turn:147.240.166.49:0?transport=tcp",
-        "turns:007.com:0?transport=udp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:2",
-        "turns:242.214.187.48:0?transport=udp",
-        "turn:host.name:2?transport=udp",
-        "turn:228.51.14.158:1?transport=udp",
-        "turns:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-        "turn:host.name:0?transport=udp"
+        "turn:108.37.81.160:0?transport=tcp"
     ],
-    "credential": "d1VUzpxZ3TeM",
     "username": "d=3.v=5.k=24.t=\u0001.r=a8kdffu4"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_20.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_20.json
deleted file mode 100644
index 3b1418990c2..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_20.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "urls": [
-        "turns:119.72.79.226:2?transport=udp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=udp",
-        "turns:165.153.82.29:2?transport=tcp",
-        "turns:a-c:1?transport=udp",
-        "turn:233.158.218.205:2?transport=udp"
-    ],
-    "credential": "o3sXZAOB",
-    "username": "d=119.v=3.k=30.t=&.r=hdgi3apt"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_3.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_3.json
deleted file mode 100644
index 0c5f9bc7bca..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_3.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "urls": [
-        "turns:123:2?transport=tcp",
-        "turns:007.com:0?transport=udp",
-        "turn:a-c:0?transport=udp",
-        "turns:007.com:2",
-        "turn:007.com:1?transport=tcp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-        "turns:xn--mgbh0fb.xn--kgbechtv:0",
-        "turns:72.203.31.79:2",
-        "turns:host.name:0",
-        "turn:007.com:2?transport=tcp"
-    ],
-    "credential": "jw==",
-    "username": "d=133.v=9.k=16.t=^.r=l9mr"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_4.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_4.json
deleted file mode 100644
index a1cb71b4283..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "urls": [
-        "turns:37.223.75.78:1?transport=udp",
-        "turns:host.name:1?transport=tcp",
-        "turns:123:0?transport=udp",
-        "turn:host.name:2"
-    ],
-    "credential": "jHf3PRvglQ==",
-    "username": "d=90.v=3.k=12.t=).r=rcz"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_5.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_5.json
deleted file mode 100644
index e10e2b866d6..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "urls": [
-        "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=tcp",
-        "turn:a-c:1?transport=tcp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=udp",
-        "turns:host.name:2?transport=udp",
-        "turn:103.196.217.16:2?transport=udp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:1?transport=udp",
-        "turn:host.name:1?transport=udp"
-    ],
-    "credential": "9+ems/6Fv0M=",
-    "username": "d=178.v=0.k=30.t=r.r=gwihax"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_6.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_6.json
deleted file mode 100644
index 360e9de1823..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_6.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "urls": [
-        "turns:196.170.89.170:1?transport=udp"
-    ],
-    "credential": "b76sRlk=",
-    "username": "d=231.v=9.k=4.t=b.r=z2j8s7exhz"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_7.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_7.json
deleted file mode 100644
index d6be3e64981..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_7.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "urls": [
-        "turns:007.com:0?transport=tcp",
-        "turn:123:2?transport=udp",
-        "turn:host.name:2",
-        "turn:a-c:0",
-        "turn:xn--mgbh0fb.xn--kgbechtv:2?transport=udp",
-        "turns:a-c:2?transport=udp"
-    ],
-    "credential": "ft8iuA==",
-    "username": "d=14.v=4.k=2.t=󵪤.r=f4x"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_8.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_8.json
deleted file mode 100644
index 8819a43c6eb..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_8.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "urls": [
-        "turn:007.com:2?transport=tcp",
-        "turns:host.name:0?transport=tcp",
-        "turns:89.93.38.11:1?transport=udp",
-        "turns:83.231.206.233:1",
-        "turn:a-c:2",
-        "turn:57.223.15.28:0?transport=udp",
-        "turn:85.102.29.140:1?transport=udp",
-        "turn:xn--mgbh0fb.xn--kgbechtv:0?transport=tcp",
-        "turns:95.11.213.169:1?transport=tcp"
-    ],
-    "credential": "6eRp29c2znw/",
-    "username": "d=121.v=6.k=18.t=𠘿.r=wbfglz"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RTCIceServer_user_9.json b/libs/wire-api/test/golden/testObject_RTCIceServer_user_9.json
deleted file mode 100644
index 9f1f23e35f7..00000000000
--- a/libs/wire-api/test/golden/testObject_RTCIceServer_user_9.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "urls": [
-        "turns:248.142.46.235:2?transport=tcp",
-        "turn:12.224.132.41:0",
-        "turn:234.126.43.235:2?transport=udp",
-        "turn:221.57.91.255:1?transport=udp",
-        "turns:007.com:1?transport=tcp"
-    ],
-    "credential": "nzZx",
-    "username": "d=137.v=10.k=31.t=0.r=9jwt1"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_1.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_1.json
index 711a3c8c122..8fb988b5287 100644
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ReceiptMode_user_1.json
@@ -1 +1 @@
--7082
\ No newline at end of file
+-7082
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_10.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_10.json
deleted file mode 100644
index cb5786cc255..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-26421
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_11.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_11.json
deleted file mode 100644
index 21c98be13b2..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-15484
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_12.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_12.json
deleted file mode 100644
index fbf9a8f46d4..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
--30165
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_13.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_13.json
deleted file mode 100644
index ee67fd93ea2..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-29422
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_14.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_14.json
deleted file mode 100644
index 4128844969f..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
--31044
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_15.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_15.json
deleted file mode 100644
index 23854715633..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-14938
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_16.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_16.json
deleted file mode 100644
index 8083ab26c7e..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-28863
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_17.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_17.json
deleted file mode 100644
index f65b5ada072..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-23112
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_18.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_18.json
deleted file mode 100644
index 40af6a8a32b..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
--11526
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_19.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_19.json
deleted file mode 100644
index 14775327afe..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
--25254
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_2.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_2.json
index 08036879ca3..47c9d2993dc 100644
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ReceiptMode_user_2.json
@@ -1 +1 @@
--15373
\ No newline at end of file
+19461
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_20.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_20.json
deleted file mode 100644
index 26a1bdc0edd..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
--15487
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_3.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_3.json
deleted file mode 100644
index a814ba14abd..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-19461
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_4.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_4.json
deleted file mode 100644
index 6528812f5c9..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
--21550
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_5.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_5.json
deleted file mode 100644
index 983ddcf551e..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
--2657
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_6.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_6.json
deleted file mode 100644
index 8832bf180fd..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
--29406
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_7.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_7.json
deleted file mode 100644
index 3febbab7ae3..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-26169
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_8.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_8.json
deleted file mode 100644
index 07e9b82587c..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-7835
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ReceiptMode_user_9.json b/libs/wire-api/test/golden/testObject_ReceiptMode_user_9.json
deleted file mode 100644
index c0d78365d2a..00000000000
--- a/libs/wire-api/test/golden/testObject_ReceiptMode_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-30914
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_1.json b/libs/wire-api/test/golden/testObject_Relation_user_1.json
index 6129d1b45dc..795c3ededa5 100644
--- a/libs/wire-api/test/golden/testObject_Relation_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Relation_user_1.json
@@ -1 +1 @@
-"accepted"
\ No newline at end of file
+"accepted"
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_10.json b/libs/wire-api/test/golden/testObject_Relation_user_10.json
deleted file mode 100644
index 1207dcd9a2f..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"cancelled"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_11.json b/libs/wire-api/test/golden/testObject_Relation_user_11.json
deleted file mode 100644
index 6129d1b45dc..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"accepted"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_12.json b/libs/wire-api/test/golden/testObject_Relation_user_12.json
deleted file mode 100644
index 6129d1b45dc..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"accepted"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_13.json b/libs/wire-api/test/golden/testObject_Relation_user_13.json
deleted file mode 100644
index 6129d1b45dc..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"accepted"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_14.json b/libs/wire-api/test/golden/testObject_Relation_user_14.json
deleted file mode 100644
index 803c0b55da5..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"ignored"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_15.json b/libs/wire-api/test/golden/testObject_Relation_user_15.json
deleted file mode 100644
index 647981f717c..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"pending"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_16.json b/libs/wire-api/test/golden/testObject_Relation_user_16.json
deleted file mode 100644
index 616a7e954e2..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"blocked"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_17.json b/libs/wire-api/test/golden/testObject_Relation_user_17.json
deleted file mode 100644
index 1207dcd9a2f..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"cancelled"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_18.json b/libs/wire-api/test/golden/testObject_Relation_user_18.json
deleted file mode 100644
index 1207dcd9a2f..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"cancelled"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_19.json b/libs/wire-api/test/golden/testObject_Relation_user_19.json
deleted file mode 100644
index 1207dcd9a2f..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"cancelled"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_2.json b/libs/wire-api/test/golden/testObject_Relation_user_2.json
index 647981f717c..de35d13e570 100644
--- a/libs/wire-api/test/golden/testObject_Relation_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Relation_user_2.json
@@ -1 +1 @@
-"pending"
\ No newline at end of file
+"blocked"
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_20.json b/libs/wire-api/test/golden/testObject_Relation_user_20.json
deleted file mode 100644
index ee1e581b68c..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"missing-legalhold-consent"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_3.json b/libs/wire-api/test/golden/testObject_Relation_user_3.json
index 1207dcd9a2f..06f7c5eb6f9 100644
--- a/libs/wire-api/test/golden/testObject_Relation_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Relation_user_3.json
@@ -1 +1 @@
-"cancelled"
\ No newline at end of file
+"pending"
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_4.json b/libs/wire-api/test/golden/testObject_Relation_user_4.json
index 6129d1b45dc..51fe0039a01 100644
--- a/libs/wire-api/test/golden/testObject_Relation_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Relation_user_4.json
@@ -1 +1 @@
-"accepted"
\ No newline at end of file
+"ignored"
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_5.json b/libs/wire-api/test/golden/testObject_Relation_user_5.json
index 616a7e954e2..2f0ee338983 100644
--- a/libs/wire-api/test/golden/testObject_Relation_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Relation_user_5.json
@@ -1 +1 @@
-"blocked"
\ No newline at end of file
+"sent"
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_6.json b/libs/wire-api/test/golden/testObject_Relation_user_6.json
index 647981f717c..0e321f29f07 100644
--- a/libs/wire-api/test/golden/testObject_Relation_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Relation_user_6.json
@@ -1 +1 @@
-"pending"
\ No newline at end of file
+"cancelled"
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_7.json b/libs/wire-api/test/golden/testObject_Relation_user_7.json
index bd64b292d35..7c00f086f2f 100644
--- a/libs/wire-api/test/golden/testObject_Relation_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Relation_user_7.json
@@ -1 +1 @@
-"sent"
\ No newline at end of file
+"missing-legalhold-consent"
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_8.json b/libs/wire-api/test/golden/testObject_Relation_user_8.json
deleted file mode 100644
index 616a7e954e2..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"blocked"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Relation_user_9.json b/libs/wire-api/test/golden/testObject_Relation_user_9.json
deleted file mode 100644
index 1207dcd9a2f..00000000000
--- a/libs/wire-api/test/golden/testObject_Relation_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"cancelled"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_1.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_1.json
index 3190b63742c..2bd38208dc9 100644
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_1.json
@@ -1,44 +1,7 @@
 {
     "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00003ab8-0000-0cff-0000-427f000000df"
-        },
         "conversation": "00003ab8-0000-0cff-0000-427f000000df",
-        "time": "1864-05-07T01:13:35.741Z",
         "data": {
-            "user_ids": [
-                "000038c1-0000-4a9c-0000-511300004c8b",
-                "00003111-0000-2620-0000-1c8800000ea0",
-                "00000de2-0000-6a83-0000-094b00007b02",
-                "00001203-0000-7200-0000-7f8600001824",
-                "0000412f-0000-6e53-0000-6fde00001ffa",
-                "000035d8-0000-190b-0000-3f6a00004698",
-                "00004a5d-0000-1532-0000-7c0f000057a8",
-                "00001eda-0000-7b4f-0000-35d800001e6f",
-                "000079aa-0000-1359-0000-42b8000036a9",
-                "00001b31-0000-356b-0000-379b000048ef",
-                "0000649d-0000-04a0-0000-6dac00001c6d",
-                "00003a75-0000-6289-0000-274d00001220",
-                "00003ffb-0000-1dcc-0000-3ad40000209c",
-                "00007243-0000-40bf-0000-6cd1000079ca",
-                "000003ef-0000-0ac8-0000-1a060000698d",
-                "00005a61-0000-3900-0000-4b5d00007ea6",
-                "00001ebb-0000-22ef-0000-4df700007541",
-                "00005dc2-0000-68ba-0000-2bd0000010a8",
-                "00001e9c-0000-24ba-0000-0f8e000016b6",
-                "0000480d-0000-0b25-0000-6f8700001bcf",
-                "00006d2e-0000-7890-0000-77e600007c77",
-                "00005702-0000-2392-0000-643e00000389",
-                "000041a6-0000-52a9-0000-41ce00003ead",
-                "000026a1-0000-0fd3-0000-4aa2000012e7",
-                "00000820-0000-54c4-0000-48490000065b",
-                "000026ea-0000-4310-0000-7c61000078ea",
-                "00005134-0000-19cc-0000-32fe00006ccb",
-                "00006c9f-0000-5750-0000-3d5c00000149",
-                "00004772-0000-793d-0000-0b4d0000087f",
-                "000074ee-0000-5b53-0000-640000005536"
-            ],
             "qualified_user_ids": [
                 {
                     "domain": "faraway.example.com",
@@ -47,126 +10,23 @@
                 {
                     "domain": "faraway.example.com",
                     "id": "00003111-0000-2620-0000-1c8800000ea0"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00000de2-0000-6a83-0000-094b00007b02"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00001203-0000-7200-0000-7f8600001824"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "0000412f-0000-6e53-0000-6fde00001ffa"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "000035d8-0000-190b-0000-3f6a00004698"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00004a5d-0000-1532-0000-7c0f000057a8"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00001eda-0000-7b4f-0000-35d800001e6f"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "000079aa-0000-1359-0000-42b8000036a9"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00001b31-0000-356b-0000-379b000048ef"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "0000649d-0000-04a0-0000-6dac00001c6d"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00003a75-0000-6289-0000-274d00001220"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00003ffb-0000-1dcc-0000-3ad40000209c"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00007243-0000-40bf-0000-6cd1000079ca"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "000003ef-0000-0ac8-0000-1a060000698d"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00005a61-0000-3900-0000-4b5d00007ea6"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00001ebb-0000-22ef-0000-4df700007541"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00005dc2-0000-68ba-0000-2bd0000010a8"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00001e9c-0000-24ba-0000-0f8e000016b6"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "0000480d-0000-0b25-0000-6f8700001bcf"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00006d2e-0000-7890-0000-77e600007c77"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00005702-0000-2392-0000-643e00000389"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "000041a6-0000-52a9-0000-41ce00003ead"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "000026a1-0000-0fd3-0000-4aa2000012e7"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00000820-0000-54c4-0000-48490000065b"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "000026ea-0000-4310-0000-7c61000078ea"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00005134-0000-19cc-0000-32fe00006ccb"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00006c9f-0000-5750-0000-3d5c00000149"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "00004772-0000-793d-0000-0b4d0000087f"
-                },
-                {
-                    "domain": "faraway.example.com",
-                    "id": "000074ee-0000-5b53-0000-640000005536"
                 }
+            ],
+            "user_ids": [
+                "000038c1-0000-4a9c-0000-511300004c8b",
+                "00003111-0000-2620-0000-1c8800000ea0"
             ]
         },
         "from": "00004166-0000-1e32-0000-52cb0000428d",
+        "qualified_conversation": {
+            "domain": "faraway.example.com",
+            "id": "00003ab8-0000-0cff-0000-427f000000df"
+        },
         "qualified_from": {
             "domain": "faraway.example.com",
             "id": "00004166-0000-1e32-0000-52cb0000428d"
         },
+        "time": "1864-05-07T01:13:35.741Z",
         "type": "conversation.member-leave"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_10.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_10.json
deleted file mode 100644
index f36ebe29fd3..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_10.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00005788-0000-327b-0000-7ef80000017e"
-        },
-        "conversation": "00005788-0000-327b-0000-7ef80000017e",
-        "time": "1864-04-11T02:49:27.442Z",
-        "data": {
-            "status": "started"
-        },
-        "from": "0000588d-0000-6704-0000-153f00001692",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "0000588d-0000-6704-0000-153f00001692"
-        },
-        "type": "conversation.typing"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_11.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_11.json
deleted file mode 100644
index 02837917937..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_11.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00001db4-0000-575c-0000-5b9200002c33"
-        },
-        "conversation": "00001db4-0000-575c-0000-5b9200002c33",
-        "time": "1864-05-25T16:08:53.052Z",
-        "data": {
-            "name": "\u0017𦙤𧉁>P2L𫐫x􆞻􇙌󱟱T𥄢0)y󵅽\u0016"
-        },
-        "from": "000009b3-0000-04dc-0000-310100002b5f",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "000009b3-0000-04dc-0000-310100002b5f"
-        },
-        "type": "conversation.rename"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_12.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_12.json
deleted file mode 100644
index cd6295e633f..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_12.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00004c29-0000-0214-0000-1d7300001cdc"
-        },
-        "conversation": "00004c29-0000-0214-0000-1d7300001cdc",
-        "time": "1864-04-23T00:31:51.842Z",
-        "data": {
-            "email": "}Y􆧂]?吝o",
-            "name": null,
-            "message": "\u0019{ze;RY",
-            "recipient": "00000002-0000-0005-0000-000100000007"
-        },
-        "from": "00003ba8-0000-448c-0000-769e00004cdf",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00003ba8-0000-448c-0000-769e00004cdf"
-        },
-        "type": "conversation.connect-request"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_13.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_13.json
deleted file mode 100644
index 4305fa47343..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_13.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "000062a2-0000-46ad-0000-0f8100005bbe"
-        },
-        "conversation": "000062a2-0000-46ad-0000-0f8100005bbe",
-        "time": "1864-05-06T22:47:56.147Z",
-        "data": {
-            "message_timer": null
-        },
-        "from": "000065a2-0000-1aaa-0000-311000003d69",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "000065a2-0000-1aaa-0000-311000003d69"
-        },
-        "type": "conversation.message-timer-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_14.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_14.json
deleted file mode 100644
index 6d1d6aa5dec..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_14.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "0000060f-0000-6d7d-0000-33a800005d07"
-        },
-        "conversation": "0000060f-0000-6d7d-0000-33a800005d07",
-        "time": "1864-04-21T02:44:02.145Z",
-        "data": {
-            "key": "AbM=P0Cv1K3WFwJLU6eg",
-            "code": "z3MqXFfMRMlMeTim7025"
-        },
-        "from": "00005c4c-0000-226a-0000-04b70000100a",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00005c4c-0000-226a-0000-04b70000100a"
-        },
-        "type": "conversation.code-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_15.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_15.json
deleted file mode 100644
index c4c6da8c5a1..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_15.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00006421-0000-0363-0000-192100003398"
-        },
-        "conversation": "00006421-0000-0363-0000-192100003398",
-        "time": "1864-04-30T23:29:02.240Z",
-        "data": {
-            "message_timer": 8977358108702637
-        },
-        "from": "000005cd-0000-7897-0000-1fc700002d35",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "000005cd-0000-7897-0000-1fc700002d35"
-        },
-        "type": "conversation.message-timer-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_16.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_16.json
deleted file mode 100644
index 4e8b454c83d..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_16.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "0000067f-0000-0d9b-0000-039f0000033f"
-        },
-        "conversation": "0000067f-0000-0d9b-0000-039f0000033f",
-        "time": "1864-04-27T19:16:49.866Z",
-        "data": {
-            "uri": "https://example.com",
-            "key": "E=ljiXAMvwAYiYxy3jSG",
-            "code": "=X8_OGM09"
-        },
-        "from": "0000030b-0000-5943-0000-6cd900006eae",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "0000030b-0000-5943-0000-6cd900006eae"
-        },
-        "type": "conversation.code-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_17.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_17.json
deleted file mode 100644
index ec8523d2c21..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_17.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00005994-0000-5c94-0000-519300002727"
-        },
-        "conversation": "00005994-0000-5c94-0000-519300002727",
-        "time": "1864-04-24T18:38:55.053Z",
-        "data": {
-            "message_timer": 3685837512701220
-        },
-        "from": "00003ddd-0000-21a2-0000-6a54000023c3",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00003ddd-0000-21a2-0000-6a54000023c3"
-        },
-        "type": "conversation.message-timer-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_18.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_18.json
deleted file mode 100644
index eee78a94ad0..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_18.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "000005bf-0000-3fdd-0000-089a0000544e"
-        },
-        "conversation": "000005bf-0000-3fdd-0000-089a0000544e",
-        "time": "1864-05-05T05:34:43.386Z",
-        "data": {
-            "email": "y\u0019T",
-            "name": "P",
-            "message": "􉴚\u001d\u0007",
-            "recipient": "00000007-0000-0005-0000-000400000002"
-        },
-        "from": "00003c0a-0000-3d64-0000-7f74000011e9",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00003c0a-0000-3d64-0000-7f74000011e9"
-        },
-        "type": "conversation.connect-request"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_19.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_19.json
deleted file mode 100644
index 386359bd8e7..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_19.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00000c59-0000-51c7-0000-1b6500001384"
-        },
-        "conversation": "00000c59-0000-51c7-0000-1b6500001384",
-        "time": "1864-04-19T14:51:39.037Z",
-        "data": null,
-        "from": "00003046-0000-14df-0000-5a5900005ef2",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00003046-0000-14df-0000-5a5900005ef2"
-        },
-        "type": "conversation.code-delete"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_2.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_2.json
deleted file mode 100644
index 1907be2fdb9..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00005a06-0000-10ab-0000-4999000058de"
-        },
-        "conversation": "00005a06-0000-10ab-0000-4999000058de",
-        "time": "1864-04-23T16:56:18.982Z",
-        "data": null,
-        "from": "00004247-0000-0560-0000-07df00005850",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00004247-0000-0560-0000-07df00005850"
-        },
-        "type": "conversation.delete"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_20.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_20.json
deleted file mode 100644
index 1cca0da5286..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_20.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00004e98-0000-2ec5-0000-31870000098c"
-        },
-        "conversation": "00004e98-0000-2ec5-0000-31870000098c",
-        "time": "1864-05-18T03:54:11.412Z",
-        "data": {
-            "message_timer": 5776200192005000
-        },
-        "from": "00006cb0-0000-6547-0000-1fe500000270",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00006cb0-0000-6547-0000-1fe500000270"
-        },
-        "type": "conversation.message-timer-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_3.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_3.json
deleted file mode 100644
index 3b3ac3350ea..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_3.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "000031b6-0000-7f2c-0000-22ca000012a0"
-        },
-        "conversation": "000031b6-0000-7f2c-0000-22ca000012a0",
-        "time": "1864-04-23T02:07:23.620Z",
-        "data": {
-            "users": [
-                {
-                    "conversation_role": "3jqe4rv30oxjs05p0vjx_gv",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000042-0000-0046-0000-005e0000001f"
-                    },
-                    "id": "00000042-0000-0046-0000-005e0000001f"
-                },
-                {
-                    "conversation_role": "gv66owx6jn8",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000073-0000-003c-0000-005800000069"
-                    },
-                    "id": "00000073-0000-003c-0000-005800000069"
-                },
-                {
-                    "conversation_role": "zx5yjj62r6x5vzvdekehjc6syfkollz3j5ztxjsu1ffrjvolkynevvykqe6dyyntx3t4p7ph_axwmb_9puw2h2i5qrnvkuwx1a7d23ln9q30h_vulfs1x8iiya",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000003a-0000-0056-0000-000e00000038"
-                    },
-                    "id": "0000003a-0000-0056-0000-000e00000038"
-                },
-                {
-                    "conversation_role": "_6hbn84l_4xly84ic0hrz_m4unx_i2_5sfotmu2xjmylyly_qilavdw54n1reep",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000007c-0000-0075-0000-006500000036"
-                    },
-                    "id": "0000007c-0000-0075-0000-006500000036"
-                },
-                {
-                    "conversation_role": "u8r_c9n84lvf4v9i8c6tzre_e3jhp327b2vvubky8_25tf6x6cszt770uuuikdpofyu5oa7lyd",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000031-0000-0004-0000-005e00000060"
-                    },
-                    "id": "00000031-0000-0004-0000-005e00000060"
-                },
-                {
-                    "conversation_role": "4agujelz62r_o96qfxja1h60hqmsbuowdhmqb1zvrlhtru6b66vl1lu5oc1",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000007b-0000-0019-0000-002a00000000"
-                    },
-                    "id": "0000007b-0000-0019-0000-002a00000000"
-                },
-                {
-                    "conversation_role": "6o_85q3e0hn13mkqzstg29b3r29ezb52cl6a_1hhzpx1wtdkav8z8nhc8uk5jj3wsp16rn0wx0dbj9rqt",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000000c-0000-0069-0000-006600000032"
-                    },
-                    "id": "0000000c-0000-0069-0000-006600000032"
-                },
-                {
-                    "conversation_role": "ii7eljki45zqe819xzx16tkvbgb85",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000001d-0000-0006-0000-00540000005a"
-                    },
-                    "id": "0000001d-0000-0006-0000-00540000005a"
-                },
-                {
-                    "conversation_role": "8fg3lg3rtnjamcshonl6ailheepmslbc_c3vgdhofs2hwbr84duunkatfkotiq246euejqre_sa4ygly",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000007f-0000-005d-0000-000700000035"
-                    },
-                    "id": "0000007f-0000-005d-0000-000700000035"
-                },
-                {
-                    "conversation_role": "5moz9hri8wj07ilkxfcsubwzelf8bkv0vpyssxthz7nnwbthym1ux33bn682ddcbv91aq7oquc9osjow75iu75kjp0prd2zam_o_zixgv3",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000006b-0000-005e-0000-003d0000007c"
-                    },
-                    "id": "0000006b-0000-005e-0000-003d0000007c"
-                },
-                {
-                    "conversation_role": "_xq9rxj1fopahja5o9av3g18y4ko17fzdjunr84k0_txycx3sd1sqn2k5_usv0l_007wdzjrnxcss4b32w4c1qe",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000005e-0000-000e-0000-00300000005f"
-                    },
-                    "id": "0000005e-0000-000e-0000-00300000005f"
-                },
-                {
-                    "conversation_role": "h0q7fe607q9oaiw53dbfunmrlposh47fvaoe5mfg8rth7dzl8r0y759kclqbbqzt7zlbu090lkdberm0u78tb",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000060-0000-0000-0000-001e0000003b"
-                    },
-                    "id": "00000060-0000-0000-0000-001e0000003b"
-                },
-                {
-                    "conversation_role": "rw50gu92raxvq87hqpf7r_xyl",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000030-0000-000e-0000-006f0000001d"
-                    },
-                    "id": "00000030-0000-000e-0000-006f0000001d"
-                },
-                {
-                    "conversation_role": "5bizt8d567yjavituolq2unxfh0qyih7_9dep7cpix5bucbevifs2m0",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000003f-0000-005e-0000-003200000062"
-                    },
-                    "id": "0000003f-0000-005e-0000-003200000062"
-                },
-                {
-                    "conversation_role": "1kit803b528tmtyvlkespy",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000002e-0000-007d-0000-005e0000004d"
-                    },
-                    "id": "0000002e-0000-007d-0000-005e0000004d"
-                },
-                {
-                    "conversation_role": "74l03am2b",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000007c-0000-0013-0000-007100000049"
-                    },
-                    "id": "0000007c-0000-0013-0000-007100000049"
-                },
-                {
-                    "conversation_role": "8ghe34e3xwi0i1e7cfe8ivltslpzuf15xadc7x5741tzeh1ne_v3m_xzjouowchqe5ubn0jptjorvxoksxwqowgp7oey9ptzpe2cegkplw3445q2z390sf1zy_09ngm",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000012-0000-0058-0000-00500000004d"
-                    },
-                    "id": "00000012-0000-0058-0000-00500000004d"
-                },
-                {
-                    "conversation_role": "ui1_axn4co_y0u6a8yrmwsam6zar72jdpdorz8xyvxa1_gfd50r4gu47detfx0rgm6s9iqy2",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000060-0000-007f-0000-003c0000001d"
-                    },
-                    "id": "00000060-0000-007f-0000-003c0000001d"
-                },
-                {
-                    "conversation_role": "32y4b84gygtg3xscfds0vu69bbsir8cbfh0_gmnh6hnbdr6md8807tuoi8ijtsfr2bkfd8d1vlacwytk55gr__t9f48uyd9p1fz07j20",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000034-0000-005a-0000-003600000063"
-                    },
-                    "id": "00000034-0000-005a-0000-003600000063"
-                },
-                {
-                    "conversation_role": "wf0v8gr2oqqdm",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000006a-0000-007f-0000-006700000068"
-                    },
-                    "id": "0000006a-0000-007f-0000-006700000068"
-                }
-            ],
-            "user_ids": [
-                "00000042-0000-0046-0000-005e0000001f",
-                "00000073-0000-003c-0000-005800000069",
-                "0000003a-0000-0056-0000-000e00000038",
-                "0000007c-0000-0075-0000-006500000036",
-                "00000031-0000-0004-0000-005e00000060",
-                "0000007b-0000-0019-0000-002a00000000",
-                "0000000c-0000-0069-0000-006600000032",
-                "0000001d-0000-0006-0000-00540000005a",
-                "0000007f-0000-005d-0000-000700000035",
-                "0000006b-0000-005e-0000-003d0000007c",
-                "0000005e-0000-000e-0000-00300000005f",
-                "00000060-0000-0000-0000-001e0000003b",
-                "00000030-0000-000e-0000-006f0000001d",
-                "0000003f-0000-005e-0000-003200000062",
-                "0000002e-0000-007d-0000-005e0000004d",
-                "0000007c-0000-0013-0000-007100000049",
-                "00000012-0000-0058-0000-00500000004d",
-                "00000060-0000-007f-0000-003c0000001d",
-                "00000034-0000-005a-0000-003600000063",
-                "0000006a-0000-007f-0000-006700000068"
-            ]
-        },
-        "from": "00005a35-0000-3751-0000-76fe000044c2",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00005a35-0000-3751-0000-76fe000044c2"
-        },
-        "type": "conversation.member-join"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_4.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_4.json
deleted file mode 100644
index cae4823aa42..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_4.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "000057d8-0000-4ce9-0000-2a9a00001ced"
-        },
-        "conversation": "000057d8-0000-4ce9-0000-2a9a00001ced",
-        "time": "1864-05-21T00:12:51.490Z",
-        "data": {
-            "access": [],
-            "access_role": "activated"
-        },
-        "from": "00005b30-0000-0805-0000-116700000485",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00005b30-0000-0805-0000-116700000485"
-        },
-        "type": "conversation.access-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_5.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_5.json
deleted file mode 100644
index 333906d175f..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_5.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00004615-0000-2e80-0000-552b0000353c"
-        },
-        "conversation": "00004615-0000-2e80-0000-552b0000353c",
-        "time": "1864-04-14T01:56:55.057Z",
-        "data": {
-            "access": [
-                "invite",
-                "private",
-                "private"
-            ],
-            "access_role": "activated"
-        },
-        "from": "0000134e-0000-6a75-0000-470a00006537",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "0000134e-0000-6a75-0000-470a00006537"
-        },
-        "type": "conversation.access-update"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_6.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_6.json
deleted file mode 100644
index 89ed317e3ab..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_6.json
+++ /dev/null
@@ -1,283 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00002aa8-0000-7a99-0000-660700000bd3"
-        },
-        "conversation": "00002aa8-0000-7a99-0000-660700000bd3",
-        "time": "1864-05-31T11:11:10.792Z",
-        "data": {
-            "users": [
-                {
-                    "conversation_role": "htshpkwocsefoqvjbzonewymi1zn8fpmdi1o8bwmm7fj161iortxvrz23lrjzabdmh6a55bb8cvq09xv6rq4qdtff95hkuqw4u8tj5ez9xx9cd7pvc_r67s2vw4m",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000041-0000-004b-0000-002300000030"
-                    },
-                    "id": "00000041-0000-004b-0000-002300000030"
-                },
-                {
-                    "conversation_role": "j2dtw20p_p7_v96xvpsjwe9ww3eyi4zdq8xx2_cabuv0w21u_vz5l09abprf1hue25srgwrlgeszd1ce3mtgz5w",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000055-0000-0065-0000-005000000065"
-                    },
-                    "id": "00000055-0000-0065-0000-005000000065"
-                },
-                {
-                    "conversation_role": "o7hm7tvk1opilxu1kc5chxj25scof183t5mdwhdkj0zjg7re3vbt5g8988z6gyu4p8sspu8fto0sko9e_m8pzk54zzvwz7vod927_jjcp3wg5jj9n2egwvi8",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000000e-0000-0042-0000-00580000000a"
-                    },
-                    "id": "0000000e-0000-0042-0000-00580000000a"
-                },
-                {
-                    "conversation_role": "kf14jpkab__n0g0ssfw21_3q52t2op841s0zl8edy11acgb218rr4nmkodozdim",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000006b-0000-0080-0000-00360000000c"
-                    },
-                    "id": "0000006b-0000-0080-0000-00360000000c"
-                },
-                {
-                    "conversation_role": "06i5vil75hof_mqn8_7cuglrizks",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000031-0000-0006-0000-003f00000069"
-                    },
-                    "id": "00000031-0000-0006-0000-003f00000069"
-                },
-                {
-                    "conversation_role": "cux_igluvokgr7z7ikcqcmm9dhskcimfufmsxwb11vfv",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000006f-0000-0026-0000-006000000045"
-                    },
-                    "id": "0000006f-0000-0026-0000-006000000045"
-                },
-                {
-                    "conversation_role": "es0p",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000002a-0000-0080-0000-003e00000014"
-                    },
-                    "id": "0000002a-0000-0080-0000-003e00000014"
-                },
-                {
-                    "conversation_role": "w28vr_ps429op3rmp3sil1wogmfgf1dsxmmsx2u5smde8srbfb11opw0a_b5z9ywbu9q0yivoz2n70m808m6f1vtvcr6oeh05c20va1jh299hk6q950",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000001d-0000-006f-0000-003e0000003d"
-                    },
-                    "id": "0000001d-0000-006f-0000-003e0000003d"
-                },
-                {
-                    "conversation_role": "4pgdip19fs0",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000004c-0000-0065-0000-007d00000026"
-                    },
-                    "id": "0000004c-0000-0065-0000-007d00000026"
-                },
-                {
-                    "conversation_role": "x76ykqupchbjeozez7aqxynobvjd38xuqb",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000028-0000-005b-0000-007d00000042"
-                    },
-                    "id": "00000028-0000-005b-0000-007d00000042"
-                },
-                {
-                    "conversation_role": "fsttup8l4pwse5n72k34u_swxpalpgzl4gjnko0l7c3gxmu0x6l4nzbyzdcaxstr2iiuxb061f9",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000011-0000-0031-0000-001e00000055"
-                    },
-                    "id": "00000011-0000-0031-0000-001e00000055"
-                },
-                {
-                    "conversation_role": "73c37ry1xfsx",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000039-0000-003b-0000-002200000013"
-                    },
-                    "id": "00000039-0000-003b-0000-002200000013"
-                },
-                {
-                    "conversation_role": "51a4e2v57yge9xa_cc6mg67bix0exndp7swn_dppzuk8n5i19xsqaoqlkyv_x2hhv8h4uzkng185o5y_77189zvwk_y8sy1ynp5y8vo0e5p__kwlcl0yztuvtiyyr1",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000007c-0000-0065-0000-001b00000046"
-                    },
-                    "id": "0000007c-0000-0065-0000-001b00000046"
-                },
-                {
-                    "conversation_role": "3qy1onol9hu2g4hql7ak8gyleg9a2dh0poq72b8opgm3140xjmrvlj0jtovjt3fpbar4x1i08lzdqndo7nhtczrrp9dahulq9fbuhfdrhu7n7kl6tkvu",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000034-0000-004c-0000-001c0000007c"
-                    },
-                    "id": "00000034-0000-004c-0000-001c0000007c"
-                },
-                {
-                    "conversation_role": "lc4kukb759glnd3j1a5cd141a7a0h8pze2c78n8x3h_9mzn7v8jtfpsgqrvt9lca6l5f8oqk3yplig1ccl8",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000004-0000-0028-0000-002300000045"
-                    },
-                    "id": "00000004-0000-0028-0000-002300000045"
-                },
-                {
-                    "conversation_role": "pfirchcrh2lo5pq1msq2x93tawq4v37onjphe9fcssiwfdpysse0dvk3ehupya4axtiq6ewmsjjj9xsaimlk0l70ovinyo5zmgil24ckv_fd2v_h4fx9i2s",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000000f-0000-007d-0000-00650000006b"
-                    },
-                    "id": "0000000f-0000-007d-0000-00650000006b"
-                },
-                {
-                    "conversation_role": "2130v11uf_bzjod2p35u_vhotitn",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000006c-0000-0028-0000-004000000067"
-                    },
-                    "id": "0000006c-0000-0028-0000-004000000067"
-                },
-                {
-                    "conversation_role": "6idgmk_1d_g5ii1sfpfcrenr8m2afbe2d71llw8xrlzdhxw_g7vn3foj5_abaul9j71_",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000059-0000-007e-0000-00580000006c"
-                    },
-                    "id": "00000059-0000-007e-0000-00580000006c"
-                },
-                {
-                    "conversation_role": "c9ycux2q_6sj1hecc_cvkz6aupdm4g5rc3gzyw9cnd0wqd0miltcb1i0q6tietu0w7khbhg8fx3z600fgsr2m3rj0mxs1pqwblnhazp1f23t",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000007f-0000-0057-0000-004c00000005"
-                    },
-                    "id": "0000007f-0000-0057-0000-004c00000005"
-                },
-                {
-                    "conversation_role": "57guddz98hnzetk8xjme1h_gtmczis9jv3xt73rtjgz6jsentre2s7d2",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000004a-0000-000b-0000-001000000004"
-                    },
-                    "id": "0000004a-0000-000b-0000-001000000004"
-                },
-                {
-                    "conversation_role": "x0qcthwpdmzimnfqh4rd4sf",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000000a-0000-0039-0000-005c00000048"
-                    },
-                    "id": "0000000a-0000-0039-0000-005c00000048"
-                },
-                {
-                    "conversation_role": "xdobrq683oi0lbxoy9ociqkouclsen5wu8suhbj75co521ipa89bnc7nh3y41fg58bxlet5u0wg94ueejw05iu15zr1kno_oxiqlhx9s9i9zd8ksyb4",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000006a-0000-000d-0000-006300000074"
-                    },
-                    "id": "0000006a-0000-000d-0000-006300000074"
-                },
-                {
-                    "conversation_role": "9ble9wkz5sx4fof474zgb",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000003-0000-0078-0000-00310000002b"
-                    },
-                    "id": "00000003-0000-0078-0000-00310000002b"
-                },
-                {
-                    "conversation_role": "6x00nd8of9_prpikunwo7292vzgp6qivsia735dns1s395syckletc2smrzxezrsn1hgjjvenm",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000006-0000-0042-0000-007e00000013"
-                    },
-                    "id": "00000006-0000-0042-0000-007e00000013"
-                },
-                {
-                    "conversation_role": "dd2lcxld259xsjsqz2h130ksyeixe21s87mhwa7tas1k_ttqefg66ga13x7ixlfuuiaj5p8i16nn6pf3sbn25p8s4ld9virn3tf",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000002d-0000-0043-0000-004f00000078"
-                    },
-                    "id": "0000002d-0000-0043-0000-004f00000078"
-                },
-                {
-                    "conversation_role": "jiyr52auzomq5ui457z209fcszalvj_wy09_zgc05pfp9x304nwxni",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000015-0000-0069-0000-005400000018"
-                    },
-                    "id": "00000015-0000-0069-0000-005400000018"
-                },
-                {
-                    "conversation_role": "ldesfdsha0z3olxjyjkijtud5z2ns5oxb5h1vbbamtgymlnmjg4ybed_tfhvntcdr1h78ihk5ztwd27vtiy",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000064-0000-007d-0000-006b00000055"
-                    },
-                    "id": "00000064-0000-007d-0000-006b00000055"
-                },
-                {
-                    "conversation_role": "hcfut6_dj",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "0000006d-0000-007a-0000-007a00000017"
-                    },
-                    "id": "0000006d-0000-007a-0000-007a00000017"
-                },
-                {
-                    "conversation_role": "q5_32a257neednc3",
-                    "qualified_id": {
-                        "domain": "faraway.example.com",
-                        "id": "00000005-0000-0065-0000-002600000007"
-                    },
-                    "id": "00000005-0000-0065-0000-002600000007"
-                }
-            ],
-            "user_ids": [
-                "00000041-0000-004b-0000-002300000030",
-                "00000055-0000-0065-0000-005000000065",
-                "0000000e-0000-0042-0000-00580000000a",
-                "0000006b-0000-0080-0000-00360000000c",
-                "00000031-0000-0006-0000-003f00000069",
-                "0000006f-0000-0026-0000-006000000045",
-                "0000002a-0000-0080-0000-003e00000014",
-                "0000001d-0000-006f-0000-003e0000003d",
-                "0000004c-0000-0065-0000-007d00000026",
-                "00000028-0000-005b-0000-007d00000042",
-                "00000011-0000-0031-0000-001e00000055",
-                "00000039-0000-003b-0000-002200000013",
-                "0000007c-0000-0065-0000-001b00000046",
-                "00000034-0000-004c-0000-001c0000007c",
-                "00000004-0000-0028-0000-002300000045",
-                "0000000f-0000-007d-0000-00650000006b",
-                "0000006c-0000-0028-0000-004000000067",
-                "00000059-0000-007e-0000-00580000006c",
-                "0000007f-0000-0057-0000-004c00000005",
-                "0000004a-0000-000b-0000-001000000004",
-                "0000000a-0000-0039-0000-005c00000048",
-                "0000006a-0000-000d-0000-006300000074",
-                "00000003-0000-0078-0000-00310000002b",
-                "00000006-0000-0042-0000-007e00000013",
-                "0000002d-0000-0043-0000-004f00000078",
-                "00000015-0000-0069-0000-005400000018",
-                "00000064-0000-007d-0000-006b00000055",
-                "0000006d-0000-007a-0000-007a00000017",
-                "00000005-0000-0065-0000-002600000007"
-            ]
-        },
-        "from": "000036f7-0000-6d15-0000-0ff200006a4c",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "000036f7-0000-6d15-0000-0ff200006a4c"
-        },
-        "type": "conversation.member-join"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_7.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_7.json
deleted file mode 100644
index 088e1c2dac3..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_7.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "00006a93-0000-005c-0000-361e00000180"
-        },
-        "conversation": "00006a93-0000-005c-0000-361e00000180",
-        "time": "1864-04-25T18:08:10.735Z",
-        "data": {
-            "text": "",
-            "sender": "b",
-            "recipient": "1c"
-        },
-        "from": "00007bb6-0000-07cc-0000-687c00002703",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00007bb6-0000-07cc-0000-687c00002703"
-        },
-        "type": "conversation.otr-message-add"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_8.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_8.json
deleted file mode 100644
index 1788d3288ed..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_8.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "000022d4-0000-6167-0000-519f0000134c"
-        },
-        "conversation": "000022d4-0000-6167-0000-519f0000134c",
-        "time": "1864-05-29T09:46:28.943Z",
-        "data": {
-            "email": "1\\X",
-            "name": "$􋇇􅱬",
-            "message": "2𥉼Q\u00194\u0013",
-            "recipient": "00000004-0000-0002-0000-000300000006"
-        },
-        "from": "0000200d-0000-386f-0000-0de000003b71",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "0000200d-0000-386f-0000-0de000003b71"
-        },
-        "type": "conversation.connect-request"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_9.json b/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_9.json
deleted file mode 100644
index f017e7589b7..00000000000
--- a/libs/wire-api/test/golden/testObject_RemoveBotResponse_user_9.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "event": {
-        "qualified_conversation": {
-            "domain": "faraway.example.com",
-            "id": "0000324b-0000-23a4-0000-0fbb00006c87"
-        },
-        "conversation": "0000324b-0000-23a4-0000-0fbb00006c87",
-        "time": "1864-05-18T05:11:02.885Z",
-        "data": {
-            "text": "\u0002󿘭\u0016ޙ\u0016",
-            "sender": "1c",
-            "recipient": "19"
-        },
-        "from": "00006234-0000-7d47-0000-0b95000079f2",
-        "qualified_from": {
-            "domain": "faraway.example.com",
-            "id": "00006234-0000-7d47-0000-0b95000079f2"
-        },
-        "type": "conversation.otr-message-add"
-    }
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_1.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_1.json
index 42b363defd0..4e418c481d5 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_1.json
@@ -2,12 +2,12 @@
     "ids": [
         23
     ],
-    "password": "~\u0010 y[b\u0007S\u0017f𨛱x.lY𣍴r`\u000b{▜\u0018鰳%=\u000c􋭄U\u0014%􃞨􂻞__'m\u001e\u0011\u0011c뢣'eSnST\u0001闛70𭊑䀙<􉘯𥫖nF􈧇2~r$=󹰫IWVMd岇\u000b**\u0018.)🖍=Pt..𧈯m𥌐a\u00078<E􅾡\u001b􌕋塌V7\u00116恔A蹆𤉸󱩂􇢛􆗬混Hw𢻠+칭h^Wb,08󹥏挥Xk􄟼~\u00007!~f7b𠓄/8𠦂|Xe8\u0007𖬴\u0005q󾩹a\u0003=]𗑇\u0010Q\u000e!\u0013𩕩~\u001bx4􀾺󸋬2jy􏩵\u0010wY㧈1M\u0011㣕􈃦PsT,OiV\u00021붕*ub\u0011e\u0008\u0014$5R\u0004]$c󰶐\u001e!d 𫵝)'\r􀴏\u0005gZW%\u0015\n\u00042􉫖\u001dy\u0013􊧻\\\u001e\u0005p饔tU\u0019󱟥󠄋l\u0002\u001d\u0011dqz\u001b\u000e󿟗{r\nxAi]Y&\u0004\u0017gF\u0007\u0019 +:\u0004+\u001b𡺺\u00192\u001c􆌣𐠝|6U󷁭(g\u001do𔕸%\u000c\nH⠬􎥖\u0003\u000eu\r􄅢&􌭑,,fI,󳌅𩣣2-𡜤b{a0􍜔 􃮖%\u0010@𦹸gT艛06re󰃠B\u000e\\\u001a󰁏'\u00048\u0016󾓁cSv\u000e𭷧𫞖\u0016\u0016[J\u0007\u0010o8\u000e%PM􋧶犥$x\u001b1𮧅󷾦KK󶰄Y焻1𧌻<0\u000cX󺾪𫋗󿮡𨫢|q0􍥡煦⣽J*􏮹X󽠖𣛤𠮞XWu;逵槇剿/􍋮tK􀽈9\u0002n8J@\u0012zz8\u0010􂼮=𐛈[oDM\u000f%2𠭐?CHZN2p𥊜Sଈ􀅃8\u001b󿠱䉉󹣎m~\u0005􈊧yuw{􃎫􏿟e\tm鍦<\u00156Xt\u0010u\u0012\rWg|󺂀{vS􂦍&&봋e@h(pT\u0004\u0014𭩀爐q'Bz2挢󵙇]𖧝!7&N󰹊𢨂ꧤ]rH9􋲈u%g󽞆󾈗䟆5\u0008\u000c\\?t\u0011🪀%􌔨,\u000c<\u00015:8󷣅[D펮CQw𘅡\nᙞ#i\u0018\u0018J,{yo􈜡;{𘌟hkU􀂧>'🡢z󺪀=e\u0011􏣱\u0016Q/_𘡉lV_}(dj󵻔\rZd<\u001eB\u0018󾃗\u000bY󷔼󰺩󰩇\u0000\u001bJ󼜛tY嗬𑃧\u001c&s\u0019􏨻o\u0012\u00077\u0008^Ｅ6Zi[`o\u0006;𩚛\u0011w䛽WxA󹿖c𪛔3\u0007\u0012s𠦄l\u0014 k=zy𥾊❌\"鋇ex􂞨fQ􄡇\u0012󠇉P柉*⡙𗩪F𐡝C\u0013􇔓#􍊿-\t\u001d􏱖`\u0017Cg5y\u001a\u0004\u0019𫴗1eS\u001dRI\u0017\u0002N⌽'jj(󽸳\\Cn+zw\u000cL\"𨐝(1𠁩􍈕\u001b\u001f𭌀ⲥ\u0007oj𘁗Y󸻘\"\\󺄋\u0013>9󶞌=\u001f᧸\u001d𥞹\u0005\u0018􉎞󰋝\u000cg󶅠􃅭𤛂9y$\u0013L8\u001f\n\u0014􈂍𘘇Fh󹙁'喇&@趵𡻫􄤁󽕲\u0017[A􄾔$D󹛞]\u0003𐢎]b\u000e󰋭C􏯯n􉖑9\u001bC=`$\u001c𧙩g@𧈸RS𡃬s4􈮤\u0001\u0013􈲘\u000b󵍠#<Q󹭻R\u0010\u0012 𬚧%\tcc/4>𣋞𨮲v􃳷x󵺏)8&y\"㇃5\"mV\u0014󺁖A\u0016\u0016􊣒~殾\u001ap}?n􂓿;󿟘\u0015􉼉\r7𤬪?\t𐿨c}xV󷭦싦>󾲎\u0007@K\u001b42⼬󴡀s竖~mXY[m𥔟\u0007*l;󻂔!\\|\u0010ys󾩒벽aS-\u0014+\u0016'%\u001445𮕠𦻏\u0014󶘀ayCtYM𧥒L\u000em𐹸𑜚Mi𫐷S๊",
     "labels": [
         "\t",
         "b",
         "",
         ")v",
         ""
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "~\u0010 y[b\u0007S\u0017f𨛱x.lY𣍴r`\u000b{▜\u0018鰳%=\u000c􋭄U\u0014%􃞨􂻞__'m\u001e\u0011\u0011c뢣'eSnST\u0001闛70𭊑䀙<􉘯𥫖nF􈧇2~r$=󹰫IWVMd岇\u000b**\u0018.)🖍=Pt..𧈯m𥌐a\u00078<E􅾡\u001b􌕋塌V7\u00116恔A蹆𤉸󱩂􇢛􆗬混Hw𢻠+칭h^Wb,08󹥏挥Xk􄟼~\u00007!~f7b𠓄/8𠦂|Xe8\u0007𖬴\u0005q󾩹a\u0003=]𗑇\u0010Q\u000e!\u0013𩕩~\u001bx4􀾺󸋬2jy􏩵\u0010wY㧈1M\u0011㣕􈃦PsT,OiV\u00021붕*ub\u0011e\u0008\u0014$5R\u0004]$c󰶐\u001e!d 𫵝)'\r􀴏\u0005gZW%\u0015\n\u00042􉫖\u001dy\u0013􊧻\\\u001e\u0005p饔tU\u0019󱟥󠄋l\u0002\u001d\u0011dqz\u001b\u000e󿟗{r\nxAi]Y&\u0004\u0017gF\u0007\u0019 +:\u0004+\u001b𡺺\u00192\u001c􆌣𐠝|6U󷁭(g\u001do𔕸%\u000c\nH⠬􎥖\u0003\u000eu\r􄅢&􌭑,,fI,󳌅𩣣2-𡜤b{a0􍜔 􃮖%\u0010@𦹸gT艛06re󰃠B\u000e\\\u001a󰁏'\u00048\u0016󾓁cSv\u000e𭷧𫞖\u0016\u0016[J\u0007\u0010o8\u000e%PM􋧶犥$x\u001b1𮧅󷾦KK󶰄Y焻1𧌻<0\u000cX󺾪𫋗󿮡𨫢|q0􍥡煦⣽J*􏮹X󽠖𣛤𠮞XWu;逵槇剿/􍋮tK􀽈9\u0002n8J@\u0012zz8\u0010􂼮=𐛈[oDM\u000f%2𠭐?CHZN2p𥊜Sଈ􀅃8\u001b󿠱䉉󹣎m~\u0005􈊧yuw{􃎫􏿟e\tm鍦<\u00156Xt\u0010u\u0012\rWg|󺂀{vS􂦍&&봋e@h(pT\u0004\u0014𭩀爐q'Bz2挢󵙇]𖧝!7&N󰹊𢨂ꧤ]rH9􋲈u%g󽞆󾈗䟆5\u0008\u000c\\?t\u0011🪀%􌔨,\u000c<\u00015:8󷣅[D펮CQw𘅡\nᙞ#i\u0018\u0018J,{yo􈜡;{𘌟hkU􀂧>'🡢z󺪀=e\u0011􏣱\u0016Q/_𘡉lV_}(dj󵻔\rZd<\u001eB\u0018󾃗\u000bY󷔼󰺩󰩇\u0000\u001bJ󼜛tY嗬𑃧\u001c&s\u0019􏨻o\u0012\u00077\u0008^Ｅ6Zi[`o\u0006;𩚛\u0011w䛽WxA󹿖c𪛔3\u0007\u0012s𠦄l\u0014 k=zy𥾊❌\"鋇ex􂞨fQ􄡇\u0012󠇉P柉*⡙𗩪F𐡝C\u0013􇔓#􍊿-\t\u001d􏱖`\u0017Cg5y\u001a\u0004\u0019𫴗1eS\u001dRI\u0017\u0002N⌽'jj(󽸳\\Cn+zw\u000cL\"𨐝(1𠁩􍈕\u001b\u001f𭌀ⲥ\u0007oj𘁗Y󸻘\"\\󺄋\u0013>9󶞌=\u001f᧸\u001d𥞹\u0005\u0018􉎞󰋝\u000cg󶅠􃅭𤛂9y$\u0013L8\u001f\n\u0014􈂍𘘇Fh󹙁'喇&@趵𡻫􄤁󽕲\u0017[A􄾔$D󹛞]\u0003𐢎]b\u000e󰋭C􏯯n􉖑9\u001bC=`$\u001c𧙩g@𧈸RS𡃬s4􈮤\u0001\u0013􈲘\u000b󵍠#<Q󹭻R\u0010\u0012 𬚧%\tcc/4>𣋞𨮲v􃳷x󵺏)8&y\"㇃5\"mV\u0014󺁖A\u0016\u0016􊣒~殾\u001ap}?n􂓿;󿟘\u0015􉼉\r7𤬪?\t𐿨c}xV󷭦싦>󾲎\u0007@K\u001b42⼬󴡀s竖~mXY[m𥔟\u0007*l;󻂔!\\|\u0010ys󾩒벽aS-\u0014+\u0016'%\u001445𮕠𦻏\u0014󶘀ayCtYM𧥒L\u000em𐹸𑜚Mi𫐷S๊"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_10.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_10.json
index 6b16db8b344..e274eb0bcb8 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_10.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_10.json
@@ -2,10 +2,10 @@
     "ids": [
         29
     ],
-    "password": "\u0005zM]\rS􁩙\u00080{\u0002@@\u000e(f+􅜻^gA\u0002*_:3\r8f𡳋AU𑣿\u0014vxT\u0002\u000c\u0014􆃰|\n􎩾z?⍳d|x󳰜;_.E\u001c\\y󹣟𭿡1%W#qrI$Q^7\u0015뮐\n4YLf\u001d,BJ\"ߪ󼧟]Mg@𫘿⣆!}}\u000eC4\u0004;'&𠕘\u001eZ0z𐒙#\u0005!km󸿕𨨕\u001e@4𘤡\u0016am󲫦QeJx\u001f-C\u0011\u0004􈌲7󷱘\u00124%\r􆣢\u001a\u00027\u001b\u0014&",
     "labels": [
         "",
         "mcQ",
         "P"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "\u0005zM]\rS􁩙\u00080{\u0002@@\u000e(f+􅜻^gA\u0002*_:3\r8f𡳋AU𑣿\u0014vxT\u0002\u000c\u0014􆃰|\n􎩾z?⍳d|x󳰜;_.E\u001c\\y󹣟𭿡1%W#qrI$Q^7\u0015뮐\n4YLf\u001d,BJ\"ߪ󼧟]Mg@𫘿⣆!}}\u000eC4\u0004;'&𠕘\u001eZ0z𐒙#\u0005!km󸿕𨨕\u001e@4𘤡\u0016am󲫦QeJx\u001f-C\u0011\u0004􈌲7󷱘\u00124%\r􆣢\u001a\u00027\u001b\u0014&"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_11.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_11.json
index 2fa20db1783..f6ce7482c5f 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_11.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_11.json
@@ -3,9 +3,9 @@
         0,
         4
     ],
-    "password": "\u000f𢿷[\u0004/E􇱎m\u0015\u00154[󴖃Jc\u0006調0\t\u00110}\u000b\u00188U斛󼽺Hi\u0012J_^S췕􊨾n tv)􋻀P\n1)􆵽\r\u0001@.􅰑\u0018-\u000c\u0018*O!\u001a\u000cI;BK4ko\u0012\u0008󸏡&x840𡑮𐬀+}!\u001bn9dLO}\u001a\u0008깾1𤎲\u000e2f󶕺󻳳𪪳\"aQy%ii}9w\\𦨋*𗁖SH?A3􏉫\u0005.\u001e􀴇1`󵧛*󰌧𐡻𠢵i\u0017kM\u001a%;􏎅\u001c󱪻蹳󹗗\u000fv𝘤\u000b𥣛Y\u0013\u00170'=󸢉g󳔐si+sgr\u000e􄞞G:\r􄕷`g:\u0017𮍿?𮉭\u00124u\u0003)𘙪႓nW\u001f.\u0012j󼨗a𫯿䝘'Q\u000c&#K1\u000eP4ﰩ []ce\u00089􆷀\u001c1\r󶚄\u000f\u0005}/`9 jr\u001a\t?嗂Q𦄴Q\u000e􋾍o􎐼Y𨱶LRS\u0002*𩱺nv.QZz\u0007~L􁏅93\u001d9􈛍\raoz7\u0008L 5ckd|E\u001a~}\u0008\u0002󻟫\u0002C7\u0001@jHFw^밭\u0018\u0002􎥝\u000e\u0017][u𝩨;^路1p[󴦜\n\u0017􏶴n5h\u0018󶻄.\u000f𨜨\u0017N6j\u0002TZO=Ui𤕳\u0000G`M>HIBp\u001f\u0013􃾈\u0019+x\u0000\nk)\u0017S#wzkV@󿮼𧬘`􎧽\u0004f~|M􃺀ju🐅dz𧘇(𥪂󻟛𩘜𩲄󲡖\u00146\u0004{c\u0019\u0011eꒄNE𡳖1궣\u0007<&o𩎟%Zi:Q𪗋\u001f㶧:\u0013)􆽥$ViLW\u001a\"m.s3𫴬eᯝ* \u0001yny\u0004\u0012 xfa|d8@I\u0003@D𤠢\u0017}w\u000c􆺈\u001b\u001b𦋾:夈\u0014󶚀fm\u001a뙠g𥺋#n𦲹\"\u00178Z\u001c*𥮧!󾚮\u001f忴󶞪>r𪟹\u0013(륃\u0019.\rc!\u001e\u000e\u0014Mve\u0005𥿶&\"󽡮[k<mlCI@\u0004\u0003􉊉r􆊥*;_褺앀\u0017Xo𤀒􃊇G\"?<\u0006𧟂\u0002\r\"+N3\u0014y\u0006v{\u0017^\u0011fb>􇚄\u0006w0V1􇯇𥥧􅛠鎣󱖴xt\u001fXI$󽾩Zgw𮤶M\u0010\u001d𣐭􇯱(\nFot\n/\u0013𮬱n\u0011/\r􋑻%1\u0002/Yw6=\u0005󲉳>𗔸\u0010O􉭌Q𞠪⒃3O\u000fo𫅃hmVar\u0015\u0004Cw\u0012\u0002qKCE\u0004󷬟=~\u001c|=#𮪿蕘􆮑/_#a奈N\u001c𠝞t􂕒􁫝d<z\u001bdj\\s󴲯󽤳4M.\u001e\u0019󺹡\u000f¡-2.\"7cxY&!Vc􊢑󻔇+:􌳬\u000eCm\"'\u0007f󷞟Iv(𧩩*j䜪\u0007\u001f\u0005 \u000c𭷏󺌐Bq~󳮎eeo𠘪",
     "labels": [
         "a",
         "g\u0002"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "\u000f𢿷[\u0004/E􇱎m\u0015\u00154[󴖃Jc\u0006調0\t\u00110}\u000b\u00188U斛󼽺Hi\u0012J_^S췕􊨾n tv)􋻀P\n1)􆵽\r\u0001@.􅰑\u0018-\u000c\u0018*O!\u001a\u000cI;BK4ko\u0012\u0008󸏡&x840𡑮𐬀+}!\u001bn9dLO}\u001a\u0008깾1𤎲\u000e2f󶕺󻳳𪪳\"aQy%ii}9w\\𦨋*𗁖SH?A3􏉫\u0005.\u001e􀴇1`󵧛*󰌧𐡻𠢵i\u0017kM\u001a%;􏎅\u001c󱪻蹳󹗗\u000fv𝘤\u000b𥣛Y\u0013\u00170'=󸢉g󳔐si+sgr\u000e􄞞G:\r􄕷`g:\u0017𮍿?𮉭\u00124u\u0003)𘙪႓nW\u001f.\u0012j󼨗a𫯿䝘'Q\u000c&#K1\u000eP4ﰩ []ce\u00089􆷀\u001c1\r󶚄\u000f\u0005}/`9 jr\u001a\t?嗂Q𦄴Q\u000e􋾍o􎐼Y𨱶LRS\u0002*𩱺nv.QZz\u0007~L􁏅93\u001d9􈛍\raoz7\u0008L 5ckd|E\u001a~}\u0008\u0002󻟫\u0002C7\u0001@jHFw^밭\u0018\u0002􎥝\u000e\u0017][u𝩨;^路1p[󴦜\n\u0017􏶴n5h\u0018󶻄.\u000f𨜨\u0017N6j\u0002TZO=Ui𤕳\u0000G`M>HIBp\u001f\u0013􃾈\u0019+x\u0000\nk)\u0017S#wzkV@󿮼𧬘`􎧽\u0004f~|M􃺀ju🐅dz𧘇(𥪂󻟛𩘜𩲄󲡖\u00146\u0004{c\u0019\u0011eꒄNE𡳖1궣\u0007<&o𩎟%Zi:Q𪗋\u001f㶧:\u0013)􆽥$ViLW\u001a\"m.s3𫴬eᯝ* \u0001yny\u0004\u0012 xfa|d8@I\u0003@D𤠢\u0017}w\u000c􆺈\u001b\u001b𦋾:夈\u0014󶚀fm\u001a뙠g𥺋#n𦲹\"\u00178Z\u001c*𥮧!󾚮\u001f忴󶞪>r𪟹\u0013(륃\u0019.\rc!\u001e\u000e\u0014Mve\u0005𥿶&\"󽡮[k<mlCI@\u0004\u0003􉊉r􆊥*;_褺앀\u0017Xo𤀒􃊇G\"?<\u0006𧟂\u0002\r\"+N3\u0014y\u0006v{\u0017^\u0011fb>􇚄\u0006w0V1􇯇𥥧􅛠鎣󱖴xt\u001fXI$󽾩Zgw𮤶M\u0010\u001d𣐭􇯱(\nFot\n/\u0013𮬱n\u0011/\r􋑻%1\u0002/Yw6=\u0005󲉳>𗔸\u0010O􉭌Q𞠪⒃3O\u000fo𫅃hmVar\u0015\u0004Cw\u0012\u0002qKCE\u0004󷬟=~\u001c|=#𮪿蕘􆮑/_#a奈N\u001c𠝞t􂕒􁫝d<z\u001bdj\\s󴲯󽤳4M.\u001e\u0019󺹡\u000f¡-2.\"7cxY&!Vc􊢑󻔇+:􌳬\u000eCm\"'\u0007f󷞟Iv(𧩩*j䜪\u0007\u001f\u0005 \u000c𭷏󺌐Bq~󳮎eeo𠘪"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_12.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_12.json
index 79af1d2c4fa..37f1d8911b4 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_12.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_12.json
@@ -7,8 +7,8 @@
         1,
         0
     ],
-    "password": "󱙘𥍭5<S\\\"JI涑K4k\u0006:Z!\u001a⏶mqꍏe[􅌐𢶩䰕\u0007Dg𧒽N!𖥑𮔲\u0001\u001eX󵤋W󱋀&\u001d5\rm{툯\u0002\u0010餏+$g戬\u0014羅뀤B󽻙}i3𫱌,x\u0012f\u0007\u000cx\\MJ6s𠈇N\u00164&~𒊭󼙈􅤒6h휏LM\u0018󸱯tx\t\u001ehP󴼅<ାL\\kh.󠁤ufO9\u001e|\u0004\u0012Ec\u0015󷜪Q\u00177ag'\nX󽖵􅞶\ni􎙃𡴚0𬼘'W㊟&\u0013\u0000\u001a|\u001f\u000b;􋍜W0n󶾲󸣇\u0010,0ﾰ󱷑f\u000fA$忲g𫟯􃘧莖/󺨴XW뱏󵉩]XeN𪻂\u000f;ᷫ|+󵕏󽻧\u0008z1􈯕󱛬\u000b󹼾k䒪~\u001dｶ\u0014>,C=b􅽜1]x~\u0015󻧃󾯱b󵇘\u0015n􆊻:𫂍󿶝弑kk\u001f拥篡𡝕뎉\u001f+脶󱴴JᢨZ\t𐩵@􋦘󷑉4I1:\u0015\u0008𧎼\u0012\t\n\u0010\u001bp\u0013𧖗k杇f[Uq\u000f`󺠶􅰲𮀹\u0011x^\u0016[6nl%󻹥L\u001fX5^H&O\u001d\u001aE\u000e⟝􄶱F4𨻶$\u0003It,U\u000c4\u0003\u000f𫅮\u0005aga&8I𔐶X%􆍍+`𖭜f󱁒A𝅙OA|Lg\u0002X\u001ca%t&!󹽾𬩬>\u0013\u0004lX+\u0011#\u0002z󾳹t.|\u0019\u000c\u0017鬀nr>D~F,\r𤅙\u0012'Xv\"Y9w(ewO\u0018𩏛3O \u0002t8cK\u000fW㽝\u0010󹃃\u0017;~!\ns􃁜F/p\u0015#琛\u0003S󰺑_r\u0013rP\u000fa몄X5-󳏱wi(ꄝ􏒂\u0011m=\u0019\u0003NGf\u000fD'\u0015q󸚞\r{鏬􄠥\u0012o󱢡bZ\u0015\u001d􂬣\u00190𭲱\u0012𪎧\u0000\nkh󾻆vsZX}󺌗.1%3Q𩌗%\u000b􏃂(tmJ@\"X\"翰c\u00196󲻔r^䣻\u0002膷\u0015𤲆𢮘1f_\u0010C󲤷c$\u0007K􃕁0\u0013󶰪/H&𫃿\u0008𧈔-\r󵯐8A/}\u001f𐋠\u0004舒)𩟯\u000f󹬁両N\u001b󳈍돦{\u0007𞡔\u000e[:f𤌓󴏍𬇹\u0019󸔧鳨$𔘭󺂙􎌾e*G𮎐:wq9籙Wж􂷫\u001c 󽷝𗭠쬢𡦙婷r\u0007 Rap|庂^'󻡸\u0005\u000bv-=)\u0013THꅹ\u0001\u0018C\u0005\u001cDi5\u0006\n\u000cy\\䜼zP\u000ePx\u0010c󴍊攍󿰚󶥫󾆁\u0010_%\u0016J\u0008a콠\u0004􀕴ZP󼫌緡`㳸󱰲\u000f\u0001A \u0014wE\u0005\u0002𘜱/\u0001\u00009E\u001c!􆷓q|\u0013\u0011$b𦽰p󴝔@\u001e|m\u0006󰻟𗂸\u0008􂇢[Ld𖨑1T檠X",
     "labels": [
         "7󶂥"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "󱙘𥍭5<S\\\"JI涑K4k\u0006:Z!\u001a⏶mqꍏe[􅌐𢶩䰕\u0007Dg𧒽N!𖥑𮔲\u0001\u001eX󵤋W󱋀&\u001d5\rm{툯\u0002\u0010餏+$g戬\u0014羅뀤B󽻙}i3𫱌,x\u0012f\u0007\u000cx\\MJ6s𠈇N\u00164&~𒊭󼙈􅤒6h휏LM\u0018󸱯tx\t\u001ehP󴼅<ାL\\kh.󠁤ufO9\u001e|\u0004\u0012Ec\u0015󷜪Q\u00177ag'\nX󽖵􅞶\ni􎙃𡴚0𬼘'W㊟&\u0013\u0000\u001a|\u001f\u000b;􋍜W0n󶾲󸣇\u0010,0ﾰ󱷑f\u000fA$忲g𫟯􃘧莖/󺨴XW뱏󵉩]XeN𪻂\u000f;ᷫ|+󵕏󽻧\u0008z1􈯕󱛬\u000b󹼾k䒪~\u001dｶ\u0014>,C=b􅽜1]x~\u0015󻧃󾯱b󵇘\u0015n􆊻:𫂍󿶝弑kk\u001f拥篡𡝕뎉\u001f+脶󱴴JᢨZ\t𐩵@􋦘󷑉4I1:\u0015\u0008𧎼\u0012\t\n\u0010\u001bp\u0013𧖗k杇f[Uq\u000f`󺠶􅰲𮀹\u0011x^\u0016[6nl%󻹥L\u001fX5^H&O\u001d\u001aE\u000e⟝􄶱F4𨻶$\u0003It,U\u000c4\u0003\u000f𫅮\u0005aga&8I𔐶X%􆍍+`𖭜f󱁒A𝅙OA|Lg\u0002X\u001ca%t&!󹽾𬩬>\u0013\u0004lX+\u0011#\u0002z󾳹t.|\u0019\u000c\u0017鬀nr>D~F,\r𤅙\u0012'Xv\"Y9w(ewO\u0018𩏛3O \u0002t8cK\u000fW㽝\u0010󹃃\u0017;~!\ns􃁜F/p\u0015#琛\u0003S󰺑_r\u0013rP\u000fa몄X5-󳏱wi(ꄝ􏒂\u0011m=\u0019\u0003NGf\u000fD'\u0015q󸚞\r{鏬􄠥\u0012o󱢡bZ\u0015\u001d􂬣\u00190𭲱\u0012𪎧\u0000\nkh󾻆vsZX}󺌗.1%3Q𩌗%\u000b􏃂(tmJ@\"X\"翰c\u00196󲻔r^䣻\u0002膷\u0015𤲆𢮘1f_\u0010C󲤷c$\u0007K􃕁0\u0013󶰪/H&𫃿\u0008𧈔-\r󵯐8A/}\u001f𐋠\u0004舒)𩟯\u000f󹬁両N\u001b󳈍돦{\u0007𞡔\u000e[:f𤌓󴏍𬇹\u0019󸔧鳨$𔘭󺂙􎌾e*G𮎐:wq9籙Wж􂷫\u001c 󽷝𗭠쬢𡦙婷r\u0007 Rap|庂^'󻡸\u0005\u000bv-=)\u0013THꅹ\u0001\u0018C\u0005\u001cDi5\u0006\n\u000cy\\䜼zP\u000ePx\u0010c󴍊攍󿰚󶥫󾆁\u0010_%\u0016J\u0008a콠\u0004􀕴ZP󼫌緡`㳸󱰲\u000f\u0001A \u0014wE\u0005\u0002𘜱/\u0001\u00009E\u001c!􆷓q|\u0013\u0011$b𦽰p󴝔@\u001e|m\u0006󰻟𗂸\u0008􂇢[Ld𖨑1T檠X"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_13.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_13.json
index 7d0784c1c36..d31f8458406 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_13.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_13.json
@@ -5,7 +5,6 @@
         2,
         1
     ],
-    "password": "r\u0007\u0016'oV𮜖mk𗤠4\u0006iE󴯇\n]\u0016///홠}c\u00159\u001e᪤U\u000bOc\u0019𨳛\u0008\u001b 𝑦<q𘥦󹾢\u0007𩶕\u000fQV&HA\u0006=\u0005𣵯컱簳x^𣔩Ce\u001d\u0001pOEl1\u001f&l𡻀􂮞W1\u0006󿰹8𪳤\u0017k{\u0019𖦁ᄅzL\toO(%􅳡feWH\u0014󴲹j$a%F㻻Ld𦦊\u0000-󱘬:i뭻\u0008\td\u001bPL􅮴H\u0000\u0010iA.s<𪘗-fL󿔡\n$+#󴬠\u000cDGWS\u001a\u000e\u000epR㲩d,q}\u000e\u0014󱒤py};Jy\u0012𝧈\u0002J.P󻱂(Se!!𧁸M䙍\u001e\nP1􉃩@P=<Fc7s㱵𮛗;ヶDL$ \u0000D_,i\u0016􁨳\u000cg\u0002[\\{󵞍 \u001f7󽑊󶣐􀫿0𤰝V挑2𤹖d4\n6z_9iQ𮎎R\u0015\u0001by⇥L󹚥.R􂭁4T( A*簁HSS.w𦢨5\u001f􋏍\u000e+\u000c\u0018􏯿>-󺊪\u001awN󱑍79󶘕᷾\u0001􍧮𫈪aD\u0005􆿄H𫄊(Z\u0007\u001bK@𤿳zfD9{Yu\u0012/EC\u0018Q\u001b,5􌫔k@-󼠞󸧝<𩎡\u0001\u0011J!󠄟=𮗛󻶣𬆖J=N𥹆𘄌\u000cT𨐶Zd\u0002p\u0001ju\u0012,󱸮@<n\u0010Ў`𠵵mf􆣃~m.G\u0006n:󶟉\u0012w DJ𖢏>\u0003|\u0017\u0003X!\u0011uZ.󾖐󸌐\u000elꭆ􇇥4!Z&_#m􈆣|L=ഠ\u001a[\r󺐣{CN󳭕𩳥2󷹟\u0007fl𣊖􄱟73k5􈫿늲􌅊󱧒𤱹\u000cLmE>V\u001d@K󼰤3,e!\u0010cV\u0003I\u001dP\u0006\u0008\u0017b\u0018\u000f>",
     "labels": [
         "",
         "",
@@ -20,5 +19,6 @@
         "",
         "",
         ""
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "r\u0007\u0016'oV𮜖mk𗤠4\u0006iE󴯇\n]\u0016///홠}c\u00159\u001e᪤U\u000bOc\u0019𨳛\u0008\u001b 𝑦<q𘥦󹾢\u0007𩶕\u000fQV&HA\u0006=\u0005𣵯컱簳x^𣔩Ce\u001d\u0001pOEl1\u001f&l𡻀􂮞W1\u0006󿰹8𪳤\u0017k{\u0019𖦁ᄅzL\toO(%􅳡feWH\u0014󴲹j$a%F㻻Ld𦦊\u0000-󱘬:i뭻\u0008\td\u001bPL􅮴H\u0000\u0010iA.s<𪘗-fL󿔡\n$+#󴬠\u000cDGWS\u001a\u000e\u000epR㲩d,q}\u000e\u0014󱒤py};Jy\u0012𝧈\u0002J.P󻱂(Se!!𧁸M䙍\u001e\nP1􉃩@P=<Fc7s㱵𮛗;ヶDL$ \u0000D_,i\u0016􁨳\u000cg\u0002[\\{󵞍 \u001f7󽑊󶣐􀫿0𤰝V挑2𤹖d4\n6z_9iQ𮎎R\u0015\u0001by⇥L󹚥.R􂭁4T( A*簁HSS.w𦢨5\u001f􋏍\u000e+\u000c\u0018􏯿>-󺊪\u001awN󱑍79󶘕᷾\u0001􍧮𫈪aD\u0005􆿄H𫄊(Z\u0007\u001bK@𤿳zfD9{Yu\u0012/EC\u0018Q\u001b,5􌫔k@-󼠞󸧝<𩎡\u0001\u0011J!󠄟=𮗛󻶣𬆖J=N𥹆𘄌\u000cT𨐶Zd\u0002p\u0001ju\u0012,󱸮@<n\u0010Ў`𠵵mf􆣃~m.G\u0006n:󶟉\u0012w DJ𖢏>\u0003|\u0017\u0003X!\u0011uZ.󾖐󸌐\u000elꭆ􇇥4!Z&_#m􈆣|L=ഠ\u001a[\r󺐣{CN󳭕𩳥2󷹟\u0007fl𣊖􄱟73k5􈫿늲􌅊󱧒𤱹\u000cLmE>V\u001d@K󼰤3,e!\u0010cV\u0003I\u001dP\u0006\u0008\u0017b\u0018\u000f>"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_14.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_14.json
index baa1639e5e1..820461e3d9b 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_14.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_14.json
@@ -3,9 +3,9 @@
         1,
         2
     ],
-    "password": "𣕅󾐢 q𓄒^$8u🅜\u000e󾽱𭽊]GᨭaN\u001d@X5jWZnJ\u0010y􆌞𪥾\u0014if8T󹴗B􋿞󻚘z舓𓁢𧚺CQ􏫻*\u001b󳛺4L\u0014Dl\u001e\u0002󼒳 n5􁊻􁩱\u0007c*/\u0001n\u0018{K󻩭𧭉A'%Hm聰\u00077󹿷󴃦r@YSW5I\u001e𡨧\u0012J>ZC6\u000eCn+󰝵mdiK\u001cS𨞱$𦺨𥰚;g\u0018/(YfSO\u001c`h𨣼󻐣\u0017&TMoO\u0019}PJ\u0003J\u000f\u0015wE𧝕\u0015\u0006R𫫑r3\u0013i\u0006s^RN􏌻o6E\u0015a\n􅉪𘦖w$C􄓴𘢃􋯚𗼷󿇵{Ii撤W{\t@􎩄?$Y`JA\\V\u0012m􋑮􋃦62N\u000fC\rK𬮪ᾔ𤠣􅆛􋚆𬧰\tGO𒁕\u0007􉍯\u0001;􉬓^3\rY䏷i\u0000ੑS2k7\u001eO󼲹\u0013󺖡[O!󱶰\u0006N\u001e2\u0015ᶦ[\u0010/\u0017{?,RNNM\u0012\u0001#J\u000bbA蟋됻󷧕/\u0017f\u001f𛀅\u0006\u0007i7N󱂓\u000741\u0001𦋇\u0012~:f\u000f\u0000(𪆐\u001bCo1N\nx4Mꠝ\u0003UjM^􀷢#􉊖\u001bbL~=HM6Ud9|\u000e=󷀍@`\r󸂙\u001b\">i󺞃4𘪽'\u000ewM\\𭭨Olq\u001ao\u001eZ㌑HB~\"s𣕨\\gO曽8􍄳.$\u001a􁱙r칦𤺛\u0018dH𣴁q~􂭨e릷棼9ZwHf􁽐􊶁m1\u000bb\u0000C#\u0000\u001a\u0003Z^󰵎ig󶆴\u001f_v!Zn.!螹b_𮛰\u0011𧁎\u0000u\u0008a𩪻)㍓o2\u0006󾷼󽝏[k쾆i􎄹\u000cu􁰐𥒗>y􂑪}􍳾􄮺S/\u0001",
     "labels": [
         "\"󸚓\u0007",
         "WG󻦬{"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "𣕅󾐢 q𓄒^$8u🅜\u000e󾽱𭽊]GᨭaN\u001d@X5jWZnJ\u0010y􆌞𪥾\u0014if8T󹴗B􋿞󻚘z舓𓁢𧚺CQ􏫻*\u001b󳛺4L\u0014Dl\u001e\u0002󼒳 n5􁊻􁩱\u0007c*/\u0001n\u0018{K󻩭𧭉A'%Hm聰\u00077󹿷󴃦r@YSW5I\u001e𡨧\u0012J>ZC6\u000eCn+󰝵mdiK\u001cS𨞱$𦺨𥰚;g\u0018/(YfSO\u001c`h𨣼󻐣\u0017&TMoO\u0019}PJ\u0003J\u000f\u0015wE𧝕\u0015\u0006R𫫑r3\u0013i\u0006s^RN􏌻o6E\u0015a\n􅉪𘦖w$C􄓴𘢃􋯚𗼷󿇵{Ii撤W{\t@􎩄?$Y`JA\\V\u0012m􋑮􋃦62N\u000fC\rK𬮪ᾔ𤠣􅆛􋚆𬧰\tGO𒁕\u0007􉍯\u0001;􉬓^3\rY䏷i\u0000ੑS2k7\u001eO󼲹\u0013󺖡[O!󱶰\u0006N\u001e2\u0015ᶦ[\u0010/\u0017{?,RNNM\u0012\u0001#J\u000bbA蟋됻󷧕/\u0017f\u001f𛀅\u0006\u0007i7N󱂓\u000741\u0001𦋇\u0012~:f\u000f\u0000(𪆐\u001bCo1N\nx4Mꠝ\u0003UjM^􀷢#􉊖\u001bbL~=HM6Ud9|\u000e=󷀍@`\r󸂙\u001b\">i󺞃4𘪽'\u000ewM\\𭭨Olq\u001ao\u001eZ㌑HB~\"s𣕨\\gO曽8􍄳.$\u001a􁱙r칦𤺛\u0018dH𣴁q~􂭨e릷棼9ZwHf􁽐􊶁m1\u000bb\u0000C#\u0000\u001a\u0003Z^󰵎ig󶆴\u001f_v!Zn.!螹b_𮛰\u0011𧁎\u0000u\u0008a𩪻)㍓o2\u0006󾷼󽝏[k쾆i􎄹\u000cu􁰐𥒗>y􂑪}􍳾􄮺S/\u0001"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_15.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_15.json
index 7d5c5dd7469..27a46add097 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_15.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_15.json
@@ -2,8 +2,8 @@
     "ids": [
         16
     ],
-    "password": "8􋨣]󵗨*ZB􅕵🝧Z𨣔,Pt\"wf􊑵󿳬l\u0000)ƺ󷟰􊍋􈃘󼞭%f𩲃WeL\u0012*\u000e豝0S@:i#d\u0007N쏤dQ;\\w\u0000>fR\u0011PzIM\u000b<$`'8𨗻_P󰽺􇻮ex􈐚M琙\u001a&-􇼉􅮙e\u00190󸫮찲󰙫\u0012\u001f\t󼫠􁾑􁵦󶲏\u0013\u0011宜\r^pZ]>zFu𓍀\"L\u0000l\u001d𩕝%;k6/<及􄸿􄡨􍪆Q^P𧯄󸣦D𡠾릢Q;􋜀\u0019;\u001ak𗝁&\u0019\u0018j\u0019d9􃩚4|~𢑗\u0005􈮒:}􅜳'𫨵\r!􂓔\u0014G𤥟SUi=1琥𗍆O\u0019􍔚fxn\u0004O\u0017\u000c\u000c0D\u0004󿧰\u001a*Y (\u0000h􄒓\\􋳽k}\u000b@3N𧒄0􍚘\u0014Xyo𝈝󸴫9)>n􁔑s\u00023l𩱠\u0001\u000c\u001e\"\u001c;\u00012e畟ioG]𭒆阳𧀗5IHH?\u000fO[~/\u0010+\nH.􊢩F>?7󴎌󹄬􋙽yvBM󰰘J,F𐫯u籒𦩵蛵I\u0017\u0014Z/􊙠`𣊱:\r\u000cD\u0006\u0008qz▵혦\\\u0002a?󵿚|\u001d>=M\u000b𩕾􏠛𧷓Qi\u001b\u001b<,uT癦Y\u0002睥2DC􂼎\t\u0012x􊙨:S@|1<nq\u0003Q5D~u􅔐bn𢲵􎲚\u0000\u0018v牏8𦕯팗\u0017[s\u001e1𨩢.'u\u0010b醢\"#면\u0015Rf􆂑!\u0003󺏯BL𝆕mX+􉴵\u0000E\u000c\u001e@",
     "labels": [
         "󾹕|𝣊𖾘\u0000v"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "8􋨣]󵗨*ZB􅕵🝧Z𨣔,Pt\"wf􊑵󿳬l\u0000)ƺ󷟰􊍋􈃘󼞭%f𩲃WeL\u0012*\u000e豝0S@:i#d\u0007N쏤dQ;\\w\u0000>fR\u0011PzIM\u000b<$`'8𨗻_P󰽺􇻮ex􈐚M琙\u001a&-􇼉􅮙e\u00190󸫮찲󰙫\u0012\u001f\t󼫠􁾑􁵦󶲏\u0013\u0011宜\r^pZ]>zFu𓍀\"L\u0000l\u001d𩕝%;k6/<及􄸿􄡨􍪆Q^P𧯄󸣦D𡠾릢Q;􋜀\u0019;\u001ak𗝁&\u0019\u0018j\u0019d9􃩚4|~𢑗\u0005􈮒:}􅜳'𫨵\r!􂓔\u0014G𤥟SUi=1琥𗍆O\u0019􍔚fxn\u0004O\u0017\u000c\u000c0D\u0004󿧰\u001a*Y (\u0000h􄒓\\􋳽k}\u000b@3N𧒄0􍚘\u0014Xyo𝈝󸴫9)>n􁔑s\u00023l𩱠\u0001\u000c\u001e\"\u001c;\u00012e畟ioG]𭒆阳𧀗5IHH?\u000fO[~/\u0010+\nH.􊢩F>?7󴎌󹄬􋙽yvBM󰰘J,F𐫯u籒𦩵蛵I\u0017\u0014Z/􊙠`𣊱:\r\u000cD\u0006\u0008qz▵혦\\\u0002a?󵿚|\u001d>=M\u000b𩕾􏠛𧷓Qi\u001b\u001b<,uT癦Y\u0002睥2DC􂼎\t\u0012x􊙨:S@|1<nq\u0003Q5D~u􅔐bn𢲵􎲚\u0000\u0018v牏8𦕯팗\u0017[s\u001e1𨩢.'u\u0010b醢\"#면\u0015Rf􆂑!\u0003󺏯BL𝆕mX+􉴵\u0000E\u000c\u001e@"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_16.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_16.json
index ea925cd60c3..372fadbcdc0 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_16.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_16.json
@@ -4,10 +4,10 @@
         1,
         0
     ],
-    "password": "詎Kxx\td黫2𣌔;\u001e𭾦\u0006\u000cp%\u000c]T\rI:᧞mṕ󺔽W4{\u0012𪞥\nY\u001d|\u0010SP\u000cWO𩪄6(\u001d#\u0016󺄤8v\u0000ﮡ3𨅹\u001d5󵣮~n􄱞AF_m\u0019i\u00152𐐹\u000b렾|7@\n2~N\u0008料\u001fQX􏒍vyr\u0018\u0003\u0005Ok\u0004\u000b茓\u001e@w\u0010\u0003C \u0004ꅈ&\\+󵋺\u0015􈲠!g\n[%{>h\u001f􉺨\u0004h*B-\u0012\u000b􊦙@T\u0006󷕝pj┉3i!𗣾M|\u0011\u001cAID\u0019eXtMzq\u000fn󴥫EBs@\u0008\u001ci\u001ergD𣐮+댯\u0018i󴐱&𢂟t峗󰄳੬􄽼<3\u0019.+fd鯣B2󻏊\u001c\u0002𫾦taa󺌿G\u0017\n\u0019𤻉肫􏍀UVｉ$󰖑􂗷\u0007aN@𥇴pLྊ\u0000􀏧\rT/\u0006􁋣L\u0000&G\r𠳊7-dB\u0005Q𢿭qQ\u0006Y󼂉\u000bP/\u0008𗚦q\u0004Kଲ\u0003R\u001e𗈊􏙡\u001bR\u000e[\u000c:\u001d|@\"𮦓𝇑􆋠󽔷ma\t밻\u0010`\r􅓊\u001c!M\u000b𞸒𬱢y𬽸D3=A􏧷4sZ8,&a\u00140\u0019𭿟\u0019𦻓󴍂\u0012談j\u001c󶶍\u00040]:\u001fu\u0018#r\u0002E+Ov꺔gb󸍀\u0018Z[􉷹]󺜧𦜧n􄓙X!􅧍󴤡𪮇>!6 qጰ󾬴Bf-y`𮯚f;*𛀖B漃\u001a𭼫zQG󸹊㈂d\u0017kGj\"􊲍唋盙\u0015T\u0002󵁹S\u000b󹱥8P|F<m!\u0002F𦇍\u0000qj-[X57fჱ𢰶2G.S󸌰@\u001b\u0000m>饵C\u0001s+#𘢴𝙕\u0005tT\u0008Y\u0007󲧀q􄕮?􅩕lm^󺇍ijL􂅶󻇿+\"\u0017𫅖H\u0015.jZB𝅴I\\\u001d",
     "labels": [
         "\u0011",
         "r{",
         "?X"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "詎Kxx\td黫2𣌔;\u001e𭾦\u0006\u000cp%\u000c]T\rI:᧞mṕ󺔽W4{\u0012𪞥\nY\u001d|\u0010SP\u000cWO𩪄6(\u001d#\u0016󺄤8v\u0000ﮡ3𨅹\u001d5󵣮~n􄱞AF_m\u0019i\u00152𐐹\u000b렾|7@\n2~N\u0008料\u001fQX􏒍vyr\u0018\u0003\u0005Ok\u0004\u000b茓\u001e@w\u0010\u0003C \u0004ꅈ&\\+󵋺\u0015􈲠!g\n[%{>h\u001f􉺨\u0004h*B-\u0012\u000b􊦙@T\u0006󷕝pj┉3i!𗣾M|\u0011\u001cAID\u0019eXtMzq\u000fn󴥫EBs@\u0008\u001ci\u001ergD𣐮+댯\u0018i󴐱&𢂟t峗󰄳੬􄽼<3\u0019.+fd鯣B2󻏊\u001c\u0002𫾦taa󺌿G\u0017\n\u0019𤻉肫􏍀UVｉ$󰖑􂗷\u0007aN@𥇴pLྊ\u0000􀏧\rT/\u0006􁋣L\u0000&G\r𠳊7-dB\u0005Q𢿭qQ\u0006Y󼂉\u000bP/\u0008𗚦q\u0004Kଲ\u0003R\u001e𗈊􏙡\u001bR\u000e[\u000c:\u001d|@\"𮦓𝇑􆋠󽔷ma\t밻\u0010`\r􅓊\u001c!M\u000b𞸒𬱢y𬽸D3=A􏧷4sZ8,&a\u00140\u0019𭿟\u0019𦻓󴍂\u0012談j\u001c󶶍\u00040]:\u001fu\u0018#r\u0002E+Ov꺔gb󸍀\u0018Z[􉷹]󺜧𦜧n􄓙X!􅧍󴤡𪮇>!6 qጰ󾬴Bf-y`𮯚f;*𛀖B漃\u001a𭼫zQG󸹊㈂d\u0017kGj\"􊲍唋盙\u0015T\u0002󵁹S\u000b󹱥8P|F<m!\u0002F𦇍\u0000qj-[X57fჱ𢰶2G.S󸌰@\u001b\u0000m>饵C\u0001s+#𘢴𝙕\u0005tT\u0008Y\u0007󲧀q􄕮?􅩕lm^󺇍ijL􂅶󻇿+\"\u0017𫅖H\u0015.jZB𝅴I\\\u001d"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_17.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_17.json
index 7978af1de78..406de2b51bc 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_17.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_17.json
@@ -1,8 +1,8 @@
 {
     "ids": [],
-    "password": " 6*\u0000큞r\u0011𨜘}>48\u0010􈨣a\u001bu^\u0012r􋮻koq􍯼@䍂f󻛵:􅀹g𨄁Pr'嘹𫐓)\u001dDE/`\u0013\u0001^M\u000e󾓼oN$%x퍟𞢄𪪩i𩒁W",
     "labels": [
         "嗡𣣚",
         "𪆡i\u001d󲛵"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": " 6*\u0000큞r\u0011𨜘}>48\u0010􈨣a\u001bu^\u0012r􋮻koq􍯼@䍂f󻛵:􅀹g𨄁Pr'嘹𫐓)\u001dDE/`\u0013\u0001^M\u000e󾓼oN$%x퍟𞢄𪪩i𩒁W"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_18.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_18.json
index 40bf5a2752c..d72a1351ffb 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_18.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_18.json
@@ -2,9 +2,9 @@
     "ids": [
         31
     ],
-    "password": "\u0011(𮔼𪚺au(_i󴅼kz􉠃K\u0010gc\u001aP\u0015􉢰4𧬊]𞡌\u001aZ3mS𪷞A&󻭑􊆲O.=\u0019,𩪟襇\u001f)\r\t%b]\u001d𣎇ne0\u001b𨛅flCO徣hI\u0008\u0006qM锋JL\u0016D iP;9.ms9\u001b\\F\u0000\u00048𤒍􈴼]g\r󲳱8\u000eT\u0013􎥼~陦\u0006W>o`\u001eꗥ9I`Vm,YFt@yl􉽠𨤏7_\u001bev\u0000\u00160ᘟ\u0016𫙾/U\u001d\u0018u,󷉘3\u0017[TBs\ti<\u000e㛗?Y?`놜3!M\u0019HK󶀢\u0015}0o;󾜟\u0004􎾹~𤦆\u000c$\u00074j􍆖󹶠v*􇕐쩀$&_bP𘒵箨DB𠇿E겴}7󰣳󻴣눶#\u001fA⺏8&j𠿀o%ms(\u0003􊺡T󾧐j\u0002F\u0007(菟K𘘡.\u0017(\u0002喷N󿢦𫝥\u0005nk\u0001\u0014\u0013s\u00010󼊩\t󶎠T󵪹F8,艅\u0003O\u001f{\u000b<Ჩ􅛪\u0004>\u001f.\"󵝔[\u0013SE󾹪9D8bf罻5bR\u0005􏬧􋿎2k`𬟝꺤\u0008M鐢&*\u0011F\u0002\u0008<􋝾󰧓\u0000|g?_量<{$L#\u001f𮈇 \\.3\t􃉛Qᠹ󹋜P\u0001\u0000b~B\u0012nu𢂁\u0004􎍂P􃖁\u0015𫑿󹃄\u001b8\\_J*\u0016폲n\u0010쵔3𝐹\u0001􋟕􎨢ol󿠓\u0019to>8\"\u0013`b\u0012\u0008􏖠a췆\u001a9Y\u001bO$t\u000c;𣒰.\\N(sV\u0002%󻝮b\u00009𦚜􀘷{Eb\u0019{\u001a󷘆0􋈂\u0018󴛜@󼈆􈡳M뵸󰤒􋁐8_\r\u0013/󸼭EB󽇾\u0016􄔱YV󳤺󵿇􁫒_M\u0002􆗰qweO𠝿w􅑗\u0014\\k\u000f󿢭s9𦇯5#􅩏\u0012>;PmFl0b\u0002𪮾P\u000f~P!|<$煷Ta\"j􄿫p轨t𩷥󲠃5&RJ:h/󽪄\u0010G:=|𤋄🀂\u0000}BCY󴝵𧭉r\u0012ꩡ󳷢\u001b󴬍\u0006+󻷍'\tᦏ𥱗\u0000\u0010&+)TvZ􊆔󽊞]GW\u0018P5yp􌉡b|m𥙫",
     "labels": [
         "-󳒗\u001aI뛩",
         "﹕"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "\u0011(𮔼𪚺au(_i󴅼kz􉠃K\u0010gc\u001aP\u0015􉢰4𧬊]𞡌\u001aZ3mS𪷞A&󻭑􊆲O.=\u0019,𩪟襇\u001f)\r\t%b]\u001d𣎇ne0\u001b𨛅flCO徣hI\u0008\u0006qM锋JL\u0016D iP;9.ms9\u001b\\F\u0000\u00048𤒍􈴼]g\r󲳱8\u000eT\u0013􎥼~陦\u0006W>o`\u001eꗥ9I`Vm,YFt@yl􉽠𨤏7_\u001bev\u0000\u00160ᘟ\u0016𫙾/U\u001d\u0018u,󷉘3\u0017[TBs\ti<\u000e㛗?Y?`놜3!M\u0019HK󶀢\u0015}0o;󾜟\u0004􎾹~𤦆\u000c$\u00074j􍆖󹶠v*􇕐쩀$&_bP𘒵箨DB𠇿E겴}7󰣳󻴣눶#\u001fA⺏8&j𠿀o%ms(\u0003􊺡T󾧐j\u0002F\u0007(菟K𘘡.\u0017(\u0002喷N󿢦𫝥\u0005nk\u0001\u0014\u0013s\u00010󼊩\t󶎠T󵪹F8,艅\u0003O\u001f{\u000b<Ჩ􅛪\u0004>\u001f.\"󵝔[\u0013SE󾹪9D8bf罻5bR\u0005􏬧􋿎2k`𬟝꺤\u0008M鐢&*\u0011F\u0002\u0008<􋝾󰧓\u0000|g?_量<{$L#\u001f𮈇 \\.3\t􃉛Qᠹ󹋜P\u0001\u0000b~B\u0012nu𢂁\u0004􎍂P􃖁\u0015𫑿󹃄\u001b8\\_J*\u0016폲n\u0010쵔3𝐹\u0001􋟕􎨢ol󿠓\u0019to>8\"\u0013`b\u0012\u0008􏖠a췆\u001a9Y\u001bO$t\u000c;𣒰.\\N(sV\u0002%󻝮b\u00009𦚜􀘷{Eb\u0019{\u001a󷘆0􋈂\u0018󴛜@󼈆􈡳M뵸󰤒􋁐8_\r\u0013/󸼭EB󽇾\u0016􄔱YV󳤺󵿇􁫒_M\u0002􆗰qweO𠝿w􅑗\u0014\\k\u000f󿢭s9𦇯5#􅩏\u0012>;PmFl0b\u0002𪮾P\u000f~P!|<$煷Ta\"j􄿫p轨t𩷥󲠃5&RJ:h/󽪄\u0010G:=|𤋄🀂\u0000}BCY󴝵𧭉r\u0012ꩡ󳷢\u001b󴬍\u0006+󻷍'\tᦏ𥱗\u0000\u0010&+)TvZ􊆔󽊞]GW\u0018P5yp􌉡b|m𥙫"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_19.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_19.json
index fb7e933c5de..fd8c31e836a 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_19.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_19.json
@@ -7,9 +7,9 @@
         0,
         1
     ],
-    "password": "\u001d(xl[󳏦\u001f󾗉[󿆝&;R󱼲*{󷳛􎞟RXc@r\u000f󻹪4vb\u0013I8𥗡\u0016\u0015􋋸\u001fR􌼊P}􍤙\u000bn)H\u0008𑈹'侮\t\u0012􂭶cO5q⠟]r󵢐C\nLJ䳗ax{Ys㮆|󼕁\u0004n|󸆗;D7Pq \u001d'_𢱥\u0007\u0004􍸣Zo\u0005\u0010;3󶔚#Y?E􄌊'𡵔b􃔁𘟄b-?\u0002~󰡡V<>\u0010\n𗵸O\u0012o簟𨋱yҤ焎胻𥎡\u001cꋜ}w\u0010飝\"\n󺜻i'􃍅𢱩𦠘􊒺\"&H瞱ypueH☤A}no𝕾\u0007𔗪-\u0008-\u000c𬓳\u001e\u0003GC=󵎮o9!쒒y\n\u0018Yf\u0001)󷮚\u0002𬼎uIv􉮄1!xUr@O\u0011,w4yg\u0005E6r磿𑨰\u001f􆤫-\u001b#\"!궡󰃊󻆩󱼆\r\u0002i|\u001b@J<[T[􅮼Y,a!㴣E𢩉𠱉Ej/2$AF􍹶Yട$JY洖󰯽\u001aI.􈆹󾄜MhzLfbA2굪U󷹍GC$𧞳\u0005𧑾.\u0003'\u0017􈷎􃚈\u001a􃩨􉨾s\u0012\u001f\nc𨂂zTm\u000b祿\u0008oc<\u001exO3>🨞AC^+Gp\u001f|qdT혌\u001e\u0011QRf\u0013\n􎁀,qfsb{E\u000b\"{c𝁧醃mV𑵡P󰽁A{q󲊴\u0008妇L\u0017{PGle𬄬I5\u0001u\u0015ha47e\tB𩟦m󿏄\u0002:𮝔dp㇣\u0013\u0003E􄖯\u000c\u0010\u001ejZ\u0002/~\u0011𭂹p9􁷬Ƶ鐠\u000c9󲂞!HG\u0005ᮔ􄘣hn$\u001a㢁}󵉛雉\\cvma󴢧IuY=PS\"`RF\u001dZ󺘠𪵿J\u000b󰜄\u0013\u001b$𤶈𦫱~.𩋮𗅿\r\u001a􈘅?M\"Aff\u0016}}+𢰒󸳳2",
     "labels": [
         "ZIa",
         "A+k&7"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "\u001d(xl[󳏦\u001f󾗉[󿆝&;R󱼲*{󷳛􎞟RXc@r\u000f󻹪4vb\u0013I8𥗡\u0016\u0015􋋸\u001fR􌼊P}􍤙\u000bn)H\u0008𑈹'侮\t\u0012􂭶cO5q⠟]r󵢐C\nLJ䳗ax{Ys㮆|󼕁\u0004n|󸆗;D7Pq \u001d'_𢱥\u0007\u0004􍸣Zo\u0005\u0010;3󶔚#Y?E􄌊'𡵔b􃔁𘟄b-?\u0002~󰡡V<>\u0010\n𗵸O\u0012o簟𨋱yҤ焎胻𥎡\u001cꋜ}w\u0010飝\"\n󺜻i'􃍅𢱩𦠘􊒺\"&H瞱ypueH☤A}no𝕾\u0007𔗪-\u0008-\u000c𬓳\u001e\u0003GC=󵎮o9!쒒y\n\u0018Yf\u0001)󷮚\u0002𬼎uIv􉮄1!xUr@O\u0011,w4yg\u0005E6r磿𑨰\u001f􆤫-\u001b#\"!궡󰃊󻆩󱼆\r\u0002i|\u001b@J<[T[􅮼Y,a!㴣E𢩉𠱉Ej/2$AF􍹶Yട$JY洖󰯽\u001aI.􈆹󾄜MhzLfbA2굪U󷹍GC$𧞳\u0005𧑾.\u0003'\u0017􈷎􃚈\u001a􃩨􉨾s\u0012\u001f\nc𨂂zTm\u000b祿\u0008oc<\u001exO3>🨞AC^+Gp\u001f|qdT혌\u001e\u0011QRf\u0013\n􎁀,qfsb{E\u000b\"{c𝁧醃mV𑵡P󰽁A{q󲊴\u0008妇L\u0017{PGle𬄬I5\u0001u\u0015ha47e\tB𩟦m󿏄\u0002:𮝔dp㇣\u0013\u0003E􄖯\u000c\u0010\u001ejZ\u0002/~\u0011𭂹p9􁷬Ƶ鐠\u000c9󲂞!HG\u0005ᮔ􄘣hn$\u001a㢁}󵉛雉\\cvma󴢧IuY=PS\"`RF\u001dZ󺘠𪵿J\u000b󰜄\u0013\u001b$𤶈𦫱~.𩋮𗅿\r\u001a􈘅?M\"Aff\u0016}}+𢰒󸳳2"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_2.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_2.json
index 8e0dbe1b3e8..55ef88bbe1a 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_2.json
@@ -1,7 +1,7 @@
 {
     "ids": [],
-    "password": ".]6?|n\u0007􄆬b`\n\u001d餟*K\u0016#&\nfuį\u0019o\u0001-\u0013𧢤f󱪻g\u0017B\u0014[DG+\u0015$w6]s\u001d\u0006NE3󼐑H𠆵16u`2nt󸾝3u!\u0000람􏴻\\𤞣𩿼\u0004ꎣDC𪉋闄h1of\u001fh}e]읃-VT}􋝰孴\u0001􎍛\u0008/\u000e􇙩󸍴lsWIV\u0008vc[்g+i{\u001cx􍡨\t畩a\u001a\u0017􍥥9\u0018%Ima+􅜪𠭨\u001b>c)@6Y\u0014m\u0008:S\u0008􃃓[$7𨬗\r\u0019]\u001c`4⋗`caw\u0011\u000e󲿫􂥥_𝠲A<:K𬕅Y5륧R|\u0018Tzx8\u0003􎯑𭜫𗪋\u001fD󿝜~𗺤𦄭\u00163\u0018㰮􋉙X𧿛;▀2\u0016-+𫢽恜M𥙇0X\u0018􆡶O뻶\u0019𪢫&'\u0005{m@ᕊN􊂱$c84\u001f~#􀱟!觔C􁊡T\u001bV𣤹8Fwc𩟏J𗳟",
     "labels": [
         "曎良\u0004:𣎔"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": ".]6?|n\u0007􄆬b`\n\u001d餟*K\u0016#&\nfuį\u0019o\u0001-\u0013𧢤f󱪻g\u0017B\u0014[DG+\u0015$w6]s\u001d\u0006NE3󼐑H𠆵16u`2nt󸾝3u!\u0000람􏴻\\𤞣𩿼\u0004ꎣDC𪉋闄h1of\u001fh}e]읃-VT}􋝰孴\u0001􎍛\u0008/\u000e􇙩󸍴lsWIV\u0008vc[்g+i{\u001cx􍡨\t畩a\u001a\u0017􍥥9\u0018%Ima+􅜪𠭨\u001b>c)@6Y\u0014m\u0008:S\u0008􃃓[$7𨬗\r\u0019]\u001c`4⋗`caw\u0011\u000e󲿫􂥥_𝠲A<:K𬕅Y5륧R|\u0018Tzx8\u0003􎯑𭜫𗪋\u001fD󿝜~𗺤𦄭\u00163\u0018㰮􋉙X𧿛;▀2\u0016-+𫢽恜M𥙇0X\u0018􆡶O뻶\u0019𪢫&'\u0005{m@ᕊN􊂱$c84\u001f~#􀱟!觔C􁊡T\u001bV𣤹8Fwc𩟏J𗳟"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_20.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_20.json
index 54ec5825ddb..fe9b5b62564 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_20.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_20.json
@@ -6,10 +6,10 @@
         1,
         1
     ],
-    "password": "TP$.\u001e􍛈X\u0019WWs(AG𭰹󽒄U\"\u001cC\u0005𗿴>\u0014h󼌐)\u000f𩿹VS)\u001f\\\"_5𘨃e\u0007\u001a\u0000&z\u0012}􅑐𨽆j⩲UD\u0003B\u001d3/𗳿􄏆~\"?𨆎\u001cc􅹇j\u0019󸓤]-𠺺􉃹𫥄oPU\t𩱏\u000c;佷\u001eR<𐢉{T\u001b\\RpG\u000e󱯁.\"s\u000b.\u0012\u0014\u0010K2跕􄺙ኞ㴩7~[𝦋X\u001f𒉣nk+0!\u000c\\Z9P_𘈚$󶆤\u0001.]H\u0013D#N{\u0011𐍶Gj/T\u0011󿈹E󴃾,𬦎\\\u001dO\u0007$@UP𡝇yf􆣘mX\u0007EO@B𬢧#3\u0004Hy㫹\u0005\u000f0B\u00174\u00064c~\u0005𡡠3Zu𫲲\u001aR3=8ై􏰒;b~\u0005\u0005x􌠔7\rLP7l\u0005\n7𣸥(\u0001𑒲<􋴃U\u0000|𤖆>\u0007\u0007{\u0008&KYr_9Ms#k\u0010#􊛌z󳷻\u0010l󹦄𫇅VF⛩u8G\u000b\u000c;첀!󳭞_󾺀󰜾R\u0007GA󹭬km4:|?`&0|􀣋\u0011~D\"{|󰴛9/t\u0014l􁴋F!2\u001f󵠂\u001bd\u0014/p􏵼r\u001f{(L𬺌䜪,zJ\u0001\u0006a/\u000eb\u000c%G &6h𥓹|\u0008\u0019i.𞱿3\u001cI󸓯\u0005ZY\u001e􉤱K/f?-f\u000e\u0004N􈝛\u001fx𥔕8PMวd\u0012#\u000568c%\u0013\u0013􍞗𪾜𭞕t\u0016󵊳G)\nl𣇘A>𨉵􊾡󸔠I26~𨃽𢚑Jp\u0019.V9lQbi>\u001f\u0008ngީ󽃀𡰄𨖝E)@WD\u0005\u001ejA􆛵鵻􄭍8K-\u001at\u0011擳.㸏󻸓t\u0006酐\u001518L|\u000f\u0003\u0019xE\u00148j𤞢\u0017羮22I;}\u0006No兩\u001dg\u0018quY󼹴\u0007\u0019+\u0013\u0015e.\u0002妊u􏂜s󸂽MD\u0008􍯐H\u0001\u0000;i4u8Vp􄩰o\u001f]i𥢝p\u000cv韉N⊸F|s[𥡪:h􋫐J6d\u0015䃸u𨣳󿕓gq",
     "labels": [
         "􎚥",
         "",
         "󾘨(d"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "TP$.\u001e􍛈X\u0019WWs(AG𭰹󽒄U\"\u001cC\u0005𗿴>\u0014h󼌐)\u000f𩿹VS)\u001f\\\"_5𘨃e\u0007\u001a\u0000&z\u0012}􅑐𨽆j⩲UD\u0003B\u001d3/𗳿􄏆~\"?𨆎\u001cc􅹇j\u0019󸓤]-𠺺􉃹𫥄oPU\t𩱏\u000c;佷\u001eR<𐢉{T\u001b\\RpG\u000e󱯁.\"s\u000b.\u0012\u0014\u0010K2跕􄺙ኞ㴩7~[𝦋X\u001f𒉣nk+0!\u000c\\Z9P_𘈚$󶆤\u0001.]H\u0013D#N{\u0011𐍶Gj/T\u0011󿈹E󴃾,𬦎\\\u001dO\u0007$@UP𡝇yf􆣘mX\u0007EO@B𬢧#3\u0004Hy㫹\u0005\u000f0B\u00174\u00064c~\u0005𡡠3Zu𫲲\u001aR3=8ై􏰒;b~\u0005\u0005x􌠔7\rLP7l\u0005\n7𣸥(\u0001𑒲<􋴃U\u0000|𤖆>\u0007\u0007{\u0008&KYr_9Ms#k\u0010#􊛌z󳷻\u0010l󹦄𫇅VF⛩u8G\u000b\u000c;첀!󳭞_󾺀󰜾R\u0007GA󹭬km4:|?`&0|􀣋\u0011~D\"{|󰴛9/t\u0014l􁴋F!2\u001f󵠂\u001bd\u0014/p􏵼r\u001f{(L𬺌䜪,zJ\u0001\u0006a/\u000eb\u000c%G &6h𥓹|\u0008\u0019i.𞱿3\u001cI󸓯\u0005ZY\u001e􉤱K/f?-f\u000e\u0004N􈝛\u001fx𥔕8PMวd\u0012#\u000568c%\u0013\u0013􍞗𪾜𭞕t\u0016󵊳G)\nl𣇘A>𨉵􊾡󸔠I26~𨃽𢚑Jp\u0019.V9lQbi>\u001f\u0008ngީ󽃀𡰄𨖝E)@WD\u0005\u001ejA􆛵鵻􄭍8K-\u001at\u0011擳.㸏󻸓t\u0006酐\u001518L|\u000f\u0003\u0019xE\u00148j𤞢\u0017羮22I;}\u0006No兩\u001dg\u0018quY󼹴\u0007\u0019+\u0013\u0015e.\u0002妊u􏂜s󸂽MD\u0008􍯐H\u0001\u0000;i4u8Vp􄩰o\u001f]i𥢝p\u000cv韉N⊸F|s[𥡪:h􋫐J6d\u0015䃸u𨣳󿕓gq"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_3.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_3.json
index e54c187e049..32dd5f65b09 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_3.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_3.json
@@ -7,11 +7,11 @@
         0,
         0
     ],
-    "password": "n􆍔8^󿻓빦x􃢱\u0019𑐎󸡙a\u0014􊮘<'\u0012'CS5䕉\rc\u0013󻅷a𩻨ᨦ+\u000fFwqHI \u0012Cc𦇼󿬧n]󲼃\u0018󺎯|𥽣C\u0008\u0019t\t\u0018s𪶣󱕄\u000c󿖁𫷑-X\u0003h󶨄󽛁'O󵉬i\u0006M]𧧼1T3z(Sb󳌠󰺌󶣔3󸶚󱑵󺢔LM\u0002\u0016箏?\r󷎒@/R7;M\u00001\r􏊃\u0018X􌲈\u0019Qc􍆼f5#k\u0000\u001b𥗫\u0016E=9\u000f\u0012uw\u001a\u0011\u0004􁜮{\u0016i𖥫a+\u0010ZO\"W:Wkᣨwg_J\u001f+S~E&1𨙒󼜛橃?'𦢋𝐥%TY󳭚D({.⑸7𠧄F󹣲&g=􀳍|􅼅A\u0007\u0014\u0018;P󺉋S\u00011GyP䨷|􀀄s𡅨G▉IGB08B<􋺅􃫜\u0018D\u0005󲌨|~y\u0012\u000b󰒞&𬪾\u000f!z\u0012 標M燯\u0019W5\u000bN?]!v𪁪,1𬡀\u0002%%\u0004v\u0016g/𣕼􈀧羌􇩉,3'ᵹ)\u0006P\u0018I\u001f?\u0010𞱹]𢂃􉥱bo\u000c􎿚h󿆽i\u001axI41Sf𣊹𬣺𥠅\u000b\u001f󺇶\u000b.(\u001d\u0004𪽮$\u001fEQ𫚪!!K󿶣Q\u001b𣜥`;􊰨.\u0017\u001b\u001cRN:\u00167\u0006:\n𥨹󹲿<𣶪:󲠖E\u00081JN󸢁\u0005WAK\u0005dAXD4[O\\>\u001exV6$\u000b",
     "labels": [
         "E9",
         "\u001b",
         "𠼰",
         "\u000eT"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "n􆍔8^󿻓빦x􃢱\u0019𑐎󸡙a\u0014􊮘<'\u0012'CS5䕉\rc\u0013󻅷a𩻨ᨦ+\u000fFwqHI \u0012Cc𦇼󿬧n]󲼃\u0018󺎯|𥽣C\u0008\u0019t\t\u0018s𪶣󱕄\u000c󿖁𫷑-X\u0003h󶨄󽛁'O󵉬i\u0006M]𧧼1T3z(Sb󳌠󰺌󶣔3󸶚󱑵󺢔LM\u0002\u0016箏?\r󷎒@/R7;M\u00001\r􏊃\u0018X􌲈\u0019Qc􍆼f5#k\u0000\u001b𥗫\u0016E=9\u000f\u0012uw\u001a\u0011\u0004􁜮{\u0016i𖥫a+\u0010ZO\"W:Wkᣨwg_J\u001f+S~E&1𨙒󼜛橃?'𦢋𝐥%TY󳭚D({.⑸7𠧄F󹣲&g=􀳍|􅼅A\u0007\u0014\u0018;P󺉋S\u00011GyP䨷|􀀄s𡅨G▉IGB08B<􋺅􃫜\u0018D\u0005󲌨|~y\u0012\u000b󰒞&𬪾\u000f!z\u0012 標M燯\u0019W5\u000bN?]!v𪁪,1𬡀\u0002%%\u0004v\u0016g/𣕼􈀧羌􇩉,3'ᵹ)\u0006P\u0018I\u001f?\u0010𞱹]𢂃􉥱bo\u000c􎿚h󿆽i\u001axI41Sf𣊹𬣺𥠅\u000b\u001f󺇶\u000b.(\u001d\u0004𪽮$\u001fEQ𫚪!!K󿶣Q\u001b𣜥`;􊰨.\u0017\u001b\u001cRN:\u00167\u0006:\n𥨹󹲿<𣶪:󲠖E\u00081JN󸢁\u0005WAK\u0005dAXD4[O\\>\u001exV6$\u000b"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_4.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_4.json
index 0dbdb91b8a7..fa0e6a3deec 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_4.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_4.json
@@ -1,6 +1,5 @@
 {
     "ids": [],
-    "password": "4􍏔􃿅_\u001d\u0002䞪5J++𣖎/\nR=8m[唉S8𥴴|𩌎6󺇆w췱𧡯nTK󲄺E'[l蟨$릤덶󺨛󽣑\u00149w\u001c+𮔻H\u0011n󱢖\u0017\u000fJ\u0005(M𡙰\u000f\u000b\u000c:\u0015r𥃊󿢬O\u0005葉떕󵛪*𠒋󾯽𥫝Z\n𤇚j󳃑!b𐎮唖K\u0008𨎂c𔒵\u000b{Zm𞹟)\u0014􏑺𗡐󶸾\u000f}M󺞪_퀟}&󱩜\u00141\u0013\u0000r􀵪r𝌫D/H,\u000e\u0001\u000f󽦕\nD퐫4H7LK󶒕DM+!\u001dY\u000c%vof󵻊\u0015𣚱􂶰𢋂\u0017\u000f\r",
     "labels": [
         "",
         "",
@@ -11,5 +10,6 @@
         "",
         "}",
         ""
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "4􍏔􃿅_\u001d\u0002䞪5J++𣖎/\nR=8m[唉S8𥴴|𩌎6󺇆w췱𧡯nTK󲄺E'[l蟨$릤덶󺨛󽣑\u00149w\u001c+𮔻H\u0011n󱢖\u0017\u000fJ\u0005(M𡙰\u000f\u000b\u000c:\u0015r𥃊󿢬O\u0005葉떕󵛪*𠒋󾯽𥫝Z\n𤇚j󳃑!b𐎮唖K\u0008𨎂c𔒵\u000b{Zm𞹟)\u0014􏑺𗡐󶸾\u000f}M󺞪_퀟}&󱩜\u00141\u0013\u0000r􀵪r𝌫D/H,\u000e\u0001\u000f󽦕\nD퐫4H7LK󶒕DM+!\u001dY\u000c%vof󵻊\u0015𣚱􂶰𢋂\u0017\u000f\r"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_5.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_5.json
index e4fd7b70b82..6ea54d39d8f 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_5.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_5.json
@@ -8,6 +8,6 @@
         0,
         0
     ],
-    "password": "&ℂdऍE􅞷𧨇\u0014OR\u0016E/4\u001a\n\u0008I\u001fz\u0017󽌗~lI𩫇Id\u001a𑱳G\u0007?􇏨L1𪆭;D\u0017sI3\u0014\u001d􏔚p\u001a!E2\u000cF/K\nE:R\u0010\n𭓑𪦁\u0004󶌽f9",
-    "labels": []
-}
\ No newline at end of file
+    "labels": [],
+    "password": "&ℂdऍE􅞷𧨇\u0014OR\u0016E/4\u001a\n\u0008I\u001fz\u0017󽌗~lI𩫇Id\u001a𑱳G\u0007?􇏨L1𪆭;D\u0017sI3\u0014\u001d􏔚p\u001a!E2\u000cF/K\nE:R\u0010\n𭓑𪦁\u0004󶌽f9"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_6.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_6.json
index 972c824dfb7..d42b884bef8 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_6.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_6.json
@@ -1,11 +1,11 @@
 {
     "ids": [],
-    "password": "w]𦺺_H𪋓𡩐O𐢧p&􂇳z\u0019l)*\u001f,'ᆁ\u0002z929vꖫ~\u0007㷚N\u00026\u0002\u001d <\u0012\no~󺺩Nn𨡾󴯁󽔧jH\u0006N\u0005IL598\u0015w뭱=Q􆤄#󷓃k\u001db$%𗦼𧴲鶝\u0012k\u0008\u001c#\"鿂?󺦾sE-W/\\|\u000e\u0016jzYW妙s􍀥動;'󽜆,}c2󿊻\u0000\u00036󽄦\u0011wNis\u0011}Q􆛲a󻬆qd󳘿JOUK𓄕$a\u0001𒔜􊝭􎵣fY?\u000ekX𑈚𮮪\u001c5阨􌪀i\u001f(\u0005𔔰쵸}m쾟=X\u0011\u0003M[6[𩘣x<Q𐡨}\\V<\u000b󿓔𛊷q(0\u0013\u000eXYB𩼊QYyJW0r3\u001f?𠖬:󲒻/|`\u0006b#\u0013l󴃏|=xK0:\u0016c\rM>W㫔󱪍\u0008\u000f,􆶏썁\u001e\u001e\u000ek)꼾zE럨\u001bऋ􊉽^􂷁]儬\u0004𗸮𡋬\u0007𡵂CA&\u00033YK'S2+fI&􊰋z弝A恈5Qu𭪣r􋴸I킮Z\u0001dv􏼂k3\u001dN𛅴㡚𫪂홴\u000e@󹎩􆉵5\u0002\u0012-\u0002􂣹7\r`\u0004%\u001aN┱!3\u0005;Pr𠼔ⵆ𣓒(􂬄\u0002􊱎\u001d垭m[\u0001`\u001dB6􋄞C[v䲋Sq\u00157\u0011닆礿&𤶇뻫JTBR\u0002p𬄛?y㮊Aik􌩒s:Yl𡳾=鏲)\rGU𫑎𦕬h􎵝󱖡⍘8Q\u0007~䟎\u001a􋆯-}1v䧁h)􀽇~G봑\"I1?𥩊⭠%Px<I\u0004𦸁󹬔尌z\u0004􉆳BfOC\u0006it\u001bn\"%\\􄿌I𗳞𩇫󴹴Q\u0017\u0001\u000b$M􆰊\u0017C\u001e\u0004W􉪻󵘨􁫎\tD󻟴]󶛸W1𝧠e󲫤󳶺J\u0014t𗷑\u000e&\u000f\u0013똳􎢒d>th\u0013su=/⏟𢺙m+\u0018ᴔZ\u0012𠡗\u001eXe\u0013[\\8>~\u001aR\u0000Y?0\u0001?HI\u0008e􃦯5\u0002|\u0003,, e󶝮\t\u0016`-仁\u0012\u0019􅊁=\u0015\u0000DrL54\u00182Fm󸽀3\u0010ꌃ䳳\u0015;Jv\u0001b먤􇉉(9􁔃DV􋌀\u0002를鉤L\u0008S\u0002Q\u0000_􄐻Z󱅘沁(\u00167\u0001T􁉣𠇛PhI𥫪;𩾀[J󼕠POxH5\u0001\u000cu􈦄:􉞮\u000cx\"𧎄\u0011\u0003콱d𧑰}󿳋>\u0006\u0016=j\u0017󴍈塖mF󾁁6\tl`ť$Ἧ󿗵F91􊫨O\u001a:L󻡢󾼰j􂁧昝SQwM:>􆊧|e^ixFd\u0007{\t𥷚\u000c6q)>>&J\u001fm\u0010蓮A\u0016\u001b𣟊ሩdP<i+K:kd,$`􁥨\u0013\u0014^𤖕76C􂉀g\u001ewE􆳠北zDu=*\u0012pN􊇍\n,\u001a𞀃􄵭䙍*\u0011{硊`rf􎇣o󽅭\u0016x􋇎g<Iq獢I5(X9D󽥒𐐨&l4𤤱\u0015\"𥇐0󾥡\u0004\u000b~%\u000f𘦺d\u000c\u0004;eVyM\u0014𭼣󿗸7􏀫.􎚼󶶖\u0000𧷠􄈩+c\u001c\u001dQK^\u0003o屿㭢7\u0010~f󵑝\u0004䰀y\u001f󺈵t#MpqˬP\t",
     "labels": [
         "",
         "*",
         "|",
         "𮤘",
         "K"
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "w]𦺺_H𪋓𡩐O𐢧p&􂇳z\u0019l)*\u001f,'ᆁ\u0002z929vꖫ~\u0007㷚N\u00026\u0002\u001d <\u0012\no~󺺩Nn𨡾󴯁󽔧jH\u0006N\u0005IL598\u0015w뭱=Q􆤄#󷓃k\u001db$%𗦼𧴲鶝\u0012k\u0008\u001c#\"鿂?󺦾sE-W/\\|\u000e\u0016jzYW妙s􍀥動;'󽜆,}c2󿊻\u0000\u00036󽄦\u0011wNis\u0011}Q􆛲a󻬆qd󳘿JOUK𓄕$a\u0001𒔜􊝭􎵣fY?\u000ekX𑈚𮮪\u001c5阨􌪀i\u001f(\u0005𔔰쵸}m쾟=X\u0011\u0003M[6[𩘣x<Q𐡨}\\V<\u000b󿓔𛊷q(0\u0013\u000eXYB𩼊QYyJW0r3\u001f?𠖬:󲒻/|`\u0006b#\u0013l󴃏|=xK0:\u0016c\rM>W㫔󱪍\u0008\u000f,􆶏썁\u001e\u001e\u000ek)꼾zE럨\u001bऋ􊉽^􂷁]儬\u0004𗸮𡋬\u0007𡵂CA&\u00033YK'S2+fI&􊰋z弝A恈5Qu𭪣r􋴸I킮Z\u0001dv􏼂k3\u001dN𛅴㡚𫪂홴\u000e@󹎩􆉵5\u0002\u0012-\u0002􂣹7\r`\u0004%\u001aN┱!3\u0005;Pr𠼔ⵆ𣓒(􂬄\u0002􊱎\u001d垭m[\u0001`\u001dB6􋄞C[v䲋Sq\u00157\u0011닆礿&𤶇뻫JTBR\u0002p𬄛?y㮊Aik􌩒s:Yl𡳾=鏲)\rGU𫑎𦕬h􎵝󱖡⍘8Q\u0007~䟎\u001a􋆯-}1v䧁h)􀽇~G봑\"I1?𥩊⭠%Px<I\u0004𦸁󹬔尌z\u0004􉆳BfOC\u0006it\u001bn\"%\\􄿌I𗳞𩇫󴹴Q\u0017\u0001\u000b$M􆰊\u0017C\u001e\u0004W􉪻󵘨􁫎\tD󻟴]󶛸W1𝧠e󲫤󳶺J\u0014t𗷑\u000e&\u000f\u0013똳􎢒d>th\u0013su=/⏟𢺙m+\u0018ᴔZ\u0012𠡗\u001eXe\u0013[\\8>~\u001aR\u0000Y?0\u0001?HI\u0008e􃦯5\u0002|\u0003,, e󶝮\t\u0016`-仁\u0012\u0019􅊁=\u0015\u0000DrL54\u00182Fm󸽀3\u0010ꌃ䳳\u0015;Jv\u0001b먤􇉉(9􁔃DV􋌀\u0002를鉤L\u0008S\u0002Q\u0000_􄐻Z󱅘沁(\u00167\u0001T􁉣𠇛PhI𥫪;𩾀[J󼕠POxH5\u0001\u000cu􈦄:􉞮\u000cx\"𧎄\u0011\u0003콱d𧑰}󿳋>\u0006\u0016=j\u0017󴍈塖mF󾁁6\tl`ť$Ἧ󿗵F91􊫨O\u001a:L󻡢󾼰j􂁧昝SQwM:>􆊧|e^ixFd\u0007{\t𥷚\u000c6q)>>&J\u001fm\u0010蓮A\u0016\u001b𣟊ሩdP<i+K:kd,$`􁥨\u0013\u0014^𤖕76C􂉀g\u001ewE􆳠北zDu=*\u0012pN􊇍\n,\u001a𞀃􄵭䙍*\u0011{硊`rf􎇣o󽅭\u0016x􋇎g<Iq獢I5(X9D󽥒𐐨&l4𤤱\u0015\"𥇐0󾥡\u0004\u000b~%\u000f𘦺d\u000c\u0004;eVyM\u0014𭼣󿗸7􏀫.􎚼󶶖\u0000𧷠􄈩+c\u001c\u001dQK^\u0003o屿㭢7\u0010~f󵑝\u0004䰀y\u001f󺈵t#MpqˬP\t"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_7.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_7.json
index 57a313026ae..8e190d5a35e 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_7.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_7.json
@@ -8,8 +8,8 @@
         0,
         1
     ],
-    "password": "𬇣H+[j􅫵\u0014\u0018",
     "labels": [
         "s\n🗚gM\u0011𑱤l "
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "𬇣H+[j􅫵\u0014\u0018"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_8.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_8.json
index e5e2276ddf8..0e17be7d712 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_8.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_8.json
@@ -3,7 +3,6 @@
         2,
         0
     ],
-    "password": "\u001d*􀱪=!ns8L({9V.\u0007\u0015X\n9AH\u0000⧾mH-Ys𨯡zI󺑋\n- QHAP4ꖡ\u00131㭅촅`_.\u000b-g𩄋\u000b\u0010k􌭹jcu`𥡥􏃕m]t\rrAggj\u001d~Ms\u0003胱^.:B\u001bUv\u0006zE:7",
     "labels": [
         "z",
         "\t",
@@ -11,5 +10,6 @@
         ";",
         "0",
         ""
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "\u001d*􀱪=!ns8L({9V.\u0007\u0015X\n9AH\u0000⧾mH-Ys𨯡zI󺑋\n- QHAP4ꖡ\u00131㭅촅`_.\u000b-g𩄋\u000b\u0010k􌭹jcu`𥡥􏃕m]t\rrAggj\u001d~Ms\u0003胱^.:B\u001bUv\u0006zE:7"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveCookies_user_9.json b/libs/wire-api/test/golden/testObject_RemoveCookies_user_9.json
index a538b25098f..c80f08d9d81 100644
--- a/libs/wire-api/test/golden/testObject_RemoveCookies_user_9.json
+++ b/libs/wire-api/test/golden/testObject_RemoveCookies_user_9.json
@@ -2,7 +2,6 @@
     "ids": [
         1
     ],
-    "password": "伴J᯦7􃆐9􁳈.ᨐ]0\u0005Y^_'𐁇+󵚣w((􁮬e$37!$, t\u001b󷷦0󴎃󱞞MꈹB-W𥴩M\rc2􃨘\\𬐃􍺝r󷐄mG]}21M1󲯿􌑕#料\\溱2d{t?\u0010F􁷲\tR\u001d\u0000􂵇\u0013\u001ba\u0004󷠿🐌\u000b]􃦨n\"V\u00070𧀓􊞰R&0􎑕d3枲𥽂ec󵭷\n􁡷\u000e􄜹Yk\u001472\u001c8𢍾v󱁎𗂣s\u0014\u0002rQk2Ma*=c󸋖󲘇*2'󻡧B栗|b\u001cD㥊k􄻋i𮉇y\u0007h~蔢𩕎\u0017\u0006E\\Rsc.D\u0008\\W󷀓󴳈U}𦲪slC\u0014%ꇀ󱯮L8uZ􁕤E}\nP(\u0014<\tf🗅􃓪훀햺!\u0017󴔼󶢶3\u0013qa𤈉􀷁L\u0001􃩄AL\u0017\r⇚\u001d/L叧G\u0010w佨𥷽\u0013\u000c+b𬴗k􀲬􂄚l#I\u0012\u00130􄙦Z􁜖~\u001eh􏌕\u0005󻴰\u0013`𑲈󷆌\u0004󴙲󺜾􍺱ud,􌿌^vx\u0018\u0017C;F\u00077#&+#k(1\u0008𫂾𩥻\u0002~$K0!z폦󶚓\u0003%􁱳􍀂\u0006\u0014C3_玸\u0006h =8|$𦠪,f駟䶍􉨹\u0007\u001f𤔭\u000f􃽾$(u\u00190\r𧑌a3\u000eMV\u0012𬻘v􃋛/\u0011\u000b􎱜\u0016^:\t\rVꎉ~/]\u001bqK􂃹%曆\u0010屹&U\u000f뤿G\u001f\u001a𫉪\u0010aJ𗣴\u0005/@\u0006􇧣i\u001a5􀛖oz\u001f?󲒆c􅂏rZ2𣹀 \u0004𬙯\rxseov󸥉\u000f𨋺)_\u001aa󺱨C𡽨I\u0003\u0003𖭤W󰊴\u001a'L\u0000'䊬􃱾\"2𤪜'#<TwqJ<􃴣\u0019s􃒙ctId𡨽'􅿢\u001e󳮙𓉹SB\u0000嬧i𨻅󲐹\u0004𥡔.5􆫩-$:Y\u0016H'W㘣\u0008Mx𠏛x6m󻡨\u0010dSpSGn*\u00199z",
     "labels": [
         "",
         "",
@@ -23,5 +22,6 @@
         "",
         "",
         ""
-    ]
-}
\ No newline at end of file
+    ],
+    "password": "伴J᯦7􃆐9􁳈.ᨐ]0\u0005Y^_'𐁇+󵚣w((􁮬e$37!$, t\u001b󷷦0󴎃󱞞MꈹB-W𥴩M\rc2􃨘\\𬐃􍺝r󷐄mG]}21M1󲯿􌑕#料\\溱2d{t?\u0010F􁷲\tR\u001d\u0000􂵇\u0013\u001ba\u0004󷠿🐌\u000b]􃦨n\"V\u00070𧀓􊞰R&0􎑕d3枲𥽂ec󵭷\n􁡷\u000e􄜹Yk\u001472\u001c8𢍾v󱁎𗂣s\u0014\u0002rQk2Ma*=c󸋖󲘇*2'󻡧B栗|b\u001cD㥊k􄻋i𮉇y\u0007h~蔢𩕎\u0017\u0006E\\Rsc.D\u0008\\W󷀓󴳈U}𦲪slC\u0014%ꇀ󱯮L8uZ􁕤E}\nP(\u0014<\tf🗅􃓪훀햺!\u0017󴔼󶢶3\u0013qa𤈉􀷁L\u0001􃩄AL\u0017\r⇚\u001d/L叧G\u0010w佨𥷽\u0013\u000c+b𬴗k􀲬􂄚l#I\u0012\u00130􄙦Z􁜖~\u001eh􏌕\u0005󻴰\u0013`𑲈󷆌\u0004󴙲󺜾􍺱ud,􌿌^vx\u0018\u0017C;F\u00077#&+#k(1\u0008𫂾𩥻\u0002~$K0!z폦󶚓\u0003%􁱳􍀂\u0006\u0014C3_玸\u0006h =8|$𦠪,f駟䶍􉨹\u0007\u001f𤔭\u000f􃽾$(u\u00190\r𧑌a3\u000eMV\u0012𬻘v􃋛/\u0011\u000b􎱜\u0016^:\t\rVꎉ~/]\u001bqK􂃹%曆\u0010屹&U\u000f뤿G\u001f\u001a𫉪\u0010aJ𗣴\u0005/@\u0006􇧣i\u001a5􀛖oz\u001f?󲒆c􅂏rZ2𣹀 \u0004𬙯\rxseov󸥉\u000f𨋺)_\u001aa󺱨C𡽨I\u0003\u0003𖭤W󰊴\u001a'L\u0000'䊬􃱾\"2𤪜'#<TwqJ<􃴣\u0019s􃒙ctId𡨽'􅿢\u001e󳮙𓉹SB\u0000嬧i𨻅󲐹\u0004𥡔.5􆫩-$:Y\u0016H'W㘣\u0008Mx𠏛x6m󻡨\u0010dSpSGn*\u00199z"
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_1.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_1.json
index 493ad3a3d4e..a554c003413 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_1.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_1.json
@@ -1,3 +1,3 @@
 {
     "password": "7\u001bA𘦏16=}:rs9$V𧢖\u0003𦞬p􁬐ϔ)\u000b􄊪L/D􁋓r󴫹\u0006􉡸󱙷cK\u0016v竰󻈋jM\u0006𓆡ir\u0004󶶲🝉􀖢apqj3󲰳H%y:b􀽹\u0010𑜗V\u001aW{0\u0012-8󼽡𤐦\u000eEK󸅧턖w󶙞feg2𤲦\u000f@4K􋰾u\u0014]\u001d7􈇇|\u0017:􈽾\u001aPIr\u0008ࠞ𔕱\u000e\u001bA/􌴎}𡓚%D\u00070`\u0012o_󵸫\u0012uݦEn\u000c$\u0012{X\u0002\",𦕞;𮡳0"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_10.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_10.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_10.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_10.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_11.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_11.json
index 9739c22f03e..92eb855d303 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_11.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_11.json
@@ -1,3 +1,3 @@
 {
     "password": "s*\u0007y\\+󰸲𡒒4\u0013Zc\u0012>5𗢖𢪘V:𥰋\n(6\u00019\u001a󼤄苠#􉿴g'􇊥p'?9\u001eb󱸁Ⳟ𐧰\u000e뿢3z;\u000fT3\u0012{)wJ[,\u0017<#𨑍\u0017[KN\u000b`Y6P\u0006嶅G\u001d\r_/X*!w󶲔*s󶺏#󹜕l?6j5\rxabx過𘓶\ro\u001a󺻹􋏔Fy􎣺𨯴A\u0001}\u001a\u001e𥅛Sj𪔠􍗄\u0015)f􋵛8HsF2\u0015𪪷T\u001a\u0002TYO\u0013~\u000b􅯄\u0010q\u001apt m\u0017g6z𧈺𡰔STgX\u00123Vv^N􂯾ﲁY\u001ej.ZM`P1>󸇝y𪵓𨁆Wa􁁀헁b\u0017𥯘𦷕𥢋)}𫪖+󸢁0ky!~󲺂螦9P𤙙\u0003Qc\u0012E女<*o\u000c\u0000𤟰W袿\u001a󳲕a1\"{ઘ\u0003(3󰜄`屿\u00078F󷲩k2𮢂\u00148uA'[lBq`𡉷fy\n!nAM M\\$󸺸𢈙B7=𧁠𢀷t^\"<\n𦝕\u0013󸗧+l_cd絁. xmI󸮽l\u0004E􍊚mFH`\u0007󲊢𣆹Iw\u001cC\u001c[􎶕\u0017C(8^o\u0005$\\FS\u000e\"\u000b󱿨FP5'\u001a\u001d󴤈􆺏=\u000f\u0011\u0010Q/{\u0010#\u0006@e@󵛤𦣷>C\r6)f\u0003}󳰺M}\u000fNF\u001c􆀬Ge𢑼A\u0002\u0011yM13t6\u001c怩96\u0001T󻀵4𩐼QH%PṂPEW𠜈\u000c\u001d勾VMx𩧹.2H\u0007󽇹𪱑󻌭\u00147Jn\u0019ir􏿥5􀍥'󴅁\u0017𗽖S籞\u0012􃫸E*|\u000e^<🆢;\u0008+Au\u000c\u0010󴨆KD𔒴J0\u001a%\u0017V\u0011J<䣓G\u001d\u0013h􈾿,\u001b󷴦\"󸼷,KA[𣒙\u0001%k𓂔p\u0012偆0𦲠G\u0014_We;𖢈𖹝\u0002+sZ\u0013Lc𢼲\u0005tm􃒆NS"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_12.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_12.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_12.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_12.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_13.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_13.json
index 32f9f0425fa..8d1c0e6f039 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_13.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_13.json
@@ -1,3 +1,3 @@
 {
     "password": "\u000b^O씝􃶴𗍺\u0015\u001cwZ􅃁\u0010􏯄\u0015㚚??􇨵1}𩡣B`v􇃞;2_aᨙ𥸵>󰣖􋕶\u0002𩄬b\u0017#ԡS𔑀󶋹t\u001a]𢆫kw=L􀀔c9𬻱\u0002⭁b?|~\u000c􇒘󳀐6O𡷸M􌠅k􀕸Vp􍄩I)ds\u001b#\u0005󵢹Z=L衎譮=G%慮r봤\u0002􄱁^[Y-\u0007~(0󴦡U(𨵯)󲽁jcv𡒪\u001c(\u0006.\u000c􊖹󿃟6󰅓宽p􁍨|\u000f`R󹥧擀wP{\u0000GVో𩫏􇊯qS/슞8뀨􏟽(ꌿ{S\u000f?!R𮇵\u00119}\u0018nY;𬋫\u0014|􋹷,􏾳r󳃾𦸵𘚘􅣡\u0016\t\u0003#1󳥗u?nm0􏄦z둰W\r\u000ec𘑅􋴳iDu\u001b+\rp󾋱=Os􁺾GzលH!+d\u001f\tu/nM\u0013N2\u000b􉲳𥇰%䠞\u00116혼􈣩<d\u0000(?\u001a?U2=󠅐􏦙󲴥e{K奞\n*㇟\u000e]@ᑵ_5F􅱪b:𭫋l𘦊!d􃤿SuAJ󱕭\u0019\u0010Ox]}G󱻻/𠮋\rA.\u001a󾽏\u001eFGb\nA󷧰*m􄌁𮇞󻌽\u0005H/\u001eꏴ\u001d\u0012\u001d\u0002D^\u0010\u000fd𣡶\u0015鄪[\u001bAD;􂬋\u0008O6󵥹I+᷾\u0013󼕔䦊f󲅝\u0010j\u00148r*`\u001fnA\\󹔻\u0001m,d3L\u0014V\u0005P\u000f\u0017K$\u000c\u0015Jng3iZ𮪑^𐝐7Gd!\u0000uXDU􏈇\u0002sjJUn0u\u001f&䔔\u0001ZL*\u000b\u001e꩞y𥳄~B􍥪Y-\\\tN=\u0017a󽔆׀󾔂󱘇~yxvy<>N󲼝󵓖Q𝪇7\u0011\u0003|󼀌.bk\r qWp;\u0018_RO5Ss)\u0000\u0001)\u0017\u001e󷓎U&9𗈥3{o.􅀚G0󸾒𨯙PB𢞶\u0018JO\u0000\u001b\u000f.\u001aH5P^QFID\u0008􆗕\u0017𨆙\u0001襯\u0007􂱢NoꍆAO󹧁\u0011B\u001b􍤜J\u0008GS&4wGm#>𮈞-􍣰z\u0003󻇼\u001eM悴9󱸚\u000f%mq;\u0018􈓿\u00027v􄄘LW\u0003\u0018\n􇡪\u001b臚kC󷁸󶉝􃔬bvp\u001e\u0000{USyk\u0006MF\u001b􎴞䭩𥰒kM:\u0001Gv\t\u000c􃉹u8@󰴜{\u000f\u001a꾗>(\u001cIw~䭌󼞏􀹌\t󱥰H?𮆴S[mൣ_\n,#􅤌󿫗墦ퟐgG6A3𧸹;􌘅鹕7"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_14.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_14.json
index a0af0c96d60..ee52091db87 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_14.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_14.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0014T;J;F󴳂Hભ%\u00140F!𦲋q2{ꓳdX\u0018F\u0002M8𡺅6N𪙍\u0008󵼆s<6󳘜􇛛𭯩>I\u001d󺀈~􊑱\rg%jZ\u0007󶶄𪺾\\S\u0013𠡓Oc`n𠵟MFp:2󺻼󳻚S\u0010𤱜2lp@\u0019󠄩)\u0018$*FM\u0000#􌵮􌤵>$㌹湑\u0006󼒊󽺸訕󶴿󸵼\u001aETJpCX󵩤𞴮􃏿q𥴩\u0007*\u001foj@􄭽\u0013d\u001b󹈏;\u001b4\u000bP󴡡\u0018\n\u001dN쨴찫𧼳j\u0007XYR:y󲷢_VG󹄧\u00177􅊞Yl`\u0012T7\u000e\u0001􄌻_s\u001e\u0003ySD\"{\u00123𥀗Hh\u0003\u000c󷷍􂓢?8󻔬ᾬvN󸤺6Z􍄧AWD}Kk𖩀\u001dQX6\u0005󴩑cCi\niB-􆧇LkdM\\\u0006𮎭4kd]\u0003􇤌󿕵|\u0011\u0007\u0013􌿖U%cm\u000f|깣\u0003jH𢨢V1\u000b\td&FW󷚡\u0015𞡑󳀐󴟍󶆬B~i.5󻆓\"Z~Y\u0002rV偠􇕗\u001b\u0011\u001e\u0018ZaM?F[Bjm2T𣡡y\"󴼭b.􎉱,_){w\"C&rG\u0017g@7􂓌\u0007𨌄\u0018Მ[7~{\u0019𥭚\\ s\u001f!l𐡱b'q\u001coSm@}厌~{L(󼦧Ik𫵻􌪴i{rk󲘭󸑟=d󺭪􌎤𡠱n4𥣌l\u001cn𠣬\u0014!􃫰7\u001f-\u0013󾒸en]\u0014A`砷\u00106􁼅Hl\t􍺛\u0006\u0001\u001d6:EjI+𣷅{Nf/s𫮚\u001dti\\𘉉\u00119eUu`H\u0000\u0017xO􍪣oM\u00139(\u0010k(|9/\u0011𡹴,􊄺:\u0001鵖@/.sLi\u0006🕫\u001c󺗬􍢴𣰶\u0014\u0013?f\u0000|]Z&gx\u001a꣑)i1|;󱀱1s\u0005𗾆뗀x>;􊟄𪣋WR&8\nLêOT\u000b~+\u001a𮄠zOq\u0000􃾍l$􍔾}\"\u0005󵇺}􃆉|\rzn\u001fdTNomHt\u0006\u001a<\u001bt🤛🥟1b􍟛𗊊g\u0011<⽝7<0酦\u0002PZwᾯ 􃷋D)Z{뵽\u0015\u0016Cz𘞳V𬹸􇶞I붽\u001f\u000c􂅽\u0012\u0012\u001b!}Tr\u00053z9\t\u0019F󱀓~q\u0017h쁍嵩\u001b1\u001d􌹩𥵜h.󾴊X)\u001e]\u0005=e\u0000A괫c_􇕈󱜢\u0016`\u0010t[V\"3𬔪7#c󰃙\u0012)0B7􇌣􋐼M=&.f\u001f⋀#h𮓒٧9N@T%#!Ü7蛥\u000bk6@\u0004\u0005f〬𬵦𬤅j:{wm𧸨􁕱𒀏U\u001c5䬑􇥀(􀎮oA󷴏!𫖃_UNyG_e\u0002^\u000e\u0004)Hc𡯒~𖺑=SZ󾣊x􌾤`󴌰ﯔ𩖹\u0012\u0003fM\u0001p;,\u001dhfbt\u001eB􏃽⎶󳤅d𖼘\u0019𝙭󻀑~m󸯛)X𪍞(Z𫴵\u0014\u0008\u0004\u0014􋞊􀢸-8T\u0006/o\u000f;𢠄MLW󸋆0yjGd\u00129\u0004󳋌4\u0001M|\u0008\u0019\u000f7SF\\8ꇲdBJ󶆜7D%F+魲𨀼\u0007󱜑>󷄿=S#K􊝷𒊡荣𖹙􃺭f󽚖d.󵉍󼉥\u000b웶󼐈p{`ZJr\u0007뎻c\u001f&\u001f^C\u0011\u001e㉱N3i&\u0019\t#\u0014\u0000hoj󱝱\t\u0015𢟘􆺄䂧t\u0004U^a󴚟\u001e\u0014볷󴇷wh􄛾\u0004py\u0008\u0019.%5\u0011G7Ꚉ2W噢<M{4O8K@\u000fG>𔘟?S\u000c<V$?􃒥p7𡫬R\u001fX#𬌙b$^􁇄B.\u000c8T𤠎4(=1\u0007\u0015\u0011s\u0001_ o-1𦢱\u000c殄Dvf'\u0005\u0004s盚\u001eq\u0017\u000c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_15.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_15.json
index 04b98d3398c..14c46d66715 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_15.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_15.json
@@ -1,3 +1,3 @@
 {
     "password": "o\u0008bJ𝞡mD􂊋\u000fh[7􁡓\u001bhl<𬘩ᷯ6es\u000f𦗤􏀑􊮡㢫󻗺,\t\u0016 mz\\_v9􁰆q菐*Aq󰔅SE4𤩰\n𠩈춋󲖑\u0008]󸻏􀨧5\u0019\u001b'v|nI􅧃F\u001f󵌨𨨴'𭅘j\u000c󰳇\u0013j􃓅\u0001\u0003\u000e􉓕􊾙\u0017ukǼ\u0002-􌌍$\u0006s􆳩CN\u001aQ>Kf𭮟\u0004C#_v\u001fU\u0013\u000b󻳼Xuꀫy󲹼󹯒𘊏`a{+𧙷bO䋜S\u0008\u0018\u000c󺰥&\u0014𦬂5엻Mgz.\u0010- w􏎜#􅙣b󸒩\u000f3\u0013O\u0017𧮸O{>q􉝡@]\u0003\u0003\u000c󱨧[)󷧳𣣟n\n􃊸𞹏𨂂yI[y}*7Gs\u0001z.􈗜􂐪Iᴔ03\u0015<](1sQ椬뎸󵢏}-QL&p쪧\u00004P5\u0000\r6󹎍\u0016{䜓I𪬼𤈽󷐋F?\u0000c\u0013x\u001d#`䷤d2𡠕>󷢕'󵓟`\u0016\u0010AEU\u0003,I)􌅉𩃐\"𨏱\u001c\u000cN\rZ\u0012j\u0004𭠅d𨛍4\u001c\nM\u001b/푽r󼜫𫸰A\u001f(Hsu\u0001`$\u000eq{~F\u001e𩖚^T􃥘𨎺a\u001ffN[Y\u0005ଈ\u0019W/\u0019W贝􀪨𣅴fC+𠲷_󳂨_𪢦^{Q8\u0002,󹞒oCG\n\u0017B_(\nB\u001b􈔇䑢W,􈆣$\t\u0005E𝆠>𨋔-𫻨󱗌l𖦔􁭎W􉊮)BZB􉟥􆆔\u0018iP\u000er>+\u001eo}m󼠏-\u001ben𩾣𥢹{}X7e⏷􇈻t􊖆\u0014eH\u0003Z\"b󽏡𔐧$\u0006瑧𫗬8󷶩O1[=p{|\u001f󽃃b\u0006J\u0011I\u000bk\u0016\u000b\u0016F\u0001Cp\u001b8?\u001eH🝞rs\u0006􋌳\u0007\u001egD砦zG[3󸝽7j𠿻\u001afl🁁IY\u0019\u000bt\u001e\u0010g+S\u0007>\u0011𪤳7\u0008vnbA䓗\u000ec𪹗􅧚\u000f𫁯𑣣􎆝1㒉klS D,ؿ>𛆗+\u0003/󱪳𗓈˳+h\u000e\u0011^(𮈑j1oVY~󼹶𦋇7)媬\\`𨠄\u000e\u001b\"<󸜂˳\u001b+食d{XeD𝥘󽹪L𘇛\u0002U\u0008􁅴qw\\􀺴I|s󿓫\u001a*L𮛀&o\u0005_RS0𔒂􁩜󶫢e@󰘧>󾓤U􀂔󰈾m􇬚0\u001d\u001e^dYE𦪻㡗n\u0014+\u000c?𗕅.\u000b𤡼󱁴\u0004\\\u0001M\u0012D𩍅lW:U𥇍>栓𭮋🠶YS^]:\u001d;t𠇰N\u0005\r\u0018lm𬮩bdqo4p\n9f\u0006\u0019}Zc}}p07Q-\n{𨐯z=\"/󿴘􇒴;m🜛_𗋸3􅘶`\t@A훭rr0I\"\u001e􌡩􀔋S\u001b1cݾ9Y\u001dW􀡃\u0002d󵧾獗Tk𡩣P𡻎\rwk\u001f11 \\𮮬I즁\u00057甦+M8T󹒸⨓\u0003L👹𐭇Jo;\u000ev􃢥k\u000cﻩex\u0016! 􇮲j\u001d&C􌇈𩊠\u001e\u001b𤷫~+>=I{᮴5𬒱H[o<\u0002?𠅡󽁾𨟙󺟂E􀶼+a_ULd\n󾻲n􏍯(g%\r󵰱&Z\u001b𦞹dtm*􎧯^zp𨊽g\u0008𪔈w`\u00169\u0004F\u0019q\u0018􌣁󼑞e\u0015B\u0017gO\r\u000c􆏛\u0004􏠙\"}\n\u0016󷟭{}Br\u0003e𪧤U\u001dP\u0010r󰈱𭒣S^𣖔wꁙ m🙳l=\u001e𧗦|󾤣#)#鳂$g\u0003\u0004)풌c􆩠C󳊻[릴\u000b󺑡\u00086EP|L&\u000b𐆇WT#𐹶*~\u0000勒C􍝿&E󾙑\u0013|􈝊@𪐊}\u001aLdi?\u000c^\u0006BFi𗍔/{쓃zL=\u0018\u0007_md\u001f~\u000fWL\u001d;+󳊥􁥶􌜻H`Do𨓫y𦷩Xw\u0016􊼋\u0005\u0013𭚡𫣉/锠C􏽍Wq25!{L\u0010u!D⾇7N𝧱ng@P!𢉼`\u00053\u000f;󰦵gl %2n㓕𤧣;O0󿧎D𠽍R"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_16.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_16.json
index 1bb59e8b838..f82fa7e059f 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_16.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_16.json
@@ -1,3 +1,3 @@
 {
     "password": "󲫔\u0008m~\"\u0011𪿻􄅬\u001c⍵𧄯𬺎\u0010\u0016&X\u0011𧛃Z󴞬\u0011q\u0017R8\u0017\u00139􏕄:󾀅p\u000c\u000bZ𗎾YH<6먕t4yJRg𡾸􎂡%\u001aG𦿢[-G\u000f𘗜:󺣔?EO𭑟+󾦨I@s+<6󸶴󿂏국ᴏ⊐i5,.\u0002󺿩𠯻ny\u00075NL\u0011Y\u001c\u001aa\u0014􋹂\t􄯐/P:l9<\t􊊙r\u001b􈊂!\u001b𬝝38󲽰*]IW󿧌戜V]t.s=fm}/\u0002Bt\u001e✣^𘃮\u0003\u000e𡽢\u001a󻟸^\u0003o尤(<p󳴥#\u0016(脊󲩴󸟳󺛨<=􍼘\n5𫞺)J?%󰠢^󼶴`P:8𝐍𒂕\u0004]!𘖂cX𧁖ᝇ𠨇Zzv􉑞&𣌋\u001a9M~x\u001d`QS𬎪󲗷Ov\u000f+`\u001bS4;\u0017+􏜟\\\u0007𡿩\u0010V@g\u0008\u0007󼌻􉷗CyP󾓎&r\u0012c|􃋈Z育􎸲a#W\u0014\u000bN]>\u000cnq\u0003\u0017[\u001d\u000ex\u001f\u000f𡒓^,O)\u0011c[;cp"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_17.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_17.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_17.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_17.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_18.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_18.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_18.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_18.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_19.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_19.json
index fbd0219a0b3..d84d8cefc7a 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_19.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_19.json
@@ -1,3 +1,3 @@
 {
     "password": "N󲋛p\u0011#\u001f\"Wj\u000c󹊗faJ􅩑nM𬣢U?5<&p9P[𤹐\\t\u0010W\u0010􆑤OBH2|C㓎~M𠬹󺠹5\u0013\u000c󲭭}\u0002H.𨹏b󳬩f\u0002C􂘞󺺹󴨪|\u001f1Lm\u001c粈)\u000b\u0001\u00107\u0018󰸍!v5XM\u0006ꕠC\r1(H\r\tzQ|rxmn􇏢HS\u0013\u0010nj?􃯘\u0000cqW𞤤n𨜕偨1\u000c𩉚\r 䤴D䤨\u001c~4d[r\u0002󶛿lU󰋂HP!E>fvW􉟍)YA~𝙢wr\u00111\u0001𬇠𐤲1\t\u0000T𤙈q^=𢈮9􍲛JY􂪐ꩢ0\u001aa焵\u001ef󳟌[0%0F(*󽈗d\r󼼿\nF\u0008g=\u0014􏇊灋r\u0005#)Y𣁎cJ\u001a𭍡󲿗MtJ\u0011(𣗣𧾀FJ6^\u001cnm𩜆Mm󽫣5|􁃷\u0007:Fy􉥖Mdt딚>󼦽WK\u001aj?\u001f91\u001ca}𝚀鉿3\u0005$O\u0016;FL\u001f$􁡗Jue\r\u0010kG[!|f>\u0019\u0006\u0004\u0008􅮬]Ojj\"c\u001c󵣵𧣰*\u000fI:\u0017%㵳ᚣ`L\r>\u000f馁􏰇%\u0003M_󳧳\u0003CqkM𪅔B󲉣N7^󾶍Q\u000b\u000c􀋡{\u0004?🏃6.\u0014\u0006\u0016𤟈jP|L&\u000c󲔢X𮧉M🈛PRh󾊄:󷻌\\󼒄To\\|dG󲁶n􈦔C;-EZ\u001d\u0007N'󸯺\u0002Y@􄹗󵼧7頿4~\u0013v󹥰\u001b蛛𣼈E󼅣\u000b\u001aE圲R/󶕿􍖀%䈅\u000fb\u0013X\u0010:d\u001ea\u000f􌶆󴤞So|{𢨇6\u0006m}}?6\\\u0010):\u0018𡽡4\u0014%<\n^f𧅤𡦭\u0012e繁&\u001d󵆾3󻫢\rwt.'h􄼜C󸐌oO_𫩞A]En𫹨&Z󿰍:\u0016"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_2.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_2.json
index a86679dd196..94d0024951e 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_2.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_2.json
@@ -1,3 +1,3 @@
 {
     "password": "󴂛y0Wdy줓\u000bec䬯P^!iU\u000c6i\u001cPaP𤜶c#鋫𮘃ⲟ&!󹣨󺵹[XDU\u001bD𮉅\u0008\u0003\u0000&kN󿰌\u0014<s>us􍠣\u000f󰝋톳,/\u0010􌖻\u00018\\bM􃨿裕􍰁]b욑N0󼚣B\"4􃰜r𭚌.\u001e󷌱+\u001ei0\u0007&\u000f^\u0003/\u0015j\u0019u7?>􅝢z\u0005x𢆌𬡣餆󲰵p`#<$𮌂r\u001f\u0018􋉜\u000fax􁯊\u001d􈬽\u0008󻋔(ꑱ\u000e5n씀3.𫓖W)􄦓𣶟V𧶦<🈻7u3싲>rG󷟆\u0015\u0008𘆻󲒅d䈦N5뽱|\u0017󴖩󷡉𞠕Nﭵ\u000bK\u0010\\f⋺eㆢWt}t;v\u0003h5\u001b\u001c􁀶^hjf\\\u001d𭦯_􎹔G\u0007,\u0001💼󵱾a\r\u000f[\u000e𦬐y\u0018jVs􊖲Ii刅i\u0005􃓴𢈯${𥻻2\u001e:󴞽􁓝\u0016\u001c*@$_@f<\u0000󶇻_S8M\rw儦%_|o=c0<󸘒r 󳚕\u0002sy{n9\\𘠣N~0d$􊢌𝝂㌬\u0011􅋒O󸸚\u0004\u0011\u0005lB!\u000b􎽒𩸿3W>b𭸜I􌸙𨴎}xq􉤁bⱇV*[T\u0008v\u000c𔔺灯(d2l\u0004RL\u0019􊁅󰡃@ij\u000e𑚞n衃 %'\u0017󽸸.𠂌.󽯼ӡ1$e\u001b뾓T~𥣬\n\u0006\u0004󰽛𣎀Q󰋬\\\u0005\u001c$;k=4dKt\re1e 0z󷋺쏿cl[U\u0017G鵅=|𤤙󿅈Ls$\u0001󲖮\u000ej\u001c5\tb\"\u0008Hp뷜Byn􆣐NQ󱖶\u0004J\u0008\u001a\ret\u0002|󾆩&\u0018U\u000f;}_𩌤T𗿙$f𦈸\"1a𡪓V=\u0005󿦶1b󺂫`\u000c𨘓-󽯆\nT4;P𨧶?7~,󿴴􇶦L,g 0\rA􀱪E\u0011󽺗\u0004󲫤I롓<&y󲔩팘?48'Qc蓌̒\u0008嗻󶦤`呼\u00011\n|\u0008K\u00018합^K𬞣*衲K}mE𣫂DP𪰣󵹿-Cp_=hxz\u001c􏲿!{\"󰧖\u000e-􄰂1J]N\u001fd𔘚O4􌩡\u001eV􋟨_󼁬ZX9pr}v8AW󵩡jg{\t)j餣\u001f:𡁸$请5$둏l􁟼􀹮\u0013\u0012\u001c\u0005\u000e\u000f2Blpz􇜫󰞉l㩸܆􃱴D\\ 󳭴)󴝆讥􏣬\u0014\u0001#𦥦^󾴛󶍄\u0018C2=3ᠷ]\nj䔇{S~mPuD|e􆗏{籛;l\u0012O\u000c$\u0018\u0003&yry\u0007S􏌈)\u0016m`\u001f󻓴PB嘓gٯ\r\u0003 􍑉1\tpC􊪒'q1\\􋕤r-@7秧_􇞫􉀅wU諡=L[A\u000ces󵊍𩱈𡟭𦟷BX\\\u0017\u0006󷶛A?\u0000L\u0007oB=on9a𥈾\u000brpm赳<\u0011入\r󻙚0\\鶅+JW􅏟F!$𬉖&󺅨󺬁\u0016\u001a𑙢\u0006<􅾎h4\r𩅍A\u000b𫋂wX\u000e짍S\u0012[S\u001fL𩲲;id󹇉霸𑵹"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_20.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_20.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_20.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_20.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_3.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_3.json
index 959702cf5f7..23c09e80edf 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_3.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_3.json
@@ -1,3 +1,3 @@
 {
     "password": "c\u001dW\u0017Q;\u0015c􊨸V/\u000e𧈏7𥷸jBd\u0004𡫡b~\u0010sL \u000c\u001b󿾊Ez􁕳*\u0018𠛎\u001e9\u000f4Bt\u001dm\u000b<\u000c􋷐\u0003?5\u000fዏ𗯧3}𤻒\u001a䗬G7t􋨮\u0012𭍙\t/wKm\u0019逿󼺕􌿾D󰉆y55]*.\u0012)􍳨Z􃓜󷹜\r􉀓Sޚ-\u0002/#iW󵻦\rH=𫜕\u0003G?𧢴m0u\tm\u0010󸤿ga\u0004pCc\n\u0005&\u0017!𧒨I𠕲􎬛\u0000X\u0006\u0018j\u000fG21mR𤼙􊯑 WCJ􅹻^𬎊5\u000e:.,\u0005𘎖銿}n𮄓\u0000/\u001d军S@.\u0017R\u000c󻬰𢴽Q\u0010𭽣o@@\u0001=~\u0016Q쪣𪺳<cX6􈇣\t\"*\u0001\u0007~W?􃮏\u001dr𣁴􋋷󼫭>\t9\u0015q􇷛}\u001e\u0005𩾤xm'De<0𮫊\u0008𭦌R􆴻3𗕒𩓴􆱾p\u0019\u0015𝈅픾\u0014|z\r󻱋𭏦R\u001cd{🏫\u001dv;<e~1􆱗-e6\u001b=\u000e5\u0014c\u00118\u00021@t-T󹥽\u001d>䎉VW𠏈\u0005$[󻘐𥇭쨚2𧞊X7\u0018󲳿zB󼳃𥰷󻺒&i􏹾/a\u0005󾶠\u000f%U𡋝!wzs\rJ^\"􇐇JU<D󴥉m\u0001𗧆󷕮\u0015'\u000366t$൏󿱱q\u0001󼸍kOd9vKO󺴝V󴸙dRGn\u0003lW!􃭛:𥯅\"􏇇}xL\u0007'L㢙\u0000􅈝;A\u0008\u0017u`te𡇄a4w\u0002𦰻+\u0011Y𣻥8&m𐬊\u0011󺚉zt1晴𥨬 hR🔣5𧥀\u001ax?嗔M𓉔􎡚󰤓eDgY텡<􏽔🕼\"=iEJs\\\t𬳉\u001f帠M\t~󸛧\u0007󻒠𤜐\u001eS[7\u000bd``\n{t􉨦\u001d𭀻`p`J\u000e𤠆}*\u0018𢷴\u0011lY[/;􅓭󷬌#𗁲g󶸯0!6⺈􀷇:\u0008@숃爮'󶸄\u001fzSm\u0003+\u0007a􀔻gv𥻧𠨭􀆎󽢹\u0018i𒊫\u000fH4\u0006玏󶨠[\u0001\u0017t\u0000􌘁69\u0008󵓜{z|\u001a\u0003Dz\u0008;􍨮^\u00019Y)𡾍)=7\u0000󱉈j4\u0018\t󲝴\u0008D#\u000c􆦼𧯶sUYV\r􀟪\nSv𤇖󰶧튫󻩊h\u0016㈇%\n𑠥㖨bH\u000c􍪅/)r󼘶\u0013\u00107d눤\u0012BVYe诛6=𖺃(󵡪󹠟u􎓴JFD]󺭴b􂖭\u001a\r,#>𓂕𭭹L\u0000\u0018\u0002􁗝􌑺zE𢔍\u0003􌼒$􀑟8󲒺𢱚\"\u0004\u0016d\u000b$\t󻈪Oj\u000f\u0000X\u0018\u001a󶔨5􅛪B>s-󲽏➸􆿎􈳧m.􇋚靇K_樂\u000c뀦]L\u001a\u0013 󺴗$#􃬋\u001e󰈯\u0017u\u0003?-􊭋{%\u001cy\u0015Y'b'󶺚-gXI4\u0016𦏇\u0008J6SelHMS󸃬|X:\u0019*\u00172􈦤@W􀹸\u000e󳟎􎯲z!q8S\u0012􃠓\u0015B󿈞7󴗰KdI\\\u0002d켂s\u0005󴫙\u000b4j󵺖閼9h\\\\Pa􅙋+!Uf\u0015cra󿍖&\u0004`g\t\u000bqp\u0014y\u000f󽱂s\u0006𫬌𦍺Jg\u0015H\u0002Ws\t-8.􋃸\tolC˴N|\u000c󶅆\u001bmp$f\nL\n􇺳浭\u0011UZ\u0010[%*/\u0001\u0018m(󽊪}󹚱𠩴􆗴\u0008𗦯󱮬{&A)\u0013󳅥?/𤑨􈈺\u000e\u001ds\t\u0011<󿷾𣴌𧿨k)Q\u0005\u000fp\u001dvP1#b𧁏󹲠􂰛Sp|\ry𠺴𡡵:0kk\u000f \rN蛝"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_4.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_4.json
index 4298ff684ce..a38bb6cf34a 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_4.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_4.json
@@ -1,3 +1,3 @@
 {
     "password": "r\u0012*)&G􁒡;J*@𗕗X􀗚O\\\u0016\u0012\u001f𨠤UM8i(\u0017U\u001f5@&􋦓ὦ4sn󳺥\u000c􋞸G!\n󶀝󼯰􍴇􌣱\u0013,󷷤𬡘Ey㟉+P[􊒆'Ph\u0007l5i𝥿𬿄Ps鮎j,⻰1y*Wfw+\u00038}7M􆬰H\u0002AI=[*J3/_oO8~-TKw𥊿\u000cK8Q󽽞\u001d\th􂔿%J~b\u001e􏅪Y𠸖P?𮅗󳌩B5R\u00019\u000f􈁎𬳓\u000em\u0002_o₪𠀑\u0017Sd󸧎6V$󺝔)\u001aM\u0006>p􏿢NGPV𘉁\"\"@CeM󰬑\rVnDwsxT?󽍬P\u001dO^\u000f^%e􌺖fTP󾀺f}*󰂽𞴑l\t􃖼;=􃉮$C􄊑}\u001dn\u0003qs󻎕y%\u0001Ce_<2.\u0008)󹨧\u0015}o􎡪J+L\r\u0011KR\u000bD1G\u000f􎿆\u0002\"]tq$i􍏾\u0003\u0017:\u0015rd D\n/\u0004\u0000\u000c\u001eI𣣀ꋇ,/5ઐ\u0011$訮󾠿KBU\u0004r󲽵p+v[笡\u001d(i􃱠_/\u001d(郷tG/Jsٍv7𮌯\u0013Ib \u0019\u0007\u0017m𔖒0Kj󸅼𢞎lfF󳹇䛛KJ\u001fN\u000e\u0002:\u001a!\u001f􃂟L%\u0005-VA<Bex\r#J\u0001􇲸?W\u001d𠽇𥾆R\u0018W7󽻑􋶳Ib𠝦\u0004󴴁F'ak\t>x\u001eAdM<\t+󺸡'련􎧹􀥲1\u000f\u0017C@r𨱽!Y%𗯧9x􏆖eqLV\u0018Z𧡯P눟􏭇􏍇^$𫿥󸎨𭟀X\u001av􋨥\n\u001a󵼉C~\u0015󴤚𣞈󹩯󷵳"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_5.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_5.json
index 53b53d670a0..57c1b4ea2b9 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_5.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_5.json
@@ -1,3 +1,3 @@
 {
     "password": "{?)L擊UMﲠzX@󲕼^9ゐ8aT.J󸲰z󴆷_R\u0018TqpGๅ\u0007󵪅􌧿\u0019\u0012㱣t\u001aw\u0017{\u000f𓋑=𬆣;z*\u0006\u000c9,\u0017g􈓫o􃃢䈡\u001b\u0003oࣟ@:ᦺ􁍰2b\u001a\u000fMt\u001cN噂2b5.?KL\u0007!􎯥,\u001a:\u00043gm\n\u00103Z 欠u\u001e(z\t󼓙𦯉#\u000cS%󠄕R/4\n􉱊\u0006\\\u001dL\u0014𗅋f^\u0013f􌉫\u000f𓀘@𓈿)󰌗?v\n\u0007𤦘L\u0015󲊥𤈬v󵇦9~GB:\"K\u0006r_\u0018w(?𡉕ugI䱰\u0017􉕘\u0005w\u000e=z𢝱奮/츻'j󲬢8h𑇡`\u0004𪺱\t,@𭗼\u0013$/(s\u001d\u0011_MkVJ𫮳𦏀󻶝 I\\F.Kt𫺏󸞵\u0007􅕐<?.\u0006&*;\u0012󵑭𮭕k|\u0007􋼵T\u0008EC𭔭F컁𢨅{87Zp@𑧏5\"\u001f\u001dsa\u001e🩳{㽳􏶺~[\u000b ;􋀆n 󷂻􁠃]󾔟x𘓁88M󿓤\u0000𪐢$dj:!b:\u0010_Js]\u000fZ%X\u001c떓󼳔;5,\u001d\u001d󷋉\u0007.\u001b󶛤~\u0016\u0019d􃴝\u001e,\u0000\u00180H0H󾇾}oB?D\u000b줄s-𪲰𝢅i\u0010𣟖뺍Sg~0KX𩺖&fIxF+e󲑥db\u0000\u0015h\u000c􈗦ۜx󺶪땐hE\u001f&Tt8C=\u000f)\u0006F\u001fka\u0008a\u0013b[B􍮌􊺬j𨗆hr:\u0017󱔊\u0003\u000e𤁲\u00043e𡏪\u0002pYq􃕾$(CV\u000fdj}t\u0006􅱤zHWQ{\u0011:𢏢\u000f\u0019&T\u001dVp􋲰H槒8>\u0019d\u0014􈅷馤\u000f\u001c\u000b/\u0016e󱙅#d溏\u000c5\u0013D𩁺쓄\u0000Eie\u001fc\u0005RZl󺐖\u0017􅰙`\u0012􉞱D䘣@Q𧍠𦒡􀔎\u0003vp\u0014eN􅗇@8(㪥z/f\t􏵚!N󰳭-j⨡𫇣Nd(v#󸄀\u0002P􉿡&u\u000b𘧪䗑xs?􃊃J_0H􎬇\u0019R􅈋𦿝𤀼sw*턩>kMXA}%;𨳌𡱺\u000e\u001b􎀴\tGZz,𗲻󰶰nE󲼢\u0014#\\8v𒃂􊹖𮥮,9u79ZW\u001b'㛖OEx\nY;𫒌P^Zu]JnZq(=XD$>g\u0004m󼏰Z!(S]\u000f{\u00175|􋴴q\r;\u0002w󲁥\u000eHesy,󷳴9𘇰7𫽢#󻇾􄈪􏥻\u0012#'\u0015\u00035󰍅P𭠢\u0000|,🜏'S엫𫘋\u0010ym=𮢋󱈆칝\u001f\"r󹚛VS/H\u0016蒅a!^%ᚵPW`\u001e\u0010L?\u0007!𨿄Q!W\u0008vi*胍\u001f!n+𐎂\u001ao+𧄾𦄈\u00045G𢳇\u0008[xT> *𔑏􊯺𬾧x13g\u0004/𬆤\u0018\r􈥦󶘢Ps;dxR\u0003!􏀛늯v3􌈁\u0000🟁x8\u001cT*\nlZ겱On^+Yk􍂭𧽤/!$|\u001b}BE􉩜mr#n𗚌􉇼P𥼄I;􍳫\u0006\u0010\u0019j&I1ZF%&U\u0000󲑫\u001eZy\u000fOr鹧`0vt\u000f~\u001d󺞾\u001c;\u0001<󼩦􋡤𩁊𭬑\u0004􎡘\n󳀰y𩴧\u0014\u0005􅀁𒆵!+y𢮘z󾝂𝙃|J􋥓/𥯮\u0013<\u001a\u0007榀𭗌\u001bY𦋕:y\u0006UR􅍺o.􂴎T濿\u0015𛁲竕^\u0007􆲥\u0014\u000c𦣾:$􃲍He.\r{\u001d}󼏩_o\u001en𗓙􌡛\nv𐽑\u000e\u0008󿡈􅓗\u000e𪣊󾄬􂗂le\u0002'@Z􂓂opC^#@􊿆\u0012vw륂\u0017𤛂x󷿺\u0005w𗰺.󱲕\u0006GfD\u00072)󼖄-\"#𦡿k\u0011ZH􁬌x􅊓+\u0010n􃛊6b'\r\u0008W􇐴\u001b\u0013dE7j\u0015\u00063󻃡󰊒y꼬P.U̽󽰂_󰰯𗠰𤙫S󹩘y*O砬Rh\u0014_?\u0015g\u0018|'𠵊-󻳎\u0018"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_6.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_6.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_6.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_6.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_7.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_7.json
index fa3498f541a..c6c985b3308 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_7.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_7.json
@@ -1,3 +1,3 @@
 {
     "password": "8󠁳Cdq&%=nR􏉮􁩇𤣃fiZ\u00038f\u001b.􀢖C􌷇\u0019Q\\i\u0012\u001f𑲤\u000b\u001d\u001c􉔺sR󵻢^R@>\u0000o\u0018\u000b)\u0010n!+h\u0008q7󱻿8\u0012(􇷑565>se\u0016\u001bem B󲩺[gCt:􁲧KA%uI\u0017} 􂞱'𤮋%.\u0008𪂌C󼗫󱩔w5􌞓𭯵Y\u001e𪼿󱵏P8NV3隦\tU󷻷𩘮M󿮘Q󻜊\r􃏐X\n8?\u0003􅺞\u000e2𫫅X\u0008\u0006N\"~]\u0004&𪜹𡣸\u0008\n;􀡹𗊎𢒈\u0013\\r󿮌􆦍D󱡊f\u0001*\u001f4yw𣿞\u0008 𓁵􄪟j\u000b\u000bn󴣐c+𠍽2􂮂}U\"6s(D}󵟜\u0014韩𩽩\u001d󹋷}궒k]}󾱞>\u0006\u001b􎦦酗^\u001b\n󼘯􀦋󼐀󴈱O.祭\u0000!F`I兠^\u0004𡶥󺗨\n%:👟𥹭LNꬱ+U􁦼V\u0019󶴿iV!􍷠O\u0011\u0015I%󿿳D\u001e𧶚:R􉚹\u001b󲗥_鐋hN\u00128\u0017{b7@V\r0u/\u0013\u000fWa\u0018𝕠󹩉1𩗍u𦒫I\u0006\">\u0017𒃻􈍚q/0󻠥\u000c,\tBgVI󲣕 𡚴>\u0000N`+p\u001fAhDY\u001d\u001cE傿\u0005D\u0004\u001c竀\u0004􃊐\u001f𫞝p󶪘 }3堙􃄵&BwNC 􁳙𫋧􎼦󹌌ڍ\u0002$􅶗D󺾃)R󻻂>.獊|C󱄠\\M󺰱\u0017󸼘B]1􍒀󱍰<5GT>1𝌃|\u0013I,\u001c\u0000󱴃􍹄I\u0003C\u001fZ\u000c[;(&)󹭓ꉆE&(n%\u0006闦|I𗦧\u0012􋕘eI#\u0016A~F\u0003\u001f󸛽6Q󿫼\u0001l&\u0006z5[lG􁊷4𨻾Sq퉓nXl=󺺷󻰆𮀱\nn21gb\u0018YL\nYh\t󺽸ザ􁢠󸌵𩟈􌒹Vx\u000cu󵬯H:\nK\u0013襝\u0001𑣞󼾿UmN\u001d𘏳駎u@ 𧩬QV=𧐄*"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_8.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_8.json
index 2f3a3c7b743..ea4054100c5 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_8.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_8.json
@@ -1,3 +1,3 @@
 {
     "password": "W󺯤D\u0013]\u001d!ZdpC6z󱋋#U_xU\u0017뀤&iLDN􆭷hy%w\u001f󻑚𧔋 \u001cmz󲦬zm\u001c-h𐃸l{`󷀬󿾂󹹚@𡭹f𬹢\u0001e\u001d󵌡\\%} ᰯ蔔R\u0018󴵩􏫄\u000c\u000c2I\\𦬚CZМ\"󻂅g^\u0005\u0018𧬿z8􈭴\u0007~\u0013u*>\u001e\u000c\u0015^@𘞃\u0016+\u0015ૺ\u0019\u0013𠛯\u0018P􂪍t\u0015V)*_u$𠤖󺡚ꃜ𥄉.}Y\u0011\u0003\u0018&8yog󲸟%􀌍\u000f\u001a𣇈M⮨@󲏹\u000e*\u0015z#𭁯\u0012󴞴O\nl𥿜\u0004\u0014🕃\u0008󲓄\"\u0007 \u0017􌃅\"X_󶎍𣵮\u0011\u0001엎O􄂾꼿󺒱n~􀆡iZ𬇫4d鞎9V󿙘\u0004ID\u0006嚶XJ\u001bF$𨒯d\u001e<{󴳕㍸𤼲UE[󲆩󰱤\u0004-Z#󰠱TO^'n𨠉D𞺘\u0000󹈃.uV\u0018`𪸾Y\u0006a$\u0017w𫍜m\u0002+>󹘘Aoꝕ!ju𠉛v;n1e퀙 >k𡚆?\u000cZ;\u0018\u001bI]0\t 󾅪@\u0002:\u0019\tX\u0010󽌗􎒑'\u0005g⹍\u0014)S\u000ekc>24󲋲\u0001\u0001F誉󽅐\u0007\u001a2?`T\u0005􈸗\"FT0ef0q䉛\u0006R]Q􂔽𬓝A𥕒춯W󽼦𡿵\u0008{%メWX􉰞w@<a⽫7\r󱥵lE1ᅙF8j󼺺𤷱\u0008\nz𭣯m~b\u0012v;;􍣃Uhz\u0010󳑌\u000b\u001fN\u0019ꆈ*[%i𦣵N􄢧S󷐰u0?,\tꫜf\tx𘦷]~G隿^\u000bT\u0017/b􁍎H􂵐U(\u0015PmP`X󹕝U:_\u000f(/>\u001d𬸦3特󻢶\u001f\u001bCJY􀞥`䂈3𝛣𗢏g󼜁Td\u0015􊲠󰸼o􎆸\u0011𧲓C𧢾퉅\\󹵧鲵𥖇2E%􅃜쫶\u0008k_𠄰𩟯\u0006󰖾𮝪􂲺n\u000bK]v􆭥T􄮩\rr󻁱{\u000c;|u'e\u0005]H𗊔U\u0005󺷥Iv󷄤%[𥞼t\u001a{w\u001f>r􅟬V4^-Y\n𬱅|\u0011+\u001b𪀊H땷\u001f#\u0010\u0013\u000eH󺢅<2)^LJ\u001c\u0018Gn\u0015\u001fra\u0001)𘃞\u0014\u0003BM𣍯\u0004M%\u0014\u0007i>Y\u0008泡\u0007ԥa󾉰{g\u0018􎥄h𗾍𐫗N龉n\u0019󸨭=R\u000cUR\u0015]\u001eJ-.*:8K\u0006\u000eT󾟯\\;#󱐲􊀨f$+𫛹jM\u000b\u0013䖟\u000f󺯎X氒`H<􅽑^𓅂W\u000e󰴸JV\tغW9~惎H\u001a\u001cvnD\rBsT8􍚌\u000e\u001a-8\u0002hi\u000f꯱儚1󺴊󱤏􁤼f󳐑j,c\u0018!ᙀ1\u0014yL𫡬_\u001d\"R!Rse𢰂FD􏍺􃮫𦪈z\u000f^A𥘬"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_9.json b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_9.json
index f88bbb349e9..5d7af1dcbc5 100644
--- a/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_9.json
+++ b/libs/wire-api/test/golden/testObject_RemoveLegalHoldSettingsRequest_team_9.json
@@ -1,3 +1,3 @@
 {
     "password": "IJ7!\rkz \u0004+𢬰􁿂\u001af&擉􂱇\u0004S𢬐u\u001c\u001a9[冎W_\r$􇩜WẲ9\u0010Wx? ?ow\u0000{\u0015\u0006Xg@󺲣=\u001eE1rGg𫁶\u0006u\u0017i{!2ṥn姷dRt𢘇\u001er#9o􏴐\u001cMNkT歱}𬑺J\u0006qS\u0011\r63m9𘖞\u000e󳪶PP~\u0007o󶼭𤲌'\u001d,\u0000E&\u0011\u0002koe\\󱫩􏒪u\u0014󾹌Z𞸛i2䝍Y\u0019\\􋵽\u0015𣝙{\u0008Gq𢍃Y\u0013w?z􀴈\u001d𨔸\u0017[\u001b/➫Q\u0002K󳹏2􉯃;[ꊏ庼𖦪㹈aix󶓻Z􍵥z큁韥Fl\u0003I󺚎\u000bhG\u0015)63N􉻞N\nw^􄝼줝􂢱\u0001\u0006y\u0006\n0H$Bw\u0015T;W%𪶕\u0005󲂻\u000eF\u0001\u00197hi+e^tr,t󰎎􂝴{.󵚰>-\u001c`K4\u000b\u0002\u0016B\u0010x&􊥽[l\u0019󶐧ifg󴉳\u001a2􏯲TJvks𪰦𧎉\u0015\u0012~\u0014✯􌫃z5￩𦙷.o|}3x𣁀Brk𑵰8탤 󸥮,p%}>\u001a􎊾R\u0019%De0䱊-\u001f𦳣B^4\u001bX󽣓~\"AQ\u0000􏸲nus&i𐀘8Qi_\u0015&A𣩡1󹅳󾢙\u0000扛)\u001c69𗛈\u0008=^\u0016\u0013$TXY\u0003orV􄴵\u000e%f󶈆~𥓜󲽄8草[i𫥛\u0003􆲸􀻻=䄌󷦒L􄃲쿆sh𮩇^\t<f\u0013j&De(\u0013^\u0013􆛮SHw[Bs5I𣌮r^\u0014a\u0000\u0000\nIﱒpt%hv󼈫S𛈀Q􇧥>H>q/\u000fI-󲺃v%7[\u0002􏿖y\u000e@E🙈bu𨇷\t馺5Pc𗘘$\u0004B𡠒󸍌qV-\u0011D\"\u00015𭶚`\u0011hh疉{[l\u0010B􄷦|􌛭\u000b􌴏\u001ep󲪶\u000c*iJG\u0015}-𭑪O\u0018dL\u0007b 󻽹+Kj𠨍Wc~~m|h3𔔰}BZt押b\u001cD.v𨂿F\u0017 dj𝀴\"\u0012"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_1.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_1.json
index d258d0577b2..520fd99c869 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_1.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_1.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000002e-0000-006e-0000-004a0000001b",
     "user_id": "0000003d-0000-0049-0000-003b00000055"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_10.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_10.json
index 1d7217aaecf..ec0971407a0 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_10.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_10.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000029-0000-003f-0000-004d00000076",
     "user_id": "00000063-0000-004c-0000-00730000000a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_11.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_11.json
index 5b7918e30b2..6c1111da5f4 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_11.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_11.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000025-0000-005e-0000-00800000007b",
     "user_id": "00000006-0000-0058-0000-005500000045"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_12.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_12.json
index cd10714fcf7..91d9ffa5a64 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_12.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_12.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000005e-0000-0005-0000-007900000008",
     "user_id": "00000019-0000-0066-0000-003e0000005b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_13.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_13.json
index 1f3ed894692..cdb55dc5a51 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_13.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_13.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000000f-0000-007b-0000-00390000005b",
     "user_id": "00000007-0000-0024-0000-005700000006"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_14.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_14.json
index 09809e99211..8628292655b 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_14.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_14.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000002d-0000-0028-0000-004500000077",
     "user_id": "00000004-0000-0007-0000-003500000079"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_15.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_15.json
index 7ddc32c4a20..e50c3f74ae6 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_15.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_15.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000005f-0000-0072-0000-005a00000009",
     "user_id": "00000001-0000-002b-0000-001900000031"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_16.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_16.json
index 53851bbdee8..b6ad4023017 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_16.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_16.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000070-0000-0020-0000-004d00000058",
     "user_id": "00000073-0000-006d-0000-006100000043"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_17.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_17.json
index 027293cf218..979de7c1e16 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_17.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_17.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000059-0000-001e-0000-005b00000033",
     "user_id": "0000003b-0000-006c-0000-006e00000048"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_18.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_18.json
index 4c4e1429df0..067f03d5829 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_18.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_18.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000002c-0000-0017-0000-002d00000008",
     "user_id": "0000004a-0000-000e-0000-005900000065"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_19.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_19.json
index fcbc6bca433..e6a872b49be 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_19.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_19.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000078-0000-005c-0000-004900000023",
     "user_id": "00000024-0000-006b-0000-006000000011"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_2.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_2.json
index 1de1fbdc894..e38364be589 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_2.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_2.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000049-0000-0059-0000-004e0000001f",
     "user_id": "0000001c-0000-0064-0000-003a0000000b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_20.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_20.json
index f3e7a5e7eba..44512e4c9da 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_20.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_20.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000020-0000-0044-0000-002200000020",
     "user_id": "00000059-0000-003b-0000-00410000006c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_3.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_3.json
index c3bba864a05..7ad5e1808ab 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_3.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_3.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000005d-0000-001f-0000-006300000019",
     "user_id": "0000007d-0000-0054-0000-000900000018"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_4.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_4.json
index ed0ece02ed4..f5c4b003ee2 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_4.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_4.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000001a-0000-002c-0000-004e0000005c",
     "user_id": "00000025-0000-0077-0000-002d00000045"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_5.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_5.json
index 2e9c03cabd8..ad84d5ccce2 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_5.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_5.json
@@ -1,4 +1,4 @@
 {
     "team_id": "0000000c-0000-0003-0000-00750000006f",
     "user_id": "00000066-0000-0055-0000-007f0000002f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_6.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_6.json
index 3f2fbf2cb81..d6893b562e2 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_6.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_6.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000018-0000-0074-0000-004800000077",
     "user_id": "0000005c-0000-0039-0000-007b0000005d"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_7.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_7.json
index bc65cb63eff..6880ebd7819 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_7.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_7.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000077-0000-005f-0000-00290000006e",
     "user_id": "0000000d-0000-0057-0000-00270000003b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_8.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_8.json
index 5f7a3a8e15e..64ff30b8973 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_8.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_8.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000064-0000-0008-0000-004400000064",
     "user_id": "00000033-0000-0004-0000-00670000003f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_9.json b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_9.json
index f04658869b3..a9ef3873622 100644
--- a/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_9.json
+++ b/libs/wire-api/test/golden/testObject_RequestNewLegalHoldClient_team_9.json
@@ -1,4 +1,4 @@
 {
     "team_id": "00000005-0000-0079-0000-003300000036",
     "user_id": "00000007-0000-0062-0000-006600000015"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_1.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_1.json
index 98e323e0b0b..b31ce6ad354 100644
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ResumableAsset_user_1.json
@@ -1,9 +1,9 @@
 {
-    "expires": "1864-04-09T06:01:25.576Z",
     "asset": {
         "expires": "1864-04-13T11:37:47.393Z",
-        "token": "5A==",
-        "key": "3-5-00000010-0000-0008-0000-004300000006"
+        "key": "3-5-00000010-0000-0008-0000-004300000006",
+        "token": "5A=="
     },
-    "chunk_size": 17
-}
\ No newline at end of file
+    "chunk_size": 17,
+    "expires": "1864-04-09T06:01:25.576Z"
+}
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_10.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_10.json
deleted file mode 100644
index c4a18e270a1..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_10.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-05-23T07:18:12.803Z",
-    "asset": {
-        "token": "UfKdZy8dO38=",
-        "key": "3-1-0000007d-0000-002e-0000-00750000006d"
-    },
-    "chunk_size": 20
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_11.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_11.json
deleted file mode 100644
index 3e7adeeecfb..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_11.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-05-01T11:31:08.393Z",
-    "asset": {
-        "expires": "1864-06-07T11:41:46.477Z",
-        "token": "",
-        "key": "3-2-0000001d-0000-0078-0000-00470000001b"
-    },
-    "chunk_size": 10
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_12.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_12.json
deleted file mode 100644
index 132d7e182ed..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_12.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-05-06T10:40:58.261Z",
-    "asset": {
-        "expires": "1864-05-17T11:30:44.469Z",
-        "token": "ae_eVOnDu38P3iQh_3uBbMpIABEc_ppAoiTGmg==",
-        "key": "3-3-00000022-0000-007e-0000-000d00000055"
-    },
-    "chunk_size": 9
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_13.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_13.json
deleted file mode 100644
index 4ec37bcf6e0..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_13.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-05-29T22:51:00.991Z",
-    "asset": {
-        "expires": "1864-04-23T13:14:02.408Z",
-        "token": "qRj2meQ68UfzECKD4C-y",
-        "key": "3-2-0000002d-0000-0075-0000-000600000003"
-    },
-    "chunk_size": 1
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_14.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_14.json
deleted file mode 100644
index a7d9e82e280..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_14.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-04-13T15:39:20.608Z",
-    "asset": {
-        "token": "sJVOwiBtfAqMC56d-f7qGja7EdQ=",
-        "key": "3-2-00000030-0000-0069-0000-001a00000032"
-    },
-    "chunk_size": 12
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_15.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_15.json
deleted file mode 100644
index 9883500df83..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_15.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-06-02T06:12:50.515Z",
-    "asset": {
-        "expires": "1864-05-22T22:28:50.009Z",
-        "token": "K2FfT2hIH0Wc-do=",
-        "key": "3-5-0000002f-0000-0064-0000-007f0000004b"
-    },
-    "chunk_size": 28
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_16.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_16.json
deleted file mode 100644
index 3c76cba02e1..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_16.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-05-09T15:19:28.092Z",
-    "asset": {
-        "expires": "1864-05-02T08:47:43.202Z",
-        "token": "g_73-UjzHqlT_rTQYPpXvDdEQO5VOIXyrR8=",
-        "key": "3-5-00000058-0000-0076-0000-00280000001b"
-    },
-    "chunk_size": 11
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_17.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_17.json
deleted file mode 100644
index 215478f3777..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_17.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-04-20T04:33:39.822Z",
-    "asset": {
-        "token": "_ozCuHYT5FEamP2vYKON",
-        "key": "3-3-0000007c-0000-0030-0000-001a0000000f"
-    },
-    "chunk_size": 1
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_18.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_18.json
deleted file mode 100644
index 4c018917dea..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_18.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "expires": "1864-05-13T21:43:48.733Z",
-    "asset": {
-        "key": "3-1-00000024-0000-0042-0000-00680000004b"
-    },
-    "chunk_size": 26
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_19.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_19.json
deleted file mode 100644
index e9a3588f93b..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_19.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-05-26T11:47:03.579Z",
-    "asset": {
-        "token": "Q41gte2seld_Ng==",
-        "key": "3-4-00000016-0000-0072-0000-007700000065"
-    },
-    "chunk_size": 14
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_2.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_2.json
deleted file mode 100644
index 0032f8f2836..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-04-26T00:29:12.625Z",
-    "asset": {
-        "expires": "1864-06-05T22:55:33.083Z",
-        "token": "tw0NZPaJk0Hl3VHZFPTyjet4u2ZErQ==",
-        "key": "3-4-00000027-0000-0020-0000-003200000062"
-    },
-    "chunk_size": 19
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_20.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_20.json
deleted file mode 100644
index 95c48fe5202..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_20.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "expires": "1864-05-30T05:11:58.499Z",
-    "asset": {
-        "key": "3-4-0000002f-0000-003c-0000-004600000044"
-    },
-    "chunk_size": 21
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_3.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_3.json
deleted file mode 100644
index 0ec25343e15..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_3.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-05-12T00:54:09.852Z",
-    "asset": {
-        "token": "f7r-XByS",
-        "key": "3-5-00000056-0000-0062-0000-00230000007d"
-    },
-    "chunk_size": 24
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_4.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_4.json
deleted file mode 100644
index f2ec259bc18..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_4.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-06-07T01:55:50.143Z",
-    "asset": {
-        "token": "dsGh0JVaM5x3-22SN_bey09Sxg==",
-        "key": "3-3-0000002e-0000-0005-0000-004500000020"
-    },
-    "chunk_size": 5
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_5.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_5.json
deleted file mode 100644
index eb6324bdbe2..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_5.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-05-09T07:28:34.680Z",
-    "asset": {
-        "expires": "1864-05-04T21:29:18.482Z",
-        "token": "jYmC3r4Wb2wSciaI2Hgwwrzgq02OzgmU8xIr",
-        "key": "3-5-00000026-0000-006e-0000-005200000005"
-    },
-    "chunk_size": 12
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_6.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_6.json
deleted file mode 100644
index 33e667c256e..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_6.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-04-13T09:12:36.767Z",
-    "asset": {
-        "expires": "1864-06-07T14:00:07.598Z",
-        "key": "3-5-00000055-0000-007e-0000-003d00000039"
-    },
-    "chunk_size": 19
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_7.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_7.json
deleted file mode 100644
index 113f7b5e8be..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_7.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "expires": "1864-05-03T02:47:46.506Z",
-    "asset": {
-        "expires": "1864-05-30T20:13:45.847Z",
-        "token": "KdZT7_v6l6f5OTs5",
-        "key": "3-1-0000004b-0000-0017-0000-00310000006e"
-    },
-    "chunk_size": 8
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_8.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_8.json
deleted file mode 100644
index 6a39de45430..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_8.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-05-07T17:08:41.651Z",
-    "asset": {
-        "expires": "1864-04-24T18:20:27.320Z",
-        "key": "3-5-0000001c-0000-0075-0000-004d0000007c"
-    },
-    "chunk_size": 27
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableAsset_user_9.json b/libs/wire-api/test/golden/testObject_ResumableAsset_user_9.json
deleted file mode 100644
index e96c564452e..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableAsset_user_9.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "expires": "1864-05-17T02:44:11.614Z",
-    "asset": {
-        "expires": "1864-05-23T18:01:30.768Z",
-        "key": "3-2-0000001c-0000-0037-0000-00770000002d"
-    },
-    "chunk_size": 25
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_1.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_1.json
index 5f2360c8fcd..6fe2dd17d1f 100644
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_1.json
+++ b/libs/wire-api/test/golden/testObject_ResumableSettings_user_1.json
@@ -1,5 +1,5 @@
 {
+    "public": false,
     "retention": "expiring",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
+    "type": "image/png"
+}
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_10.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_10.json
deleted file mode 100644
index d7d3767b2db..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_10.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "eternal",
-    "type": "image/png",
-    "public": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_11.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_11.json
deleted file mode 100644
index c4e6a03a410..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_11.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "eternal",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_12.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_12.json
deleted file mode 100644
index ec26f792d6f..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_12.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "volatile",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_13.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_13.json
deleted file mode 100644
index c4e6a03a410..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_13.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "eternal",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_14.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_14.json
deleted file mode 100644
index d7d3767b2db..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_14.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "eternal",
-    "type": "image/png",
-    "public": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_15.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_15.json
deleted file mode 100644
index ec26f792d6f..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_15.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "volatile",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_16.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_16.json
deleted file mode 100644
index ec26f792d6f..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_16.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "volatile",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_17.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_17.json
index 8d5c54526e3..462ed70e3eb 100644
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_17.json
+++ b/libs/wire-api/test/golden/testObject_ResumableSettings_user_17.json
@@ -1,5 +1,5 @@
 {
+    "public": true,
     "retention": "volatile",
-    "type": "image/png",
-    "public": true
-}
\ No newline at end of file
+    "type": "image/png"
+}
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_18.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_18.json
deleted file mode 100644
index ec26f792d6f..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_18.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "volatile",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_19.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_19.json
deleted file mode 100644
index 5f2360c8fcd..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_19.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "expiring",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_2.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_2.json
index d7d3767b2db..8223d85e2dd 100644
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_2.json
+++ b/libs/wire-api/test/golden/testObject_ResumableSettings_user_2.json
@@ -1,5 +1,5 @@
 {
+    "public": true,
     "retention": "eternal",
-    "type": "image/png",
-    "public": true
-}
\ No newline at end of file
+    "type": "image/png"
+}
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_20.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_20.json
deleted file mode 100644
index ec26f792d6f..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_20.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "volatile",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_3.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_3.json
deleted file mode 100644
index ec26f792d6f..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_3.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "volatile",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_4.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_4.json
index 7ba46d58846..7b059d3d67e 100644
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_4.json
+++ b/libs/wire-api/test/golden/testObject_ResumableSettings_user_4.json
@@ -1,5 +1,5 @@
 {
+    "public": true,
     "retention": "eternal-infrequent_access",
-    "type": "image/png",
-    "public": true
-}
\ No newline at end of file
+    "type": "image/png"
+}
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_5.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_5.json
index 40b9f9deb9d..13648db881b 100644
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_5.json
+++ b/libs/wire-api/test/golden/testObject_ResumableSettings_user_5.json
@@ -1,5 +1,5 @@
 {
+    "public": false,
     "retention": "persistent",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
+    "type": "image/png"
+}
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_6.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_6.json
deleted file mode 100644
index 40b9f9deb9d..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_6.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "persistent",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_7.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_7.json
deleted file mode 100644
index 7ba46d58846..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_7.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "eternal-infrequent_access",
-    "type": "image/png",
-    "public": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_8.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_8.json
deleted file mode 100644
index 40b9f9deb9d..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_8.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "persistent",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_ResumableSettings_user_9.json b/libs/wire-api/test/golden/testObject_ResumableSettings_user_9.json
deleted file mode 100644
index c4e6a03a410..00000000000
--- a/libs/wire-api/test/golden/testObject_ResumableSettings_user_9.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "retention": "eternal",
-    "type": "image/png",
-    "public": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_1.json b/libs/wire-api/test/golden/testObject_RichField_user_1.json
index 3d2e6921434..ec2e27022d0 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_1.json
@@ -1,4 +1,4 @@
 {
-    "value": "󹒃E9Y|􋥲󻈊𩃱q'\u0010󿧱[J4Nm\u000b}^󴂯Lv󺈛8s\u001ar>.",
-    "type": "2w\u001b\u0000\u001ažjCn󷄕Wd􋮝"
-}
\ No newline at end of file
+    "type": "2w\u001b\u0000\u001ažjCn󷄕Wd􋮝",
+    "value": "󹒃E9Y|􋥲󻈊𩃱q'\u0010󿧱[J4Nm\u000b}^󴂯Lv󺈛8s\u001ar>."
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_10.json b/libs/wire-api/test/golden/testObject_RichField_user_10.json
index 7d0b08ec556..037ea7ca28e 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_10.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_10.json
@@ -1,4 +1,4 @@
 {
-    "value": "觎n&T\u0011N𦽶*\u001ePhM$\u0012􎪂ㅜ&sj}𢯤",
-    "type": "᷂/>󵀘M􎙆X\u0001!]"
-}
\ No newline at end of file
+    "type": "᷂/>󵀘M􎙆X\u0001!]",
+    "value": "觎n&T\u0011N𦽶*\u001ePhM$\u0012􎪂ㅜ&sj}𢯤"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_11.json b/libs/wire-api/test/golden/testObject_RichField_user_11.json
index bae445273cd..79dac021765 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_11.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_11.json
@@ -1,4 +1,4 @@
 {
-    "value": "x䩖",
-    "type": "I󺊶\r􈋍6􀋈.[󻉲8󳁆h𥀹X\u0012𪴁󰓞O廙^U􁇩\u001e\u000f0v\u0001LQ~"
-}
\ No newline at end of file
+    "type": "I󺊶\r􈋍6􀋈.[󻉲8󳁆h𥀹X\u0012𪴁󰓞O廙^U􁇩\u001e\u000f0v\u0001LQ~",
+    "value": "x䩖"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_12.json b/libs/wire-api/test/golden/testObject_RichField_user_12.json
index 31dae5f32c6..6e024eb815d 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_12.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_12.json
@@ -1,4 +1,4 @@
 {
-    "value": "궄9@\n󷥼\u0017\u0010[앨d⅄jnB𓀯f}",
-    "type": "C\u0014=r􏰿󻌶\u000b\u0010\u0000\tF\u0011:𥬁A'+"
-}
\ No newline at end of file
+    "type": "C\u0014=r􏰿󻌶\u000b\u0010\u0000\tF\u0011:𥬁A'+",
+    "value": "궄9@\n󷥼\u0017\u0010[앨d⅄jnB𓀯f}"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_13.json b/libs/wire-api/test/golden/testObject_RichField_user_13.json
index d72c5e2452e..6b939d44f16 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_13.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_13.json
@@ -1,4 +1,4 @@
 {
-    "value": "𧝱F􊄹\u0010gছRol\n\u00186󿥲'\t􈄲\u001clTT\"\u0005𫉺",
-    "type": "`"
-}
\ No newline at end of file
+    "type": "`",
+    "value": "𧝱F􊄹\u0010gছRol\n\u00186󿥲'\t􈄲\u001clTT\"\u0005𫉺"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_14.json b/libs/wire-api/test/golden/testObject_RichField_user_14.json
index aa7f41b407a..914cf6ae602 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_14.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_14.json
@@ -1,4 +1,4 @@
 {
-    "value": "&𪿬\u0003Tc􉒵\u000fw卧\u0017𢱬5&__;&",
-    "type": "M󴜻\u0003)I\u000e"
-}
\ No newline at end of file
+    "type": "M󴜻\u0003)I\u000e",
+    "value": "&𪿬\u0003Tc􉒵\u000fw卧\u0017𢱬5&__;&"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_15.json b/libs/wire-api/test/golden/testObject_RichField_user_15.json
index 73bba68959e..36b52d7827d 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_15.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_15.json
@@ -1,4 +1,4 @@
 {
-    "value": "\u00184w<U\u001dB4AM𘍳\t畠",
-    "type": "j\u0002d.h7oc6%􃀲#\u001d%􌻐\nz"
-}
\ No newline at end of file
+    "type": "j\u0002d.h7oc6%􃀲#\u001d%􌻐\nz",
+    "value": "\u00184w<U\u001dB4AM𘍳\t畠"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_16.json b/libs/wire-api/test/golden/testObject_RichField_user_16.json
index ddfbbbfb941..817a1c94c44 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_16.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_16.json
@@ -1,4 +1,4 @@
 {
-    "value": "\u0019$\u0013$󽒒\u001b\u0016p\u001f\u0015󿾾\u0007wW𢠝vHN\u000eP",
-    "type": "\r"
-}
\ No newline at end of file
+    "type": "\r",
+    "value": "\u0019$\u0013$󽒒\u001b\u0016p\u001f\u0015󿾾\u0007wW𢠝vHN\u000eP"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_17.json b/libs/wire-api/test/golden/testObject_RichField_user_17.json
index ca01b4acbaf..0b33bc42e9c 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_17.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_17.json
@@ -1,4 +1,4 @@
 {
-    "value": "T\u0002&:3f{\r9/\u0003\u0013󽉇\u001c\u001c",
-    "type": "uM\u0003\u0006N󲌬"
-}
\ No newline at end of file
+    "type": "uM\u0003\u0006N󲌬",
+    "value": "T\u0002&:3f{\r9/\u0003\u0013󽉇\u001c\u001c"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_18.json b/libs/wire-api/test/golden/testObject_RichField_user_18.json
index 602edcbd5f4..f049fa53a40 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_18.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_18.json
@@ -1,4 +1,4 @@
 {
-    "value": "􍒕\u0006ZS􆳞\u0008󹖞\u0012D",
-    "type": "𧇜x갘𣟷$%\u001a􋼂o󻨌𧌐(H`𩿏N𖧋TjM!{$㞍t즨}"
-}
\ No newline at end of file
+    "type": "𧇜x갘𣟷$%\u001a􋼂o󻨌𧌐(H`𩿏N𖧋TjM!{$㞍t즨}",
+    "value": "􍒕\u0006ZS􆳞\u0008󹖞\u0012D"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_19.json b/libs/wire-api/test/golden/testObject_RichField_user_19.json
index e7b51cf1fed..abe4f17c46d 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_19.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_19.json
@@ -1,4 +1,4 @@
 {
-    "value": "󷖹qZj6曅)2\u0003C<􋓺7􄱲󱒯=$21m J",
-    "type": "(SN\u0007}L𗦑Ἷk\u0017"
-}
\ No newline at end of file
+    "type": "(SN\u0007}L𗦑Ἷk\u0017",
+    "value": "󷖹qZj6曅)2\u0003C<􋓺7􄱲󱒯=$21m J"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_2.json b/libs/wire-api/test/golden/testObject_RichField_user_2.json
index 3271e01088c..314990334b3 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_2.json
@@ -1,4 +1,4 @@
 {
-    "value": ".3jc剗[^\u001fgB`p\"𫉶zlj𭡊\u0002\rJOfࣸa",
-    "type": "04,𦷛pPSFaJak|O嫔k"
-}
\ No newline at end of file
+    "type": "04,𦷛pPSFaJak|O嫔k",
+    "value": ".3jc剗[^\u001fgB`p\"𫉶zlj𭡊\u0002\rJOfࣸa"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_20.json b/libs/wire-api/test/golden/testObject_RichField_user_20.json
index 7b188de4a23..54d3aede3e3 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_20.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_20.json
@@ -1,4 +1,4 @@
 {
-    "value": "}(=z0w𫬣𤬖c𞢝\u001f9K\u0014:\u000f󲲰󱑩?\u000bN) 1􁂟_2 ",
-    "type": "O"
-}
\ No newline at end of file
+    "type": "O",
+    "value": "}(=z0w𫬣𤬖c𞢝\u001f9K\u0014:\u000f󲲰󱑩?\u000bN) 1􁂟_2 "
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_3.json b/libs/wire-api/test/golden/testObject_RichField_user_3.json
index ad26f36bf37..dc1cc715785 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_3.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_3.json
@@ -1,4 +1,4 @@
 {
-    "value": "%𩣟󼌦f=&nM瘜M$@jVP\u001f\u0018\u000f􍏰z􆦆𭺳3&/Ik썽W\u0019",
-    "type": "𧝩^𨸽M韂ד\u000cE^𪣹M𦓑C"
-}
\ No newline at end of file
+    "type": "𧝩^𨸽M韂ד\u000cE^𪣹M𦓑C",
+    "value": "%𩣟󼌦f=&nM瘜M$@jVP\u001f\u0018\u000f􍏰z􆦆𭺳3&/Ik썽W\u0019"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_4.json b/libs/wire-api/test/golden/testObject_RichField_user_4.json
index aa21405b3b3..99d276778b1 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_4.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_4.json
@@ -1,4 +1,4 @@
 {
-    "value": "䷖5",
-    "type": "+"
-}
\ No newline at end of file
+    "type": "+",
+    "value": "䷖5"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_5.json b/libs/wire-api/test/golden/testObject_RichField_user_5.json
index 70411e8e3c6..3dd18bd7ef0 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_5.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_5.json
@@ -1,4 +1,4 @@
 {
-    "value": "\u001b\rz*?\\􀽒D",
-    "type": ">􏡍a/I"
-}
\ No newline at end of file
+    "type": ">􏡍a/I",
+    "value": "\u001b\rz*?\\􀽒D"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_6.json b/libs/wire-api/test/golden/testObject_RichField_user_6.json
index 97092976fa7..162181529ea 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_6.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_6.json
@@ -1,4 +1,4 @@
 {
-    "value": "넨\u001b~\u0012)󻄍\u000eC5󼨻\u001f􉆀\u0000􂏘\u0015pEK\"\u0011y󶟈TwV",
-    "type": "_B>)YQPt|Y\u0001']F𫤳qd$ 󱸐?\u0008:z㷏𦿅"
-}
\ No newline at end of file
+    "type": "_B>)YQPt|Y\u0001']F𫤳qd$ 󱸐?\u0008:z㷏𦿅",
+    "value": "넨\u001b~\u0012)󻄍\u000eC5󼨻\u001f􉆀\u0000􂏘\u0015pEK\"\u0011y󶟈TwV"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_7.json b/libs/wire-api/test/golden/testObject_RichField_user_7.json
index 54105c14bd3..dc2a7f9a770 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_7.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_7.json
@@ -1,4 +1,4 @@
 {
-    "value": "6\u001bp\\hR𨑺=\u0011􀌦",
-    "type": "󺶫\u00117𫥥c:s􋵺4xN"
-}
\ No newline at end of file
+    "type": "󺶫\u00117𫥥c:s􋵺4xN",
+    "value": "6\u001bp\\hR𨑺=\u0011􀌦"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_8.json b/libs/wire-api/test/golden/testObject_RichField_user_8.json
index 6b88caa1dac..f0b32f3bae3 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_8.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_8.json
@@ -1,4 +1,4 @@
 {
-    "value": "YYF\u0012󴺈\u000be/9z(󶎲",
-    "type": "1\u0000󴂛I\u0000Jm􍎲\u0006"
-}
\ No newline at end of file
+    "type": "1\u0000󴂛I\u0000Jm􍎲\u0006",
+    "value": "YYF\u0012󴺈\u000be/9z(󶎲"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichField_user_9.json b/libs/wire-api/test/golden/testObject_RichField_user_9.json
index 94168d9eaa6..68840a8a377 100644
--- a/libs/wire-api/test/golden/testObject_RichField_user_9.json
+++ b/libs/wire-api/test/golden/testObject_RichField_user_9.json
@@ -1,4 +1,4 @@
 {
-    "value": "iJ%\u0010\nfrM'𩧪",
-    "type": "D\u0004\\o"
-}
\ No newline at end of file
+    "type": "D\u0004\\o",
+    "value": "iJ%\u0010\nfrM'𩧪"
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_1.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_1.json
index bcf8943b876..477781585c6 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_1.json
@@ -1,29 +1,29 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "􄙑",
-            "type": "𪹊U󴨆z􃞜󼫉pFn띊\n𥊦uF*\u0006\u000b\u001a\u0005Ox􏲶𒍒t3+\u0011󸳣K"
+            "type": "𪹊U󴨆z􃞜󼫉pFn띊\n𥊦uF*\u0006\u000b\u001a\u0005Ox􏲶𒍒t3+\u0011󸳣K",
+            "value": "􄙑"
         },
         {
-            "value": "􍣞󸆒𖩊궺.&\u0013􆪉Y𥻩ގ zZjp?X",
-            "type": "M\u0011M󸈜\u0018𫢒󹰦5d󼁸>VVg"
+            "type": "M\u0011M󸈜\u0018𫢒󹰦5d󼁸>VVg",
+            "value": "􍣞󸆒𖩊궺.&\u0013􆪉Y𥻩ގ zZjp?X"
         },
         {
-            "value": "k6",
-            "type": ",􏯭\u0015\"yC}􊷝􈭖e[;⨓b+"
+            "type": ",􏯭\u0015\"yC}􊷝􈭖e[;⨓b+",
+            "value": "k6"
         },
         {
-            "value": "s\u000b􄨄u",
-            "type": "FYx}|N\u0014M\u0007\u0008]w%$F􂟴b1𬈷?n􃞛6󷫊[𐋃\u0011}􉽡"
+            "type": "FYx}|N\u0014M\u0007\u0008]w%$F􂟴b1𬈷?n􃞛6󷫊[𐋃\u0011}􉽡",
+            "value": "s\u000b􄨄u"
         },
         {
-            "value": "~H\u001eH3htՁ+",
-            "type": "\u00169nO\u0016𐫔䣣󰕵󺴘𩰘\u0018𧆣k􀄶=4\u0003<DM\n\u0013􋁉\rnn8󽶊"
+            "type": "\u00169nO\u0016𐫔䣣󰕵󺴘𩰘\u0018𧆣k􀄶=4\u0003<DM\n\u0013􋁉\rnn8󽶊",
+            "value": "~H\u001eH3htՁ+"
         },
         {
-            "value": "\\*",
-            "type": ":;"
+            "type": ":;",
+            "value": "\\*"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_10.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_10.json
index 06dcfc5cb7b..f2ea3ee5237 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_10.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_10.json
@@ -1,81 +1,81 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "_=x\u0006\u0001h\u0017",
-            "type": "K\u0018SN0𑲀𤧉.54䰸􎪔fY󵎁뉙)"
+            "type": "K\u0018SN0𑲀𤧉.54䰸􎪔fY󵎁뉙)",
+            "value": "_=x\u0006\u0001h\u0017"
         },
         {
-            "value": ".=@}OdoKl*YU_I(H\t 󰥡\u0012-",
-            "type": "𥳈􅓅1O􉣃o􃗦\u0000󵒁\u0003􍕮􍉵􄈃zri="
+            "type": "𥳈􅓅1O􉣃o􃗦\u0000󵒁\u0003􍕮􍉵􄈃zri=",
+            "value": ".=@}OdoKl*YU_I(H\t 󰥡\u0012-"
         },
         {
-            "value": "]09|􈐅\\􇣚\u0007}xY",
-            "type": "\u0008u㯟\u0018\u0011u@}"
+            "type": "\u0008u㯟\u0018\u0011u@}",
+            "value": "]09|􈐅\\􇣚\u0007}xY"
         },
         {
-            "value": "􏭲\u0013o\u000c+𡜮8𣇊\u0017.cq/0u**ꅆ\u000es",
-            "type": ": U\u000cLm󻪖CZ\u000e4}Nt"
+            "type": ": U\u000cLm󻪖CZ\u000e4}Nt",
+            "value": "􏭲\u0013o\u000c+𡜮8𣇊\u0017.cq/0u**ꅆ\u000es"
         },
         {
-            "value": "𠼮~\u0010`\u0004EF\u0013\\\t􃏸g􀻫f_D\u001c\u0015vnE􋳺\u001e󴉋D",
-            "type": "a⚲\u000b"
+            "type": "a⚲\u000b",
+            "value": "𠼮~\u0010`\u0004EF\u0013\\\t􃏸g􀻫f_D\u001c\u0015vnE􋳺\u001e󴉋D"
         },
         {
-            "value": "􉇉]f􂬭\u001cAeḷ$\u0019熷𪺬a%A\u0013􉻘􍸌\u001dI",
-            "type": "􂅫􁢯I\"􈷶c󾙾"
+            "type": "􂅫􁢯I\"􈷶c󾙾",
+            "value": "􉇉]f􂬭\u001cAeḷ$\u0019熷𪺬a%A\u0013􉻘􍸌\u001dI"
         },
         {
-            "value": "v-)i󸔤=\u0013Ww\u0008󿂝D2􅃤#CZ",
-            "type": "𐘺v3|JT^?@!j\u001e󻴠\u0007"
+            "type": "𐘺v3|JT^?@!j\u001e󻴠\u0007",
+            "value": "v-)i󸔤=\u0013Ww\u0008󿂝D2􅃤#CZ"
         },
         {
-            "value": "@\"\u0014𑋊t@\u000b󻍑N6󵃩\u0008𮇢b\u0004`%􌤺\u0005ꏻ|",
-            "type": "𬇘$\u0018h=?G^𪰤𥑯89<M>^┫\u001e\u0008􊇦#󷌶匆a"
+            "type": "𬇘$\u0018h=?G^𪰤𥑯89<M>^┫\u001e\u0008􊇦#󷌶匆a",
+            "value": "@\"\u0014𑋊t@\u000b󻍑N6󵃩\u0008𮇢b\u0004`%􌤺\u0005ꏻ|"
         },
         {
-            "value": "9𫺅{\u0018'T\u0011q-𘇾𥌸􊯁_\\j]\u0000Sp𛃲N\u001f􄶂)&D\u0019",
-            "type": "$1\u001d㠮騀n"
+            "type": "$1\u001d㠮騀n",
+            "value": "9𫺅{\u0018'T\u0011q-𘇾𥌸􊯁_\\j]\u0000Sp𛃲N\u001f􄶂)&D\u0019"
         },
         {
-            "value": "c(L􊼍𧒏𡐛ﰔ^󼇞\u0014\u001c󿽨\\V􉏉1eOsl\u001f\"]",
-            "type": "b\u0002펥𪖕:~}󳛨i󸥷Q꒴\u000f湫nI9C쵻𘏬'╤A"
+            "type": "b\u0002펥𪖕:~}󳛨i󸥷Q꒴\u000f湫nI9C쵻𘏬'╤A",
+            "value": "c(L􊼍𧒏𡐛ﰔ^󼇞\u0014\u001c󿽨\\V􉏉1eOsl\u001f\"]"
         },
         {
-            "value": "\u000c|XCf|cCe\u0019s@/\u001b-$M",
-            "type": "<F"
+            "type": "<F",
+            "value": "\u000c|XCf|cCe\u0019s@/\u001b-$M"
         },
         {
-            "value": "(c!?9Q8󹷔n舎\u0012",
-            "type": "𠃼1􆽾@\"k`\\􆫤\u0017*4`;&\n\u0014􈈰%5\u0011]p󽃗f\u000e"
+            "type": "𠃼1􆽾@\"k`\\􆫤\u0017*4`;&\n\u0014􈈰%5\u0011]p󽃗f\u000e",
+            "value": "(c!?9Q8󹷔n舎\u0012"
         },
         {
-            "value": "󲔬{Ox\u0017sS\u0004.^ﭗ󾊚Af\r\r\u001fn\u0000\u000e별",
-            "type": "F[\u0007Zg𑖃\u001a\u0015𓁶𨕶-A$*A5z\u000e󼡫P{\n!\u000c\u0006!\u001a*"
+            "type": "F[\u0007Zg𑖃\u001a\u0015𓁶𨕶-A$*A5z\u000e󼡫P{\n!\u000c\u0006!\u001a*",
+            "value": "󲔬{Ox\u0017sS\u0004.^ﭗ󾊚Af\r\r\u001fn\u0000\u000e별"
         },
         {
-            "value": "􌢋􅄀~B\u00196\t㰶B󻨇8s\u00011\u000fS</=q􌹜\u0014\u0016n+\u0018쑖",
-            "type": "\u001f[]>\u000c!􊱑⣾5@[􈪪𨤦~O"
+            "type": "\u001f[]>\u000c!􊱑⣾5@[􈪪𨤦~O",
+            "value": "􌢋􅄀~B\u00196\t㰶B󻨇8s\u00011\u000fS</=q􌹜\u0014\u0016n+\u0018쑖"
         },
         {
-            "value": "\u001c\"𫽃N\u001a𩈑dz%󾉸\u0019pP\u0014􇹭𡸴xJvFrc",
-            "type": "\"N󶹕$l+\u001b棇~A𬤮\u0015󺏪􁥟륺G(𬙗.cꆫ"
+            "type": "\"N󶹕$l+\u001b棇~A𬤮\u0015󺏪􁥟륺G(𬙗.cꆫ",
+            "value": "\u001c\"𫽃N\u001a𩈑dz%󾉸\u0019pP\u0014􇹭𡸴xJvFrc"
         },
         {
-            "value": "𪴩I&\u000f/]\u001fP􌱙󼷩C􊑽b",
-            "type": "\u0006w𒐬b\"󷒵\u0006)L𫍛󶚙\u0016:󼧬e\u0008*{\u000e\u0015"
+            "type": "\u0006w𒐬b\"󷒵\u0006)L𫍛󶚙\u0016:󼧬e\u0008*{\u000e\u0015",
+            "value": "𪴩I&\u000f/]\u001fP􌱙󼷩C􊑽b"
         },
         {
-            "value": ">!D\u0000\u0015+\t􏪿𡴟ZwE\u001evI\u000b\u0017𗀞 𫝊,C{O",
-            "type": "K󼉺\u001f\u0012?q2/뵥M󹟧y(􏓡~\u0012"
+            "type": "K󼉺\u001f\u0012?q2/뵥M󹟧y(􏓡~\u0012",
+            "value": ">!D\u0000\u0015+\t􏪿𡴟ZwE\u001evI\u000b\u0017𗀞 𫝊,C{O"
         },
         {
-            "value": "\u001f\u000e\u0014Sg$M~㤳K67&gud􀥿O4cvc.q\\走W\"c􎥢",
-            "type": "\n􌁿􁙍s𧀛랒\u000crp\\8𧦆{"
+            "type": "\n􌁿􁙍s𧀛랒\u000crp\\8𧦆{",
+            "value": "\u001f\u000e\u0014Sg$M~㤳K67&gud􀥿O4cvc.q\\走W\"c􎥢"
         },
         {
-            "value": "3z\u000b((}!\"􊧜Q",
-            "type": "\u0007~NT\u00180^"
+            "type": "\u0007~NT\u00180^",
+            "value": "3z\u000b((}!\"􊧜Q"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_11.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_11.json
index 70cb09826ff..dfa08e77c05 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_11.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_11.json
@@ -1,49 +1,49 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "􋰤󺅴󱊧Y~\"Y",
-            "type": "%\u0016A\u0005@O󷥵\u000e)y "
+            "type": "%\u0016A\u0005@O󷥵\u000e)y ",
+            "value": "􋰤󺅴󱊧Y~\"Y"
         },
         {
-            "value": "r>\rh\u0000>󾿍$?䯶\u0001\u0019&T",
-            "type": ")󽫘c􆚞󽫓P @(^x\u001e5"
+            "type": ")󽫘c􆚞󽫓P @(^x\u001e5",
+            "value": "r>\rh\u0000>󾿍$?䯶\u0001\u0019&T"
         },
         {
-            "value": "~ᴲc𬩐R𗑻qz𬪧$>z\u0006`5\u0019L#\u0017;䞊T",
-            "type": "􂺁UK"
+            "type": "􂺁UK",
+            "value": "~ᴲc𬩐R𗑻qz𬪧$>z\u0006`5\u0019L#\u0017;䞊T"
         },
         {
-            "value": "\u001eT*\u0007",
-            "type": "/c^z󶴆"
+            "type": "/c^z󶴆",
+            "value": "\u001eT*\u0007"
         },
         {
-            "value": "𮢢u\u001d\u0007󼀗e󼔺T/􆿩􂨯\u0000",
-            "type": "\u0013M󿹃`锇\\𤘂E𥍹\u0015\u0019E\u000c`\u0007<czn겄a🛌🩁\t튈t\u001b"
+            "type": "\u0013M󿹃`锇\\𤘂E𥍹\u0015\u0019E\u000c`\u0007<czn겄a🛌🩁\t튈t\u001b",
+            "value": "𮢢u\u001d\u0007󼀗e󼔺T/􆿩􂨯\u0000"
         },
         {
-            "value": "𬜔v\u0000􉋩X\u0005𘫭s@z􉰁鈾v􆣞y纚\u0004b𨭜􈳅",
-            "type": "#)pnE􋟙\u0016􂸰"
+            "type": "#)pnE􋟙\u0016􂸰",
+            "value": "𬜔v\u0000􉋩X\u0005𘫭s@z􉰁鈾v􆣞y纚\u0004b𨭜􈳅"
         },
         {
-            "value": "b\u0000눃󱾔g𬬑=󷳉\u0006^𗋿^\u0007􏀃9𡒑'c?",
-            "type": "=OHSv\"{+V>iFy\u0012󹓮𮐂d\"eV,󵀷;\u0007(󹣑"
+            "type": "=OHSv\"{+V>iFy\u0012󹓮𮐂d\"eV,󵀷;\u0007(󹣑",
+            "value": "b\u0000눃󱾔g𬬑=󷳉\u0006^𗋿^\u0007􏀃9𡒑'c?"
         },
         {
-            "value": "ഁ :\u00005􊀗z󸑊􃘸N􂘯𪹭5@Qb",
-            "type": "󴋂\u001c6\u0000\u001f)n$󴹙\u000fY~"
+            "type": "󴋂\u001c6\u0000\u001f)n$󴹙\u000fY~",
+            "value": "ഁ :\u00005􊀗z󸑊􃘸N􂘯𪹭5@Qb"
         },
         {
-            "value": "#(N\u0004\u000cLힹ]K,결􀬀",
-            "type": "\\󻬏􈯏"
+            "type": "\\󻬏􈯏",
+            "value": "#(N\u0004\u000cLힹ]K,결􀬀"
         },
         {
-            "value": "𢱳\u0000?.[_JU`",
-            "type": "K"
+            "type": "K",
+            "value": "𢱳\u0000?.[_JU`"
         },
         {
-            "value": "􋠃뇮\tI4VNUh",
-            "type": "󾔏;8𥴖n=\u000bA\u000coZcKo\u0004󾘱=g{*\u0019"
+            "type": "󾔏;8𥴖n=\u000bA\u000coZcKo\u0004󾘱=g{*\u0019",
+            "value": "􋠃뇮\tI4VNUh"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_12.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_12.json
index 1e2720ede57..cd04768a1b0 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_12.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_12.json
@@ -1,117 +1,117 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "t\u0010𤒚e姛j䣇L􉋒\u0011\u001a𣣡\u001a􇆿\u0017\u0014sTk脏􊢡2#-",
-            "type": ""
+            "type": "",
+            "value": "t\u0010𤒚e姛j䣇L􉋒\u0011\u001a𣣡\u001a􇆿\u0017\u0014sTk脏􊢡2#-"
         },
         {
-            "value": "5=[n𠇿%􎢖𠶸䧧aEv#CS􇣄=\r󸠆g1,HM\u0015\\죱",
-            "type": "W['&]􀤩_􇣒\u0012kW\u001bs􊬥\u00041}Xm󹃔`\u0011󾩀its􃶞"
+            "type": "W['&]􀤩_􇣒\u0012kW\u001bs􊬥\u00041}Xm󹃔`\u0011󾩀its􃶞",
+            "value": "5=[n𠇿%􎢖𠶸䧧aEv#CS􇣄=\r󸠆g1,HM\u0015\\죱"
         },
         {
-            "value": "`E_J\u0006|BXW/.*M\u0018\u001cP\u0012󸇭Jj7|U\u0005\u0002H",
-            "type": "oRl󲍀-*\u0019?:M'/\n𠬒𣞯"
+            "type": "oRl󲍀-*\u0019?:M'/\n𠬒𣞯",
+            "value": "`E_J\u0006|BXW/.*M\u0018\u001cP\u0012󸇭Jj7|U\u0005\u0002H"
         },
         {
-            "value": "h\u0002s)󹫤C6\u0006􉁯(=􉆳󼣊\\v\u0005\t-)󰩀-^R@e\u0014;d󴭷D",
-            "type": "h𠾋\u0001󽃠\u00189𐰝]󶋡󿰈3]"
+            "type": "h𠾋\u0001󽃠\u00189𐰝]󶋡󿰈3]",
+            "value": "h\u0002s)󹫤C6\u0006􉁯(=􉆳󼣊\\v\u0005\t-)󰩀-^R@e\u0014;d󴭷D"
         },
         {
-            "value": "\u0014@ PC󻨔\u0011.H􍮌\u0010􍏁,2n",
-            "type": "hjp\u000c󹥞\u0015𩇏\u001c\n굘叫\r2🔱y\u0002"
+            "type": "hjp\u000c󹥞\u0015𩇏\u001c\n굘叫\r2🔱y\u0002",
+            "value": "\u0014@ PC󻨔\u0011.H􍮌\u0010􍏁,2n"
         },
         {
-            "value": "v:^\u0004𢭲H𘪈",
-            "type": "xmAm\u000e`𛆳f#\u0013I\u0012QC#|lu_c\u0018ﳶl"
+            "type": "xmAm\u000e`𛆳f#\u0013I\u0012QC#|lu_c\u0018ﳶl",
+            "value": "v:^\u0004𢭲H𘪈"
         },
         {
-            "value": "\u000c􍬂_kH\u0008\u0008QG-m\u0016NJ<_jft@᪀{&{o9\u0004󵔾*",
-            "type": ";􄆪\t\n*\u0015Uq|􂚏.\u0004䆠A頳z𢾠􋻈􁖯T;+\u000f1`Hk^"
+            "type": ";􄆪\t\n*\u0015Uq|􂚏.\u0004䆠A頳z𢾠􋻈􁖯T;+\u000f1`Hk^",
+            "value": "\u000c􍬂_kH\u0008\u0008QG-m\u0016NJ<_jft@᪀{&{o9\u0004󵔾*"
         },
         {
-            "value": "焪^PW\u001e2_OZ𞡧N\u000f\u001f\u0011􋉞=i1\u000f#g󾌧\u0016\u001a`U",
-            "type": "'𣳬gRX󳌥\u0000𩺜pvh\u0015_p\u001b\u001d􀾁􃕸ygA1K􁐻"
+            "type": "'𣳬gRX󳌥\u0000𩺜pvh\u0015_p\u001b\u001d􀾁􃕸ygA1K􁐻",
+            "value": "焪^PW\u001e2_OZ𞡧N\u000f\u001f\u0011􋉞=i1\u000f#g󾌧\u0016\u001a`U"
         },
         {
-            "value": "󿔓􂌮/󷋛􈺲.ꫢ38y𥹹\u0011\u001e􌍭a(",
-            "type": "|h\u0007_@𦷟K\u0016<D^"
+            "type": "|h\u0007_@𦷟K\u0016<D^",
+            "value": "󿔓􂌮/󷋛􈺲.ꫢ38y𥹹\u0011\u001e􌍭a("
         },
         {
-            "value": "eNN\u0011图K􂦝/e:I𤠔K骷J𘙝C@𩁶\u0000􊃇\u00109m􀁬\u0013󶺺\u0019",
-            "type": "nxyx2T\u0003:p+ꥬq>\u0019:n2"
+            "type": "nxyx2T\u0003:p+ꥬq>\u0019:n2",
+            "value": "eNN\u0011图K􂦝/e:I𤠔K骷J𘙝C@𩁶\u0000􊃇\u00109m􀁬\u0013󶺺\u0019"
         },
         {
-            "value": "7c\u001f4hx\u001a𥼺@󼤐VwtQ-o􅚖",
-            "type": "`\u0017"
+            "type": "`\u0017",
+            "value": "7c\u001f4hx\u001a𥼺@󼤐VwtQ-o􅚖"
         },
         {
-            "value": "6\u001d~\tᦀ􇦾C\u0015!𓍊^2𐠊􀆎:󰑧I\u0008",
-            "type": "󷄇𥋹\nlﱁ㆜3\u001b\u001fꩤ䳆󰈘Ჭ󵲌.󸣳FWs"
+            "type": "󷄇𥋹\nlﱁ㆜3\u001b\u001fꩤ䳆󰈘Ჭ󵲌.󸣳FWs",
+            "value": "6\u001d~\tᦀ􇦾C\u0015!𓍊^2𐠊􀆎:󰑧I\u0008"
         },
         {
-            "value": "󾘶^\u00105n􇫎\u001c𢊰P\u0017\u001c_\u0001&\"󱺺",
-            "type": "𬋉𝓚愿T\u00052S4_􍛥p𠺤\\𧑊7\u0016󴶴Q%\u001bF\u0016c󱜞􇹟#\u0013\u0014"
+            "type": "𬋉𝓚愿T\u00052S4_􍛥p𠺤\\𧑊7\u0016󴶴Q%\u001bF\u0016c󱜞􇹟#\u0013\u0014",
+            "value": "󾘶^\u00105n􇫎\u001c𢊰P\u0017\u001c_\u0001&\"󱺺"
         },
         {
-            "value": "OZ\u001a\u001f鞂z􌒃\u00144A<",
-            "type": "𗥧;A}^󵦟g\\3\u001a03𦢻𦨭X\u0019"
+            "type": "𗥧;A}^󵦟g\\3\u001a03𦢻𦨭X\u0019",
+            "value": "OZ\u001a\u001f鞂z􌒃\u00144A<"
         },
         {
-            "value": "G)/h8v\u0019\u0013𠯣?𭍙2\u0000k𥳅\u0006#W\u000elG\u001a󲎚\\",
-            "type": "zOr􋄝&"
+            "type": "zOr􋄝&",
+            "value": "G)/h8v\u0019\u0013𠯣?𭍙2\u0000k𥳅\u0006#W\u000elG\u001a󲎚\\"
         },
         {
-            "value": "D?\u001assN]2\u0018y\u0004uiN𮎕,h󾣝躚Q𗛅[",
-            "type": ">𝥷Se!~pz峄1\t󲑌􊸼"
+            "type": ">𝥷Se!~pz峄1\t󲑌􊸼",
+            "value": "D?\u001assN]2\u0018y\u0004uiN𮎕,h󾣝躚Q𗛅["
         },
         {
-            "value": "\u0018",
-            "type": "jX𮖸\u0013?󱶐Pf􈷇钞\u001d}>s;@󸈮𤄐𠲖󾠤蠘+\u0008Q\u0001b\u001a"
+            "type": "jX𮖸\u0013?󱶐Pf􈷇钞\u001d}>s;@󸈮𤄐𠲖󾠤蠘+\u0008Q\u0001b\u001a",
+            "value": "\u0018"
         },
         {
-            "value": "X􋸜􌥝\u0019쁄+𠬩M􂣟Z\u0013𣾨\"L\nOD窪Wf\u0006n\u000f\u001d􆏅",
-            "type": "ᰣ$󳷭􋜑󴐈\r􋕙PJ󼲙|7𗌪竝ddi𡇗\u000c"
+            "type": "ᰣ$󳷭􋜑󴐈\r􋕙PJ󼲙|7𗌪竝ddi𡇗\u000c",
+            "value": "X􋸜􌥝\u0019쁄+𠬩M􂣟Z\u0013𣾨\"L\nOD窪Wf\u0006n\u000f\u001d􆏅"
         },
         {
-            "value": "Ze",
-            "type": "6彤L\u001d𭊽Ycgi}o#"
+            "type": "6彤L\u001d𭊽Ycgi}o#",
+            "value": "Ze"
         },
         {
-            "value": "\r𬣂𤉅􅶤I\u001d<󱒛\u001c⛓@",
-            "type": "%􏃆9Mp2"
+            "type": "%􏃆9Mp2",
+            "value": "\r𬣂𤉅􅶤I\u001d<󱒛\u001c⛓@"
         },
         {
-            "value": "𦀦\u0017󶷗𣐵cg!`󸻯\u0007\u0004q&\u0016p[\u0001\u000ef",
-            "type": "\u0000\u0002\u000e􌯪\to\tc"
+            "type": "\u0000\u0002\u000e􌯪\to\tc",
+            "value": "𦀦\u0017󶷗𣐵cg!`󸻯\u0007\u0004q&\u0016p[\u0001\u000ef"
         },
         {
-            "value": "𬔕錇",
-            "type": "\u001df􃟆}MV;u\u0000V⯕#Nm𪴀_M]\t_6?\u0016\r\u00067Y󵢅$X"
+            "type": "\u001df􃟆}MV;u\u0000V⯕#Nm𪴀_M]\t_6?\u0016\r\u00067Y󵢅$X",
+            "value": "𬔕錇"
         },
         {
-            "value": "hX\u0004",
-            "type": "S+V1\u0007H󻶝A3\u0014\"\u0013䪰;jK<wa_QTjT~,h"
+            "type": "S+V1\u0007H󻶝A3\u0014\"\u0013䪰;jK<wa_QTjT~,h",
+            "value": "hX\u0004"
         },
         {
-            "value": "Fuj\n𠻷|𓊔\u0010\u000fd3𬱯􅯠{rZV",
-            "type": "󺅢\u000f>XE4󳬍Jy]_+R󷉋𪞙\u0018︢\t\u00148𤴳抳뤍𦟛󸝓A詓"
+            "type": "󺅢\u000f>XE4󳬍Jy]_+R󷉋𪞙\u0018︢\t\u00148𤴳抳뤍𦟛󸝓A詓",
+            "value": "Fuj\n𠻷|𓊔\u0010\u000fd3𬱯􅯠{rZV"
         },
         {
-            "value": "Q=e\u0008f\u000c𐼧􃌣1/m~M\u0012𥕪🞚WT󵜾4\u0018\u0018𥰔爥s",
-            "type": "f𥅔𫏿\u0015sJ&\")􆪫,󻟥\u0013\u0012hu􅮪P𠹲𪗋t"
+            "type": "f𥅔𫏿\u0015sJ&\")􆪫,󻟥\u0013\u0012hu􅮪P𠹲𪗋t",
+            "value": "Q=e\u0008f\u000c𐼧􃌣1/m~M\u0012𥕪🞚WT󵜾4\u0018\u0018𥰔爥s"
         },
         {
-            "value": "{飖\u001au>\u0018꼞v4~{",
-            "type": "R u󵯘~𖥣\u001aꬥ玗\u0014𩢻kE𬷆H@𫂟􄾧Yx,g𥎣"
+            "type": "R u󵯘~𖥣\u001aꬥ玗\u0014𩢻kE𬷆H@𫂟􄾧Yx,g𥎣",
+            "value": "{飖\u001au>\u0018꼞v4~{"
         },
         {
-            "value": "2\"^g\u0019Y􅥋\nMny祵󽱪󻵭s趢\u0013U󻤴.\u0010\u001crE{r1E",
-            "type": "R\u001fj\u001eY\u0018L"
+            "type": "R\u001fj\u001eY\u0018L",
+            "value": "2\"^g\u0019Y􅥋\nMny祵󽱪󻵭s趢\u0013U󻤴.\u0010\u001crE{r1E"
         },
         {
-            "value": "3u8K\u000b\\\n\u000c^=󻤲\u0010`\nu𡛷;􌪐硇.𪀤􉣰\u000e碒\u0016\u0012",
-            "type": "􃒑$⒱\u0018뼼'2(\u0019𢙹\u001a\u0012󲃑_7[󴫂􂷜\u001c\u0012$􆜞"
+            "type": "􃒑$⒱\u0018뼼'2(\u0019𢙹\u001a\u0012󲃑_7[󴫂􂷜\u001c\u0012$􆜞",
+            "value": "3u8K\u000b\\\n\u000c^=󻤲\u0010`\nu𡛷;􌪐硇.𪀤􉣰\u000e碒\u0016\u0012"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_13.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_13.json
index 696d8d52c67..5cc0e4cba33 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_13.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_13.json
@@ -1,109 +1,109 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "𮊛y]*GCEk9?\u001b.󻡊^r􇞗6Ύ{P0󸊸1;\u0018v㧶a",
-            "type": "z*\u0010穙I􇆨𠵊m[𤔓)┨fKT󹎗\u0015\"p\u00058:cp\u0001xi"
+            "type": "z*\u0010穙I􇆨𠵊m[𤔓)┨fKT󹎗\u0015\"p\u00058:cp\u0001xi",
+            "value": "𮊛y]*GCEk9?\u001b.󻡊^r􇞗6Ύ{P0󸊸1;\u0018v㧶a"
         },
         {
-            "value": "3:aru=B(YX/餙󾎝U󳋢\\?􂟁\u0003",
-            "type": "`\u001bHBX𫌵󱣹\u0011\tX뫨Q)1\u000f󼼫d"
+            "type": "`\u001bHBX𫌵󱣹\u0011\tX뫨Q)1\u000f󼼫d",
+            "value": "3:aru=B(YX/餙󾎝U󳋢\\?􂟁\u0003"
         },
         {
-            "value": "_\u000f>|%\u0006\u00150k󷹞N ef􍹮󸗭c嫋)᭟2ⅨN>|𢜧",
-            "type": "𨯘R\u001c\u0016[\u0013\r噄􍛪5h\u001bl󻦼\u00197t\u001d ,\u0008Kj󾄏\u001bG6"
+            "type": "𨯘R\u001c\u0016[\u0013\r噄􍛪5h\u001bl󻦼\u00197t\u001d ,\u0008Kj󾄏\u001bG6",
+            "value": "_\u000f>|%\u0006\u00150k󷹞N ef􍹮󸗭c嫋)᭟2ⅨN>|𢜧"
         },
         {
-            "value": "\u0008𛂡[\u001f𝙎rVr]𣧮pw􀊆nT3FG",
-            "type": "Nf\\T"
+            "type": "Nf\\T",
+            "value": "\u0008𛂡[\u001f𝙎rVr]𣧮pw􀊆nT3FG"
         },
         {
-            "value": "􇚂\u0017\u000e]\u000c'\u000f\u001b",
-            "type": "𐹧y\u000f\u001f𪌠󰍎LU\u00048h\u001e\u0001󶽖\u0000󽋑t 뭾𬅪䪞\u0018xX"
+            "type": "𐹧y\u000f\u001f𪌠󰍎LU\u00048h\u001e\u0001󶽖\u0000󽋑t 뭾𬅪䪞\u0018xX",
+            "value": "􇚂\u0017\u000e]\u000c'\u000f\u001b"
         },
         {
-            "value": "𥣮=胣!9nRi\u001d􌤫ꦠ",
-            "type": "FN\u0019&􏍇U𮄨~󶏿t𥉝`􍛋s"
+            "type": "FN\u0019&􏍇U𮄨~󶏿t𥉝`􍛋s",
+            "value": "𥣮=胣!9nRi\u001d􌤫ꦠ"
         },
         {
-            "value": " 􄬣\u000f\"u󲩑3󾈪Jl\u001exx:\u001chx\u0005u",
-            "type": "𘗴;R\u0007y\"\u001b:󸽍𗅧f\u0007ᏮDD􇒲"
+            "type": "𘗴;R\u0007y\"\u001b:󸽍𗅧f\u0007ᏮDD􇒲",
+            "value": " 􄬣\u000f\"u󲩑3󾈪Jl\u001exx:\u001chx\u0005u"
         },
         {
-            "value": "𥥵#{푓5s\u0013/s\"#\u001c:el\u0001",
-            "type": "󾹔􇆈|ཟ􃉕GmZ𗍧8k_JF\u001alI🖵LP𞄨"
+            "type": "󾹔􇆈|ཟ􃉕GmZ𗍧8k_JF\u001alI🖵LP𞄨",
+            "value": "𥥵#{푓5s\u0013/s\"#\u001c:el\u0001"
         },
         {
-            "value": "󾷟]",
-            "type": "L"
+            "type": "L",
+            "value": "󾷟]"
         },
         {
-            "value": "*𗐱\u0001~-6i ?􃁌`\u0003\u000e𢁗R\u000c𡜢t\u0011􋣟-3c.隝",
-            "type": "孌q)r𑒭*SA1:"
+            "type": "孌q)r𑒭*SA1:",
+            "value": "*𗐱\u0001~-6i ?􃁌`\u0003\u000e𢁗R\u000c𡜢t\u0011􋣟-3c.隝"
         },
         {
-            "value": "N",
-            "type": "𞢐mSH󾲹Y\u001f𗃐􈶎\u0018,w4uFD\u000e\"A緖\u0001"
+            "type": "𞢐mSH󾲹Y\u001f𗃐􈶎\u0018,w4uFD\u000e\"A緖\u0001",
+            "value": "N"
         },
         {
-            "value": "/𢫔;𩔙E%𗁲l\n\u0014.:{|]T@%\u0014􋃊`􀦽\u000f􏅺\u0019𭓤",
-            "type": "𪩒󱦵 :T0㞷\n쁱3\u0001\u0011\u000e@󼙯\u0003배0𧞉"
+            "type": "𪩒󱦵 :T0㞷\n쁱3\u0001\u0011\u000e@󼙯\u0003배0𧞉",
+            "value": "/𢫔;𩔙E%𗁲l\n\u0014.:{|]T@%\u0014􋃊`􀦽\u000f􏅺\u0019𭓤"
         },
         {
-            "value": "!\u0001u?𖩑􁞱Dz𫠬aIu",
-            "type": "I5\u001e𗧕1;v?𤃪@4􏧾􋣰󰎙|Pc"
+            "type": "I5\u001e𗧕1;v?𤃪@4􏧾􋣰󰎙|Pc",
+            "value": "!\u0001u?𖩑􁞱Dz𫠬aIu"
         },
         {
-            "value": "\u000818c0\u000fU􊹉'󼪜𧲋8\u0003",
-            "type": "󶗰 ?\u0017L+\t\nq𛲗\u0012\u0000+뵚\u0005\u0008/F𥥦o𘕻\u0001G"
+            "type": "󶗰 ?\u0017L+\t\nq𛲗\u0012\u0000+뵚\u0005\u0008/F𥥦o𘕻\u0001G",
+            "value": "\u000818c0\u000fU􊹉'󼪜𧲋8\u0003"
         },
         {
-            "value": "𬢠󻼐",
-            "type": "`vi\u001b󻰦z+%􇳥"
+            "type": "`vi\u001b󻰦z+%􇳥",
+            "value": "𬢠󻼐"
         },
         {
-            "value": "\r8\\YqNh𤖈\u00038u󵇂Q𧤂o&㦋꧴s􈛻\u001a󲀵LV\u001eqKu",
-            "type": "􉪠^TJ"
+            "type": "􉪠^TJ",
+            "value": "\r8\\YqNh𤖈\u00038u󵇂Q𧤂o&㦋꧴s􈛻\u001a󲀵LV\u001eqKu"
         },
         {
-            "value": "\u0002?fB󾷇崢𫘸iNI\u0003iH􈲐\u0016+\u0013&o",
-            "type": "𘪦(B\u0007/'譳󴣼\u00140ꍴ#U@CJV󼅠ǴpzR_\u0005𬸂[F𮩝 5"
+            "type": "𘪦(B\u0007/'譳󴣼\u00140ꍴ#U@CJV󼅠ǴpzR_\u0005𬸂[F𮩝 5",
+            "value": "\u0002?fB󾷇崢𫘸iNI\u0003iH􈲐\u0016+\u0013&o"
         },
         {
-            "value": "􈞠朑%Y󿺂𗨈WDE󽢹^𮤵jt􁀒\u0001\u001c0􅉞N\u000c𘞮",
-            "type": "\u0017V{\u000c?Z#b􃑨𝓮𧼟]\u001eG\u0012㱯bi󺞓섷(󵅱󲂘\u0008u\\"
+            "type": "\u0017V{\u000c?Z#b􃑨𝓮𧼟]\u001eG\u0012㱯bi󺞓섷(󵅱󲂘\u0008u\\",
+            "value": "􈞠朑%Y󿺂𗨈WDE󽢹^𮤵jt􁀒\u0001\u001c0􅉞N\u000c𘞮"
         },
         {
-            "value": "􅫘Z<\u0014咙<\u001aF(MQq󲁇\u0004\\󷳞𗓃x|\u001e\u0008\u0011m𨓛U",
-            "type": "\u0006r\u0007\t[\u0013'(\"/vSeljA\u0010{\u0001󻋍m𤈀"
+            "type": "\u0006r\u0007\t[\u0013'(\"/vSeljA\u0010{\u0001󻋍m𤈀",
+            "value": "􅫘Z<\u0014咙<\u001aF(MQq󲁇\u0004\\󷳞𗓃x|\u001e\u0008\u0011m𨓛U"
         },
         {
-            "value": "\u0011\u000f\u0004\u0016\u0002@\u0011='h\u00188\u0002d^GM󰪌􉢳n",
-            "type": "𩁿my5_湺\u0013\u001d?iA󳧭i\u0006ꛉ󽯗[~󳞙GPc"
+            "type": "𩁿my5_湺\u0013\u001d?iA󳧭i\u0006ꛉ󽯗[~󳞙GPc",
+            "value": "\u0011\u000f\u0004\u0016\u0002@\u0011='h\u00188\u0002d^GM󰪌􉢳n"
         },
         {
-            "value": "\u0013\u0018,N\u0005",
-            "type": "'H\"󴞂󸒦󿂍\r𛁄D;rP\u0019 がe\u0018"
+            "type": "'H\"󴞂󸒦󿂍\r𛁄D;rP\u0019 がe\u0018",
+            "value": "\u0013\u0018,N\u0005"
         },
         {
-            "value": "/",
-            "type": "𤈄󽭼\\\u0012\\%(j􍠞󿣀􄡫_@𦢥X\u0004𧧤\u00196\u0013󿐒\u0000冗\u0019"
+            "type": "𤈄󽭼\\\u0012\\%(j􍠞󿣀􄡫_@𦢥X\u0004𧧤\u00196\u0013󿐒\u0000冗\u0019",
+            "value": "/"
         },
         {
-            "value": "-𭚪M",
-            "type": "\u001aogWc𬝵oCY󻂑􌗞𠡼2PO_"
+            "type": "\u001aogWc𬝵oCY󻂑􌗞𠡼2PO_",
+            "value": "-𭚪M"
         },
         {
-            "value": "B",
-            "type": "vV9~􏕫4L,\u0013jz{􉜸󱷊;"
+            "type": "vV9~􏕫4L,\u0013jz{􉜸󱷊;",
+            "value": "B"
         },
         {
-            "value": "xХo\u0014𣷙,𥖮\u0014􍋦t􃣒0\tq\u0017􇜅u𔘣Q􉚥󾝇TpM𠀕\u001f:",
-            "type": "𮦵(𪶘#󹞕𑶓󲮣7\t\u0017A嶂y􎬱\u001f\u0006\u0017\u0000𐒀󰎡"
+            "type": "𮦵(𪶘#󹞕𑶓󲮣7\t\u0017A嶂y􎬱\u001f\u0006\u0017\u0000𐒀󰎡",
+            "value": "xХo\u0014𣷙,𥖮\u0014􍋦t􃣒0\tq\u0017􇜅u𔘣Q􉚥󾝇TpM𠀕\u001f:"
         },
         {
-            "value": "8Av1Gu+(䆃𬉒IK]r\u001e\u000c\u001c툗⿴*6^x|N􂸯e𖭧-w",
-            "type": "y\u0010\u0002]\u0011R\u001dH>^'󽫣v䡌\u000b"
+            "type": "y\u0010\u0002]\u0011R\u001dH>^'󽫣v䡌\u000b",
+            "value": "8Av1Gu+(䆃𬉒IK]r\u001e\u000c\u001c툗⿴*6^x|N􂸯e𖭧-w"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_14.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_14.json
index 2d5d6158aec..241e2ba39ef 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_14.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_14.json
@@ -1,101 +1,101 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "\"𪶺/8􍥱&n仚:䡾\n\u001f𩮺@gB_K",
-            "type": "Y􋸾d\u0000RI"
+            "type": "Y􋸾d\u0000RI",
+            "value": "\"𪶺/8􍥱&n仚:䡾\n\u001f𩮺@gB_K"
         },
         {
-            "value": "􋶋|\u0018j\u0019LuCp 𣰙􆛋l3h􄡺鑳5g󹤗𥷣X",
-            "type": "\u0003M&S<\u0011d2Pk+\u0007pM\u0008"
+            "type": "\u0003M&S<\u0011d2Pk+\u0007pM\u0008",
+            "value": "􋶋|\u0018j\u0019LuCp 𣰙􆛋l3h􄡺鑳5g󹤗𥷣X"
         },
         {
-            "value": ":\"",
-            "type": "􌡷r$ss>~0[􇣇:9𒔅]Ew%󸫺𣯠켢(󹛠}\u001b"
+            "type": "􌡷r$ss>~0[􇣇:9𒔅]Ew%󸫺𣯠켢(󹛠}\u001b",
+            "value": ":\""
         },
         {
-            "value": "f􉳽\u0011\u001c󾀝\u0014􏋱󱑞y𖠂ﰊ􆗲:G\u001b",
-            "type": "w𧐴\t𡢖K/\u0014Um\u0006𝥘󸝝I\u000er=$W_\u0018"
+            "type": "w𧐴\t𡢖K/\u0014Um\u0006𝥘󸝝I\u000er=$W_\u0018",
+            "value": "f􉳽\u0011\u001c󾀝\u0014􏋱󱑞y𖠂ﰊ􆗲:G\u001b"
         },
         {
-            "value": "\u0003B𨑗\u0015𩹠C𡻠H~T*6\u000f䁊\u0002db\n󲃉\u0005TC\u0006%\u000f\r\ru􇊠",
-            "type": ""
+            "type": "",
+            "value": "\u0003B𨑗\u0015𩹠C𡻠H~T*6\u000f䁊\u0002db\n󲃉\u0005TC\u0006%\u000f\r\ru􇊠"
         },
         {
-            "value": "\u0012e뵜\rR𧭷W0\u0012\u0006󽺁\r􍇐",
-            "type": "\u0013cYvJ󹓉dBMW\u000f _𢳕V"
+            "type": "\u0013cYvJ󹓉dBMW\u000f _𢳕V",
+            "value": "\u0012e뵜\rR𧭷W0\u0012\u0006󽺁\r􍇐"
         },
         {
-            "value": "󶪶\u0017X\u000cQ@2\u0013!TH󱊗X\u0002\u0008z\u001at`\u0002a]􍜤o󽻻􆢶합\u0000",
-            "type": "􃪗󷂇W0fY\u000b󳇳\r>l3mo6s2+\u0010󼧯*g'H"
+            "type": "􃪗󷂇W0fY\u000b󳇳\r>l3mo6s2+\u0010󼧯*g'H",
+            "value": "󶪶\u0017X\u000cQ@2\u0013!TH󱊗X\u0002\u0008z\u001at`\u0002a]􍜤o󽻻􆢶합\u0000"
         },
         {
-            "value": "𤩮Q\u000cNq\u0013S=hT9󴄓\t\u0004\u0012䂵\u0010l",
-            "type": "RAc\u0003u[󿎸rFF7s"
+            "type": "RAc\u0003u[󿎸rFF7s",
+            "value": "𤩮Q\u000cNq\u0013S=hT9󴄓\t\u0004\u0012䂵\u0010l"
         },
         {
-            "value": "🄘􃒱<􈫦G󷡎􁧨\u0011?%",
-            "type": "HM\n\u001c&x\u001f𦝸!\t㮿\u0018\u000f8\u001fJ\u001f𑩷K\u0018ODm\u0007\u0017h𣴮"
+            "type": "HM\n\u001c&x\u001f𦝸!\t㮿\u0018\u000f8\u001fJ\u001f𑩷K\u0018ODm\u0007\u0017h𣴮",
+            "value": "🄘􃒱<􈫦G󷡎􁧨\u0011?%"
         },
         {
-            "value": "%t[\u0013\u0007􌁮\u0008-\u0013r\\\u0011/1􇳬\u0019gn􊖝ꗛ􆣩,?𬊱w𣦬",
-            "type": "C\u0002ᒯF􄐻Io{􈲣}h"
+            "type": "C\u0002ᒯF􄐻Io{􈲣}h",
+            "value": "%t[\u0013\u0007􌁮\u0008-\u0013r\\\u0011/1􇳬\u0019gn􊖝ꗛ􆣩,?𬊱w𣦬"
         },
         {
-            "value": "\u0004@󱔞4O\u001a9\u0016\u0002\u0019/,1󾵌",
-            "type": ">ldT꧊"
+            "type": ">ldT꧊",
+            "value": "\u0004@󱔞4O\u001a9\u0016\u0002\u0019/,1󾵌"
         },
         {
-            "value": "\u000b\u0015󽵗󸕈Z䮇'\u0014K%\t\u0011\u001e맍C𫉒HtuLW%\u0014LQ7%!\u001dy",
-            "type": "(cCiV􀌈\u001a􇧨5\u0002\"*􋅝𤇊2DK\ro0q]5藓/<"
+            "type": "(cCiV􀌈\u001a􇧨5\u0002\"*􋅝𤇊2DK\ro0q]5藓/<",
+            "value": "\u000b\u0015󽵗󸕈Z䮇'\u0014K%\t\u0011\u001e맍C𫉒HtuLW%\u0014LQ7%!\u001dy"
         },
         {
-            "value": "A󻢧.^P$u0\u0018𛉟fP🧳􌖗NZ\u001d\u001en󼱸𮕩<<󲬴􄹙\u0006\u00123f",
-            "type": " {YA7\u0012𖩋鵪󴛑"
+            "type": " {YA7\u0012𖩋鵪󴛑",
+            "value": "A󻢧.^P$u0\u0018𛉟fP🧳􌖗NZ\u001d\u001en󼱸𮕩<<󲬴􄹙\u0006\u00123f"
         },
         {
-            "value": "󱵜\u0002Oq~",
-            "type": "4%+i풞󾞥a\u0007_J\u0003*"
+            "type": "4%+i풞󾞥a\u0007_J\u0003*",
+            "value": "󱵜\u0002Oq~"
         },
         {
-            "value": "^\u001c\u0003𤑀",
-            "type": "\u001b酅DD\u0019(+9&axn\\"
+            "type": "\u001b酅DD\u0019(+9&axn\\",
+            "value": "^\u001c\u0003𤑀"
         },
         {
-            "value": "􏆳_ru?𫏣G^_󽘉.󷍠􋲘􍱸𩝙K=QH",
-            "type": "QM+􀆵s]󵚘󿜔㎜󸨹\u0017㨰+a%󵱍󷂾󸽉\u0000󻞴{G󰧎I􋍛h"
+            "type": "QM+􀆵s]󵚘󿜔㎜󸨹\u0017㨰+a%󵱍󷂾󸽉\u0000󻞴{G󰧎I􋍛h",
+            "value": "􏆳_ru?𫏣G^_󽘉.󷍠􋲘􍱸𩝙K=QH"
         },
         {
-            "value": "􀼿3哒󽻬rJ\u0013/\u0013읥)<?d|\u001c󵮎]\u0005䚺\t\u001c",
-            "type": "{r\u0010v\u0014z\t.p󶄞𢵯|Ld@\u001dh^􅑶8"
+            "type": "{r\u0010v\u0014z\t.p󶄞𢵯|Ld@\u001dh^􅑶8",
+            "value": "􀼿3哒󽻬rJ\u0013/\u0013읥)<?d|\u001c󵮎]\u0005䚺\t\u001c"
         },
         {
-            "value": "\u0010'X-_\u0007\u0002HaR\u001aZ\u001f\u0019Au󴞳缚\u001e",
-            "type": "vx\u0004iy=>塢~4􊰺􉨋􁧥\"b]\u001c\u0002X\"^==1l1"
+            "type": "vx\u0004iy=>塢~4􊰺􉨋􁧥\"b]\u001c\u0002X\"^==1l1",
+            "value": "\u0010'X-_\u0007\u0002HaR\u001aZ\u001f\u0019Au󴞳缚\u001e"
         },
         {
-            "value": "TZb󼧞ps瀔Yf𪬛w[",
-            "type": "\u000c\u0014Q\u00198\u001f詽[e鬎\u0006􄔑"
+            "type": "\u000c\u0014Q\u00198\u001f詽[e鬎\u0006􄔑",
+            "value": "TZb󼧞ps瀔Yf𪬛w["
         },
         {
-            "value": "&1uQ\"xsPA􋽱\u0007􈜭}\u0012\u0010𝩯茁,󻗊f\u0017+$",
-            "type": "糄󾲡K,3􆧻*C.w􀋂\u0016h󵌢c"
+            "type": "糄󾲡K,3􆧻*C.w􀋂\u0016h󵌢c",
+            "value": "&1uQ\"xsPA􋽱\u0007􈜭}\u0012\u0010𝩯茁,󻗊f\u0017+$"
         },
         {
-            "value": "x$#\u0005\u000btMJ,霔k􏹚h󼏌 9\u001d;)fQS?i",
-            "type": "\u0001󻓁B󶑋䕗󲐗bQ\u0011\r\u001e\u000ct\u0018𡳄셎\u0005\u001d"
+            "type": "\u0001󻓁B󶑋䕗󲐗bQ\u0011\r\u001e\u000ct\u0018𡳄셎\u0005\u001d",
+            "value": "x$#\u0005\u000btMJ,霔k􏹚h󼏌 9\u001d;)fQS?i"
         },
         {
-            "value": "~𠛽[m|V󵩣p讆N𡽡2PPp+(\u0018",
-            "type": "믫p7$󻭟\u000c-Bq"
+            "type": "믫p7$󻭟\u000c-Bq",
+            "value": "~𠛽[m|V󵩣p讆N𡽡2PPp+(\u0018"
         },
         {
-            "value": "𗅙\t,\n*C\u001e",
-            "type": "\u00114\u0001荩𥀘󹢊d󳉊􎁲􏞃x硨j깂y\u0010"
+            "type": "\u00114\u0001荩𥀘󹢊d󳉊􎁲􏞃x硨j깂y\u0010",
+            "value": "𗅙\t,\n*C\u001e"
         },
         {
-            "value": "𪇧P𐜞;㝂Dlw:c\u0012􊧰𦥭𪵿\u0008>\u001e<󸤒`uN􃟯",
-            "type": "𨃁%\u0007\u0001^\u0007\u000e\u001f𧟼@}󼧃𝒰g99h"
+            "type": "𨃁%\u0007\u0001^\u0007\u000e\u001f𧟼@}󼧃𝒰g99h",
+            "value": "𪇧P𐜞;㝂Dlw:c\u0012􊧰𦥭𪵿\u0008>\u001e<󸤒`uN􃟯"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_15.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_15.json
index 8f7304d61df..ece4cc5675d 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_15.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_15.json
@@ -1,33 +1,33 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "f\u0002\rb",
-            "type": "\u001d{!\u001a􈛻𠮦󽾕K𠫯,󶷧\u0015󶲌"
+            "type": "\u001d{!\u001a􈛻𠮦󽾕K𠫯,󶷧\u0015󶲌",
+            "value": "f\u0002\rb"
         },
         {
-            "value": "ڭ󷍥\"N󹲽(Jm",
-            "type": "/󷗞#\u0010XxM핣Dg\tI𝦺I9%"
+            "type": "/󷗞#\u0010XxM핣Dg\tI𝦺I9%",
+            "value": "ڭ󷍥\"N󹲽(Jm"
         },
         {
-            "value": "􇇘 𠛪f\u0014I􄢄2v",
-            "type": "􈗷-yR7L\u0005؟'Ly"
+            "type": "􈗷-yR7L\u0005؟'Ly",
+            "value": "􇇘 𠛪f\u0014I􄢄2v"
         },
         {
-            "value": "]\u0002<𗴗􄓣$:𖣏𤟂\"4䈚\u001d􏁶IO󳘞%kZ\u0008",
-            "type": "p)J*f 𬕞9􃈮/$\u0008O󵅖𐊡󽴌\u0004\u0015\rmS\u0010w𪺮dN"
+            "type": "p)J*f 𬕞9􃈮/$\u0008O󵅖𐊡󽴌\u0004\u0015\rmS\u0010w𪺮dN",
+            "value": "]\u0002<𗴗􄓣$:𖣏𤟂\"4䈚\u001d􏁶IO󳘞%kZ\u0008"
         },
         {
-            "value": "\u0008+𥺡􄶋󱑂V􊫂0𤁵g N\u0011O0<p\u0001􎤝[7aT~",
-            "type": "k\u0014H𨹵X𬠍8,bJK\u0007H\u001b\u0007s􎴠\u0002m 󾠮}8󲅚gaOPJ"
+            "type": "k\u0014H𨹵X𬠍8,bJK\u0007H\u001b\u0007s􎴠\u0002m 󾠮}8󲅚gaOPJ",
+            "value": "\u0008+𥺡􄶋󱑂V􊫂0𤁵g N\u0011O0<p\u0001􎤝[7aT~"
         },
         {
-            "value": "<d\u001a𬏃S?",
-            "type": "Y;Q􊩚%󰸘\u0018\u0010"
+            "type": "Y;Q􊩚%󰸘\u0018\u0010",
+            "value": "<d\u001a𬏃S?"
         },
         {
-            "value": "\\W'\u001eC4ﰸ􏝄w󲎄\u001f_*",
-            "type": "3H?\u001e"
+            "type": "3H?\u001e",
+            "value": "\\W'\u001eC4ﰸ􏝄w󲎄\u001f_*"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_16.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_16.json
index e04f2b71aa2..87d7bd81ffc 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_16.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_16.json
@@ -1,25 +1,25 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "1(\u000e7>K\u0003l/Mg",
-            "type": "\u0005\u001d𢎬Msn?\tl\u001a􋇺n󻬏}\u000f\u000c"
+            "type": "\u0005\u001d𢎬Msn?\tl\u001a􋇺n󻬏}\u000f\u000c",
+            "value": "1(\u000e7>K\u0003l/Mg"
         },
         {
-            "value": "\u00060󾟄\u00068\u0012JJ󰲎t츶\u0012R󲑮tT~x",
-            "type": "\u00173\u000fU<Ay"
+            "type": "\u00173\u000fU<Ay",
+            "value": "\u00060󾟄\u00068\u0012JJ󰲎t츶\u0012R󲑮tT~x"
         },
         {
-            "value": "\u0016􎖇\tď􀎿ql_􄕧\u0011D𥑣ঢF\u0015S\u001fdZ𧊪㤊07􃮽7C𝁢\u00129",
-            "type": "𦔞>𡰗_ek\u0014\u001c\u000f-\u001ev\u000cRo7懛𮘋\u0001*0"
+            "type": "𦔞>𡰗_ek\u0014\u001c\u000f-\u001ev\u000cRo7懛𮘋\u0001*0",
+            "value": "\u0016􎖇\tď􀎿ql_􄕧\u0011D𥑣ঢF\u0015S\u001fdZ𧊪㤊07􃮽7C𝁢\u00129"
         },
         {
-            "value": "\u0013Z𗉱\u0016OPH熈\u0016sW1",
-            "type": "itT@𡧄L5SOl'%l\u0018A\u0016\u0012>^\u0001ᘡoK𠾐\u0012剬\u000b"
+            "type": "itT@𡧄L5SOl'%l\u0018A\u0016\u0012>^\u0001ᘡoK𠾐\u0012剬\u000b",
+            "value": "\u0013Z𗉱\u0016OPH熈\u0016sW1"
         },
         {
-            "value": "#tP\t􀞁􋮮󱞣\u000b1\u0010&B\u00114]Bd\t󾼄\u001a􆅩P\u0014b\u001dRz􂸘",
-            "type": "􇚇0𑲛\u001c$~\u0011KA𨼎\u0011\u0013\n櫓\n"
+            "type": "􇚇0𑲛\u001c$~\u0011KA𨼎\u0011\u0013\n櫓\n",
+            "value": "#tP\t􀞁􋮮󱞣\u000b1\u0010&B\u00114]Bd\t󾼄\u001a􆅩P\u0014b\u001dRz􂸘"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_17.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_17.json
index 58bb042ac5c..1311c80c838 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_17.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_17.json
@@ -1,73 +1,73 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "󹥇􎑁􈬧24\u0017󻌄y7h𗦙",
-            "type": "%\u0002-𩰙]\u001a𫯧\u0004+4𝖳\u001c\u000b;\u001b#]{\u0006\u0010M𗰂*\u001e"
+            "type": "%\u0002-𩰙]\u001a𫯧\u0004+4𝖳\u001c\u000b;\u001b#]{\u0006\u0010M𗰂*\u001e",
+            "value": "󹥇􎑁􈬧24\u0017󻌄y7h𗦙"
         },
         {
-            "value": "\u0011𬙹)<%4$?뒗:XcpN\u0018u𭡮𫧳𞴠6p",
-            "type": "[[eF\"􌄼J~d\u0016`B\u0008𤇺[\u001b𧾿𩙠\nP𥮎!'𦈮j"
+            "type": "[[eF\"􌄼J~d\u0016`B\u0008𤇺[\u001b𧾿𩙠\nP𥮎!'𦈮j",
+            "value": "\u0011𬙹)<%4$?뒗:XcpN\u0018u𭡮𫧳𞴠6p"
         },
         {
-            "value": "Xx`P6f􍾥3<𧓚\u001e&󺻾yf\u0014\u0006𡷂Zb",
-            "type": "\u001a;I𝚵},\u0017E\u0014K]󠇅\u001aV-\u0007P\u001d\u0015N쨽\u0011\u000f6<\u0000M"
+            "type": "\u001a;I𝚵},\u0017E\u0014K]󠇅\u001aV-\u0007P\u001d\u0015N쨽\u0011\u000f6<\u0000M",
+            "value": "Xx`P6f􍾥3<𧓚\u001e&󺻾yf\u0014\u0006𡷂Zb"
         },
         {
-            "value": "\u0002v𦒢|O(\u0019\"{z$8\u0003o𧩸t?􀔩=R\u0005",
-            "type": "2&\u0012wG\u0019􈤆i慭𐜘\n|\u0012,67"
+            "type": "2&\u0012wG\u0019􈤆i慭𐜘\n|\u0012,67",
+            "value": "\u0002v𦒢|O(\u0019\"{z$8\u0003o𧩸t?􀔩=R\u0005"
         },
         {
-            "value": "\u0008􅽫jp𦿒}r󳥪'␥-Cu𭅷)\u000b\u0015",
-            "type": "F홺\u000cY\r􊉉\u001e`j$󱁦4"
+            "type": "F홺\u000cY\r􊉉\u001e`j$󱁦4",
+            "value": "\u0008􅽫jp𦿒}r󳥪'␥-Cu𭅷)\u000b\u0015"
         },
         {
-            "value": "kW3!x\u0011e\u0010𬁪󺈢󴪨h𣗐)w",
-            "type": "󲔇1g*󼃉\u000b桫\n􋺌 ᔫ\u001d󸀫6"
+            "type": "󲔇1g*󼃉\u000b桫\n􋺌 ᔫ\u001d󸀫6",
+            "value": "kW3!x\u0011e\u0010𬁪󺈢󴪨h𣗐)w"
         },
         {
-            "value": "'􃏴+覘gV󷧳󾆴&󾹘欣\u001c--ye𦳖+𠆰\u001d@Z 𦧼C䁼uY",
-            "type": "Xg􏭩ij\u0012"
+            "type": "Xg􏭩ij\u0012",
+            "value": "'􃏴+覘gV󷧳󾆴&󾹘欣\u001c--ye𦳖+𠆰\u001d@Z 𦧼C䁼uY"
         },
         {
-            "value": "𮧼窯8@𬰭Lg𢲶%\u001eL쐏𝕼󽌵9YbVAZzSI𞡊g",
-            "type": "\r"
+            "type": "\r",
+            "value": "𮧼窯8@𬰭Lg𢲶%\u001eL쐏𝕼󽌵9YbVAZzSI𞡊g"
         },
         {
-            "value": "xT􈴬\u0007Ry4?0\u0002𝦚亁\u001d𘃠c>Oa𛆗",
-            "type": "U0$Ꚓ"
+            "type": "U0$Ꚓ",
+            "value": "xT􈴬\u0007Ry4?0\u0002𝦚亁\u001d𘃠c>Oa𛆗"
         },
         {
-            "value": "\\&𐌸y&󺃂) l󶡵󲨼\tQqS`ZT`􅌇Di#Ea􆲉a󱡺q",
-            "type": "鲀I{DR\u0017󶏺\u0001\\4?hV􅗡\u001a+GS𥼶Gy掆-iX=i<["
+            "type": "鲀I{DR\u0017󶏺\u0001\\4?hV􅗡\u001a+GS𥼶Gy掆-iX=i<[",
+            "value": "\\&𐌸y&󺃂) l󶡵󲨼\tQqS`ZT`􅌇Di#Ea􆲉a󱡺q"
         },
         {
-            "value": "\u000c\u001a\u000e3\"\u001d󳯃\u0012#q\u0015",
-            "type": "@"
+            "type": "@",
+            "value": "\u000c\u001a\u000e3\"\u001d󳯃\u0012#q\u0015"
         },
         {
-            "value": "\u001ce󿴅\u0019<6=\u001e\"U83󼱹a\u0017I[?\u0002\u000b󵓄s78>>",
-            "type": "𝅛\n\u000eTb7\u0012ᯛu󸩕\t54󰭄􎰱\ntp0i"
+            "type": "𝅛\n\u000eTb7\u0012ᯛu󸩕\t54󰭄􎰱\ntp0i",
+            "value": "\u001ce󿴅\u0019<6=\u001e\"U83󼱹a\u0017I[?\u0002\u000b󵓄s78>>"
         },
         {
-            "value": "\u001fbnE𦆵𥽳9;@󻞵v",
-            "type": "i伀="
+            "type": "i伀=",
+            "value": "\u001fbnE𦆵𥽳9;@󻞵v"
         },
         {
-            "value": " 󷮧󱋺\u0015prv󶟮𬆉\u001f2j_􁯍䔊\n}>6\u001c挾g?X\u0003",
-            "type": "\u0000\u0019^t\u0010P^+/팔N𫧊\u0003H𧆏􍟧\u001a\u000e?xfC𠞓zZ􃜊쉄"
+            "type": "\u0000\u0019^t\u0010P^+/팔N𫧊\u0003H𧆏􍟧\u001a\u000e?xfC𠞓zZ􃜊쉄",
+            "value": " 󷮧󱋺\u0015prv󶟮𬆉\u001f2j_􁯍䔊\n}>6\u001c挾g?X\u0003"
         },
         {
-            "value": "躳7≓b,󻶫j\u0002㠹\u000f\u0000g⠏$\\e",
-            "type": "F ]QW􏿞鑣󹅀dEZ􁵘xqD\u001650y\u000cU\u0008}N"
+            "type": "F ]QW􏿞鑣󹅀dEZ􁵘xqD\u001650y\u000cU\u0008}N",
+            "value": "躳7≓b,󻶫j\u0002㠹\u000f\u0000g⠏$\\e"
         },
         {
-            "value": "N㊴V)$F𪄡􈶜",
-            "type": "󻚿a󲓷\u0002`ZQುnu󿁁\u0010>wv&󰃗\u0000𠱟$舁\u0018K\rCG"
+            "type": "󻚿a󲓷\u0002`ZQುnu󿁁\u0010>wv&󰃗\u0000𠱟$舁\u0018K\rCG",
+            "value": "N㊴V)$F𪄡􈶜"
         },
         {
-            "value": "\u001fo\u001c🦢􄨶:`",
-            "type": "󾡜25ෆ"
+            "type": "󾡜25ෆ",
+            "value": "\u001fo\u001c🦢􄨶:`"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_18.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_18.json
index 7bfd9d69210..957255fd68e 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_18.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_18.json
@@ -1,89 +1,89 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "嚰󽗧p\u0002\u001c􄧒\u000b#䮄s'􉋸􎈝𫞪\u000c􌪧)𢶉⫖𭵝\u0017s𗙗 𠖯􆊂M\ru(",
-            "type": "L<𭡭𧼂⫼'Da􇿾DB󻒚\u0011𘥸u}!%g𪣨`d\u0004\r5󵍋\u000b∆􎹈"
+            "type": "L<𭡭𧼂⫼'Da􇿾DB󻒚\u0011𘥸u}!%g𪣨`d\u0004\r5󵍋\u000b∆􎹈",
+            "value": "嚰󽗧p\u0002\u001c􄧒\u000b#䮄s'􉋸􎈝𫞪\u000c􌪧)𢶉⫖𭵝\u0017s𗙗 𠖯􆊂M\ru("
         },
         {
-            "value": "D\u0003b\u00043􎌔6\u0011􅌛󿰱",
-            "type": "R/\u001d􂅏v{󹪢t5𪙄ŋ􎝷)\u0015􋪙"
+            "type": "R/\u001d􂅏v{󹪢t5𪙄ŋ􎝷)\u0015􋪙",
+            "value": "D\u0003b\u00043􎌔6\u0011􅌛󿰱"
         },
         {
-            "value": "\u001al⇡El=\u0019\u0018툶",
-            "type": "쁞 2氶^z}\\􆻣\u001d\u001dlk(Jb\u0011P𦮳D􇆁2󾏴(󽼛8 \u0013^"
+            "type": "쁞 2氶^z}\\􆻣\u001d\u001dlk(Jb\u0011P𦮳D􇆁2󾏴(󽼛8 \u0013^",
+            "value": "\u001al⇡El=\u0019\u0018툶"
         },
         {
-            "value": "C1켦\u001f?\u000f2q􃈴󷯜393ꐅX:Fg\r\u0014\u0006|=UvMj焠",
-            "type": "􂸐R6m \u0001qNn󹸪\u0004\u0014<It\r{\u001ec󾈏'X𡩬𧏌󾟳Z\u001eL􊁔􍅚"
+            "type": "􂸐R6m \u0001qNn󹸪\u0004\u0014<It\r{\u001ec󾈏'X𡩬𧏌󾟳Z\u001eL􊁔􍅚",
+            "value": "C1켦\u001f?\u000f2q􃈴󷯜393ꐅX:Fg\r\u0014\u0006|=UvMj焠"
         },
         {
-            "value": "l",
-            "type": "㵌\u0018%w\u001e+"
+            "type": "㵌\u0018%w\u001e+",
+            "value": "l"
         },
         {
-            "value": "{dh[\rv𦏎𮉘𩑊Dw\u000b󿭼N뻬4\u0017Z \u0015\u0001\u0017!𬂪2\u0005~\u000e䘁",
-            "type": "\tꊟ\u001b%D5c􏉠􆶨-"
+            "type": "\tꊟ\u001b%D5c􏉠􆶨-",
+            "value": "{dh[\rv𦏎𮉘𩑊Dw\u000b󿭼N뻬4\u0017Z \u0015\u0001\u0017!𬂪2\u0005~\u000e䘁"
         },
         {
-            "value": "󵪼p󷋈\\􇹨\u0004M\u0019^l|𠪅]z󻖨",
-            "type": ""
+            "type": "",
+            "value": "󵪼p󷋈\\􇹨\u0004M\u0019^l|𠪅]z󻖨"
         },
         {
-            "value": "􊪳lb󶕕<q𘢽󱗚􄘐\u0002GCg\t}T❶𣈶R󿕶",
-            "type": "Q󶭁󰟴_\u0007𥕐{𩝹p"
+            "type": "Q󶭁󰟴_\u0007𥕐{𩝹p",
+            "value": "􊪳lb󶕕<q𘢽󱗚􄘐\u0002GCg\t}T❶𣈶R󿕶"
         },
         {
-            "value": "\u0019>",
-            "type": "!\u000bU󽮣F2d0n\u0002\u0015ew􇞡&K\u001a<\u0013􇄪𐋣􅺖쑯x"
+            "type": "!\u000bU󽮣F2d0n\u0002\u0015ew􇞡&K\u001a<\u0013􇄪𐋣􅺖쑯x",
+            "value": "\u0019>"
         },
         {
-            "value": "𭪜}𐋳\u0015<\u0004􂟈@􅫹\u0007$𪕐󰑽󴝼:󲬩誫m9\u000e\u0005󷝻smv\u0007y",
-            "type": "'5\u0000\u0004𬰗TU\u000fC+쿃𥶸K󽈠𗈼7\u0013g􈧁𮋲𮟴fo"
+            "type": "'5\u0000\u0004𬰗TU\u000fC+쿃𥶸K󽈠𗈼7\u0013g􈧁𮋲𮟴fo",
+            "value": "𭪜}𐋳\u0015<\u0004􂟈@􅫹\u0007$𪕐󰑽󴝼:󲬩誫m9\u000e\u0005󷝻smv\u0007y"
         },
         {
-            "value": "픝ZNM}W𭪰}䪬f*\\\u0010",
-            "type": "&r#􂷡tn\u0005󲫹􊿄`-\t茘\u0005\u00043\u0003\u000fs"
+            "type": "&r#􂷡tn\u0005󲫹􊿄`-\t茘\u0005\u00043\u0003\u000fs",
+            "value": "픝ZNM}W𭪰}䪬f*\\\u0010"
         },
         {
-            "value": "𩝯%hᅔ%𪃗4𖤋𦐗6Cg",
-            "type": "3c󸣪g4\u00169\u0003\u0003H;󱀂\u0000\u0015H󹱁\"y\u0004d"
+            "type": "3c󸣪g4\u00169\u0003\u0003H;󱀂\u0000\u0015H󹱁\"y\u0004d",
+            "value": "𩝯%hᅔ%𪃗4𖤋𦐗6Cg"
         },
         {
-            "value": "\u000e𫶨󻞓",
-            "type": "^1h,;V\u001aL㺌S)𐪊O\u0017d0j"
+            "type": "^1h,;V\u001aL㺌S)𐪊O\u0017d0j",
+            "value": "\u000e𫶨󻞓"
         },
         {
-            "value": "G\\-b\u0018cm󵼱y\u0012_)",
-            "type": "\u00174J𭑕\"󴲴IVSy"
+            "type": "\u00174J𭑕\"󴲴IVSy",
+            "value": "G\\-b\u0018cm󵼱y\u0012_)"
         },
         {
-            "value": "S󿉻r=󸴔ꐍ\u0017\u0015g%\u000bꙕ]-\u0001c{𥸀)mn\u000bʩ☦Xr\u0018",
-            "type": "\u0006FR𖦳𗢐􍹏\u001e𢡫\u0012\u001dEG;c\u0003*N\u000eO4DwV皒\u000b𘌋MQ"
+            "type": "\u0006FR𖦳𗢐􍹏\u001e𢡫\u0012\u001dEG;c\u0003*N\u000eO4DwV皒\u000b𘌋MQ",
+            "value": "S󿉻r=󸴔ꐍ\u0017\u0015g%\u000bꙕ]-\u0001c{𥸀)mn\u000bʩ☦Xr\u0018"
         },
         {
-            "value": "㜡\\줾q\u0017",
-            "type": "yO􈸼V􃘐\u001b8'🦼]KH𗬦b𭪓􋘆螻\u0011L聠9倀<?Q\u000b\u0005"
+            "type": "yO􈸼V􃘐\u001b8'🦼]KH𗬦b𭪓􋘆螻\u0011L聠9倀<?Q\u000b\u0005",
+            "value": "㜡\\줾q\u0017"
         },
         {
-            "value": "\u000c\nV8餚󱦿\u000e<\t\u0006Y􈦴j\u0011𣲰Q\u001d!",
-            "type": "\u0004v"
+            "type": "\u0004v",
+            "value": "\u000c\nV8餚󱦿\u000e<\t\u0006Y􈦴j\u0011𣲰Q\u001d!"
         },
         {
-            "value": "NOW^T\u0004𣀹󺷡\u0005NTw􊏱 -󸕻PNo\u0008r􏬈H󻱩s􆁈",
-            "type": "W.𢿯o&#VG𢈑󼹈\u0004?s𝢉\u0015M\n𐃶􍅞l&mG[\u001a\u001f\t\u000cꢞ\r"
+            "type": "W.𢿯o&#VG𢈑󼹈\u0004?s𝢉\u0015M\n𐃶􍅞l&mG[\u001a\u001f\t\u000cꢞ\r",
+            "value": "NOW^T\u0004𣀹󺷡\u0005NTw􊏱 -󸕻PNo\u0008r􏬈H󻱩s􆁈"
         },
         {
-            "value": "=𪡇",
-            "type": "B\u0014ଚB\n\u0010\u0019rT $*$]E\r󲗳"
+            "type": "B\u0014ଚB\n\u0010\u0019rT $*$]E\r󲗳",
+            "value": "=𪡇"
         },
         {
-            "value": ";]𘒯^z􁘦szi",
-            "type": "􀆣G`\u0014*@󴣯p폗􍰶𣒿㞠\u0019;]"
+            "type": "􀆣G`\u0014*@󴣯p폗􍰶𣒿㞠\u0019;]",
+            "value": ";]𘒯^z􁘦szi"
         },
         {
-            "value": "=𓌵a🩬\u0011R𠿃G\u0012T$,􅽑\u0016",
-            "type": "o=,\t\u0012`Nq\u0019𐠱𠒽󸶆c(uf"
+            "type": "o=,\t\u0012`Nq\u0019𐠱𠒽󸶆c(uf",
+            "value": "=𓌵a🩬\u0011R𠿃G\u0012T$,􅽑\u0016"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_19.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_19.json
index 67dd0251ce6..545c87c1bb3 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_19.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_19.json
@@ -1,29 +1,29 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "B𡉗𘐻'\r􅂮\u001b7~G窤6]lT7q𮧆\u000bz\u0000Jd쒻\t𤓷7",
-            "type": "\u001a\u0017\u0016\u000b\u001a芎V=%r;Q6:L\"+O􋱦u\u0008C\u0004\u0012"
+            "type": "\u001a\u0017\u0016\u000b\u001a芎V=%r;Q6:L\"+O􋱦u\u0008C\u0004\u0012",
+            "value": "B𡉗𘐻'\r􅂮\u001b7~G窤6]lT7q𮧆\u000bz\u0000Jd쒻\t𤓷7"
         },
         {
-            "value": "J`D`%u𬠩𘑤󺷭󱼎\u001d􎝑󺜅\u0012\u000e􉋔𨚁e.G\u001d󺊩*8Mea",
-            "type": "摽2U𦾳\u001a\tK$ l\u001b\u0003OZ\u001d"
+            "type": "摽2U𦾳\u001a\tK$ l\u001b\u0003OZ\u001d",
+            "value": "J`D`%u𬠩𘑤󺷭󱼎\u001d􎝑󺜅\u0012\u000e􉋔𨚁e.G\u001d󺊩*8Mea"
         },
         {
-            "value": "\u001e􎮪𠟐es\u001c0T`U\u0015􉜺=vnb󲩙",
-            "type": "􋚰\u0019\u0002/\u0016k4p%\u0015W\u0016󰉌=𬴰"
+            "type": "􋚰\u0019\u0002/\u0016k4p%\u0015W\u0016󰉌=𬴰",
+            "value": "\u001e􎮪𠟐es\u001c0T`U\u0015􉜺=vnb󲩙"
         },
         {
-            "value": "X\"S􉩒$\t殪-\u0011镔g𢌭:\tLK@\u0006",
-            "type": "\u0003󾽵<f\u0017O\u0003~|"
+            "type": "\u0003󾽵<f\u0017O\u0003~|",
+            "value": "X\"S􉩒$\t殪-\u0011镔g𢌭:\tLK@\u0006"
         },
         {
-            "value": "0V",
-            "type": "6𥃱\u0000d𬼏􁰃Lv;􄐄>􊼹U^W\"\u0014a\n"
+            "type": "6𥃱\u0000d𬼏􁰃Lv;􄐄>􊼹U^W\"\u0014a\n",
+            "value": "0V"
         },
         {
-            "value": "􋛷M{\u001a󿎨􆇵*o",
-            "type": "\u0002D\u000c􋙚(o󰜖>={)\\𤑌"
+            "type": "\u0002D\u000c􋙚(o󰜖>={)\\𤑌",
+            "value": "􋛷M{\u001a󿎨􆇵*o"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_2.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_2.json
index b03bc964c23..e17228ea4fa 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_2.json
@@ -1,113 +1,113 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "~\td",
-            "type": "Gp󾹒kC\u001c𪽟FcQ鍠EP8𨥈"
+            "type": "Gp󾹒kC\u001c𪽟FcQ鍠EP8𨥈",
+            "value": "~\td"
         },
         {
-            "value": "+Ne􂈁Q𧂞G\u001a\u001a<\"z𢫔鈸Z󸰥VL\u000c괤\n\u0018􄿈|yd",
-            "type": "(ZlgZk\u0002􅩏\u0015kw1󼸺i𬰇X𮗯󾓆qA󼙦藟8𨮨\u0008ᦡ8󹌹O"
+            "type": "(ZlgZk\u0002􅩏\u0015kw1󼸺i𬰇X𮗯󾓆qA󼙦藟8𨮨\u0008ᦡ8󹌹O",
+            "value": "+Ne􂈁Q𧂞G\u001a\u001a<\"z𢫔鈸Z󸰥VL\u000c괤\n\u0018􄿈|yd"
         },
         {
-            "value": "O\u000e+_𣵌i(*󴞞",
-            "type": ""
+            "type": "",
+            "value": "O\u000e+_𣵌i(*󴞞"
         },
         {
-            "value": "Y",
-            "type": "\u0008B$􈪲R$󴅫[cm돜/yꆗ\u001aM􁮾𦕃\u000f\"􀹴􂧭T@$Hv\u000e"
+            "type": "\u0008B$􈪲R$󴅫[cm돜/yꆗ\u001aM􁮾𦕃\u000f\"􀹴􂧭T@$Hv\u000e",
+            "value": "Y"
         },
         {
-            "value": "?GW𖹄􊸾_}\nZ󺯆􅭍6\r4\u000e>􉶧\u001a",
-            "type": "\n\u000b1f\u001c𬨋\u0019R!`K\u000c:"
+            "type": "\n\u000b1f\u001c𬨋\u0019R!`K\u000c:",
+            "value": "?GW𖹄􊸾_}\nZ󺯆􅭍6\r4\u000e>􉶧\u001a"
         },
         {
-            "value": "\u0004𤪇@b\u000f\u000e\u0019󿎉bqlᱮA􃀮;\u0015\u0004BBgn!lB\u000ce",
-            "type": "\u0003𘖤\u0012"
+            "type": "\u0003𘖤\u0012",
+            "value": "\u0004𤪇@b\u000f\u000e\u0019󿎉bqlᱮA􃀮;\u0015\u0004BBgn!lB\u000ce"
         },
         {
-            "value": "\u000c]CyK.󼢴rIi\u001ft?0\\P``\u0017G",
-            "type": "^&;𝥤𬅗}\u0014\u001fL!􆾑G􇹷L𣉠G["
+            "type": "^&;𝥤𬅗}\u0014\u001fL!􆾑G􇹷L𣉠G[",
+            "value": "\u000c]CyK.󼢴rIi\u001ft?0\\P``\u0017G"
         },
         {
-            "value": "4\u000c\u0019\u0002𬡜\u0015$/4Y>\u0005g\u000fS􄤠󻚊󹒁^G\u001c䚻H4Q􃥟\u00027",
-            "type": "K8\u0008\u001bo\t"
+            "type": "K8\u0008\u001bo\t",
+            "value": "4\u000c\u0019\u0002𬡜\u0015$/4Y>\u0005g\u000fS􄤠󻚊󹒁^G\u001c䚻H4Q􃥟\u00027"
         },
         {
-            "value": "|",
-            "type": "󳼘䄩 󷖊󷴑b\\FoD\u0017𔖀\u0005􀾥䁹eB(E"
+            "type": "󳼘䄩 󷖊󷴑b\\FoD\u0017𔖀\u0005􀾥䁹eB(E",
+            "value": "|"
         },
         {
-            "value": "3𛂅\u0011%\u001f𣨍𢣽.𫈊𩒺頻䭗yU󽦯\u0011\u0018Oj𑋹Y􄮳\u001b\u001c",
-            "type": "𤂪aoe𦯎%,5\u000fM6\u0003崐?Bꣻj䡔䖤𢇏*\t󴎒"
+            "type": "𤂪aoe𦯎%,5\u000fM6\u0003崐?Bꣻj䡔䖤𢇏*\t󴎒",
+            "value": "3𛂅\u0011%\u001f𣨍𢣽.𫈊𩒺頻䭗yU󽦯\u0011\u0018Oj𑋹Y􄮳\u001b\u001c"
         },
         {
-            "value": "\u0010\u0003󳯒\u000c􋭻\u001dvf\u0014CooiMnUT71",
-            "type": "F\u0011\u000cc\u0012𢊐J􃦊𘣘&\u000b3\th-Vg%𫊽\u0019Mb\u001fo􀚱􀟵\t"
+            "type": "F\u0011\u000cc\u0012𢊐J􃦊𘣘&\u000b3\th-Vg%𫊽\u0019Mb\u001fo􀚱􀟵\t",
+            "value": "\u0010\u0003󳯒\u000c􋭻\u001dvf\u0014CooiMnUT71"
         },
         {
-            "value": "􄛟艪e蘔疆gN",
-            "type": "􉩶+\u0014"
+            "type": "􉩶+\u0014",
+            "value": "􄛟艪e蘔疆gN"
         },
         {
-            "value": "\u0002𢂈櫒𐑁=󹗩:󾨄𗰮\u0003\u000b\u001f􀀁C᱕",
-            "type": "󵜈\u0013~#*\u0003ἦY=eHI⭚𩼆"
+            "type": "󵜈\u0013~#*\u0003ἦY=eHI⭚𩼆",
+            "value": "\u0002𢂈櫒𐑁=󹗩:󾨄𗰮\u0003\u000b\u001f􀀁C᱕"
         },
         {
-            "value": "qx2.􄇆􅕃vjw<󷖅󼄴\u0004󵋿󻒝\u0001",
-            "type": "\u0003F\u0011D\u0014\u0007𔐾"
+            "type": "\u0003F\u0011D\u0014\u0007𔐾",
+            "value": "qx2.􄇆􅕃vjw<󷖅󼄴\u0004󵋿󻒝\u0001"
         },
         {
-            "value": "9\u000fMi;9􂺘󾞂\u0004<$,S^4s𭯕\u0011*V\u000c𦡞jV󶰲)\u0008舎",
-            "type": "T:;p\n\u0002"
+            "type": "T:;p\n\u0002",
+            "value": "9\u000fMi;9􂺘󾞂\u0004<$,S^4s𭯕\u0011*V\u000c𦡞jV󶰲)\u0008舎"
         },
         {
-            "value": "\u0002\u0003𩤓􊵵rl\u0007𬴈4􁈹\u0015O",
-            "type": "\"by!\u0018"
+            "type": "\"by!\u0018",
+            "value": "\u0002\u0003𩤓􊵵rl\u0007𬴈4􁈹\u0015O"
         },
         {
-            "value": "\u0008葐G",
-            "type": "\u0002"
+            "type": "\u0002",
+            "value": "\u0008葐G"
         },
         {
-            "value": "g-!1W𡇗\u0011\u0010",
-            "type": "X\u0014o\u000e"
+            "type": "X\u0014o\u000e",
+            "value": "g-!1W𡇗\u0011\u0010"
         },
         {
-            "value": "􌷾󵥹\u0010Y;k",
-            "type": "㯻\u0014Fp𥵄]􀝷󶨤\u0005tOJ +T𮈯𔐾\u0006"
+            "type": "㯻\u0014Fp𥵄]􀝷󶨤\u0005tOJ +T𮈯𔐾\u0006",
+            "value": "􌷾󵥹\u0010Y;k"
         },
         {
-            "value": "𫂓.|\u0015_^\u0007I;𮓯}hD1t󽾸j0o]H\rq6",
-            "type": "jV贙b0\u001cq~t􈴘𞢙;ae𗺞\u0005ڡ󰒼󳨣􊱏\u000fm󿚩𪗢筜"
+            "type": "jV贙b0\u001cq~t􈴘𞢙;ae𗺞\u0005ڡ󰒼󳨣􊱏\u000fm󿚩𪗢筜",
+            "value": "𫂓.|\u0015_^\u0007I;𮓯}hD1t󽾸j0o]H\rq6"
         },
         {
-            "value": "𬖦\u0018'f뚰1X𗏙󸟨n/𦃙7'\u0002ᰛXvG􉯇+✦m\u000f]",
-            "type": "𞺃𨛈5u𧮆y󸏵􋮔Ng\u000c>䢁ygxJCXX󴡸}􉋱\u0004󻝚\u0000BI"
+            "type": "𞺃𨛈5u𧮆y󸏵􋮔Ng\u000c>䢁ygxJCXX󴡸}􉋱\u0004󻝚\u0000BI",
+            "value": "𬖦\u0018'f뚰1X𗏙󸟨n/𦃙7'\u0002ᰛXvG􉯇+✦m\u000f]"
         },
         {
-            "value": "7}HZg&V.𡙺g",
-            "type": "𧥩Cy뚯`*\u000c󺅪𡞳.=}\u0013V󳐈(\u0008b`\u000b\u0005"
+            "type": "𧥩Cy뚯`*\u000c󺅪𡞳.=}\u0013V󳐈(\u0008b`\u000b\u0005",
+            "value": "7}HZg&V.𡙺g"
         },
         {
-            "value": "􍭠㕃\"𒃠",
-            "type": "o\u0017􊗙󷲠\\g𘃍w\u001f\u0007Osko\u0013}[ꃬTno\u0017"
+            "type": "o\u0017􊗙󷲠\\g𘃍w\u001f\u0007Osko\u0013}[ꃬTno\u0017",
+            "value": "􍭠㕃\"𒃠"
         },
         {
-            "value": "O󸿤n\u000b-J<ei󶬲s9𪊷嚶\u001f/𭠗K'V0_A-􂀦㗭ixm",
-            "type": "a󲊛l0vr𨉜\u0007x%\r󰞰☄陵4O+𬕜󻸷&%🙜|𦀄&\u0018􌥾󴵼"
+            "type": "a󲊛l0vr𨉜\u0007x%\r󰞰☄陵4O+𬕜󻸷&%🙜|𦀄&\u0018􌥾󴵼",
+            "value": "O󸿤n\u000b-J<ei󶬲s9𪊷嚶\u001f/𭠗K'V0_A-􂀦㗭ixm"
         },
         {
-            "value": "m?𢥩\u0013|/dC󰌤⥼𩱬",
-            "type": "\u0007h,e\u000eoWiB􄌡"
+            "type": "\u0007h,e\u000eoWiB􄌡",
+            "value": "m?𢥩\u0013|/dC󰌤⥼𩱬"
         },
         {
-            "value": "1􂑪󳭧W󻗪C󳾔\u0011.H>r𬋸Y啈𬝂H K\u0008Z$",
-            "type": "ni𑁛𤩏wL\u000bপ􄿍gL𣻖J($h D=󻩮4\u000b𑵪𤾬T🠶"
+            "type": "ni𑁛𤩏wL\u000bপ􄿍gL𣻖J($h D=󻩮4\u000b𑵪𤾬T🠶",
+            "value": "1􂑪󳭧W󻗪C󳾔\u0011.H>r𬋸Y啈𬝂H K\u0008Z$"
         },
         {
-            "value": "\u0018*\r\u000fz%\u0015\u0004,󺇝\u0006𖽝􍣗-",
-            "type": "C\u00001v\n(l󷣦\u0004\u0016\u0006󽢃Fq\u0007vmS􁽔𠴣qD'eĤ"
+            "type": "C\u00001v\n(l󷣦\u0004\u0016\u0006󽢃Fq\u0007vmS􁽔𠴣qD'eĤ",
+            "value": "\u0018*\r\u000fz%\u0015\u0004,󺇝\u0006𖽝􍣗-"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_20.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_20.json
index e88557b3e16..d09fe2189a6 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_20.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_20.json
@@ -1,4 +1,4 @@
 {
-    "version": 0,
-    "fields": []
-}
\ No newline at end of file
+    "fields": [],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_3.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_3.json
index 4c206835d94..79efd75fcd4 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_3.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_3.json
@@ -1,25 +1,25 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "a_*l8=\u0010$􂭫`\u0014汧G",
-            "type": "=\u000f2\u001fH4g􃕢\u000cL"
+            "type": "=\u000f2\u001fH4g􃕢\u000cL",
+            "value": "a_*l8=\u0010$􂭫`\u0014汧G"
         },
         {
-            "value": "h􉍡􀯆􂐄ᒽ𤠉|ll/\u0018e\u0005󹂴NS𤔝6>\u0001\t揯\u000fJC",
-            "type": "\u001b&ws󶈴j𢪈B󻧩\u001d\n5􀅙䧵fI"
+            "type": "\u001b&ws󶈴j𢪈B󻧩\u001d\n5􀅙䧵fI",
+            "value": "h􉍡􀯆􂐄ᒽ𤠉|ll/\u0018e\u0005󹂴NS𤔝6>\u0001\t揯\u000fJC"
         },
         {
-            "value": "%􊚳􈹮􂨀𩤃𡐠𦕩􎷢𢱲\u0017\u001e=7q𢵌𒔿SIs|𭺍",
-            "type": "􏓑DJ:\u000b\u0006𑨀󰩕hw0\t5"
+            "type": "􏓑DJ:\u000b\u0006𑨀󰩕hw0\t5",
+            "value": "%􊚳􈹮􂨀𩤃𡐠𦕩􎷢𢱲\u0017\u001e=7q𢵌𒔿SIs|𭺍"
         },
         {
-            "value": "\u0018/\n\u00187;􅜢~Xํnn\u0017\u0019k|",
-            "type": "G\u0003\u0005\u0000𦮅%@u󹿀\u001b󼫇ekh*렃="
+            "type": "G\u0003\u0005\u0000𦮅%@u󹿀\u001b󼫇ekh*렃=",
+            "value": "\u0018/\n\u00187;􅜢~Xํnn\u0017\u0019k|"
         },
         {
-            "value": "\u0015r𭒠e3x\u0002>I#\u0017",
-            "type": "-q󹾜3*Z㒦\u0015\u001f\u0008z67x; \u000f"
+            "type": "-q󹾜3*Z㒦\u0015\u001f\u0008z67x; \u000f",
+            "value": "\u0015r𭒠e3x\u0002>I#\u0017"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_4.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_4.json
index 9b84cb1040f..a74fc213a1f 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_4.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_4.json
@@ -1,81 +1,81 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "􂛐F\u0000hN𝍆􉃣0警𬕆",
-            "type": "􃭴Rv\"\u0005s\u0018:1\u001ay庮:"
+            "type": "􃭴Rv\"\u0005s\u0018:1\u001ay庮:",
+            "value": "􂛐F\u0000hN𝍆􉃣0警𬕆"
         },
         {
-            "value": "9z=+\u0015*\u0016v3𡎡7c\u000f,Uy(u\r\nD󿖹\u000c􉳒",
-            "type": "􅮨䄅s-\u0010\u00126\u001b@\u0001{􃷅\u0002𥲀\u000e[4\u000f\u0001"
+            "type": "􅮨䄅s-\u0010\u00126\u001b@\u0001{􃷅\u0002𥲀\u000e[4\u000f\u0001",
+            "value": "9z=+\u0015*\u0016v3𡎡7c\u000f,Uy(u\r\nD󿖹\u000c􉳒"
         },
         {
-            "value": "9Em􃡿홚\u0003n쵢\u0004\u0015g+OF:懨\u0015f𡗺𗱋\u0010Q8\u0004\u0005\u0017`\u0001",
-            "type": "𥴗𮩰\u0000_𡾨𨏼\u0001\u0007.Q%IS\u0014"
+            "type": "𥴗𮩰\u0000_𡾨𨏼\u0001\u0007.Q%IS\u0014",
+            "value": "9Em􃡿홚\u0003n쵢\u0004\u0015g+OF:懨\u0015f𡗺𗱋\u0010Q8\u0004\u0005\u0017`\u0001"
         },
         {
-            "value": "\u0017X",
-            "type": "𡌏\u0011\u001f\u0000H\u00192\u001d󻴲\r󾶢&䁍󷟹~g􇋔"
+            "type": "𡌏\u0011\u001f\u0000H\u00192\u001d󻴲\r󾶢&䁍󷟹~g􇋔",
+            "value": "\u0017X"
         },
         {
-            "value": "󲔞u\u0008*V5.>^-梵-6V𪬴6W/=ᥥ@\u00137k&;L䄤\u0005\u000c",
-            "type": "􍩏A+J.U+Q\u0012Py􅴗#.􋙱􈑌\nQ꾹_􈐧㼦.󿓚U;}"
+            "type": "􍩏A+J.U+Q\u0012Py􅴗#.􋙱􈑌\nQ꾹_􈐧㼦.󿓚U;}",
+            "value": "󲔞u\u0008*V5.>^-梵-6V𪬴6W/=ᥥ@\u00137k&;L䄤\u0005\u000c"
         },
         {
-            "value": "q\u0012sp/Y`44aRH}vs/<&􄤬?",
-            "type": "𠶙󽀒O󾿣􅛣e\u000bk"
+            "type": "𠶙󽀒O󾿣􅛣e\u000bk",
+            "value": "q\u0012sp/Y`44aRH}vs/<&􄤬?"
         },
         {
-            "value": "㴗T嘒P<9qowDH󲕆𦻘p䆐􅩓C]#:󲍊䧃􏗷憌g",
-            "type": "&pL>5󳦉𘂯@"
+            "type": "&pL>5󳦉𘂯@",
+            "value": "㴗T嘒P<9qowDH󲕆𦻘p䆐􅩓C]#:󲍊䧃􏗷憌g"
         },
         {
-            "value": "\u0008􋑾\u0003\u0018eeJab\u00159\u0012軁",
-            "type": "V𦸨~yRTv\u0001􊗾C􈩜{D?0樫\u0004&:\u0004]􏇬n\u001cM󻜑"
+            "type": "V𦸨~yRTv\u0001􊗾C􈩜{D?0樫\u0004&:\u0004]􏇬n\u001cM󻜑",
+            "value": "\u0008􋑾\u0003\u0018eeJab\u00159\u0012軁"
         },
         {
-            "value": "=hJSu\u0007\u0002𝑮0$\u0001h>B\rᳲX>\u00029\u0010,LOFw_P",
-            "type": "\n􍢔\u001e𬍞y퉔w"
+            "type": "\n􍢔\u001e𬍞y퉔w",
+            "value": "=hJSu\u0007\u0002𝑮0$\u0001h>B\rᳲX>\u00029\u0010,LOFw_P"
         },
         {
-            "value": "{`\u0018𑄞󺴕hIְ􂗋y􂸕\u000c睡ᩁ:u6\u0019",
-            "type": ""
+            "type": "",
+            "value": "{`\u0018𑄞󺴕hIְ􂗋y􂸕\u000c睡ᩁ:u6\u0019"
         },
         {
-            "value": "(􃈒\u0018gg\u0012=-AI-ZA8h􆔹7\u0002젞\u0004%R\u001d\u001dQW叽\u001d\u0000",
-            "type": "􉜸R􅫉𮣎+ੑ& M\u001c𭚝Ulb,󿫮F}"
+            "type": "􉜸R􅫉𮣎+ੑ& M\u001c𭚝Ulb,󿫮F}",
+            "value": "(􃈒\u0018gg\u0012=-AI-ZA8h􆔹7\u0002젞\u0004%R\u001d\u001dQW叽\u001d\u0000"
         },
         {
-            "value": " \u0008󳋌a%􉪸~\"昗\u001dHtZn\u0015\u0015EAYo\u00062h􍃩\u000b",
-            "type": "󺧕sQddV[JX3𣏒uPC𒃊_"
+            "type": "󺧕sQddV[JX3𣏒uPC𒃊_",
+            "value": " \u0008󳋌a%􉪸~\"昗\u001dHtZn\u0015\u0015EAYo\u00062h􍃩\u000b"
         },
         {
-            "value": "#t[(a!餯9z\\𬒶kD粼\u0005\u000f\u0011R\u0016􁹐\u0016𤦰\u001cLj",
-            "type": "xj\u0007􈗷F酥SP󱩈U(簨]K􈋤t􎤩,\u001a*󶝆\u0013𪑣J󻄜u\u0014"
+            "type": "xj\u0007􈗷F酥SP󱩈U(簨]K􈋤t􎤩,\u001a*󶝆\u0013𪑣J󻄜u\u0014",
+            "value": "#t[(a!餯9z\\𬒶kD粼\u0005\u000f\u0011R\u0016􁹐\u0016𤦰\u001cLj"
         },
         {
-            "value": "𩎼",
-            "type": "XldA/􎨯\u001b󲷇𗄍&\"W<\u000c,쎰\u000c"
+            "type": "XldA/􎨯\u001b󲷇𗄍&\"W<\u000c,쎰\u000c",
+            "value": "𩎼"
         },
         {
-            "value": "\u0004􃻛𢯭󼎴(?&\u000f󸧹\u0003\u000c\u0000K󽾢",
-            "type": "hZz"
+            "type": "hZz",
+            "value": "\u0004􃻛𢯭󼎴(?&\u000f󸧹\u0003\u000c\u0000K󽾢"
         },
         {
-            "value": "\u0010\t厉\u0016A\u001e\u001e\u000b󾯫􄍺L\u000fID\u0002粼KD;l?G\u0001p󽿒u]",
-            "type": "T𧰢-\u0000jvKg7뙀\u0017\u0007@}"
+            "type": "T𧰢-\u0000jvKg7뙀\u0017\u0007@}",
+            "value": "\u0010\t厉\u0016A\u001e\u001e\u000b󾯫􄍺L\u000fID\u0002粼KD;l?G\u0001p󽿒u]"
         },
         {
-            "value": "\tv\u0017w\u001d󼥡\u0006󳾚",
-            "type": "\u0014󿅬d󻲤\u0012!y%􊅑Mal<"
+            "type": "\u0014󿅬d󻲤\u0012!y%􊅑Mal<",
+            "value": "\tv\u0017w\u001d󼥡\u0006󳾚"
         },
         {
-            "value": "i\u001dv@<\u0005\r\u0018kᵮ𪢛O걧&𥡰",
-            "type": "\\L45&\r𩵖5\u001aL􈴷􋒤rnD\u000e36􆜏]mqnq"
+            "type": "\\L45&\r𩵖5\u001aL􈴷􋒤rnD\u000e36􆜏]mqnq",
+            "value": "i\u001dv@<\u0005\r\u0018kᵮ𪢛O걧&𥡰"
         },
         {
-            "value": "𪤱@wz.\u001d𭻩M",
-            "type": "\u0007S<"
+            "type": "\u0007S<",
+            "value": "𪤱@wz.\u001d𭻩M"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_5.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_5.json
index e4b729ae32c..35c3e52b92e 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_5.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_5.json
@@ -1,81 +1,81 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "=S𢕖󷈓𧞢F\u0016~\u000cR\u0003qZ`Bx",
-            "type": "􂔚Sp\u0008[I爉󳝚􂠥䭙B,}\u0013\u0000𭪳!󷇭󱁤~\tTqV\u001a\u0007\u0016𛃼k"
+            "type": "􂔚Sp\u0008[I爉󳝚􂠥䭙B,}\u0013\u0000𭪳!󷇭󱁤~\tTqV\u001a\u0007\u0016𛃼k",
+            "value": "=S𢕖󷈓𧞢F\u0016~\u000cR\u0003qZ`Bx"
         },
         {
-            "value": "``]Q􅥫\u0008A\u0006\"\u000c\u001e𬲟󳱢𔘠2􎄵🗐,",
-            "type": "hE󷓤􁸗~\u0001\nN/\u001c\t䐊dOࡧO;T8_\n󹚘\t\u0000Ov\u001fb𥟰"
+            "type": "hE󷓤􁸗~\u0001\nN/\u001c\t䐊dOࡧO;T8_\n󹚘\t\u0000Ov\u001fb𥟰",
+            "value": "``]Q􅥫\u0008A\u0006\"\u000c\u001e𬲟󳱢𔘠2􎄵🗐,"
         },
         {
-            "value": "=𢴺F",
-            "type": "'v𤱤B㽖0􆂴􍔁詝􏳵𩮔#"
+            "type": "'v𤱤B㽖0􆂴􍔁詝􏳵𩮔#",
+            "value": "=𢴺F"
         },
         {
-            "value": "󿐟#Q𫿆[W",
-            "type": "࿂E"
+            "type": "࿂E",
+            "value": "󿐟#Q𫿆[W"
         },
         {
-            "value": "rBpC󺇂\u001ao00}\u000c鯽국&V4U􌶦qI<",
-            "type": "\u0013}\u0007󲮬"
+            "type": "\u0013}\u0007󲮬",
+            "value": "rBpC󺇂\u001ao00}\u000c鯽국&V4U􌶦qI<"
         },
         {
-            "value": "<􀚹ThAႪ35OIR+\u000e0\u0000GTv\u0002\u001b\u0010􆻾M\u0015",
-            "type": "\u0001e"
+            "type": "\u0001e",
+            "value": "<􀚹ThAႪ35OIR+\u000e0\u0000GTv\u0002\u001b\u0010􆻾M\u0015"
         },
         {
-            "value": "i_􌏜\u0019M!曖",
-            "type": "삧􁈰헕&鍊\u0000,(z𗱩\u0011p\u0002􆯸("
+            "type": "삧􁈰헕&鍊\u0000,(z𗱩\u0011p\u0002􆯸(",
+            "value": "i_􌏜\u0019M!曖"
         },
         {
-            "value": "=GTO\u000b􊴋d~f_R/\u0005E𭷓p_N\u00192Y4\u0011p𬥕󺢹󻮋1",
-            "type": "?.J󸵇3um+뼜jD\u0016d魶\u0018\u0006/\tP&𤅺𐅛z)\\󹄲ᑹ􅟤n6"
+            "type": "?.J󸵇3um+뼜jD\u0016d魶\u0018\u0006/\tP&𤅺𐅛z)\\󹄲ᑹ􅟤n6",
+            "value": "=GTO\u000b􊴋d~f_R/\u0005E𭷓p_N\u00192Y4\u0011p𬥕󺢹󻮋1"
         },
         {
-            "value": "􌙉\u0017\u0000>Pb􊼊\n􌊧7t􄯲MHR󼧥*",
-            "type": "$jc𘐠󷈟\u0019\u000b\u0003􃅃秺5W\\󾌲lk$"
+            "type": "$jc𘐠󷈟\u0019\u000b\u0003􃅃秺5W\\󾌲lk$",
+            "value": "􌙉\u0017\u0000>Pb􊼊\n􌊧7t􄯲MHR󼧥*"
         },
         {
-            "value": "/",
-            "type": "􀤠"
+            "type": "􀤠",
+            "value": "/"
         },
         {
-            "value": "𣙒W\u000e󻭆+a􋂎}󴇗𤹰𤷮􁾻𣺎\u0005𒇎I𤲿􂃠䓘[p\u0015\u001791:=",
-            "type": "G\u0011D\u001aRr\u0016.\u0003􉦤,\u0001\u000c(\u001a"
+            "type": "G\u0011D\u001aRr\u0016.\u0003􉦤,\u0001\u000c(\u001a",
+            "value": "𣙒W\u000e󻭆+a􋂎}󴇗𤹰𤷮􁾻𣺎\u0005𒇎I𤲿􂃠䓘[p\u0015\u001791:="
         },
         {
-            "value": "放uT,-/􇤉\\\u001d",
-            "type": "D\u0010􎃹\u0016.CXF>c󿵝􁶰"
+            "type": "D\u0010􎃹\u0016.CXF>c󿵝􁶰",
+            "value": "放uT,-/􇤉\\\u001d"
         },
         {
-            "value": "\u0016M𖣀B'󲣆󽀢y\u0019B8󷾩C炯\u0003몙\u0016Z\u0010𣕭.j;C)4𥟡r",
-            "type": "𨿁\u0019Ut𐂏􎫚Qi姘w\u001d&乇\u00045\u0015𪘜1容"
+            "type": "𨿁\u0019Ut𐂏􎫚Qi姘w\u001d&乇\u00045\u0015𪘜1容",
+            "value": "\u0016M𖣀B'󲣆󽀢y\u0019B8󷾩C炯\u0003몙\u0016Z\u0010𣕭.j;C)4𥟡r"
         },
         {
-            "value": "Hb􅕖󿗔-𪋦g\u0000煦.\u0008𫇮xRxg󵟂n=󳝧\u0005qf}\u0004\u001do",
-            "type": "0x{〾';\u0004휌쇲\u00058𡛾?>\u001c=-j\u0008x"
+            "type": "0x{〾';\u0004휌쇲\u00058𡛾?>\u001c=-j\u0008x",
+            "value": "Hb􅕖󿗔-𪋦g\u0000煦.\u0008𫇮xRxg󵟂n=󳝧\u0005qf}\u0004\u001do"
         },
         {
-            "value": "L\r麕D\u001bajF􌤎󰽪𓊺O\t􍴞.\r7𣑂",
-            "type": "d􉣔\u001c+^𪫙󿗊\">T\u0016q/f􅁭8ik"
+            "type": "d􉣔\u001c+^𪫙󿗊\">T\u0016q/f􅁭8ik",
+            "value": "L\r麕D\u001bajF􌤎󰽪𓊺O\t􍴞.\r7𣑂"
         },
         {
-            "value": "t\u0016x\u001f\u001c{9𧊖𠬕gr:\u0006~\u00181\u001a(Kyo+󲟬>",
-            "type": "n\u0011􇑓=蒛􏕝𐩆\u0005\u001e\u000ep/>y󽔘'lgq𡖻ؒ\u00138^>G"
+            "type": "n\u0011􇑓=蒛􏕝𐩆\u0005\u001e\u000ep/>y󽔘'lgq𡖻ؒ\u00138^>G",
+            "value": "t\u0016x\u001f\u001c{9𧊖𠬕gr:\u0006~\u00181\u001a(Kyo+󲟬>"
         },
         {
-            "value": "𑄮/\u0002Dl\u001fb\n\u001d𣓮)]\u0012s{M(m󹙮昴􁷔\u0016\u0005U􃷣\u0003U⇃!:",
-            "type": "Td"
+            "type": "Td",
+            "value": "𑄮/\u0002Dl\u001fb\n\u001d𣓮)]\u0012s{M(m󹙮昴􁷔\u0016\u0005U􃷣\u0003U⇃!:"
         },
         {
-            "value": "2󺀕􊑚\u0003𫔔􇰓+}냊󹚬<\u001ba𗸣9\u0002󿄛\u000b鋨󾃻󻷥􏙢󱊒",
-            "type": "z𛄋UTUu\u0003xB*󹊈R\u0014"
+            "type": "z𛄋UTUu\u0003xB*󹊈R\u0014",
+            "value": "2󺀕􊑚\u0003𫔔􇰓+}냊󹚬<\u001ba𗸣9\u0002󿄛\u000b鋨󾃻󻷥􏙢󱊒"
         },
         {
-            "value": "􄍿\u0016\u001f||􏢤}𗮻S[􅦸K\r絜.g",
-            "type": "6\u0015󸺶\txd󶾟\u000cD\u0018Wap\u0003O􋸎r󽱨賡z\u0010"
+            "type": "6\u0015󸺶\txd󶾟\u000cD\u0018Wap\u0003O􋸎r󽱨賡z\u0010",
+            "value": "􄍿\u0016\u001f||􏢤}𗮻S[􅦸K\r絜.g"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_6.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_6.json
index 24117c123c8..585a4846e90 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_6.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_6.json
@@ -1,85 +1,85 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "𝡰{y𗯏NE\u000c-󿩧zG~7x`\u0005𨊻\u0005󻂨;扳𩪅萒\u0019\u0014",
-            "type": "a󳭇y􇇔\u001e𘢷銽n\u001aMr&Pw32Ov\u0013S\u001c蕚W퓜}ၑ(㑫\u000e"
+            "type": "a󳭇y􇇔\u001e𘢷銽n\u001aMr&Pw32Ov\u0013S\u001c蕚W퓜}ၑ(㑫\u000e",
+            "value": "𝡰{y𗯏NE\u000c-󿩧zG~7x`\u0005𨊻\u0005󻂨;扳𩪅萒\u0019\u0014"
         },
         {
-            "value": "牘􇏞gN𦆱(v:ZHY刺M",
-            "type": "gSﱃL2RM\u000c~\u0008]5$vT"
+            "type": "gSﱃL2RM\u000c~\u0008]5$vT",
+            "value": "牘􇏞gN𦆱(v:ZHY刺M"
         },
         {
-            "value": "S󳷼󠀡\u0013;",
-            "type": "8\u0006\u0012\u001aC\u0016"
+            "type": "8\u0006\u0012\u001aC\u0016",
+            "value": "S󳷼󠀡\u0013;"
         },
         {
-            "value": "2廳\"<𥳈",
-            "type": "%𧮱c[6\u0001"
+            "type": "%𧮱c[6\u0001",
+            "value": "2廳\"<𥳈"
         },
         {
-            "value": "\u0019Z`>􃘂w.\u0019Vz𡞸􀪵\u0002\u001aO\u0011𘣾𗇚\u0015\u0018XAO5@",
-            "type": "@\u0018\u0008H𦠵TB Hf mgi"
+            "type": "@\u0018\u0008H𦠵TB Hf mgi",
+            "value": "\u0019Z`>􃘂w.\u0019Vz𡞸􀪵\u0002\u001aO\u0011𘣾𗇚\u0015\u0018XAO5@"
         },
         {
-            "value": "O,&`􌳝\u0002󷶭i.\u0010F G􌶡5",
-            "type": "E\u0018\u000c\u0010\u0007\u0001/G\u000c􂥡閸􂮂U]:y\u0017[j8:鎷𤯎ꭏu"
+            "type": "E\u0018\u000c\u0010\u0007\u0001/G\u000c􂥡閸􂮂U]:y\u0017[j8:鎷𤯎ꭏu",
+            "value": "O,&`􌳝\u0002󷶭i.\u0010F G􌶡5"
         },
         {
-            "value": "_&j𥑛𪌄c\u0004\u0007\u001dw\n𦡠Ot簆醫O󺓻󲝍𝣥!w𢽣\n",
-            "type": "􋩝\u001cs\r𒀽t\u0003𪳽h"
+            "type": "􋩝\u001cs\r𒀽t\u0003𪳽h",
+            "value": "_&j𥑛𪌄c\u0004\u0007\u001dw\n𦡠Ot簆醫O󺓻󲝍𝣥!w𢽣\n"
         },
         {
-            "value": "f􃨰nX䅮`\u0013𧈷\u0011\u0011𠅺󿼓WhW\u000f;\u0000}p𮇫\u0014>虎e",
-            "type": "J󵔍軁WP\rFxM\u001b\u0016S"
+            "type": "J󵔍軁WP\rFxM\u001b\u0016S",
+            "value": "f􃨰nX䅮`\u0013𧈷\u0011\u0011𠅺󿼓WhW\u000f;\u0000}p𮇫\u0014>虎e"
         },
         {
-            "value": "8\"gFT쬔X&嫛󴠔D􋩒󾪩󻰼",
-            "type": "ZTu\u0018c\u000e\u0014[=2􁄵UcC-jV@􊳶fN"
+            "type": "ZTu\u0018c\u000e\u0014[=2􁄵UcC-jV@􊳶fN",
+            "value": "8\"gFT쬔X&嫛󴠔D􋩒󾪩󻰼"
         },
         {
-            "value": "?X\u001f\u0016\u000b𞹇𪢂2岃J𪷇5F*BT\u0004󰨷\u0003\u0013&",
-            "type": "E~L\u0014\u0018😓p)\u001bW"
+            "type": "E~L\u0014\u0018😓p)\u001bW",
+            "value": "?X\u001f\u0016\u000b𞹇𪢂2岃J𪷇5F*BT\u0004󰨷\u0003\u0013&"
         },
         {
-            "value": "\u000c󲲿n𧠼3󼄊:𫍼􅶢}\\BI𭕿@'[\u001e2w􀤌",
-            "type": "6z󶞄􊫎G/T)e!v𪼉\u0005|\u001f%B9\u0017]\u0012lL􎉥"
+            "type": "6z󶞄􊫎G/T)e!v𪼉\u0005|\u001f%B9\u0017]\u0012lL􎉥",
+            "value": "\u000c󲲿n𧠼3󼄊:𫍼􅶢}\\BI𭕿@'[\u001e2w􀤌"
         },
         {
-            "value": "\u001b􂽜V󶦹jv",
-            "type": "]S􅒲󰚊􎞋w\u001f󸂟\u0006*o􍺷O`\u0019\u000b\u0002l("
+            "type": "]S􅒲󰚊􎞋w\u001f󸂟\u0006*o􍺷O`\u0019\u000b\u0002l(",
+            "value": "\u001b􂽜V󶦹jv"
         },
         {
-            "value": "𮎡\u0016as􁡼r>󰹣",
-            "type": "6\u000el\u000e\u0016Eb!􎍢𦸤C"
+            "type": "6\u000el\u000e\u0016Eb!􎍢𦸤C",
+            "value": "𮎡\u0016as􁡼r>󰹣"
         },
         {
-            "value": "xy󽍾Pw壴\u001f󲀹\u0011p\u0000\u0005#",
-            "type": "BkfZq*C>I󶧂󿅖\u0013#𦴁.󼠕%\u0018X󻝆(_,軍"
+            "type": "BkfZq*C>I󶧂󿅖\u0013#𦴁.󼠕%\u0018X󻝆(_,軍",
+            "value": "xy󽍾Pw壴\u001f󲀹\u0011p\u0000\u0005#"
         },
         {
-            "value": "\u001d𐡐4\u000bH唐㷺\u0012𐭹󸓡\u0006JZc𒒔",
-            "type": ",{\u0005\u0005ER𥄎\u0008B\u001f\\;\u0014蔶󹉂7\u0010󳐏Bk󼈽\u0019􆘹]\u0001Y"
+            "type": ",{\u0005\u0005ER𥄎\u0008B\u001f\\;\u0014蔶󹉂7\u0010󳐏Bk󼈽\u0019􆘹]\u0001Y",
+            "value": "\u001d𐡐4\u000bH唐㷺\u0012𐭹󸓡\u0006JZc𒒔"
         },
         {
-            "value": "\u001eM[󱋾x󽇆\u000c\u0012/\u0007b\r.#s\\\"w)?𧝡􌝶3\u0016w􊅴",
-            "type": "\u001b4􌞞觅A\"9\u00134\u0010󵟛g"
+            "type": "\u001b4􌞞觅A\"9\u00134\u0010󵟛g",
+            "value": "\u001eM[󱋾x󽇆\u000c\u0012/\u0007b\r.#s\\\"w)?𧝡􌝶3\u0016w􊅴"
         },
         {
-            "value": "𗒤H𠧛",
-            "type": "􆛃G𠓀􁽮\u0001\u0002􉒍._e\u001aQv􌕛dn\u001d􈿒󶈭䛥"
+            "type": "􆛃G𠓀􁽮\u0001\u0002􉒍._e\u001aQv􌕛dn\u001d􈿒󶈭䛥",
+            "value": "𗒤H𠧛"
         },
         {
-            "value": "T󼂏󷷏\u0004*",
-            "type": "3\u001e<\u0015>O잂󿆧\u000bHJDXU+􍻓~4+"
+            "type": "3\u001e<\u0015>O잂󿆧\u000bHJDXU+􍻓~4+",
+            "value": "T󼂏󷷏\u0004*"
         },
         {
-            "value": "\u000ex़X\u0003@𩌧xll;*𡤼",
-            "type": ","
+            "type": ",",
+            "value": "\u000ex़X\u0003@𩌧xll;*𡤼"
         },
         {
-            "value": "\u0007ᖄ",
-            "type": "ksP~R󲵰𩷻mo󳻧􉖡\u0015聠K\u000b󿳲\u001d\nV빬𬙠\u001eZ􃊤󷏩"
+            "type": "ksP~R󲵰𩷻mo󳻧􉖡\u0015聠K\u000b󿳲\u001d\nV빬𬙠\u001eZ􃊤󷏩",
+            "value": "\u0007ᖄ"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_7.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_7.json
index 418a0fe3ab7..5a29a88ed23 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_7.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_7.json
@@ -1,61 +1,61 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": " ",
-            "type": "O,*w%5inz`􇪃"
+            "type": "O,*w%5inz`􇪃",
+            "value": " "
         },
         {
-            "value": "󷣴𩬹󾼒kYfꅀ𨅄𗩕P󷁞󶴕𗅂\u000fr󷷭\u0016",
-            "type": "Bz\u0012g\u000b\u0002\u000cY,󴜷mvfB*#;"
+            "type": "Bz\u0012g\u000b\u0002\u000cY,󴜷mvfB*#;",
+            "value": "󷣴𩬹󾼒kYfꅀ𨅄𗩕P󷁞󶴕𗅂\u000fr󷷭\u0016"
         },
         {
-            "value": "\u000cw󴽚6쌿\u0008􂼂lJmp;󵖥",
-            "type": "\u0012㑐\u00072첣X\u001c􍫍"
+            "type": "\u0012㑐\u00072첣X\u001c􍫍",
+            "value": "\u000cw󴽚6쌿\u0008􂼂lJmp;󵖥"
         },
         {
-            "value": "p\u001fl\u0001􁺘艞𡴮jM|\u001c𗢪o𦂈\u0012FeN\u0011𖽭\u000b⪍\u0006\u0005",
-            "type": "3󸣶8@\u001fw"
+            "type": "3󸣶8@\u001fw",
+            "value": "p\u001fl\u0001􁺘艞𡴮jM|\u001c𗢪o𦂈\u0012FeN\u0011𖽭\u000b⪍\u0006\u0005"
         },
         {
-            "value": "\u0012☇􂺿m𭙷E也.\u0008u6\"#w庫\u0003s<\u0007'@\u001e\u0019y\u0014\u0003\u000es",
-            "type": "m+\u0000\u0017\u001aZw𗓅+T2"
+            "type": "m+\u0000\u0017\u001aZw𗓅+T2",
+            "value": "\u0012☇􂺿m𭙷E也.\u0008u6\"#w庫\u0003s<\u0007'@\u001e\u0019y\u0014\u0003\u000es"
         },
         {
-            "value": "n𛇢𪟥<8􂵷E]R-S5]Blc\u0015\u0002􆣝\u0013Y𣾟\u0016\u0019?",
-            "type": "%2󽃭=[􆅼M([w"
+            "type": "%2󽃭=[􆅼M([w",
+            "value": "n𛇢𪟥<8􂵷E]R-S5]Blc\u0015\u0002􆣝\u0013Y𣾟\u0016\u0019?"
         },
         {
-            "value": "􀈜\u0003􍔘-l𬵶bXBE󷻬󰤷2􍲺",
-            "type": ".􆽽L\tgUM4󸱑ypK􎞸󱳖/𬤏+u]V{儾"
+            "type": ".􆽽L\tgUM4󸱑ypK􎞸󱳖/𬤏+u]V{儾",
+            "value": "􀈜\u0003􍔘-l𬵶bXBE󷻬󰤷2􍲺"
         },
         {
-            "value": "J\u0004\u0011O\u001eb󠇬;\u00178NQ\u0013\t",
-            "type": "􀇇1G&􅡴􎸞}􈽐(p􏷑\u0001"
+            "type": "􀇇1G&􅡴􎸞}􈽐(p􏷑\u0001",
+            "value": "J\u0004\u0011O\u001eb󠇬;\u00178NQ\u0013\t"
         },
         {
-            "value": "7􉜉f󻷤f",
-            "type": "Wa􍿡dR+p𘄹󾎓\u000f𬀳󲾁p\u0008x𪯩t󽋠\u00001\u000e\u000fPD"
+            "type": "Wa􍿡dR+p𘄹󾎓\u000f𬀳󲾁p\u0008x𪯩t󽋠\u00001\u000e\u000fPD",
+            "value": "7􉜉f󻷤f"
         },
         {
-            "value": "\u000e\u000f.1􃽬\u0001􆺏:^kJ𥬅\u000cdQj􊃚]\u0001",
-            "type": "JW\u000e\u0002us\u0002􏨰󲚋K󰗝🁋𢩇"
+            "type": "JW\u000e\u0002us\u0002􏨰󲚋K󰗝🁋𢩇",
+            "value": "\u000e\u000f.1􃽬\u0001􆺏:^kJ𥬅\u000cdQj􊃚]\u0001"
         },
         {
-            "value": "E姡&)<𗁋[yF[􀔧𮤫\u001fBZ􋈨;舼\u0019~𡱖~+u\u0005p",
-            "type": "<p\u0003t\u001e}({!󲭆|A|^V搣䷸K􇆛\u000f\u0011󷟇\\F󽩍\u0017"
+            "type": "<p\u0003t\u001e}({!󲭆|A|^V搣䷸K􇆛\u000f\u0011󷟇\\F󽩍\u0017",
+            "value": "E姡&)<𗁋[yF[􀔧𮤫\u001fBZ􋈨;舼\u0019~𡱖~+u\u0005p"
         },
         {
-            "value": "vB\u0016e1𮍲F#R󳾻@𥽨|􄮴X",
-            "type": "J􀖾Z嫡]󸋳Z{`@K@,"
+            "type": "J􀖾Z嫡]󸋳Z{`@K@,",
+            "value": "vB\u0016e1𮍲F#R󳾻@𥽨|􄮴X"
         },
         {
-            "value": "U茝l",
-            "type": "R𠲷\u0005􃮙4E+D\u0007A9\u0005P🐸'$\u0007"
+            "type": "R𠲷\u0005􃮙4E+D\u0007A9\u0005P🐸'$\u0007",
+            "value": "U茝l"
         },
         {
-            "value": "뾇3𩺅텷!\"\t%zz\u0002⢍.M󼡖㛠󻋰%􅜾\tB1wC􆦄K)󵷯",
-            "type": "W󻏻Wyx\u0019Js\tH7\u0014Usn􂓪󰼃P仌V\u0011Zi"
+            "type": "W󻏻Wyx\u0019Js\tH7\u0014Usn􂓪󰼃P仌V\u0011Zi",
+            "value": "뾇3𩺅텷!\"\t%zz\u0002⢍.M󼡖㛠󻋰%􅜾\tB1wC􆦄K)󵷯"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_8.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_8.json
index 3d96a951f05..54aff0bcf23 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_8.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_8.json
@@ -1,117 +1,117 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "+5+[\u000b\u0007*>\u0013n/.BG𨤳\u0000𭙜Y?i",
-            "type": "Dz𦃏s󴇑􌻆𦤌7u󳵝㲝\u0004扭}k=R𢉱\u0014\u0017+\u0016Y73󷯜:"
+            "type": "Dz𦃏s󴇑􌻆𦤌7u󳵝㲝\u0004扭}k=R𢉱\u0014\u0017+\u0016Y73󷯜:",
+            "value": "+5+[\u000b\u0007*>\u0013n/.BG𨤳\u0000𭙜Y?i"
         },
         {
-            "value": "􀭗烅K]📼j8ፒ𨸵#,󶭂𭘗􎋳V}\u0002\u000f\u0017",
-            "type": "g\u0012􈲪\u0013釤h􉸣8`\u0016\u0019x<󿅖\u0006c@3\t&Cv"
+            "type": "g\u0012􈲪\u0013釤h􉸣8`\u0016\u0019x<󿅖\u0006c@3\t&Cv",
+            "value": "􀭗烅K]📼j8ፒ𨸵#,󶭂𭘗􎋳V}\u0002\u000f\u0017"
         },
         {
-            "value": "I\u0019O𩎬\u000f&bP󷪮\u0001b􆘀Z𩁋S󵢎E\r]3j<|2:\u0007",
-            "type": "Z󳟏󸽝@07􂣿\u001b\u00130\u000f\u0001\u0004fVP兹\u0010)"
+            "type": "Z󳟏󸽝@07􂣿\u001b\u00130\u000f\u0001\u0004fVP兹\u0010)",
+            "value": "I\u0019O𩎬\u000f&bP󷪮\u0001b􆘀Z𩁋S󵢎E\r]3j<|2:\u0007"
         },
         {
-            "value": "a]􅬘\u0004?@;!􇶾\u0007𫧎󱷲􅸻\t#x\u0002󵔰",
-            "type": "􏕛/ guMT\u0001􄹇\"{S\t󺽗󠇟M𧐍\u0003Z.F6"
+            "type": "􏕛/ guMT\u0001􄹇\"{S\t󺽗󠇟M𧐍\u0003Z.F6",
+            "value": "a]􅬘\u0004?@;!􇶾\u0007𫧎󱷲􅸻\t#x\u0002󵔰"
         },
         {
-            "value": "\u000eZ}\t\u001bY(G🐃'\u0004J:\u000c[g^X\r󰗔",
-            "type": "\u0017VLH%B&\u0002q􄘎\"o\u0018"
+            "type": "\u0017VLH%B&\u0002q􄘎\"o\u0018",
+            "value": "\u000eZ}\t\u001bY(G🐃'\u0004J:\u000c[g^X\r󰗔"
         },
         {
-            "value": "s\u000eon\u0001t𤨩M󻚕\u000e臨Ul﹪GG+b3𨸵",
-            "type": "􄵱\u001d\\ၓ\u001e/w\u0006𩡜,f"
+            "type": "􄵱\u001d\\ၓ\u001e/w\u0006𩡜,f",
+            "value": "s\u000eon\u0001t𤨩M󻚕\u000e臨Ul﹪GG+b3𨸵"
         },
         {
-            "value": "𦋍𭱿􆉞{&\u000eP2@",
-            "type": "Nl\u001a𪺟Qk\u0013"
+            "type": "Nl\u001a𪺟Qk\u0013",
+            "value": "𦋍𭱿􆉞{&\u000eP2@"
         },
         {
-            "value": "2󽮛",
-            "type": "d􏝚􋫨g"
+            "type": "d􏝚􋫨g",
+            "value": "2󽮛"
         },
         {
-            "value": "Wd\rd嫣8=%:qO,𢁸Bt􇧧\u0003^(󲔉􉍞^󶙠-",
-            "type": "\u0015:%j\u0017D𥭅􍝯M?𑁙Jo<j3"
+            "type": "\u0015:%j\u0017D𥭅􍝯M?𑁙Jo<j3",
+            "value": "Wd\rd嫣8=%:qO,𢁸Bt􇧧\u0003^(󲔉􉍞^󶙠-"
         },
         {
-            "value": "󽵔𝒖[𠳜&\u0004C:$B𦯈\u0004󿓰\u001dH𣴦\u0000㔈Y􏸝𡸣\":om",
-            "type": "\u001d9M"
+            "type": "\u001d9M",
+            "value": "󽵔𝒖[𠳜&\u0004C:$B𦯈\u0004󿓰\u001dH𣴦\u0000㔈Y􏸝𡸣\":om"
         },
         {
-            "value": "y",
-            "type": "x􍑛qa\u0010q泴pP#.􆒋*8z"
+            "type": "x􍑛qa\u0010q泴pP#.􆒋*8z",
+            "value": "y"
         },
         {
-            "value": "m2v\u0010\u0015ble􎇲􅏹\u000b;*]\u0015󻁬L𨇧=",
-            "type": ")󿇌\u0016rvQ\u0019􉙰4J\u000e􊡑x-􍍊J\u0005?긗hG*="
+            "type": ")󿇌\u0016rvQ\u0019􉙰4J\u000e􊡑x-􍍊J\u0005?긗hG*=",
+            "value": "m2v\u0010\u0015ble􎇲􅏹\u000b;*]\u0015󻁬L𨇧="
         },
         {
-            "value": ".y󼞝S=k\u0019r0\u0017𗹗􃇙gYR_㦲𓏒DE\u0015v\u0016",
-            "type": "󾸺aG'#􉞥\u0007􅨲><舊\tDfd\u0005e󱦻扜󼏓𥯑󳿭\u000e!"
+            "type": "󾸺aG'#􉞥\u0007􅨲><舊\tDfd\u0005e󱦻扜󼏓𥯑󳿭\u000e!",
+            "value": ".y󼞝S=k\u0019r0\u0017𗹗􃇙gYR_㦲𓏒DE\u0015v\u0016"
         },
         {
-            "value": "Y󻰏3\u0012&鹵\u0006\u0008+*\u0001b\u0018",
-            "type": "IdX􄹻\\\u0004}kx\u00113V󰝪_󳝇A\tmz\u001e󱘵&"
+            "type": "IdX􄹻\\\u0004}kx\u00113V󰝪_󳝇A\tmz\u001e󱘵&",
+            "value": "Y󻰏3\u0012&鹵\u0006\u0008+*\u0001b\u0018"
         },
         {
-            "value": "X:\tn􂹂dM9d%n",
-            "type": "-PV0󿐒go\u0002-SJ󳮮v6𣝊n-"
+            "type": "-PV0󿐒go\u0002-SJ󳮮v6𣝊n-",
+            "value": "X:\tn􂹂dM9d%n"
         },
         {
-            "value": "\u0005\u001ao",
-            "type": "m\u001d<\u000b𩋙)𪮰\u00174y"
+            "type": "m\u001d<\u000b𩋙)𪮰\u00174y",
+            "value": "\u0005\u001ao"
         },
         {
-            "value": "Y",
-            "type": "Hqa1𓀝]"
+            "type": "Hqa1𓀝]",
+            "value": "Y"
         },
         {
-            "value": "\u000c$|𗗽􅡇󷏂(",
-            "type": "3\u000e/I\\틇\\􃜉:𝓓\u001f𢲑"
+            "type": "3\u000e/I\\틇\\􃜉:𝓓\u001f𢲑",
+            "value": "\u000c$|𗗽􅡇󷏂("
         },
         {
-            "value": "ZA#􊭘􏐪\u0001E큢.\t<X𥖏<𣮍F\u000ep|pJ\u001c?𓇚",
-            "type": "\u0012"
+            "type": "\u0012",
+            "value": "ZA#􊭘􏐪\u0001E큢.\t<X𥖏<𣮍F\u000ep|pJ\u001c?𓇚"
         },
         {
-            "value": "荁m𥰰J\u0006o",
-            "type": "􆓷􉦿ꡌ#\u0002􉠐\u001ax\u001bm􊆎_􃥶UU=\u0017_"
+            "type": "􆓷􉦿ꡌ#\u0002􉠐\u001ax\u001bm􊆎_􃥶UU=\u0017_",
+            "value": "荁m𥰰J\u0006o"
         },
         {
-            "value": "QY\u001dۚ\u0012\u0017\u001a𦋀🀡ZW\\>\u0005𭔻5l󾌏3n{\u0006\u0018U䨡",
-            "type": ",G\u0013󺐉59!9\u0007TMV{\u00010>F[[HZ螔w\"JF𡁎"
+            "type": ",G\u0013󺐉59!9\u0007TMV{\u00010>F[[HZ螔w\"JF𡁎",
+            "value": "QY\u001dۚ\u0012\u0017\u001a𦋀🀡ZW\\>\u0005𭔻5l󾌏3n{\u0006\u0018U䨡"
         },
         {
-            "value": "\u0013/𗧄<􃜥\u0015迺􄪥\u0004m(_PL",
-            "type": "72&9B$oAzN`C\u001f\u000eD􃣘8"
+            "type": "72&9B$oAzN`C\u001f\u000eD􃣘8",
+            "value": "\u0013/𗧄<􃜥\u0015迺􄪥\u0004m(_PL"
         },
         {
-            "value": "󹯩𡵟𢇾?f",
-            "type": "9\u0005U􀮡󲋀HU^l琴\u0005?*\u0011𠄷Td󼒔"
+            "type": "9\u0005U􀮡󲋀HU^l琴\u0005?*\u0011𠄷Td󼒔",
+            "value": "󹯩𡵟𢇾?f"
         },
         {
-            "value": "󺦷􄢂FS`#\u001b",
-            "type": "O\u001fX4h쏋a􋛹\u001ef{/<􀬅@\\CbvtN\u000b\u000b2󶣃t\u0015\u0017"
+            "type": "O\u001fX4h쏋a􋛹\u001ef{/<􀬅@\\CbvtN\u000b\u000b2󶣃t\u0015\u0017",
+            "value": "󺦷􄢂FS`#\u001b"
         },
         {
-            "value": "8g󱴛벞\u001f\\<󶁰\u001bI\u0000Ἱl\u000e󷫁i\u0002g𝥁\\y𩴡\u0005\u001c_",
-            "type": "KGO􆶟X󽟲%}􃤀Z𥹱U􁫳_`󻗻q\u0011摷\u0004$\u001f𫣵\u0016XN\u0012R"
+            "type": "KGO􆶟X󽟲%}􃤀Z𥹱U􁫳_`󻗻q\u0011摷\u0004$\u001f𫣵\u0016XN\u0012R",
+            "value": "8g󱴛벞\u001f\\<󶁰\u001bI\u0000Ἱl\u000e󷫁i\u0002g𝥁\\y𩴡\u0005\u001c_"
         },
         {
-            "value": "\rx{\u0006u𠼙vL靠􆛱\\;)*Kk\u0013\u0014~\u0003{𐑅$𘗲",
-            "type": "􌔉𤁌nF󺒸$>󶎿#𦸃\u0005\u0014d\u0015\u001f󰗎F]𨫜􆘑w謲󼡒"
+            "type": "􌔉𤁌nF󺒸$>󶎿#𦸃\u0005\u0014d\u0015\u001f󰗎F]𨫜􆘑w謲󼡒",
+            "value": "\rx{\u0006u𠼙vL靠􆛱\\;)*Kk\u0013\u0014~\u0003{𐑅$𘗲"
         },
         {
-            "value": "𭙪􏝢q4t\u0004B",
-            "type": "kd(X$𮢇\u0003]rP6撩>wi鯉\u00188\u0002}󶙽\u001aw2"
+            "type": "kd(X$𮢇\u0003]rP6撩>wi鯉\u00188\u0002}󶙽\u001aw2",
+            "value": "𭙪􏝢q4t\u0004B"
         },
         {
-            "value": "m\u0011,₺",
-            "type": "90􃋑#\u0008-/G"
+            "type": "90􃋑#\u0008-/G",
+            "value": "m\u0011,₺"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_9.json b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_9.json
index 65bcd10cd3b..8ebf12ad856 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_9.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoAssocList_user_9.json
@@ -1,69 +1,69 @@
 {
-    "version": 0,
     "fields": [
         {
-            "value": "Q툔\u0019f\u000e\u0011􀃠(W􂁠󱜆;𫮬s5\u001db;U\u0017󰘶D*\u0013盳\u001a\u000c4",
-            "type": ""
+            "type": "",
+            "value": "Q툔\u0019f\u000e\u0011􀃠(W􂁠󱜆;𫮬s5\u001db;U\u0017󰘶D*\u0013盳\u001a\u000c4"
         },
         {
-            "value": "\\\u0018-%N𭠚rW􅅕𬥾\u0002绘􋨚?{\t􍒻c󲎙}C\u000b􀬖>𦍪9",
-            "type": "\u001a毉o$\tm1\u0000PIe𗦱!e𤿦\u0018D𢈭b𒂾󷊝87N􎈙\u0001"
+            "type": "\u001a毉o$\tm1\u0000PIe𗦱!e𤿦\u0018D𢈭b𒂾󷊝87N􎈙\u0001",
+            "value": "\\\u0018-%N𭠚rW􅅕𬥾\u0002绘􋨚?{\t􍒻c󲎙}C\u000b􀬖>𦍪9"
         },
         {
-            "value": "!3\u0005#⇓󰔿aA󱲷\u001e󺁗",
-            "type": "\u0012\u0017:#j󸋺󲻆R\u001aΉ둵\u0013󴝥\u000cX󹀿{\u0007\u001c􉫓$\u0011@\u0000"
+            "type": "\u0012\u0017:#j󸋺󲻆R\u001aΉ둵\u0013󴝥\u000cX󹀿{\u0007\u001c􉫓$\u0011@\u0000",
+            "value": "!3\u0005#⇓󰔿aA󱲷\u001e󺁗"
         },
         {
-            "value": "\u0005F𣆏}w",
-            "type": "\u001d!\u0004\u0011[.\u0019꠶䧚\u0015𑿍󶆬 󻭣V@􍘨󳅧uX"
+            "type": "\u001d!\u0004\u0011[.\u0019꠶䧚\u0015𑿍󶆬 󻭣V@􍘨󳅧uX",
+            "value": "\u0005F𣆏}w"
         },
         {
-            "value": "􂘇],%5gtF&\u0011𘟗",
-            "type": "i|O;?\u000c8*\u0000{\r`􍆮"
+            "type": "i|O;?\u000c8*\u0000{\r`􍆮",
+            "value": "􂘇],%5gtF&\u0011𘟗"
         },
         {
-            "value": "E(*𨭞\u000fF𮩀\u0017f\u0002.",
-            "type": "􈜎X튜湂6Y|\u0001q啈,$󲍺k\u001bA𦆗𝪝X\u0004𬙰^^𢮜4\u001f#Lh"
+            "type": "􈜎X튜湂6Y|\u0001q啈,$󲍺k\u001bA𦆗𝪝X\u0004𬙰^^𢮜4\u001f#Lh",
+            "value": "E(*𨭞\u000fF𮩀\u0017f\u0002."
         },
         {
-            "value": ")#\u0017􊼽Xv𪄥\u0010C\n󳂜",
-            "type": "D𗩧|䩚\t𨓨\u0005P\u0010𡌸.HT%𤍎\u000221\r𡩮]\t\u0014\u0014󹿮\u000c"
+            "type": "D𗩧|䩚\t𨓨\u0005P\u0010𡌸.HT%𤍎\u000221\r𡩮]\t\u0014\u0014󹿮\u000c",
+            "value": ")#\u0017􊼽Xv𪄥\u0010C\n󳂜"
         },
         {
-            "value": "<_y\u0000nqk\rQCrz\u001c2\u0005󸿅3\u0014.",
-            "type": "_􌦌DV"
+            "type": "_􌦌DV",
+            "value": "<_y\u0000nqk\rQCrz\u001c2\u0005󸿅3\u0014."
         },
         {
-            "value": " {𩾾&𠮊M7c@&_\u001f󾒀\u0012q𑗄𫳝",
-            "type": "A晶AyU*U󽻌X૨p􉹤/섋\u001f^\u0000A\u001b\u0019]𧁟􈵿%?C"
+            "type": "A晶AyU*U󽻌X૨p􉹤/섋\u001f^\u0000A\u001b\u0019]𧁟􈵿%?C",
+            "value": " {𩾾&𠮊M7c@&_\u001f󾒀\u0012q𑗄𫳝"
         },
         {
-            "value": "\u0003󺔽\u001b",
-            "type": "\u000f𠒭W2\u0011O󼻆t\u0001󴻳蹵"
+            "type": "\u000f𠒭W2\u0011O󼻆t\u0001󴻳蹵",
+            "value": "\u0003󺔽\u001b"
         },
         {
-            "value": "9Q𩎧􁸏2&8`𡨬\\J;\u000f&군􋹺㛿0􉊰|",
-            "type": "\"k\u001d𑌓晗󷦨\u001b05M\u000c\n\r\t,;"
+            "type": "\"k\u001d𑌓晗󷦨\u001b05M\u000c\n\r\t,;",
+            "value": "9Q𩎧􁸏2&8`𡨬\\J;\u000f&군􋹺㛿0􉊰|"
         },
         {
-            "value": "􂵸􈦕.-\u001a",
-            "type": " 󲎖T󴷩+\u001f)q<󱟮s󷬮􊧣]M\u000e\u000b<\u0008@c󴚒)\u000e𡾈o6󶴟劌S"
+            "type": " 󲎖T󴷩+\u001f)q<󱟮s󷬮􊧣]M\u000e\u000b<\u0008@c󴚒)\u000e𡾈o6󶴟劌S",
+            "value": "􂵸􈦕.-\u001a"
         },
         {
-            "value": "+q𦯶𬔩5%O-\u000eZG\u0019\u0013\u000c:J󳈔D_^稑\u0001",
-            "type": "薵!1𭏖0\u000c\r𝖈\u0017𩥲"
+            "type": "薵!1𭏖0\u000c\r𝖈\u0017𩥲",
+            "value": "+q𦯶𬔩5%O-\u000eZG\u0019\u0013\u000c:J󳈔D_^稑\u0001"
         },
         {
-            "value": "J[\u0010~gi/\u0014EW\"64b\u00151􀃲':_1",
-            "type": "\u0004o1bv\u0004+\u0004𦄕d􄞊\u0016?'w碨𫐵􂡍M7kV\u0013\u0017\u001dqc"
+            "type": "\u0004o1bv\u0004+\u0004𦄕d􄞊\u0016?'w碨𫐵􂡍M7kV\u0013\u0017\u001dqc",
+            "value": "J[\u0010~gi/\u0014EW\"64b\u00151􀃲':_1"
         },
         {
-            "value": "\u0017p淥\u001a&",
-            "type": "𒃪\u0018\u000f􄗘RF(T\u0018󰎚`𣧿\u001e\u0014㝣\u0013𭼬:E󷫝𬋛夃"
+            "type": "𒃪\u0018\u000f􄗘RF(T\u0018󰎚`𣧿\u001e\u0014㝣\u0013𭼬:E󷫝𬋛夃",
+            "value": "\u0017p淥\u001a&"
         },
         {
-            "value": "󴼻!R|jE粸",
-            "type": "\"4􇧜􈼢󳏒h\u001au󼌺\u0011𭢁\u0002"
+            "type": "\"4􇧜􈼢󳏒h\u001au󼌺\u0011𭢁\u0002",
+            "value": "󴼻!R|jE粸"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "version": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_1.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_1.json
index b7ee8df6dae..79d04b67138 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_1.json
@@ -1,136 +1,136 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\r\u0004-󺴐𠙅g좾𫍰(d|󹇙[\u0014": "",
+        "\u0011f澆􇙪qj𬲘\t􁛫C\u0012V忇ZnY": "\u0014|􄩡g\"]#S𗐏\u0012\u0016/[\u000fH츚𝘡󺆳K+𫃴S𡱡N􄿻",
+        "\u0014𤉶<8g\u0006": "\u0007󻝎􆞦𮮏P'[􇝓'\u0016>\\󷠘\u0004",
+        "\u0019)𢭛R􌸑@_z,l": "'\u000cS?\u0010k'􈪪a />|Fk\u000e􇜣x󰈵󼁹K􎕍猫kp闇",
+        "\u001c\u001cPXw致&\u0015歳Kr얌7": "(e=z\"𫨃pLmg󺹛}2j𨕧OA󴕝_q\u0011󶓠",
+        "\"{^\u0017\u0012\u0018>𪢛\u0000섩w\u0013e4\u0002\u000f\\`\nJ\u0005[m㢕vd": "\u001fW[˸A+h}󶽺zQ쨗🔧\u0003",
+        ")\u0004dQ󰤰􃦞􀌼􊍣6_𨶚.|𫆋_": "I",
+        "4 X": "\u0017W󵥏m󷅭\u001cXA𭑫N`󻍂B󵎿",
+        "Fl𩣣\u000f*uBgcwKo\u0008\u0015𬼒\u0001𭱔\r%𮂅4~'\u0000ilE󹩀": "\u0003\u0006\u001e*􀷕󴷥8󾁍_\u001d􅊒ឲH􋡒Jmw\u001a,A",
+        "P.\u0006墭=輟A𩏤|c": "Q󰌰𨛟h􉪙}~\u0007?:Xq2q3Ց",
+        "XN\u001e\u0006<(4𗯔k1ON󳿩𭥥]\u0002𡗛𦙐d\u001aᾞ": "n󳪵𞺳0y{𭼓zH\n\u0011Cs\u0005",
+        "k7􏫠e)[*󺕫𩚻\u0018": "\u0003\u000cZS\u0000\u0018 報^",
+        "tڵ󷾎U𮖇/o$\u000cc": "\u00071㊎􁋔H]#󰻜𡇥\u0002*LYqs[",
+        "𗢲e": "Oࡁp",
+        "𦓔㈨'5q<𫡈": "@􎉤M쑝m\\𮐺a1B༮[S#=,.|S0\u0000j\r%",
+        "󹾣\u0007S!𥫶0:": "(]􀺚sJ\u0011󽕞􂦌C𮞒9\u000e􎛑\\\u0004Wu󻏦J᪓􇰴x\u000c.",
+        "􌷷䱅\u001b_􈚼5\u001c": "􏸻\t%b𬆘\u001c≙B#\u001e𮛗󻊆\u0005"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "𩷷NMJ\u001a𑫴6e𘕏\u001cf\u0008𒊇𦝕-𪚐mg􋉄\u001cㅨ󻟫􌐓#䩧b:🝮(",
-                    "type": "\u0010󺗮A\u001e\u0014nUXi<📃S<WE0\u000b{\u000f=LG𦀃aI󱱅"
+                    "type": "\u0010󺗮A\u001e\u0014nUXi<📃S<WE0\u000b{\u000f=LG𦀃aI󱱅",
+                    "value": "𩷷NMJ\u001a𑫴6e𘕏\u001cf\u0008𒊇𦝕-𪚐mg􋉄\u001cㅨ󻟫􌐓#䩧b:🝮("
                 },
                 {
-                    "value": "&:\u0018\u0006Q=\u0010\u0018YC󱂁-\"{Ke𠤩\u0003v\u0007?󰈫\u0005'\u0005]",
-                    "type": "嗊'^I$Au􍰍􈰾!󸀲x\u0014𡄆𤨹󾁗 𫎟U𥻁􇋓aL𪪘\u0016\u0002\u0010"
+                    "type": "嗊'^I$Au􍰍􈰾!󸀲x\u0014𡄆𤨹󾁗 𫎟U𥻁􇋓aL𪪘\u0016\u0002\u0010",
+                    "value": "&:\u0018\u0006Q=\u0010\u0018YC󱂁-\"{Ke𠤩\u0003v\u0007?󰈫\u0005'\u0005]"
                 },
                 {
-                    "value": "𠏝󼈽m\u0011\u000b\u0017H\u000b\u0004@􁏔Yl\u0002F]%\"\u0004\u0017Ol",
-                    "type": "F4\u000fm􁢨L𠎝.Wr𮏍)\u0012𠘸"
+                    "type": "F4\u000fm􁢨L𠎝.Wr𮏍)\u0012𠘸",
+                    "value": "𠏝󼈽m\u0011\u000b\u0017H\u000b\u0004@􁏔Yl\u0002F]%\"\u0004\u0017Ol"
                 },
                 {
-                    "value": "]#\u0017b鹡𦒦R2\u0008𘇱kv=.g0\nF+-",
-                    "type": "\\𠡙lRJ"
+                    "type": "\\𠡙lRJ",
+                    "value": "]#\u0017b鹡𦒦R2\u0008𘇱kv=.g0\nF+-"
                 },
                 {
-                    "value": "\u0000󾋎󻂾|㿪\u0000*6s1?\u001d\u0019q%2\t􊪱",
-                    "type": "5iಓ\u0016bXL}⅘\u0015𮪸R2I𪕞c"
+                    "type": "5iಓ\u0016bXL}⅘\u0015𮪸R2I𪕞c",
+                    "value": "\u0000󾋎󻂾|㿪\u0000*6s1?\u001d\u0019q%2\t􊪱"
                 },
                 {
-                    "value": "67𐭪#h󱊓P󾊭J",
-                    "type": "\"L+KR󱴬og\u001fo􊿚+䇀o\tw󶊃0ﲉ\u0016\u0003y󴒜"
+                    "type": "\"L+KR󱴬og\u001fo􊿚+䇀o\tw󶊃0ﲉ\u0016\u0003y󴒜",
+                    "value": "67𐭪#h󱊓P󾊭J"
                 },
                 {
-                    "value": "𗃻Tl\n\nh.f\u0003q𪶕屍\u0004XC\npo󴬨>@\\0\u0010",
-                    "type": "!Nv\u0016\u000bQ\u0007􏾼`wC}'X"
+                    "type": "!Nv\u0016\u000bQ\u0007􏾼`wC}'X",
+                    "value": "𗃻Tl\n\nh.f\u0003q𪶕屍\u0004XC\npo󴬨>@\\0\u0010"
                 },
                 {
-                    "value": "늁:\u001f􉹔𧵟􆙯\u001c1)𬄴`\u0005",
-                    "type": "p\u0018􎿒s􂳧\n󶔀0vH;.wkeD}[ecN;Hp:􃑁+⡱\u0002"
+                    "type": "p\u0018􎿒s􂳧\n󶔀0vH;.wkeD}[ecN;Hp:􃑁+⡱\u0002",
+                    "value": "늁:\u001f􉹔𧵟􆙯\u001c1)𬄴`\u0005"
                 },
                 {
-                    "value": "W\u001e`%\u0017\u0014y\u0008𠠏$\u001c",
-                    "type": "𣚆=^j\"󿞑\u0016􅋪葓`􆲻󿃱\u0017\u0003q󰾴R^6"
+                    "type": "𣚆=^j\"󿞑\u0016􅋪葓`􆲻󿃱\u0017\u0003q󰾴R^6",
+                    "value": "W\u001e`%\u0017\u0014y\u0008𠠏$\u001c"
                 },
                 {
-                    "value": "\\𐄉'\u000c%n",
-                    "type": "u\u000f~󽘵l𨞯.~@𨞉􄅋𨁛⟙\u0001e\t6\u001b\u001e挒i\tLbX;P~"
+                    "type": "u\u000f~󽘵l𨞯.~@𨞉􄅋𨁛⟙\u0001e\t6\u001b\u001e挒i\tLbX;P~",
+                    "value": "\\𐄉'\u000c%n"
                 },
                 {
-                    "value": "6􀓪?h\u0007􄔼𗺉d􌾿",
-                    "type": "\u0000m\u0016:I􎵻62𡟆pV16\u0003󴆍6䴓k"
+                    "type": "\u0000m\u0016:I􎵻62𡟆pV16\u0003󴆍6䴓k",
+                    "value": "6􀓪?h\u0007􄔼𗺉d􌾿"
                 },
                 {
-                    "value": "\u001b󼥚U\u0019r\u00173m~Ἶ𨍖u[xV<y𪙌𤳛\u0014M󴜠褌빨\u001a􄪮^b檡",
-                    "type": "a\u0010G\u0014\u001eEJ🨅im𢾺qZ\u0016/`>\u0010R󳐊"
+                    "type": "a\u0010G\u0014\u001eEJ🨅im𢾺qZ\u0016/`>\u0010R󳐊",
+                    "value": "\u001b󼥚U\u0019r\u00173m~Ἶ𨍖u[xV<y𪙌𤳛\u0014M󴜠褌빨\u001a􄪮^b檡"
                 },
                 {
-                    "value": "󼴳\u0008`+|+eu嶭(Z𭚣D󻁶󷼙6Y\"U",
-                    "type": "US`W􀝣ꣃ󿶶\u001au𐚨\u000b󳙫𩱅(X&D󻣋𢅯􎋳Y>\u001c󵡤ᩓ"
+                    "type": "US`W􀝣ꣃ󿶶\u001au𐚨\u000b󳙫𩱅(X&D󻣋𢅯􎋳Y>\u001c󵡤ᩓ",
+                    "value": "󼴳\u0008`+|+eu嶭(Z𭚣D󻁶󷼙6Y\"U"
                 },
                 {
-                    "value": "\u0014􋱸\u0012&􅑫\u000b'\u0013aM䏁\u001f𨖰\u0016 \r\u001b\"\u000f뤅\u0003oEhQ\u001b󴶺f\u001b󽙊",
-                    "type": "瀡UVd𣰦e&󾾖!P\u0005𑌰\u0001󿪝8𦢱jZd􄨭󻌽󳛂"
+                    "type": "瀡UVd𣰦e&󾾖!P\u0005𑌰\u0001󿪝8𦢱jZd􄨭󻌽󳛂",
+                    "value": "\u0014􋱸\u0012&􅑫\u000b'\u0013aM䏁\u001f𨖰\u0016 \r\u001b\"\u000f뤅\u0003oEhQ\u001b󴶺f\u001b󽙊"
                 },
                 {
-                    "value": "f@SKbEo>@i𐌚~$\u001b킻􎌋\u0001{`2B󻣦",
-                    "type": "󰋫hk􇚌󽑕Etb?+\u000c,)d4󳻟gM!󱪊☉qJ"
+                    "type": "󰋫hk􇚌󽑕Etb?+\u000c,)d4󳻟gM!󱪊☉qJ",
+                    "value": "f@SKbEo>@i𐌚~$\u001b킻􎌋\u0001{`2B󻣦"
                 },
                 {
-                    "value": "全\u0005\u0008YSzQh\u001fJ𑁖Z\u001e\u0008腕a\u000bv􌼓C癹􈦿rl",
-                    "type": "Me𗞿󳜙購<u\u0017\t~k"
+                    "type": "Me𗞿󳜙購<u\u0017\t~k",
+                    "value": "全\u0005\u0008YSzQh\u001fJ𑁖Z\u001e\u0008腕a\u000bv􌼓C癹􈦿rl"
                 },
                 {
-                    "value": "𧞬􆟅䭮𩵐唺󼈓\u001e(J\u0004>n곇\u0005몔v􁑾C󳿟D.P䭣𐭾󲂳HS@",
-                    "type": "YD\t󺦀N\u0014\u0004􂓺+v􏝁\u0003𗈰J􃪑>"
+                    "type": "YD\t󺦀N\u0014\u0004􂓺+v􏝁\u0003𗈰J􃪑>",
+                    "value": "𧞬􆟅䭮𩵐唺󼈓\u001e(J\u0004>n곇\u0005몔v􁑾C󳿟D.P䭣𐭾󲂳HS@"
                 },
                 {
-                    "value": "\u0016\u0014\u001e󻆙C?",
-                    "type": "D1o"
+                    "type": "D1o",
+                    "value": "\u0016\u0014\u001e󻆙C?"
                 },
                 {
-                    "value": "HV\u0013M\u0006\u0016Z\"󹇔\nFs\u0011-\n;",
-                    "type": "\u0000p􍠄\u0017}8#􍩐i)\u000e7J􋌮E^~􉕅*h>􂼦\r+l2"
+                    "type": "\u0000p􍠄\u0017}8#􍩐i)\u000e7J􋌮E^~􉕅*h>􂼦\r+l2",
+                    "value": "HV\u0013M\u0006\u0016Z\"󹇔\nFs\u0011-\n;"
                 },
                 {
-                    "value": "{<􎟘^96v\u0010A`\u000b",
-                    "type": "T<a_[Ugv\u0019L\u0001\u001fpM\r􏮗jJ\u0015%:*m󻤙\u001f𛅱~nF"
+                    "type": "T<a_[Ugv\u0019L\u0001\u001fpM\r􏮗jJ\u0015%:*m󻤙\u001f𛅱~nF",
+                    "value": "{<􎟘^96v\u0010A`\u000b"
                 },
                 {
-                    "value": "{~\u0004副\u0006",
-                    "type": "z4𦅩P"
+                    "type": "z4𦅩P",
+                    "value": "{~\u0004副\u0006"
                 },
                 {
-                    "value": "#\u001e􌣨F\u001c􀉔\u001475\u001f毵",
-                    "type": "1\u0014\u0005󽅶㿜\u0005\u0008\u001f<g\u001fW"
+                    "type": "1\u0014\u0005󽅶㿜\u0005\u0008\u001f<g\u001fW",
+                    "value": "#\u001e􌣨F\u001c􀉔\u001475\u001f毵"
                 },
                 {
-                    "value": "𫍝(\u0011\\&0-",
-                    "type": "~v󰖮\u0005󳏯\u001b컏骏ibo\u001fbX\\'&𗵱:\u001f󽫪􀑟\u0000T𤂭􉨶^"
+                    "type": "~v󰖮\u0005󳏯\u001b컏骏ibo\u001fbX\\'&𗵱:\u001f󽫪􀑟\u0000T𤂭􉨶^",
+                    "value": "𫍝(\u0011\\&0-"
                 },
                 {
-                    "value": "圭𤽕l&0\u00024󼮒r-E\u0006󷈽",
-                    "type": "\u0005[\u001cb󸾾䛵\u0013웶<􆍼\u0005f*[\u0005f𠗷􁗕w𫬰N\u0008h ⊖"
+                    "type": "\u0005[\u001cb󸾾䛵\u0013웶<􆍼\u0005f*[\u0005f𠗷􁗕w𫬰N\u0008h ⊖",
+                    "value": "圭𤽕l&0\u00024󼮒r-E\u0006󷈽"
                 },
                 {
-                    "value": "𡖒󿄘_\u0011m\u0018󵃏\u001b}󰬡|쨭\u001bv􈅪4\u00134􅓽%",
-                    "type": "𧃸SyC𪺠JR􄴆\u0012𭶀\u000c𭇼N􄉉"
+                    "type": "𧃸SyC𪺠JR􄴆\u0012𭶀\u000c𭇼N􄉉",
+                    "value": "𡖒󿄘_\u0011m\u0018󵃏\u001b}󰬡|쨭\u001bv􈅪4\u00134􅓽%"
                 },
                 {
-                    "value": "8SOe",
-                    "type": "."
+                    "type": ".",
+                    "value": "8SOe"
                 },
                 {
-                    "value": "𧙢\u0005",
-                    "type": "󸩽i􄹺𪱪\u0010q\\O􈫯\u000f𢏽\u0012臊􉑞p\t"
+                    "type": "󸩽i􄹺𪱪\u0010q\\O􈫯\u000f𢏽\u0012臊􉑞p\t",
+                    "value": "𧙢\u0005"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\u001c\u001cPXw致&\u0015歳Kr얌7": "(e=z\"𫨃pLmg󺹛}2j𨕧OA󴕝_q\u0011󶓠",
-        "4 X": "\u0017W󵥏m󷅭\u001cXA𭑫N`󻍂B󵎿",
-        "\r\u0004-󺴐𠙅g좾𫍰(d|󹇙[\u0014": "",
-        "tڵ󷾎U𮖇/o$\u000cc": "\u00071㊎􁋔H]#󰻜𡇥\u0002*LYqs[",
-        "Fl𩣣\u000f*uBgcwKo\u0008\u0015𬼒\u0001𭱔\r%𮂅4~'\u0000ilE󹩀": "\u0003\u0006\u001e*􀷕󴷥8󾁍_\u001d􅊒ឲH􋡒Jmw\u001a,A",
-        "\u0011f澆􇙪qj𬲘\t􁛫C\u0012V忇ZnY": "\u0014|􄩡g\"]#S𗐏\u0012\u0016/[\u000fH츚𝘡󺆳K+𫃴S𡱡N􄿻",
-        "k7􏫠e)[*󺕫𩚻\u0018": "\u0003\u000cZS\u0000\u0018 報^",
-        ")\u0004dQ󰤰􃦞􀌼􊍣6_𨶚.|𫆋_": "I",
-        "𦓔㈨'5q<𫡈": "@􎉤M쑝m\\𮐺a1B༮[S#=,.|S0\u0000j\r%",
-        "P.\u0006墭=輟A𩏤|c": "Q󰌰𨛟h􉪙}~\u0007?:Xq2q3Ց",
-        "XN\u001e\u0006<(4𗯔k1ON󳿩𭥥]\u0002𡗛𦙐d\u001aᾞ": "n󳪵𞺳0y{𭼓zH\n\u0011Cs\u0005",
-        "\u0019)𢭛R􌸑@_z,l": "'\u000cS?\u0010k'􈪪a />|Fk\u000e􇜣x󰈵󼁹K􎕍猫kp闇",
-        "𗢲e": "Oࡁp",
-        "\u0014𤉶<8g\u0006": "\u0007󻝎􆞦𮮏P'[􇝓'\u0016>\\󷠘\u0004",
-        "󹾣\u0007S!𥫶0:": "(]􀺚sJ\u0011󽕞􂦌C𮞒9\u000e􎛑\\\u0004Wu󻏦J᪓􇰴x\u000c.",
-        "􌷷䱅\u001b_􈚼5\u001c": "􏸻\t%b𬆘\u001c≙B#\u001e𮛗󻊆\u0005",
-        "\"{^\u0017\u0012\u0018>𪢛\u0000섩w\u0013e4\u0002\u000f\\`\nJ\u0005[m㢕vd": "\u001fW[˸A+h}󶽺zQ쨗🔧\u0003"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_10.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_10.json
index 9bf897bca87..910b5be343f 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_10.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_10.json
@@ -1,46 +1,46 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\rw쵨f\u0010𗼙􉹸󾏓{4𡦝*𣮰𝦪H\u001f󲻷%\u0004H󲂏": "\u0011󹉓\u0002",
+        "\u0017D􆃅\u001a!𠂭􁽥󷒬z": "\"e曲q\t󾲶C𫲄욊qd$H\u0006n\u001a&s%5",
+        "\u0018􋢝+󱐮5䎐h\n󻴏@➙\u0001X\u001dH돖E": "0\u0000,@𝥕𑃞\u000fD}\u000c!MLXPZ5H􊈸Aa-𮧿L𥜿",
+        "&󴹭G$Dh􏄄;b\u0002-~𦲋W𪤯􌳇𡪌I\u0010i4􁳰": "A 𦽗<",
+        "Kt䑑\u0001oT󲟮x2)<r󸈾j$K(;􃝁fWW5A\"\u0005𫸨": "\u00155\u0002󱷠0#q􇼪𢙫h􉋊#",
+        "M)𨳜piIg뿛<􂞖!󹦄\u0010􂷸kV_m5‣6": "e8{S\u0003/𖣛󰫴\u001a'Q_𭦽>􇀊K\u0010𐔆r𩵔􃒔",
+        "Rsᐤs뽿A1𬽶}\u001e㺯rNA$󺝿\u000f": "0\u0004d98X\u00047",
+        "`;\u000f]籠󺈚!67:O_\u0002": "\u000bl惯\r\u001b󱪱6](􄣘Ps\u0005\u001dy𤏵\u000e􊁁\u0007дf\u0010巟w\\",
+        "l\u000c\u0008U\u001b\u0016+:󷬹\"􇭗%$lP𑂲\"\u0003츾\u0019\u000fz]": "d#\\\u0003v,􇙆􄲉D󱩮{\\🕓2sQO-J􊰽:󺁆:<􅌍\u001c\u0016>^",
+        "#N?􉠡䯩\u0003\u0003Z󿉃WPs\u001d(A": "|L2\u0014Iuf,?\u0007\u0014쩗S'\u0002󺋦bໃ",
+        "𠆶Vb𫵟y>\u0004􌯙\u0002􌒰nQY􋁲󳲛,XY􄢕󵪭": ""
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "'/𡙮󼉤LL\u001fv𝩠_W𒂊⾒e",
-                    "type": "𧬂𗻹\u001d7\u0018'\u000b]U\u0004{rs0'"
+                    "type": "𧬂𗻹\u001d7\u0018'\u000b]U\u0004{rs0'",
+                    "value": "'/𡙮󼉤LL\u001fv𝩠_W𒂊⾒e"
                 },
                 {
-                    "value": "H􍹭\u0010;󿀚`|;G\u00182LD💩l*",
-                    "type": "𘘔\n\u001dr\u001b,>{􍘫l#9*\u0007u\u0019􆡣\u0015"
+                    "type": "𘘔\n\u001dr\u001b,>{􍘫l#9*\u0007u\u0019􆡣\u0015",
+                    "value": "H􍹭\u0010;󿀚`|;G\u00182LD💩l*"
                 },
                 {
-                    "value": "J\u0019\u000b􀧓\u0018?\u000b\u0016H5Rcb𤦛",
-                    "type": ">\u001b󽃍􇩅􊝤􁫩l\u0017"
+                    "type": ">\u001b󽃍􇩅􊝤􁫩l\u0017",
+                    "value": "J\u0019\u000b􀧓\u0018?\u000b\u0016H5Rcb𤦛"
                 },
                 {
-                    "value": "􁋭`oi",
-                    "type": "K􈇀􄻴w/𮪶d \u0019s酭\u0001w󷤵􃢣5Z讼m􂜸LQ}:r\u001d"
+                    "type": "K􈇀􄻴w/𮪶d \u0019s酭\u0001w󷤵􃢣5Z讼m􂜸LQ}:r\u001d",
+                    "value": "􁋭`oi"
                 },
                 {
-                    "value": "웑<Cs*6𫧠\u00012",
-                    "type": "\u0008N/󵦵:3􉟦%[􃋫BȄ{\no𐧕\u0019`%D(\"\u0019𩆣􃨢􄋬"
+                    "type": "\u0008N/󵦵:3􉟦%[􃋫BȄ{\no𐧕\u0019`%D(\"\u0019𩆣􃨢􄋬",
+                    "value": "웑<Cs*6𫧠\u00012"
                 },
                 {
-                    "value": "qa)\u0002l/󳝚\u0016\u0010𡝤+\u0002ztSih\u001e5e",
-                    "type": "\u0008%\u0017󰂆e\u0013^\u0013B𦒦"
+                    "type": "\u0008%\u0017󰂆e\u0013^\u0013B𦒦",
+                    "value": "qa)\u0002l/󳝚\u0016\u0010𡝤+\u0002ztSih\u001e5e"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "𠆶Vb𫵟y>\u0004􌯙\u0002􌒰nQY􋁲󳲛,XY􄢕󵪭": "",
-        "M)𨳜piIg뿛<􂞖!󹦄\u0010􂷸kV_m5‣6": "e8{S\u0003/𖣛󰫴\u001a'Q_𭦽>􇀊K\u0010𐔆r𩵔􃒔",
-        "#N?􉠡䯩\u0003\u0003Z󿉃WPs\u001d(A": "|L2\u0014Iuf,?\u0007\u0014쩗S'\u0002󺋦bໃ",
-        "\rw쵨f\u0010𗼙􉹸󾏓{4𡦝*𣮰𝦪H\u001f󲻷%\u0004H󲂏": "\u0011󹉓\u0002",
-        "\u0018􋢝+󱐮5䎐h\n󻴏@➙\u0001X\u001dH돖E": "0\u0000,@𝥕𑃞\u000fD}\u000c!MLXPZ5H􊈸Aa-𮧿L𥜿",
-        "&󴹭G$Dh􏄄;b\u0002-~𦲋W𪤯􌳇𡪌I\u0010i4􁳰": "A 𦽗<",
-        "`;\u000f]籠󺈚!67:O_\u0002": "\u000bl惯\r\u001b󱪱6](􄣘Ps\u0005\u001dy𤏵\u000e􊁁\u0007дf\u0010巟w\\",
-        "Kt䑑\u0001oT󲟮x2)<r󸈾j$K(;􃝁fWW5A\"\u0005𫸨": "\u00155\u0002󱷠0#q􇼪𢙫h􉋊#",
-        "l\u000c\u0008U\u001b\u0016+:󷬹\"􇭗%$lP𑂲\"\u0003츾\u0019\u000fz]": "d#\\\u0003v,􇙆􄲉D󱩮{\\🕓2sQO-J􊰽:󺁆:<􅌍\u001c\u0016>^",
-        "Rsᐤs뽿A1𬽶}\u001e㺯rNA$󺝿\u000f": "0\u0004d98X\u00047",
-        "\u0017D􆃅\u001a!𠂭􁽥󷒬z": "\"e曲q\t󾲶C𫲄욊qd$H\u0006n\u001a&s%5"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_11.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_11.json
index 5d68d4ca27d..7d4c5f26c0a 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_11.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_11.json
@@ -1,106 +1,106 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "o!🚓AZn\u001c\u0007\"",
+        "\u0005󰛥y": "\u0004",
+        "\u0010\u000bw!FZa#j≈o𤦹􆧂\rL􋷃rQ\u00163\u000bᘽ𠗳1": "Qz)􂒞\u0000AAWZ\u0002H\u0003􋘴O-%󵷿\\",
+        " \u0012\u0013\n􈯅󰛞V쐡Sr.lH🥣\u0013D􌺨􄕗󴓻\no𤗽'yc3󳩴󹚫\u0017": "􃜂\u0004\u0010~\u000fCx\u0016k\u0013Q󾹲􃡅\rZr魦tX[",
+        "(#\u00120쯍R\r\u0010\u0011VJk\u0011\u000c:zTi": "\u0005󳛝/ﾽQ𛀇ﾾGp𗳣=~A\u0016󳇇w\u0012\u0008",
+        "7l𥹡!q": "!Wa9o𓂵^",
+        "7yF\u0011\u0000Oye𨥋\u0001\u0001": "G\u0002\u000b.\u0004;𣱇\u00025Q",
+        "8Z$\u0016뾮O𢚹󵯌dDV\u0007": "춴薈y\u000c=",
+        ":\u000fE\u001b\u0006\u0012t": "}\n\u0019󷡋",
+        ":#_𢿆x\u0015􊨨y쭴$N\u000e_\nO\r{]𖼦ꊧ􃏪_": "\u001a~溮t)\u000em󵁲𞴰1\u0017􊶨􃨔",
+        "GJ\u0007h\u001cjd\u00118<ip\u0016뢇\u0000Q.\u0012㉅󺖓􄡈!.7P\u000bMe": "􇓑\u0011i\u0000&􃊸\u001bf^",
+        "I\u001dt􃶓󽫓gA􉈵􁚩𗠥⧥\u001fv􃱌\t)I\u0013\u0007u𥐰󴻩_4\u000e5倅僗\\󵄲": "F9􆕧\u0004\u001c.𑊕58󶜄\u0017𧅗\u0012\u0004-\u0011]7O\u001b22\nl饆",
+        "K]'Q%$\"\u001eZ2Ơ\"": "𘍅pp鳓Iꏊ+>",
+        "O\u0017'Vj':\u001b'\u000e\u0015ᣮ\u000e\u0018\nQ􎜡\u0002\u0019읬;Jx": "}\u0004!\u001e\u0017Myk􆛼𣫃`",
+        "VR:v;ZqL𬺂l\u001fn󲔃􃅢𧘝𐒝M𠘘": "\u001dhu崙l􎥤𠉨?1Ꝫ>\u0012D󽝤􊦆",
+        "`%􋐶d": "l|\u001b+l\u0016𣮛”􊗒\u0000\u001a\"$􎰼󳿽<\u0016Q7𥑭FHᕄ\"*",
+        "`k4^{\u0012再X􎡑N}%lI9P\u0001z)\u0011\u0012쀥$": "𡕙~",
+        "si𦱢\\Z96?\u0007F}\u0008𔗴\r=C郳꽡\u000bx_": "a\u001d𬖽",
+        "}\u0014􁎒I\u000eY󻱭": "ld\u000fx&󶆌ꗕ󰹖Mg(􄐼\u0007a",
+        "栊{쀼<xZ\u001e𨼇V#3^畹%S8􌶗;": "?GnhDhP0\u0008",
+        "鞅A󵎛\u000f(\u0015\r{𫝇􂂇": "a􃟡\u0015_𮃗0ya逖*\u0003`\u0005󹗊􃄁?𨟣s𫷀<􆇸\u001b>\u000b",
+        "𡗌 󺅔fN?`􏒑M8+\u0012Ai@\u0006h\u000c": "0\u0014vᗅ\u000cU󱼁WV󱾩c𗶢=\u000e\u0019%𤝵",
+        "􅞀_\u0018⓼\"9\u001a藤@\u0013|.\u000302!{8*7\u0019𦱬q~t𥃠": "@^Zb󺻘^K힎T0T~@x"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "􍑑겱􏮊𪸒IhWi󷍦\u0010𮥵Y\u0005/\u00072w󱝖",
-                    "type": "\u0017󻌹\u0018"
+                    "type": "\u0017󻌹\u0018",
+                    "value": "􍑑겱􏮊𪸒IhWi󷍦\u0010𮥵Y\u0005/\u00072w󱝖"
                 },
                 {
-                    "value": "\u0000`r\u0010Y􍋻󼣓4𨦖@􈷹1zCYPqi󵩌\u000fp󳅎󾬾\u0001􏪯~",
-                    "type": "𪾀􌰣H\u00162V󽮑&𖤼*\t_M%𮮥\u0018;􆏌S\u00164\u0002^\u001fk􉱛,!98"
+                    "type": "𪾀􌰣H\u00162V󽮑&𖤼*\t_M%𮮥\u0018;􆏌S\u00164\u0002^\u001fk􉱛,!98",
+                    "value": "\u0000`r\u0010Y􍋻󼣓4𨦖@􈷹1zCYPqi󵩌\u000fp󳅎󾬾\u0001􏪯~"
                 },
                 {
-                    "value": "H󸖬g8\u0013<cl⿍𪶟\u0007󽯉𦐖\u0002􎯞Q_\u0015HX[V紲9q\u001d.",
-                    "type": "iJ>󺿄f𪵇\u001a녘\u0017\u0019G󲥑􁸝\"\u0005"
+                    "type": "iJ>󺿄f𪵇\u001a녘\u0017\u0019G󲥑􁸝\"\u0005",
+                    "value": "H󸖬g8\u0013<cl⿍𪶟\u0007󽯉𦐖\u0002􎯞Q_\u0015HX[V紲9q\u001d."
                 },
                 {
-                    "value": "X𣼚e&3t",
-                    "type": "~𫢎pM1@2s⥓k^;􏼲-"
+                    "type": "~𫢎pM1@2s⥓k^;􏼲-",
+                    "value": "X𣼚e&3t"
                 },
                 {
-                    "value": "\u001d<l\u0006:i>􆂙𗎣<􌴚\u0014㞏簋do:\nZ@*@K󶆕󿬡a/\u0008𮧒",
-                    "type": ">\u000c8p𐘲𤪓󶀔rj𩪐LA\u0018q󳕉EG􊘶\u001fgF􉒍<X􍅊𤸎𪿒\u0008󼕞𗚟"
+                    "type": ">\u000c8p𐘲𤪓󶀔rj𩪐LA\u0018q󳕉EG􊘶\u001fgF􉒍<X􍅊𤸎𪿒\u0008󼕞𗚟",
+                    "value": "\u001d<l\u0006:i>􆂙𗎣<􌴚\u0014㞏簋do:\nZ@*@K󶆕󿬡a/\u0008𮧒"
                 },
                 {
-                    "value": "gR\u0006[Il*𢪔,\u00137sb\u0017󿋯zSo6\t㔠𔒊z$\u001d\u0014ꙮ%\u0005",
-                    "type": "zu㧇X\u0019󺮷m𨢷\"o\\G𨖿aJ\u001a"
+                    "type": "zu㧇X\u0019󺮷m𨢷\"o\\G𨖿aJ\u001a",
+                    "value": "gR\u0006[Il*𢪔,\u00137sb\u0017󿋯zSo6\t㔠𔒊z$\u001d\u0014ꙮ%\u0005"
                 },
                 {
-                    "value": "󹗀Yq<&8\u0016b𝙕\u001fOi\u00011/8󸖬⣩\u001a\u0011:\u00003",
-                    "type": "\u0019\u0016"
+                    "type": "\u0019\u0016",
+                    "value": "󹗀Yq<&8\u0016b𝙕\u001fOi\u00011/8󸖬⣩\u001a\u0011:\u00003"
                 },
                 {
-                    "value": "\u0008𢔶&􂗧ww栾m䁢r㘤]󽩙M\u0018󻅐\u0001\u00073Z=􎍈𮩢B!\u001a􊷵f햲",
-                    "type": "𤄀-K4[6^/𬖂tLt\u0016🢢󸾲𪽕伻󾗝'閌3􉅪󼱘"
+                    "type": "𤄀-K4[6^/𬖂tLt\u0016🢢󸾲𪽕伻󾗝'閌3􉅪󼱘",
+                    "value": "\u0008𢔶&􂗧ww栾m䁢r㘤]󽩙M\u0018󻅐\u0001\u00073Z=􎍈𮩢B!\u001a􊷵f햲"
                 },
                 {
-                    "value": "&42鱶\u0007SXkꙸ$GT󿣻6󼝐􄣄\rY=߁\u001d𪤥",
-                    "type": "\u0006𣊸,R\u0008\u0002("
+                    "type": "\u0006𣊸,R\u0008\u0002(",
+                    "value": "&42鱶\u0007SXkꙸ$GT󿣻6󼝐􄣄\rY=߁\u001d𪤥"
                 },
                 {
-                    "value": "2. n\u0014bHjg𔕝b",
-                    "type": "E&(#ZwW\u0001􂈳80\r&.N]H􏀑/$\"\u001f齗9\n\u001cAd"
+                    "type": "E&(#ZwW\u0001􂈳80\r&.N]H􏀑/$\"\u001f齗9\n\u001cAd",
+                    "value": "2. n\u0014bHjg𔕝b"
                 },
                 {
-                    "value": "T􆛭R6􂬯K\u0002`\u00048KCK𪈨􄠗",
-                    "type": "sbSx1􃛦>92|􅙯\u000b|)\u0004\u0010M\u00082k_"
+                    "type": "sbSx1􃛦>92|􅙯\u000b|)\u0004\u0010M\u00082k_",
+                    "value": "T􆛭R6􂬯K\u0002`\u00048KCK𪈨􄠗"
                 },
                 {
-                    "value": "W#qᯟ􎁜净",
-                    "type": "\u0019Xr_svft\\i𘃈󵟰𮍺𡅟|l@c#q쮩p\\"
+                    "type": "\u0019Xr_svft\\i𘃈󵟰𮍺𡅟|l@c#q쮩p\\",
+                    "value": "W#qᯟ􎁜净"
                 },
                 {
-                    "value": "#쌔\\:zs\u00015K󿃶C\u0001=\"𣪻󿒅\u000f􅀜寅",
-                    "type": "\u0005sI~jB􅥁z󱫣\u0002\u000e󽷧\u0017q4M4􏾳\u0007]8\u0004Z􌘓j"
+                    "type": "\u0005sI~jB􅥁z󱫣\u0002\u000e󽷧\u0017q4M4􏾳\u0007]8\u0004Z􌘓j",
+                    "value": "#쌔\\:zs\u00015K󿃶C\u0001=\"𣪻󿒅\u000f􅀜寅"
                 },
                 {
-                    "value": "爵᧖",
-                    "type": "=殟Y𠶓\u00142(=;\u0011V袽 𤴍󸳆𬎎Zp\r󷙂􁷹4F􄹖\u0014"
+                    "type": "=殟Y𠶓\u00142(=;\u0011V袽 𤴍󸳆𬎎Zp\r󷙂􁷹4F􄹖\u0014",
+                    "value": "爵᧖"
                 },
                 {
-                    "value": "|Wa_K􊝼𪋆",
-                    "type": "?f|𦈔psj󵥑]y>􏛹󽘰-ᥦ"
+                    "type": "?f|𦈔psj󵥑]y>􏛹󽘰-ᥦ",
+                    "value": "|Wa_K􊝼𪋆"
                 },
                 {
-                    "value": "\u0010\u0016+he\u001cx󳭴\"\u001d\u0012P5<\u001e匋䛗+",
-                    "type": "\u0008􎡢7b𐌵Z(m7\u001e眺p]E^-m\u0004.\u001fq);𤜦y𡫝(\u001f"
+                    "type": "\u0008􎡢7b𐌵Z(m7\u001e眺p]E^-m\u0004.\u001fq);𤜦y𡫝(\u001f",
+                    "value": "\u0010\u0016+he\u001cx󳭴\"\u001d\u0012P5<\u001e匋䛗+"
                 },
                 {
-                    "value": "JU󴌴O\u0017\u0018𭋭𠣊^G]5󳏓",
-                    "type": "|\tKli\\𘇹𢺯金d\n!𥗞HO􋰃5\u001du\u0014+􉸁I\u001d|\u0005\u001f"
+                    "type": "|\tKli\\𘇹𢺯金d\n!𥗞HO􋰃5\u001du\u0014+􉸁I\u001d|\u0005\u001f",
+                    "value": "JU󴌴O\u0017\u0018𭋭𠣊^G]5󳏓"
                 },
                 {
-                    "value": "䞸Q>(>F,\u00065",
-                    "type": "x_H3J􆓶\u0019g􌦃"
+                    "type": "x_H3J􆓶\u0019g􌦃",
+                    "value": "䞸Q>(>F,\u00065"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "7yF\u0011\u0000Oye𨥋\u0001\u0001": "G\u0002\u000b.\u0004;𣱇\u00025Q",
-        "(#\u00120쯍R\r\u0010\u0011VJk\u0011\u000c:zTi": "\u0005󳛝/ﾽQ𛀇ﾾGp𗳣=~A\u0016󳇇w\u0012\u0008",
-        ":#_𢿆x\u0015􊨨y쭴$N\u000e_\nO\r{]𖼦ꊧ􃏪_": "\u001a~溮t)\u000em󵁲𞴰1\u0017􊶨􃨔",
-        "\u0010\u000bw!FZa#j≈o𤦹􆧂\rL􋷃rQ\u00163\u000bᘽ𠗳1": "Qz)􂒞\u0000AAWZ\u0002H\u0003􋘴O-%󵷿\\",
-        "I\u001dt􃶓󽫓gA􉈵􁚩𗠥⧥\u001fv􃱌\t)I\u0013\u0007u𥐰󴻩_4\u000e5倅僗\\󵄲": "F9􆕧\u0004\u001c.𑊕58󶜄\u0017𧅗\u0012\u0004-\u0011]7O\u001b22\nl饆",
-        "O\u0017'Vj':\u001b'\u000e\u0015ᣮ\u000e\u0018\nQ􎜡\u0002\u0019읬;Jx": "}\u0004!\u001e\u0017Myk􆛼𣫃`",
-        " \u0012\u0013\n􈯅󰛞V쐡Sr.lH🥣\u0013D􌺨􄕗󴓻\no𤗽'yc3󳩴󹚫\u0017": "􃜂\u0004\u0010~\u000fCx\u0016k\u0013Q󾹲􃡅\rZr魦tX[",
-        "": "o!🚓AZn\u001c\u0007\"",
-        ":\u000fE\u001b\u0006\u0012t": "}\n\u0019󷡋",
-        "GJ\u0007h\u001cjd\u00118<ip\u0016뢇\u0000Q.\u0012㉅󺖓􄡈!.7P\u000bMe": "􇓑\u0011i\u0000&􃊸\u001bf^",
-        "栊{쀼<xZ\u001e𨼇V#3^畹%S8􌶗;": "?GnhDhP0\u0008",
-        "`%􋐶d": "l|\u001b+l\u0016𣮛”􊗒\u0000\u001a\"$􎰼󳿽<\u0016Q7𥑭FHᕄ\"*",
-        "鞅A󵎛\u000f(\u0015\r{𫝇􂂇": "a􃟡\u0015_𮃗0ya逖*\u0003`\u0005󹗊􃄁?𨟣s𫷀<􆇸\u001b>\u000b",
-        "􅞀_\u0018⓼\"9\u001a藤@\u0013|.\u000302!{8*7\u0019𦱬q~t𥃠": "@^Zb󺻘^K힎T0T~@x",
-        "K]'Q%$\"\u001eZ2Ơ\"": "𘍅pp鳓Iꏊ+>",
-        "}\u0014􁎒I\u000eY󻱭": "ld\u000fx&󶆌ꗕ󰹖Mg(􄐼\u0007a",
-        "8Z$\u0016뾮O𢚹󵯌dDV\u0007": "춴薈y\u000c=",
-        "𡗌 󺅔fN?`􏒑M8+\u0012Ai@\u0006h\u000c": "0\u0014vᗅ\u000cU󱼁WV󱾩c𗶢=\u000e\u0019%𤝵",
-        "`k4^{\u0012再X􎡑N}%lI9P\u0001z)\u0011\u0012쀥$": "𡕙~",
-        "\u0005󰛥y": "\u0004",
-        "7l𥹡!q": "!Wa9o𓂵^",
-        "si𦱢\\Z96?\u0007F}\u0008𔗴\r=C郳꽡\u000bx_": "a\u001d𬖽",
-        "VR:v;ZqL𬺂l\u001fn󲔃􃅢𧘝𐒝M𠘘": "\u001dhu崙l􎥤𠉨?1Ꝫ>\u0012D󽝤􊦆"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_12.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_12.json
index 6adff4ccf6b..dd2569daa7a 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_12.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_12.json
@@ -1,55 +1,55 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "􈧭;)XGD\u0004/Qr$Yg\u0001A+d_\u000f+\u001aI,%{\u0003<'㰋;",
+        "\r\u0001U\u0005\u0004󿅳\u0017\u001f~\u0016C𤃇!8\u000b戸󱧻\u001cN@铝S8{:ﴸe": "U;rKHG+9",
+        "\u0019\u0007`<*?\u001d#􊥻/5\u0013춓V\u0000\nBi\u001f\u001f햟\u000b𫯓HPᛁ󽭀זּ\u00010": "f7]\u0012\u0015V\u000eHTꥻ$P",
+        "\u001e𥫼DC\u001cD𥤙I)6ik": "፮PA멕r\u0003􈢕2U\t q𩣜(|ᇅfS\u0013A",
+        "7V\u0017Z)󳐍": "_H\u0015cꁖG2W9뽌+*",
+        "9*󵁮}~\u0019􌒀,^+Nrw'\u0004e\u001c`𓀊": "󴽭𬵥J𮏏􏜻󵗥𢋇_𧻉pGuO7<󲌢I\u001c",
+        "I\u000c\u001f\t𝝀k]􅆋Ml*􈥭󱛽\u0007,lt}": "^[󸁆\u0000[g~U\u0008y\u001aX\u001dW\u0007􃆍\\_\u0017pK𝂽",
+        "qv'Ip\u0008 𡴺}𤥊mU𭀤": "O󶵺D1𩬏h\u0010\u0001㾥溫\u0008=!\u0005\u0001𫧅!Fꚷ",
+        "vy\u0003\u0015\"𮭎%g𬁬􍗎􎡢i7": "H*o㶇y3!r'w㕥%Y0\u000bUO믽g",
+        "淋/\u000b/\u000e]𬯐,\"𨓼􉚞.y緇g\t𨽣I\u0004_9􈓫\u000b󿁛/": "㋹㸕↓>d6􇅌;\u0013n\u0003",
+        "𩜄 󳬞nCx-t\u001e;": "T󱗱F\u0010󶜭'7rﻙ!HF㌈󱽉\u001b\tt𡜂𨪡$\u001d􁪷\u0016󵣼\u001b,󵶉󼇍",
+        "󳲮)r\u0010r": "\u00034M\u001f>\u0000`y4\u0012\u0004/MJ5𮓪T\u001d",
+        "󼘯𫾵x1(~W\u0014娌\u001b]m\u001d\u0013\u0015A\u0005Rm\u000e\u0005\u000fC\u000c𪩾:]\u0010\u000e": "􉓭󲨧(.Vi]􇓷VQ󾆑fi\u001ah@.\u001e\u00037ij\"U𬫟L󰄪",
+        "󽟹": "N\u0001D+ꯖY􏬰QY1M7𢬧\u0003𤅱W𣓄<p",
+        "􌮪3聣Ka􏽮􊉗;&#_G𨺋9\\r\u000f𩽻\u0004\u001a1Wi^𧍼\u001f\u0014蓇.(": "",
+        "􌼽󼘥鸗2󱂧􀅍\u0004𠁵􎀸\u001d^􃼶KZ=/𪑋\n#V\u001bj堺": "\u00061"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "QT\u001fT󽯵\u001f\u0018/]6\u000fV",
-                    "type": "􈩮\n[E"
+                    "type": "􈩮\n[E",
+                    "value": "QT\u001fT󽯵\u001f\u0018/]6\u000fV"
                 },
                 {
-                    "value": "󷭭\n\u000e󷄧Lj+c\u0006鴒L󳑮\u0008찉{\t.􁖇\t芌ം􅹼𩕏󽀀􌭡E\u000c\u001at",
-                    "type": "S􇧾𐬲\u001b\u0002􏒜o\u0000tGT\u0012<xh𨟟􋗥1\u0015能󹯩!G\u001c"
+                    "type": "S􇧾𐬲\u001b\u0002􏒜o\u0000tGT\u0012<xh𨟟􋗥1\u0015能󹯩!G\u001c",
+                    "value": "󷭭\n\u000e󷄧Lj+c\u0006鴒L󳑮\u0008찉{\t.􁖇\t芌ം􅹼𩕏󽀀􌭡E\u000c\u001at"
                 },
                 {
-                    "value": "E⑨𤠳4OG􃲐=No4ꡤ",
-                    "type": "^0􌰘Qg𤂋)ᝇ<P􉴂G\u001bL:k\u0003􆷵[aOk6g=\u000f𩠙\u00023"
+                    "type": "^0􌰘Qg𤂋)ᝇ<P􉴂G\u001bL:k\u0003􆷵[aOk6g=\u000f𩠙\u00023",
+                    "value": "E⑨𤠳4OG􃲐=No4ꡤ"
                 },
                 {
-                    "value": "|e𓊁𤜝\u0001\u0008󷌬󴪦ZHN𮯍\u0011U\u001c/\u0011Yu\u000c",
-                    "type": "\u0018NiO\u0002󾀹A?)"
+                    "type": "\u0018NiO\u0002󾀹A?)",
+                    "value": "|e𓊁𤜝\u0001\u0008󷌬󴪦ZHN𮯍\u0011U\u001c/\u0011Yu\u000c"
                 },
                 {
-                    "value": "\u0002􃫇1sS|Nl󾏲\u001d",
-                    "type": "o쪗n\u0015+;􈾾v\\\u001f{𓇺j􍄣 \u001c\u0018􃊎<2?\u0019Wrz\u0016hE"
+                    "type": "o쪗n\u0015+;􈾾v\\\u001f{𓇺j􍄣 \u001c\u0018􃊎<2?\u0019Wrz\u0016hE",
+                    "value": "\u0002􃫇1sS|Nl󾏲\u001d"
                 },
                 {
-                    "value": "W\u001d\\\u001dBPI\u0005?a\u0016Q􍬛",
-                    "type": "\rN\u0012-C􎿅H]s੩?\u0004[# "
+                    "type": "\rN\u0012-C􎿅H]s੩?\u0004[# ",
+                    "value": "W\u001d\\\u001dBPI\u0005?a\u0016Q􍬛"
                 },
                 {
-                    "value": " [\u0010\u0010\u0013g󾴦j h\u000b'󱴙\u0003\rm \u000b􂯗􏢮󺶜\u0013K]\u0019@ꮱ𐎁P",
-                    "type": "/\r_q󰂍𡊛8a𖡇\u001c\"-"
+                    "type": "/\r_q󰂍𡊛8a𖡇\u001c\"-",
+                    "value": " [\u0010\u0010\u0013g󾴦j h\u000b'󱴙\u0003\rm \u000b􂯗􏢮󺶜\u0013K]\u0019@ꮱ𐎁P"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\u0019\u0007`<*?\u001d#􊥻/5\u0013춓V\u0000\nBi\u001f\u001f햟\u000b𫯓HPᛁ󽭀זּ\u00010": "f7]\u0012\u0015V\u000eHTꥻ$P",
-        "󽟹": "N\u0001D+ꯖY􏬰QY1M7𢬧\u0003𤅱W𣓄<p",
-        "": "􈧭;)XGD\u0004/Qr$Yg\u0001A+d_\u000f+\u001aI,%{\u0003<'㰋;",
-        "I\u000c\u001f\t𝝀k]􅆋Ml*􈥭󱛽\u0007,lt}": "^[󸁆\u0000[g~U\u0008y\u001aX\u001dW\u0007􃆍\\_\u0017pK𝂽",
-        "􌮪3聣Ka􏽮􊉗;&#_G𨺋9\\r\u000f𩽻\u0004\u001a1Wi^𧍼\u001f\u0014蓇.(": "",
-        "󳲮)r\u0010r": "\u00034M\u001f>\u0000`y4\u0012\u0004/MJ5𮓪T\u001d",
-        "vy\u0003\u0015\"𮭎%g𬁬􍗎􎡢i7": "H*o㶇y3!r'w㕥%Y0\u000bUO믽g",
-        "𩜄 󳬞nCx-t\u001e;": "T󱗱F\u0010󶜭'7rﻙ!HF㌈󱽉\u001b\tt𡜂𨪡$\u001d􁪷\u0016󵣼\u001b,󵶉󼇍",
-        "\r\u0001U\u0005\u0004󿅳\u0017\u001f~\u0016C𤃇!8\u000b戸󱧻\u001cN@铝S8{:ﴸe": "U;rKHG+9",
-        "淋/\u000b/\u000e]𬯐,\"𨓼􉚞.y緇g\t𨽣I\u0004_9􈓫\u000b󿁛/": "㋹㸕↓>d6􇅌;\u0013n\u0003",
-        "9*󵁮}~\u0019􌒀,^+Nrw'\u0004e\u001c`𓀊": "󴽭𬵥J𮏏􏜻󵗥𢋇_𧻉pGuO7<󲌢I\u001c",
-        "7V\u0017Z)󳐍": "_H\u0015cꁖG2W9뽌+*",
-        "󼘯𫾵x1(~W\u0014娌\u001b]m\u001d\u0013\u0015A\u0005Rm\u000e\u0005\u000fC\u000c𪩾:]\u0010\u000e": "􉓭󲨧(.Vi]􇓷VQ󾆑fi\u001ah@.\u001e\u00037ij\"U𬫟L󰄪",
-        "􌼽󼘥鸗2󱂧􀅍\u0004𠁵􎀸\u001d^􃼶KZ=/𪑋\n#V\u001bj堺": "\u00061",
-        "qv'Ip\u0008 𡴺}𤥊mU𭀤": "O󶵺D1𩬏h\u0010\u0001㾥溫\u0008=!\u0005\u0001𫧅!Fꚷ",
-        "\u001e𥫼DC\u001cD𥤙I)6ik": "፮PA멕r\u0003􈢕2U\t q𩣜(|ᇅfS\u0013A"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_13.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_13.json
index e8fecdefec1..83d52e9ef57 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_13.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_13.json
@@ -1,105 +1,105 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "}X󴾨W<􄒌+1\u0010𘞖􄰙\u001a\rqC𢲰>p|𩩥",
+        "\u0004s촻􇆾 \"u><M\u00176jq\nk>\u0004󲯟2a\u0006+󵖬c\u001b": "􈴭\u001a",
+        ")j𓃴9$\u0001XxjZ𧥌70󲈊\u0004*@..󳽽": "\t\u000c􌱺j\u0004\u001d󿲭re\u001c\t o\u001bEx\u001a<xt",
+        ",-[Q.Y(,\n𩞤G": "𢄩",
+        ">􀭽\u0005\u0004T靠@\u0008_L<\u0004": "B(H\u001bTU\u0019\u001b",
+        "JV|􎘣FR(k󸼂Kr󾵪췮􀳊#/냠#6W/\u0018pk}\u0004@􄹰n~": "SH5Ou_\r\u000682j",
+        "O\"l\\稊a0 .15\u0003": "v",
+        "P\u0019)\n/\u00001O": "m\u0005\u0019P\u0008^\u001dN󽱴us(\u000b}󺴺\u0011zd􅱱|\u00149❸va[@\u0019O",
+        "\\O^f#": "m\u001d<i\u0002k\"ULmhw𑘣\u000b.Q(@s􇆃-auK\u0018Da",
+        "]=k䍆Ra\u0008\u0011L": "𘃄󽻖\u0012󸒠\u001a5B󷍖?\"󼯅𧓈>􁮺PBv~Pc\u0005\u000fvg𨎝󰘉UP󶖞[",
+        "e󺔼D\u000c7\u001a\u0011x=W)0R?xAw[K\u0011\u00117j": "\u0015um\t𢜝pI|7\u0007[壏\u0004F's􉺢2󸖌\t󸪓Eu憎􉗿",
+        "k&": "7Uᶲ\n8CI2fjtH",
+        "~AE\u001b𒉞\u0012U\u00014\u000f𬌂󿽭": "\u000c\u0015􌎻𘍒I룾🆃\u0008󱁛Ly)[<U",
+        "|k𤰼󴹟\u001a󷊂7􈬡KS\u001d\u0016𭹯\u0013􎈼F$9\u001f󽽵": "nQhrgყnc㚲󲅇,g󸯤B􉸇GXc]V\u0002翍h𫼍T􇿳g",
+        "ᅱC\u0001畘\"v􌭱\u0008'bj*(DRvR": "W\u0017\u001b\u001c",
+        "ጹa𫷴󱧖{📑Lx\u0016/\u001e|\u0011n,窗V䎀핳􉼀#𨌿": "Atv<W}\u001b\u0005W\u0014n5𨻹o:󺄟\u000b\u0014$bK洊{􇴮\u00133j4",
+        "𦜷&r": "m",
+        "􁼇ꝰ\u000c󴯷A!󾞐\u0010B\t\u0008/C𪶏g\u000f𠱐7}𝨺": "c\u000c\u0014zN􀜙\u0008>W$\u0006󷧌\u0002`\u0016󱴫I*"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "㯓@o􋰤\u0013轪讷𡈥g󻀦k髝𑿍\u0007\u0006",
-                    "type": "𣍖󱺬:\t3R@𛆏/5Vw\u001b0󾑰\u001a7􄳫]"
+                    "type": "𣍖󱺬:\t3R@𛆏/5Vw\u001b0󾑰\u001a7􄳫]",
+                    "value": "㯓@o􋰤\u0013轪讷𡈥g󻀦k髝𑿍\u0007\u0006"
                 },
                 {
-                    "value": "󽵇󼃘\u0018󳼺\u0018􊄭G^\u0006x|K\u001b-\u000c\u000cf𬫍𒐽[",
-                    "type": "hR𫆌⼬𣊚筬\u0012z𩒌\u0008K痾ꔈ𘕷gM\u0006􊇞|V\u0008x"
+                    "type": "hR𫆌⼬𣊚筬\u0012z𩒌\u0008K痾ꔈ𘕷gM\u0006􊇞|V\u0008x",
+                    "value": "󽵇󼃘\u0018󳼺\u0018􊄭G^\u0006x|K\u001b-\u000c\u000cf𬫍𒐽["
                 },
                 {
-                    "value": "D\")`􌯄\u001cw^𞄌",
-                    "type": "\u0008\u0012"
+                    "type": "\u0008\u0012",
+                    "value": "D\")`􌯄\u001cw^𞄌"
                 },
                 {
-                    "value": "i\u001e􉒛𘩷_\u001bb𬎇2C춀KKqLhT􋌺,\u000bᧀ\u0017W臬󷧨􏹡",
-                    "type": "\u0003\u0016`𨨢;\u0018J\"s>s\nN-&󾴘>ZMK\u0016ᒆb啁"
+                    "type": "\u0003\u0016`𨨢;\u0018J\"s>s\nN-&󾴘>ZMK\u0016ᒆb啁",
+                    "value": "i\u001e􉒛𘩷_\u001bb𬎇2C춀KKqLhT􋌺,\u000bᧀ\u0017W臬󷧨􏹡"
                 },
                 {
-                    "value": "cw8|\t)",
-                    "type": "FL𝖄􈛮\u0019䖘􈴓\rk\u0004\u0012MF䒳1\rYZ\t󺣜\u0001"
+                    "type": "FL𝖄􈛮\u0019䖘􈴓\rk\u0004\u0012MF䒳1\rYZ\t󺣜\u0001",
+                    "value": "cw8|\t)"
                 },
                 {
-                    "value": "/o\u0011𩔸!B󼽘􉓋\u0000t~=",
-                    "type": "󹴻\u001f\u001b\u0008󸂬\u0011"
+                    "type": "󹴻\u001f\u001b\u0008󸂬\u0011",
+                    "value": "/o\u0011𩔸!B󼽘􉓋\u0000t~="
                 },
                 {
-                    "value": "9_7󹾤!𨢸\u0008'󺓊\u0016N(N\u0007]𮜔9A𗱧sm[0",
-                    "type": "-i"
+                    "type": "-i",
+                    "value": "9_7󹾤!𨢸\u0008'󺓊\u0016N(N\u0007]𮜔9A𗱧sm[0"
                 },
                 {
-                    "value": "𠹤\u001f\u0013aD\\􇍃􌎸>.U\u000b\u0012IV\u0010h%\u0017󵘱?7􊙄\"\n",
-                    "type": "4g󸗽𨁈>\u0007kK蜞\u000f\u001a[W??!b"
+                    "type": "4g󸗽𨁈>\u0007kK蜞\u000f\u001a[W??!b",
+                    "value": "𠹤\u001f\u0013aD\\􇍃􌎸>.U\u000b\u0012IV\u0010h%\u0017󵘱?7􊙄\"\n"
                 },
                 {
-                    "value": "\u001eP𬈇퉥v\u0017yfj⸜z~6&\u001as;Pz0",
-                    "type": "𐩾#𘨧󾄓𠜒􊤶1􇆓5p󶲼󻪴湳"
+                    "type": "𐩾#𘨧󾄓𠜒􊤶1􇆓5p󶲼󻪴湳",
+                    "value": "\u001eP𬈇퉥v\u0017yfj⸜z~6&\u001as;Pz0"
                 },
                 {
-                    "value": "TBA6)r<",
-                    "type": ""
+                    "type": "",
+                    "value": "TBA6)r<"
                 },
                 {
-                    "value": "\"\u0011P@n.",
-                    "type": ",B𥠦(s⑇eh􃐆"
+                    "type": ",B𥠦(s⑇eh􃐆",
+                    "value": "\"\u0011P@n."
                 },
                 {
-                    "value": "ᔢ\u0012&{\u0017싳o`捖\u0019K\u000f6j5L+􌨇BtM<",
-                    "type": "l5霿\u001c8󽥦"
+                    "type": "l5霿\u001c8󽥦",
+                    "value": "ᔢ\u0012&{\u0017싳o`捖\u0019K\u000f6j5L+􌨇BtM<"
                 },
                 {
-                    "value": "𦤭VXV`\\'jT󽭗o@h]\u0003\u0001\"\u0015\u000em",
-                    "type": "/\u0005\u0008`y\r0C\u000f~f>j\u00148q g=vwx\u000e\u001d କ𥺙"
+                    "type": "/\u0005\u0008`y\r0C\u000f~f>j\u00148q g=vwx\u000e\u001d କ𥺙",
+                    "value": "𦤭VXV`\\'jT󽭗o@h]\u0003\u0001\"\u0015\u000em"
                 },
                 {
-                    "value": "󼈴𦳅󾽅v!\u000bS.g\u0006V\\*k⊯p󱪣|\u0010r@$\u001d\u0018>􅒆(󻌖Fɣ",
-                    "type": "\u0000f𝥉`vc"
+                    "type": "\u0000f𝥉`vc",
+                    "value": "󼈴𦳅󾽅v!\u000bS.g\u0006V\\*k⊯p󱪣|\u0010r@$\u001d\u0018>􅒆(󻌖Fɣ"
                 },
                 {
-                    "value": "󿜸CE\u001b\u0010\u00007󼱡\u0006\u001bM\u0015:~릹𥭰/",
-                    "type": "_<􅬌OO"
+                    "type": "_<􅬌OO",
+                    "value": "󿜸CE\u001b\u0010\u00007󼱡\u0006\u001bM\u0015:~릹𥭰/"
                 },
                 {
-                    "value": "Hs󵇌cZ]𗁖􄓐*󿶵\u0016k𥟫4𬐜\u0011\u0017xL`jh$\u001cR~",
-                    "type": "𧍏􀷁\u0005%\u001c􍼕󱚦uZ.𐧉\t\u0019f󱺢uoe!𒑋1li𦾹#8󻈳_"
+                    "type": "𧍏􀷁\u0005%\u001c􍼕󱚦uZ.𐧉\t\u0019f󱺢uoe!𒑋1li𦾹#8󻈳_",
+                    "value": "Hs󵇌cZ]𗁖􄓐*󿶵\u0016k𥟫4𬐜\u0011\u0017xL`jh$\u001cR~"
                 },
                 {
-                    "value": "􆁣9p\u0002p\toB낗F'𣢇#lG6e𣻸P",
-                    "type": "󽱗*k󴁬𗝬"
+                    "type": "󽱗*k󴁬𗝬",
+                    "value": "􆁣9p\u0002p\toB낗F'𣢇#lG6e𣻸P"
                 },
                 {
-                    "value": "x\u0005\u0005𗉘\u0002F􋇅/tuVf&1矛\u001d𬜦O𧽹􍎦",
-                    "type": "0\u0000􈼩\u000b"
+                    "type": "0\u0000􈼩\u000b",
+                    "value": "x\u0005\u0005𗉘\u0002F􋇅/tuVf&1矛\u001d𬜦O𧽹􍎦"
                 },
                 {
-                    "value": "ꍪ󱪀𝆰􉙔\u0012d𢕪8A絒f󴘂[^4-<𡥳",
-                    "type": ";􈰢i󹈇3淗⧗􍵶5MG:G"
+                    "type": ";􈰢i󹈇3淗⧗􍵶5MG:G",
+                    "value": "ꍪ󱪀𝆰􉙔\u0012d𢕪8A絒f󴘂[^4-<𡥳"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "|k𤰼󴹟\u001a󷊂7􈬡KS\u001d\u0016𭹯\u0013􎈼F$9\u001f󽽵": "nQhrgყnc㚲󲅇,g󸯤B􉸇GXc]V\u0002翍h𫼍T􇿳g",
-        "JV|􎘣FR(k󸼂Kr󾵪췮􀳊#/냠#6W/\u0018pk}\u0004@􄹰n~": "SH5Ou_\r\u000682j",
-        "]=k䍆Ra\u0008\u0011L": "𘃄󽻖\u0012󸒠\u001a5B󷍖?\"󼯅𧓈>􁮺PBv~Pc\u0005\u000fvg𨎝󰘉UP󶖞[",
-        "\u0004s촻􇆾 \"u><M\u00176jq\nk>\u0004󲯟2a\u0006+󵖬c\u001b": "􈴭\u001a",
-        "O\"l\\稊a0 .15\u0003": "v",
-        "": "}X󴾨W<􄒌+1\u0010𘞖􄰙\u001a\rqC𢲰>p|𩩥",
-        "𦜷&r": "m",
-        "\\O^f#": "m\u001d<i\u0002k\"ULmhw𑘣\u000b.Q(@s􇆃-auK\u0018Da",
-        "e󺔼D\u000c7\u001a\u0011x=W)0R?xAw[K\u0011\u00117j": "\u0015um\t𢜝pI|7\u0007[壏\u0004F's􉺢2󸖌\t󸪓Eu憎􉗿",
-        ">􀭽\u0005\u0004T靠@\u0008_L<\u0004": "B(H\u001bTU\u0019\u001b",
-        "~AE\u001b𒉞\u0012U\u00014\u000f𬌂󿽭": "\u000c\u0015􌎻𘍒I룾🆃\u0008󱁛Ly)[<U",
-        ")j𓃴9$\u0001XxjZ𧥌70󲈊\u0004*@..󳽽": "\t\u000c􌱺j\u0004\u001d󿲭re\u001c\t o\u001bEx\u001a<xt",
-        "ᅱC\u0001畘\"v􌭱\u0008'bj*(DRvR": "W\u0017\u001b\u001c",
-        "􁼇ꝰ\u000c󴯷A!󾞐\u0010B\t\u0008/C𪶏g\u000f𠱐7}𝨺": "c\u000c\u0014zN􀜙\u0008>W$\u0006󷧌\u0002`\u0016󱴫I*",
-        ",-[Q.Y(,\n𩞤G": "𢄩",
-        "k&": "7Uᶲ\n8CI2fjtH",
-        "ጹa𫷴󱧖{📑Lx\u0016/\u001e|\u0011n,窗V䎀핳􉼀#𨌿": "Atv<W}\u001b\u0005W\u0014n5𨻹o:󺄟\u000b\u0014$bK洊{􇴮\u00133j4",
-        "P\u0019)\n/\u00001O": "m\u0005\u0019P\u0008^\u001dN󽱴us(\u000b}󺴺\u0011zd􅱱|\u00149❸va[@\u0019O"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_14.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_14.json
index f02ff04cb2e..ee1fd8901a5 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_14.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_14.json
@@ -1,53 +1,53 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0000􈐙𞡏": "& [\r\u0008C\u001d\u001a]F\u000bp\u001a>d",
+        "\u0005<\u0008^\u000cO": "X󱚥\u0010#\u0000s$􎾊𘍉\u000f",
+        "\u0006\u001fF;a􈖳\u0018x\u0016Q􊇞G/EF\t": "[𭿰v\u001f󻺬5&⩟􎏸}􀶌&;IGz󲃬8􍉸#󻧾",
+        "\t􀃐i\u000e\u001e@R\u000f>[\n#𣔿䩕qQ&䤵T.": "O\u0008T淝}Z3\\Cvd",
+        "\u000ct^⁍_剑𘞌d𢂆􇄎%": "􉰥\nLGSY7􀕳;N\u000b𣴿\u0019",
+        "\u0012j𠓣i\u0016\u001aUAalz2𨳐\u0012hKᯛ": "𐠘+󿌠G𤫈IaHb0$\u0013Y0)uJO-l􍪐",
+        "\u001b􌺈6𩾉e𬶊蜨I}姀\u001e\u001c󰆰F\u001d": "\u0016o鉏𒄟xMem2r?t\u0011l𡢿^􊜮VjG\u0004𗃨[;뢱\u0019_𔓣",
+        "-+\u0007NS\u0002dY\u0019\u0006\u0004􃦟er#<<幼i󸣲r\u0005􏺘grq𨨃\u0006": "UE􊷅쮎\u0013􄾥􋣢9􌟟T􂴕\u001d󼺫ツᮇz𗛃`*􎆜HO$o󵗎!󳴰\u0007",
+        "0𘛾U5\u0012\u001cZMM=䋋": "󹦭_􎠽yw􁕶Z󵐩q%\u0011]\u0011󵥦\u0003\u0011𪌧{hsb󸋣n󷂶\u000f\u001d󼯳\u000e",
+        ":DO󸢉\u0001\u0002,u󹅔󲪁W\u0001H\u0016\u0000ag􌧠􊶉": "zFb]K󵙿\u0000zLQ?\u0013W,&i𫟦`𦰤U𤂙WMLZ鶴|",
+        "D7𨃱\u0017\u001dV\u001dg\u001b􆘇_(4zO𡔡#h𣔧8l󶏨\u00173󷲥P􆋗\u0010r": "]󶆤ദT\u001dXq*@𗮣hx洎*\u0016𥏁\\\u0016^悪^\u001fTBTv",
+        "f\u0001@\u0006\u001c9\\WXL*S\\{\u000c0\u0008\u0004": "G`󶶚\r?𮞣MJ􈔕󻶼f\u0008\u001bM!jqqn𫣐\u00069𧣹<\u0016]t\u0005",
+        "v": "\u001ac鲹jl\r\u0004\u0003F􍬟~JS(Y\u0004􃇌󱿃3l\u00194\u001f\u000e\u0011n羅",
+        "x_\u001c": "!S\u00186⊞o&𑩪􇽱",
+        "z'~9𑪉:2󼊼⡌>": "𬖛F𫼂\u0003󹈊󺣮we\u000fꑶ2#",
+        "ྜ󷿋Jd𮇇\"關X\u000c\u0007븏\u000bg\u0018\\": "\u0018G\u0001\u0002\u000b颣M𑦻\u001f軦:A(C",
+        "󶜀b=eD󼒉\u0006\u001d\u0019mK\u0003􅑈\r\u0006􎰉-": "\u0017Ez⣅IEd.a􅶣bS 6f#\u0010蛑'\u0016蜶",
+        "󷥛y(\t": "\u001e\u0007w􋐷:"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "Sw󰽵󺡻󰹞(",
-                    "type": "K캧H\u001c\u0010tG{z\u000fw1\u0016I􁺵\u001e󻴩=&妇j<\u001307_r"
+                    "type": "K캧H\u001c\u0010tG{z\u000fw1\u0016I􁺵\u001e󻴩=&妇j<\u001307_r",
+                    "value": "Sw󰽵󺡻󰹞("
                 },
                 {
-                    "value": "vpm)P𤚏\u001f􀳳-􁶿<喆\u0008\u0016n",
-                    "type": ": )L!G󿮞xZ𪴿9󱎰肼PO1RK󿪨^"
+                    "type": ": )L!G󿮞xZ𪴿9󱎰肼PO1RK󿪨^",
+                    "value": "vpm)P𤚏\u001f􀳳-􁶿<喆\u0008\u0016n"
                 },
                 {
-                    "value": "\u0013B",
-                    "type": "\u001cq󳭕r𫷜{𫒐𧫨󻆈K󺆛*g[闞\u0018"
+                    "type": "\u001cq󳭕r𫷜{𫒐𧫨󻆈K󺆛*g[闞\u0018",
+                    "value": "\u0013B"
                 },
                 {
-                    "value": "Qꞝ0\\l\u0000\u0006\r𨚔핃\u0003",
-                    "type": "H󱀌\r5󱎛􇹕풻󸜈7𤅉􀟻"
+                    "type": "H󱀌\r5󱎛􇹕풻󸜈7𤅉􀟻",
+                    "value": "Qꞝ0\\l\u0000\u0006\r𨚔핃\u0003"
                 },
                 {
-                    "value": "󳓠􀸪wQ]i\u0017S\u001fkh$\u001e\u0018\u00038\u0013󳸊R[\u0000E􎊧>+0Zg",
-                    "type": ".Z\u0013zn}\u0014"
+                    "type": ".Z\u0013zn}\u0014",
+                    "value": "󳓠􀸪wQ]i\u0017S\u001fkh$\u001e\u0018\u00038\u0013󳸊R[\u0000E􎊧>+0Zg"
                 },
                 {
-                    "value": "𩠌퀁\u0013eYmQ8HmG􉔬𪩜N\u000b𭴛",
-                    "type": "\u0019q%*Bq𬒦q*󴩙e\u0012\u0010\u000ekBv\u0016"
+                    "type": "\u0019q%*Bq𬒦q*󴩙e\u0012\u0010\u000ekBv\u0016",
+                    "value": "𩠌퀁\u0013eYmQ8HmG􉔬𪩜N\u000b𭴛"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\u0000􈐙𞡏": "& [\r\u0008C\u001d\u001a]F\u000bp\u001a>d",
-        "z'~9𑪉:2󼊼⡌>": "𬖛F𫼂\u0003󹈊󺣮we\u000fꑶ2#",
-        "\u0006\u001fF;a􈖳\u0018x\u0016Q􊇞G/EF\t": "[𭿰v\u001f󻺬5&⩟􎏸}􀶌&;IGz󲃬8􍉸#󻧾",
-        "\t􀃐i\u000e\u001e@R\u000f>[\n#𣔿䩕qQ&䤵T.": "O\u0008T淝}Z3\\Cvd",
-        "-+\u0007NS\u0002dY\u0019\u0006\u0004􃦟er#<<幼i󸣲r\u0005􏺘grq𨨃\u0006": "UE􊷅쮎\u0013􄾥􋣢9􌟟T􂴕\u001d󼺫ツᮇz𗛃`*􎆜HO$o󵗎!󳴰\u0007",
-        "\u0005<\u0008^\u000cO": "X󱚥\u0010#\u0000s$􎾊𘍉\u000f",
-        "\u001b􌺈6𩾉e𬶊蜨I}姀\u001e\u001c󰆰F\u001d": "\u0016o鉏𒄟xMem2r?t\u0011l𡢿^􊜮VjG\u0004𗃨[;뢱\u0019_𔓣",
-        "󷥛y(\t": "\u001e\u0007w􋐷:",
-        "D7𨃱\u0017\u001dV\u001dg\u001b􆘇_(4zO𡔡#h𣔧8l󶏨\u00173󷲥P􆋗\u0010r": "]󶆤ദT\u001dXq*@𗮣hx洎*\u0016𥏁\\\u0016^悪^\u001fTBTv",
-        "\u0012j𠓣i\u0016\u001aUAalz2𨳐\u0012hKᯛ": "𐠘+󿌠G𤫈IaHb0$\u0013Y0)uJO-l􍪐",
-        ":DO󸢉\u0001\u0002,u󹅔󲪁W\u0001H\u0016\u0000ag􌧠􊶉": "zFb]K󵙿\u0000zLQ?\u0013W,&i𫟦`𦰤U𤂙WMLZ鶴|",
-        "f\u0001@\u0006\u001c9\\WXL*S\\{\u000c0\u0008\u0004": "G`󶶚\r?𮞣MJ􈔕󻶼f\u0008\u001bM!jqqn𫣐\u00069𧣹<\u0016]t\u0005",
-        "ྜ󷿋Jd𮇇\"關X\u000c\u0007븏\u000bg\u0018\\": "\u0018G\u0001\u0002\u000b颣M𑦻\u001f軦:A(C",
-        "\u000ct^⁍_剑𘞌d𢂆􇄎%": "􉰥\nLGSY7􀕳;N\u000b𣴿\u0019",
-        "󶜀b=eD󼒉\u0006\u001d\u0019mK\u0003􅑈\r\u0006􎰉-": "\u0017Ez⣅IEd.a􅶣bS 6f#\u0010蛑'\u0016蜶",
-        "x_\u001c": "!S\u00186⊞o&𑩪􇽱",
-        "v": "\u001ac鲹jl\r\u0004\u0003F􍬟~JS(Y\u0004􃇌󱿃3l\u00194\u001f\u000e\u0011n羅",
-        "0𘛾U5\u0012\u001cZMM=䋋": "󹦭_􎠽yw􁕶Z󵐩q%\u0011]\u0011󵥦\u0003\u0011𪌧{hsb󸋣n󷂶\u000f\u001d󼯳\u000e"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_15.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_15.json
index 735192bb338..7aed4f79058 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_15.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_15.json
@@ -1,137 +1,137 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "\u0014",
+        "\u0000􂐛WB\u0004\u0010MC𢠴e󱵎,z\u000f󼽥-h􍡇IF\u0003\u0018W\u000b󱔾F": "l蝍cS`",
+        "\u0001<": "\u00154􄀠k\u00118I\u001e󻢠􉎎'D剕u􇩎RZ󺱌$\u0005+\u001a<E\u0011L\u001e󸂬3􊧶",
+        "\u0012T": "󴹕𠍱+.\rQ>L󵯼9Z<m0뭨Gp튭󳛌\u001d\n",
+        ";4􇪓": "\u001a\u00169R\u0012숅󿽤h\"\u0005𣋟󹇵P\u0011󺴪gR𧲳\u0019D,x𞢭)䣢\t󴺙\u0018\u000b𡇦",
+        "Uz\u001cv*Uꛁ$\u001d𛊆𦑰D+.": "^녖\u0006YT\u0016fi\u0016􏖆DA\u001f\u0015鑿􇼃􏐣[ꩅa\u0007",
+        "YQ\u0019Vx􇰦𬯼􀭃)QFDዏ􆦮􃌀o窟󻰱𣺴:J@\u0001": "Mh\u001a7󻕚/𢞩\u001buW𨤤𪓎\u0004놢\r\u0005f}󻽬􏻑N/\u001c\u0000(h\u0015",
+        "}~y0~]w!e𦥞':\u001e8n󴦀\u0005f P᩠𡅞J": "u@\u0017\u0005d8Y󿠟\u0004K󹲉\u0000#)\"󸷋;㸊p_伸\u0003\u001fDQD{@𥏰",
+        "氷\u001b4n𣂶2)􂬆1kbf\u000e\u001e^T ⅋\u00046偣^!\u0018dgm󻰱": "Y\u000c^󲢊\u0016􉮼v󾡇",
+        "􎗊\u0008\u0003\u0007Y󸉔\u0013󸴬\u001f\u0006󲛔𦱙𣤡\u001f{\u001cP䣵": "\u000b󰙻􆅋Q\u0008&\u0014n𔕱𪼭uu􍬰c􏱅!品䇊筳\u0007!𥄄\u001f;Xut"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "[",
-                    "type": "󳆥􀄐‪􃚠%𠕃Y|獇%5&󾻪A\r4>󵬪𝃊.󽋱\u0007\u001e"
+                    "type": "󳆥􀄐‪􃚠%𠕃Y|獇%5&󾻪A\r4>󵬪𝃊.󽋱\u0007\u001e",
+                    "value": "["
                 },
                 {
-                    "value": "8q𐙦L𬙚\u0018",
-                    "type": "無\u000e$\u00073𢾫5\u0017\u0019\u0005"
+                    "type": "無\u000e$\u00073𢾫5\u0017\u0019\u0005",
+                    "value": "8q𐙦L𬙚\u0018"
                 },
                 {
-                    "value": "\u0017\u0006􏟏I􀂶5\ns𦰡_\u0017𢈊i\u0016鼧",
-                    "type": "ං𠍠ꮨ􍫡t%y-V\u001a\u0018󱕱}5𑃝󽴵0U+ 퍧"
+                    "type": "ං𠍠ꮨ􍫡t%y-V\u001a\u0018󱕱}5𑃝󽴵0U+ 퍧",
+                    "value": "\u0017\u0006􏟏I􀂶5\ns𦰡_\u0017𢈊i\u0016鼧"
                 },
                 {
-                    "value": "^zj,\r\u0000}󷈛\u001b$c #L",
-                    "type": "􍾬bY􀥧A\u0015"
+                    "type": "􍾬bY􀥧A\u0015",
+                    "value": "^zj,\r\u0000}󷈛\u001b$c #L"
                 },
                 {
-                    "value": "|9!",
-                    "type": "bhAL[v/CW\r.^KU\u0006.HnO𘁉\u0017nDg\u000cqZ\n"
+                    "type": "bhAL[v/CW\r.^KU\u0006.HnO𘁉\u0017nDg\u000cqZ\n",
+                    "value": "|9!"
                 },
                 {
-                    "value": "\t9𠵚𖹿/o𝩕j᭛Z‖D~F",
-                    "type": "𢢞\"\u001c6y}󰈱A0b𮣄["
+                    "type": "𢢞\"\u001c6y}󰈱A0b𮣄[",
+                    "value": "\t9𠵚𖹿/o𝩕j᭛Z‖D~F"
                 },
                 {
-                    "value": "4\u000bBv钽􇏷\u001bZ\rj",
-                    "type": "𬱩􈀟@𝂁􎗱阺\u0008\n\u000e\u001b\t,/􉦧𫺊C"
+                    "type": "𬱩􈀟@𝂁􎗱阺\u0008\n\u000e\u001b\t,/􉦧𫺊C",
+                    "value": "4\u000bBv钽􇏷\u001bZ\rj"
                 },
                 {
-                    "value": "↶y\u0001",
-                    "type": "x󰧀RA\u001eNXCq􍇕󺊑\u001e\u000b𪪙}nf$C૦=R􋌦\u001cl\u0012\u0016'\"\u0015"
+                    "type": "x󰧀RA\u001eNXCq􍇕󺊑\u001e\u000b𪪙}nf$C૦=R􋌦\u001cl\u0012\u0016'\"\u0015",
+                    "value": "↶y\u0001"
                 },
                 {
-                    "value": "Wcc_􁙳",
-                    "type": "\u0006\tɶ"
+                    "type": "\u0006\tɶ",
+                    "value": "Wcc_􁙳"
                 },
                 {
-                    "value": "`VP󳆬)􃒧\t;",
-                    "type": "𭈱\u000c햘U􉡈q\u0005<𨓦"
+                    "type": "𭈱\u000c햘U􉡈q\u0005<𨓦",
+                    "value": "`VP󳆬)􃒧\t;"
                 },
                 {
-                    "value": "I󺓮\u001f󹊪7\u0017\\𮏫\u001f􀄙Y8E\u001dI𐳃\u001d\tl󻼥\u001a",
-                    "type": "𨁜\u001e칒&:Xel\u0000􅍎B0􃳱iU\u001d y\u00001b)暢z"
+                    "type": "𨁜\u001e칒&:Xel\u0000􅍎B0􃳱iU\u001d y\u00001b)暢z",
+                    "value": "I󺓮\u001f󹊪7\u0017\\𮏫\u001f􀄙Y8E\u001dI𐳃\u001d\tl󻼥\u001a"
                 },
                 {
-                    "value": "\u0015DV>xRͱ\u0000H2􄏿\u0019&\u0019\u0017l-$\u00133aD2-",
-                    "type": "? *\u0002\u001d􏟾\u0010T\u0002NT/Nl.0\u000c𣑎Z\u000e\u0006u󴢳?\u0003􌁅z혾𪹥"
+                    "type": "? *\u0002\u001d􏟾\u0010T\u0002NT/Nl.0\u000c𣑎Z\u000e\u0006u󴢳?\u0003􌁅z혾𪹥",
+                    "value": "\u0015DV>xRͱ\u0000H2􄏿\u0019&\u0019\u0017l-$\u00133aD2-"
                 },
                 {
-                    "value": "蕟}\u0000%H𮤷揾\u000cf󰂗\u001eaF",
-                    "type": "5𥢣\u0013[k󿈥*\u000eo닁"
+                    "type": "5𥢣\u0013[k󿈥*\u000eo닁",
+                    "value": "蕟}\u0000%H𮤷揾\u000cf󰂗\u001eaF"
                 },
                 {
-                    "value": "\u001f5􍘽\u0018c\u001a\u0008v7𪆯\u0006\u0015􆸇",
-                    "type": "璫`m􄠰i6󴏿a󷎌覹􎣢_𦻹R.R\u0015?"
+                    "type": "璫`m􄠰i6󴏿a󷎌覹􎣢_𦻹R.R\u0015?",
+                    "value": "\u001f5􍘽\u0018c\u001a\u0008v7𪆯\u0006\u0015􆸇"
                 },
                 {
-                    "value": "􎻀󶘥V\u001c\u001a𐓰\u000bl%󱴏XU<𨣳TB\u0012𘥦`􆯏v0\t",
-                    "type": "U뺡h􁤥􂾬S\u0014;;\u0016k􎶫\u0017\u0007S=7󳭷\u001e>􏅶 "
+                    "type": "U뺡h􁤥􂾬S\u0014;;\u0016k􎶫\u0017\u0007S=7󳭷\u001e>􏅶 ",
+                    "value": "􎻀󶘥V\u001c\u001a𐓰\u000bl%󱴏XU<𨣳TB\u0012𘥦`􆯏v0\t"
                 },
                 {
-                    "value": "r\\\u0010ﲦ\n\u0018}UJ\u0017𮜝|':B1F徭o!v4\nGU􆦥n<🠔",
-                    "type": "0\"𮤄\u0004"
+                    "type": "0\"𮤄\u0004",
+                    "value": "r\\\u0010ﲦ\n\u0018}UJ\u0017𮜝|':B1F徭o!v4\nGU􆦥n<🠔"
                 },
                 {
-                    "value": " \u0001𨎌.􃤡n4䬋g𑰑\u000cR\r~!",
-                    "type": "\u0019<-\u0014N6,\r𒈫𫮆\u000c𘒛𗒴G仞{%󴿄\u001f\u00138􉶰B:e#秴]w𑌢"
+                    "type": "\u0019<-\u0014N6,\r𒈫𫮆\u000c𘒛𗒴G仞{%󴿄\u001f\u00138􉶰B:e#秴]w𑌢",
+                    "value": " \u0001𨎌.􃤡n4䬋g𑰑\u000cR\r~!"
                 },
                 {
-                    "value": "𫂅&Q韕b",
-                    "type": " ['􋊠􅛂"
+                    "type": " ['􋊠􅛂",
+                    "value": "𫂅&Q韕b"
                 },
                 {
-                    "value": "`u\u0001f0l_\u001d4R〧!赉6뾈3BI胋",
-                    "type": "?e\u0000q󵖨\u001b`\u0012{𦟾[\u000c6:\u001aY󾎦,󱏿&\u0000\u0015"
+                    "type": "?e\u0000q󵖨\u001b`\u0012{𦟾[\u000c6:\u001aY󾎦,󱏿&\u0000\u0015",
+                    "value": "`u\u0001f0l_\u001d4R〧!赉6뾈3BI胋"
                 },
                 {
-                    "value": "*8\u0011f7𨨏E\u000e&",
-                    "type": ""
+                    "type": "",
+                    "value": "*8\u0011f7𨨏E\u000e&"
                 },
                 {
-                    "value": "p\u0003",
-                    "type": "\u000f9ML1𨝩 !󲀟\u001e󻆎\u000c{󾄄\u0015􌳸zw\u00179I󿙣􅿧\u0015𢐪"
+                    "type": "\u000f9ML1𨝩 !󲀟\u001e󻆎\u000c{󾄄\u0015􌳸zw\u00179I󿙣􅿧\u0015𢐪",
+                    "value": "p\u0003"
                 },
                 {
-                    "value": "jE𫙱'l",
-                    "type": "`>𧸴𗓢󷿎􅎭󵺏fB\u0012Q\u0013Yꨒ>"
+                    "type": "`>𧸴𗓢󷿎􅎭󵺏fB\u0012Q\u0013Yꨒ>",
+                    "value": "jE𫙱'l"
                 },
                 {
-                    "value": "yL􄻬L\u0010fK󹇘\u0011I~yv|",
-                    "type": "㹨𩿜I󳕚l#\"T􌵶N:\rPK\u0018\u001b󾾔\u001ah#It(e𡔾󺊠"
+                    "type": "㹨𩿜I󳕚l#\"T􌵶N:\rPK\u0018\u001b󾾔\u001ah#It(e𡔾󺊠",
+                    "value": "yL􄻬L\u0010fK󹇘\u0011I~yv|"
                 },
                 {
-                    "value": "MH ",
-                    "type": "\u000b\u001ceauk􋅄󼽫󴄉w"
+                    "type": "\u000b\u001ceauk􋅄󼽫󴄉w",
+                    "value": "MH "
                 },
                 {
-                    "value": "z\u0017PqjO\n𢭫ma-wVCy󷓨\u0010\u0010, #\u0016迚_𛈂",
-                    "type": "\u000eJ\u0007'D"
+                    "type": "\u000eJ\u0007'D",
+                    "value": "z\u0017PqjO\n𢭫ma-wVCy󷓨\u0010\u0010, #\u0016迚_𛈂"
                 },
                 {
-                    "value": "\rn𬛈V7$g𑄸􇵓,󼶯\u001f\u001e[􆄏󺘸.\u0018Y쀾沀\u001a",
-                    "type": "s􊑓󽟱5\u0001\\𬩎"
+                    "type": "s􊑓󽟱5\u0001\\𬩎",
+                    "value": "\rn𬛈V7$g𑄸􇵓,󼶯\u001f\u001e[􆄏󺘸.\u0018Y쀾沀\u001a"
                 },
                 {
-                    "value": "\u0007P𤓢pW𠊲",
-                    "type": "q)4j􍒞?Q8aȣif!zA\u0019􅥴𥡍"
+                    "type": "q)4j􍒞?Q8aȣif!zA\u0019􅥴𥡍",
+                    "value": "\u0007P𤓢pW𠊲"
                 },
                 {
-                    "value": "NzDk:@T5\u0011\u0018jmg2V",
-                    "type": "B-8d\u000e"
+                    "type": "B-8d\u000e",
+                    "value": "NzDk:@T5\u0011\u0018jmg2V"
                 },
                 {
-                    "value": "'\u001e",
-                    "type": "\u0019\u0008⬑𗴔w􉸎"
+                    "type": "\u0019\u0008⬑𗴔w􉸎",
+                    "value": "'\u001e"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "}~y0~]w!e𦥞':\u001e8n󴦀\u0005f P᩠𡅞J": "u@\u0017\u0005d8Y󿠟\u0004K󹲉\u0000#)\"󸷋;㸊p_伸\u0003\u001fDQD{@𥏰",
-        "\u0000􂐛WB\u0004\u0010MC𢠴e󱵎,z\u000f󼽥-h􍡇IF\u0003\u0018W\u000b󱔾F": "l蝍cS`",
-        "": "\u0014",
-        "􎗊\u0008\u0003\u0007Y󸉔\u0013󸴬\u001f\u0006󲛔𦱙𣤡\u001f{\u001cP䣵": "\u000b󰙻􆅋Q\u0008&\u0014n𔕱𪼭uu􍬰c􏱅!品䇊筳\u0007!𥄄\u001f;Xut",
-        "氷\u001b4n𣂶2)􂬆1kbf\u000e\u001e^T ⅋\u00046偣^!\u0018dgm󻰱": "Y\u000c^󲢊\u0016􉮼v󾡇",
-        "YQ\u0019Vx􇰦𬯼􀭃)QFDዏ􆦮􃌀o窟󻰱𣺴:J@\u0001": "Mh\u001a7󻕚/𢞩\u001buW𨤤𪓎\u0004놢\r\u0005f}󻽬􏻑N/\u001c\u0000(h\u0015",
-        ";4􇪓": "\u001a\u00169R\u0012숅󿽤h\"\u0005𣋟󹇵P\u0011󺴪gR𧲳\u0019D,x𞢭)䣢\t󴺙\u0018\u000b𡇦",
-        "\u0001<": "\u00154􄀠k\u00118I\u001e󻢠􉎎'D剕u􇩎RZ󺱌$\u0005+\u001a<E\u0011L\u001e󸂬3􊧶",
-        "Uz\u001cv*Uꛁ$\u001d𛊆𦑰D+.": "^녖\u0006YT\u0016fi\u0016􏖆DA\u001f\u0015鑿􇼃􏐣[ꩅa\u0007",
-        "\u0012T": "󴹕𠍱+.\rQ>L󵯼9Z<m0뭨Gp튭󳛌\u001d\n"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_16.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_16.json
index 239c167d3ae..549e4c0efbc 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_16.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_16.json
@@ -1,111 +1,111 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "Edpv􇨫y^{[𩼲㑡\u0019f\u001844󻦪󺤀󻺎",
+        "\u0003dC𭝇\u000b\u001f󳇽": "M\"f𩠠q󲜻D\u001e>\u000f𢅱",
+        "\t9$]𠟓4jn\u0019\u001e?\u001e": "pE\n𤻝a+-\u0013󷼸*,yzB\u0013⼩=\u0005",
+        "\u000ePT": "6^#i=a\u0016\u0004",
+        "\u0012蛯อ⸲ퟦ_𣬗􇗶\t\u00034EG𢠺Lm𧆹󴝌􍟣駭\u0004𐃟?": "帜!\u000eW\u0011\u001c􎤌!E6\u0015j󺽙t𫠹Ko5pwx\u0018T",
+        "\u0015(􏦡󸵱L^󶶻-𪬅~": ":\r\r燀毘T\u0002\u001d2/s􎀡",
+        ")4n󲵱ZN2": "\u001c󿊧Wq\u000cqZ\u001cJA\u0015\rB?f<\"\u00130M|\u0004",
+        "Gs􌜄41\u001b􈨬󳈌ⶉ𧆫fj\rd𫉌\u0006\u00018qj<?\u001d\u0000\u00178\"b?j": "]\u000cV~🜉􊶦!U'\u0007\u0001\u0016D\u0002Z",
+        "T`M\u000fa𪐨𡈫!\u0013Q𡞹6\u001eU[u𬣨\u0016󵖝\u000c\nh": "\"D\u0003\u0010\u0011$#\u0011",
+        "b􇨴F;": "N󸁫&;􎊄z󻲱{􍽐C\u001b#\u000b\u001d󸿹VG",
+        "c𒊏dVzM\u0016\n%a𡆇CT;y􍆗}𤔥mT󸇜S\u0012g": "(T\u0015\u001c/BG\u0000Aqn􌳫.jJ^I𡅻8DX􅴂m",
+        "hx㸱\u001f\u001e􀇬AO\u0008􀇖}𪱾": "\u0018",
+        "o": "",
+        "t\u0001n": "k\"\u0002Cu\u0018\u0017􃏏0c󺟵q\\6􂽗􂌇(_\u0012'󽀣𪠝,􌝼S=}",
+        "{\u000f_W}𠰏7I!!<el􂕷\u0018\u0002􉭁5\u001e": "#\rxጞ󾾪\u0012w7f<󲛧a1",
+        "星": "??\u000f󸣪ૐlc\u0019IC",
+        "즉\t㞶pM9󲦾": "\u000f󱅥|z󵠦T+\\yP= \u000c\u0014Ie᩿􀽭\u001c\u000f\u0017T𠈖J9",
+        "𘄬􁽞{\"\u001ed~i󼵂": "\u001d\u0019𬸿􇾭n沒\u0001$뫃2\u001cG-\u001b􂷅)柖Tz􊐪I8ao𡢒3qg^#",
+        "𨚥\u0010\u0008\\𧄘\u000b󼃜_J\r#\u001a\u0015": "툪77󳝤󳔇eM􄾁gm",
+        "𮮃ἕ\u00150{󹨭Z𬄭Eo\u0011󼘛w": "l@y",
+        "󾉛!󵷛z": "IS;𫮕\u0007􅽒$",
+        "􈎍co-𘀢V.?[p\u0006w𑨀=ob<g􍧅.-": "\u000bo\u000eS\u001c\t/\u0016[\"\u0014!$\u0019",
+        "􉄶\u000b_$u\u001505\t]D]x1\u0001翵q%럂S􂥧%󲡢\u0010Nn𦪧󳮍󽳹": "\u000cN%\u0010{Bt`\u000eL􏃶\u0007=erz5\u0013l-\u000bE7\nYZ",
+        "􌲈'e\u001c5": "틋cQ\u0008\n水R2󷰚󰋟pr\u0018\t[+h\u000b􍒖"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "`Rl錴𨋷亭K\u0019\u0016^\u0017󾴰󰂇Vn󺆷\u0004G󻤙x纰F𩄁?ps󼛍\u001b",
-                    "type": "w~vmF􉕸\u0017'󿵁.dr􈎷\u0010\u0004愞-\u000c`\u001d\u0008%٨\u0006"
+                    "type": "w~vmF􉕸\u0017'󿵁.dr􈎷\u0010\u0004愞-\u000c`\u001d\u0008%٨\u0006",
+                    "value": "`Rl錴𨋷亭K\u0019\u0016^\u0017󾴰󰂇Vn󺆷\u0004G󻤙x纰F𩄁?ps󼛍\u001b"
                 },
                 {
-                    "value": "g8+",
-                    "type": "8<_󾐜\u0010+\u0015􉻑j􎜟H󸧹nl\u000b\u0000C@弴k]\u001d%9🛨"
+                    "type": "8<_󾐜\u0010+\u0015􉻑j􎜟H󸧹nl\u000b\u0000C@弴k]\u001d%9🛨",
+                    "value": "g8+"
                 },
                 {
-                    "value": "L[2𘡐r,\u0017 `9\u0017󴚢<䁢\u001d\u000e<u",
-                    "type": "8󲦰y\u001b\u001a11l𬛱І.(􅣴漑Vv#"
+                    "type": "8󲦰y\u001b\u001a11l𬛱І.(􅣴漑Vv#",
+                    "value": "L[2𘡐r,\u0017 `9\u0017󴚢<䁢\u001d\u000e<u"
                 },
                 {
-                    "value": "iH􍪞!4",
-                    "type": "\u0014𦲑jQ\u0000\u0003~󶠽\u0006+nd_\u0015"
+                    "type": "\u0014𦲑jQ\u0000\u0003~󶠽\u0006+nd_\u0015",
+                    "value": "iH􍪞!4"
                 },
                 {
-                    "value": "X󺯥EJBz𢍯􋜳*+􂌴%k󵴞i@\u000fs󹩋\u0014.",
-                    "type": "dTឡ𧻜/!HV\u001e욉\u0019h]5Fc\u0011w𤉜𮗢+D4_􉭀~瞎\u000c􌢏"
+                    "type": "dTឡ𧻜/!HV\u001e욉\u0019h]5Fc\u0011w𤉜𮗢+D4_􉭀~瞎\u000c􌢏",
+                    "value": "X󺯥EJBz𢍯􋜳*+􂌴%k󵴞i@\u000fs󹩋\u0014."
                 },
                 {
-                    "value": "q󳀱􏯳`s\u0011DDc",
-                    "type": "\u000c􇫳៍\u0013"
+                    "type": "\u000c􇫳៍\u0013",
+                    "value": "q󳀱􏯳`s\u0011DDc"
                 },
                 {
-                    "value": "\u0010(𢾍𤔼V𗎆𥌸9𮨭􇠫{􍎁\u0015u\u001es`i\u001b𑣋^j􇻭􋣬",
-                    "type": "􅎏󰲌鐩"
+                    "type": "􅎏󰲌鐩",
+                    "value": "\u0010(𢾍𤔼V𗎆𥌸9𮨭􇠫{􍎁\u0015u\u001es`i\u001b𑣋^j􇻭􋣬"
                 },
                 {
-                    "value": "􈮀\u0018uS󱆻w􉖑\u0006/𠗑𘕴\u000e2q\u0014;h󶕪\u0017;O?􇑖",
-                    "type": "1>\"<\u0012𑓖|󱂉"
+                    "type": "1>\"<\u0012𑓖|󱂉",
+                    "value": "􈮀\u0018uS󱆻w􉖑\u0006/𠗑𘕴\u000e2q\u0014;h󶕪\u0017;O?􇑖"
                 },
                 {
-                    "value": "𡪢\u0015癝椧Vx#\u0002\u0006*􍃑\u0016 06",
-                    "type": "\u0011q󰨍Yz󹓅n󾚧\tn越P𬧱9"
+                    "type": "\u0011q󰨍Yz󹓅n󾚧\tn越P𬧱9",
+                    "value": "𡪢\u0015癝椧Vx#\u0002\u0006*􍃑\u0016 06"
                 },
                 {
-                    "value": "􎍅餾⩈\u0006SUu󹴥z잚",
-                    "type": "앒\u0012>\"􊠵ON\u001fG󷇲GC\u0013@0\u000b\u0016\rA3:\u0005*"
+                    "type": "앒\u0012>\"􊠵ON\u001fG󷇲GC\u0013@0\u000b\u0016\rA3:\u0005*",
+                    "value": "􎍅餾⩈\u0006SUu󹴥z잚"
                 },
                 {
-                    "value": "Lp*J\u0018S/塠\u0004􈧅",
-                    "type": "8e􊧯󻶔04󲎸r\tK𨑨p\u001c/ᚗ"
+                    "type": "8e􊧯󻶔04󲎸r\tK𨑨p\u001c/ᚗ",
+                    "value": "Lp*J\u0018S/塠\u0004􈧅"
                 },
                 {
-                    "value": "x5􃮃o",
-                    "type": "􁱨,{3𡟄1􁥜􍢆\r\"?hGYO󿖿t𩀞4{\u0016@"
+                    "type": "􁱨,{3𡟄1􁥜􍢆\r\"?hGYO󿖿t𩀞4{\u0016@",
+                    "value": "x5􃮃o"
                 },
                 {
-                    "value": "Z컄\rq)D\u0012z쿍]@t%]\u000f",
-                    "type": "𧓂\u001b挊{􁺥"
+                    "type": "𧓂\u001b挊{􁺥",
+                    "value": "Z컄\rq)D\u0012z쿍]@t%]\u000f"
                 },
                 {
-                    "value": "Q",
-                    "type": "􌱏\u001aq\u0007\u000fBs"
+                    "type": "􌱏\u001aq\u0007\u000fBs",
+                    "value": "Q"
                 },
                 {
-                    "value": "𨡩3mGW塲l뫌ſt\u000c𣞢.=",
-                    "type": "𭄂2,Y􄋵$h5棦-B\u0019x)\u0001*I떠O;\\b"
+                    "type": "𭄂2,Y􄋵$h5棦-B\u0019x)\u0001*I떠O;\\b",
+                    "value": "𨡩3mGW塲l뫌ſt\u000c𣞢.="
                 },
                 {
-                    "value": "&\u001b~s􇹠똄*y\u0003zL@~\u00079D𧼀",
-                    "type": "􏟓ି=􈛨4v\t𢞜TB"
+                    "type": "􏟓ି=􈛨4v\t𢞜TB",
+                    "value": "&\u001b~s􇹠똄*y\u0003zL@~\u00079D𧼀"
                 },
                 {
-                    "value": "\u000bH􋊆\u001a\u0003$\u000f+𒇮듅z􋦀`>􅖞S\u0001_qo",
-                    "type": "q󹍫r􅆧8h\u000ck\u0013K9🏅󵖻"
+                    "type": "q󹍫r􅆧8h\u000ck\u0013K9🏅󵖻",
+                    "value": "\u000bH􋊆\u001a\u0003$\u000f+𒇮듅z􋦀`>􅖞S\u0001_qo"
                 },
                 {
-                    "value": "22g\u0004j*𣢘9\u00057a:",
-                    "type": "࿋&@\u0014}󻌻\\~5𢷠*𐒊]\u001bZ𦫝"
+                    "type": "࿋&@\u0014}󻌻\\~5𢷠*𐒊]\u001bZ𦫝",
+                    "value": "22g\u0004j*𣢘9\u00057a:"
                 },
                 {
-                    "value": "l𤏟𨀥;U\u0012\"􇕣>LT#𮕮5O􀯶\u00077PC",
-                    "type": "󽡘<W緵󼪇ch\u0013u􍂋O\n"
+                    "type": "󽡘<W緵󼪇ch\u0013u􍂋O\n",
+                    "value": "l𤏟𨀥;U\u0012\"􇕣>LT#𮕮5O􀯶\u00077PC"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\t9$]𠟓4jn\u0019\u001e?\u001e": "pE\n𤻝a+-\u0013󷼸*,yzB\u0013⼩=\u0005",
-        "􉄶\u000b_$u\u001505\t]D]x1\u0001翵q%럂S􂥧%󲡢\u0010Nn𦪧󳮍󽳹": "\u000cN%\u0010{Bt`\u000eL􏃶\u0007=erz5\u0013l-\u000bE7\nYZ",
-        "𨚥\u0010\u0008\\𧄘\u000b󼃜_J\r#\u001a\u0015": "툪77󳝤󳔇eM􄾁gm",
-        "b􇨴F;": "N󸁫&;􎊄z󻲱{􍽐C\u001b#\u000b\u001d󸿹VG",
-        "\u000ePT": "6^#i=a\u0016\u0004",
-        "𘄬􁽞{\"\u001ed~i󼵂": "\u001d\u0019𬸿􇾭n沒\u0001$뫃2\u001cG-\u001b􂷅)柖Tz􊐪I8ao𡢒3qg^#",
-        "󾉛!󵷛z": "IS;𫮕\u0007􅽒$",
-        "{\u000f_W}𠰏7I!!<el􂕷\u0018\u0002􉭁5\u001e": "#\rxጞ󾾪\u0012w7f<󲛧a1",
-        "": "Edpv􇨫y^{[𩼲㑡\u0019f\u001844󻦪󺤀󻺎",
-        "𮮃ἕ\u00150{󹨭Z𬄭Eo\u0011󼘛w": "l@y",
-        "􈎍co-𘀢V.?[p\u0006w𑨀=ob<g􍧅.-": "\u000bo\u000eS\u001c\t/\u0016[\"\u0014!$\u0019",
-        "T`M\u000fa𪐨𡈫!\u0013Q𡞹6\u001eU[u𬣨\u0016󵖝\u000c\nh": "\"D\u0003\u0010\u0011$#\u0011",
-        ")4n󲵱ZN2": "\u001c󿊧Wq\u000cqZ\u001cJA\u0015\rB?f<\"\u00130M|\u0004",
-        "Gs􌜄41\u001b􈨬󳈌ⶉ𧆫fj\rd𫉌\u0006\u00018qj<?\u001d\u0000\u00178\"b?j": "]\u000cV~🜉􊶦!U'\u0007\u0001\u0016D\u0002Z",
-        "o": "",
-        "\u0012蛯อ⸲ퟦ_𣬗􇗶\t\u00034EG𢠺Lm𧆹󴝌􍟣駭\u0004𐃟?": "帜!\u000eW\u0011\u001c􎤌!E6\u0015j󺽙t𫠹Ko5pwx\u0018T",
-        "즉\t㞶pM9󲦾": "\u000f󱅥|z󵠦T+\\yP= \u000c\u0014Ie᩿􀽭\u001c\u000f\u0017T𠈖J9",
-        "hx㸱\u001f\u001e􀇬AO\u0008􀇖}𪱾": "\u0018",
-        "c𒊏dVzM\u0016\n%a𡆇CT;y􍆗}𤔥mT󸇜S\u0012g": "(T\u0015\u001c/BG\u0000Aqn􌳫.jJ^I𡅻8DX􅴂m",
-        "\u0003dC𭝇\u000b\u001f󳇽": "M\"f𩠠q󲜻D\u001e>\u000f𢅱",
-        "t\u0001n": "k\"\u0002Cu\u0018\u0017􃏏0c󺟵q\\6􂽗􂌇(_\u0012'󽀣𪠝,􌝼S=}",
-        "星": "??\u000f󸣪ૐlc\u0019IC",
-        "􌲈'e\u001c5": "틋cQ\u0008\n水R2󷰚󰋟pr\u0018\t[+h\u000b􍒖",
-        "\u0015(􏦡󸵱L^󶶻-𪬅~": ":\r\r燀毘T\u0002\u001d2/s􎀡"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_17.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_17.json
index dae2e7ecc1c..190277a8f8e 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_17.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_17.json
@@ -1,94 +1,94 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {},
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "(7D􁉴􂥇\u0010FP%Y𪾔,}\u0015\u0015",
-                    "type": "􊖉D鼗j\u0005HMgz󺺶(r"
+                    "type": "􊖉D鼗j\u0005HMgz󺺶(r",
+                    "value": "(7D􁉴􂥇\u0010FP%Y𪾔,}\u0015\u0015"
                 },
                 {
-                    "value": "|\u000e\u0008&\"륧󰼨j𤰇`l􆟪~\u0002%zl\u001ep􃗩ⰸ4󽒾\n鯈y-",
-                    "type": "ybx\u00016\u0015+o\\d%\u0014@@"
+                    "type": "ybx\u00016\u0015+o\\d%\u0014@@",
+                    "value": "|\u000e\u0008&\"륧󰼨j𤰇`l􆟪~\u0002%zl\u001ep􃗩ⰸ4󽒾\n鯈y-"
                 },
                 {
-                    "value": "<N\u0006f\u0011>\u0003\u0002a",
-                    "type": "0\u0014s󶝆􇑦ﲡT\r\u0000Sຈ𮎏󻶷S,"
+                    "type": "0\u0014s󶝆􇑦ﲡT\r\u0000Sຈ𮎏󻶷S,",
+                    "value": "<N\u0006f\u0011>\u0003\u0002a"
                 },
                 {
-                    "value": "􅆳\u0006[S\u0002󵖏fIBz􄱻\u0010[d-",
-                    "type": "6\u000b\u0011.@p\u0016⽽7 m2nm􋂴1󾈳󳓋𛅾\u0017-􌠊E􂈃/"
+                    "type": "6\u000b\u0011.@p\u0016⽽7 m2nm􋂴1󾈳󳓋𛅾\u0017-􌠊E􂈃/",
+                    "value": "􅆳\u0006[S\u0002󵖏fIBz􄱻\u0010[d-"
                 },
                 {
-                    "value": ")R󳡢.",
-                    "type": "YbO\t\u0017𑱸dYꬔ\u000b\r􏈊󸬏\u000c(𔓪q𗔏𪩐\u0005𣹃󹑊p"
+                    "type": "YbO\t\u0017𑱸dYꬔ\u000b\r􏈊󸬏\u000c(𔓪q𗔏𪩐\u0005𣹃󹑊p",
+                    "value": ")R󳡢."
                 },
                 {
-                    "value": "󻏱>G{9",
-                    "type": "𒍷t#T"
+                    "type": "𒍷t#T",
+                    "value": "󻏱>G{9"
                 },
                 {
-                    "value": "\u0008!󱮶竞󸜍Mi*'M᳙]낄䛚\u0016%𘞏\u001f:\u001eg(]6,1挒𗓫hX",
-                    "type": "q 匿󼂕\"􎪑c\u0004>􋍴'B󱇝𗬙𗏪􆈣\u00044\u001c\u0012:ew"
+                    "type": "q 匿󼂕\"􎪑c\u0004>􋍴'B󱇝𗬙𗏪􆈣\u00044\u001c\u0012:ew",
+                    "value": "\u0008!󱮶竞󸜍Mi*'M᳙]낄䛚\u0016%𘞏\u001f:\u001eg(]6,1挒𗓫hX"
                 },
                 {
-                    "value": "&l􂛼0",
-                    "type": "𩐝lB~53k綮𨒤"
+                    "type": "𩐝lB~53k綮𨒤",
+                    "value": "&l􂛼0"
                 },
                 {
-                    "value": "U􈰶X\u001ciÕ\u000cU|7K5\u001bm  󺈎?􂗎Z􋩢𦖽D!,\n",
-                    "type": "p`묓𖠷O7^\t{D\u0006A"
+                    "type": "p`묓𖠷O7^\t{D\u0006A",
+                    "value": "U􈰶X\u001ciÕ\u000cU|7K5\u001bm  󺈎?􂗎Z􋩢𦖽D!,\n"
                 },
                 {
-                    "value": "\u0014N𒅐`Pp\u000c𢚏|9K\n`Io󴠬瞒\\j,󳕒B4:).uY>\u000b",
-                    "type": "\\𩽺\u0005\u0013􋴅l\u00192\u000fj􆽍\\󽩒v3v*\u001f~-dM󽸲e\u0010\u001d􊊋"
+                    "type": "\\𩽺\u0005\u0013􋴅l\u00192\u000fj􆽍\\󽩒v3v*\u001f~-dM󽸲e\u0010\u001d􊊋",
+                    "value": "\u0014N𒅐`Pp\u000c𢚏|9K\n`Io󴠬瞒\\j,󳕒B4:).uY>\u000b"
                 },
                 {
-                    "value": "\u0013V}\u001e𬖿%􏩫Y\u001bH.eJZ;sZ?c𭯷\u0001\u001d\u0002=V",
-                    "type": "z𪯬􊂤Y󵥴Y9qM$ b"
+                    "type": "z𪯬􊂤Y󵥴Y9qM$ b",
+                    "value": "\u0013V}\u001e𬖿%􏩫Y\u001bH.eJZ;sZ?c𭯷\u0001\u001d\u0002=V"
                 },
                 {
-                    "value": "􏞇𥈩/lb𬻏(]󵯁𒉿G)9𝃚`A󵧠s\u0011O􅗐[Z",
-                    "type": "22𥥽!<$R􉯝\u000bE𩡵􌇓 _c􁀃"
+                    "type": "22𥥽!<$R􉯝\u000bE𩡵􌇓 _c􁀃",
+                    "value": "􏞇𥈩/lb𬻏(]󵯁𒉿G)9𝃚`A󵧠s\u0011O􅗐[Z"
                 },
                 {
-                    "value": "Cs𨽾􋣄\u000e􇄻\u0011dA𨎳\tt⧄iSU=\r􆒓\u000e𠲘󸎁Z􎫟@𝠌231",
-                    "type": "󵪻v\u001a􀺡"
+                    "type": "󵪻v\u001a􀺡",
+                    "value": "Cs𨽾􋣄\u000e􇄻\u0011dA𨎳\tt⧄iSU=\r􆒓\u000e𠲘󸎁Z􎫟@𝠌231"
                 },
                 {
-                    "value": "􌵗F󺣦<\u0010\u00155/\u0016IlgX𩉮KE.",
-                    "type": "bu􂌜\u001f󺭑E􋣘硫x\u0000\u000erRw\u0007"
+                    "type": "bu􂌜\u001f󺭑E􋣘硫x\u0000\u000erRw\u0007",
+                    "value": "􌵗F󺣦<\u0010\u00155/\u0016IlgX𩉮KE."
                 },
                 {
-                    "value": ";yG<.D芆k0X^󿿊\u0005!􄁣z\u0010\u0019>I$W$",
-                    "type": "𠌸@oؚ^M􂖳!\u000c],\u0006\"4"
+                    "type": "𠌸@oؚ^M􂖳!\u000c],\u0006\"4",
+                    "value": ";yG<.D芆k0X^󿿊\u0005!􄁣z\u0010\u0019>I$W$"
                 },
                 {
-                    "value": "P|M6t0 \u0017\u0004벷p-N\u001eEd\u0019n\"{􃁑/鈸*u1",
-                    "type": "#K􋧎\u0012e\u0000t(u\u0006}q􈣔c(i󵋆J⎢a$Z<"
+                    "type": "#K􋧎\u0012e\u0000t(u\u0006}q􈣔c(i󵋆J⎢a$Z<",
+                    "value": "P|M6t0 \u0017\u0004벷p-N\u001eEd\u0019n\"{􃁑/鈸*u1"
                 },
                 {
-                    "value": ")0\u0016\u001dCG\u0012􂨻j邥%\u0017􂳢",
-                    "type": ",\u00115󱽋𬟅\u001ek*𑩃S􄜑\ro$,2𫲵*S]󶑁^"
+                    "type": ",\u00115󱽋𬟅\u001ek*𑩃S􄜑\ro$,2𫲵*S]󶑁^",
+                    "value": ")0\u0016\u001dCG\u0012􂨻j邥%\u0017􂳢"
                 },
                 {
-                    "value": "쿘@\u0000o0󶿬󹰞󷍧}󵓽􂻏㣢\u001dw\u001b,唸%/\u0006\u0001",
-                    "type": "#􁘺\u0003g\u0001\u000c\u0005>􌵠,&􌄊𩅏\u0019h\u000b.\u001d󻍌"
+                    "type": "#􁘺\u0003g\u0001\u000c\u0005>􌵠,&􌄊𩅏\u0019h\u000b.\u001d󻍌",
+                    "value": "쿘@\u0000o0󶿬󹰞󷍧}󵓽􂻏㣢\u001dw\u001b,唸%/\u0006\u0001"
                 },
                 {
-                    "value": "y󸿮󶌚i􈫹𛲠]ZkG𪩚o\u0008󲞳󰼽\u0008o\u000e:s",
-                    "type": "\u0005u\u001c<RZ^N𠩴󰑨7:h𥽫\u0015s𩓺\u001d1,A\u001eSv\u001fgY0"
+                    "type": "\u0005u\u001c<RZ^N𠩴󰑨7:h𥽫\u0015s𩓺\u001d1,A\u001eSv\u001fgY0",
+                    "value": "y󸿮󶌚i􈫹𛲠]ZkG𪩚o\u0008󲞳󰼽\u0008o\u000e:s"
                 },
                 {
-                    "value": "𦓏q𠼩􁃾#軛\u0001􏕙j\u0000𧐯󹯨Ks𨳵D𠡵",
-                    "type": "\u0003y𡲀-X(􃣧\u000eYea6􆫟"
+                    "type": "\u0003y𡲀-X(􃣧\u000eYea6􆫟",
+                    "value": "𦓏q𠼩􁃾#軛\u0001􏕙j\u0000𧐯󹯨Ks𨳵D𠡵"
                 },
                 {
-                    "value": "፼0r\u001e\u000e􊕢ᙬ󷶿0",
-                    "type": "H"
+                    "type": "H",
+                    "value": "፼0r\u001e\u000e􊕢ᙬ󷶿0"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {}
-}
\ No newline at end of file
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_18.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_18.json
index a9ba3eecd03..3cbbf97a43b 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_18.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_18.json
@@ -1,71 +1,71 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "6헇ⷄq": "{?􁫮\u0006y~",
+        "y𨏛振Y2O[𣤾(h9N": "m7㚄na\u000c𩟁􀙡\n\u0000\u0013SyB􀀉",
+        "豇~\u0006\u0011\u0016􀞚􍔱\u001b\u0015.C7\u000eOk􁾡ﳮ/<􁲝@I󶣇": "\u0019lc#c􅿙􊼖dPc6Lr|.M\"뱳y\u001c\\:󿄬/􏐏m",
+        "𡦢+⋚QVJ󳩉fV#!0sI\u001f%\u0010󷥤\u0008~󼼩(\u000e": "븂i􍼵8\u000fq󸭣k\n厽o4Hw\u0002\u001c"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "ᖀ:\u001eJN⪟C9JoA)i^\u0005]vZ=􎲴p􌀏K\u0019𪥯nb\u0015􆟯",
-                    "type": "o\"𫠯@}𘕾C􎃩{!)󴭂\t,󼍕Q,l󹊎󽆬􎪱\\N攆Cq\r\u0001Q"
+                    "type": "o\"𫠯@}𘕾C􎃩{!)󴭂\t,󼍕Q,l󹊎󽆬􎪱\\N攆Cq\r\u0001Q",
+                    "value": "ᖀ:\u001eJN⪟C9JoA)i^\u0005]vZ=􎲴p􌀏K\u0019𪥯nb\u0015􆟯"
                 },
                 {
-                    "value": "\u0012\u001cMl",
-                    "type": "^􍟿󴆙`"
+                    "type": "^􍟿󴆙`",
+                    "value": "\u0012\u001cMl"
                 },
                 {
-                    "value": "wwMX@\u0010t\u0000􇩿\u0010\u0014'/Qb􅗭󽄣󰲩B\u001az",
-                    "type": "{\u001duHh1c"
+                    "type": "{\u001duHh1c",
+                    "value": "wwMX@\u0010t\u0000􇩿\u0010\u0014'/Qb􅗭󽄣󰲩B\u001az"
                 },
                 {
-                    "value": "􎙤0헭􆞇呐󷈘A𭗌dF\u0012g\u0013a\u0015|\u0008",
-                    "type": "󻪋)􋽊A+r𖧃0fHG쁫iH\u0019󽤔\rl%u'\u000b􃛹\t9𦇮Ud𦝾"
+                    "type": "󻪋)􋽊A+r𖧃0fHG쁫iH\u0019󽤔\rl%u'\u000b􃛹\t9𦇮Ud𦝾",
+                    "value": "􎙤0헭􆞇呐󷈘A𭗌dF\u0012g\u0013a\u0015|\u0008"
                 },
                 {
-                    "value": "\n\u0008G𣘓\u000e\u0019\u00055%𓍶6Gz!Wj/i\u0011qk􉑡U󹱒",
-                    "type": "x𫐇s"
+                    "type": "x𫐇s",
+                    "value": "\n\u0008G𣘓\u000e\u0019\u00055%𓍶6Gz!Wj/i\u0011qk􉑡U󹱒"
                 },
                 {
-                    "value": "▩\u000c",
-                    "type": "/`𣠮/}砲𝂜󷑛Qr􃲱>p󸯶󹬮$\nt6󰪦􍕡Y}\u0010\u0010􌤘,"
+                    "type": "/`𣠮/}砲𝂜󷑛Qr􃲱>p󸯶󹬮$\nt6󰪦􍕡Y}\u0010\u0010􌤘,",
+                    "value": "▩\u000c"
                 },
                 {
-                    "value": "~*\rm",
-                    "type": "G7t\u0018c"
+                    "type": "G7t\u0018c",
+                    "value": "~*\rm"
                 },
                 {
-                    "value": "#\u0001􌈜/9󻱾EϺH\u0012P\u0010",
-                    "type": ">-E[?l􆄍\u0013h\u0003A$u{p|-W97u\u0017f\u0016"
+                    "type": ">-E[?l􆄍\u0013h\u0003A$u{p|-W97u\u0017f\u0016",
+                    "value": "#\u0001􌈜/9󻱾EϺH\u0012P\u0010"
                 },
                 {
-                    "value": "=\u001b;>𮤓EĒ\u0008󳴚p􉳎9𖫓,\u0016F󰣰􃝛$",
-                    "type": "\n󽸵&3掠~\u0008[\u0014o8􉉈𑨬嘦}󴣉󽎰-\n"
+                    "type": "\n󽸵&3掠~\u0008[\u0014o8􉉈𑨬嘦}󴣉󽎰-\n",
+                    "value": "=\u001b;>𮤓EĒ\u0008󳴚p􉳎9𖫓,\u0016F󰣰􃝛$"
                 },
                 {
-                    "value": "B􁌚J;",
-                    "type": "𧭜⠶*2􊗰󷭦\u000f\u000b:"
+                    "type": "𧭜⠶*2􊗰󷭦\u000f\u000b:",
+                    "value": "B􁌚J;"
                 },
                 {
-                    "value": "\u0013\u0012ꅔ聈M4ri4K=zA",
-                    "type": "s𗔴(󷴖𛈄\u001fi󵠋Io🖻q1%l/\u00101e\u0003"
+                    "type": "s𗔴(󷴖𛈄\u001fi󵠋Io🖻q1%l/\u00101e\u0003",
+                    "value": "\u0013\u0012ꅔ聈M4ri4K=zA"
                 },
                 {
-                    "value": "g<􆵪2FV\u0004=[!{U`",
-                    "type": "j\u0012\u00158a_"
+                    "type": "j\u0012\u00158a_",
+                    "value": "g<􆵪2FV\u0004=[!{U`"
                 },
                 {
-                    "value": "𥴨L+j$󹯗}{뼃\t_=𓎜ズ좇[\u0018\n𪥕i𐬢Y)󲹕",
-                    "type": "􈲕p-\u0010\u0013𤊖\u0006􈖺|\u0000e}yY"
+                    "type": "􈲕p-\u0010\u0013𤊖\u0006􈖺|\u0000e}yY",
+                    "value": "𥴨L+j$󹯗}{뼃\t_=𓎜ズ좇[\u0018\n𪥕i𐬢Y)󲹕"
                 },
                 {
-                    "value": "\u0000𑖂􎃧󲦟@󻛪\u000f@𢥺@",
-                    "type": "Z􈔍;}3\u001c"
+                    "type": "Z􈔍;}3\u001c",
+                    "value": "\u0000𑖂􎃧󲦟@󻛪\u000f@𢥺@"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "6헇ⷄq": "{?􁫮\u0006y~",
-        "豇~\u0006\u0011\u0016􀞚􍔱\u001b\u0015.C7\u000eOk􁾡ﳮ/<􁲝@I󶣇": "\u0019lc#c􅿙􊼖dPc6Lr|.M\"뱳y\u001c\\:󿄬/􏐏m",
-        "y𨏛振Y2O[𣤾(h9N": "m7㚄na\u000c𩟁􀙡\n\u0000\u0013SyB􀀉",
-        "𡦢+⋚QVJ󳩉fV#!0sI\u001f%\u0010󷥤\u0008~󼼩(\u000e": "븂i􍼵8\u000fq󸭣k\n厽o4Hw\u0002\u001c"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_19.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_19.json
index e4a7ea726f1..6898bc8c717 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_19.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_19.json
@@ -1,22 +1,22 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\r\"鶮T|l0$\u0013": "ᕺq\u0011\u0006&牸つp𦗛\u0010\u001cY",
+        "P2\u0008\u00051&󻼋\u0007㥎\u001e󷫞_q,-u𦽹_u\u001b2𒇭;k\u0018": "GJ􋆊",
+        "𠱀K􇞵P.7􃧈s|\u001bUv\u0014w𖫜\u000eB/\u001e𔐭/[T\u0016YF𩞋": "\u000c\u0000𧏿E\u001f47(\n"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "d蔈􆖦)A䞲k@\u001a􌀸<􁚚𠏰I󵁞\u0011}:\u0016􉇤󲱞$\u000b\u0019\u0012&OMW",
-                    "type": "l%豒\u0006\u0014b𔐊𝒇\u0019$󶾿5~f錠H"
+                    "type": "l%豒\u0006\u0014b𔐊𝒇\u0019$󶾿5~f錠H",
+                    "value": "d蔈􆖦)A䞲k@\u001a􌀸<􁚚𠏰I󵁞\u0011}:\u0016􉇤󲱞$\u000b\u0019\u0012&OMW"
                 },
                 {
-                    "value": "󴒷􂢊x孴3\n䡕󾃽俸\r0e\u0010󻖀",
-                    "type": "\u0013\u0012󺤝vS\t\u0000\u0014􆅯<\u0019ț\u0010<\u0000xR\u001aU\u001cx\u0016\\JtiN?&􊨪"
+                    "type": "\u0013\u0012󺤝vS\t\u0000\u0014􆅯<\u0019ț\u0010<\u0000xR\u001aU\u001cx\u0016\\JtiN?&􊨪",
+                    "value": "󴒷􂢊x孴3\n䡕󾃽俸\r0e\u0010󻖀"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "𠱀K􇞵P.7􃧈s|\u001bUv\u0014w𖫜\u000eB/\u001e𔐭/[T\u0016YF𩞋": "\u000c\u0000𧏿E\u001f47(\n",
-        "\r\"鶮T|l0$\u0013": "ᕺq\u0011\u0006&牸つp𦗛\u0010\u001cY",
-        "P2\u0008\u00051&󻼋\u0007㥎\u001e󷫞_q,-u𦽹_u\u001b2𒇭;k\u0018": "GJ􋆊"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_2.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_2.json
index b81e33d84bd..472918e60e8 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_2.json
@@ -1,77 +1,77 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u001d}+C": "2\"`$^\u001ew\u001b􆹁&)c\rH",
+        "\u001f\u001fF𡮸{\u0013\u0008r\u0002%$%Q󸱪씐v![V\t\u0008B=\u001d": "\u0007􆸘{􉬪~趗Va~QG􍴦^c\u0000Uk~{\u0011S",
+        "\"ᛈ\u0011](􏏠": "\u000cNL\nW𢘿𧎷g7\u0007\"n>􂽥\u0001󺈇6𤬻􃷲󰈰zj5󹄨]畗o",
+        "%\"hn%'Ls^\"Ej": "M𣞅2h6\"",
+        ".r\u0000ASiNn": "@(A)𦫦󽷐\"^\u001e𥘄nT )\u0000𡍃go%7i󹘨",
+        "1Dj\u0012n𒋾$#\u0007\u0017": "\u001a&\u0014⨝\u0003P\u000c[",
+        "98\nJ𫈖s\u0006\u000fG󻆤": "^Ꞁ𨼜𠢺<1y:D𦘯\u0004G\u0005^𝖧+𗁴 卒\u000f𧮼y",
+        ">hI\u0002s\u0007K3_\u0000fO": "\r+",
+        ">腵!]􀠂A7~􀜦<5Qom\rn􌄬ZKZHL\u000b": "rh􉾺𦞧󷗻󶂓j",
+        "K\u0008N\u0016𩣐4\u0006i": "m\u0017~􄑤􌞣\u0005􀨿",
+        "Mc\u001f􉬹J;": "V*IL\u0002⍤W\u0018\u000efL(xbD􋞯Au@(U;",
+        "TI􌟀l8\r\u000c": "Bxe\u0012󵈊}L1#Z",
+        "T𦞂+A:\u0002\u001c\u0014@􉩑󶺮ri\\𭕠\u0011A\"5дk􆍪󹟭q": "u\ni󺹻\n=yf!V\u001e𠱣􍸫iq",
+        "U}􂼛;Q􁘟4\u001e=㘲w": "<9󱍝\u0012\u0017𪋃蔃󺸛U󴗬f𡲧>󱏟󹣤\u001f",
+        "W\u001f\u001e/𗈚zPM𢅍6\u0007鰔\u0000\u000bA󼘾2𩘉\"I": "q􀗬􊀝ൌ}C~l󳝄\u000eg?ꄜ]l5\r\u0001br􋙑tMk",
+        "cB)#": "\u0018:AjO\u0011\u0017c#{\rǬX\u0000釜",
+        "ꯗ\\~\u0017+/A\u0003": "TㄾV􍞨Tcb\"\u0013󻌅",
+        "𔖮~K𩂽1[\u0017󹥝\u001bAx\u0011_r`p>?𒊜󳰩K_􉗃WqQzW9": "C􃄐.~\\^1)昄T",
+        "𗨄*": "4\u0015U䘗W\u0012ea𘓠\u0001󲙻􇑝\u0016𡞀☯",
+        "𧫸\"^>:tx􀟧􄌬𑅙2*\u001bL\nd;n%}": "!􉺞\\j􅓚𣥊(3㈻\\tytDĜV𓅪NU\u001f`Q𗑢I\u0003CI\u0006𨠌",
+        "𫏵Ly󱥢\u0017}𡅰ZH\u000e󽻞𥺲o}\u000c􈷪w\u001cf3\u0012]J\u001a\u0016": "xi󵠏^\u0001X\u001c",
+        "𭅰qB\u0017\u0011\"󲁏􊯫+⅊\u001fL": "r􀑣\u0019^-𑊑J\u0014fY>\u0007p s\u000ez",
+        "󵌆": "\u0005\u0004B􎞤\u001c󶺠'3p9􋆼\u001bl蟧\u0007\u0001􅱢w",
+        "󹍋OH6": "ml󼼔𗯑􏔼𥡦'",
+        "󹜃e󽢩q?vY𪶳R洼U\u0006>5rr\u001e\u0017[𠄇𡾃P\u000c\u0016\r?𓍱": "\u0001󺷳Q-\u000eb(rT􌔩",
+        "󻗟\u000bh\u001a\u001dY\u0015𢲢c𫍫t~󿭸L\u0003\tEH&􀋅yT y\u0017S\u0010": "N~F彀Z<\u0005􂾠a8Y"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "\"\u0004hc1K瘦",
-                    "type": "v􀉋vq𡸈F𧟃W􈥖\r8牐.C;"
+                    "type": "v􀉋vq𡸈F𧟃W􈥖\r8牐.C;",
+                    "value": "\"\u0004hc1K瘦"
                 },
                 {
-                    "value": "\u0012􌠱\u001f\u0014b츛\u0019T\u0003E\u0008E𐔠\u0019\u0017\u000e􅩳",
-                    "type": "v몊\r\u000b\u0012k511}Xp􂜄𭮒q507\u00033"
+                    "type": "v몊\r\u000b\u0012k511}Xp􂜄𭮒q507\u00033",
+                    "value": "\u0012􌠱\u001f\u0014b츛\u0019T\u0003E\u0008E𐔠\u0019\u0017\u000e􅩳"
                 },
                 {
-                    "value": "󺺔􏸘\u001dD􁈊rN􊝤N󿴓挎;|q7",
-                    "type": "Cr\u001f𢣰훊䉄x󳛐󿁾t\n䅩z; F𬾜r𤼑𤼍-\u0001"
+                    "type": "Cr\u001f𢣰훊䉄x󳛐󿁾t\n䅩z; F𬾜r𤼑𤼍-\u0001",
+                    "value": "󺺔􏸘\u001dD􁈊rN􊝤N󿴓挎;|q7"
                 },
                 {
-                    "value": "\u0017\u0017c𭔑LY\u0013\u0002󼭗𗍀Q oEo",
-                    "type": "kzXo[1\u001eI\t󰳱T\u0007\u0010󻇐U𮃏\u000eo\rJҽb󺫭󱶨K~"
+                    "type": "kzXo[1\u001eI\t󰳱T\u0007\u0010󻇐U𮃏\u000eo\rJҽb󺫭󱶨K~",
+                    "value": "\u0017\u0017c𭔑LY\u0013\u0002󼭗𗍀Q oEo"
                 },
                 {
-                    "value": "\u0004䂨+_\\1\u0016\u0005𗖔GyIl&\u0010k\u0015􎹎.Vy\u0017䫚(8",
-                    "type": "\u001b󾣝𑁍\u0000\u0015\u000cc􆧹󿈪Q%\u0014IDɝYLlMRu"
+                    "type": "\u001b󾣝𑁍\u0000\u0015\u000cc􆧹󿈪Q%\u0014IDɝYLlMRu",
+                    "value": "\u0004䂨+_\\1\u0016\u0005𗖔GyIl&\u0010k\u0015􎹎.Vy\u0017䫚(8"
                 },
                 {
-                    "value": "𠻕E\u001c\\Oy9M\u0015bK",
-                    "type": "5^s꺈ꡅ􋕂\u0003_\u0010\u0000\u0015슼䫞V <"
+                    "type": "5^s꺈ꡅ􋕂\u0003_\u0010\u0000\u0015슼䫞V <",
+                    "value": "𠻕E\u001c\\Oy9M\u0015bK"
                 },
                 {
-                    "value": "qg\u0001𪵞𥲮.:Sa󰦻1\u0005s5!볡1:&z7x𛈪󴽅\u000c\u001f닟􄞔􂦳",
-                    "type": "ҳ\u000b\"j\u001dE\u0016YVm𢨏\u0012\\{\u0007h􂆕𠸷"
+                    "type": "ҳ\u000b\"j\u001dE\u0016YVm𢨏\u0012\\{\u0007h􂆕𠸷",
+                    "value": "qg\u0001𪵞𥲮.:Sa󰦻1\u0005s5!볡1:&z7x𛈪󴽅\u000c\u001f닟􄞔􂦳"
                 },
                 {
-                    "value": "?W􉓚󳛤4;𠀶)\u0013-Z?\u001ceUjw𪲅h",
-                    "type": "N\u0002􋷤\u0007󴰏e𦢟Aw"
+                    "type": "N\u0002􋷤\u0007󴰏e𦢟Aw",
+                    "value": "?W􉓚󳛤4;𠀶)\u0013-Z?\u001ceUjw𪲅h"
                 },
                 {
-                    "value": "􊨚T/I+8Q拰6m􇣗𗈝;󹏖;5󹈍E󹚫|\t\t𑠠\u0018",
-                    "type": "\u000e𣾱ٍ\u0003𢾜􄅿1up\u0014\u0008W_P,mu"
+                    "type": "\u000e𣾱ٍ\u0003𢾜􄅿1up\u0014\u0008W_P,mu",
+                    "value": "􊨚T/I+8Q拰6m􇣗𗈝;󹏖;5󹈍E󹚫|\t\t𑠠\u0018"
                 },
                 {
-                    "value": "U+延\u0016a󳱓m\\,n\u0014D𢉉5𘢅mY󰷘\u00010<w𪜯\n\u0005􌶃2𤮭𨍚\u0014",
-                    "type": "ow󽌆\u001bLe`\u0003-\u0010en*Ứ!󿤼󴩪󿿨󵔕[D4{\u0001\u0004\u0004H6"
+                    "type": "ow󽌆\u001bLe`\u0003-\u0010en*Ứ!󿤼󴩪󿿨󵔕[D4{\u0001\u0004\u0004H6",
+                    "value": "U+延\u0016a󳱓m\\,n\u0014D𢉉5𘢅mY󰷘\u00010<w𪜯\n\u0005􌶃2𤮭𨍚\u0014"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        ">hI\u0002s\u0007K3_\u0000fO": "\r+",
-        "%\"hn%'Ls^\"Ej": "M𣞅2h6\"",
-        "T𦞂+A:\u0002\u001c\u0014@􉩑󶺮ri\\𭕠\u0011A\"5дk􆍪󹟭q": "u\ni󺹻\n=yf!V\u001e𠱣􍸫iq",
-        "󵌆": "\u0005\u0004B􎞤\u001c󶺠'3p9􋆼\u001bl蟧\u0007\u0001􅱢w",
-        "𗨄*": "4\u0015U䘗W\u0012ea𘓠\u0001󲙻􇑝\u0016𡞀☯",
-        "K\u0008N\u0016𩣐4\u0006i": "m\u0017~􄑤􌞣\u0005􀨿",
-        "TI􌟀l8\r\u000c": "Bxe\u0012󵈊}L1#Z",
-        "cB)#": "\u0018:AjO\u0011\u0017c#{\rǬX\u0000釜",
-        "1Dj\u0012n𒋾$#\u0007\u0017": "\u001a&\u0014⨝\u0003P\u000c[",
-        "W\u001f\u001e/𗈚zPM𢅍6\u0007鰔\u0000\u000bA󼘾2𩘉\"I": "q􀗬􊀝ൌ}C~l󳝄\u000eg?ꄜ]l5\r\u0001br􋙑tMk",
-        "\u001f\u001fF𡮸{\u0013\u0008r\u0002%$%Q󸱪씐v![V\t\u0008B=\u001d": "\u0007􆸘{􉬪~趗Va~QG􍴦^c\u0000Uk~{\u0011S",
-        "󹜃e󽢩q?vY𪶳R洼U\u0006>5rr\u001e\u0017[𠄇𡾃P\u000c\u0016\r?𓍱": "\u0001󺷳Q-\u000eb(rT􌔩",
-        "ꯗ\\~\u0017+/A\u0003": "TㄾV􍞨Tcb\"\u0013󻌅",
-        "\"ᛈ\u0011](􏏠": "\u000cNL\nW𢘿𧎷g7\u0007\"n>􂽥\u0001󺈇6𤬻􃷲󰈰zj5󹄨]畗o",
-        "󻗟\u000bh\u001a\u001dY\u0015𢲢c𫍫t~󿭸L\u0003\tEH&􀋅yT y\u0017S\u0010": "N~F彀Z<\u0005􂾠a8Y",
-        ".r\u0000ASiNn": "@(A)𦫦󽷐\"^\u001e𥘄nT )\u0000𡍃go%7i󹘨",
-        "𭅰qB\u0017\u0011\"󲁏􊯫+⅊\u001fL": "r􀑣\u0019^-𑊑J\u0014fY>\u0007p s\u000ez",
-        "98\nJ𫈖s\u0006\u000fG󻆤": "^Ꞁ𨼜𠢺<1y:D𦘯\u0004G\u0005^𝖧+𗁴 卒\u000f𧮼y",
-        ">腵!]􀠂A7~􀜦<5Qom\rn􌄬ZKZHL\u000b": "rh􉾺𦞧󷗻󶂓j",
-        "\u001d}+C": "2\"`$^\u001ew\u001b􆹁&)c\rH",
-        "𧫸\"^>:tx􀟧􄌬𑅙2*\u001bL\nd;n%}": "!􉺞\\j􅓚𣥊(3㈻\\tytDĜV𓅪NU\u001f`Q𗑢I\u0003CI\u0006𨠌",
-        "Mc\u001f􉬹J;": "V*IL\u0002⍤W\u0018\u000efL(xbD􋞯Au@(U;",
-        "U}􂼛;Q􁘟4\u001e=㘲w": "<9󱍝\u0012\u0017𪋃蔃󺸛U󴗬f𡲧>󱏟󹣤\u001f",
-        "󹍋OH6": "ml󼼔𗯑􏔼𥡦'",
-        "𔖮~K𩂽1[\u0017󹥝\u001bAx\u0011_r`p>?𒊜󳰩K_􉗃WqQzW9": "C􃄐.~\\^1)昄T",
-        "𫏵Ly󱥢\u0017}𡅰ZH\u000e󽻞𥺲o}\u000c􈷪w\u001cf3\u0012]J\u001a\u0016": "xi󵠏^\u0001X\u001c"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_20.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_20.json
index 68ff18beed8..747953e6cee 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_20.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_20.json
@@ -1,82 +1,82 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "y᪂=o𠮳\u00178Cs)𤉦@\u0010": "\u000e纽\u000b𗐋D􊝒\u0012𝗈B*\u00062\u000b\u001cM􊒈kR*V",
+        "}󴍋𗢆&\u001b\u0018󹐸𦔆嗞z%\u001dq榟": "􆬘󼕋'84\u001en􊺡󲁭𐢍d\u001f𢣭𨁸|􆭟:w\u0000-\u0004𑫡\u0003",
+        "𦠋Bf\\󰺵=\u0018Yq𐨰`": "\u001eo\u0004BPSc"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "V\u0003􊭗\u000e즭r\u0006a",
-                    "type": "􋩟>MS󸑑\tZ\r(#藕=󾲉+d󽋋𪅏"
+                    "type": "􋩟>MS󸑑\tZ\r(#藕=󾲉+d󽋋𪅏",
+                    "value": "V\u0003􊭗\u000e즭r\u0006a"
                 },
                 {
-                    "value": "T<ஸ\"\u000cz\u001f\u0008",
-                    "type": "^󽥱3d逺uw\u0005\u0005M𠧴Eꁧ[􂑚称\u0000橕p𨺥"
+                    "type": "^󽥱3d逺uw\u0005\u0005M𠧴Eꁧ[􂑚称\u0000橕p𨺥",
+                    "value": "T<ஸ\"\u000cz\u001f\u0008"
                 },
                 {
-                    "value": "𥿭\u0007\u000b󠇋5]⚍\"\u0001u쿭𬞜\u000bv-",
-                    "type": "秌x𥡖\u0001"
+                    "type": "秌x𥡖\u0001",
+                    "value": "𥿭\u0007\u000b󠇋5]⚍\"\u0001u쿭𬞜\u000bv-"
                 },
                 {
-                    "value": "EhJ@{x뤷\r𦒦O\r$HD1𧧛󻮏\u0013􃥛󳘨󵞑ⷀ}\u0002",
-                    "type": "󸔿\"}i]\u0001\u00157𤰟\u0013\u0002\u0005X\u000bGN\u0010\u0002"
+                    "type": "󸔿\"}i]\u0001\u00157𤰟\u0013\u0002\u0005X\u000bGN\u0010\u0002",
+                    "value": "EhJ@{x뤷\r𦒦O\r$HD1𧧛󻮏\u0013􃥛󳘨󵞑ⷀ}\u0002"
                 },
                 {
-                    "value": "BtVr𘪪𥀩󿉌5;FN<\u0013𩳽\n􅼸'Ag",
-                    "type": "H󲕶;"
+                    "type": "H󲕶;",
+                    "value": "BtVr𘪪𥀩󿉌5;FN<\u0013𩳽\n􅼸'Ag"
                 },
                 {
-                    "value": "\u0014-4􀬟y.\u0019Qlz\u0012s󴣘􍪌^\u0017^\n\u0005颫[",
-                    "type": "T󽪶a󹱐O'󱲌𨗾y+7􎵮H\u0007𧧴D?\u001cN)\u001aVG𨐶𦧟\u001a)􆐮촳"
+                    "type": "T󽪶a󹱐O'󱲌𨗾y+7􎵮H\u0007𧧴D?\u001cN)\u001aVG𨐶𦧟\u001a)􆐮촳",
+                    "value": "\u0014-4􀬟y.\u0019Qlz\u0012s󴣘􍪌^\u0017^\n\u0005颫["
                 },
                 {
-                    "value": "}\u001f_SE𩟀^趔i\u00160",
-                    "type": ""
+                    "type": "",
+                    "value": "}\u001f_SE𩟀^趔i\u00160"
                 },
                 {
-                    "value": "]\u0003􅝷X\u000cT𫌯\u001fy袅\u000cR",
-                    "type": "LE󺖕Y𡬐억ꢙ𩰨`"
+                    "type": "LE󺖕Y𡬐억ꢙ𩰨`",
+                    "value": "]\u0003􅝷X\u000cT𫌯\u001fy袅\u000cR"
                 },
                 {
-                    "value": "\u0013󽩩􅝀\u0003a𬜆\u000e/𦉟𫚈=z\u0006,𣨉󻂹%2\u0006\u0010*\u000e",
-                    "type": "\u0002󱌟"
+                    "type": "\u0002󱌟",
+                    "value": "\u0013󽩩􅝀\u0003a𬜆\u000e/𦉟𫚈=z\u0006,𣨉󻂹%2\u0006\u0010*\u000e"
                 },
                 {
-                    "value": "Y%\u001b􇾻\u001e\u0016f@\u001f{\u0005\u001biM􌠺ii_",
-                    "type": "W#@WNS􈦃𝤅\u001fv4H"
+                    "type": "W#@WNS􈦃𝤅\u001fv4H",
+                    "value": "Y%\u001b􇾻\u001e\u0016f@\u001f{\u0005\u001biM􌠺ii_"
                 },
                 {
-                    "value": ";cnns𘉀󵽖Wx<#󹷸@􋬭\u0016􍅶K􁗭M,􌌀GᙨF㾯':s",
-                    "type": "a뼜xp󳺫M\u001c鲧:틆즠l\u001fG􂺌"
+                    "type": "a뼜xp󳺫M\u001c鲧:틆즠l\u001fG􂺌",
+                    "value": ";cnns𘉀󵽖Wx<#󹷸@􋬭\u0016􍅶K􁗭M,􌌀GᙨF㾯':s"
                 },
                 {
-                    "value": "3Ly?\u001b",
-                    "type": "a:XV䂾Z􍁫c:J𫬯#󶋏|maO)FD:b"
+                    "type": "a:XV䂾Z􍁫c:J𫬯#󶋏|maO)FD:b",
+                    "value": "3Ly?\u001b"
                 },
                 {
-                    "value": "!~晑\u0003\u0007\u0004􌜕􆙻\u0000*󽦎D􍮼gC\u0010h\u0004*  \u001f\u0001枊󿣏𮋺",
-                    "type": "󷣤;禷訴Ed\u000eGn󺟥!\u0001/4<f􅰣^b\u0014(󼆲m"
+                    "type": "󷣤;禷訴Ed\u000eGn󺟥!\u0001/4<f􅰣^b\u0014(󼆲m",
+                    "value": "!~晑\u0003\u0007\u0004􌜕􆙻\u0000*󽦎D􍮼gC\u0010h\u0004*  \u001f\u0001枊󿣏𮋺"
                 },
                 {
-                    "value": "*\u0005\u000c􍺨",
-                    "type": ".^A种V\t\u00171qjYV󹦟\u0008\u0012^_%}\u001d"
+                    "type": ".^A种V\t\u00171qjYV󹦟\u0008\u0012^_%}\u001d",
+                    "value": "*\u0005\u000c􍺨"
                 },
                 {
-                    "value": "󷫔lJ`?\u0006_,\u0005𫃀5󺱋t\u000cU𠟧\u000f􉪷b\u0013y-",
-                    "type": "`D'v;}{\u0016\u000cl猳Ar="
+                    "type": "`D'v;}{\u0016\u000cl猳Ar=",
+                    "value": "󷫔lJ`?\u0006_,\u0005𫃀5󺱋t\u000cU𠟧\u000f􉪷b\u0013y-"
                 },
                 {
-                    "value": "w$L𧊊\u000c\u001c憤6\u0008闽&n󸰌nT}塪ddRi",
-                    "type": "}IgmU𥙪zFN󻍙\u0011\u0018\u0016#"
+                    "type": "}IgmU𥙪zFN󻍙\u0011\u0018\u0016#",
+                    "value": "w$L𧊊\u000c\u001c憤6\u0008闽&n󸰌nT}塪ddRi"
                 },
                 {
-                    "value": "􉧩v@􁭛Z",
-                    "type": "󱎵`o1솥H.\u000e]HQ􆘫B"
+                    "type": "󱎵`o1솥H.\u000e]HQ􆘫B",
+                    "value": "􉧩v@􁭛Z"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "y᪂=o𠮳\u00178Cs)𤉦@\u0010": "\u000e纽\u000b𗐋D􊝒\u0012𝗈B*\u00062\u000b\u001cM􊒈kR*V",
-        "}󴍋𗢆&\u001b\u0018󹐸𦔆嗞z%\u001dq榟": "􆬘󼕋'84\u001en􊺡󲁭𐢍d\u001f𢣭𨁸|􆭟:w\u0000-\u0004𑫡\u0003",
-        "𦠋Bf\\󰺵=\u0018Yq𐨰`": "\u001eo\u0004BPSc"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_3.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_3.json
index 3fadd64021e..57d8be0fe22 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_3.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_3.json
@@ -1,109 +1,109 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0000iy\u0002^@\u00111qF󼣁d\u001fa>\u0015\u0002$]-=󳉧\u0010\u0004": "\u0014!󸼪𡶲i%$m?빔K=𭂟Z,􊱂",
+        "\u0001[z\u0014\n&:15\t󼶩砓\n𩧢&􆠱w󽏖z$K󽹀\u0010B󲊽/=󴤉0": "\u001f\u0012y핲Vh\u001exꝿm𣹊L\u0001􂏰/#𠤔",
+        "\u0019,Ky\u0007n-N\u0019b꫰": "G$O^󹑝𣓛w6􋂘\u0010㗓\u0001􄦎C㬸d怨\u0015ln|!oﶉ;\u0010[𩖥J",
+        "51􇴡&->": "󲖲铻Hষ􁔵y2\t\u0004p\u00072𬜐󼢉Gm})",
+        "B5𪇺u􈵭\u000f=h\u000c\u0008\n?pv,\u0003\u0006N4𣀪": "-󾚔𭑙󺖢vY\u000fя(",
+        "L\u0005􈶸": "\u0003󴰍y",
+        "Y": "=􂨛􋡬(|𐛈xb𡀾\u0010􉁩u*􆮅]1𣣂\u001f􎘠ﾬ둡",
+        "\\\u001d|\u0013hy𢂼\u0013唘W\u0000\u001dXHq\u0017D\u0011I\u0016􃥁\rK0b拴􁪐\u001e": "}o棲\"\u001d󸹓-`!𦓯QIn􁥹7uI\u000f\u0019\u001f𖽸F",
+        "`ਝQ8㫠W%􀘶U􃿗9": "\u0018U𝕭>\u0002JcZ\u0002\u001dt\u001eb\u0001\u0017􆒶쯽*\u0010𞋔b\u001dTඹ",
+        "k\u001d0*\u0014\u001fG𑊵?p\u0016a:&\u0010vN\u001dt\u001a/B,􄋭z_W": "I\u000c􊵌9g\u0017]\r𧰀缡-X7ꁵU=K󱚇,\u0019󷻆$=󳺮\u001c",
+        "n4🞓䬍K1\u00037ॷ􍒷󿱱PE\u0012\u0000CU\u0002\u0014􆏣􅤛󽭪ʠ4i~b": "rc\u0012􏪪\u0010􋺝?\u0014󠀯D纷k􂑃􇆰Y􋪙󰂷hK𪋄󲓽|􍭦\u0002@\u0016\u001eb􏜐",
+        "{*\u000c": "|S|=\u000b",
+        "𨜁\u001aoP⟞@p\u0003!𫃩\u0016$1󹖞\u0010 [𠌔ﴌ<􂒉󳵔𨊏滏Q\u0015": "\u0003󶒡빧pC9𣱻N􀑘療7-#\u0014􎩟",
+        "󳔫`$C󼐛+\u00198(m_t컴<*%\u001a󹙖󽮂[\u0015!󷤴'􀸀": "\u001a#z.􇲁\u0002\u0019\n"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "[!h쵄孳Nz\r󳶉􅙻𥗢ibz?",
-                    "type": "B􌰤?wѫ{𭒃i#?~}x\u0013\r\u001fc4𗙍C"
+                    "type": "B􌰤?wѫ{𭒃i#?~}x\u0013\r\u001fc4𗙍C",
+                    "value": "[!h쵄孳Nz\r󳶉􅙻𥗢ibz?"
                 },
                 {
-                    "value": "𡿳\u0006\u001b􄼉HB􌑭\na𧂱=>e\u0008",
-                    "type": "-\u0014x􅰧􅩖󴧈"
+                    "type": "-\u0014x􅰧􅩖󴧈",
+                    "value": "𡿳\u0006\u001b􄼉HB􌑭\na𧂱=>e\u0008"
                 },
                 {
-                    "value": ":v⾵@U-\u0002_Op;Y\t@􌴕I2[\u000b𨮗",
-                    "type": "x"
+                    "type": "x",
+                    "value": ":v⾵@U-\u0002_Op;Y\t@􌴕I2[\u000b𨮗"
                 },
                 {
-                    "value": "7YA\u000e\u0012kvꞟ䰈𫳰㻘􇤠:·#*pm7蕋\u000f\u001a󽟛憕u\u0005!\u0015",
-                    "type": "&\n䐯gg𖽗\u0001\u0000Zu\u0013󵞺\u0005l4yv`n鼳\u0007`\r4ꀳ`:"
+                    "type": "&\n䐯gg𖽗\u0001\u0000Zu\u0013󵞺\u0005l4yv`n鼳\u0007`\r4ꀳ`:",
+                    "value": "7YA\u000e\u0012kvꞟ䰈𫳰㻘􇤠:·#*pm7蕋\u000f\u001a󽟛憕u\u0005!\u0015"
                 },
                 {
-                    "value": "\u0006𦋉H",
-                    "type": "C\u0001𒆳🄓'lT𩕑`𫰍!I뱝􎜆TK𪤻b)􂂆\r"
+                    "type": "C\u0001𒆳🄓'lT𩕑`𫰍!I뱝􎜆TK𪤻b)􂂆\r",
+                    "value": "\u0006𦋉H"
                 },
                 {
-                    "value": "\u001fx\u0001𐧯<S\u0010\u0016j<l𐔏/D",
-                    "type": "󿱍o\u0000\t󳭇%f\n><\no`+󳞆v\"Y󾞖"
+                    "type": "󿱍o\u0000\t󳭇%f\n><\no`+󳞆v\"Y󾞖",
+                    "value": "\u001fx\u0001𐧯<S\u0010\u0016j<l𐔏/D"
                 },
                 {
-                    "value": "}*\u0002􉚳\u0007𗋡4(aY𘀭q󷓕",
-                    "type": "aJ\u001b\u001e*𩳨8K𦘼\u001aI\"|)=0o\u001f墚lY\u00009"
+                    "type": "aJ\u001b\u001e*𩳨8K𦘼\u001aI\"|)=0o\u001f墚lY\u00009",
+                    "value": "}*\u0002􉚳\u0007𗋡4(aY𘀭q󷓕"
                 },
                 {
-                    "value": "h:M{􁒄\u0017 \u000e𩡧*8􉾒V\u001e\u0003{<󴷀{\u0008Q",
-                    "type": "𢟇\u00045􋹤K軪􀯱2Q󺒴=f^g󷂳󲎋𠿒󰒻<u$􀌄𭸡8|"
+                    "type": "𢟇\u00045􋹤K軪􀯱2Q󺒴=f^g󷂳󲎋𠿒󰒻<u$􀌄𭸡8|",
+                    "value": "h:M{􁒄\u0017 \u000e𩡧*8􉾒V\u001e\u0003{<󴷀{\u0008Q"
                 },
                 {
-                    "value": "-Q糡l>T8~%)0m8𤕵Z󹔢QD\u0012w􏝃vT⒓k`C",
-                    "type": "S𮃖􅩯󷴴v󶶣wE2\"\u000c\u0007\u0007\"\u0015ᄽ/0}k,g#."
+                    "type": "S𮃖􅩯󷴴v󶶣wE2\"\u000c\u0007\u0007\"\u0015ᄽ/0}k,g#.",
+                    "value": "-Q糡l>T8~%)0m8𤕵Z󹔢QD\u0012w􏝃vT⒓k`C"
                 },
                 {
-                    "value": "\u0011b.h\u001a_󷫇\n\u0010𬿓!JHᱪn􅩳㶬6oQ󽬋",
-                    "type": "D.钥C􍏈󳅝\u000ef𡚣t𭪓G;Qp㷐􈩓\u0008"
+                    "type": "D.钥C􍏈󳅝\u000ef𡚣t𭪓G;Qp㷐􈩓\u0008",
+                    "value": "\u0011b.h\u001a_󷫇\n\u0010𬿓!JHᱪn􅩳㶬6oQ󽬋"
                 },
                 {
-                    "value": "iOv\u0007j|tl#lu*UF􌹥$\"H",
-                    "type": "#𖣽\u0005q𮖕휩󲌚\u0019\u0018@A5U𭘣Aj􍏌fi𪧚2I5􀃸s"
+                    "type": "#𖣽\u0005q𮖕휩󲌚\u0019\u0018@A5U𭘣Aj􍏌fi𪧚2I5􀃸s",
+                    "value": "iOv\u0007j|tl#lu*UF􌹥$\"H"
                 },
                 {
-                    "value": "苧eFEhD$\u0001L\u000f &tu",
-                    "type": "􍼀󵱕u𓂋󳕱𣚢d"
+                    "type": "􍼀󵱕u𓂋󳕱𣚢d",
+                    "value": "苧eFEhD$\u0001L\u000f &tu"
                 },
                 {
-                    "value": "𧇡󴉙z`󻍋\u001fED<1󻌙+󰜫mE7􁃇#",
-                    "type": "w_% XL}扁\u0011"
+                    "type": "w_% XL}扁\u0011",
+                    "value": "𧇡󴉙z`󻍋\u001fED<1󻌙+󰜫mE7􁃇#"
                 },
                 {
-                    "value": "Kh;𩯊𫒯)Y礹\u0006",
-                    "type": "􎗏vu/\u0000ಅK㬱8;;\u0003)𩸵M\u0004-qM\u0011\u000b𔔲"
+                    "type": "􎗏vu/\u0000ಅK㬱8;;\u0003)𩸵M\u0004-qM\u0011\u000b𔔲",
+                    "value": "Kh;𩯊𫒯)Y礹\u0006"
                 },
                 {
-                    "value": "1𑦢x2",
-                    "type": "`@𡂂󵙉p\u0002􍯎r0& Wk\u0011\u001f䓋M󸌓g?T\u0007l\u0014r"
+                    "type": "`@𡂂󵙉p\u0002􍯎r0& Wk\u0011\u001f䓋M󸌓g?T\u0007l\u0014r",
+                    "value": "1𑦢x2"
                 },
                 {
-                    "value": "d Y𘐺𡮽𝟮as{\n+󵰵I🁷U\u0003n",
-                    "type": "),􃲻u\u0012󶵪l#󴁃w辴\u000f𥐌I@a𐳋GpzB8"
+                    "type": "),􃲻u\u0012󶵪l#󴁃w辴\u000f𥐌I@a𐳋GpzB8",
+                    "value": "d Y𘐺𡮽𝟮as{\n+󵰵I🁷U\u0003n"
                 },
                 {
-                    "value": "_E_􏎈􌙮\u001bY",
-                    "type": ""
+                    "type": "",
+                    "value": "_E_􏎈􌙮\u001bY"
                 },
                 {
-                    "value": "쀆\u000cuXTC;󳅫u(厲\\鮷萧􊆶Y 󵱤𝁐\u0014",
-                    "type": "O \t晨a|,-\u000fuXwiL깲𫉭c&\u0018BDuG\t2"
+                    "type": "O \t晨a|,-\u000fuXwiL깲𫉭c&\u0018BDuG\t2",
+                    "value": "쀆\u000cuXTC;󳅫u(厲\\鮷萧􊆶Y 󵱤𝁐\u0014"
                 },
                 {
-                    "value": "&\u000f\u000b]􌖘\u0010E3𗞏쨠\u001c딉\u001d\u000f􅩔a\u0006􃚑\u0010c󷽡Tbo",
-                    "type": "^냸󰹫𧕥m\"\u0004B􋟣`麰󲶺l#𥷍\u0000<x晉b\\2J%"
+                    "type": "^냸󰹫𧕥m\"\u0004B􋟣`麰󲶺l#𥷍\u0000<x晉b\\2J%",
+                    "value": "&\u000f\u000b]􌖘\u0010E3𗞏쨠\u001c딉\u001d\u000f􅩔a\u0006􃚑\u0010c󷽡Tbo"
                 },
                 {
-                    "value": "D5􈅀🨤Q󻜣*@􀛥G\u0013􍗱𤽫暐",
-                    "type": "􅼒L18Cu󵫜􊆀i\u0011>􇜄\u001b󴘸?􈻊\u000e,\u0005󺅄p\u001c/컏w"
+                    "type": "􅼒L18Cu󵫜􊆀i\u0011>􇜄\u001b󴘸?􈻊\u000e,\u0005󺅄p\u001c/컏w",
+                    "value": "D5􈅀🨤Q󻜣*@􀛥G\u0013􍗱𤽫暐"
                 },
                 {
-                    "value": "y󱀼\u0005𥚦\u000e숆5]\u0016=j\u000fVv$}!󷤾?e䘥q",
-                    "type": "𧍾g"
+                    "type": "𧍾g",
+                    "value": "y󱀼\u0005𥚦\u000e숆5]\u0016=j\u000fVv$}!󷤾?e䘥q"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "B5𪇺u􈵭\u000f=h\u000c\u0008\n?pv,\u0003\u0006N4𣀪": "-󾚔𭑙󺖢vY\u000fя(",
-        "n4🞓䬍K1\u00037ॷ􍒷󿱱PE\u0012\u0000CU\u0002\u0014􆏣􅤛󽭪ʠ4i~b": "rc\u0012􏪪\u0010􋺝?\u0014󠀯D纷k􂑃􇆰Y􋪙󰂷hK𪋄󲓽|􍭦\u0002@\u0016\u001eb􏜐",
-        "{*\u000c": "|S|=\u000b",
-        "51􇴡&->": "󲖲铻Hষ􁔵y2\t\u0004p\u00072𬜐󼢉Gm})",
-        "`ਝQ8㫠W%􀘶U􃿗9": "\u0018U𝕭>\u0002JcZ\u0002\u001dt\u001eb\u0001\u0017􆒶쯽*\u0010𞋔b\u001dTඹ",
-        "\u0001[z\u0014\n&:15\t󼶩砓\n𩧢&􆠱w󽏖z$K󽹀\u0010B󲊽/=󴤉0": "\u001f\u0012y핲Vh\u001exꝿm𣹊L\u0001􂏰/#𠤔",
-        "Y": "=􂨛􋡬(|𐛈xb𡀾\u0010􉁩u*􆮅]1𣣂\u001f􎘠ﾬ둡",
-        "\\\u001d|\u0013hy𢂼\u0013唘W\u0000\u001dXHq\u0017D\u0011I\u0016􃥁\rK0b拴􁪐\u001e": "}o棲\"\u001d󸹓-`!𦓯QIn􁥹7uI\u000f\u0019\u001f𖽸F",
-        "k\u001d0*\u0014\u001fG𑊵?p\u0016a:&\u0010vN\u001dt\u001a/B,􄋭z_W": "I\u000c􊵌9g\u0017]\r𧰀缡-X7ꁵU=K󱚇,\u0019󷻆$=󳺮\u001c",
-        "𨜁\u001aoP⟞@p\u0003!𫃩\u0016$1󹖞\u0010 [𠌔ﴌ<􂒉󳵔𨊏滏Q\u0015": "\u0003󶒡빧pC9𣱻N􀑘療7-#\u0014􎩟",
-        "󳔫`$C󼐛+\u00198(m_t컴<*%\u001a󹙖󽮂[\u0015!󷤴'􀸀": "\u001a#z.􇲁\u0002\u0019\n",
-        "L\u0005􈶸": "\u0003󴰍y",
-        "\u0019,Ky\u0007n-N\u0019b꫰": "G$O^󹑝𣓛w6􋂘\u0010㗓\u0001􄦎C㬸d怨\u0015ln|!oﶉ;\u0010[𩖥J",
-        "\u0000iy\u0002^@\u00111qF󼣁d\u001fa>\u0015\u0002$]-=󳉧\u0010\u0004": "\u0014!󸼪𡶲i%$m?빔K=𭂟Z,􊱂"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_4.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_4.json
index d7fc3557d19..27e3361a282 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_4.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_4.json
@@ -1,63 +1,63 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "!B􅟃(󿛖^": "o|~2V⁼-⽊>\u0010\rh\r𤿗𤍥^so𡬂󶢊",
+        "=[3kw􉹿ൡ􈭅V𢛞]\"h𗂓K= V\u0007z7𤳸x\\𫬗\u000e󵵅\t,": "P𛂽,\u0010󲲱8􄢻S壐󼩾Ja2<9i\u000e\u0000]􉮄\u0012𫾽",
+        "𒔤\u0018 RS\u0000\u0002󳏏_\u000bubE\u0015:x:U6dj\u000be󽁢MS+V\u0005X": "M$.󵂋d\rB{Y",
+        "𠁣\u001a\u0000\u0001o=U󽆊Cf𪧇􏩠􉓍lf螰\u0014X3>Sdb􆿒": "[=h{H\"􆺉됬3jd@􉧎{"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "$\u0000]J\u0017\u0017Lg󷰱𧋑󽉦96I/2K",
-                    "type": "󱌦𤅏`Z峿b"
+                    "type": "󱌦𤅏`Z峿b",
+                    "value": "$\u0000]J\u0017\u0017Lg󷰱𧋑󽉦96I/2K"
                 },
                 {
-                    "value": "@\u000ex𢄜B􊩺_ I\u0013\t\u0014䀩\u0011%",
-                    "type": "v*:ㅦt\u0003\u0014*\u0019󰣍💮𛉽𡝶󲏒"
+                    "type": "v*:ㅦt\u0003\u0014*\u0019󰣍💮𛉽𡝶󲏒",
+                    "value": "@\u000ex𢄜B􊩺_ I\u0013\t\u0014䀩\u0011%"
                 },
                 {
-                    "value": "p牦豗K\u0003\u0017Du𠉸FAE󠇎]-M\u0000",
-                    "type": "\u0012*1A:)𠼺\r}q7~𗍼\u0000#Ze!􎫽ᤍ\u000b}("
+                    "type": "\u0012*1A:)𠼺\r}q7~𗍼\u0000#Ze!􎫽ᤍ\u000b}(",
+                    "value": "p牦豗K\u0003\u0017Du𠉸FAE󠇎]-M\u0000"
                 },
                 {
-                    "value": "~􌠋Y􏘟젔>X􊡆𥇬\u0014\u0018`\u001b𨉉\u0010\"45\u0000\u0006z\u0019􄴍\u001e",
-                    "type": "A󲜀𥴯<},\u001fzf}K8+𣓟𤑨N󶰍zI준o銃A𖢡\u0010𦏧\u001f"
+                    "type": "A󲜀𥴯<},\u001fzf}K8+𣓟𤑨N󶰍zI준o銃A𖢡\u0010𦏧\u001f",
+                    "value": "~􌠋Y􏘟젔>X􊡆𥇬\u0014\u0018`\u001b𨉉\u0010\"45\u0000\u0006z\u0019􄴍\u001e"
                 },
                 {
-                    "value": "",
-                    "type": "\u0008󵌒􊂨L9=.r𐃸)/\u0001PB.fr=Kh怮I􋠹Y娂l􃗞~U"
+                    "type": "\u0008󵌒􊂨L9=.r𐃸)/\u0001PB.fr=Kh怮I􋠹Y娂l􃗞~U",
+                    "value": ""
                 },
                 {
-                    "value": "𩶙􏻕A",
-                    "type": ""
+                    "type": "",
+                    "value": "𩶙􏻕A"
                 },
                 {
-                    "value": "\u0019\u0004􉢻y\u0015篖fr𬃗𣉄􆭉*Nq\u0011x.:]0\u0000",
-                    "type": "􄤂m\u0014󱰐w\"\u00176_"
+                    "type": "􄤂m\u0014󱰐w\"\u00176_",
+                    "value": "\u0019\u0004􉢻y\u0015篖fr𬃗𣉄􆭉*Nq\u0011x.:]0\u0000"
                 },
                 {
-                    "value": "\u001cZB䣓𠲉\"D;\u001eaG􆤳Pr󷺳CI􃤦\u0003",
-                    "type": "R>떶)\u0008d$\\nH􈗩𭙊𬒰\u001c|𨼨-􅳯 \u0010C󸸺0\u0011󿱏UP~"
+                    "type": "R>떶)\u0008d$\\nH􈗩𭙊𬒰\u001c|𨼨-􅳯 \u0010C󸸺0\u0011󿱏UP~",
+                    "value": "\u001cZB䣓𠲉\"D;\u001eaG􆤳Pr󷺳CI􃤦\u0003"
                 },
                 {
-                    "value": "LJ󰖁'\u0012M|(󱹗XS\u0019!i04",
-                    "type": ".XV󱊶𧭇\u0015\u0019o퓡\u000bq󼞪WB󱟎󿗞(\u001b󰄱B󻳛*"
+                    "type": ".XV󱊶𧭇\u0015\u0019o퓡\u000bq󼞪WB󱟎󿗞(\u001b󰄱B󻳛*",
+                    "value": "LJ󰖁'\u0012M|(󱹗XS\u0019!i04"
                 },
                 {
-                    "value": "𤰷𪿍\u00059󲹀\t",
-                    "type": "?-\u001a􅏃𪣒\u0006D.&y2=\u0000􋅡M􅶖꧕+\r+\u000c"
+                    "type": "?-\u001a􅏃𪣒\u0006D.&y2=\u0000􋅡M􅶖꧕+\r+\u000c",
+                    "value": "𤰷𪿍\u00059󲹀\t"
                 },
                 {
-                    "value": "Q󱂨󲽧Kf\u001c\u0003𫒝^\u001d\u0004􀌐<𩍊𢎕󱇓Hb@r\u000f0N;𤗆kX>",
-                    "type": "󺶁\u0008(k\u0015]"
+                    "type": "󺶁\u0008(k\u0015]",
+                    "value": "Q󱂨󲽧Kf\u001c\u0003𫒝^\u001d\u0004􀌐<𩍊𢎕󱇓Hb@r\u000f0N;𤗆kX>"
                 },
                 {
-                    "value": "x;9?Q(d6\u0016𢤶&󳬖smp\tkDn\u000e󰏯\u001a\u000eD",
-                    "type": "𧅳\u0005+\u000c:\u0006<"
+                    "type": "𧅳\u0005+\u000c:\u0006<",
+                    "value": "x;9?Q(d6\u0016𢤶&󳬖smp\tkDn\u000e󰏯\u001a\u000eD"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "!B􅟃(󿛖^": "o|~2V⁼-⽊>\u0010\rh\r𤿗𤍥^so𡬂󶢊",
-        "𒔤\u0018 RS\u0000\u0002󳏏_\u000bubE\u0015:x:U6dj\u000be󽁢MS+V\u0005X": "M$.󵂋d\rB{Y",
-        "𠁣\u001a\u0000\u0001o=U󽆊Cf𪧇􏩠􉓍lf螰\u0014X3>Sdb􆿒": "[=h{H\"􆺉됬3jd@􉧎{",
-        "=[3kw􉹿ൡ􈭅V𢛞]\"h𗂓K= V\u0007z7𤳸x\\𫬗\u000e󵵅\t,": "P𛂽,\u0010󲲱8􄢻S壐󼩾Ja2<9i\u000e\u0000]􉮄\u0012𫾽"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_5.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_5.json
index 66eb3a20b08..44c7b929949 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_5.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_5.json
@@ -1,20 +1,20 @@
 {
-    "urn:wire:scim:schemas:profile:1.0": {
-        "richInfo": {
-            "version": 0,
-            "fields": []
-        }
-    },
     "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "#\u001cmPU]朚g𗎍U\u000cWMoHJG>7b\u0004뽚􂀸\u000e\u0004{Y\u0005$": "􋽐zI𢒃󱉊Dp𩯪\u0014'g\u0007b_VC+0v\u0007c\u001e􎬵y\u000f\u0001K](U",
         "\u001a=3%w󶾡𘘧 u~󺿉t徭y+-󶞡Q[󿂚": "O'(\u0000􇈵\u0003'08𗱚b쫮ya\u0007󳕞󽸊c􁑡\u001a\u0002⪍뛺\u001a\u0004l",
-        "􋥠𗵣G\u0007:㖀$+\u001d|": "fs5)毠;\u000br#\u00076&\u0004\u0006\u001dڟy\u0018",
+        "#\u001cmPU]朚g𗎍U\u000cWMoHJG>7b\u0004뽚􂀸\u000e\u0004{Y\u0005$": "􋽐zI𢒃󱉊Dp𩯪\u0014'g\u0007b_VC+0v\u0007c\u001e􎬵y\u000f\u0001K](U",
         "2𭓓^": "矦\\󵨢Uw\u0004u3𥊄2Kn",
-        "𮌄Z􇌭7Vo𑢶􃧫}": "\u0000P\u0007𨄆菝󻎱󷁤󺒄\u0018Y_.YO",
+        "mL\u0015[𧤘𛈂屜Ẻ𠦺K\u001b󹐥C\u0006ws騐}z\u0003\u0001\u0004􂕖䳖\u0013": "\u000f8t#\u001br5\u001d\u0008\u0001AJj뮲rQnkU􅰪oᵧ(/<\u001b𭸼z􍝇7",
         "nz🔀\u0007𨡴/;'I󰢫]𝒂(\u0016in@45\u0012": "𥦎\u0018\u001b𣃦\r􏈫8𦪅8\u0001\u001d6l\ty\u0001􇙺\u001d!2T<N\u0004𗽵O",
         "󲈵:L󹇮0􂣺𡲵f𧬊o󴜍𥅶􍙿S\t": ">0H\u000c\u0005>𬗼OmK\u001aF@ܨ𫨊e\u0013P\u0007J𭡳M\u0016􉌮]6",
-        "𥠻w󱪿!\u000e7U\t|7𩘾a𗙀𬎳": "\u0001􋴛󹖌*Q\u000cHH6",
         "쎩": "⻘\u001d6\n📳zv5t扟􈉆𬄏m\u0011\u00069𬁬\r󰈾",
-        "mL\u0015[𧤘𛈂屜Ẻ𠦺K\u001b󹐥C\u0006ws騐}z\u0003\u0001\u0004􂕖䳖\u0013": "\u000f8t#\u001br5\u001d\u0008\u0001AJj뮲rQnkU􅰪oᵧ(/<\u001b𭸼z􍝇7"
+        "𥠻w󱪿!\u000e7U\t|7𩘾a𗙀𬎳": "\u0001􋴛󹖌*Q\u000cHH6",
+        "𮌄Z􇌭7Vo𑢶􃧫}": "\u0000P\u0007𨄆菝󻎱󷁤󺒄\u0018Y_.YO",
+        "􋥠𗵣G\u0007:㖀$+\u001d|": "fs5)毠;\u000br#\u00076&\u0004\u0006\u001dڟy\u0018"
+    },
+    "urn:wire:scim:schemas:profile:1.0": {
+        "richInfo": {
+            "fields": [],
+            "version": 0
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_6.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_6.json
index 290f29af2ee..43071735841 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_6.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_6.json
@@ -1,53 +1,53 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0007𫈲E󸞲􍘎];\u0017&A(& 𨗫󷋋p󰥇\u000f𭺂\u0013Ak}\u001b.-\"'": "\r",
+        "\u000b8𐘃\u0002": "􈠇x4\nam@봉\u000cd'扲4g%ngl\\g3d唝\u0010.􀟕a",
+        "\u0018": "\u000eS󱘳􌿉𑨼\n-s",
+        "0\u0005\"u\u001eS%": "\"\u0017󳷲\u0017sI􏵋󱭆\u001b\t\u0004wA\u001c?RUi􃁗_\u00144流/􏸑",
+        "K\"rO": "\u000b\u001c\u0017\u0019b𦋸s𩿓\u000f?􌐤2\")贞)",
+        "Q\u001e.󷏂􍅔󰱏\u0007\u0017FEj\u0012󹣨?j >Cv82vY~ mqy": "l>rV\u0017Yz𔕶pJF\u000f|,",
+        "X\u0014󶼂􀽟𤑓?A𘋾ꟿ𐫢@𦨬\u0007󹸍N@62\u0004r#d􍇂b\u0010": "􃓂t7",
+        "𮎞󽁞y󴄘--DG.D": "t}l뛥B\u00169\u0013D􏴦T􎭞!K|\u0005|:KU\u0019􍴮@𒀕+\u001b\u000e牺",
+        "󱛥8\r!弊R[\u0013G䕗\u0016\u0001\u000f?>LPKE\r劈\u0017􄭔": "􀝊@)R2I􋭲𪞲󴂢m6n8𫑉R𬰀𧹳9J1𮤲󰋔󰳤\u0001LRw\u0016􀚬",
+        "󽜔􄕪0琇􋸂󵵴󰁽ib\\RI𦊹Bb4\u0017􌑠&bTVv\u000f𐳆tꨚ􈾖9\u0013": "􂏷婫􁋊H󻆭\u0012𗊿6HE5󽢌\u0017𗓉􌙸Ἧ"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "a\u0004\u001f󱲫th𪩏󵖝",
-                    "type": ""
+                    "type": "",
+                    "value": "a\u0004\u001f󱲫th𪩏󵖝"
                 },
                 {
-                    "value": "\nq{A\u0016􍣀ή(}\u001b􉝝K2K\u0008\u0011Cit𪔁",
-                    "type": "􈴰1𛊇[\\y"
+                    "type": "􈴰1𛊇[\\y",
+                    "value": "\nq{A\u0016􍣀ή(}\u001b􉝝K2K\u0008\u0011Cit𪔁"
                 },
                 {
-                    "value": "\u0003􅂬\u001b𒐒둡󾪕i\u0014.d",
-                    "type": "cf|\u0016{\u0017d󼣦􆏈JoLS󶸝S\u000e|𦇤|eE<"
+                    "type": "cf|\u0016{\u0017d󼣦􆏈JoLS󶸝S\u000e|𦇤|eE<",
+                    "value": "\u0003􅂬\u001b𒐒둡󾪕i\u0014.d"
                 },
                 {
-                    "value": "z퐩\u00019[\u001b9f4ࢡ",
-                    "type": "󹿽􎐯"
+                    "type": "󹿽􎐯",
+                    "value": "z퐩\u00019[\u001b9f4ࢡ"
                 },
                 {
-                    "value": "𢧩􏮲Y,󹢵󰔳􏀔𘤝",
-                    "type": "^#􅯥!\u000eB\u0006 Q􄑃󴎮O\t𨽏X@\u001d葻L\u0011g\u0005U\u0018󸆹R|"
+                    "type": "^#􅯥!\u000eB\u0006 Q􄑃󴎮O\t𨽏X@\u001d葻L\u0011g\u0005U\u0018󸆹R|",
+                    "value": "𢧩􏮲Y,󹢵󰔳􏀔𘤝"
                 },
                 {
-                    "value": "TH`􃹷󷷩\u001b\u0012",
-                    "type": "{󳪥㋘󵣝 󰞻"
+                    "type": "{󳪥㋘󵣝 󰞻",
+                    "value": "TH`􃹷󷷩\u001b\u0012"
                 },
                 {
-                    "value": "r\u0001b󼒉:􌏮𧘑谅%󻠭o]㾠󽙨h]N{\u00163H&𒁪x\u0014",
-                    "type": "gIcTc\u0018;b䚱\u0010~\t󰵭mWU~_)avv"
+                    "type": "gIcTc\u0018;b䚱\u0010~\t󰵭mWU~_)avv",
+                    "value": "r\u0001b󼒉:􌏮𧘑谅%󻠭o]㾠󽙨h]N{\u00163H&𒁪x\u0014"
                 },
                 {
-                    "value": "&\u0018󹽩'𫶱f!􂀸BF\u0015𢨑b𧗩P츃h􄫸%้cࣣ􆶅(",
-                    "type": "$\u0019𗆻_𝒾[\u00071(𡿸\u0013\u0001"
+                    "type": "$\u0019𗆻_𝒾[\u00071(𡿸\u0013\u0001",
+                    "value": "&\u0018󹽩'𫶱f!􂀸BF\u0015𢨑b𧗩P츃h􄫸%้cࣣ􆶅("
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "󱛥8\r!弊R[\u0013G䕗\u0016\u0001\u000f?>LPKE\r劈\u0017􄭔": "􀝊@)R2I􋭲𪞲󴂢m6n8𫑉R𬰀𧹳9J1𮤲󰋔󰳤\u0001LRw\u0016􀚬",
-        "K\"rO": "\u000b\u001c\u0017\u0019b𦋸s𩿓\u000f?􌐤2\")贞)",
-        "𮎞󽁞y󴄘--DG.D": "t}l뛥B\u00169\u0013D􏴦T􎭞!K|\u0005|:KU\u0019􍴮@𒀕+\u001b\u000e牺",
-        "\u000b8𐘃\u0002": "􈠇x4\nam@봉\u000cd'扲4g%ngl\\g3d唝\u0010.􀟕a",
-        "\u0007𫈲E󸞲􍘎];\u0017&A(& 𨗫󷋋p󰥇\u000f𭺂\u0013Ak}\u001b.-\"'": "\r",
-        "Q\u001e.󷏂􍅔󰱏\u0007\u0017FEj\u0012󹣨?j >Cv82vY~ mqy": "l>rV\u0017Yz𔕶pJF\u000f|,",
-        "0\u0005\"u\u001eS%": "\"\u0017󳷲\u0017sI􏵋󱭆\u001b\t\u0004wA\u001c?RUi􃁗_\u00144流/􏸑",
-        "X\u0014󶼂􀽟𤑓?A𘋾ꟿ𐫢@𦨬\u0007󹸍N@62\u0004r#d􍇂b\u0010": "􃓂t7",
-        "󽜔􄕪0琇􋸂󵵴󰁽ib\\RI𦊹Bb4\u0017􌑠&bTVv\u000f𐳆tꨚ􈾖9\u0013": "􂏷婫􁋊H󻆭\u0012𗊿6HE5󽢌\u0017𗓉􌙸Ἧ",
-        "\u0018": "\u000eS󱘳􌿉𑨼\n-s"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_7.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_7.json
index 7c1eebbf82e..1074a202852 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_7.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_7.json
@@ -1,119 +1,119 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0005Jy띉acIXK4\u0006𥗄": "yk_󳬒",
+        "\u000b\u0002j,$󵑳(\u0005󲑖𫸗I8堟驟\u0019\u001e𡺽F": "q컺\u0002d럄p裤\u0016􌤹[𫅚􆊠tl󺉷hF?",
+        "\u0012\"\u0016\u0015)𗛢𥫘\u0013#Yf3\u000c": "0&UI+􈿝O𐴘Hl\"P\u001c\u0018X",
+        "\u001d󺋛-TdC/\\\u0000omf/﹈⾽𢛔_*\u0003󷫌선": "踾*🩅􄛍G\u0003'𬪉~𧇽KOI\u00190󰀞_'\u0017ꕓ󠅂𐧩:Q=9U",
+        "4\u0012\r􀐻\u0010": "\u0011B\r\r\u0004B𭄋剻8󿢞NR'⛙S%y@o\u001bPG",
+        "=b@\u00146Z/m[": "vF捡J󺘉\u0017\u00146F󶨋\"\u00184tB\u0019\u000cRhbt`H\u0019H+󿼮󳈿",
+        "YL󼕇\r": "",
+        "fM1_e%": "\u000c󱼇怕\u0005\u0011􎮚􉎀󽭴K/y",
+        "p\u000cj㘦u\n\rr钌hL4\u0014ꑟph\u0010F-": "􋧎69u~\\04븤\u001a9\u0017p",
+        "u𦙡%󽭞\u0007[!\u0010𮤂\t:M%": "b𤐑jb󺝰\u000b~y\u001b",
+        "}p*\u00191n󼮴\u0002I𝓗􈧩Z䩍m": "\r\u001b\u001b\u000c!󼄹<󹃷\u0003k󷭷h𐭘g\u0000 Yퟓo",
+        "􌃠|\u0006.\\VO\t\u0008O": "\u000c @\u001c𦖡􉈔\u0004xU\u0015􃻎C^O\u001b4\u0003\u0013a6c\u0007-\u001c󸳳7e𨨔",
+        "ꝃf&\u0000󿁻𣨢𦑫~q\u000c\u000c)M0手D&tu\u0007\u000b": "BH\u000c'ꅎ}a\u0002\u000eJ=V'𥟅􎨈t!9𭍕.􋭟\u000e",
+        "𠱩;\u0015SOmﴷb\u001aBq\u0016\t\\𝑤\\􃰝\u0010x 󼨐": "5v\u0013!焘+P㉢𗠶\u0000𠜦",
+        "𣉃cz𤸠(0\u0017/\u001eiKwut\u001e\u0004}􀁞\u0008\u000c󵤕\n": "#",
+        "𪔣$󷘗#E𩳉(󼇴N['𤈡o~wL䴃\u001b r:7⭸dmA": "{M𨆐rud`󶌜]v𐘀􊍥􊚘]\u001f\u0004(\u0003Aah𡀤Z.\u0012\u0016 ",
+        "󶃛C.IE\u0018": "mI%*O􀢩>!;D4`h\u0010T_v􀮻4e.",
+        "󻺦8i-m": "{GUBA&󷥨+\u0006R&\u001bSsDVk1",
+        "􃶓B->": "Q𤸟K𧿨􋑑𡸮󸏴g",
+        "􍵯U": "\\u\r嗭𒅞􋇽􌓅sWJ#𡐈d\u0017e.\u0007m􊪑tz<\u0007"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "􄖤",
-                    "type": "yVr􅗙'􅎯𫫧[𑌤W!𫮇𝥹x'!d"
+                    "type": "yVr􅗙'􅎯𫫧[𑌤W!𫮇𝥹x'!d",
+                    "value": "􄖤"
                 },
                 {
-                    "value": "󰈜\u0004\u0003􇿘N\u0011=𩨁󿓕!K\u001d}",
-                    "type": "𨿣𘀏"
+                    "type": "𨿣𘀏",
+                    "value": "󰈜\u0004\u0003􇿘N\u0011=𩨁󿓕!K\u001d}"
                 },
                 {
-                    "value": "공𥇋󽗾㰔mr1\u001e𡃒@\u001b 𥔣BCm1\u0011Pw􋤄Vs\\",
-                    "type": "Cᘹ?L\u0004\n󸙑\r3󳩅"
+                    "type": "Cᘹ?L\u0004\n󸙑\r3󳩅",
+                    "value": "공𥇋󽗾㰔mr1\u001e𡃒@\u001b 𥔣BCm1\u0011Pw􋤄Vs\\"
                 },
                 {
-                    "value": "W>\u0005-\na=,jm􅜙\u001c􀛍D𭋤M",
-                    "type": "\u00192&\u001dﾱc9-\u0016\u0008-Z锷\u0005l>"
+                    "type": "\u00192&\u001dﾱc9-\u0016\u0008-Z锷\u0005l>",
+                    "value": "W>\u0005-\na=,jm􅜙\u001c􀛍D𭋤M"
                 },
                 {
-                    "value": "p4􀬎&oh\u0014X󲼼&oHE;'eNj\nI@",
-                    "type": "_𪵗󽹪zK\r}"
+                    "type": "_𪵗󽹪zK\r}",
+                    "value": "p4􀬎&oh\u0014X󲼼&oHE;'eNj\nI@"
                 },
                 {
-                    "value": "!踋Wg\\ꔿ$𤒂<6pb!\u0003􅳉BH\u0013􉈘:+\u0019\u0002F\u0018=\u0000",
-                    "type": "\u0006\u0001T􈪥􌱶\u000c\u001cOr,𘌝Khᔅ멋́*r\u0017Yo)L$\u000fdGH"
+                    "type": "\u0006\u0001T􈪥􌱶\u000c\u001cOr,𘌝Khᔅ멋́*r\u0017Yo)L$\u000fdGH",
+                    "value": "!踋Wg\\ꔿ$𤒂<6pb!\u0003􅳉BH\u0013􉈘:+\u0019\u0002F\u0018=\u0000"
                 },
                 {
-                    "value": "6\u0003\u0010Xqꭡ\u0005",
-                    "type": "W\u000c7|%"
+                    "type": "W\u000c7|%",
+                    "value": "6\u0003\u0010Xqꭡ\u0005"
                 },
                 {
-                    "value": "$匧X{};c\u0018𫌛R{",
-                    "type": "􁗴4f"
+                    "type": "􁗴4f",
+                    "value": "$匧X{};c\u0018𫌛R{"
                 },
                 {
-                    "value": "4𩇀𡇉𗺖\u001b𧏾<>d~H\u0015VQ",
-                    "type": "\u00181=􏬪t􃷊퐓c\u0015;萈P𪗐%󹬑🐨Ug𬎾@o\\ao\u0012\u001c/"
+                    "type": "\u00181=􏬪t􃷊퐓c\u0015;萈P𪗐%󹬑🐨Ug𬎾@o\\ao\u0012\u001c/",
+                    "value": "4𩇀𡇉𗺖\u001b𧏾<>d~H\u0015VQ"
                 },
                 {
-                    "value": "􄼟\u0015S\u000b󼥖~󽊺 𥧚􇩠!󸚀\u000e\u0000𤏪NJ6$H",
-                    "type": "𨼌\u0003\u0010뜘󳎑;,cn$W^60掘i\u001b?f󺹈ሗQnf6􉬺@?"
+                    "type": "𨼌\u0003\u0010뜘󳎑;,cn$W^60掘i\u001b?f󺹈ሗQnf6􉬺@?",
+                    "value": "􄼟\u0015S\u000b󼥖~󽊺 𥧚􇩠!󸚀\u000e\u0000𤏪NJ6$H"
                 },
                 {
-                    "value": "\u001b,\u0012󿻸W]Y\u001bE󶕴vDiw𦔋\u0007w崽\u001e毲􂗲\u000cD\tUY􁗈Y",
-                    "type": "\u0006,bOfoZ*+*🌝nd4\u0005𫰥V]𖦚3"
+                    "type": "\u0006,bOfoZ*+*🌝nd4\u0005𫰥V]𖦚3",
+                    "value": "\u001b,\u0012󿻸W]Y\u001bE󶕴vDiw𦔋\u0007w崽\u001e毲􂗲\u000cD\tUY􁗈Y"
                 },
                 {
-                    "value": "􈹦놶O\u0015wa\u001a􃲲𤆽k.p\u0003",
-                    "type": "𤚒\u0003I\u0004"
+                    "type": "𤚒\u0003I\u0004",
+                    "value": "􈹦놶O\u0015wa\u001a􃲲𤆽k.p\u0003"
                 },
                 {
-                    "value": "\u001bl᷾􄅚𩕻䙶\u000c\u0004?szC𭒰u\u0018\u0014\u0000𠋍I𢭕",
-                    "type": "+\u001bA9z󾟑E\u0014𡵔|Jk홄\u000e􏏿s;~yPY󷟟)\u000cw)"
+                    "type": "+\u001bA9z󾟑E\u0014𡵔|Jk홄\u000e􏏿s;~yPY󷟟)\u000cw)",
+                    "value": "\u001bl᷾􄅚𩕻䙶\u000c\u0004?szC𭒰u\u0018\u0014\u0000𠋍I𢭕"
                 },
                 {
-                    "value": "󰓂\u0007zmw\rJꕗu\u000ec9\u001d\u0002􉈒󿎣",
-                    "type": "tK1R𝍵 󴿍󶮦\u0001"
+                    "type": "tK1R𝍵 󴿍󶮦\u0001",
+                    "value": "󰓂\u0007zmw\rJꕗu\u000ec9\u001d\u0002􉈒󿎣"
                 },
                 {
-                    "value": "􌆺𥀌󱰺~sg􆵦?𫘗w\u001e𫘡𫡥>7",
-                    "type": "Wb仉U\u0004+7𨇼􂬅\u0000\u001c4󻯹]eM턅=沲ᨑ\u0008\\4\u001c􉶪"
+                    "type": "Wb仉U\u0004+7𨇼􂬅\u0000\u001c4󻯹]eM턅=沲ᨑ\u0008\\4\u001c􉶪",
+                    "value": "􌆺𥀌󱰺~sg􆵦?𫘗w\u001e𫘡𫡥>7"
                 },
                 {
-                    "value": "𨅒Xse\u0006􎇱^奀t\u0002m􃥼\u0002BrM􂍀2(mj:.􄇳HD05e",
-                    "type": "~2+􆣹qp)𭕷&դ\u000c<W"
+                    "type": "~2+􆣹qp)𭕷&դ\u000c<W",
+                    "value": "𨅒Xse\u0006􎇱^奀t\u0002m􃥼\u0002BrM􂍀2(mj:.􄇳HD05e"
                 },
                 {
-                    "value": "Z<\u0018%D\\FV|𧦎qS`@\u0013",
-                    "type": "\u0008]\u001f𬬼+t𤇌\tt\"(豓|@"
+                    "type": "\u0008]\u001f𬬼+t𤇌\tt\"(豓|@",
+                    "value": "Z<\u0018%D\\FV|𧦎qS`@\u0013"
                 },
                 {
-                    "value": "\u0006󹳗^r\nLX]󲕫",
-                    "type": "z<WXchW\u00019a'\u0018I\u001e\u0013F􆒏𠐚\u0018>t?\u0002\u0001"
+                    "type": "z<WXchW\u00019a'\u0018I\u001e\u0013F􆒏𠐚\u0018>t?\u0002\u0001",
+                    "value": "\u0006󹳗^r\nLX]󲕫"
                 },
                 {
-                    "value": "D𗱀󱲙\u0013\u001cI1",
-                    "type": "jZ􎔎4P̞{B󿡂N󻿠𒒯aZ"
+                    "type": "jZ􎔎4P̞{B󿡂N󻿠𒒯aZ",
+                    "value": "D𗱀󱲙\u0013\u001cI1"
                 },
                 {
-                    "value": "\u001a&=",
-                    "type": "B\u0001\u0002V\u0019Ernb𬇚\u0011堮𮠓𩫎󳜺U󲛮\u0012p?\u000f\u0019Tl\u0015OH𪟾"
+                    "type": "B\u0001\u0002V\u0019Ernb𬇚\u0011堮𮠓𩫎󳜺U󲛮\u0012p?\u000f\u0019Tl\u0015OH𪟾",
+                    "value": "\u001a&="
                 },
                 {
-                    "value": "*9\"",
-                    "type": "R51𢐥}\u0008V3\u0004=M}"
+                    "type": "R51𢐥}\u0008V3\u0004=M}",
+                    "value": "*9\""
                 },
                 {
-                    "value": "!>󿘯\u001c𡉛\u00087𬷬\u000fO%?􎛿Z7i",
-                    "type": "􃬐\u0012􏩻O##.4h0𩩾\u0018𩺖\u000e𨍲𠻟e䶏0𠯶\u0005\u00163*\u0018/"
+                    "type": "􃬐\u0012􏩻O##.4h0𩩾\u0018𩺖\u000e𨍲𠻟e䶏0𠯶\u0005\u00163*\u0018/",
+                    "value": "!>󿘯\u001c𡉛\u00087𬷬\u000fO%?􎛿Z7i"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "ꝃf&\u0000󿁻𣨢𦑫~q\u000c\u000c)M0手D&tu\u0007\u000b": "BH\u000c'ꅎ}a\u0002\u000eJ=V'𥟅􎨈t!9𭍕.􋭟\u000e",
-        "4\u0012\r􀐻\u0010": "\u0011B\r\r\u0004B𭄋剻8󿢞NR'⛙S%y@o\u001bPG",
-        "\u001d󺋛-TdC/\\\u0000omf/﹈⾽𢛔_*\u0003󷫌선": "踾*🩅􄛍G\u0003'𬪉~𧇽KOI\u00190󰀞_'\u0017ꕓ󠅂𐧩:Q=9U",
-        "p\u000cj㘦u\n\rr钌hL4\u0014ꑟph\u0010F-": "􋧎69u~\\04븤\u001a9\u0017p",
-        "YL󼕇\r": "",
-        "𪔣$󷘗#E𩳉(󼇴N['𤈡o~wL䴃\u001b r:7⭸dmA": "{M𨆐rud`󶌜]v𐘀􊍥􊚘]\u001f\u0004(\u0003Aah𡀤Z.\u0012\u0016 ",
-        "𣉃cz𤸠(0\u0017/\u001eiKwut\u001e\u0004}􀁞\u0008\u000c󵤕\n": "#",
-        "󶃛C.IE\u0018": "mI%*O􀢩>!;D4`h\u0010T_v􀮻4e.",
-        "\u000b\u0002j,$󵑳(\u0005󲑖𫸗I8堟驟\u0019\u001e𡺽F": "q컺\u0002d럄p裤\u0016􌤹[𫅚􆊠tl󺉷hF?",
-        "󻺦8i-m": "{GUBA&󷥨+\u0006R&\u001bSsDVk1",
-        "u𦙡%󽭞\u0007[!\u0010𮤂\t:M%": "b𤐑jb󺝰\u000b~y\u001b",
-        "}p*\u00191n󼮴\u0002I𝓗􈧩Z䩍m": "\r\u001b\u001b\u000c!󼄹<󹃷\u0003k󷭷h𐭘g\u0000 Yퟓo",
-        "fM1_e%": "\u000c󱼇怕\u0005\u0011􎮚􉎀󽭴K/y",
-        "=b@\u00146Z/m[": "vF捡J󺘉\u0017\u00146F󶨋\"\u00184tB\u0019\u000cRhbt`H\u0019H+󿼮󳈿",
-        "􃶓B->": "Q𤸟K𧿨􋑑𡸮󸏴g",
-        "\u0005Jy띉acIXK4\u0006𥗄": "yk_󳬒",
-        "\u0012\"\u0016\u0015)𗛢𥫘\u0013#Yf3\u000c": "0&UI+􈿝O𐴘Hl\"P\u001c\u0018X",
-        "􍵯U": "\\u\r嗭𒅞􋇽􌓅sWJ#𡐈d\u0017e.\u0007m􊪑tz<\u0007",
-        "𠱩;\u0015SOmﴷb\u001aBq\u0016\t\\𝑤\\􃰝\u0010x 󼨐": "5v\u0013!焘+P㉢𗠶\u0000𠜦",
-        "􌃠|\u0006.\\VO\t\u0008O": "\u000c @\u001c𦖡􉈔\u0004xU\u0015􃻎C^O\u001b4\u0003\u0013a6c\u0007-\u001c󸳳7e𨨔"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_8.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_8.json
index d21a0a389bb..6c923ecf637 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_8.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_8.json
@@ -1,45 +1,45 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "𩌞",
+        ".1󸠬\u00012.?K>p\u0006GG𐃆U~": "\u0013\u001a\u00127\u0011S\u0019𣦲\u001c􍜯\u001c\u0006𩕐n󾠕x,H􅊕ZFrrU\n",
+        "=\u0016bD𥶛`8>󼄧'󶤜": "\\[\u0004\"\tg*~\u0017𤎬{\u00162%7_X镛\u0013bC\niE",
+        "A󰛘<\u0017u(ZbMख𭩰UeS!􎕾<\u0001;@\u0014\u0002+fwF\u000ea􀹶": "􉟯0\u00104\u0007𢐂(k\u0007c🄲䝢-󹗮W𠛪v\u0004\u000b&5J",
+        "Xpr3&D􇧕🥘^𡍎d\u0004\u001b{?\u0002Od軭\u000b\u0017\n􀏼,": "\u0010,[q\u0011B󷦪𖣜",
+        "p󼘖AclBh\t\u001ctf􆨺": "\u0006𫦏\t1F\tᒾ",
+        "yi\u0011:\"v綁b)\u0014.@E{𮘔󼃁𩵋YO": "`_h𨶲",
+        "𨃊𨋸_ꇺ\u001b^p": "B@\u000bE\n\r]P\u0002",
+        "􆥙󶖍\u000cU:": "Q%:t\u0012\u0005(ૺ:\u0000jꂽ8r>\u0012kmu𗎆",
+        "􌾧᧣$黈@􃊮7hQ8𨍋*\u0004-'I\u001d𤰜\u001f^?Oe\u0002ꗊj": "𥟱\t𝍒^oG\u0013T\u0017+\u000e\u0014g􈋷O<󰇟n,mcPi2%= "
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "~\u0017􈫞􏸍LR",
-                    "type": "\u000c&3გ$ur𫚞oQ󹄏o\u0004"
+                    "type": "\u000c&3გ$ur𫚞oQ󹄏o\u0004",
+                    "value": "~\u0017􈫞􏸍LR"
                 },
                 {
-                    "value": "\r\u0012\u001b9罣C𗜬\u0011H𤼔𗧗\u0017󱼚wZ􄯒䆶𡹳\u0001}x>Fd\u000e&ጯ",
-                    "type": "D\u001a\"𗎨d\u0002\u0000"
+                    "type": "D\u001a\"𗎨d\u0002\u0000",
+                    "value": "\r\u0012\u001b9罣C𗜬\u0011H𤼔𗧗\u0017󱼚wZ􄯒䆶𡹳\u0001}x>Fd\u000e&ጯ"
                 },
                 {
-                    "value": "E/V+~p􉧶\u0013ⲍa\u0003𓇒\u000b\u000c󺘿A[n6^N\t7",
-                    "type": "􈉥🨑\u000b9\u0006yXg􏆫NU\u0005𐢉\u001e𐓛4e6󸖾\u0007$𗚽~"
+                    "type": "􈉥🨑\u000b9\u0006yXg􏆫NU\u0005𐢉\u001e𐓛4e6󸖾\u0007$𗚽~",
+                    "value": "E/V+~p􉧶\u0013ⲍa\u0003𓇒\u000b\u000c󺘿A[n6^N\t7"
                 },
                 {
-                    "value": "\u0015Ik\u0014",
-                    "type": "CV󺦎/\u0014C󺴜EB*􅿳r󺏁\u0008󻩿󱬯𤽶m5𣓄i"
+                    "type": "CV󺦎/\u0014C󺴜EB*􅿳r󺏁\u0008󻩿󱬯𤽶m5𣓄i",
+                    "value": "\u0015Ik\u0014"
                 },
                 {
-                    "value": "\u000bAlLMb\u0018vvn\u0013\u001bM𮇱X`𩇭",
-                    "type": "1=D=\u0000v𬴂jD\u0005O("
+                    "type": "1=D=\u0000v𬴂jD\u0005O(",
+                    "value": "\u000bAlLMb\u0018vvn\u0013\u001bM𮇱X`𩇭"
                 },
                 {
-                    "value": "}83i𪨗􉩚􎦌\u0015􂢒𣗁6h\u0008𡿣I􂖶S\u0014\u0013OW%_\u0012*𡾒",
-                    "type": "3\u0000𦰷\u0001\u0002􅥗`𣌕P\u001fKEV􍮈4U瞒Ox"
+                    "type": "3\u0000𦰷\u0001\u0002􅥗`𣌕P\u001fKEV􍮈4U瞒Ox",
+                    "value": "}83i𪨗􉩚􎦌\u0015􂢒𣗁6h\u0008𡿣I􂖶S\u0014\u0013OW%_\u0012*𡾒"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "p󼘖AclBh\t\u001ctf􆨺": "\u0006𫦏\t1F\tᒾ",
-        "": "𩌞",
-        "A󰛘<\u0017u(ZbMख𭩰UeS!􎕾<\u0001;@\u0014\u0002+fwF\u000ea􀹶": "􉟯0\u00104\u0007𢐂(k\u0007c🄲䝢-󹗮W𠛪v\u0004\u000b&5J",
-        "Xpr3&D􇧕🥘^𡍎d\u0004\u001b{?\u0002Od軭\u000b\u0017\n􀏼,": "\u0010,[q\u0011B󷦪𖣜",
-        ".1󸠬\u00012.?K>p\u0006GG𐃆U~": "\u0013\u001a\u00127\u0011S\u0019𣦲\u001c􍜯\u001c\u0006𩕐n󾠕x,H􅊕ZFrrU\n",
-        "􆥙󶖍\u000cU:": "Q%:t\u0012\u0005(ૺ:\u0000jꂽ8r>\u0012kmu𗎆",
-        "𨃊𨋸_ꇺ\u001b^p": "B@\u000bE\n\r]P\u0002",
-        "=\u0016bD𥶛`8>󼄧'󶤜": "\\[\u0004\"\tg*~\u0017𤎬{\u00162%7_X镛\u0013bC\niE",
-        "􌾧᧣$黈@􃊮7hQ8𨍋*\u0004-'I\u001d𤰜\u001f^?Oe\u0002ꗊj": "𥟱\t𝍒^oG\u0013T\u0017+\u000e\u0014g􈋷O<󰇟n,mcPi2%= ",
-        "yi\u0011:\"v綁b)\u0014.@E{𮘔󼃁𩵋YO": "`_h𨶲"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_9.json b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_9.json
index c31e02eded4..7e91a1ee136 100644
--- a/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_9.json
+++ b/libs/wire-api/test/golden/testObject_RichInfoMapAndList_user_9.json
@@ -1,88 +1,88 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0011C=D􊵯6m𬰚󻡤^􋈈]􏹒I]x\n\u000f\u001b\u001bt$\u001f\u0000iX\u0010\u001a󺄿": "H\u00004\tE(􋿷[𧁹l\u0003Gm\u00030y󽢸]𣴪􋬗)\u0013z?",
+        "\u0015􇺊R𓌐s": "\u0012\u000c𫡔4􌦜\u001f\r\u0013𨔒x",
+        " 𮏁􌪌b": "^L!𬒝?~i^\u0012W\u0017g󰹮􌸋*𑪋󷫜\u0017\"8􆌮j",
+        "55K鷕󶌜\r䘁􂴑􊡙󶠇\t󰅇R": "*H𩂞\u0008g􅽰$oU!9qDd;ተ;z𣸐R󴥢",
+        ";`)O􋹺㹭􎡖D(4l􄵰w\u000825": "󸒅\u0004o\u0000󺘴󷝴$㿿􊴒DH􆧒􉡥\tk(\u0018\u00051M􍣃𪓽\u0003cJ'",
+        "H렔󽥖􉾲%􅍠ꩄH\u001b;]󵚛\u0005𫙥\\x": "T巽􀖩\u001d𭐁mA8XI\u0005",
+        "Md6DS􍈰󰀿#\u00169e\u001f(\\󺋙L{𢉽􆤮\u0014𘁢\u001fp𩆊`vꍇ8\u0015": "B8S󰤊;Tc\u0014蓛那󰁔􂭽\u0000hp\\+󲛀]p1|M9RD𫆖n-\u0018",
+        "w㸣돽\u000f󺡞S&􏸐𬅷n;ᴎpo\u0008\u0006􆁱]I.8󾖰Nd􍏙\u000c\u0017U\u0007A": "\u000e>",
+        "}S{;䌆j|􆚹󹑃": "\n1+𨤇󸅮!Ix󼋙L\u0003੍𫦁z?邒5\u0014\u000b\"U%=ﬗe禴U",
+        "𧵯\u0019*􁠄\\t𨂶K𩷅x⍞󽼖愣5􊷛\u001e󸾢ᤘ": "nSq`\t\u000br\u001eQ\"Qj\u001fyE𩶺58e2\u0013:D\u0011𧼴Un\u001d",
+        "𭃁\u000b\u0018􌮱ᖙH㈤\u0004<\\󳕜􊯍W(Y\u0000􎑋": "\tb\u0010A䔞;䬓S嶴󿡙뛈%󶮮!/􋚤k􌤜",
+        "𮛿)󹸐is𩹼贞\u0006jJ*{p􃞯1𧶴zm6g^𫊨𐧘": "=y=\u001c𭣑K\u001e\u001dy8\u0010",
+        "􀌙wz󿘎坐\u000e󿿮\u0019+oqC𪐡^a[l󹌉Z𝒶7&\u001e\u0014r}": "Ihel\u0018\u0014邶󷌚\u000c2^*h`u\u0006\u001cu𩲑󸒋\u0014"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "T5⻃\u0017󿵂](}{\u0003󾮉'􇽓Mq5󹈴\u001a\u0005`s똾\u0012Zw",
-                    "type": "􀩏e4\u001e宏h^x^\u0019v\u0003+XJ𠽆[X􊭹\u0004􇊗'\u0010K􊿪𦃼"
+                    "type": "􀩏e4\u001e宏h^x^\u0019v\u0003+XJ𠽆[X􊭹\u0004􇊗'\u0010K􊿪𦃼",
+                    "value": "T5⻃\u0017󿵂](}{\u0003󾮉'􇽓Mq5󹈴\u001a\u0005`s똾\u0012Zw"
                 },
                 {
-                    "value": "􂪁(0\u0012\u00033蕕U𫧊2􄼔౮F+=pd\rp􎳽瀕o",
-                    "type": "^:;\u0018\u001cy4"
+                    "type": "^:;\u0018\u001cy4",
+                    "value": "􂪁(0\u0012\u00033蕕U𫧊2􄼔౮F+=pd\rp􎳽瀕o"
                 },
                 {
-                    "value": "6cPៀR",
-                    "type": ""
+                    "type": "",
+                    "value": "6cPៀR"
                 },
                 {
-                    "value": ")|\u0013\u000cK",
-                    "type": "?󿯲~d\u0013;U􎋐P󳉶zJ*{*T"
+                    "type": "?󿯲~d\u0013;U􎋐P󳉶zJ*{*T",
+                    "value": ")|\u0013\u000cK"
                 },
                 {
-                    "value": "\u0003d-𮃧\u001e𫿟 z);],nC󹧹􄵙𬀎D󳿈\u0016\r2\u001cD",
-                    "type": "󷵏<^ߏ\u001b𬼱lIdb􅻆\u0011^t\u0012𪭘􌲣𬩤Pb"
+                    "type": "󷵏<^ߏ\u001b𬼱lIdb􅻆\u0011^t\u0012𪭘􌲣𬩤Pb",
+                    "value": "\u0003d-𮃧\u001e𫿟 z);],nC󹧹􄵙𬀎D󳿈\u0016\r2\u001cD"
                 },
                 {
-                    "value": "󾍔繩H\u0015􋮯🠢K􆥪\u0013(\u0016𬎖{X\u001c𮒁wV󼪂",
-                    "type": "\u0018\u0007\u0013H[s\u000693"
+                    "type": "\u0018\u0007\u0013H[s\u000693",
+                    "value": "󾍔繩H\u0015􋮯🠢K􆥪\u0013(\u0016𬎖{X\u001c𮒁wV󼪂"
                 },
                 {
-                    "value": "F\u0013𑻠=k\u0014󱹲\u001d􂿸i𨁸1􃛭J𗿝m'P󺲼plO𭺰􁰉",
-                    "type": "$迓T􍺬nf\u0001T𠩬{z󺣘Goz\u001e_@[V\u0019󻴹8C6D"
+                    "type": "$迓T􍺬nf\u0001T𠩬{z󺣘Goz\u001e_@[V\u0019󻴹8C6D",
+                    "value": "F\u0013𑻠=k\u0014󱹲\u001d􂿸i𨁸1􃛭J𗿝m'P󺲼plO𭺰􁰉"
                 },
                 {
-                    "value": "o\u0017?}7H𣮉Z𩁋7󰘟%4𪐛༧𨶾",
-                    "type": "\u0014v-\u0002\u0004?\u0004Q[0𣸬mnFN\t/>\u0003􏼫V󴗩B\u0006F𪵖"
+                    "type": "\u0014v-\u0002\u0004?\u0004Q[0𣸬mnFN\t/>\u0003􏼫V󴗩B\u0006F𪵖",
+                    "value": "o\u0017?}7H𣮉Z𩁋7󰘟%4𪐛༧𨶾"
                 },
                 {
-                    "value": "Ms󺕢󼪁B󹯓M",
-                    "type": "\u001c@$'᭬LR􂠈w~o󶀹'\u0008"
+                    "type": "\u001c@$'᭬LR􂠈w~o󶀹'\u0008",
+                    "value": "Ms󺕢󼪁B󹯓M"
                 },
                 {
-                    "value": "V\r",
-                    "type": "m9d5:O.4􌼸\u0013m"
+                    "type": "m9d5:O.4􌼸\u0013m",
+                    "value": "V\r"
                 },
                 {
-                    "value": "G𩱳􊏈",
-                    "type": "4fJ%*\u001f}Y󿢦\u0006V󷍄\u0013O􃗿\u001b2:{H*c󵥂𮒋z\t󹓳W"
+                    "type": "4fJ%*\u001f}Y󿢦\u0006V󷍄\u0013O􃗿\u001b2:{H*c󵥂𮒋z\t󹓳W",
+                    "value": "G𩱳􊏈"
                 },
                 {
-                    "value": ",\u0006R􁈺!g𭣿",
-                    "type": "2󹿺\u0008\"f}+ \u0005v\r󻣺\u0003]F@􅃆0R㻂"
+                    "type": "2󹿺\u0008\"f}+ \u0005v\r󻣺\u0003]F@􅃆0R㻂",
+                    "value": ",\u0006R􁈺!g𭣿"
                 },
                 {
-                    "value": "&,61\u0001C󰵬uj>_",
-                    "type": "C􉑣}\"j2𡷰\u000bWi􀥌ࣛ󼒚\u000fDn𝣆􇿓􏟟傘9\u0007\u0007𥘷A\u0016"
+                    "type": "C􉑣}\"j2𡷰\u000bWi􀥌ࣛ󼒚\u000fDn𝣆􇿓􏟟傘9\u0007\u0007𥘷A\u0016",
+                    "value": "&,61\u0001C󰵬uj>_"
                 },
                 {
-                    "value": "\u0012I櫩\u0011&T𦼒x󿁸i\u0005下𦸪‥絁ZoH~P{4",
-                    "type": "𤪥"
+                    "type": "𤪥",
+                    "value": "\u0012I櫩\u0011&T𦼒x󿁸i\u0005下𦸪‥絁ZoH~P{4"
                 },
                 {
-                    "value": "^_\\\\*𥡘𫛄\u001b\u0007󻻠󽼥AW\u0006'",
-                    "type": "K\u000b`=7NH\t뵤󿈖\u0004H"
+                    "type": "K\u000b`=7NH\t뵤󿈖\u0004H",
+                    "value": "^_\\\\*𥡘𫛄\u001b\u0007󻻠󽼥AW\u0006'"
                 },
                 {
-                    "value": "{%\u0003IEz\u0019$O9嗐 󼣴RLt𠃤\t𧨽C\u0017󹖢[",
-                    "type": "RxS\u0018}\u0005i5鲘*Z󽡔󺩈"
+                    "type": "RxS\u0018}\u0005i5鲘*Z󽡔󺩈",
+                    "value": "{%\u0003IEz\u0019$O9嗐 󼣴RLt𠃤\t𧨽C\u0017󹖢["
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "𭃁\u000b\u0018􌮱ᖙH㈤\u0004<\\󳕜􊯍W(Y\u0000􎑋": "\tb\u0010A䔞;䬓S嶴󿡙뛈%󶮮!/􋚤k􌤜",
-        "𮛿)󹸐is𩹼贞\u0006jJ*{p􃞯1𧶴zm6g^𫊨𐧘": "=y=\u001c𭣑K\u001e\u001dy8\u0010",
-        "}S{;䌆j|􆚹󹑃": "\n1+𨤇󸅮!Ix󼋙L\u0003੍𫦁z?邒5\u0014\u000b\"U%=ﬗe禴U",
-        " 𮏁􌪌b": "^L!𬒝?~i^\u0012W\u0017g󰹮􌸋*𑪋󷫜\u0017\"8􆌮j",
-        "􀌙wz󿘎坐\u000e󿿮\u0019+oqC𪐡^a[l󹌉Z𝒶7&\u001e\u0014r}": "Ihel\u0018\u0014邶󷌚\u000c2^*h`u\u0006\u001cu𩲑󸒋\u0014",
-        "55K鷕󶌜\r䘁􂴑􊡙󶠇\t󰅇R": "*H𩂞\u0008g􅽰$oU!9qDd;ተ;z𣸐R󴥢",
-        "H렔󽥖􉾲%􅍠ꩄH\u001b;]󵚛\u0005𫙥\\x": "T巽􀖩\u001d𭐁mA8XI\u0005",
-        "𧵯\u0019*􁠄\\t𨂶K𩷅x⍞󽼖愣5􊷛\u001e󸾢ᤘ": "nSq`\t\u000br\u001eQ\"Qj\u001fyE𩶺58e2\u0013:D\u0011𧼴Un\u001d",
-        "w㸣돽\u000f󺡞S&􏸐𬅷n;ᴎpo\u0008\u0006􆁱]I.8󾖰Nd􍏙\u000c\u0017U\u0007A": "\u000e>",
-        "Md6DS􍈰󰀿#\u00169e\u001f(\\󺋙L{𢉽􆤮\u0014𘁢\u001fp𩆊`vꍇ8\u0015": "B8S󰤊;Tc\u0014蓛那󰁔􂭽\u0000hp\\+󲛀]p1|M9RD𫆖n-\u0018",
-        "\u0015􇺊R𓌐s": "\u0012\u000c𫡔4􌦜\u001f\r\u0013𨔒x",
-        "\u0011C=D􊵯6m𬰚󻡤^􋈈]􏹒I]x\n\u000f\u001b\u001bt$\u001f\u0000iX\u0010\u001a󺄿": "H\u00004\tE(􋿷[𧁹l\u0003Gm\u00030y󽢸]𣴪􋬗)\u0013z?",
-        ";`)O􋹺㹭􎡖D(4l􄵰w\u000825": "󸒅\u0004o\u0000󺘴󷝴$㿿􊴒DH􆧒􉡥\tk(\u0018\u00051M􍣃𪓽\u0003cJ'"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_1.json b/libs/wire-api/test/golden/testObject_RichInfo_user_1.json
index e95b055864f..1d882a46c47 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_1.json
@@ -1,86 +1,86 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0002\u0002k,O􂵤\u0002?\u0013\u000eb韻@󺼝": "ゕ\u0011󲮉j𮌒\u001e\\􉯉\u0007\u0017\u000cZhL\t\u0013u",
+        "\u0005𬊚󾮡𗠞黔􄱁c": "𮑹=Z\u000fJ\u0015쁦:󽛺xgo󿹽\u0002w\u0004J$\u001a5$嶮S􈃺槳\u0004",
+        "\u0005􄪫􈌧#=􇿑𣋇췻4𮪏U>?I59.\u000fLW": "𪒰Q)`\u0000=􄀍\u001e @)\u001d\r󽤣~󷃻v\u0011|'𡁖􄥃1ॹ`𨇭",
+        "\t󻴺;􉁋!􃲣\u001b7\np-$󷩪\u000c\u0011\u001f􀣮聾K9\u0013Z\u0015\u0004mi;@qL": "S\u0005󱨀",
+        "\u000e𩥍o𢘋i􅡏/\u0010󺑥d": "t\u0002㽔",
+        "\u0012Q󼥊\u0019'O󵗙󶫳D(F􆼁\u0017𬁽􈨴􊠑m": "s\u0008|\u001f\u0013\u0004q#𪬧󰇪W;\u000b]p\u0006𗒖~󿼧Z?𥴇,􄊊",
+        "\u001b\u0010󶫆𤋴)\\_􅋠R\u000e𩖬6𠍢(sj􂓧\r ᒩc\u0013": "D\u001a={#%\"@𤧋𠷉庙",
+        "\u001e𤓤\u0002W3]d\u0008󲀆𐜢_󷝏\u001fW,\u0007kL\u0011􀥆p\u001af􂄉󺅘gcL": "z\u001d)hw\u0015\r𥂡C\u0018􎥠󻬉4\u001b嫴\u0006",
+        "\")6䗓ᕜPkk󿉑}Z􏂣@𞡢V𫸱ndaZQ\u0015E2": "𢿄䠗Lr𥱁틍ipVJ𪳅DdYj#~\t󻊜\u0008􇿵\u001e!j\u001f",
+        "D\u001c2􂲭󾃎I=&\"jB": "3B\u000c82S3g􀢺",
+        "[9􆊼𩇴=係짉𗖞j.r\u001b\u001f\tR\u000cz\u0003\u0004󸷪T": "\u001ep𨧦",
+        "^𔑪": "q3",
+        "gॽz\u0011\u0018": "P\\\u0011𭰨:S\u0003継#?􋑦D-퉈\u0003!G*d殹Q\r@iUL~{",
+        "z=t\t\u000c􉅴G9F\\k)􊟃3\u0015%􂉾\t𘈹*\u0012df\u0001": "q􃤡M7UBI\u0008\u0004󶾃W\t\u00006>_Q\u0013}3\u0008\"x",
+        "􁮸A\u0013*J": "[𐧸\u0008"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "P\\\u0011𭰨:S\u0003継#?􋑦D-퉈\u0003!G*d殹Q\r@iUL~{",
-                    "type": "gॽz\u0011\u0018"
+                    "type": "gॽz\u0011\u0018",
+                    "value": "P\\\u0011𭰨:S\u0003継#?􋑦D-퉈\u0003!G*d殹Q\r@iUL~{"
                 },
                 {
-                    "value": "3B\u000c82S3g􀢺",
-                    "type": "D\u001c2􂲭󾃎I=&\"jB"
+                    "type": "D\u001c2􂲭󾃎I=&\"jB",
+                    "value": "3B\u000c82S3g􀢺"
                 },
                 {
-                    "value": "D\u001a={#%\"@𤧋𠷉庙",
-                    "type": "\u001b\u0010󶫆𤋴)\\_􅋠R\u000e𩖬6𠍢(sj􂓧\r ᒩc\u0013"
+                    "type": "\u001b\u0010󶫆𤋴)\\_􅋠R\u000e𩖬6𠍢(sj􂓧\r ᒩc\u0013",
+                    "value": "D\u001a={#%\"@𤧋𠷉庙"
                 },
                 {
-                    "value": "𪒰Q)`\u0000=􄀍\u001e @)\u001d\r󽤣~󷃻v\u0011|'𡁖􄥃1ॹ`𨇭",
-                    "type": "\u0005􄪫􈌧#=􇿑𣋇췻4𮪏U>?I59.\u000fLW"
+                    "type": "\u0005􄪫􈌧#=􇿑𣋇췻4𮪏U>?I59.\u000fLW",
+                    "value": "𪒰Q)`\u0000=􄀍\u001e @)\u001d\r󽤣~󷃻v\u0011|'𡁖􄥃1ॹ`𨇭"
                 },
                 {
-                    "value": "S\u0005󱨀",
-                    "type": "\t󻴺;􉁋!􃲣\u001b7\np-$󷩪\u000c\u0011\u001f􀣮聾K9\u0013Z\u0015\u0004mi;@qL"
+                    "type": "\t󻴺;􉁋!􃲣\u001b7\np-$󷩪\u000c\u0011\u001f􀣮聾K9\u0013Z\u0015\u0004mi;@qL",
+                    "value": "S\u0005󱨀"
                 },
                 {
-                    "value": "s\u0008|\u001f\u0013\u0004q#𪬧󰇪W;\u000b]p\u0006𗒖~󿼧Z?𥴇,􄊊",
-                    "type": "\u0012Q󼥊\u0019'O󵗙󶫳D(F􆼁\u0017𬁽􈨴􊠑m"
+                    "type": "\u0012Q󼥊\u0019'O󵗙󶫳D(F􆼁\u0017𬁽􈨴􊠑m",
+                    "value": "s\u0008|\u001f\u0013\u0004q#𪬧󰇪W;\u000b]p\u0006𗒖~󿼧Z?𥴇,􄊊"
                 },
                 {
-                    "value": "𮑹=Z\u000fJ\u0015쁦:󽛺xgo󿹽\u0002w\u0004J$\u001a5$嶮S􈃺槳\u0004",
-                    "type": "\u0005𬊚󾮡𗠞黔􄱁c"
+                    "type": "\u0005𬊚󾮡𗠞黔􄱁c",
+                    "value": "𮑹=Z\u000fJ\u0015쁦:󽛺xgo󿹽\u0002w\u0004J$\u001a5$嶮S􈃺槳\u0004"
                 },
                 {
-                    "value": "t\u0002㽔",
-                    "type": "\u000e𩥍o𢘋i􅡏/\u0010󺑥d"
+                    "type": "\u000e𩥍o𢘋i􅡏/\u0010󺑥d",
+                    "value": "t\u0002㽔"
                 },
                 {
-                    "value": "z\u001d)hw\u0015\r𥂡C\u0018􎥠󻬉4\u001b嫴\u0006",
-                    "type": "\u001e𤓤\u0002W3]d\u0008󲀆𐜢_󷝏\u001fW,\u0007kL\u0011􀥆p\u001af􂄉󺅘gcL"
+                    "type": "\u001e𤓤\u0002W3]d\u0008󲀆𐜢_󷝏\u001fW,\u0007kL\u0011􀥆p\u001af􂄉󺅘gcL",
+                    "value": "z\u001d)hw\u0015\r𥂡C\u0018􎥠󻬉4\u001b嫴\u0006"
                 },
                 {
-                    "value": "𢿄䠗Lr𥱁틍ipVJ𪳅DdYj#~\t󻊜\u0008􇿵\u001e!j\u001f",
-                    "type": "\")6䗓ᕜPkk󿉑}Z􏂣@𞡢V𫸱ndaZQ\u0015E2"
+                    "type": "\")6䗓ᕜPkk󿉑}Z􏂣@𞡢V𫸱ndaZQ\u0015E2",
+                    "value": "𢿄䠗Lr𥱁틍ipVJ𪳅DdYj#~\t󻊜\u0008􇿵\u001e!j\u001f"
                 },
                 {
-                    "value": "\u001ep𨧦",
-                    "type": "[9􆊼𩇴=係짉𗖞j.r\u001b\u001f\tR\u000cz\u0003\u0004󸷪T"
+                    "type": "[9􆊼𩇴=係짉𗖞j.r\u001b\u001f\tR\u000cz\u0003\u0004󸷪T",
+                    "value": "\u001ep𨧦"
                 },
                 {
-                    "value": "ゕ\u0011󲮉j𮌒\u001e\\􉯉\u0007\u0017\u000cZhL\t\u0013u",
-                    "type": "\u0002\u0002k,O􂵤\u0002?\u0013\u000eb韻@󺼝"
+                    "type": "\u0002\u0002k,O􂵤\u0002?\u0013\u000eb韻@󺼝",
+                    "value": "ゕ\u0011󲮉j𮌒\u001e\\􉯉\u0007\u0017\u000cZhL\t\u0013u"
                 },
                 {
-                    "value": "q3",
-                    "type": "^𔑪"
+                    "type": "^𔑪",
+                    "value": "q3"
                 },
                 {
-                    "value": "[𐧸\u0008",
-                    "type": "􁮸A\u0013*J"
+                    "type": "􁮸A\u0013*J",
+                    "value": "[𐧸\u0008"
                 },
                 {
-                    "value": "q􃤡M7UBI\u0008\u0004󶾃W\t\u00006>_Q\u0013}3\u0008\"x",
-                    "type": "z=t\t\u000c􉅴G9F\\k)􊟃3\u0015%􂉾\t𘈹*\u0012df\u0001"
+                    "type": "z=t\t\u000c􉅴G9F\\k)􊟃3\u0015%􂉾\t𘈹*\u0012df\u0001",
+                    "value": "q􃤡M7UBI\u0008\u0004󶾃W\t\u00006>_Q\u0013}3\u0008\"x"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\u0002\u0002k,O􂵤\u0002?\u0013\u000eb韻@󺼝": "ゕ\u0011󲮉j𮌒\u001e\\􉯉\u0007\u0017\u000cZhL\t\u0013u",
-        "D\u001c2􂲭󾃎I=&\"jB": "3B\u000c82S3g􀢺",
-        "z=t\t\u000c􉅴G9F\\k)􊟃3\u0015%􂉾\t𘈹*\u0012df\u0001": "q􃤡M7UBI\u0008\u0004󶾃W\t\u00006>_Q\u0013}3\u0008\"x",
-        "\u001b\u0010󶫆𤋴)\\_􅋠R\u000e𩖬6𠍢(sj􂓧\r ᒩc\u0013": "D\u001a={#%\"@𤧋𠷉庙",
-        "gॽz\u0011\u0018": "P\\\u0011𭰨:S\u0003継#?􋑦D-퉈\u0003!G*d殹Q\r@iUL~{",
-        "^𔑪": "q3",
-        "\u0012Q󼥊\u0019'O󵗙󶫳D(F􆼁\u0017𬁽􈨴􊠑m": "s\u0008|\u001f\u0013\u0004q#𪬧󰇪W;\u000b]p\u0006𗒖~󿼧Z?𥴇,􄊊",
-        "\u0005𬊚󾮡𗠞黔􄱁c": "𮑹=Z\u000fJ\u0015쁦:󽛺xgo󿹽\u0002w\u0004J$\u001a5$嶮S􈃺槳\u0004",
-        "\u000e𩥍o𢘋i􅡏/\u0010󺑥d": "t\u0002㽔",
-        "[9􆊼𩇴=係짉𗖞j.r\u001b\u001f\tR\u000cz\u0003\u0004󸷪T": "\u001ep𨧦",
-        "􁮸A\u0013*J": "[𐧸\u0008",
-        "\u001e𤓤\u0002W3]d\u0008󲀆𐜢_󷝏\u001fW,\u0007kL\u0011􀥆p\u001af􂄉󺅘gcL": "z\u001d)hw\u0015\r𥂡C\u0018􎥠󻬉4\u001b嫴\u0006",
-        "\t󻴺;􉁋!􃲣\u001b7\np-$󷩪\u000c\u0011\u001f􀣮聾K9\u0013Z\u0015\u0004mi;@qL": "S\u0005󱨀",
-        "\")6䗓ᕜPkk󿉑}Z􏂣@𞡢V𫸱ndaZQ\u0015E2": "𢿄䠗Lr𥱁틍ipVJ𪳅DdYj#~\t󻊜\u0008􇿵\u001e!j\u001f",
-        "\u0005􄪫􈌧#=􇿑𣋇췻4𮪏U>?I59.\u000fLW": "𪒰Q)`\u0000=􄀍\u001e @)\u001d\r󽤣~󷃻v\u0011|'𡁖􄥃1ॹ`𨇭"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_10.json b/libs/wire-api/test/golden/testObject_RichInfo_user_10.json
index cc5d4f02c7b..e3b4b278444 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_10.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_10.json
@@ -1,86 +1,86 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u000b\u0011\u001cr": "/\u0013󵢹\u000c条o\u0002k􊏥/>",
+        "\u000ePX󺸱_f\rw,S6\u0011\nF\u0002O\u0012\u001a+\u001b𨮛􍨩\u00021䯚": "苖aEIuIcᑽ(p9p",
+        "\u001a": "\u0015(􆸼A\u0016{\u0000Z􋛘kE󱰨\u0017\u0005W\u000b\u001a",
+        "\u001d#􆟇<SF\u0013>YAc<I󸘴\u0004>S^": "𩷷6qK+P\u000f\u0004q𔒻*C󻐑t􅑄𗣯P\t󰢬Z\r󽐝",
+        "*<􍝂\u001c󺆊4􋙗𧼰UZ们Wv": "u)Cp󵽓u<@\u0003cs-J5󾒫'\u0003}0\u0012E󰑘\u001f컷.\r0𧋼",
+        "8;": "5\u0007\u0015𣫷\u0002\\\u000c\u0015G󲔺\u001a卽\u0017뺂Qj.舙𛲁u!D;𨰒",
+        ":ba": ";",
+        "F𤠌": "LJY2?󸙟\u001c\u0015󵗤󿓒󴱎",
+        "K􀿚?\u001d[N\u0008𗙌 x8\u0013b􍼭⽲貺6B+`ભ󻆿𧜆𩾆䢝": "U\u0016 M\u00119\u001dv縦󾻧f\u000f𒐰N󹢝\u0012\u0017",
+        "N8]@W󵗧󿁢": "(}qXz\u0016\u000b𡋇𭔑A$*󷎭q𘛁xz\tv@",
+        "VnHyJ5z<QA󸆇\u0007": "󴕷g\u0007j䪇\\",
+        "]": "~}9\u0010ZG𢺑d􁠚h𪃬㲼g𭽼0)6\u0012=𬗒3",
+        "鵧\u0018 1\u001dn\u001e!X\u001a𥟮DXM\u0002ks􋛩􇼈\u001e󸊟\u000f\u0018|\u0015B": "@\u0000冠!#}",
+        "🢘􎇵󾛞'~󽎙􈵠Lyj": "g8􂹒\u0005j]m𩬱\u0016\u001a\u0002\t𢚷5",
+        "􇳆𠗂􍢣r󶹭\u0015@\u0014Oh\u0004\\\r󰍬;Eѹ\u001agM3\u0013𮂟𠌮": "\u0018_뚢ﳴ{"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "苖aEIuIcᑽ(p9p",
-                    "type": "\u000ePX󺸱_f\rw,S6\u0011\nF\u0002O\u0012\u001a+\u001b𨮛􍨩\u00021䯚"
+                    "type": "\u000ePX󺸱_f\rw,S6\u0011\nF\u0002O\u0012\u001a+\u001b𨮛􍨩\u00021䯚",
+                    "value": "苖aEIuIcᑽ(p9p"
                 },
                 {
-                    "value": "@\u0000冠!#}",
-                    "type": "鵧\u0018 1\u001dn\u001e!X\u001a𥟮DXM\u0002ks􋛩􇼈\u001e󸊟\u000f\u0018|\u0015B"
+                    "type": "鵧\u0018 1\u001dn\u001e!X\u001a𥟮DXM\u0002ks􋛩􇼈\u001e󸊟\u000f\u0018|\u0015B",
+                    "value": "@\u0000冠!#}"
                 },
                 {
-                    "value": "\u0018_뚢ﳴ{",
-                    "type": "􇳆𠗂􍢣r󶹭\u0015@\u0014Oh\u0004\\\r󰍬;Eѹ\u001agM3\u0013𮂟𠌮"
+                    "type": "􇳆𠗂􍢣r󶹭\u0015@\u0014Oh\u0004\\\r󰍬;Eѹ\u001agM3\u0013𮂟𠌮",
+                    "value": "\u0018_뚢ﳴ{"
                 },
                 {
-                    "value": "(}qXz\u0016\u000b𡋇𭔑A$*󷎭q𘛁xz\tv@",
-                    "type": "N8]@W󵗧󿁢"
+                    "type": "N8]@W󵗧󿁢",
+                    "value": "(}qXz\u0016\u000b𡋇𭔑A$*󷎭q𘛁xz\tv@"
                 },
                 {
-                    "value": "g8􂹒\u0005j]m𩬱\u0016\u001a\u0002\t𢚷5",
-                    "type": "🢘􎇵󾛞'~󽎙􈵠Lyj"
+                    "type": "🢘􎇵󾛞'~󽎙􈵠Lyj",
+                    "value": "g8􂹒\u0005j]m𩬱\u0016\u001a\u0002\t𢚷5"
                 },
                 {
-                    "value": "u)Cp󵽓u<@\u0003cs-J5󾒫'\u0003}0\u0012E󰑘\u001f컷.\r0𧋼",
-                    "type": "*<􍝂\u001c󺆊4􋙗𧼰UZ们Wv"
+                    "type": "*<􍝂\u001c󺆊4􋙗𧼰UZ们Wv",
+                    "value": "u)Cp󵽓u<@\u0003cs-J5󾒫'\u0003}0\u0012E󰑘\u001f컷.\r0𧋼"
                 },
                 {
-                    "value": "~}9\u0010ZG𢺑d􁠚h𪃬㲼g𭽼0)6\u0012=𬗒3",
-                    "type": "]"
+                    "type": "]",
+                    "value": "~}9\u0010ZG𢺑d􁠚h𪃬㲼g𭽼0)6\u0012=𬗒3"
                 },
                 {
-                    "value": "LJY2?󸙟\u001c\u0015󵗤󿓒󴱎",
-                    "type": "F𤠌"
+                    "type": "F𤠌",
+                    "value": "LJY2?󸙟\u001c\u0015󵗤󿓒󴱎"
                 },
                 {
-                    "value": "𩷷6qK+P\u000f\u0004q𔒻*C󻐑t􅑄𗣯P\t󰢬Z\r󽐝",
-                    "type": "\u001d#􆟇<SF\u0013>YAc<I󸘴\u0004>S^"
+                    "type": "\u001d#􆟇<SF\u0013>YAc<I󸘴\u0004>S^",
+                    "value": "𩷷6qK+P\u000f\u0004q𔒻*C󻐑t􅑄𗣯P\t󰢬Z\r󽐝"
                 },
                 {
-                    "value": ";",
-                    "type": ":ba"
+                    "type": ":ba",
+                    "value": ";"
                 },
                 {
-                    "value": "/\u0013󵢹\u000c条o\u0002k􊏥/>",
-                    "type": "\u000b\u0011\u001cr"
+                    "type": "\u000b\u0011\u001cr",
+                    "value": "/\u0013󵢹\u000c条o\u0002k􊏥/>"
                 },
                 {
-                    "value": "5\u0007\u0015𣫷\u0002\\\u000c\u0015G󲔺\u001a卽\u0017뺂Qj.舙𛲁u!D;𨰒",
-                    "type": "8;"
+                    "type": "8;",
+                    "value": "5\u0007\u0015𣫷\u0002\\\u000c\u0015G󲔺\u001a卽\u0017뺂Qj.舙𛲁u!D;𨰒"
                 },
                 {
-                    "value": "󴕷g\u0007j䪇\\",
-                    "type": "VnHyJ5z<QA󸆇\u0007"
+                    "type": "VnHyJ5z<QA󸆇\u0007",
+                    "value": "󴕷g\u0007j䪇\\"
                 },
                 {
-                    "value": "\u0015(􆸼A\u0016{\u0000Z􋛘kE󱰨\u0017\u0005W\u000b\u001a",
-                    "type": "\u001a"
+                    "type": "\u001a",
+                    "value": "\u0015(􆸼A\u0016{\u0000Z􋛘kE󱰨\u0017\u0005W\u000b\u001a"
                 },
                 {
-                    "value": "U\u0016 M\u00119\u001dv縦󾻧f\u000f𒐰N󹢝\u0012\u0017",
-                    "type": "K􀿚?\u001d[N\u0008𗙌 x8\u0013b􍼭⽲貺6B+`ભ󻆿𧜆𩾆䢝"
+                    "type": "K􀿚?\u001d[N\u0008𗙌 x8\u0013b􍼭⽲貺6B+`ભ󻆿𧜆𩾆䢝",
+                    "value": "U\u0016 M\u00119\u001dv縦󾻧f\u000f𒐰N󹢝\u0012\u0017"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "🢘􎇵󾛞'~󽎙􈵠Lyj": "g8􂹒\u0005j]m𩬱\u0016\u001a\u0002\t𢚷5",
-        "\u001a": "\u0015(􆸼A\u0016{\u0000Z􋛘kE󱰨\u0017\u0005W\u000b\u001a",
-        "VnHyJ5z<QA󸆇\u0007": "󴕷g\u0007j䪇\\",
-        "􇳆𠗂􍢣r󶹭\u0015@\u0014Oh\u0004\\\r󰍬;Eѹ\u001agM3\u0013𮂟𠌮": "\u0018_뚢ﳴ{",
-        "]": "~}9\u0010ZG𢺑d􁠚h𪃬㲼g𭽼0)6\u0012=𬗒3",
-        "鵧\u0018 1\u001dn\u001e!X\u001a𥟮DXM\u0002ks􋛩􇼈\u001e󸊟\u000f\u0018|\u0015B": "@\u0000冠!#}",
-        "K􀿚?\u001d[N\u0008𗙌 x8\u0013b􍼭⽲貺6B+`ભ󻆿𧜆𩾆䢝": "U\u0016 M\u00119\u001dv縦󾻧f\u000f𒐰N󹢝\u0012\u0017",
-        "\u000ePX󺸱_f\rw,S6\u0011\nF\u0002O\u0012\u001a+\u001b𨮛􍨩\u00021䯚": "苖aEIuIcᑽ(p9p",
-        "\u001d#􆟇<SF\u0013>YAc<I󸘴\u0004>S^": "𩷷6qK+P\u000f\u0004q𔒻*C󻐑t􅑄𗣯P\t󰢬Z\r󽐝",
-        "F𤠌": "LJY2?󸙟\u001c\u0015󵗤󿓒󴱎",
-        "*<􍝂\u001c󺆊4􋙗𧼰UZ们Wv": "u)Cp󵽓u<@\u0003cs-J5󾒫'\u0003}0\u0012E󰑘\u001f컷.\r0𧋼",
-        "\u000b\u0011\u001cr": "/\u0013󵢹\u000c条o\u0002k􊏥/>",
-        "N8]@W󵗧󿁢": "(}qXz\u0016\u000b𡋇𭔑A$*󷎭q𘛁xz\tv@",
-        "8;": "5\u0007\u0015𣫷\u0002\\\u000c\u0015G󲔺\u001a卽\u0017뺂Qj.舙𛲁u!D;𨰒",
-        ":ba": ";"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_11.json b/libs/wire-api/test/golden/testObject_RichInfo_user_11.json
index 3f9e4cc01a5..b32fd830596 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_11.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_11.json
@@ -1,86 +1,86 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u00039V21􊍸WT𐚐~/}h7*3j": "v!\\\u0011\u0014@5󿟌\u0012\u0016",
+        "\u0007o𨐡O:拁\u0007": "󺂒",
+        "\u0018OAYI!P󱴁2􄄙": "\u001c\u0012^䖝",
+        "3\u000cRT7󻉎~": "e3Y􎫈F|􈅮󸸌\u001e􆻖X_B8Ԯ𗏉Ov𦋵n檝P\\tqﾂd",
+        "3󶾓\u0015+Uho*\u001c\u001a{􀳼u\"敋槟􁚻\u001agl\u0016": "𛃢\u001b\u001bZ6􋞔TbKn􆕍I􎺞𩬷2He6",
+        "6x\u0003/󳇑D􇶹Qy0Z\\": "凙VP)\u0007\u0005\u001d\u001bl`",
+        "<cW\u000e\u001d1{梐󻭀\u00064\u0001n먠7;&\u0014\u0001\u0002k\u001d􋭭q𨩈\n%𭜚9": "􇱽󱓮sCpj\u0017\t\u0006\u0008Q\u001fA𣟖2􈑅\u00016",
+        "F5zYY𝔩$a𝆔\u0016u󽣞#w\u0000]\u0019ꪜoy\u0008\u001akKBC\u001e􆇔L": "㷑IX宵􆱜Ckl_𩱲W^\u001dI",
+        "R>,銿N*E𞋞-\u0011b4D瞁N𬊡%dU": "􈰤:^\u0014\u0002",
+        "~𤔎͆􀪪􄗓c2": "􂑾唡\u0001\tF􏎰~𨜱밥6",
+        "𬓸K🕎ꭊ6Y󸫉<𗔍\u001b𗫩\u0013\u0016🀿Ih39s왕aC摄\u0004Y􆊲": "F`?n􎫠",
+        "󼞵她qa^r.󸮅?c\u0013𦗽K\u001a`-n\u000e𫦩=\u00151\u0000": "\u0016\\h-꠸ro7AQh󴓶",
+        "󿖊(,F\u0019\u001a\u00117\u000bx\u00119\u0011qk󺲓FFU熚OE􎽕V沧[V9\u000f": "𐲨󼫂1_GcM`󰟟Zn䔎\u001d]",
+        "􍒤𧏃\u0018\u001eKYPg,𭾑n)\u000eu𧿭b\u00003\u0015\u0013L": "Pm𬞖`\u001a阴<F􈅎\u00147g\r5",
+        "􍢁%vlo󱯒i蹢E𗂨I\u0001R\u0019𝁭G𡯐nr": "鼜r􇆜\u0005lG"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "F`?n􎫠",
-                    "type": "𬓸K🕎ꭊ6Y󸫉<𗔍\u001b𗫩\u0013\u0016🀿Ih39s왕aC摄\u0004Y􆊲"
+                    "type": "𬓸K🕎ꭊ6Y󸫉<𗔍\u001b𗫩\u0013\u0016🀿Ih39s왕aC摄\u0004Y􆊲",
+                    "value": "F`?n􎫠"
                 },
                 {
-                    "value": "􂑾唡\u0001\tF􏎰~𨜱밥6",
-                    "type": "~𤔎͆􀪪􄗓c2"
+                    "type": "~𤔎͆􀪪􄗓c2",
+                    "value": "􂑾唡\u0001\tF􏎰~𨜱밥6"
                 },
                 {
-                    "value": "𐲨󼫂1_GcM`󰟟Zn䔎\u001d]",
-                    "type": "󿖊(,F\u0019\u001a\u00117\u000bx\u00119\u0011qk󺲓FFU熚OE􎽕V沧[V9\u000f"
+                    "type": "󿖊(,F\u0019\u001a\u00117\u000bx\u00119\u0011qk󺲓FFU熚OE􎽕V沧[V9\u000f",
+                    "value": "𐲨󼫂1_GcM`󰟟Zn䔎\u001d]"
                 },
                 {
-                    "value": "鼜r􇆜\u0005lG",
-                    "type": "􍢁%vlo󱯒i蹢E𗂨I\u0001R\u0019𝁭G𡯐nr"
+                    "type": "􍢁%vlo󱯒i蹢E𗂨I\u0001R\u0019𝁭G𡯐nr",
+                    "value": "鼜r􇆜\u0005lG"
                 },
                 {
-                    "value": "v!\\\u0011\u0014@5󿟌\u0012\u0016",
-                    "type": "\u00039V21􊍸WT𐚐~/}h7*3j"
+                    "type": "\u00039V21􊍸WT𐚐~/}h7*3j",
+                    "value": "v!\\\u0011\u0014@5󿟌\u0012\u0016"
                 },
                 {
-                    "value": "\u0016\\h-꠸ro7AQh󴓶",
-                    "type": "󼞵她qa^r.󸮅?c\u0013𦗽K\u001a`-n\u000e𫦩=\u00151\u0000"
+                    "type": "󼞵她qa^r.󸮅?c\u0013𦗽K\u001a`-n\u000e𫦩=\u00151\u0000",
+                    "value": "\u0016\\h-꠸ro7AQh󴓶"
                 },
                 {
-                    "value": "e3Y􎫈F|􈅮󸸌\u001e􆻖X_B8Ԯ𗏉Ov𦋵n檝P\\tqﾂd",
-                    "type": "3\u000cRT7󻉎~"
+                    "type": "3\u000cRT7󻉎~",
+                    "value": "e3Y􎫈F|􈅮󸸌\u001e􆻖X_B8Ԯ𗏉Ov𦋵n檝P\\tqﾂd"
                 },
                 {
-                    "value": "𛃢\u001b\u001bZ6􋞔TbKn􆕍I􎺞𩬷2He6",
-                    "type": "3󶾓\u0015+Uho*\u001c\u001a{􀳼u\"敋槟􁚻\u001agl\u0016"
+                    "type": "3󶾓\u0015+Uho*\u001c\u001a{􀳼u\"敋槟􁚻\u001agl\u0016",
+                    "value": "𛃢\u001b\u001bZ6􋞔TbKn􆕍I􎺞𩬷2He6"
                 },
                 {
-                    "value": "㷑IX宵􆱜Ckl_𩱲W^\u001dI",
-                    "type": "F5zYY𝔩$a𝆔\u0016u󽣞#w\u0000]\u0019ꪜoy\u0008\u001akKBC\u001e􆇔L"
+                    "type": "F5zYY𝔩$a𝆔\u0016u󽣞#w\u0000]\u0019ꪜoy\u0008\u001akKBC\u001e􆇔L",
+                    "value": "㷑IX宵􆱜Ckl_𩱲W^\u001dI"
                 },
                 {
-                    "value": "凙VP)\u0007\u0005\u001d\u001bl`",
-                    "type": "6x\u0003/󳇑D􇶹Qy0Z\\"
+                    "type": "6x\u0003/󳇑D􇶹Qy0Z\\",
+                    "value": "凙VP)\u0007\u0005\u001d\u001bl`"
                 },
                 {
-                    "value": "󺂒",
-                    "type": "\u0007o𨐡O:拁\u0007"
+                    "type": "\u0007o𨐡O:拁\u0007",
+                    "value": "󺂒"
                 },
                 {
-                    "value": "􈰤:^\u0014\u0002",
-                    "type": "R>,銿N*E𞋞-\u0011b4D瞁N𬊡%dU"
+                    "type": "R>,銿N*E𞋞-\u0011b4D瞁N𬊡%dU",
+                    "value": "􈰤:^\u0014\u0002"
                 },
                 {
-                    "value": "Pm𬞖`\u001a阴<F􈅎\u00147g\r5",
-                    "type": "􍒤𧏃\u0018\u001eKYPg,𭾑n)\u000eu𧿭b\u00003\u0015\u0013L"
+                    "type": "􍒤𧏃\u0018\u001eKYPg,𭾑n)\u000eu𧿭b\u00003\u0015\u0013L",
+                    "value": "Pm𬞖`\u001a阴<F􈅎\u00147g\r5"
                 },
                 {
-                    "value": "􇱽󱓮sCpj\u0017\t\u0006\u0008Q\u001fA𣟖2􈑅\u00016",
-                    "type": "<cW\u000e\u001d1{梐󻭀\u00064\u0001n먠7;&\u0014\u0001\u0002k\u001d􋭭q𨩈\n%𭜚9"
+                    "type": "<cW\u000e\u001d1{梐󻭀\u00064\u0001n먠7;&\u0014\u0001\u0002k\u001d􋭭q𨩈\n%𭜚9",
+                    "value": "􇱽󱓮sCpj\u0017\t\u0006\u0008Q\u001fA𣟖2􈑅\u00016"
                 },
                 {
-                    "value": "\u001c\u0012^䖝",
-                    "type": "\u0018OAYI!P󱴁2􄄙"
+                    "type": "\u0018OAYI!P󱴁2􄄙",
+                    "value": "\u001c\u0012^䖝"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\u0018OAYI!P󱴁2􄄙": "\u001c\u0012^䖝",
-        "F5zYY𝔩$a𝆔\u0016u󽣞#w\u0000]\u0019ꪜoy\u0008\u001akKBC\u001e􆇔L": "㷑IX宵􆱜Ckl_𩱲W^\u001dI",
-        "R>,銿N*E𞋞-\u0011b4D瞁N𬊡%dU": "􈰤:^\u0014\u0002",
-        "6x\u0003/󳇑D􇶹Qy0Z\\": "凙VP)\u0007\u0005\u001d\u001bl`",
-        "<cW\u000e\u001d1{梐󻭀\u00064\u0001n먠7;&\u0014\u0001\u0002k\u001d􋭭q𨩈\n%𭜚9": "􇱽󱓮sCpj\u0017\t\u0006\u0008Q\u001fA𣟖2􈑅\u00016",
-        "\u00039V21􊍸WT𐚐~/}h7*3j": "v!\\\u0011\u0014@5󿟌\u0012\u0016",
-        "𬓸K🕎ꭊ6Y󸫉<𗔍\u001b𗫩\u0013\u0016🀿Ih39s왕aC摄\u0004Y􆊲": "F`?n􎫠",
-        "~𤔎͆􀪪􄗓c2": "􂑾唡\u0001\tF􏎰~𨜱밥6",
-        "􍒤𧏃\u0018\u001eKYPg,𭾑n)\u000eu𧿭b\u00003\u0015\u0013L": "Pm𬞖`\u001a阴<F􈅎\u00147g\r5",
-        "󿖊(,F\u0019\u001a\u00117\u000bx\u00119\u0011qk󺲓FFU熚OE􎽕V沧[V9\u000f": "𐲨󼫂1_GcM`󰟟Zn䔎\u001d]",
-        "3󶾓\u0015+Uho*\u001c\u001a{􀳼u\"敋槟􁚻\u001agl\u0016": "𛃢\u001b\u001bZ6􋞔TbKn􆕍I􎺞𩬷2He6",
-        "\u0007o𨐡O:拁\u0007": "󺂒",
-        "􍢁%vlo󱯒i蹢E𗂨I\u0001R\u0019𝁭G𡯐nr": "鼜r􇆜\u0005lG",
-        "3\u000cRT7󻉎~": "e3Y􎫈F|􈅮󸸌\u001e􆻖X_B8Ԯ𗏉Ov𦋵n檝P\\tqﾂd",
-        "󼞵她qa^r.󸮅?c\u0013𦗽K\u001a`-n\u000e𫦩=\u00151\u0000": "\u0016\\h-꠸ro7AQh󴓶"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_12.json b/libs/wire-api/test/golden/testObject_RichInfo_user_12.json
index 8aafcc89327..b74904d000e 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_12.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_12.json
@@ -1,16 +1,16 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "!_ZO💿𓄢𢗩#zFc\u0008T": "L􆙧A\nF6𫃢\u001b󰂾\u0008t"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "L􆙧A\nF6𫃢\u001b󰂾\u0008t",
-                    "type": "!_ZO💿𓄢𢗩#zFc\u0008T"
+                    "type": "!_ZO💿𓄢𢗩#zFc\u0008T",
+                    "value": "L􆙧A\nF6𫃢\u001b󰂾\u0008t"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "!_ZO💿𓄢𢗩#zFc\u0008T": "L􆙧A\nF6𫃢\u001b󰂾\u0008t"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_13.json b/libs/wire-api/test/golden/testObject_RichInfo_user_13.json
index d815308459e..4f6457186cf 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_13.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_13.json
@@ -1,46 +1,46 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0011师u\u0005\u0017&ᇊz'􉩬%": "9i5k4>/􈬊P𫪳𞡳\u0004 _𗎆\u0008辉v]NZ𨪒8ꃟ}%",
+        ",'\\$\u0007.􎲮꺤\u0005𑆺\u0002󽯂\u001a􁶩!\tY\u001b🜿\u0004~\\": "󺰐􋡡3T",
+        "Bo'􅩋": "􆚡G\u001fW.A*",
+        "L*;郿Q􅑻\u0019dAB󶰶j,%2d?泧󰞨\u0002i": "󺸾󵸆\u001fk\u000ciZ\u0006>𘪼U",
+        "|_T~\u000e󹩆z8#$𡄚쬠󻶕J 􄏌X⢐𠦕v$": "x|涜k𗅃\u0007󠅜l`hv󻝳\u001f\u0002󺊓\u0018a|\t씰뮽$",
+        "𝌋!kP犺󷑼y\u001a阓𮉚\r\u0018nle􋖁KޅE\u00002\\\u0018뵏\u0002\"$􆌙0\u0011": "𮐲.􃩈\u001b\u0016M#",
+        "󸲳i􇐒\u0005\"􈇉\u0018}[": "󸇚􏲙󽘩P"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "9i5k4>/􈬊P𫪳𞡳\u0004 _𗎆\u0008辉v]NZ𨪒8ꃟ}%",
-                    "type": "\u0011师u\u0005\u0017&ᇊz'􉩬%"
+                    "type": "\u0011师u\u0005\u0017&ᇊz'􉩬%",
+                    "value": "9i5k4>/􈬊P𫪳𞡳\u0004 _𗎆\u0008辉v]NZ𨪒8ꃟ}%"
                 },
                 {
-                    "value": "󺸾󵸆\u001fk\u000ciZ\u0006>𘪼U",
-                    "type": "L*;郿Q􅑻\u0019dAB󶰶j,%2d?泧󰞨\u0002i"
+                    "type": "L*;郿Q􅑻\u0019dAB󶰶j,%2d?泧󰞨\u0002i",
+                    "value": "󺸾󵸆\u001fk\u000ciZ\u0006>𘪼U"
                 },
                 {
-                    "value": "󺰐􋡡3T",
-                    "type": ",'\\$\u0007.􎲮꺤\u0005𑆺\u0002󽯂\u001a􁶩!\tY\u001b🜿\u0004~\\"
+                    "type": ",'\\$\u0007.􎲮꺤\u0005𑆺\u0002󽯂\u001a􁶩!\tY\u001b🜿\u0004~\\",
+                    "value": "󺰐􋡡3T"
                 },
                 {
-                    "value": "𮐲.􃩈\u001b\u0016M#",
-                    "type": "𝌋!kP犺󷑼y\u001a阓𮉚\r\u0018nle􋖁KޅE\u00002\\\u0018뵏\u0002\"$􆌙0\u0011"
+                    "type": "𝌋!kP犺󷑼y\u001a阓𮉚\r\u0018nle􋖁KޅE\u00002\\\u0018뵏\u0002\"$􆌙0\u0011",
+                    "value": "𮐲.􃩈\u001b\u0016M#"
                 },
                 {
-                    "value": "x|涜k𗅃\u0007󠅜l`hv󻝳\u001f\u0002󺊓\u0018a|\t씰뮽$",
-                    "type": "|_T~\u000e󹩆z8#$𡄚쬠󻶕J 􄏌X⢐𠦕v$"
+                    "type": "|_T~\u000e󹩆z8#$𡄚쬠󻶕J 􄏌X⢐𠦕v$",
+                    "value": "x|涜k𗅃\u0007󠅜l`hv󻝳\u001f\u0002󺊓\u0018a|\t씰뮽$"
                 },
                 {
-                    "value": "󸇚􏲙󽘩P",
-                    "type": "󸲳i􇐒\u0005\"􈇉\u0018}["
+                    "type": "󸲳i􇐒\u0005\"􈇉\u0018}[",
+                    "value": "󸇚􏲙󽘩P"
                 },
                 {
-                    "value": "􆚡G\u001fW.A*",
-                    "type": "Bo'􅩋"
+                    "type": "Bo'􅩋",
+                    "value": "􆚡G\u001fW.A*"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\u0011师u\u0005\u0017&ᇊz'􉩬%": "9i5k4>/􈬊P𫪳𞡳\u0004 _𗎆\u0008辉v]NZ𨪒8ꃟ}%",
-        "L*;郿Q􅑻\u0019dAB󶰶j,%2d?泧󰞨\u0002i": "󺸾󵸆\u001fk\u000ciZ\u0006>𘪼U",
-        "|_T~\u000e󹩆z8#$𡄚쬠󻶕J 􄏌X⢐𠦕v$": "x|涜k𗅃\u0007󠅜l`hv󻝳\u001f\u0002󺊓\u0018a|\t씰뮽$",
-        "Bo'􅩋": "􆚡G\u001fW.A*",
-        "󸲳i􇐒\u0005\"􈇉\u0018}[": "󸇚􏲙󽘩P",
-        ",'\\$\u0007.􎲮꺤\u0005𑆺\u0002󽯂\u001a􁶩!\tY\u001b🜿\u0004~\\": "󺰐􋡡3T",
-        "𝌋!kP犺󷑼y\u001a阓𮉚\r\u0018nle􋖁KޅE\u00002\\\u0018뵏\u0002\"$􆌙0\u0011": "𮐲.􃩈\u001b\u0016M#"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_14.json b/libs/wire-api/test/golden/testObject_RichInfo_user_14.json
index e93cc9aea9d..1690a2e4049 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_14.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_14.json
@@ -1,111 +1,111 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0002Kms_𤆣󷞬\u0010􄅫0􁤶\u000cK=\\!'\u0011": "4%\u000fGO\u0007Jw,𥑩Tg\u001f􏀀\u001e5[䚂\u0004!􀚟G󶫅:󴎏N",
+        "\u0005`Ws\u001bG\u0001\\\\9lR8針$\u0008*\u0000. \u000f\u0014": "y󵋍󵚄L[\u0011",
+        "\t􌃌f󰶺hU󻀵Rdk3\u0006P\u0005Au2,D": "7𗼓",
+        "\u0013Il4": "\u001c\u00139W\n:󴁾130\u0005,]2X",
+        "\u0015Sp\u0013U%tꊅS\u0005$": ",j.\u0012r\u001a\u0006\"\u0016󹋐'2<\u000c郕𘕧=4",
+        "\u001e􈠙\u001d(󺑸=\u001fo($V9Cj*\u001d>Mᄳ#\u0016/": "e\r󴌤󵸛NyA ኃb􅆛'\u001d􎙜:",
+        "3*냱\u001c`(u𭅩\u0019Z𫸃=\u001e": "K􁩧󲡨q󰙑li ",
+        "B1>\u0017:𧤹r󻷕䯦h\u0008\\dq􃌗K𣰕𦰴\u0013Y?\\ 󳆢\u0000믇󿛢[\u000b#": "\u001a=\u0000ItaqMR珰u𝘦",
+        "N\u000b1𠝋춆r\u0000􏉗앻􋊦e𡼬)u󱳲󹰓䐑FF": "󷺵ᾆG\u0000\u001f'xQ\u0011jc𔖌▞&\u001a)f\u0008M󻛖",
+        "T7a)3\u0019𬂆\r": "ΕWn|(u\u0012:ua𡪅7􄾆QCS\r>PsL󽉇󶪃𦇃􋮽\u0003\n碎",
+        "Ud=妸􎶥oJ:󵣏P􃾃": "U\u0005\u0003\u001a\nz\u0008^􈞴!\r󴚁􌉷\t",
+        "Yz\u0011C'1􉤥꠩\"U+i\\􃴄I\u001aw": "uz4𮅧K󶖈\u0017𨎭OI",
+        "]J􏤳O\u000eud>8\u0006\tX9": "\u0011􇧏6𭑎\u0006\"𣠁Z)煃,W\u0005=󼜮􋜨II\u0004L𡑷@0󷈡\u0003󸁢W!",
+        "mM#": "𡙶虉􌌧e\u0013+󱳶[\u0006􊘤'𬂍h󸗔",
+        "p^󼿄f\u0012􂟱􆱀?h􄈽󴭃\u001a@\u000c\u0019󷒝Ψ": "~\u001f󽕱󱣗\u000fFX[󠆩𨗎𥭳L|`􋙤&",
+        "sk&6@t􍢃9􄢭\u0012􅜼􁛕\u001b\u0013󰡳\u0018'\u001a7a": "𗃽􀈘rT\u001c$R'|\u001dBD2𪡖\u0003A𬫇𬨢N𬦚",
+        "~\u000fjHN^0𭫆𠑹\u0005𪤿\u0016;-8U": "磼",
+        "ၕ": "󴼅y\u0005􇡱qU",
+        "𬖯脁P䲚9/\t7􃈷!\u001c5凯M𘂖\u0008lB\u000cvr": "􅨦07􍣞w,;7\u0007􁛫\u0001􏭂TAM\r`\u0011:󻵡𮪈𘫘F}\u001b🏲\u0019f󼭸r",
+        "󷥋􊿷.n[\"I鞄􍳌篨𗘸D\nk鸟Xl\u000fKNV\u0013𐇡6s": "e􈸥PG@4󸀙\u0014A<\r{􏥎{V*\u0011\u000c𫳤\u0012\u0018󷉃U+簥"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "e􈸥PG@4󸀙\u0014A<\r{􏥎{V*\u0011\u000c𫳤\u0012\u0018󷉃U+簥",
-                    "type": "󷥋􊿷.n[\"I鞄􍳌篨𗘸D\nk鸟Xl\u000fKNV\u0013𐇡6s"
+                    "type": "󷥋􊿷.n[\"I鞄􍳌篨𗘸D\nk鸟Xl\u000fKNV\u0013𐇡6s",
+                    "value": "e􈸥PG@4󸀙\u0014A<\r{􏥎{V*\u0011\u000c𫳤\u0012\u0018󷉃U+簥"
                 },
                 {
-                    "value": "􅨦07􍣞w,;7\u0007􁛫\u0001􏭂TAM\r`\u0011:󻵡𮪈𘫘F}\u001b🏲\u0019f󼭸r",
-                    "type": "𬖯脁P䲚9/\t7􃈷!\u001c5凯M𘂖\u0008lB\u000cvr"
+                    "type": "𬖯脁P䲚9/\t7􃈷!\u001c5凯M𘂖\u0008lB\u000cvr",
+                    "value": "􅨦07􍣞w,;7\u0007􁛫\u0001􏭂TAM\r`\u0011:󻵡𮪈𘫘F}\u001b🏲\u0019f󼭸r"
                 },
                 {
-                    "value": "y󵋍󵚄L[\u0011",
-                    "type": "\u0005`Ws\u001bG\u0001\\\\9lR8針$\u0008*\u0000. \u000f\u0014"
+                    "type": "\u0005`Ws\u001bG\u0001\\\\9lR8針$\u0008*\u0000. \u000f\u0014",
+                    "value": "y󵋍󵚄L[\u0011"
                 },
                 {
-                    "value": "𡙶虉􌌧e\u0013+󱳶[\u0006􊘤'𬂍h󸗔",
-                    "type": "mM#"
+                    "type": "mM#",
+                    "value": "𡙶虉􌌧e\u0013+󱳶[\u0006􊘤'𬂍h󸗔"
                 },
                 {
-                    "value": "4%\u000fGO\u0007Jw,𥑩Tg\u001f􏀀\u001e5[䚂\u0004!􀚟G󶫅:󴎏N",
-                    "type": "\u0002Kms_𤆣󷞬\u0010􄅫0􁤶\u000cK=\\!'\u0011"
+                    "type": "\u0002Kms_𤆣󷞬\u0010􄅫0􁤶\u000cK=\\!'\u0011",
+                    "value": "4%\u000fGO\u0007Jw,𥑩Tg\u001f􏀀\u001e5[䚂\u0004!􀚟G󶫅:󴎏N"
                 },
                 {
-                    "value": "ΕWn|(u\u0012:ua𡪅7􄾆QCS\r>PsL󽉇󶪃𦇃􋮽\u0003\n碎",
-                    "type": "T7a)3\u0019𬂆\r"
+                    "type": "T7a)3\u0019𬂆\r",
+                    "value": "ΕWn|(u\u0012:ua𡪅7􄾆QCS\r>PsL󽉇󶪃𦇃􋮽\u0003\n碎"
                 },
                 {
-                    "value": "e\r󴌤󵸛NyA ኃb􅆛'\u001d􎙜:",
-                    "type": "\u001e􈠙\u001d(󺑸=\u001fo($V9Cj*\u001d>Mᄳ#\u0016/"
+                    "type": "\u001e􈠙\u001d(󺑸=\u001fo($V9Cj*\u001d>Mᄳ#\u0016/",
+                    "value": "e\r󴌤󵸛NyA ኃb􅆛'\u001d􎙜:"
                 },
                 {
-                    "value": "\u001a=\u0000ItaqMR珰u𝘦",
-                    "type": "B1>\u0017:𧤹r󻷕䯦h\u0008\\dq􃌗K𣰕𦰴\u0013Y?\\ 󳆢\u0000믇󿛢[\u000b#"
+                    "type": "B1>\u0017:𧤹r󻷕䯦h\u0008\\dq􃌗K𣰕𦰴\u0013Y?\\ 󳆢\u0000믇󿛢[\u000b#",
+                    "value": "\u001a=\u0000ItaqMR珰u𝘦"
                 },
                 {
-                    "value": "󴼅y\u0005􇡱qU",
-                    "type": "ၕ"
+                    "type": "ၕ",
+                    "value": "󴼅y\u0005􇡱qU"
                 },
                 {
-                    "value": "uz4𮅧K󶖈\u0017𨎭OI",
-                    "type": "Yz\u0011C'1􉤥꠩\"U+i\\􃴄I\u001aw"
+                    "type": "Yz\u0011C'1􉤥꠩\"U+i\\􃴄I\u001aw",
+                    "value": "uz4𮅧K󶖈\u0017𨎭OI"
                 },
                 {
-                    "value": "~\u001f󽕱󱣗\u000fFX[󠆩𨗎𥭳L|`􋙤&",
-                    "type": "p^󼿄f\u0012􂟱􆱀?h􄈽󴭃\u001a@\u000c\u0019󷒝Ψ"
+                    "type": "p^󼿄f\u0012􂟱􆱀?h􄈽󴭃\u001a@\u000c\u0019󷒝Ψ",
+                    "value": "~\u001f󽕱󱣗\u000fFX[󠆩𨗎𥭳L|`􋙤&"
                 },
                 {
-                    "value": "7𗼓",
-                    "type": "\t􌃌f󰶺hU󻀵Rdk3\u0006P\u0005Au2,D"
+                    "type": "\t􌃌f󰶺hU󻀵Rdk3\u0006P\u0005Au2,D",
+                    "value": "7𗼓"
                 },
                 {
-                    "value": "U\u0005\u0003\u001a\nz\u0008^􈞴!\r󴚁􌉷\t",
-                    "type": "Ud=妸􎶥oJ:󵣏P􃾃"
+                    "type": "Ud=妸􎶥oJ:󵣏P􃾃",
+                    "value": "U\u0005\u0003\u001a\nz\u0008^􈞴!\r󴚁􌉷\t"
                 },
                 {
-                    "value": ",j.\u0012r\u001a\u0006\"\u0016󹋐'2<\u000c郕𘕧=4",
-                    "type": "\u0015Sp\u0013U%tꊅS\u0005$"
+                    "type": "\u0015Sp\u0013U%tꊅS\u0005$",
+                    "value": ",j.\u0012r\u001a\u0006\"\u0016󹋐'2<\u000c郕𘕧=4"
                 },
                 {
-                    "value": "\u001c\u00139W\n:󴁾130\u0005,]2X",
-                    "type": "\u0013Il4"
+                    "type": "\u0013Il4",
+                    "value": "\u001c\u00139W\n:󴁾130\u0005,]2X"
                 },
                 {
-                    "value": "󷺵ᾆG\u0000\u001f'xQ\u0011jc𔖌▞&\u001a)f\u0008M󻛖",
-                    "type": "N\u000b1𠝋춆r\u0000􏉗앻􋊦e𡼬)u󱳲󹰓䐑FF"
+                    "type": "N\u000b1𠝋춆r\u0000􏉗앻􋊦e𡼬)u󱳲󹰓䐑FF",
+                    "value": "󷺵ᾆG\u0000\u001f'xQ\u0011jc𔖌▞&\u001a)f\u0008M󻛖"
                 },
                 {
-                    "value": "磼",
-                    "type": "~\u000fjHN^0𭫆𠑹\u0005𪤿\u0016;-8U"
+                    "type": "~\u000fjHN^0𭫆𠑹\u0005𪤿\u0016;-8U",
+                    "value": "磼"
                 },
                 {
-                    "value": "K􁩧󲡨q󰙑li ",
-                    "type": "3*냱\u001c`(u𭅩\u0019Z𫸃=\u001e"
+                    "type": "3*냱\u001c`(u𭅩\u0019Z𫸃=\u001e",
+                    "value": "K􁩧󲡨q󰙑li "
                 },
                 {
-                    "value": "\u0011􇧏6𭑎\u0006\"𣠁Z)煃,W\u0005=󼜮􋜨II\u0004L𡑷@0󷈡\u0003󸁢W!",
-                    "type": "]J􏤳O\u000eud>8\u0006\tX9"
+                    "type": "]J􏤳O\u000eud>8\u0006\tX9",
+                    "value": "\u0011􇧏6𭑎\u0006\"𣠁Z)煃,W\u0005=󼜮􋜨II\u0004L𡑷@0󷈡\u0003󸁢W!"
                 },
                 {
-                    "value": "𗃽􀈘rT\u001c$R'|\u001dBD2𪡖\u0003A𬫇𬨢N𬦚",
-                    "type": "sk&6@t􍢃9􄢭\u0012􅜼􁛕\u001b\u0013󰡳\u0018'\u001a7a"
+                    "type": "sk&6@t􍢃9􄢭\u0012􅜼􁛕\u001b\u0013󰡳\u0018'\u001a7a",
+                    "value": "𗃽􀈘rT\u001c$R'|\u001dBD2𪡖\u0003A𬫇𬨢N𬦚"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "p^󼿄f\u0012􂟱􆱀?h􄈽󴭃\u001a@\u000c\u0019󷒝Ψ": "~\u001f󽕱󱣗\u000fFX[󠆩𨗎𥭳L|`􋙤&",
-        "Ud=妸􎶥oJ:󵣏P􃾃": "U\u0005\u0003\u001a\nz\u0008^􈞴!\r󴚁􌉷\t",
-        "\u001e􈠙\u001d(󺑸=\u001fo($V9Cj*\u001d>Mᄳ#\u0016/": "e\r󴌤󵸛NyA ኃb􅆛'\u001d􎙜:",
-        "𬖯脁P䲚9/\t7􃈷!\u001c5凯M𘂖\u0008lB\u000cvr": "􅨦07􍣞w,;7\u0007􁛫\u0001􏭂TAM\r`\u0011:󻵡𮪈𘫘F}\u001b🏲\u0019f󼭸r",
-        "~\u000fjHN^0𭫆𠑹\u0005𪤿\u0016;-8U": "磼",
-        "Yz\u0011C'1􉤥꠩\"U+i\\􃴄I\u001aw": "uz4𮅧K󶖈\u0017𨎭OI",
-        "\t􌃌f󰶺hU󻀵Rdk3\u0006P\u0005Au2,D": "7𗼓",
-        "\u0013Il4": "\u001c\u00139W\n:󴁾130\u0005,]2X",
-        "\u0005`Ws\u001bG\u0001\\\\9lR8針$\u0008*\u0000. \u000f\u0014": "y󵋍󵚄L[\u0011",
-        "mM#": "𡙶虉􌌧e\u0013+󱳶[\u0006􊘤'𬂍h󸗔",
-        "T7a)3\u0019𬂆\r": "ΕWn|(u\u0012:ua𡪅7􄾆QCS\r>PsL󽉇󶪃𦇃􋮽\u0003\n碎",
-        "󷥋􊿷.n[\"I鞄􍳌篨𗘸D\nk鸟Xl\u000fKNV\u0013𐇡6s": "e􈸥PG@4󸀙\u0014A<\r{􏥎{V*\u0011\u000c𫳤\u0012\u0018󷉃U+簥",
-        "N\u000b1𠝋춆r\u0000􏉗앻􋊦e𡼬)u󱳲󹰓䐑FF": "󷺵ᾆG\u0000\u001f'xQ\u0011jc𔖌▞&\u001a)f\u0008M󻛖",
-        "B1>\u0017:𧤹r󻷕䯦h\u0008\\dq􃌗K𣰕𦰴\u0013Y?\\ 󳆢\u0000믇󿛢[\u000b#": "\u001a=\u0000ItaqMR珰u𝘦",
-        "]J􏤳O\u000eud>8\u0006\tX9": "\u0011􇧏6𭑎\u0006\"𣠁Z)煃,W\u0005=󼜮􋜨II\u0004L𡑷@0󷈡\u0003󸁢W!",
-        "3*냱\u001c`(u𭅩\u0019Z𫸃=\u001e": "K􁩧󲡨q󰙑li ",
-        "ၕ": "󴼅y\u0005􇡱qU",
-        "\u0015Sp\u0013U%tꊅS\u0005$": ",j.\u0012r\u001a\u0006\"\u0016󹋐'2<\u000c郕𘕧=4",
-        "\u0002Kms_𤆣󷞬\u0010􄅫0􁤶\u000cK=\\!'\u0011": "4%\u000fGO\u0007Jw,𥑩Tg\u001f􏀀\u001e5[䚂\u0004!􀚟G󶫅:󴎏N",
-        "sk&6@t􍢃9􄢭\u0012􅜼􁛕\u001b\u0013󰡳\u0018'\u001a7a": "𗃽􀈘rT\u001c$R'|\u001dBD2𪡖\u0003A𬫇𬨢N𬦚"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_15.json b/libs/wire-api/test/golden/testObject_RichInfo_user_15.json
index 49fb85c7200..9d97a5ce285 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_15.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_15.json
@@ -1,161 +1,161 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "xL\u000e󸪇(\u0005\tY\u0014\u0000F􅺜[퇶\tU`twpU\u00037󴸜!w᭚",
+        "\u0004": ">nSp\u001bq\u0012\r\u0016e\u0012SToL]iq\t>􁙮Y)",
+        "\u0014\"旁􄠙\t󽆷\r𝅯V\u001e~󰱛Fp[1PS⌴􀣓𓋀g8𥠻箩YO2?": "f",
+        "\u0014b\u0007X󽜢\u001a󵿕": "V B􃀅$HHl󹢽􋔺𨓈􋘗o󼽋,~\u0004p(E𪕜6r2\u001eC`",
+        "\u0017V𥜄&\u0006N󿑸": "p􋋉cX\u001b<䫭",
+        "!,dHU𗸠\u001e0usQt}􊶔5𗥒{^\u000b": "\u0015&􎦟\\\\\u000bJ\u0019\u001d&tBvv>Rgq𥌸ZlPy\\",
+        "'sB %\u0000󽙕di⤎󷬮9憵'=\rC𬠤􊲘𦱶🈁􅭠*": "0v𦍌\u00137ꅪ",
+        "-W\u0004c𣩏DP|􀕾󰦖\u0003\u0003/\u0010Kr馔\\\u0010𮧋|៧𤊳\u0001\u0008􅳂": " \u0017\t\u000ckR!\u0010",
+        "-䀈": "􊰮\u0011H󽸌\u00061>_'",
+        "2􏱧𘕊P(9契𠟁\u0005)\u001c󱽒砛4󺆜T𭹀8yQvP;\r": "1\u001a;n󷔖\tl柳\u0019_-C󷯣Q6]}Y􅽱\u0019zq",
+        "91!󶊵@l\"󱊑G\u0003\u0004{􀁎􈵥yaJ": ".3w4u,Y@\u0001𧔣A󽳛𠤿t㼿\"i󲱇n\"%􅌾瀌2󶃉",
+        ";t\u001aj󺕠F\u0013i󾰓󱦑=\u0006`d􀦃𗘫,D𩰶ᠮ\u001d𨭬": "\u0017sg𠔯(Ji𠽓4L抡\u0010xG萕􏌱!\u0019Ieo%sDJ𝉁%𧱙8",
+        "BP8i3𬧇@[g𮉟3𗇙OHq\u00187": "x&菞\u0004iKb6t󹋟",
+        "D\u0000q𦜪|.\u0000󰔑'𖠘mkCiG\u0015:\u0007\u000bv's󴄘0(\u0007\u000bV": "\u001f颁=\u0008\u0011,E",
+        "M壭#긇`C􃧈\u001a􎞗v@d\u0011􊥠󸫵QL'4>": "\\hON#Tb'󳊘숏wE",
+        "V&\u0015kᚑWm\u001c𪴑^􈻟􇢰􁷑\u0008]k-": "\u0007-\u00025C􃶄6t\u0019􅩨R𬝖J- 4'󺳕@\n2\u0016",
+        "X^?U04\u001e4\u0012w.{GyR󽑱i5\u0006u*\u0005\u0010횓f\u001f": "xbF\u0000󿒠V-Jd0\u0015>x_𥟐氚\nKz\u0002!\u0003",
+        "Z􅰉\u001e󾻀\u001cq\u0000E\u001f+􎷦B\"\\Y72t`<R?": "\u0004󿐱𭩨𨩋d󺉽#+r",
+        "`\"\u0005't󾨺䯼:\u0005爅F\u0014[KO%𩉽\u0002\u001b8ᵰ%s": "󶰶\u0019_)󹑲𔔧~W:󽘁u",
+        "a\u000b􌕕LsE󼥔􂉟GD'􈰫a󴐿𥣴`G\u0019]\u0004\u001d`3i\u001a𘐦K": "\u0004RnwnF󿨣;5\nDK𑋑KHT(\u001cX",
+        "r󳐊9K\u00193-5^)9\u0014𔓿": "l\u001c\u001f",
+        "t\u0002": "󱾕7n𪛀\u0011屙x",
+        "y󹫲B㩕": "<󹾵\u001e-\n\u001d'􄄅%z\u0010\u001a,\u0010tSpSݑ",
+        "}\u0001Q=𨂗a􁒧|󾟝\u0004ﳷ#f􇝲?\u0000#%O9fap칎뎼L$~": "🐃G>v<1󿀀W5s't𥦖\u001c\u001cx>%𠽊\u001db(1\u000c1\u001e\u0001",
+        "𣹖􌺦\t󴦯Tu􊄫h3M8􎒸􆇉6": "WoQ\u001ba𒍇F\u0010\u001dmH9􂂿k􉗼󸡖􂡴H",
+        "𨻪N𦙇?%\u0008󷷣뎽􈓓?\u0011􃎧𮕖)@󳸈􁤨\u0001\u0004􏛅愯\\&>`": "%X/造Bi%:㩦}g)c􆔋\u001b\u001fY9󿷼",
+        "𬟛.A􃿥RX=:P𞤄+3\u0016\u0000􆇾v₨)􂼳Xn𪫰\u0003󿠿\u0000p􃡒\u000cb": "웠>􍃯\u000c+=󸑌)\u000c:PL󾀃􈌚R>^\u0001b\u0005a",
+        "𭱯,󻃾~𪺦<,v󵋎􄩘": "\u0010􈁐?ᗛ\u0011",
+        "󸺁\n5\u0004\u0016\u001ap[+N\u0002A𐘶7uQ": "\u0001",
+        "􆁲~!󶔝􁪍D􋉊\u0005𨧯2r": "𫑫\\R\u0011*A􆪞7/\u000f󹘤\u001aiRI|\u0008y\u0015e󸯉S􀿦OL'􀖗􄧥*"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "\\hON#Tb'󳊘숏wE",
-                    "type": "M壭#긇`C􃧈\u001a􎞗v@d\u0011􊥠󸫵QL'4>"
+                    "type": "M壭#긇`C􃧈\u001a􎞗v@d\u0011􊥠󸫵QL'4>",
+                    "value": "\\hON#Tb'󳊘숏wE"
                 },
                 {
-                    "value": "\u0010􈁐?ᗛ\u0011",
-                    "type": "𭱯,󻃾~𪺦<,v󵋎􄩘"
+                    "type": "𭱯,󻃾~𪺦<,v󵋎􄩘",
+                    "value": "\u0010􈁐?ᗛ\u0011"
                 },
                 {
-                    "value": "<󹾵\u001e-\n\u001d'􄄅%z\u0010\u001a,\u0010tSpSݑ",
-                    "type": "y󹫲B㩕"
+                    "type": "y󹫲B㩕",
+                    "value": "<󹾵\u001e-\n\u001d'􄄅%z\u0010\u001a,\u0010tSpSݑ"
                 },
                 {
-                    "value": "\u0017sg𠔯(Ji𠽓4L抡\u0010xG萕􏌱!\u0019Ieo%sDJ𝉁%𧱙8",
-                    "type": ";t\u001aj󺕠F\u0013i󾰓󱦑=\u0006`d􀦃𗘫,D𩰶ᠮ\u001d𨭬"
+                    "type": ";t\u001aj󺕠F\u0013i󾰓󱦑=\u0006`d􀦃𗘫,D𩰶ᠮ\u001d𨭬",
+                    "value": "\u0017sg𠔯(Ji𠽓4L抡\u0010xG萕􏌱!\u0019Ieo%sDJ𝉁%𧱙8"
                 },
                 {
-                    "value": "󶰶\u0019_)󹑲𔔧~W:󽘁u",
-                    "type": "`\"\u0005't󾨺䯼:\u0005爅F\u0014[KO%𩉽\u0002\u001b8ᵰ%s"
+                    "type": "`\"\u0005't󾨺䯼:\u0005爅F\u0014[KO%𩉽\u0002\u001b8ᵰ%s",
+                    "value": "󶰶\u0019_)󹑲𔔧~W:󽘁u"
                 },
                 {
-                    "value": " \u0017\t\u000ckR!\u0010",
-                    "type": "-W\u0004c𣩏DP|􀕾󰦖\u0003\u0003/\u0010Kr馔\\\u0010𮧋|៧𤊳\u0001\u0008􅳂"
+                    "type": "-W\u0004c𣩏DP|􀕾󰦖\u0003\u0003/\u0010Kr馔\\\u0010𮧋|៧𤊳\u0001\u0008􅳂",
+                    "value": " \u0017\t\u000ckR!\u0010"
                 },
                 {
-                    "value": "xbF\u0000󿒠V-Jd0\u0015>x_𥟐氚\nKz\u0002!\u0003",
-                    "type": "X^?U04\u001e4\u0012w.{GyR󽑱i5\u0006u*\u0005\u0010횓f\u001f"
+                    "type": "X^?U04\u001e4\u0012w.{GyR󽑱i5\u0006u*\u0005\u0010횓f\u001f",
+                    "value": "xbF\u0000󿒠V-Jd0\u0015>x_𥟐氚\nKz\u0002!\u0003"
                 },
                 {
-                    "value": "1\u001a;n󷔖\tl柳\u0019_-C󷯣Q6]}Y􅽱\u0019zq",
-                    "type": "2􏱧𘕊P(9契𠟁\u0005)\u001c󱽒砛4󺆜T𭹀8yQvP;\r"
+                    "type": "2􏱧𘕊P(9契𠟁\u0005)\u001c󱽒砛4󺆜T𭹀8yQvP;\r",
+                    "value": "1\u001a;n󷔖\tl柳\u0019_-C󷯣Q6]}Y􅽱\u0019zq"
                 },
                 {
-                    "value": "0v𦍌\u00137ꅪ",
-                    "type": "'sB %\u0000󽙕di⤎󷬮9憵'=\rC𬠤􊲘𦱶🈁􅭠*"
+                    "type": "'sB %\u0000󽙕di⤎󷬮9憵'=\rC𬠤􊲘𦱶🈁􅭠*",
+                    "value": "0v𦍌\u00137ꅪ"
                 },
                 {
-                    "value": "\u0015&􎦟\\\\\u000bJ\u0019\u001d&tBvv>Rgq𥌸ZlPy\\",
-                    "type": "!,dHU𗸠\u001e0usQt}􊶔5𗥒{^\u000b"
+                    "type": "!,dHU𗸠\u001e0usQt}􊶔5𗥒{^\u000b",
+                    "value": "\u0015&􎦟\\\\\u000bJ\u0019\u001d&tBvv>Rgq𥌸ZlPy\\"
                 },
                 {
-                    "value": ">nSp\u001bq\u0012\r\u0016e\u0012SToL]iq\t>􁙮Y)",
-                    "type": "\u0004"
+                    "type": "\u0004",
+                    "value": ">nSp\u001bq\u0012\r\u0016e\u0012SToL]iq\t>􁙮Y)"
                 },
                 {
-                    "value": "p􋋉cX\u001b<䫭",
-                    "type": "\u0017V𥜄&\u0006N󿑸"
+                    "type": "\u0017V𥜄&\u0006N󿑸",
+                    "value": "p􋋉cX\u001b<䫭"
                 },
                 {
-                    "value": "%X/造Bi%:㩦}g)c􆔋\u001b\u001fY9󿷼",
-                    "type": "𨻪N𦙇?%\u0008󷷣뎽􈓓?\u0011􃎧𮕖)@󳸈􁤨\u0001\u0004􏛅愯\\&>`"
+                    "type": "𨻪N𦙇?%\u0008󷷣뎽􈓓?\u0011􃎧𮕖)@󳸈􁤨\u0001\u0004􏛅愯\\&>`",
+                    "value": "%X/造Bi%:㩦}g)c􆔋\u001b\u001fY9󿷼"
                 },
                 {
-                    "value": ".3w4u,Y@\u0001𧔣A󽳛𠤿t㼿\"i󲱇n\"%􅌾瀌2󶃉",
-                    "type": "91!󶊵@l\"󱊑G\u0003\u0004{􀁎􈵥yaJ"
+                    "type": "91!󶊵@l\"󱊑G\u0003\u0004{􀁎􈵥yaJ",
+                    "value": ".3w4u,Y@\u0001𧔣A󽳛𠤿t㼿\"i󲱇n\"%􅌾瀌2󶃉"
                 },
                 {
-                    "value": "V B􃀅$HHl󹢽􋔺𨓈􋘗o󼽋,~\u0004p(E𪕜6r2\u001eC`",
-                    "type": "\u0014b\u0007X󽜢\u001a󵿕"
+                    "type": "\u0014b\u0007X󽜢\u001a󵿕",
+                    "value": "V B􃀅$HHl󹢽􋔺𨓈􋘗o󼽋,~\u0004p(E𪕜6r2\u001eC`"
                 },
                 {
-                    "value": "\u0004RnwnF󿨣;5\nDK𑋑KHT(\u001cX",
-                    "type": "a\u000b􌕕LsE󼥔􂉟GD'􈰫a󴐿𥣴`G\u0019]\u0004\u001d`3i\u001a𘐦K"
+                    "type": "a\u000b􌕕LsE󼥔􂉟GD'􈰫a󴐿𥣴`G\u0019]\u0004\u001d`3i\u001a𘐦K",
+                    "value": "\u0004RnwnF󿨣;5\nDK𑋑KHT(\u001cX"
                 },
                 {
-                    "value": "WoQ\u001ba𒍇F\u0010\u001dmH9􂂿k􉗼󸡖􂡴H",
-                    "type": "𣹖􌺦\t󴦯Tu􊄫h3M8􎒸􆇉6"
+                    "type": "𣹖􌺦\t󴦯Tu􊄫h3M8􎒸􆇉6",
+                    "value": "WoQ\u001ba𒍇F\u0010\u001dmH9􂂿k􉗼󸡖􂡴H"
                 },
                 {
-                    "value": "𫑫\\R\u0011*A􆪞7/\u000f󹘤\u001aiRI|\u0008y\u0015e󸯉S􀿦OL'􀖗􄧥*",
-                    "type": "􆁲~!󶔝􁪍D􋉊\u0005𨧯2r"
+                    "type": "􆁲~!󶔝􁪍D􋉊\u0005𨧯2r",
+                    "value": "𫑫\\R\u0011*A􆪞7/\u000f󹘤\u001aiRI|\u0008y\u0015e󸯉S􀿦OL'􀖗􄧥*"
                 },
                 {
-                    "value": "􊰮\u0011H󽸌\u00061>_'",
-                    "type": "-䀈"
+                    "type": "-䀈",
+                    "value": "􊰮\u0011H󽸌\u00061>_'"
                 },
                 {
-                    "value": "xL\u000e󸪇(\u0005\tY\u0014\u0000F􅺜[퇶\tU`twpU\u00037󴸜!w᭚",
-                    "type": ""
+                    "type": "",
+                    "value": "xL\u000e󸪇(\u0005\tY\u0014\u0000F􅺜[퇶\tU`twpU\u00037󴸜!w᭚"
                 },
                 {
-                    "value": "x&菞\u0004iKb6t󹋟",
-                    "type": "BP8i3𬧇@[g𮉟3𗇙OHq\u00187"
+                    "type": "BP8i3𬧇@[g𮉟3𗇙OHq\u00187",
+                    "value": "x&菞\u0004iKb6t󹋟"
                 },
                 {
-                    "value": "\u001f颁=\u0008\u0011,E",
-                    "type": "D\u0000q𦜪|.\u0000󰔑'𖠘mkCiG\u0015:\u0007\u000bv's󴄘0(\u0007\u000bV"
+                    "type": "D\u0000q𦜪|.\u0000󰔑'𖠘mkCiG\u0015:\u0007\u000bv's󴄘0(\u0007\u000bV",
+                    "value": "\u001f颁=\u0008\u0011,E"
                 },
                 {
-                    "value": "󱾕7n𪛀\u0011屙x",
-                    "type": "t\u0002"
+                    "type": "t\u0002",
+                    "value": "󱾕7n𪛀\u0011屙x"
                 },
                 {
-                    "value": "\u0004󿐱𭩨𨩋d󺉽#+r",
-                    "type": "Z􅰉\u001e󾻀\u001cq\u0000E\u001f+􎷦B\"\\Y72t`<R?"
+                    "type": "Z􅰉\u001e󾻀\u001cq\u0000E\u001f+􎷦B\"\\Y72t`<R?",
+                    "value": "\u0004󿐱𭩨𨩋d󺉽#+r"
                 },
                 {
-                    "value": "f",
-                    "type": "\u0014\"旁􄠙\t󽆷\r𝅯V\u001e~󰱛Fp[1PS⌴􀣓𓋀g8𥠻箩YO2?"
+                    "type": "\u0014\"旁􄠙\t󽆷\r𝅯V\u001e~󰱛Fp[1PS⌴􀣓𓋀g8𥠻箩YO2?",
+                    "value": "f"
                 },
                 {
-                    "value": "웠>􍃯\u000c+=󸑌)\u000c:PL󾀃􈌚R>^\u0001b\u0005a",
-                    "type": "𬟛.A􃿥RX=:P𞤄+3\u0016\u0000􆇾v₨)􂼳Xn𪫰\u0003󿠿\u0000p􃡒\u000cb"
+                    "type": "𬟛.A􃿥RX=:P𞤄+3\u0016\u0000􆇾v₨)􂼳Xn𪫰\u0003󿠿\u0000p􃡒\u000cb",
+                    "value": "웠>􍃯\u000c+=󸑌)\u000c:PL󾀃􈌚R>^\u0001b\u0005a"
                 },
                 {
-                    "value": "\u0001",
-                    "type": "󸺁\n5\u0004\u0016\u001ap[+N\u0002A𐘶7uQ"
+                    "type": "󸺁\n5\u0004\u0016\u001ap[+N\u0002A𐘶7uQ",
+                    "value": "\u0001"
                 },
                 {
-                    "value": "l\u001c\u001f",
-                    "type": "r󳐊9K\u00193-5^)9\u0014𔓿"
+                    "type": "r󳐊9K\u00193-5^)9\u0014𔓿",
+                    "value": "l\u001c\u001f"
                 },
                 {
-                    "value": "🐃G>v<1󿀀W5s't𥦖\u001c\u001cx>%𠽊\u001db(1\u000c1\u001e\u0001",
-                    "type": "}\u0001Q=𨂗a􁒧|󾟝\u0004ﳷ#f􇝲?\u0000#%O9fap칎뎼L$~"
+                    "type": "}\u0001Q=𨂗a􁒧|󾟝\u0004ﳷ#f􇝲?\u0000#%O9fap칎뎼L$~",
+                    "value": "🐃G>v<1󿀀W5s't𥦖\u001c\u001cx>%𠽊\u001db(1\u000c1\u001e\u0001"
                 },
                 {
-                    "value": "\u0007-\u00025C􃶄6t\u0019􅩨R𬝖J- 4'󺳕@\n2\u0016",
-                    "type": "V&\u0015kᚑWm\u001c𪴑^􈻟􇢰􁷑\u0008]k-"
+                    "type": "V&\u0015kᚑWm\u001c𪴑^􈻟􇢰􁷑\u0008]k-",
+                    "value": "\u0007-\u00025C􃶄6t\u0019􅩨R𬝖J- 4'󺳕@\n2\u0016"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "𣹖􌺦\t󴦯Tu􊄫h3M8􎒸􆇉6": "WoQ\u001ba𒍇F\u0010\u001dmH9􂂿k􉗼󸡖􂡴H",
-        "y󹫲B㩕": "<󹾵\u001e-\n\u001d'􄄅%z\u0010\u001a,\u0010tSpSݑ",
-        "}\u0001Q=𨂗a􁒧|󾟝\u0004ﳷ#f􇝲?\u0000#%O9fap칎뎼L$~": "🐃G>v<1󿀀W5s't𥦖\u001c\u001cx>%𠽊\u001db(1\u000c1\u001e\u0001",
-        "\u0017V𥜄&\u0006N󿑸": "p􋋉cX\u001b<䫭",
-        "`\"\u0005't󾨺䯼:\u0005爅F\u0014[KO%𩉽\u0002\u001b8ᵰ%s": "󶰶\u0019_)󹑲𔔧~W:󽘁u",
-        "-䀈": "􊰮\u0011H󽸌\u00061>_'",
-        "𨻪N𦙇?%\u0008󷷣뎽􈓓?\u0011􃎧𮕖)@󳸈􁤨\u0001\u0004􏛅愯\\&>`": "%X/造Bi%:㩦}g)c􆔋\u001b\u001fY9󿷼",
-        "": "xL\u000e󸪇(\u0005\tY\u0014\u0000F􅺜[퇶\tU`twpU\u00037󴸜!w᭚",
-        "D\u0000q𦜪|.\u0000󰔑'𖠘mkCiG\u0015:\u0007\u000bv's󴄘0(\u0007\u000bV": "\u001f颁=\u0008\u0011,E",
-        "𭱯,󻃾~𪺦<,v󵋎􄩘": "\u0010􈁐?ᗛ\u0011",
-        "X^?U04\u001e4\u0012w.{GyR󽑱i5\u0006u*\u0005\u0010횓f\u001f": "xbF\u0000󿒠V-Jd0\u0015>x_𥟐氚\nKz\u0002!\u0003",
-        "M壭#긇`C􃧈\u001a􎞗v@d\u0011􊥠󸫵QL'4>": "\\hON#Tb'󳊘숏wE",
-        ";t\u001aj󺕠F\u0013i󾰓󱦑=\u0006`d􀦃𗘫,D𩰶ᠮ\u001d𨭬": "\u0017sg𠔯(Ji𠽓4L抡\u0010xG萕􏌱!\u0019Ieo%sDJ𝉁%𧱙8",
-        "Z􅰉\u001e󾻀\u001cq\u0000E\u001f+􎷦B\"\\Y72t`<R?": "\u0004󿐱𭩨𨩋d󺉽#+r",
-        "𬟛.A􃿥RX=:P𞤄+3\u0016\u0000􆇾v₨)􂼳Xn𪫰\u0003󿠿\u0000p􃡒\u000cb": "웠>􍃯\u000c+=󸑌)\u000c:PL󾀃􈌚R>^\u0001b\u0005a",
-        "!,dHU𗸠\u001e0usQt}􊶔5𗥒{^\u000b": "\u0015&􎦟\\\\\u000bJ\u0019\u001d&tBvv>Rgq𥌸ZlPy\\",
-        "r󳐊9K\u00193-5^)9\u0014𔓿": "l\u001c\u001f",
-        "2􏱧𘕊P(9契𠟁\u0005)\u001c󱽒砛4󺆜T𭹀8yQvP;\r": "1\u001a;n󷔖\tl柳\u0019_-C󷯣Q6]}Y􅽱\u0019zq",
-        "-W\u0004c𣩏DP|􀕾󰦖\u0003\u0003/\u0010Kr馔\\\u0010𮧋|៧𤊳\u0001\u0008􅳂": " \u0017\t\u000ckR!\u0010",
-        "\u0004": ">nSp\u001bq\u0012\r\u0016e\u0012SToL]iq\t>􁙮Y)",
-        "BP8i3𬧇@[g𮉟3𗇙OHq\u00187": "x&菞\u0004iKb6t󹋟",
-        "\u0014b\u0007X󽜢\u001a󵿕": "V B􃀅$HHl󹢽􋔺𨓈􋘗o󼽋,~\u0004p(E𪕜6r2\u001eC`",
-        "󸺁\n5\u0004\u0016\u001ap[+N\u0002A𐘶7uQ": "\u0001",
-        "\u0014\"旁􄠙\t󽆷\r𝅯V\u001e~󰱛Fp[1PS⌴􀣓𓋀g8𥠻箩YO2?": "f",
-        "91!󶊵@l\"󱊑G\u0003\u0004{􀁎􈵥yaJ": ".3w4u,Y@\u0001𧔣A󽳛𠤿t㼿\"i󲱇n\"%􅌾瀌2󶃉",
-        "􆁲~!󶔝􁪍D􋉊\u0005𨧯2r": "𫑫\\R\u0011*A􆪞7/\u000f󹘤\u001aiRI|\u0008y\u0015e󸯉S􀿦OL'􀖗􄧥*",
-        "V&\u0015kᚑWm\u001c𪴑^􈻟􇢰􁷑\u0008]k-": "\u0007-\u00025C􃶄6t\u0019􅩨R𬝖J- 4'󺳕@\n2\u0016",
-        "'sB %\u0000󽙕di⤎󷬮9憵'=\rC𬠤􊲘𦱶🈁􅭠*": "0v𦍌\u00137ꅪ",
-        "a\u000b􌕕LsE󼥔􂉟GD'􈰫a󴐿𥣴`G\u0019]\u0004\u001d`3i\u001a𘐦K": "\u0004RnwnF󿨣;5\nDK𑋑KHT(\u001cX",
-        "t\u0002": "󱾕7n𪛀\u0011屙x"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_16.json b/libs/wire-api/test/golden/testObject_RichInfo_user_16.json
index 88881bdc5a2..3de3040dc07 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_16.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_16.json
@@ -1,51 +1,51 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "S􃣧\u00080𩍆\u0001\u0001Oj𠔅󻭋LI|d욪\u000e",
+        "*룬􉀛\u001f\u001e󰘌D􁃘𬡈P\u0006=A\u0016-Ap𫹍󹚱L\u001d\u001d\u001d": "g",
+        "@ffF\u0007(~a\u0019⸎\u00036\u0016": "\r᪦~\u001dn􋅵",
+        "M'*F*ㆡv𬵉󷻮󷅒Iqo\u001d󻳸B1Tgᇫ": "S=",
+        "lPj𩒪sR􏟙AV`I􆶪𭋰h\u001e\u000c\u0000\u0002􏕒\u0018󱳑󿇼si\"'P\u0005fQ": "=󲑲MBp)𝞪\u0012󴑧玼􏹓x󻲭x4",
+        "𐁙׆j@󵇯,@w>􀃝𧗛q": "25\u0001|\u0016w󴘸􅹸􃐅jW\u0001|G\u0016\u0006\u0012\u001dcjV.",
+        "𑅬󸢼(\u0010ad󶠡\u0003|󼃐\u000b𦾽+􈠠NGSH\u0004*.": ")\u0004f`j?t󺦿^/\u0003󼑴z3􈄁\u000c\u000c\u001d",
+        "󰸛\u0005𤲦>\u0013\u0019\u0015􀥝RB.嚒\u0003{\u0015\u0019UUq{": "d􃸭\u0010󲯰\u0010"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": ")\u0004f`j?t󺦿^/\u0003󼑴z3􈄁\u000c\u000c\u001d",
-                    "type": "𑅬󸢼(\u0010ad󶠡\u0003|󼃐\u000b𦾽+􈠠NGSH\u0004*."
+                    "type": "𑅬󸢼(\u0010ad󶠡\u0003|󼃐\u000b𦾽+􈠠NGSH\u0004*.",
+                    "value": ")\u0004f`j?t󺦿^/\u0003󼑴z3􈄁\u000c\u000c\u001d"
                 },
                 {
-                    "value": "S􃣧\u00080𩍆\u0001\u0001Oj𠔅󻭋LI|d욪\u000e",
-                    "type": ""
+                    "type": "",
+                    "value": "S􃣧\u00080𩍆\u0001\u0001Oj𠔅󻭋LI|d욪\u000e"
                 },
                 {
-                    "value": "d􃸭\u0010󲯰\u0010",
-                    "type": "󰸛\u0005𤲦>\u0013\u0019\u0015􀥝RB.嚒\u0003{\u0015\u0019UUq{"
+                    "type": "󰸛\u0005𤲦>\u0013\u0019\u0015􀥝RB.嚒\u0003{\u0015\u0019UUq{",
+                    "value": "d􃸭\u0010󲯰\u0010"
                 },
                 {
-                    "value": "\r᪦~\u001dn􋅵",
-                    "type": "@ffF\u0007(~a\u0019⸎\u00036\u0016"
+                    "type": "@ffF\u0007(~a\u0019⸎\u00036\u0016",
+                    "value": "\r᪦~\u001dn􋅵"
                 },
                 {
-                    "value": "g",
-                    "type": "*룬􉀛\u001f\u001e󰘌D􁃘𬡈P\u0006=A\u0016-Ap𫹍󹚱L\u001d\u001d\u001d"
+                    "type": "*룬􉀛\u001f\u001e󰘌D􁃘𬡈P\u0006=A\u0016-Ap𫹍󹚱L\u001d\u001d\u001d",
+                    "value": "g"
                 },
                 {
-                    "value": "S=",
-                    "type": "M'*F*ㆡv𬵉󷻮󷅒Iqo\u001d󻳸B1Tgᇫ"
+                    "type": "M'*F*ㆡv𬵉󷻮󷅒Iqo\u001d󻳸B1Tgᇫ",
+                    "value": "S="
                 },
                 {
-                    "value": "25\u0001|\u0016w󴘸􅹸􃐅jW\u0001|G\u0016\u0006\u0012\u001dcjV.",
-                    "type": "𐁙׆j@󵇯,@w>􀃝𧗛q"
+                    "type": "𐁙׆j@󵇯,@w>􀃝𧗛q",
+                    "value": "25\u0001|\u0016w󴘸􅹸􃐅jW\u0001|G\u0016\u0006\u0012\u001dcjV."
                 },
                 {
-                    "value": "=󲑲MBp)𝞪\u0012󴑧玼􏹓x󻲭x4",
-                    "type": "lPj𩒪sR􏟙AV`I􆶪𭋰h\u001e\u000c\u0000\u0002􏕒\u0018󱳑󿇼si\"'P\u0005fQ"
+                    "type": "lPj𩒪sR􏟙AV`I􆶪𭋰h\u001e\u000c\u0000\u0002􏕒\u0018󱳑󿇼si\"'P\u0005fQ",
+                    "value": "=󲑲MBp)𝞪\u0012󴑧玼􏹓x󻲭x4"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "M'*F*ㆡv𬵉󷻮󷅒Iqo\u001d󻳸B1Tgᇫ": "S=",
-        "lPj𩒪sR􏟙AV`I􆶪𭋰h\u001e\u000c\u0000\u0002􏕒\u0018󱳑󿇼si\"'P\u0005fQ": "=󲑲MBp)𝞪\u0012󴑧玼􏹓x󻲭x4",
-        "": "S􃣧\u00080𩍆\u0001\u0001Oj𠔅󻭋LI|d욪\u000e",
-        "󰸛\u0005𤲦>\u0013\u0019\u0015􀥝RB.嚒\u0003{\u0015\u0019UUq{": "d􃸭\u0010󲯰\u0010",
-        "𐁙׆j@󵇯,@w>􀃝𧗛q": "25\u0001|\u0016w󴘸􅹸􃐅jW\u0001|G\u0016\u0006\u0012\u001dcjV.",
-        "@ffF\u0007(~a\u0019⸎\u00036\u0016": "\r᪦~\u001dn􋅵",
-        "𑅬󸢼(\u0010ad󶠡\u0003|󼃐\u000b𦾽+􈠠NGSH\u0004*.": ")\u0004f`j?t󺦿^/\u0003󼑴z3􈄁\u000c\u000c\u001d",
-        "*룬􉀛\u001f\u001e󰘌D􁃘𬡈P\u0006=A\u0016-Ap𫹍󹚱L\u001d\u001d\u001d": "g"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_17.json b/libs/wire-api/test/golden/testObject_RichInfo_user_17.json
index 604b000dd3f..b0b09c6020d 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_17.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_17.json
@@ -1,16 +1,16 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "􎵟_𢳀𡸿\u0002qF\u0016𑙄": "qx\u001d\u000b\u001dE𗷤䨽s𩶻`?\u0004\u0014\u001f*㋊"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "qx\u001d\u000b\u001dE𗷤䨽s𩶻`?\u0004\u0014\u001f*㋊",
-                    "type": "􎵟_𢳀𡸿\u0002qF\u0016𑙄"
+                    "type": "􎵟_𢳀𡸿\u0002qF\u0016𑙄",
+                    "value": "qx\u001d\u000b\u001dE𗷤䨽s𩶻`?\u0004\u0014\u001f*㋊"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "􎵟_𢳀𡸿\u0002qF\u0016𑙄": "qx\u001d\u000b\u001dE𗷤䨽s𩶻`?\u0004\u0014\u001f*㋊"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_18.json b/libs/wire-api/test/golden/testObject_RichInfo_user_18.json
index 8578bb2861b..18d00a05c92 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_18.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_18.json
@@ -1,111 +1,111 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0005l%g|R旟": "\u001b;󼎏\u0012󹅚Vi\u0004\u0008@k\u001d~M귟\u001d|󹜝\u0019󷆳55d}91'",
+        "\u0006󼾤A\n\u00088": "pj:",
+        "\u0008C󽴯4a𐼀-rVr󹴕Ok": "\u001c",
+        "\u000f\u000b\u0017\u0001\u0017\u0001\u001e\u0015>𭼩\u0007􈞗\u001f^*": " [􈴛L>\u000c􉉦",
+        "\u0019\u0003\u0019{󼏝1\t􋽘\u0006髹i": "\u001eS}xmTq\u0006WZ𘟀樥\u0014\u0013𮑷 'C#V*d\u000f~󻣆8",
+        "\"젣\u0011w\u0007{3W;􎳫[FS\u0008𖬧v󼟝󳪣%t}": "\u000c𥘐u_hv󴷩\nn󶛴S_",
+        "%2V􋙔󶨀D𬠮[AM/S8鷚^\u000b\u001e": "88A$Jfrz𒉪>CV^M\u000f炃􃇽uG𝁣𖭪7~o𬻦\t|\rJG",
+        "'3􄕷+)𬷂{KꖿZeL\u0006'\n𗍛>)\u0008a+UfQ0I\u0005N􁒡ⴤ": "\u0012\u0017𒄳",
+        "FW\u0003\u001f\u0005 ~a𦟫gt𑋐칀{": "󷸞\"玌QE󿋰",
+        "L'\\𐜫\u001aN6\u001dB2*2B": "Brh",
+        "[\u0001=𗶜𡋡󻯿x值Ob𫟗8Q\u00195󴄍y%|\u0017\u0010-𠋡|󶥩𬮵픔7[": "(᧲\u000c\"~􈧽𮫲R",
+        "c`EBW": "g\u0013m\u0000󶃷\u0000肛󽴱Y\u0006\u0008\u000by\u0000",
+        "m\"N8⩣􊾙\r": "𦟼\u0002󷓳A\tA󸗛mEz",
+        "n󼢂5@\u0003鋭\u001fꪈ": "~q􋓆U\"\u0006\u0011.{緲t\u001b8伣",
+        "s袅": "|",
+        "v\u0011𨾪􂹁v;\u001cYp$J]󳐈": "vd㋣𡂝A|\u0007\u0016\u0006yV1𬆄\"y㝹x\u00051Y\u0005𪕯𫇢w\r\u0018C\n$\u0004",
+        "x": "tI",
+        "x|\t-\u0007\u0000": "2\u000eš\u0015\u0013?",
+        "󰾩": ";E\u0007K%S\u0016ST1/\tJ7\u0005\u0007\u001c󼝀𮀇\r鈒0]r\u000c􏘄l(",
+        "󶩍􀕱r@𨀐F~R쬚\u000fud􍁥N)b\u0014𑴧􍕥\u0016貂": "􏚴^,U􎰾菦_\u0010^]󰤫>|󰉇󹻁x󵰶󸾗b𠪬"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "88A$Jfrz𒉪>CV^M\u000f炃􃇽uG𝁣𖭪7~o𬻦\t|\rJG",
-                    "type": "%2V􋙔󶨀D𬠮[AM/S8鷚^\u000b\u001e"
+                    "type": "%2V􋙔󶨀D𬠮[AM/S8鷚^\u000b\u001e",
+                    "value": "88A$Jfrz𒉪>CV^M\u000f炃􃇽uG𝁣𖭪7~o𬻦\t|\rJG"
                 },
                 {
-                    "value": "\u001c",
-                    "type": "\u0008C󽴯4a𐼀-rVr󹴕Ok"
+                    "type": "\u0008C󽴯4a𐼀-rVr󹴕Ok",
+                    "value": "\u001c"
                 },
                 {
-                    "value": "vd㋣𡂝A|\u0007\u0016\u0006yV1𬆄\"y㝹x\u00051Y\u0005𪕯𫇢w\r\u0018C\n$\u0004",
-                    "type": "v\u0011𨾪􂹁v;\u001cYp$J]󳐈"
+                    "type": "v\u0011𨾪􂹁v;\u001cYp$J]󳐈",
+                    "value": "vd㋣𡂝A|\u0007\u0016\u0006yV1𬆄\"y㝹x\u00051Y\u0005𪕯𫇢w\r\u0018C\n$\u0004"
                 },
                 {
-                    "value": "\u000c𥘐u_hv󴷩\nn󶛴S_",
-                    "type": "\"젣\u0011w\u0007{3W;􎳫[FS\u0008𖬧v󼟝󳪣%t}"
+                    "type": "\"젣\u0011w\u0007{3W;􎳫[FS\u0008𖬧v󼟝󳪣%t}",
+                    "value": "\u000c𥘐u_hv󴷩\nn󶛴S_"
                 },
                 {
-                    "value": "Brh",
-                    "type": "L'\\𐜫\u001aN6\u001dB2*2B"
+                    "type": "L'\\𐜫\u001aN6\u001dB2*2B",
+                    "value": "Brh"
                 },
                 {
-                    "value": ";E\u0007K%S\u0016ST1/\tJ7\u0005\u0007\u001c󼝀𮀇\r鈒0]r\u000c􏘄l(",
-                    "type": "󰾩"
+                    "type": "󰾩",
+                    "value": ";E\u0007K%S\u0016ST1/\tJ7\u0005\u0007\u001c󼝀𮀇\r鈒0]r\u000c􏘄l("
                 },
                 {
-                    "value": "(᧲\u000c\"~􈧽𮫲R",
-                    "type": "[\u0001=𗶜𡋡󻯿x值Ob𫟗8Q\u00195󴄍y%|\u0017\u0010-𠋡|󶥩𬮵픔7["
+                    "type": "[\u0001=𗶜𡋡󻯿x值Ob𫟗8Q\u00195󴄍y%|\u0017\u0010-𠋡|󶥩𬮵픔7[",
+                    "value": "(᧲\u000c\"~􈧽𮫲R"
                 },
                 {
-                    "value": "󷸞\"玌QE󿋰",
-                    "type": "FW\u0003\u001f\u0005 ~a𦟫gt𑋐칀{"
+                    "type": "FW\u0003\u001f\u0005 ~a𦟫gt𑋐칀{",
+                    "value": "󷸞\"玌QE󿋰"
                 },
                 {
-                    "value": "|",
-                    "type": "s袅"
+                    "type": "s袅",
+                    "value": "|"
                 },
                 {
-                    "value": "~q􋓆U\"\u0006\u0011.{緲t\u001b8伣",
-                    "type": "n󼢂5@\u0003鋭\u001fꪈ"
+                    "type": "n󼢂5@\u0003鋭\u001fꪈ",
+                    "value": "~q􋓆U\"\u0006\u0011.{緲t\u001b8伣"
                 },
                 {
-                    "value": "𦟼\u0002󷓳A\tA󸗛mEz",
-                    "type": "m\"N8⩣􊾙\r"
+                    "type": "m\"N8⩣􊾙\r",
+                    "value": "𦟼\u0002󷓳A\tA󸗛mEz"
                 },
                 {
-                    "value": "\u001b;󼎏\u0012󹅚Vi\u0004\u0008@k\u001d~M귟\u001d|󹜝\u0019󷆳55d}91'",
-                    "type": "\u0005l%g|R旟"
+                    "type": "\u0005l%g|R旟",
+                    "value": "\u001b;󼎏\u0012󹅚Vi\u0004\u0008@k\u001d~M귟\u001d|󹜝\u0019󷆳55d}91'"
                 },
                 {
-                    "value": "g\u0013m\u0000󶃷\u0000肛󽴱Y\u0006\u0008\u000by\u0000",
-                    "type": "c`EBW"
+                    "type": "c`EBW",
+                    "value": "g\u0013m\u0000󶃷\u0000肛󽴱Y\u0006\u0008\u000by\u0000"
                 },
                 {
-                    "value": "pj:",
-                    "type": "\u0006󼾤A\n\u00088"
+                    "type": "\u0006󼾤A\n\u00088",
+                    "value": "pj:"
                 },
                 {
-                    "value": "2\u000eš\u0015\u0013?",
-                    "type": "x|\t-\u0007\u0000"
+                    "type": "x|\t-\u0007\u0000",
+                    "value": "2\u000eš\u0015\u0013?"
                 },
                 {
-                    "value": "\u0012\u0017𒄳",
-                    "type": "'3􄕷+)𬷂{KꖿZeL\u0006'\n𗍛>)\u0008a+UfQ0I\u0005N􁒡ⴤ"
+                    "type": "'3􄕷+)𬷂{KꖿZeL\u0006'\n𗍛>)\u0008a+UfQ0I\u0005N􁒡ⴤ",
+                    "value": "\u0012\u0017𒄳"
                 },
                 {
-                    "value": "􏚴^,U􎰾菦_\u0010^]󰤫>|󰉇󹻁x󵰶󸾗b𠪬",
-                    "type": "󶩍􀕱r@𨀐F~R쬚\u000fud􍁥N)b\u0014𑴧􍕥\u0016貂"
+                    "type": "󶩍􀕱r@𨀐F~R쬚\u000fud􍁥N)b\u0014𑴧􍕥\u0016貂",
+                    "value": "􏚴^,U􎰾菦_\u0010^]󰤫>|󰉇󹻁x󵰶󸾗b𠪬"
                 },
                 {
-                    "value": "\u001eS}xmTq\u0006WZ𘟀樥\u0014\u0013𮑷 'C#V*d\u000f~󻣆8",
-                    "type": "\u0019\u0003\u0019{󼏝1\t􋽘\u0006髹i"
+                    "type": "\u0019\u0003\u0019{󼏝1\t􋽘\u0006髹i",
+                    "value": "\u001eS}xmTq\u0006WZ𘟀樥\u0014\u0013𮑷 'C#V*d\u000f~󻣆8"
                 },
                 {
-                    "value": "tI",
-                    "type": "x"
+                    "type": "x",
+                    "value": "tI"
                 },
                 {
-                    "value": " [􈴛L>\u000c􉉦",
-                    "type": "\u000f\u000b\u0017\u0001\u0017\u0001\u001e\u0015>𭼩\u0007􈞗\u001f^*"
+                    "type": "\u000f\u000b\u0017\u0001\u0017\u0001\u001e\u0015>𭼩\u0007􈞗\u001f^*",
+                    "value": " [􈴛L>\u000c􉉦"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "FW\u0003\u001f\u0005 ~a𦟫gt𑋐칀{": "󷸞\"玌QE󿋰",
-        "%2V􋙔󶨀D𬠮[AM/S8鷚^\u000b\u001e": "88A$Jfrz𒉪>CV^M\u000f炃􃇽uG𝁣𖭪7~o𬻦\t|\rJG",
-        "x|\t-\u0007\u0000": "2\u000eš\u0015\u0013?",
-        "m\"N8⩣􊾙\r": "𦟼\u0002󷓳A\tA󸗛mEz",
-        "󶩍􀕱r@𨀐F~R쬚\u000fud􍁥N)b\u0014𑴧􍕥\u0016貂": "􏚴^,U􎰾菦_\u0010^]󰤫>|󰉇󹻁x󵰶󸾗b𠪬",
-        "L'\\𐜫\u001aN6\u001dB2*2B": "Brh",
-        "\"젣\u0011w\u0007{3W;􎳫[FS\u0008𖬧v󼟝󳪣%t}": "\u000c𥘐u_hv󴷩\nn󶛴S_",
-        "\u0019\u0003\u0019{󼏝1\t􋽘\u0006髹i": "\u001eS}xmTq\u0006WZ𘟀樥\u0014\u0013𮑷 'C#V*d\u000f~󻣆8",
-        "\u0006󼾤A\n\u00088": "pj:",
-        "'3􄕷+)𬷂{KꖿZeL\u0006'\n𗍛>)\u0008a+UfQ0I\u0005N􁒡ⴤ": "\u0012\u0017𒄳",
-        "\u000f\u000b\u0017\u0001\u0017\u0001\u001e\u0015>𭼩\u0007􈞗\u001f^*": " [􈴛L>\u000c􉉦",
-        "\u0008C󽴯4a𐼀-rVr󹴕Ok": "\u001c",
-        "v\u0011𨾪􂹁v;\u001cYp$J]󳐈": "vd㋣𡂝A|\u0007\u0016\u0006yV1𬆄\"y㝹x\u00051Y\u0005𪕯𫇢w\r\u0018C\n$\u0004",
-        "[\u0001=𗶜𡋡󻯿x值Ob𫟗8Q\u00195󴄍y%|\u0017\u0010-𠋡|󶥩𬮵픔7[": "(᧲\u000c\"~􈧽𮫲R",
-        "x": "tI",
-        "n󼢂5@\u0003鋭\u001fꪈ": "~q􋓆U\"\u0006\u0011.{緲t\u001b8伣",
-        "c`EBW": "g\u0013m\u0000󶃷\u0000肛󽴱Y\u0006\u0008\u000by\u0000",
-        "󰾩": ";E\u0007K%S\u0016ST1/\tJ7\u0005\u0007\u001c󼝀𮀇\r鈒0]r\u000c􏘄l(",
-        "s袅": "|",
-        "\u0005l%g|R旟": "\u001b;󼎏\u0012󹅚Vi\u0004\u0008@k\u001d~M귟\u001d|󹜝\u0019󷆳55d}91'"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_19.json b/libs/wire-api/test/golden/testObject_RichInfo_user_19.json
index 185260d1137..263a1a8ea24 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_19.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_19.json
@@ -1,86 +1,86 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0007=𧡔\u0005\u0017󵋤U\u0001!@𥬅9^󼐒{ 𦬢󲜉1t!􉠋": "\u0019q\u0018숺3\u001d𐛉-r|\u0005r\u001f-z􉮘%lI𬴢\u001a<{\u0008\u0013",
+        "\u000bb\u0008SF󾪨\u000b[𩩆𨢫\u0014\u001faL\u0010􇳲P􃆵J=u\"n􄀳k𑖌r%": "𝔃𭈶\u0008\n",
+        "\u000e\r\u0005􄱿p\u000e𐭟<": "V𥍦e5E\u001d{󱄜2UPj􁤤",
+        "29Rd\u0004n双\u0019i􄚬󱧑52,\u0019$𑀆𠢎󳴟l\u000eWo}e": "൰􌀹\u001bM𞤧Q6\u000e􂬯𤝿",
+        "9\u0016D": "\n#!d䬩G\u0007=&9􈩆\u001eM\t􏳑4b\tf)~%\u0001D",
+        "r\u0010􁕜ꉱ_Y󴨼0QX": "b_\\􀞀C",
+        "vHxq欎h󳬡%J": ":}",
+        "w4{2V⎎󠇖 \u001a+𭘦\u0007뮩󸣒\\+": "Q\u000fJy􌙬,\u000bP.\u000f\u0005D/\u000f夀􈼼&ူ37lp",
+        "}rExd􊆎\u0018*O>": "&3kSY󺜨\u0013=\u001b(1􊊰􎵹\u0005󾨊14\u0000'\u0015}w臖\u001c \u000b􎘖d|󷵮",
+        "㪅X": "M",
+        "V(jc󳋅b榼u": "|l3󼡭1𠇟)􊌄cBT􎃧𨫎l\u0005|쌪\u000cw􈎗i䏾\u001d􇁵",
+        "𣈉:\u001b[&𨐉6a\r-}􇄾": "i󷯧\u001d-􊌥𡖓󿥄\u000fJ떭\u0013P鏞󰴊,즬\u001a0a8􉻛\u0008[f\u0003",
+        "𧫠󻗶K8ss]\u001aR\u001e!!\u001e?Eb\u0011`Z뉢\"0􇮃:&": "ql􏍎y_w\u0008",
+        "󷻁􃲈\u001a,\u001a\u00101󳏁o0!&\u0010󽨞🂃\u000f0𒁒gk?nflN": "O􀇊𨊡v7#R9",
+        "􏯹\u0012􌑏:.=9_|t3W\u000c": "⦅C^B}􇸇;𤈶Nh`/󲻲<𬔢-􅯗D텇)ﳋ)Q"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "O􀇊𨊡v7#R9",
-                    "type": "󷻁􃲈\u001a,\u001a\u00101󳏁o0!&\u0010󽨞🂃\u000f0𒁒gk?nflN"
+                    "type": "󷻁􃲈\u001a,\u001a\u00101󳏁o0!&\u0010󽨞🂃\u000f0𒁒gk?nflN",
+                    "value": "O􀇊𨊡v7#R9"
                 },
                 {
-                    "value": "൰􌀹\u001bM𞤧Q6\u000e􂬯𤝿",
-                    "type": "29Rd\u0004n双\u0019i􄚬󱧑52,\u0019$𑀆𠢎󳴟l\u000eWo}e"
+                    "type": "29Rd\u0004n双\u0019i􄚬󱧑52,\u0019$𑀆𠢎󳴟l\u000eWo}e",
+                    "value": "൰􌀹\u001bM𞤧Q6\u000e􂬯𤝿"
                 },
                 {
-                    "value": "|l3󼡭1𠇟)􊌄cBT􎃧𨫎l\u0005|쌪\u000cw􈎗i䏾\u001d􇁵",
-                    "type": "V(jc󳋅b榼u"
+                    "type": "V(jc󳋅b榼u",
+                    "value": "|l3󼡭1𠇟)􊌄cBT􎃧𨫎l\u0005|쌪\u000cw􈎗i䏾\u001d􇁵"
                 },
                 {
-                    "value": "b_\\􀞀C",
-                    "type": "r\u0010􁕜ꉱ_Y󴨼0QX"
+                    "type": "r\u0010􁕜ꉱ_Y󴨼0QX",
+                    "value": "b_\\􀞀C"
                 },
                 {
-                    "value": ":}",
-                    "type": "vHxq欎h󳬡%J"
+                    "type": "vHxq欎h󳬡%J",
+                    "value": ":}"
                 },
                 {
-                    "value": "⦅C^B}􇸇;𤈶Nh`/󲻲<𬔢-􅯗D텇)ﳋ)Q",
-                    "type": "􏯹\u0012􌑏:.=9_|t3W\u000c"
+                    "type": "􏯹\u0012􌑏:.=9_|t3W\u000c",
+                    "value": "⦅C^B}􇸇;𤈶Nh`/󲻲<𬔢-􅯗D텇)ﳋ)Q"
                 },
                 {
-                    "value": "i󷯧\u001d-􊌥𡖓󿥄\u000fJ떭\u0013P鏞󰴊,즬\u001a0a8􉻛\u0008[f\u0003",
-                    "type": "𣈉:\u001b[&𨐉6a\r-}􇄾"
+                    "type": "𣈉:\u001b[&𨐉6a\r-}􇄾",
+                    "value": "i󷯧\u001d-􊌥𡖓󿥄\u000fJ떭\u0013P鏞󰴊,즬\u001a0a8􉻛\u0008[f\u0003"
                 },
                 {
-                    "value": "&3kSY󺜨\u0013=\u001b(1􊊰􎵹\u0005󾨊14\u0000'\u0015}w臖\u001c \u000b􎘖d|󷵮",
-                    "type": "}rExd􊆎\u0018*O>"
+                    "type": "}rExd􊆎\u0018*O>",
+                    "value": "&3kSY󺜨\u0013=\u001b(1􊊰􎵹\u0005󾨊14\u0000'\u0015}w臖\u001c \u000b􎘖d|󷵮"
                 },
                 {
-                    "value": "ql􏍎y_w\u0008",
-                    "type": "𧫠󻗶K8ss]\u001aR\u001e!!\u001e?Eb\u0011`Z뉢\"0􇮃:&"
+                    "type": "𧫠󻗶K8ss]\u001aR\u001e!!\u001e?Eb\u0011`Z뉢\"0􇮃:&",
+                    "value": "ql􏍎y_w\u0008"
                 },
                 {
-                    "value": "𝔃𭈶\u0008\n",
-                    "type": "\u000bb\u0008SF󾪨\u000b[𩩆𨢫\u0014\u001faL\u0010􇳲P􃆵J=u\"n􄀳k𑖌r%"
+                    "type": "\u000bb\u0008SF󾪨\u000b[𩩆𨢫\u0014\u001faL\u0010􇳲P􃆵J=u\"n􄀳k𑖌r%",
+                    "value": "𝔃𭈶\u0008\n"
                 },
                 {
-                    "value": "\n#!d䬩G\u0007=&9􈩆\u001eM\t􏳑4b\tf)~%\u0001D",
-                    "type": "9\u0016D"
+                    "type": "9\u0016D",
+                    "value": "\n#!d䬩G\u0007=&9􈩆\u001eM\t􏳑4b\tf)~%\u0001D"
                 },
                 {
-                    "value": "M",
-                    "type": "㪅X"
+                    "type": "㪅X",
+                    "value": "M"
                 },
                 {
-                    "value": "\u0019q\u0018숺3\u001d𐛉-r|\u0005r\u001f-z􉮘%lI𬴢\u001a<{\u0008\u0013",
-                    "type": "\u0007=𧡔\u0005\u0017󵋤U\u0001!@𥬅9^󼐒{ 𦬢󲜉1t!􉠋"
+                    "type": "\u0007=𧡔\u0005\u0017󵋤U\u0001!@𥬅9^󼐒{ 𦬢󲜉1t!􉠋",
+                    "value": "\u0019q\u0018숺3\u001d𐛉-r|\u0005r\u001f-z􉮘%lI𬴢\u001a<{\u0008\u0013"
                 },
                 {
-                    "value": "Q\u000fJy􌙬,\u000bP.\u000f\u0005D/\u000f夀􈼼&ူ37lp",
-                    "type": "w4{2V⎎󠇖 \u001a+𭘦\u0007뮩󸣒\\+"
+                    "type": "w4{2V⎎󠇖 \u001a+𭘦\u0007뮩󸣒\\+",
+                    "value": "Q\u000fJy􌙬,\u000bP.\u000f\u0005D/\u000f夀􈼼&ူ37lp"
                 },
                 {
-                    "value": "V𥍦e5E\u001d{󱄜2UPj􁤤",
-                    "type": "\u000e\r\u0005􄱿p\u000e𐭟<"
+                    "type": "\u000e\r\u0005􄱿p\u000e𐭟<",
+                    "value": "V𥍦e5E\u001d{󱄜2UPj􁤤"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "V(jc󳋅b榼u": "|l3󼡭1𠇟)􊌄cBT􎃧𨫎l\u0005|쌪\u000cw􈎗i䏾\u001d􇁵",
-        "㪅X": "M",
-        "􏯹\u0012􌑏:.=9_|t3W\u000c": "⦅C^B}􇸇;𤈶Nh`/󲻲<𬔢-􅯗D텇)ﳋ)Q",
-        "29Rd\u0004n双\u0019i􄚬󱧑52,\u0019$𑀆𠢎󳴟l\u000eWo}e": "൰􌀹\u001bM𞤧Q6\u000e􂬯𤝿",
-        "9\u0016D": "\n#!d䬩G\u0007=&9􈩆\u001eM\t􏳑4b\tf)~%\u0001D",
-        "w4{2V⎎󠇖 \u001a+𭘦\u0007뮩󸣒\\+": "Q\u000fJy􌙬,\u000bP.\u000f\u0005D/\u000f夀􈼼&ူ37lp",
-        "\u0007=𧡔\u0005\u0017󵋤U\u0001!@𥬅9^󼐒{ 𦬢󲜉1t!􉠋": "\u0019q\u0018숺3\u001d𐛉-r|\u0005r\u001f-z􉮘%lI𬴢\u001a<{\u0008\u0013",
-        "vHxq欎h󳬡%J": ":}",
-        "󷻁􃲈\u001a,\u001a\u00101󳏁o0!&\u0010󽨞🂃\u000f0𒁒gk?nflN": "O􀇊𨊡v7#R9",
-        "}rExd􊆎\u0018*O>": "&3kSY󺜨\u0013=\u001b(1􊊰􎵹\u0005󾨊14\u0000'\u0015}w臖\u001c \u000b􎘖d|󷵮",
-        "\u000bb\u0008SF󾪨\u000b[𩩆𨢫\u0014\u001faL\u0010􇳲P􃆵J=u\"n􄀳k𑖌r%": "𝔃𭈶\u0008\n",
-        "\u000e\r\u0005􄱿p\u000e𐭟<": "V𥍦e5E\u001d{󱄜2UPj􁤤",
-        "r\u0010􁕜ꉱ_Y󴨼0QX": "b_\\􀞀C",
-        "𧫠󻗶K8ss]\u001aR\u001e!!\u001e?Eb\u0011`Z뉢\"0􇮃:&": "ql􏍎y_w\u0008",
-        "𣈉:\u001b[&𨐉6a\r-}􇄾": "i󷯧\u001d-􊌥𡖓󿥄\u000fJ떭\u0013P鏞󰴊,즬\u001a0a8􉻛\u0008[f\u0003"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_2.json b/libs/wire-api/test/golden/testObject_RichInfo_user_2.json
index 67b4aaaa005..e2305137d2a 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_2.json
@@ -1,106 +1,106 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "\u001bqo?\u001d纳l󲪻𬧷d\u0006\u001a𡫠0𣟲\u0008􉣡y𖦚Z\u000fe[wǩ󶸴󲻠𦂄",
+        "\u0008fpK\u0007#🍧8r󰍛v;xl$b\u0005\u000bQ𩨈'!m􀙦_j": "$\u0000bF􃉍z%𥍉",
+        "\u0008󶺲\u001a\u0018zlI.sA𫏤(􁁼%􅃠ͩ\t\u001a3S": "􍍍Y\u001a𫚋B𝐀CMK}P{\u001b𒍀PE\u0019􌗮",
+        "\u000f<$o􇬁{x􈮼dJQ󻆧\u001f􃌎,􈇼e!﹥\\𮠦󿍨𪾜\u00061󱆴s": ".",
+        "$\u001aV2M:$\u001c\u001c󰆶󽉃 𭿒K\u0013O󲵱B󾇓**O(v": "󰐶Y􀶧Z𪨾'늏jw𖠨q𠊬􂴩𫘃g1<🁚bj󷒀[㹺",
+        "%^􁫠co\u0012󹻌-}\u001e􄘬]𗐸A@ↅ㎕": "&\u0013\".9𤃠a\u0000\"TM󻂽\u001fD󺲘\r𨾹U",
+        "+[#5Y": "\u001c\u000cW􂂿􎳹\u0002",
+        ",\u0016P\u001a\u001a@C": "\" X\u0014\u0004<n$n=gyY䢼\u0019󹔄:.",
+        "Jw\r\u001ba₁s\u0004fI\u001dvbN\"\u0014": "w\txslJ󹏲󹁟:䔨*[g\\\rQ稣~p}Id\n\u000f𗵫O",
+        "Tg\u0008𪝙v𨽦YB󹖓v0w:\u0019\u000cZ𗐩yQ": "󺜦p9?􋲦\u0001\u0018\u0003\r\u0018`lPB$􊘃z􌾀aT⢩W+/`\u0001􆟰",
+        "V": "𭫨*􏮚\u0018𞲄떭x󱬣􇹵\u0007sm\u001d*y𣭕𥲢偋^hz1ݘ-\u0010L𑂉󴤧t󾏐",
+        "jv􁙊h5U\u0000kd4􃤖2BG䄃Q䭳􃐹": "\r",
+        "q\u0018\u0011𫠰\u001f\u0007\u0011%:󶫻w𫝢wR𘍷𩎢MI$KYwui": "{\u001e\u0016𭾧(􈐷",
+        "䝓^𒊮􎵤􍭜-쩚󹗰+??\u0006갮𥽒C=": "NX\u000e*B@h?l\u0006y\u0016𡨮.40E\u0015",
+        "󱅷疃󵃇2:": "@~99h♟9􁭢j􀏺\u001f􆹊\u000cR𫋋\u0001삀\u000e撯o",
+        "󺬝n\u0013`": "&jij𪦓",
+        "󽊓\u0014猁\u000b󴷢\u0008𨅑}泫\u0001C𣇪": "`O􂱒<\u0015^\u000bc𨌹xb\u001e",
+        "􃐀\u0003\u0004'2𮏪~7KQs􇣃>\u0018$\u0013kn?\u000f+ᬜ𪝬aO\u0007🖆": "\u0010홿N\u0012DaZ\u000ft􄟰EMf`N􅟣.𫢰",
+        "􇙍\u000ccO𡅁F": "\u0006\u001c}"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "&jij𪦓",
-                    "type": "󺬝n\u0013`"
+                    "type": "󺬝n\u0013`",
+                    "value": "&jij𪦓"
                 },
                 {
-                    "value": "󰐶Y􀶧Z𪨾'늏jw𖠨q𠊬􂴩𫘃g1<🁚bj󷒀[㹺",
-                    "type": "$\u001aV2M:$\u001c\u001c󰆶󽉃 𭿒K\u0013O󲵱B󾇓**O(v"
+                    "type": "$\u001aV2M:$\u001c\u001c󰆶󽉃 𭿒K\u0013O󲵱B󾇓**O(v",
+                    "value": "󰐶Y􀶧Z𪨾'늏jw𖠨q𠊬􂴩𫘃g1<🁚bj󷒀[㹺"
                 },
                 {
-                    "value": "&\u0013\".9𤃠a\u0000\"TM󻂽\u001fD󺲘\r𨾹U",
-                    "type": "%^􁫠co\u0012󹻌-}\u001e􄘬]𗐸A@ↅ㎕"
+                    "type": "%^􁫠co\u0012󹻌-}\u001e􄘬]𗐸A@ↅ㎕",
+                    "value": "&\u0013\".9𤃠a\u0000\"TM󻂽\u001fD󺲘\r𨾹U"
                 },
                 {
-                    "value": ".",
-                    "type": "\u000f<$o􇬁{x􈮼dJQ󻆧\u001f􃌎,􈇼e!﹥\\𮠦󿍨𪾜\u00061󱆴s"
+                    "type": "\u000f<$o􇬁{x􈮼dJQ󻆧\u001f􃌎,􈇼e!﹥\\𮠦󿍨𪾜\u00061󱆴s",
+                    "value": "."
                 },
                 {
-                    "value": "\u001c\u000cW􂂿􎳹\u0002",
-                    "type": "+[#5Y"
+                    "type": "+[#5Y",
+                    "value": "\u001c\u000cW􂂿􎳹\u0002"
                 },
                 {
-                    "value": "{\u001e\u0016𭾧(􈐷",
-                    "type": "q\u0018\u0011𫠰\u001f\u0007\u0011%:󶫻w𫝢wR𘍷𩎢MI$KYwui"
+                    "type": "q\u0018\u0011𫠰\u001f\u0007\u0011%:󶫻w𫝢wR𘍷𩎢MI$KYwui",
+                    "value": "{\u001e\u0016𭾧(􈐷"
                 },
                 {
-                    "value": "w\txslJ󹏲󹁟:䔨*[g\\\rQ稣~p}Id\n\u000f𗵫O",
-                    "type": "Jw\r\u001ba₁s\u0004fI\u001dvbN\"\u0014"
+                    "type": "Jw\r\u001ba₁s\u0004fI\u001dvbN\"\u0014",
+                    "value": "w\txslJ󹏲󹁟:䔨*[g\\\rQ稣~p}Id\n\u000f𗵫O"
                 },
                 {
-                    "value": "\u001bqo?\u001d纳l󲪻𬧷d\u0006\u001a𡫠0𣟲\u0008􉣡y𖦚Z\u000fe[wǩ󶸴󲻠𦂄",
-                    "type": ""
+                    "type": "",
+                    "value": "\u001bqo?\u001d纳l󲪻𬧷d\u0006\u001a𡫠0𣟲\u0008􉣡y𖦚Z\u000fe[wǩ󶸴󲻠𦂄"
                 },
                 {
-                    "value": "$\u0000bF􃉍z%𥍉",
-                    "type": "\u0008fpK\u0007#🍧8r󰍛v;xl$b\u0005\u000bQ𩨈'!m􀙦_j"
+                    "type": "\u0008fpK\u0007#🍧8r󰍛v;xl$b\u0005\u000bQ𩨈'!m􀙦_j",
+                    "value": "$\u0000bF􃉍z%𥍉"
                 },
                 {
-                    "value": "􍍍Y\u001a𫚋B𝐀CMK}P{\u001b𒍀PE\u0019􌗮",
-                    "type": "\u0008󶺲\u001a\u0018zlI.sA𫏤(􁁼%􅃠ͩ\t\u001a3S"
+                    "type": "\u0008󶺲\u001a\u0018zlI.sA𫏤(􁁼%􅃠ͩ\t\u001a3S",
+                    "value": "􍍍Y\u001a𫚋B𝐀CMK}P{\u001b𒍀PE\u0019􌗮"
                 },
                 {
-                    "value": "𭫨*􏮚\u0018𞲄떭x󱬣􇹵\u0007sm\u001d*y𣭕𥲢偋^hz1ݘ-\u0010L𑂉󴤧t󾏐",
-                    "type": "V"
+                    "type": "V",
+                    "value": "𭫨*􏮚\u0018𞲄떭x󱬣􇹵\u0007sm\u001d*y𣭕𥲢偋^hz1ݘ-\u0010L𑂉󴤧t󾏐"
                 },
                 {
-                    "value": "\u0006\u001c}",
-                    "type": "􇙍\u000ccO𡅁F"
+                    "type": "􇙍\u000ccO𡅁F",
+                    "value": "\u0006\u001c}"
                 },
                 {
-                    "value": "@~99h♟9􁭢j􀏺\u001f􆹊\u000cR𫋋\u0001삀\u000e撯o",
-                    "type": "󱅷疃󵃇2:"
+                    "type": "󱅷疃󵃇2:",
+                    "value": "@~99h♟9􁭢j􀏺\u001f􆹊\u000cR𫋋\u0001삀\u000e撯o"
                 },
                 {
-                    "value": "NX\u000e*B@h?l\u0006y\u0016𡨮.40E\u0015",
-                    "type": "䝓^𒊮􎵤􍭜-쩚󹗰+??\u0006갮𥽒C="
+                    "type": "䝓^𒊮􎵤􍭜-쩚󹗰+??\u0006갮𥽒C=",
+                    "value": "NX\u000e*B@h?l\u0006y\u0016𡨮.40E\u0015"
                 },
                 {
-                    "value": "\u0010홿N\u0012DaZ\u000ft􄟰EMf`N􅟣.𫢰",
-                    "type": "􃐀\u0003\u0004'2𮏪~7KQs􇣃>\u0018$\u0013kn?\u000f+ᬜ𪝬aO\u0007🖆"
+                    "type": "􃐀\u0003\u0004'2𮏪~7KQs􇣃>\u0018$\u0013kn?\u000f+ᬜ𪝬aO\u0007🖆",
+                    "value": "\u0010홿N\u0012DaZ\u000ft􄟰EMf`N􅟣.𫢰"
                 },
                 {
-                    "value": "\" X\u0014\u0004<n$n=gyY䢼\u0019󹔄:.",
-                    "type": ",\u0016P\u001a\u001a@C"
+                    "type": ",\u0016P\u001a\u001a@C",
+                    "value": "\" X\u0014\u0004<n$n=gyY䢼\u0019󹔄:."
                 },
                 {
-                    "value": "󺜦p9?􋲦\u0001\u0018\u0003\r\u0018`lPB$􊘃z􌾀aT⢩W+/`\u0001􆟰",
-                    "type": "Tg\u0008𪝙v𨽦YB󹖓v0w:\u0019\u000cZ𗐩yQ"
+                    "type": "Tg\u0008𪝙v𨽦YB󹖓v0w:\u0019\u000cZ𗐩yQ",
+                    "value": "󺜦p9?􋲦\u0001\u0018\u0003\r\u0018`lPB$􊘃z􌾀aT⢩W+/`\u0001􆟰"
                 },
                 {
-                    "value": "\r",
-                    "type": "jv􁙊h5U\u0000kd4􃤖2BG䄃Q䭳􃐹"
+                    "type": "jv􁙊h5U\u0000kd4􃤖2BG䄃Q䭳􃐹",
+                    "value": "\r"
                 },
                 {
-                    "value": "`O􂱒<\u0015^\u000bc𨌹xb\u001e",
-                    "type": "󽊓\u0014猁\u000b󴷢\u0008𨅑}泫\u0001C𣇪"
+                    "type": "󽊓\u0014猁\u000b󴷢\u0008𨅑}泫\u0001C𣇪",
+                    "value": "`O􂱒<\u0015^\u000bc𨌹xb\u001e"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "􇙍\u000ccO𡅁F": "\u0006\u001c}",
-        "􃐀\u0003\u0004'2𮏪~7KQs􇣃>\u0018$\u0013kn?\u000f+ᬜ𪝬aO\u0007🖆": "\u0010홿N\u0012DaZ\u000ft􄟰EMf`N􅟣.𫢰",
-        "$\u001aV2M:$\u001c\u001c󰆶󽉃 𭿒K\u0013O󲵱B󾇓**O(v": "󰐶Y􀶧Z𪨾'늏jw𖠨q𠊬􂴩𫘃g1<🁚bj󷒀[㹺",
-        "䝓^𒊮􎵤􍭜-쩚󹗰+??\u0006갮𥽒C=": "NX\u000e*B@h?l\u0006y\u0016𡨮.40E\u0015",
-        "\u000f<$o􇬁{x􈮼dJQ󻆧\u001f􃌎,􈇼e!﹥\\𮠦󿍨𪾜\u00061󱆴s": ".",
-        "": "\u001bqo?\u001d纳l󲪻𬧷d\u0006\u001a𡫠0𣟲\u0008􉣡y𖦚Z\u000fe[wǩ󶸴󲻠𦂄",
-        "\u0008󶺲\u001a\u0018zlI.sA𫏤(􁁼%􅃠ͩ\t\u001a3S": "􍍍Y\u001a𫚋B𝐀CMK}P{\u001b𒍀PE\u0019􌗮",
-        "󽊓\u0014猁\u000b󴷢\u0008𨅑}泫\u0001C𣇪": "`O􂱒<\u0015^\u000bc𨌹xb\u001e",
-        "󺬝n\u0013`": "&jij𪦓",
-        "Jw\r\u001ba₁s\u0004fI\u001dvbN\"\u0014": "w\txslJ󹏲󹁟:䔨*[g\\\rQ稣~p}Id\n\u000f𗵫O",
-        "jv􁙊h5U\u0000kd4􃤖2BG䄃Q䭳􃐹": "\r",
-        "Tg\u0008𪝙v𨽦YB󹖓v0w:\u0019\u000cZ𗐩yQ": "󺜦p9?􋲦\u0001\u0018\u0003\r\u0018`lPB$􊘃z􌾀aT⢩W+/`\u0001􆟰",
-        "+[#5Y": "\u001c\u000cW􂂿􎳹\u0002",
-        "󱅷疃󵃇2:": "@~99h♟9􁭢j􀏺\u001f􆹊\u000cR𫋋\u0001삀\u000e撯o",
-        "q\u0018\u0011𫠰\u001f\u0007\u0011%:󶫻w𫝢wR𘍷𩎢MI$KYwui": "{\u001e\u0016𭾧(􈐷",
-        "\u0008fpK\u0007#🍧8r󰍛v;xl$b\u0005\u000bQ𩨈'!m􀙦_j": "$\u0000bF􃉍z%𥍉",
-        "%^􁫠co\u0012󹻌-}\u001e􄘬]𗐸A@ↅ㎕": "&\u0013\".9𤃠a\u0000\"TM󻂽\u001fD󺲘\r𨾹U",
-        "V": "𭫨*􏮚\u0018𞲄떭x󱬣􇹵\u0007sm\u001d*y𣭕𥲢偋^hz1ݘ-\u0010L𑂉󴤧t󾏐",
-        ",\u0016P\u001a\u001a@C": "\" X\u0014\u0004<n$n=gyY䢼\u0019󹔄:."
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_20.json b/libs/wire-api/test/golden/testObject_RichInfo_user_20.json
index b2d6515efa6..90347faa7ab 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_20.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_20.json
@@ -1,91 +1,91 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u000b": "􅣔 𭓶9獸\u0000墫󻋨Q$",
+        "\u000b\u001fﹽ𔕜z􇟘𐀘\u0001": "PA",
+        "\u0011D&)5EOo\u0011\u0019\rYArK`w^qG씻\u0003\u001f@𫷥\u0002\u000f2\u000b\u0001": "d󠅐D\u0004𨾨w_󽇞럁󶖆P5\u0008𫘃JTw\u000bv;\u000e`v^{1\u0003H",
+        "\u0012": "\u000ewC\u001f\u000fQ\u0004󻤻\u000e0\u0003,\u0018=\u0005Pj",
+        "\u001b\u0001(𢸦M􀉓\u0015>󸣁\u0012]uc󲁙\u000c􏣢rG􌣎#R빤\u001f": "􉧓\u001c𡘥t",
+        "\u001ck뵃\u000f􎂒􏉬P􉤨􊧶@h􅜂{": "𫳬L絊;\u0015􍷁4%\u00002\u0006,wg'􆖡]\u0002",
+        "/{t𮎶*𘁘/QO􎜦u\u0014\u0010[\u000f44J\u0002": "䑽>\r\u000cZR\u001cp𤌭󾮀",
+        "O\u0013\u0012\u000b󿟌sFHeቄG'Z[k􆣾\r?􁞒": "6)(%\u0019U󸷏\u00190(E4Y%󹎁\u0004i𥕷\u0012𤗖}/|",
+        "Q𣤵d\u0011\u0007j\u0001z𢵚\u0017x%dC\ngaY\u0016𩿱蝗": "K{8𦓋$I8Y%󽞜홫󲋐󸺓]\"rp\u001f\u0006K\u001fu\u0013󸕶",
+        "Y@\r?𔑌!b,:,􊚐]DY𧝾𥺓\u00059\u0000m(aQ)": "((􌲉\u0002\u0013桎\u0003X󰽻(*A@1?𡣃7",
+        "l": "𐋵󻚙&\u0017𫏃",
+        "pd6\u0019틑Y󻾉8碣vY󽭦󠆶􁥓\"u\u0010": "* \u001f󺚣)\u001f󻘶\u0008\u0004(􍜟*킧\u001a(\u000c)S`\u0000G􍨤&󷥝𪀱",
+        "{0J;𐢃ulC*󲽑\u001a.>YK\u0014@Ul𝛼;Om􌈤,𡧼U󶌔": "읪\u000e\u0003ᏻt􉗺\u001a\u000e8'=",
+        "}w*dioz%w􃽤zJ𢰸)󸦘Yr2L\u001aAQQ.rsH/": "\t\\󳯑𫾦죝r`𢓴-a%\u000b",
+        "㫣u󷸊\u0000Nbb󱠔\u0019dJO\"w\u000b􁠰𣤻씻4#\u00191T\u001ej󹆓𮩻ꍚ\u0014": "D􄢅,",
+        "􁜆5t?\u0004􁒞#*c􊤆\u0004}󽧧󾺎u󵬍 i 뵓x􋰿} ;\u0008p9;": "\u0019VIp𬐶IDO~%6vK\u0019L􇝞\u001dj\\"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "\u0019VIp𬐶IDO~%6vK\u0019L􇝞\u001dj\\",
-                    "type": "􁜆5t?\u0004􁒞#*c􊤆\u0004}󽧧󾺎u󵬍 i 뵓x􋰿} ;\u0008p9;"
+                    "type": "􁜆5t?\u0004􁒞#*c􊤆\u0004}󽧧󾺎u󵬍 i 뵓x􋰿} ;\u0008p9;",
+                    "value": "\u0019VIp𬐶IDO~%6vK\u0019L􇝞\u001dj\\"
                 },
                 {
-                    "value": "d󠅐D\u0004𨾨w_󽇞럁󶖆P5\u0008𫘃JTw\u000bv;\u000e`v^{1\u0003H",
-                    "type": "\u0011D&)5EOo\u0011\u0019\rYArK`w^qG씻\u0003\u001f@𫷥\u0002\u000f2\u000b\u0001"
+                    "type": "\u0011D&)5EOo\u0011\u0019\rYArK`w^qG씻\u0003\u001f@𫷥\u0002\u000f2\u000b\u0001",
+                    "value": "d󠅐D\u0004𨾨w_󽇞럁󶖆P5\u0008𫘃JTw\u000bv;\u000e`v^{1\u0003H"
                 },
                 {
-                    "value": "\t\\󳯑𫾦죝r`𢓴-a%\u000b",
-                    "type": "}w*dioz%w􃽤zJ𢰸)󸦘Yr2L\u001aAQQ.rsH/"
+                    "type": "}w*dioz%w􃽤zJ𢰸)󸦘Yr2L\u001aAQQ.rsH/",
+                    "value": "\t\\󳯑𫾦죝r`𢓴-a%\u000b"
                 },
                 {
-                    "value": "6)(%\u0019U󸷏\u00190(E4Y%󹎁\u0004i𥕷\u0012𤗖}/|",
-                    "type": "O\u0013\u0012\u000b󿟌sFHeቄG'Z[k􆣾\r?􁞒"
+                    "type": "O\u0013\u0012\u000b󿟌sFHeቄG'Z[k􆣾\r?􁞒",
+                    "value": "6)(%\u0019U󸷏\u00190(E4Y%󹎁\u0004i𥕷\u0012𤗖}/|"
                 },
                 {
-                    "value": "D􄢅,",
-                    "type": "㫣u󷸊\u0000Nbb󱠔\u0019dJO\"w\u000b􁠰𣤻씻4#\u00191T\u001ej󹆓𮩻ꍚ\u0014"
+                    "type": "㫣u󷸊\u0000Nbb󱠔\u0019dJO\"w\u000b􁠰𣤻씻4#\u00191T\u001ej󹆓𮩻ꍚ\u0014",
+                    "value": "D􄢅,"
                 },
                 {
-                    "value": "䑽>\r\u000cZR\u001cp𤌭󾮀",
-                    "type": "/{t𮎶*𘁘/QO􎜦u\u0014\u0010[\u000f44J\u0002"
+                    "type": "/{t𮎶*𘁘/QO􎜦u\u0014\u0010[\u000f44J\u0002",
+                    "value": "䑽>\r\u000cZR\u001cp𤌭󾮀"
                 },
                 {
-                    "value": "K{8𦓋$I8Y%󽞜홫󲋐󸺓]\"rp\u001f\u0006K\u001fu\u0013󸕶",
-                    "type": "Q𣤵d\u0011\u0007j\u0001z𢵚\u0017x%dC\ngaY\u0016𩿱蝗"
+                    "type": "Q𣤵d\u0011\u0007j\u0001z𢵚\u0017x%dC\ngaY\u0016𩿱蝗",
+                    "value": "K{8𦓋$I8Y%󽞜홫󲋐󸺓]\"rp\u001f\u0006K\u001fu\u0013󸕶"
                 },
                 {
-                    "value": "𫳬L絊;\u0015􍷁4%\u00002\u0006,wg'􆖡]\u0002",
-                    "type": "\u001ck뵃\u000f􎂒􏉬P􉤨􊧶@h􅜂{"
+                    "type": "\u001ck뵃\u000f􎂒􏉬P􉤨􊧶@h􅜂{",
+                    "value": "𫳬L絊;\u0015􍷁4%\u00002\u0006,wg'􆖡]\u0002"
                 },
                 {
-                    "value": "\u000ewC\u001f\u000fQ\u0004󻤻\u000e0\u0003,\u0018=\u0005Pj",
-                    "type": "\u0012"
+                    "type": "\u0012",
+                    "value": "\u000ewC\u001f\u000fQ\u0004󻤻\u000e0\u0003,\u0018=\u0005Pj"
                 },
                 {
-                    "value": "((􌲉\u0002\u0013桎\u0003X󰽻(*A@1?𡣃7",
-                    "type": "Y@\r?𔑌!b,:,􊚐]DY𧝾𥺓\u00059\u0000m(aQ)"
+                    "type": "Y@\r?𔑌!b,:,􊚐]DY𧝾𥺓\u00059\u0000m(aQ)",
+                    "value": "((􌲉\u0002\u0013桎\u0003X󰽻(*A@1?𡣃7"
                 },
                 {
-                    "value": "* \u001f󺚣)\u001f󻘶\u0008\u0004(􍜟*킧\u001a(\u000c)S`\u0000G􍨤&󷥝𪀱",
-                    "type": "pd6\u0019틑Y󻾉8碣vY󽭦󠆶􁥓\"u\u0010"
+                    "type": "pd6\u0019틑Y󻾉8碣vY󽭦󠆶􁥓\"u\u0010",
+                    "value": "* \u001f󺚣)\u001f󻘶\u0008\u0004(􍜟*킧\u001a(\u000c)S`\u0000G􍨤&󷥝𪀱"
                 },
                 {
-                    "value": "PA",
-                    "type": "\u000b\u001fﹽ𔕜z􇟘𐀘\u0001"
+                    "type": "\u000b\u001fﹽ𔕜z􇟘𐀘\u0001",
+                    "value": "PA"
                 },
                 {
-                    "value": "􉧓\u001c𡘥t",
-                    "type": "\u001b\u0001(𢸦M􀉓\u0015>󸣁\u0012]uc󲁙\u000c􏣢rG􌣎#R빤\u001f"
+                    "type": "\u001b\u0001(𢸦M􀉓\u0015>󸣁\u0012]uc󲁙\u000c􏣢rG􌣎#R빤\u001f",
+                    "value": "􉧓\u001c𡘥t"
                 },
                 {
-                    "value": "읪\u000e\u0003ᏻt􉗺\u001a\u000e8'=",
-                    "type": "{0J;𐢃ulC*󲽑\u001a.>YK\u0014@Ul𝛼;Om􌈤,𡧼U󶌔"
+                    "type": "{0J;𐢃ulC*󲽑\u001a.>YK\u0014@Ul𝛼;Om􌈤,𡧼U󶌔",
+                    "value": "읪\u000e\u0003ᏻt􉗺\u001a\u000e8'="
                 },
                 {
-                    "value": "𐋵󻚙&\u0017𫏃",
-                    "type": "l"
+                    "type": "l",
+                    "value": "𐋵󻚙&\u0017𫏃"
                 },
                 {
-                    "value": "􅣔 𭓶9獸\u0000墫󻋨Q$",
-                    "type": "\u000b"
+                    "type": "\u000b",
+                    "value": "􅣔 𭓶9獸\u0000墫󻋨Q$"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "l": "𐋵󻚙&\u0017𫏃",
-        "\u0011D&)5EOo\u0011\u0019\rYArK`w^qG씻\u0003\u001f@𫷥\u0002\u000f2\u000b\u0001": "d󠅐D\u0004𨾨w_󽇞럁󶖆P5\u0008𫘃JTw\u000bv;\u000e`v^{1\u0003H",
-        "/{t𮎶*𘁘/QO􎜦u\u0014\u0010[\u000f44J\u0002": "䑽>\r\u000cZR\u001cp𤌭󾮀",
-        "\u000b": "􅣔 𭓶9獸\u0000墫󻋨Q$",
-        "Y@\r?𔑌!b,:,􊚐]DY𧝾𥺓\u00059\u0000m(aQ)": "((􌲉\u0002\u0013桎\u0003X󰽻(*A@1?𡣃7",
-        "\u001ck뵃\u000f􎂒􏉬P􉤨􊧶@h􅜂{": "𫳬L絊;\u0015􍷁4%\u00002\u0006,wg'􆖡]\u0002",
-        "\u000b\u001fﹽ𔕜z􇟘𐀘\u0001": "PA",
-        "Q𣤵d\u0011\u0007j\u0001z𢵚\u0017x%dC\ngaY\u0016𩿱蝗": "K{8𦓋$I8Y%󽞜홫󲋐󸺓]\"rp\u001f\u0006K\u001fu\u0013󸕶",
-        "\u0012": "\u000ewC\u001f\u000fQ\u0004󻤻\u000e0\u0003,\u0018=\u0005Pj",
-        "􁜆5t?\u0004􁒞#*c􊤆\u0004}󽧧󾺎u󵬍 i 뵓x􋰿} ;\u0008p9;": "\u0019VIp𬐶IDO~%6vK\u0019L􇝞\u001dj\\",
-        "\u001b\u0001(𢸦M􀉓\u0015>󸣁\u0012]uc󲁙\u000c􏣢rG􌣎#R빤\u001f": "􉧓\u001c𡘥t",
-        "O\u0013\u0012\u000b󿟌sFHeቄG'Z[k􆣾\r?􁞒": "6)(%\u0019U󸷏\u00190(E4Y%󹎁\u0004i𥕷\u0012𤗖}/|",
-        "pd6\u0019틑Y󻾉8碣vY󽭦󠆶􁥓\"u\u0010": "* \u001f󺚣)\u001f󻘶\u0008\u0004(􍜟*킧\u001a(\u000c)S`\u0000G􍨤&󷥝𪀱",
-        "㫣u󷸊\u0000Nbb󱠔\u0019dJO\"w\u000b􁠰𣤻씻4#\u00191T\u001ej󹆓𮩻ꍚ\u0014": "D􄢅,",
-        "{0J;𐢃ulC*󲽑\u001a.>YK\u0014@Ul𝛼;Om􌈤,𡧼U󶌔": "읪\u000e\u0003ᏻt􉗺\u001a\u000e8'=",
-        "}w*dioz%w􃽤zJ𢰸)󸦘Yr2L\u001aAQQ.rsH/": "\t\\󳯑𫾦죝r`𢓴-a%\u000b"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_3.json b/libs/wire-api/test/golden/testObject_RichInfo_user_3.json
index 21c38285aac..db53994627b 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_3.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_3.json
@@ -1,36 +1,36 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u001aN": "\u0006CI􁛰⾃S󿅃e\u0015𠢒",
+        "\u001e\u000f$𭶘xP >\u0015jGF(xRw": "\u0007╕󺨙q\u0014󸩿w𠳞𥑝\u0006{(r#􎈾\u000e􊬗󰥭=c􈖣",
+        "S𘣒A\u0017\u00084𬈯\"󻵛H\u0003L\u0014𥇛YF\u001aj𭢎xij\u0004􅏄Sl": "5C􏻦",
+        "t󺇍v&>M\u00184?Bvxr\u0018􆰸": "\u001bb>K}雗󾆤Y/󿷐\u000f;􋳗w\u0014􈑟8",
+        "􀛀𫄋of#瘌A􉷤뢹\u0018\u0008{7􁑚\u001b\u0019𩷷F?M􊌕 E4𗙢-+": "𣪜;C\u000c]\u001c􇌏\u00026o􈊁a{ﳇ^\u0002XS"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "\u001bb>K}雗󾆤Y/󿷐\u000f;􋳗w\u0014􈑟8",
-                    "type": "t󺇍v&>M\u00184?Bvxr\u0018􆰸"
+                    "type": "t󺇍v&>M\u00184?Bvxr\u0018􆰸",
+                    "value": "\u001bb>K}雗󾆤Y/󿷐\u000f;􋳗w\u0014􈑟8"
                 },
                 {
-                    "value": "\u0007╕󺨙q\u0014󸩿w𠳞𥑝\u0006{(r#􎈾\u000e􊬗󰥭=c􈖣",
-                    "type": "\u001e\u000f$𭶘xP >\u0015jGF(xRw"
+                    "type": "\u001e\u000f$𭶘xP >\u0015jGF(xRw",
+                    "value": "\u0007╕󺨙q\u0014󸩿w𠳞𥑝\u0006{(r#􎈾\u000e􊬗󰥭=c􈖣"
                 },
                 {
-                    "value": "𣪜;C\u000c]\u001c􇌏\u00026o􈊁a{ﳇ^\u0002XS",
-                    "type": "􀛀𫄋of#瘌A􉷤뢹\u0018\u0008{7􁑚\u001b\u0019𩷷F?M􊌕 E4𗙢-+"
+                    "type": "􀛀𫄋of#瘌A􉷤뢹\u0018\u0008{7􁑚\u001b\u0019𩷷F?M􊌕 E4𗙢-+",
+                    "value": "𣪜;C\u000c]\u001c􇌏\u00026o􈊁a{ﳇ^\u0002XS"
                 },
                 {
-                    "value": "\u0006CI􁛰⾃S󿅃e\u0015𠢒",
-                    "type": "\u001aN"
+                    "type": "\u001aN",
+                    "value": "\u0006CI􁛰⾃S󿅃e\u0015𠢒"
                 },
                 {
-                    "value": "5C􏻦",
-                    "type": "S𘣒A\u0017\u00084𬈯\"󻵛H\u0003L\u0014𥇛YF\u001aj𭢎xij\u0004􅏄Sl"
+                    "type": "S𘣒A\u0017\u00084𬈯\"󻵛H\u0003L\u0014𥇛YF\u001aj𭢎xij\u0004􅏄Sl",
+                    "value": "5C􏻦"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\u001e\u000f$𭶘xP >\u0015jGF(xRw": "\u0007╕󺨙q\u0014󸩿w𠳞𥑝\u0006{(r#􎈾\u000e􊬗󰥭=c􈖣",
-        "S𘣒A\u0017\u00084𬈯\"󻵛H\u0003L\u0014𥇛YF\u001aj𭢎xij\u0004􅏄Sl": "5C􏻦",
-        "\u001aN": "\u0006CI􁛰⾃S󿅃e\u0015𠢒",
-        "􀛀𫄋of#瘌A􉷤뢹\u0018\u0008{7􁑚\u001b\u0019𩷷F?M􊌕 E4𗙢-+": "𣪜;C\u000c]\u001c􇌏\u00026o􈊁a{ﳇ^\u0002XS",
-        "t󺇍v&>M\u00184?Bvxr\u0018􆰸": "\u001bb>K}雗󾆤Y/󿷐\u000f;􋳗w\u0014􈑟8"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_4.json b/libs/wire-api/test/golden/testObject_RichInfo_user_4.json
index c67513a4bb2..a609a58f7a7 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_4.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_4.json
@@ -1,111 +1,111 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0002He\r\u001ak賅,\u001fM2v\u0008\u001e𮕍z蝜\u0017󸻫\u0014\u0000\n󾛤=io": ">𦛟𭠂7f}\u0011rZ\rs븨Nh\"𛈊kइ釚􀶗as$|7󹶎A󱵭󷻹",
+        "\u0003\u0003W\u0013\u0015􏠽=U󻞑􂆇\n󰙃Fd菨'\u0007\u001e3\u0007,\u0015#\u0015": "\u001b\u001f􋅜𥹪",
+        "\t@𗝁ᮚPt󱤙󷵟ql.\u0012𠑻-\u001f𤞚un=\u001dmM\u000b\u0001R": "䭵TQ^(HF'<JVF\u001ebX%p󿠽x",
+        "(7j􏽔S.,_": "𢋖C~轜&=􊺬\u0000􊽷Va<𘎘𓌅!̈􁧴zKẚ~\\ꚱ𩨦\u0019;a𘫖)",
+        "-\u0017𡖾kI􈯟": "\u0007\u001eN B\u0007󵫂𫓙\u001doc*%",
+        ".\u001c%N5=`\u0019\u0003󾦥\u0014t3@𫨗Oz.􂜆鱋0IG\tdk>-􊷟": "8U\u001eJ6uNV_\u000b",
+        "3#u𦘕𐚌zf'G\u001f\u000eN駧󽠖􃏍𣥿n": "J<~ ㌜?1\u000eh\r􏱬\u000e9s󼾠𐃟a􊉼𥙮\u00114𠘢CNI|",
+        ">NN𬾗\u001e[N@x\u0002󾿐X󽇈\u0000\r)w􄘰\u001bu\u000cg𧇀@\u0011": "N\r\t󵱁蓇𗲳󳁏",
+        "J􋮃[gHH\rjs\u0011%h󳏬\u0006𧟟}rh𬵩\u00026\u0005󲲭_\u001f\u0013-.\u0018": "V𪔍~\u0007𣋹h\tq\t[S󷛨\u001cDa\u0002N4𘕕𥌥川0􌠋o~𣥋",
+        "\\Y\u000cr\u0003\u000f": "4󾴏M6J",
+        "]|:𭁴`䇵􁝅A\u001e6": "0RᎭ􍮕󰼧CrXᐊoA;K𤏌􉾂A",
+        "^3󹘼&": "4/S\u000cC􊯰󳴉J\"|\u000fHy\u001c",
+        "{𭿹=": "^󴟴_\u0002\u0018_掑\u0018\u001bp#BS~􎺏#\u000f",
+        "䚄;": "𭉖𐦡碰 \u001f\u0019p\u0011\u0001r􄘨",
+        "寓𛇀𘪊]7𨜒􍣥;󷩠L[)3\u000f\u000bfZ=[": "^\u0003q(P\u0002_𡟊k􇲂i𥗶󰂹'\u0014\u0005\u00112J\u000f􅞤i􆉭󶈛",
+        "쾓O\u001e$7[J󸋧7Wb𩳒\u0014󶃙󳢨\u0004){2)\t\u0011􄋎qG􁖂󳤲": "䠍3>\"sn􅴠4",
+        "𡢪Q\"[􋒆\u001b􇬘[{󷍇\u0004𥦇\u0017﹑5Cl\u0004\u0001󼖪ZA􉥋R,焴/𡑭󹠐": "K𠠾",
+        "𡢷􈌘\\\u0000hOWZZ붎(t": "}8\u0003|n1⾐",
+        "󺟄\u0006󿊀i𡿍;=/3􉞐\"U": "\u0017K\u001a\u001a\u000e:󺰓y\u0001𪝹]`\u0003e\u0011O:𦶴h~akL\u0000u󴈗t",
+        "􏏒󽑢\u0017J󹡀K􃉠K𧢽ct𠛝B󲎞􎔚𤊀2": "\u0014𨇴8,*󸶠&JP\u0008pzN𒂅a\n\u0010{& Z+/i𗦉"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "N\r\t󵱁蓇𗲳󳁏",
-                    "type": ">NN𬾗\u001e[N@x\u0002󾿐X󽇈\u0000\r)w􄘰\u001bu\u000cg𧇀@\u0011"
+                    "type": ">NN𬾗\u001e[N@x\u0002󾿐X󽇈\u0000\r)w􄘰\u001bu\u000cg𧇀@\u0011",
+                    "value": "N\r\t󵱁蓇𗲳󳁏"
                 },
                 {
-                    "value": "𭉖𐦡碰 \u001f\u0019p\u0011\u0001r􄘨",
-                    "type": "䚄;"
+                    "type": "䚄;",
+                    "value": "𭉖𐦡碰 \u001f\u0019p\u0011\u0001r􄘨"
                 },
                 {
-                    "value": "\u0017K\u001a\u001a\u000e:󺰓y\u0001𪝹]`\u0003e\u0011O:𦶴h~akL\u0000u󴈗t",
-                    "type": "󺟄\u0006󿊀i𡿍;=/3􉞐\"U"
+                    "type": "󺟄\u0006󿊀i𡿍;=/3􉞐\"U",
+                    "value": "\u0017K\u001a\u001a\u000e:󺰓y\u0001𪝹]`\u0003e\u0011O:𦶴h~akL\u0000u󴈗t"
                 },
                 {
-                    "value": "\u0014𨇴8,*󸶠&JP\u0008pzN𒂅a\n\u0010{& Z+/i𗦉",
-                    "type": "􏏒󽑢\u0017J󹡀K􃉠K𧢽ct𠛝B󲎞􎔚𤊀2"
+                    "type": "􏏒󽑢\u0017J󹡀K􃉠K𧢽ct𠛝B󲎞􎔚𤊀2",
+                    "value": "\u0014𨇴8,*󸶠&JP\u0008pzN𒂅a\n\u0010{& Z+/i𗦉"
                 },
                 {
-                    "value": "^\u0003q(P\u0002_𡟊k􇲂i𥗶󰂹'\u0014\u0005\u00112J\u000f􅞤i􆉭󶈛",
-                    "type": "寓𛇀𘪊]7𨜒􍣥;󷩠L[)3\u000f\u000bfZ=["
+                    "type": "寓𛇀𘪊]7𨜒􍣥;󷩠L[)3\u000f\u000bfZ=[",
+                    "value": "^\u0003q(P\u0002_𡟊k􇲂i𥗶󰂹'\u0014\u0005\u00112J\u000f􅞤i􆉭󶈛"
                 },
                 {
-                    "value": "}8\u0003|n1⾐",
-                    "type": "𡢷􈌘\\\u0000hOWZZ붎(t"
+                    "type": "𡢷􈌘\\\u0000hOWZZ붎(t",
+                    "value": "}8\u0003|n1⾐"
                 },
                 {
-                    "value": "^󴟴_\u0002\u0018_掑\u0018\u001bp#BS~􎺏#\u000f",
-                    "type": "{𭿹="
+                    "type": "{𭿹=",
+                    "value": "^󴟴_\u0002\u0018_掑\u0018\u001bp#BS~􎺏#\u000f"
                 },
                 {
-                    "value": "䠍3>\"sn􅴠4",
-                    "type": "쾓O\u001e$7[J󸋧7Wb𩳒\u0014󶃙󳢨\u0004){2)\t\u0011􄋎qG􁖂󳤲"
+                    "type": "쾓O\u001e$7[J󸋧7Wb𩳒\u0014󶃙󳢨\u0004){2)\t\u0011􄋎qG􁖂󳤲",
+                    "value": "䠍3>\"sn􅴠4"
                 },
                 {
-                    "value": "V𪔍~\u0007𣋹h\tq\t[S󷛨\u001cDa\u0002N4𘕕𥌥川0􌠋o~𣥋",
-                    "type": "J􋮃[gHH\rjs\u0011%h󳏬\u0006𧟟}rh𬵩\u00026\u0005󲲭_\u001f\u0013-.\u0018"
+                    "type": "J􋮃[gHH\rjs\u0011%h󳏬\u0006𧟟}rh𬵩\u00026\u0005󲲭_\u001f\u0013-.\u0018",
+                    "value": "V𪔍~\u0007𣋹h\tq\t[S󷛨\u001cDa\u0002N4𘕕𥌥川0􌠋o~𣥋"
                 },
                 {
-                    "value": "0RᎭ􍮕󰼧CrXᐊoA;K𤏌􉾂A",
-                    "type": "]|:𭁴`䇵􁝅A\u001e6"
+                    "type": "]|:𭁴`䇵􁝅A\u001e6",
+                    "value": "0RᎭ􍮕󰼧CrXᐊoA;K𤏌􉾂A"
                 },
                 {
-                    "value": "\u0007\u001eN B\u0007󵫂𫓙\u001doc*%",
-                    "type": "-\u0017𡖾kI􈯟"
+                    "type": "-\u0017𡖾kI􈯟",
+                    "value": "\u0007\u001eN B\u0007󵫂𫓙\u001doc*%"
                 },
                 {
-                    "value": "4󾴏M6J",
-                    "type": "\\Y\u000cr\u0003\u000f"
+                    "type": "\\Y\u000cr\u0003\u000f",
+                    "value": "4󾴏M6J"
                 },
                 {
-                    "value": "8U\u001eJ6uNV_\u000b",
-                    "type": ".\u001c%N5=`\u0019\u0003󾦥\u0014t3@𫨗Oz.􂜆鱋0IG\tdk>-􊷟"
+                    "type": ".\u001c%N5=`\u0019\u0003󾦥\u0014t3@𫨗Oz.􂜆鱋0IG\tdk>-􊷟",
+                    "value": "8U\u001eJ6uNV_\u000b"
                 },
                 {
-                    "value": "𢋖C~轜&=􊺬\u0000􊽷Va<𘎘𓌅!̈􁧴zKẚ~\\ꚱ𩨦\u0019;a𘫖)",
-                    "type": "(7j􏽔S.,_"
+                    "type": "(7j􏽔S.,_",
+                    "value": "𢋖C~轜&=􊺬\u0000􊽷Va<𘎘𓌅!̈􁧴zKẚ~\\ꚱ𩨦\u0019;a𘫖)"
                 },
                 {
-                    "value": "K𠠾",
-                    "type": "𡢪Q\"[􋒆\u001b􇬘[{󷍇\u0004𥦇\u0017﹑5Cl\u0004\u0001󼖪ZA􉥋R,焴/𡑭󹠐"
+                    "type": "𡢪Q\"[􋒆\u001b􇬘[{󷍇\u0004𥦇\u0017﹑5Cl\u0004\u0001󼖪ZA􉥋R,焴/𡑭󹠐",
+                    "value": "K𠠾"
                 },
                 {
-                    "value": "\u001b\u001f􋅜𥹪",
-                    "type": "\u0003\u0003W\u0013\u0015􏠽=U󻞑􂆇\n󰙃Fd菨'\u0007\u001e3\u0007,\u0015#\u0015"
+                    "type": "\u0003\u0003W\u0013\u0015􏠽=U󻞑􂆇\n󰙃Fd菨'\u0007\u001e3\u0007,\u0015#\u0015",
+                    "value": "\u001b\u001f􋅜𥹪"
                 },
                 {
-                    "value": "J<~ ㌜?1\u000eh\r􏱬\u000e9s󼾠𐃟a􊉼𥙮\u00114𠘢CNI|",
-                    "type": "3#u𦘕𐚌zf'G\u001f\u000eN駧󽠖􃏍𣥿n"
+                    "type": "3#u𦘕𐚌zf'G\u001f\u000eN駧󽠖􃏍𣥿n",
+                    "value": "J<~ ㌜?1\u000eh\r􏱬\u000e9s󼾠𐃟a􊉼𥙮\u00114𠘢CNI|"
                 },
                 {
-                    "value": "4/S\u000cC􊯰󳴉J\"|\u000fHy\u001c",
-                    "type": "^3󹘼&"
+                    "type": "^3󹘼&",
+                    "value": "4/S\u000cC􊯰󳴉J\"|\u000fHy\u001c"
                 },
                 {
-                    "value": "䭵TQ^(HF'<JVF\u001ebX%p󿠽x",
-                    "type": "\t@𗝁ᮚPt󱤙󷵟ql.\u0012𠑻-\u001f𤞚un=\u001dmM\u000b\u0001R"
+                    "type": "\t@𗝁ᮚPt󱤙󷵟ql.\u0012𠑻-\u001f𤞚un=\u001dmM\u000b\u0001R",
+                    "value": "䭵TQ^(HF'<JVF\u001ebX%p󿠽x"
                 },
                 {
-                    "value": ">𦛟𭠂7f}\u0011rZ\rs븨Nh\"𛈊kइ釚􀶗as$|7󹶎A󱵭󷻹",
-                    "type": "\u0002He\r\u001ak賅,\u001fM2v\u0008\u001e𮕍z蝜\u0017󸻫\u0014\u0000\n󾛤=io"
+                    "type": "\u0002He\r\u001ak賅,\u001fM2v\u0008\u001e𮕍z蝜\u0017󸻫\u0014\u0000\n󾛤=io",
+                    "value": ">𦛟𭠂7f}\u0011rZ\rs븨Nh\"𛈊kइ釚􀶗as$|7󹶎A󱵭󷻹"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "^3󹘼&": "4/S\u000cC􊯰󳴉J\"|\u000fHy\u001c",
-        ".\u001c%N5=`\u0019\u0003󾦥\u0014t3@𫨗Oz.􂜆鱋0IG\tdk>-􊷟": "8U\u001eJ6uNV_\u000b",
-        "\u0003\u0003W\u0013\u0015􏠽=U󻞑􂆇\n󰙃Fd菨'\u0007\u001e3\u0007,\u0015#\u0015": "\u001b\u001f􋅜𥹪",
-        "󺟄\u0006󿊀i𡿍;=/3􉞐\"U": "\u0017K\u001a\u001a\u000e:󺰓y\u0001𪝹]`\u0003e\u0011O:𦶴h~akL\u0000u󴈗t",
-        "{𭿹=": "^󴟴_\u0002\u0018_掑\u0018\u001bp#BS~􎺏#\u000f",
-        "䚄;": "𭉖𐦡碰 \u001f\u0019p\u0011\u0001r􄘨",
-        "3#u𦘕𐚌zf'G\u001f\u000eN駧󽠖􃏍𣥿n": "J<~ ㌜?1\u000eh\r􏱬\u000e9s󼾠𐃟a􊉼𥙮\u00114𠘢CNI|",
-        "􏏒󽑢\u0017J󹡀K􃉠K𧢽ct𠛝B󲎞􎔚𤊀2": "\u0014𨇴8,*󸶠&JP\u0008pzN𒂅a\n\u0010{& Z+/i𗦉",
-        ">NN𬾗\u001e[N@x\u0002󾿐X󽇈\u0000\r)w􄘰\u001bu\u000cg𧇀@\u0011": "N\r\t󵱁蓇𗲳󳁏",
-        "쾓O\u001e$7[J󸋧7Wb𩳒\u0014󶃙󳢨\u0004){2)\t\u0011􄋎qG􁖂󳤲": "䠍3>\"sn􅴠4",
-        "(7j􏽔S.,_": "𢋖C~轜&=􊺬\u0000􊽷Va<𘎘𓌅!̈􁧴zKẚ~\\ꚱ𩨦\u0019;a𘫖)",
-        "\t@𗝁ᮚPt󱤙󷵟ql.\u0012𠑻-\u001f𤞚un=\u001dmM\u000b\u0001R": "䭵TQ^(HF'<JVF\u001ebX%p󿠽x",
-        "\\Y\u000cr\u0003\u000f": "4󾴏M6J",
-        "\u0002He\r\u001ak賅,\u001fM2v\u0008\u001e𮕍z蝜\u0017󸻫\u0014\u0000\n󾛤=io": ">𦛟𭠂7f}\u0011rZ\rs븨Nh\"𛈊kइ釚􀶗as$|7󹶎A󱵭󷻹",
-        "-\u0017𡖾kI􈯟": "\u0007\u001eN B\u0007󵫂𫓙\u001doc*%",
-        "]|:𭁴`䇵􁝅A\u001e6": "0RᎭ􍮕󰼧CrXᐊoA;K𤏌􉾂A",
-        "J􋮃[gHH\rjs\u0011%h󳏬\u0006𧟟}rh𬵩\u00026\u0005󲲭_\u001f\u0013-.\u0018": "V𪔍~\u0007𣋹h\tq\t[S󷛨\u001cDa\u0002N4𘕕𥌥川0􌠋o~𣥋",
-        "𡢷􈌘\\\u0000hOWZZ붎(t": "}8\u0003|n1⾐",
-        "𡢪Q\"[􋒆\u001b􇬘[{󷍇\u0004𥦇\u0017﹑5Cl\u0004\u0001󼖪ZA􉥋R,焴/𡑭󹠐": "K𠠾",
-        "寓𛇀𘪊]7𨜒􍣥;󷩠L[)3\u000f\u000bfZ=[": "^\u0003q(P\u0002_𡟊k􇲂i𥗶󰂹'\u0014\u0005\u00112J\u000f􅞤i􆉭󶈛"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_5.json b/libs/wire-api/test/golden/testObject_RichInfo_user_5.json
index a2d5bde9127..f568c2dd072 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_5.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_5.json
@@ -1,36 +1,36 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "􏊧􋼈Tq㺏𦓫\u001fM􄨵vr>\u001e󲘹r糣~Ho4𫣷Fpq􄛩y]^",
+        "+􄻈𪉱BQ4󹂹bZ>?􌝩?\u0000 a𖤒|K󽫲>5kR": "\u000fbs2`\u0010MD&􅒗}RUx\u001ci\u0012\u0005Sjt6𨡺􂐥\u0015V\t\u0019",
+        "᪤\t\u0008]􁼘\u001fx\u001b𫬞jk🩎/Xiyg\u001f\t􇀲": "oR+oꣃ7e􌠶6MA\u00053Y􊆪W~J",
+        "琱󴍯U\u001f\n􏗲\r ": "@̥cl\u0001/𗲙󽰋n􋵞",
+        "鋖𠃼`": "⌇\nv\u0004⫗\u001e𔐳y&jy5F 􀋏G󽼭+𦎝\u000cu\u000eM𘀾0\u001b"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "oR+oꣃ7e􌠶6MA\u00053Y􊆪W~J",
-                    "type": "᪤\t\u0008]􁼘\u001fx\u001b𫬞jk🩎/Xiyg\u001f\t􇀲"
+                    "type": "᪤\t\u0008]􁼘\u001fx\u001b𫬞jk🩎/Xiyg\u001f\t􇀲",
+                    "value": "oR+oꣃ7e􌠶6MA\u00053Y􊆪W~J"
                 },
                 {
-                    "value": "\u000fbs2`\u0010MD&􅒗}RUx\u001ci\u0012\u0005Sjt6𨡺􂐥\u0015V\t\u0019",
-                    "type": "+􄻈𪉱BQ4󹂹bZ>?􌝩?\u0000 a𖤒|K󽫲>5kR"
+                    "type": "+􄻈𪉱BQ4󹂹bZ>?􌝩?\u0000 a𖤒|K󽫲>5kR",
+                    "value": "\u000fbs2`\u0010MD&􅒗}RUx\u001ci\u0012\u0005Sjt6𨡺􂐥\u0015V\t\u0019"
                 },
                 {
-                    "value": "􏊧􋼈Tq㺏𦓫\u001fM􄨵vr>\u001e󲘹r糣~Ho4𫣷Fpq􄛩y]^",
-                    "type": ""
+                    "type": "",
+                    "value": "􏊧􋼈Tq㺏𦓫\u001fM􄨵vr>\u001e󲘹r糣~Ho4𫣷Fpq􄛩y]^"
                 },
                 {
-                    "value": "@̥cl\u0001/𗲙󽰋n􋵞",
-                    "type": "琱󴍯U\u001f\n􏗲\r "
+                    "type": "琱󴍯U\u001f\n􏗲\r ",
+                    "value": "@̥cl\u0001/𗲙󽰋n􋵞"
                 },
                 {
-                    "value": "⌇\nv\u0004⫗\u001e𔐳y&jy5F 􀋏G󽼭+𦎝\u000cu\u000eM𘀾0\u001b",
-                    "type": "鋖𠃼`"
+                    "type": "鋖𠃼`",
+                    "value": "⌇\nv\u0004⫗\u001e𔐳y&jy5F 􀋏G󽼭+𦎝\u000cu\u000eM𘀾0\u001b"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "᪤\t\u0008]􁼘\u001fx\u001b𫬞jk🩎/Xiyg\u001f\t􇀲": "oR+oꣃ7e􌠶6MA\u00053Y􊆪W~J",
-        "": "􏊧􋼈Tq㺏𦓫\u001fM􄨵vr>\u001e󲘹r糣~Ho4𫣷Fpq􄛩y]^",
-        "琱󴍯U\u001f\n􏗲\r ": "@̥cl\u0001/𗲙󽰋n􋵞",
-        "鋖𠃼`": "⌇\nv\u0004⫗\u001e𔐳y&jy5F 􀋏G󽼭+𦎝\u000cu\u000eM𘀾0\u001b",
-        "+􄻈𪉱BQ4󹂹bZ>?􌝩?\u0000 a𖤒|K󽫲>5kR": "\u000fbs2`\u0010MD&􅒗}RUx\u001ci\u0012\u0005Sjt6𨡺􂐥\u0015V\t\u0019"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_6.json b/libs/wire-api/test/golden/testObject_RichInfo_user_6.json
index 7a465bcae18..de48c5ae99c 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_6.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_6.json
@@ -1,101 +1,101 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u000bAA9\n\u00116)h;ꑀ󷍪Qj{d葈%󵊭c\u001e󽠨\\𘗣O\u0011,a": "\"xaCQ;鏜C^\u001fwm𫱙(N􄃕6 +\u0012\u001fX;",
+        "\u0015 >\u001a\u000ehem=,1\u0018\u0002𨩇8": "{\u0012T_\u001b(JaC7|\u0004YKi\u0013\u001b:l,𨴸",
+        "\u001d𧆭T~+\u0011𩼴􇙣p〘_\r(󷷊\u001fP\u0019#X𩙙𞴡榊": "\u000f𥫮󴸡4S",
+        "\u001e": ">{I뺪$𮍳🚿𮮂\u0016\u000f𬲳xOg2\u001dv0󵱨Ih\u0016P𤊪m]r",
+        "(􂂃94􄾸\u0016/􊍣\u0011@s󺄨󻐷􌞽:{\u0001\"K\u001bXーFs􈃞󼄼": "AL\nꖥ😍\u0019O1}䚛\rO#.gxE",
+        ")\r\u0006\u001d󾶲3f\u0005󾔾U`\u0016衬,\u001a'\u0000B": ";\u001c𞴏\u001fD",
+        "=P􂱧xO4㭠n\u001c󼁶U󾫳pnHu{𥈹;󻕈": "-􊲎3w(nᲄ𮡅>\u000f\u001cO𐛷05~\u000c",
+        "CK%𡗢呝[􁋨,}cMJU/@􄼚鹡": ")\u000f1q\u0005",
+        "O\u0018)p𤝾W\u001ba󾘹𩜀\u0015": "\u0004󾟔r:[G\u001d]\u000e6B󸺯𢣠#W\u0012𦨝𐰓\u0003􀠠,\u0012\u001b",
+        "Pn\u001bA\u0006bc𠱆hv\"M𭒝臓獴\u000b'C": "]-f_\u0017",
+        "[0\u0010𪅬": "L,5tm9\u0019",
+        "\\ꠁ\u0001𠫂tV": "\u001b𭀁/􆻶ZA핣󻘎\u0013IE敏{\u0006pV븽k",
+        "co\u001dP􉯿B󶝸,&캸󰸓\u0006$kap": "d\u0001󲅽Ɀ\u0006D􌭨z/\u0015K痧􆾠\u0005-\u0004\u0016y\u0011\u0000#\u001flT",
+        "wm\u0002𨗃\u0017\u00076󷪙G8􁅊f𝣱\u001a󽶰m\u0011Y\u000b)9x~>Q\n": "=21yL\u0008\"𩊐,󼜮\u0012\u0008\r𠴿\u001fm hf}iU𥻵\u001a\u0008}3I",
+        "𮛷깋k􂽩\u000fdzA45\"j扸b$\u00068Fg{UQ.": "!3\u0018V\u001c\r(*'󿟏􅺻􏐴z=󼗐Ἠ\u0010􉹟-\u0016t\u0013􈮪b\u0002\u0003V\u0001",
+        "􁼒6.󸬱<𝟅󳱀lꇈ\u0011": "􎾒𘙂\u0018􉣔􋕈\u000be𫋢󼠜\u0005d",
+        "􌆴\t🁼\r": "8U㮕2A󻚸/J\u0007D57􉛆\u0016dC𬔔\n䭱l\u0006\u0012=",
+        "􍎙D󶎜:\u000f\u0014f榍􇜘|@": "Ka\u000c\u00002y󰍯u􃂠wh\u0011\\􉓿􃴠\u000b6Y"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "\u001b𭀁/􆻶ZA핣󻘎\u0013IE敏{\u0006pV븽k",
-                    "type": "\\ꠁ\u0001𠫂tV"
+                    "type": "\\ꠁ\u0001𠫂tV",
+                    "value": "\u001b𭀁/􆻶ZA핣󻘎\u0013IE敏{\u0006pV븽k"
                 },
                 {
-                    "value": "L,5tm9\u0019",
-                    "type": "[0\u0010𪅬"
+                    "type": "[0\u0010𪅬",
+                    "value": "L,5tm9\u0019"
                 },
                 {
-                    "value": "AL\nꖥ😍\u0019O1}䚛\rO#.gxE",
-                    "type": "(􂂃94􄾸\u0016/􊍣\u0011@s󺄨󻐷􌞽:{\u0001\"K\u001bXーFs􈃞󼄼"
+                    "type": "(􂂃94􄾸\u0016/􊍣\u0011@s󺄨󻐷􌞽:{\u0001\"K\u001bXーFs􈃞󼄼",
+                    "value": "AL\nꖥ😍\u0019O1}䚛\rO#.gxE"
                 },
                 {
-                    "value": "!3\u0018V\u001c\r(*'󿟏􅺻􏐴z=󼗐Ἠ\u0010􉹟-\u0016t\u0013􈮪b\u0002\u0003V\u0001",
-                    "type": "𮛷깋k􂽩\u000fdzA45\"j扸b$\u00068Fg{UQ."
+                    "type": "𮛷깋k􂽩\u000fdzA45\"j扸b$\u00068Fg{UQ.",
+                    "value": "!3\u0018V\u001c\r(*'󿟏􅺻􏐴z=󼗐Ἠ\u0010􉹟-\u0016t\u0013􈮪b\u0002\u0003V\u0001"
                 },
                 {
-                    "value": ">{I뺪$𮍳🚿𮮂\u0016\u000f𬲳xOg2\u001dv0󵱨Ih\u0016P𤊪m]r",
-                    "type": "\u001e"
+                    "type": "\u001e",
+                    "value": ">{I뺪$𮍳🚿𮮂\u0016\u000f𬲳xOg2\u001dv0󵱨Ih\u0016P𤊪m]r"
                 },
                 {
-                    "value": "-􊲎3w(nᲄ𮡅>\u000f\u001cO𐛷05~\u000c",
-                    "type": "=P􂱧xO4㭠n\u001c󼁶U󾫳pnHu{𥈹;󻕈"
+                    "type": "=P􂱧xO4㭠n\u001c󼁶U󾫳pnHu{𥈹;󻕈",
+                    "value": "-􊲎3w(nᲄ𮡅>\u000f\u001cO𐛷05~\u000c"
                 },
                 {
-                    "value": "d\u0001󲅽Ɀ\u0006D􌭨z/\u0015K痧􆾠\u0005-\u0004\u0016y\u0011\u0000#\u001flT",
-                    "type": "co\u001dP􉯿B󶝸,&캸󰸓\u0006$kap"
+                    "type": "co\u001dP􉯿B󶝸,&캸󰸓\u0006$kap",
+                    "value": "d\u0001󲅽Ɀ\u0006D􌭨z/\u0015K痧􆾠\u0005-\u0004\u0016y\u0011\u0000#\u001flT"
                 },
                 {
-                    "value": ";\u001c𞴏\u001fD",
-                    "type": ")\r\u0006\u001d󾶲3f\u0005󾔾U`\u0016衬,\u001a'\u0000B"
+                    "type": ")\r\u0006\u001d󾶲3f\u0005󾔾U`\u0016衬,\u001a'\u0000B",
+                    "value": ";\u001c𞴏\u001fD"
                 },
                 {
-                    "value": "\"xaCQ;鏜C^\u001fwm𫱙(N􄃕6 +\u0012\u001fX;",
-                    "type": "\u000bAA9\n\u00116)h;ꑀ󷍪Qj{d葈%󵊭c\u001e󽠨\\𘗣O\u0011,a"
+                    "type": "\u000bAA9\n\u00116)h;ꑀ󷍪Qj{d葈%󵊭c\u001e󽠨\\𘗣O\u0011,a",
+                    "value": "\"xaCQ;鏜C^\u001fwm𫱙(N􄃕6 +\u0012\u001fX;"
                 },
                 {
-                    "value": "\u0004󾟔r:[G\u001d]\u000e6B󸺯𢣠#W\u0012𦨝𐰓\u0003􀠠,\u0012\u001b",
-                    "type": "O\u0018)p𤝾W\u001ba󾘹𩜀\u0015"
+                    "type": "O\u0018)p𤝾W\u001ba󾘹𩜀\u0015",
+                    "value": "\u0004󾟔r:[G\u001d]\u000e6B󸺯𢣠#W\u0012𦨝𐰓\u0003􀠠,\u0012\u001b"
                 },
                 {
-                    "value": "]-f_\u0017",
-                    "type": "Pn\u001bA\u0006bc𠱆hv\"M𭒝臓獴\u000b'C"
+                    "type": "Pn\u001bA\u0006bc𠱆hv\"M𭒝臓獴\u000b'C",
+                    "value": "]-f_\u0017"
                 },
                 {
-                    "value": "Ka\u000c\u00002y󰍯u􃂠wh\u0011\\􉓿􃴠\u000b6Y",
-                    "type": "􍎙D󶎜:\u000f\u0014f榍􇜘|@"
+                    "type": "􍎙D󶎜:\u000f\u0014f榍􇜘|@",
+                    "value": "Ka\u000c\u00002y󰍯u􃂠wh\u0011\\􉓿􃴠\u000b6Y"
                 },
                 {
-                    "value": "􎾒𘙂\u0018􉣔􋕈\u000be𫋢󼠜\u0005d",
-                    "type": "􁼒6.󸬱<𝟅󳱀lꇈ\u0011"
+                    "type": "􁼒6.󸬱<𝟅󳱀lꇈ\u0011",
+                    "value": "􎾒𘙂\u0018􉣔􋕈\u000be𫋢󼠜\u0005d"
                 },
                 {
-                    "value": "\u000f𥫮󴸡4S",
-                    "type": "\u001d𧆭T~+\u0011𩼴􇙣p〘_\r(󷷊\u001fP\u0019#X𩙙𞴡榊"
+                    "type": "\u001d𧆭T~+\u0011𩼴􇙣p〘_\r(󷷊\u001fP\u0019#X𩙙𞴡榊",
+                    "value": "\u000f𥫮󴸡4S"
                 },
                 {
-                    "value": "8U㮕2A󻚸/J\u0007D57􉛆\u0016dC𬔔\n䭱l\u0006\u0012=",
-                    "type": "􌆴\t🁼\r"
+                    "type": "􌆴\t🁼\r",
+                    "value": "8U㮕2A󻚸/J\u0007D57􉛆\u0016dC𬔔\n䭱l\u0006\u0012="
                 },
                 {
-                    "value": ")\u000f1q\u0005",
-                    "type": "CK%𡗢呝[􁋨,}cMJU/@􄼚鹡"
+                    "type": "CK%𡗢呝[􁋨,}cMJU/@􄼚鹡",
+                    "value": ")\u000f1q\u0005"
                 },
                 {
-                    "value": "=21yL\u0008\"𩊐,󼜮\u0012\u0008\r𠴿\u001fm hf}iU𥻵\u001a\u0008}3I",
-                    "type": "wm\u0002𨗃\u0017\u00076󷪙G8􁅊f𝣱\u001a󽶰m\u0011Y\u000b)9x~>Q\n"
+                    "type": "wm\u0002𨗃\u0017\u00076󷪙G8􁅊f𝣱\u001a󽶰m\u0011Y\u000b)9x~>Q\n",
+                    "value": "=21yL\u0008\"𩊐,󼜮\u0012\u0008\r𠴿\u001fm hf}iU𥻵\u001a\u0008}3I"
                 },
                 {
-                    "value": "{\u0012T_\u001b(JaC7|\u0004YKi\u0013\u001b:l,𨴸",
-                    "type": "\u0015 >\u001a\u000ehem=,1\u0018\u0002𨩇8"
+                    "type": "\u0015 >\u001a\u000ehem=,1\u0018\u0002𨩇8",
+                    "value": "{\u0012T_\u001b(JaC7|\u0004YKi\u0013\u001b:l,𨴸"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "\\ꠁ\u0001𠫂tV": "\u001b𭀁/􆻶ZA핣󻘎\u0013IE敏{\u0006pV븽k",
-        "wm\u0002𨗃\u0017\u00076󷪙G8􁅊f𝣱\u001a󽶰m\u0011Y\u000b)9x~>Q\n": "=21yL\u0008\"𩊐,󼜮\u0012\u0008\r𠴿\u001fm hf}iU𥻵\u001a\u0008}3I",
-        "\u0015 >\u001a\u000ehem=,1\u0018\u0002𨩇8": "{\u0012T_\u001b(JaC7|\u0004YKi\u0013\u001b:l,𨴸",
-        "co\u001dP􉯿B󶝸,&캸󰸓\u0006$kap": "d\u0001󲅽Ɀ\u0006D􌭨z/\u0015K痧􆾠\u0005-\u0004\u0016y\u0011\u0000#\u001flT",
-        "(􂂃94􄾸\u0016/􊍣\u0011@s󺄨󻐷􌞽:{\u0001\"K\u001bXーFs􈃞󼄼": "AL\nꖥ😍\u0019O1}䚛\rO#.gxE",
-        "O\u0018)p𤝾W\u001ba󾘹𩜀\u0015": "\u0004󾟔r:[G\u001d]\u000e6B󸺯𢣠#W\u0012𦨝𐰓\u0003􀠠,\u0012\u001b",
-        "𮛷깋k􂽩\u000fdzA45\"j扸b$\u00068Fg{UQ.": "!3\u0018V\u001c\r(*'󿟏􅺻􏐴z=󼗐Ἠ\u0010􉹟-\u0016t\u0013􈮪b\u0002\u0003V\u0001",
-        "􌆴\t🁼\r": "8U㮕2A󻚸/J\u0007D57􉛆\u0016dC𬔔\n䭱l\u0006\u0012=",
-        "\u001e": ">{I뺪$𮍳🚿𮮂\u0016\u000f𬲳xOg2\u001dv0󵱨Ih\u0016P𤊪m]r",
-        ")\r\u0006\u001d󾶲3f\u0005󾔾U`\u0016衬,\u001a'\u0000B": ";\u001c𞴏\u001fD",
-        "CK%𡗢呝[􁋨,}cMJU/@􄼚鹡": ")\u000f1q\u0005",
-        "Pn\u001bA\u0006bc𠱆hv\"M𭒝臓獴\u000b'C": "]-f_\u0017",
-        "\u000bAA9\n\u00116)h;ꑀ󷍪Qj{d葈%󵊭c\u001e󽠨\\𘗣O\u0011,a": "\"xaCQ;鏜C^\u001fwm𫱙(N􄃕6 +\u0012\u001fX;",
-        "􁼒6.󸬱<𝟅󳱀lꇈ\u0011": "􎾒𘙂\u0018􉣔􋕈\u000be𫋢󼠜\u0005d",
-        "[0\u0010𪅬": "L,5tm9\u0019",
-        "=P􂱧xO4㭠n\u001c󼁶U󾫳pnHu{𥈹;󻕈": "-􊲎3w(nᲄ𮡅>\u000f\u001cO𐛷05~\u000c",
-        "\u001d𧆭T~+\u0011𩼴􇙣p〘_\r(󷷊\u001fP\u0019#X𩙙𞴡榊": "\u000f𥫮󴸡4S",
-        "􍎙D󶎜:\u000f\u0014f榍􇜘|@": "Ka\u000c\u00002y󰍯u􃂠wh\u0011\\􉓿􃴠\u000b6Y"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_7.json b/libs/wire-api/test/golden/testObject_RichInfo_user_7.json
index 0fa320a70dd..fccc3bae626 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_7.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_7.json
@@ -1,86 +1,86 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "": "㎌󶅻\u0014\tx𫣵d|q\u0011t:0",
+        "\u0000Go𐃬3⩁󹚂": "H󷔡IL_",
+        "\u0001o\u001e豹-(􍅵)f\u0017󳉚S󹐵k": "NO#r󳁩]\u00034hX}󾂩\u0000➶\u000f\u001f\u0018𥉼1\u0010\u0012I=y",
+        "%f\u0014\n􂖰C􃗸m\u000c\u0017qUa\u0004C": "3rXe#Hlq=z𫋁*;|󷯋",
+        ")𧇌.{󳘘t_\u0002􊴷E𡝤\u0007 8?": "W𩗎&󺟲\n^𫁘ME\u0018\u0003􊇛f􏊟뱲fsL铦",
+        "+": "X\u001c$􎄌囚e\u0013$X1VI\\𩖋`𨖀z\u0019^\u000b\u000e􆓘aq󴦪H",
+        "7\u001c\u0001r\u0007󠁔坛a4": "'\u0019a1鳖\u0011S*z]𡾳:&M",
+        "8웒8Mh<\" G[-W]\u001e%𧆯󹒪a\u00073\u0000𩒆𑱗\u0016": "󲢼󾌩_\u000e쌽B^",
+        "Vx\u0001徿{􅱿le^\u001cp􀻳𗹄镭Z𫖧\u0005]}?𮗄n\u0017": "ᑼ󰇖C\u000f:<轎0nN\u0008a劗\u0014c(m9)\u001b }>\"|\u0018k`\u000c",
+        "b<􊲎\u001d𐧈\u0014􉎴􍘄/􄣹:쪵)Uᖁ𪴞\u0001𧯳\u001dp": "@9\u0008\t\r,^􈒀͌󰥍\u0001BL2=𬀚S%\u0000",
+        "fWu\u0001􏱲\u0015\u0002QVk𬇌_g\u0000lAK𥲪M,b𘖙􋖓": "o6!M\u0010􉾹䵽\u0002[𮔘󲣜𒇋𮨬[􇰅\r𣒌ﱦY",
+        "xNP􀈌z\u0018s2󱈍": "[#ok\u001cR\u000b.@Al􃼨𥰣0]􊁋*4$0u<𪖺𐓺\u0002S\u0016c즭",
+        "L4": "V\u000c+{x󵫷𝨹Uew$at",
+        "鯛󸼬": "󸝬",
+        "󳂳\u001f1>c": "Ly\u001c3bG9󾳉H俬g>(\u0014"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "[#ok\u001cR\u000b.@Al􃼨𥰣0]􊁋*4$0u<𪖺𐓺\u0002S\u0016c즭",
-                    "type": "xNP􀈌z\u0018s2󱈍"
+                    "type": "xNP􀈌z\u0018s2󱈍",
+                    "value": "[#ok\u001cR\u000b.@Al􃼨𥰣0]􊁋*4$0u<𪖺𐓺\u0002S\u0016c즭"
                 },
                 {
-                    "value": "Ly\u001c3bG9󾳉H俬g>(\u0014",
-                    "type": "󳂳\u001f1>c"
+                    "type": "󳂳\u001f1>c",
+                    "value": "Ly\u001c3bG9󾳉H俬g>(\u0014"
                 },
                 {
-                    "value": "3rXe#Hlq=z𫋁*;|󷯋",
-                    "type": "%f\u0014\n􂖰C􃗸m\u000c\u0017qUa\u0004C"
+                    "type": "%f\u0014\n􂖰C􃗸m\u000c\u0017qUa\u0004C",
+                    "value": "3rXe#Hlq=z𫋁*;|󷯋"
                 },
                 {
-                    "value": "W𩗎&󺟲\n^𫁘ME\u0018\u0003􊇛f􏊟뱲fsL铦",
-                    "type": ")𧇌.{󳘘t_\u0002􊴷E𡝤\u0007 8?"
+                    "type": ")𧇌.{󳘘t_\u0002􊴷E𡝤\u0007 8?",
+                    "value": "W𩗎&󺟲\n^𫁘ME\u0018\u0003􊇛f􏊟뱲fsL铦"
                 },
                 {
-                    "value": "V\u000c+{x󵫷𝨹Uew$at",
-                    "type": "L4"
+                    "type": "L4",
+                    "value": "V\u000c+{x󵫷𝨹Uew$at"
                 },
                 {
-                    "value": "'\u0019a1鳖\u0011S*z]𡾳:&M",
-                    "type": "7\u001c\u0001r\u0007󠁔坛a4"
+                    "type": "7\u001c\u0001r\u0007󠁔坛a4",
+                    "value": "'\u0019a1鳖\u0011S*z]𡾳:&M"
                 },
                 {
-                    "value": "H󷔡IL_",
-                    "type": "\u0000Go𐃬3⩁󹚂"
+                    "type": "\u0000Go𐃬3⩁󹚂",
+                    "value": "H󷔡IL_"
                 },
                 {
-                    "value": "㎌󶅻\u0014\tx𫣵d|q\u0011t:0",
-                    "type": ""
+                    "type": "",
+                    "value": "㎌󶅻\u0014\tx𫣵d|q\u0011t:0"
                 },
                 {
-                    "value": "@9\u0008\t\r,^􈒀͌󰥍\u0001BL2=𬀚S%\u0000",
-                    "type": "b<􊲎\u001d𐧈\u0014􉎴􍘄/􄣹:쪵)Uᖁ𪴞\u0001𧯳\u001dp"
+                    "type": "b<􊲎\u001d𐧈\u0014􉎴􍘄/􄣹:쪵)Uᖁ𪴞\u0001𧯳\u001dp",
+                    "value": "@9\u0008\t\r,^􈒀͌󰥍\u0001BL2=𬀚S%\u0000"
                 },
                 {
-                    "value": "X\u001c$􎄌囚e\u0013$X1VI\\𩖋`𨖀z\u0019^\u000b\u000e􆓘aq󴦪H",
-                    "type": "+"
+                    "type": "+",
+                    "value": "X\u001c$􎄌囚e\u0013$X1VI\\𩖋`𨖀z\u0019^\u000b\u000e􆓘aq󴦪H"
                 },
                 {
-                    "value": "o6!M\u0010􉾹䵽\u0002[𮔘󲣜𒇋𮨬[􇰅\r𣒌ﱦY",
-                    "type": "fWu\u0001􏱲\u0015\u0002QVk𬇌_g\u0000lAK𥲪M,b𘖙􋖓"
+                    "type": "fWu\u0001􏱲\u0015\u0002QVk𬇌_g\u0000lAK𥲪M,b𘖙􋖓",
+                    "value": "o6!M\u0010􉾹䵽\u0002[𮔘󲣜𒇋𮨬[􇰅\r𣒌ﱦY"
                 },
                 {
-                    "value": "NO#r󳁩]\u00034hX}󾂩\u0000➶\u000f\u001f\u0018𥉼1\u0010\u0012I=y",
-                    "type": "\u0001o\u001e豹-(􍅵)f\u0017󳉚S󹐵k"
+                    "type": "\u0001o\u001e豹-(􍅵)f\u0017󳉚S󹐵k",
+                    "value": "NO#r󳁩]\u00034hX}󾂩\u0000➶\u000f\u001f\u0018𥉼1\u0010\u0012I=y"
                 },
                 {
-                    "value": "󲢼󾌩_\u000e쌽B^",
-                    "type": "8웒8Mh<\" G[-W]\u001e%𧆯󹒪a\u00073\u0000𩒆𑱗\u0016"
+                    "type": "8웒8Mh<\" G[-W]\u001e%𧆯󹒪a\u00073\u0000𩒆𑱗\u0016",
+                    "value": "󲢼󾌩_\u000e쌽B^"
                 },
                 {
-                    "value": "ᑼ󰇖C\u000f:<轎0nN\u0008a劗\u0014c(m9)\u001b }>\"|\u0018k`\u000c",
-                    "type": "Vx\u0001徿{􅱿le^\u001cp􀻳𗹄镭Z𫖧\u0005]}?𮗄n\u0017"
+                    "type": "Vx\u0001徿{􅱿le^\u001cp􀻳𗹄镭Z𫖧\u0005]}?𮗄n\u0017",
+                    "value": "ᑼ󰇖C\u000f:<轎0nN\u0008a劗\u0014c(m9)\u001b }>\"|\u0018k`\u000c"
                 },
                 {
-                    "value": "󸝬",
-                    "type": "鯛󸼬"
+                    "type": "鯛󸼬",
+                    "value": "󸝬"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "xNP􀈌z\u0018s2󱈍": "[#ok\u001cR\u000b.@Al􃼨𥰣0]􊁋*4$0u<𪖺𐓺\u0002S\u0016c즭",
-        "b<􊲎\u001d𐧈\u0014􉎴􍘄/􄣹:쪵)Uᖁ𪴞\u0001𧯳\u001dp": "@9\u0008\t\r,^􈒀͌󰥍\u0001BL2=𬀚S%\u0000",
-        "L4": "V\u000c+{x󵫷𝨹Uew$at",
-        ")𧇌.{󳘘t_\u0002􊴷E𡝤\u0007 8?": "W𩗎&󺟲\n^𫁘ME\u0018\u0003􊇛f􏊟뱲fsL铦",
-        "": "㎌󶅻\u0014\tx𫣵d|q\u0011t:0",
-        "+": "X\u001c$􎄌囚e\u0013$X1VI\\𩖋`𨖀z\u0019^\u000b\u000e􆓘aq󴦪H",
-        "\u0001o\u001e豹-(􍅵)f\u0017󳉚S󹐵k": "NO#r󳁩]\u00034hX}󾂩\u0000➶\u000f\u001f\u0018𥉼1\u0010\u0012I=y",
-        "Vx\u0001徿{􅱿le^\u001cp􀻳𗹄镭Z𫖧\u0005]}?𮗄n\u0017": "ᑼ󰇖C\u000f:<轎0nN\u0008a劗\u0014c(m9)\u001b }>\"|\u0018k`\u000c",
-        "7\u001c\u0001r\u0007󠁔坛a4": "'\u0019a1鳖\u0011S*z]𡾳:&M",
-        "%f\u0014\n􂖰C􃗸m\u000c\u0017qUa\u0004C": "3rXe#Hlq=z𫋁*;|󷯋",
-        "fWu\u0001􏱲\u0015\u0002QVk𬇌_g\u0000lAK𥲪M,b𘖙􋖓": "o6!M\u0010􉾹䵽\u0002[𮔘󲣜𒇋𮨬[􇰅\r𣒌ﱦY",
-        "8웒8Mh<\" G[-W]\u001e%𧆯󹒪a\u00073\u0000𩒆𑱗\u0016": "󲢼󾌩_\u000e쌽B^",
-        "鯛󸼬": "󸝬",
-        "\u0000Go𐃬3⩁󹚂": "H󷔡IL_",
-        "󳂳\u001f1>c": "Ly\u001c3bG9󾳉H俬g>(\u0014"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_8.json b/libs/wire-api/test/golden/testObject_RichInfo_user_8.json
index eaf91bbaa45..8aaa9ba20d8 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_8.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_8.json
@@ -1,26 +1,26 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\\𓐙n": "~\u001c\u000b4􇠋zS\u000e(2-Ud􅙓\u000b\u000cq\"z\u0002",
+        "yxP?wI悵OՇQO%\u0013𠋦\u0017E𒔜􄔷𥾽:󻿬󺕤\u0008\u0002󱪙\u0001⭒𖣭\"㉂": "Hqg\u0008𗃯嶼S\u0004𪾏𥹖L􈶲",
+        "󳖈󽻳𤀌k#3\rq\u0018": "Y\nz'𭟨gm𪄣ambJ󲎁\u000b\"\u0007So)oD\u000c\u0017"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "Y\nz'𭟨gm𪄣ambJ󲎁\u000b\"\u0007So)oD\u000c\u0017",
-                    "type": "󳖈󽻳𤀌k#3\rq\u0018"
+                    "type": "󳖈󽻳𤀌k#3\rq\u0018",
+                    "value": "Y\nz'𭟨gm𪄣ambJ󲎁\u000b\"\u0007So)oD\u000c\u0017"
                 },
                 {
-                    "value": "Hqg\u0008𗃯嶼S\u0004𪾏𥹖L􈶲",
-                    "type": "yxP?wI悵OՇQO%\u0013𠋦\u0017E𒔜􄔷𥾽:󻿬󺕤\u0008\u0002󱪙\u0001⭒𖣭\"㉂"
+                    "type": "yxP?wI悵OՇQO%\u0013𠋦\u0017E𒔜􄔷𥾽:󻿬󺕤\u0008\u0002󱪙\u0001⭒𖣭\"㉂",
+                    "value": "Hqg\u0008𗃯嶼S\u0004𪾏𥹖L􈶲"
                 },
                 {
-                    "value": "~\u001c\u000b4􇠋zS\u000e(2-Ud􅙓\u000b\u000cq\"z\u0002",
-                    "type": "\\𓐙n"
+                    "type": "\\𓐙n",
+                    "value": "~\u001c\u000b4􇠋zS\u000e(2-Ud􅙓\u000b\u000cq\"z\u0002"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "yxP?wI悵OՇQO%\u0013𠋦\u0017E𒔜􄔷𥾽:󻿬󺕤\u0008\u0002󱪙\u0001⭒𖣭\"㉂": "Hqg\u0008𗃯嶼S\u0004𪾏𥹖L􈶲",
-        "\\𓐙n": "~\u001c\u000b4􇠋zS\u000e(2-Ud􅙓\u000b\u000cq\"z\u0002",
-        "󳖈󽻳𤀌k#3\rq\u0018": "Y\nz'𭟨gm𪄣ambJ󲎁\u000b\"\u0007So)oD\u000c\u0017"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RichInfo_user_9.json b/libs/wire-api/test/golden/testObject_RichInfo_user_9.json
index eb5bf8fde68..fa561224ac5 100644
--- a/libs/wire-api/test/golden/testObject_RichInfo_user_9.json
+++ b/libs/wire-api/test/golden/testObject_RichInfo_user_9.json
@@ -1,96 +1,96 @@
 {
+    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
+        "\u0002􄶌)T𞠾\"6": "󰗝𧴆bIB@\u0016\u00125홶\u001c\u0019\u001by\t吐b",
+        "\u0003󷌑B": "\u001bnd\u0015\u001b;Ch셇d @\u001f\u001c􉳊}17Hb=x􍗁⠱\u0017",
+        "\u0019K9\u0014'`zu~\\𫖲X+\u0011𡛂\u0003\u0010*0\n殟": "y",
+        "\u001fE\t3\u0015$󺈆X􆉑𐡥哉􂻋4\u001b=QU\u0016%#􆍉%hT\u0004󻲗": "\u001eZm3",
+        "!i": "-j𫈈,愡\u0016#\u0006􄜒G􌬅\u0010㶃\u0000",
+        "E灗\u000e": "􁟡\u0004",
+        "I𬠅z𫛕$\u000fGf&><h\u0001𡟟\u001bZ􌲇": "Gw\u0006\u001f𮎹\u0019􌷚\u0002md\u0006\u0001%_mS=󷋕Z",
+        "JL􆥣'\u0002N\u0000i\"8%`\u001bmBk74^𩄪j\u001c𬘰\u001aG`ZW\u001c": "+IkzzeG:&\u0008\u0019l\u0015",
+        "T\u0010\u000f9􀡚\u001ds\u0015\u0015": ".\rᎣP\u0019s󲃇",
+        "^8OeZneC": "\u000eD\u0007󱧲󾢏H䵕􋋰􃓙Eh󳀤G\u0012mp瘀",
+        "dG\u00142쩞>+\u0005J\nxE": "b\u001d􈛚\u0007𗡡5\u0006r;jN塀\u0014䔀\u0003",
+        "zk𓄈𠐌s`AJᾅ=R\"AD\u0019\u0007rk_𪲀1\u0007u!𤿝$": "&𩵚:\u0001\\@\u000c􉏡몖C鬼8*􄳿\\y<",
+        "Et\u000fz)\u0011\u0015|mp􎩉\u0006仓󳛟\u0011v𨄞\u0001]\u0002": "euR\u0004𠣔KC\t\u001a婏𢖨𒄙M\u001d\u0006P0􆎿o\"j",
+        "ͦ\u000f4𪋱\rN*\u001euG\u0013\u0002f\n\u001b𦄜\u0003\u0014􊺿𔔔󴸞W󺜨": "\u00053MꙄ􌲓\u000ck𬉼\u0018🦁b>e\u0002 XKB咑{1",
+        "ՙ𨌮4:𤘄t97": "CS)붯_\r",
+        "𪋷?": "𖺓\u0019\u0002\u0001\u0015T󲯖帰`􍜐\u000b",
+        "􄋬sR𭚉\u000b牢?'\u0014\r.\u0005=": "阬y\"J!>'􃳬}/Y􃎓?󾐈𑢠󼽎崡\u000e‿\\=莶I𘐯`~7"
+    },
     "urn:wire:scim:schemas:profile:1.0": {
         "richInfo": {
-            "version": 0,
             "fields": [
                 {
-                    "value": "b\u001d􈛚\u0007𗡡5\u0006r;jN塀\u0014䔀\u0003",
-                    "type": "dG\u00142쩞>+\u0005J\nxE"
+                    "type": "dG\u00142쩞>+\u0005J\nxE",
+                    "value": "b\u001d􈛚\u0007𗡡5\u0006r;jN塀\u0014䔀\u0003"
                 },
                 {
-                    "value": "\u000eD\u0007󱧲󾢏H䵕􋋰􃓙Eh󳀤G\u0012mp瘀",
-                    "type": "^8OeZneC"
+                    "type": "^8OeZneC",
+                    "value": "\u000eD\u0007󱧲󾢏H䵕􋋰􃓙Eh󳀤G\u0012mp瘀"
                 },
                 {
-                    "value": "&𩵚:\u0001\\@\u000c􉏡몖C鬼8*􄳿\\y<",
-                    "type": "zk𓄈𠐌s`AJᾅ=R\"AD\u0019\u0007rk_𪲀1\u0007u!𤿝$"
+                    "type": "zk𓄈𠐌s`AJᾅ=R\"AD\u0019\u0007rk_𪲀1\u0007u!𤿝$",
+                    "value": "&𩵚:\u0001\\@\u000c􉏡몖C鬼8*􄳿\\y<"
                 },
                 {
-                    "value": "y",
-                    "type": "\u0019K9\u0014'`zu~\\𫖲X+\u0011𡛂\u0003\u0010*0\n殟"
+                    "type": "\u0019K9\u0014'`zu~\\𫖲X+\u0011𡛂\u0003\u0010*0\n殟",
+                    "value": "y"
                 },
                 {
-                    "value": "𖺓\u0019\u0002\u0001\u0015T󲯖帰`􍜐\u000b",
-                    "type": "𪋷?"
+                    "type": "𪋷?",
+                    "value": "𖺓\u0019\u0002\u0001\u0015T󲯖帰`􍜐\u000b"
                 },
                 {
-                    "value": "euR\u0004𠣔KC\t\u001a婏𢖨𒄙M\u001d\u0006P0􆎿o\"j",
-                    "type": "Et\u000fz)\u0011\u0015|mp􎩉\u0006仓󳛟\u0011v𨄞\u0001]\u0002"
+                    "type": "Et\u000fz)\u0011\u0015|mp􎩉\u0006仓󳛟\u0011v𨄞\u0001]\u0002",
+                    "value": "euR\u0004𠣔KC\t\u001a婏𢖨𒄙M\u001d\u0006P0􆎿o\"j"
                 },
                 {
-                    "value": "󰗝𧴆bIB@\u0016\u00125홶\u001c\u0019\u001by\t吐b",
-                    "type": "\u0002􄶌)T𞠾\"6"
+                    "type": "\u0002􄶌)T𞠾\"6",
+                    "value": "󰗝𧴆bIB@\u0016\u00125홶\u001c\u0019\u001by\t吐b"
                 },
                 {
-                    "value": "\u001bnd\u0015\u001b;Ch셇d @\u001f\u001c􉳊}17Hb=x􍗁⠱\u0017",
-                    "type": "\u0003󷌑B"
+                    "type": "\u0003󷌑B",
+                    "value": "\u001bnd\u0015\u001b;Ch셇d @\u001f\u001c􉳊}17Hb=x􍗁⠱\u0017"
                 },
                 {
-                    "value": "-j𫈈,愡\u0016#\u0006􄜒G􌬅\u0010㶃\u0000",
-                    "type": "!i"
+                    "type": "!i",
+                    "value": "-j𫈈,愡\u0016#\u0006􄜒G􌬅\u0010㶃\u0000"
                 },
                 {
-                    "value": "\u00053MꙄ􌲓\u000ck𬉼\u0018🦁b>e\u0002 XKB咑{1",
-                    "type": "ͦ\u000f4𪋱\rN*\u001euG\u0013\u0002f\n\u001b𦄜\u0003\u0014􊺿𔔔󴸞W󺜨"
+                    "type": "ͦ\u000f4𪋱\rN*\u001euG\u0013\u0002f\n\u001b𦄜\u0003\u0014􊺿𔔔󴸞W󺜨",
+                    "value": "\u00053MꙄ􌲓\u000ck𬉼\u0018🦁b>e\u0002 XKB咑{1"
                 },
                 {
-                    "value": ".\rᎣP\u0019s󲃇",
-                    "type": "T\u0010\u000f9􀡚\u001ds\u0015\u0015"
+                    "type": "T\u0010\u000f9􀡚\u001ds\u0015\u0015",
+                    "value": ".\rᎣP\u0019s󲃇"
                 },
                 {
-                    "value": "\u001eZm3",
-                    "type": "\u001fE\t3\u0015$󺈆X􆉑𐡥哉􂻋4\u001b=QU\u0016%#􆍉%hT\u0004󻲗"
+                    "type": "\u001fE\t3\u0015$󺈆X􆉑𐡥哉􂻋4\u001b=QU\u0016%#􆍉%hT\u0004󻲗",
+                    "value": "\u001eZm3"
                 },
                 {
-                    "value": "􁟡\u0004",
-                    "type": "E灗\u000e"
+                    "type": "E灗\u000e",
+                    "value": "􁟡\u0004"
                 },
                 {
-                    "value": "Gw\u0006\u001f𮎹\u0019􌷚\u0002md\u0006\u0001%_mS=󷋕Z",
-                    "type": "I𬠅z𫛕$\u000fGf&><h\u0001𡟟\u001bZ􌲇"
+                    "type": "I𬠅z𫛕$\u000fGf&><h\u0001𡟟\u001bZ􌲇",
+                    "value": "Gw\u0006\u001f𮎹\u0019􌷚\u0002md\u0006\u0001%_mS=󷋕Z"
                 },
                 {
-                    "value": "阬y\"J!>'􃳬}/Y􃎓?󾐈𑢠󼽎崡\u000e‿\\=莶I𘐯`~7",
-                    "type": "􄋬sR𭚉\u000b牢?'\u0014\r.\u0005="
+                    "type": "􄋬sR𭚉\u000b牢?'\u0014\r.\u0005=",
+                    "value": "阬y\"J!>'􃳬}/Y􃎓?󾐈𑢠󼽎崡\u000e‿\\=莶I𘐯`~7"
                 },
                 {
-                    "value": "+IkzzeG:&\u0008\u0019l\u0015",
-                    "type": "JL􆥣'\u0002N\u0000i\"8%`\u001bmBk74^𩄪j\u001c𬘰\u001aG`ZW\u001c"
+                    "type": "JL􆥣'\u0002N\u0000i\"8%`\u001bmBk74^𩄪j\u001c𬘰\u001aG`ZW\u001c",
+                    "value": "+IkzzeG:&\u0008\u0019l\u0015"
                 },
                 {
-                    "value": "CS)붯_\r",
-                    "type": "ՙ𨌮4:𤘄t97"
+                    "type": "ՙ𨌮4:𤘄t97",
+                    "value": "CS)붯_\r"
                 }
-            ]
+            ],
+            "version": 0
         }
-    },
-    "urn:ietf:params:scim:schemas:extension:wire:1.0:User": {
-        "dG\u00142쩞>+\u0005J\nxE": "b\u001d􈛚\u0007𗡡5\u0006r;jN塀\u0014䔀\u0003",
-        "zk𓄈𠐌s`AJᾅ=R\"AD\u0019\u0007rk_𪲀1\u0007u!𤿝$": "&𩵚:\u0001\\@\u000c􉏡몖C鬼8*􄳿\\y<",
-        "\u0002􄶌)T𞠾\"6": "󰗝𧴆bIB@\u0016\u00125홶\u001c\u0019\u001by\t吐b",
-        "JL􆥣'\u0002N\u0000i\"8%`\u001bmBk74^𩄪j\u001c𬘰\u001aG`ZW\u001c": "+IkzzeG:&\u0008\u0019l\u0015",
-        "!i": "-j𫈈,愡\u0016#\u0006􄜒G􌬅\u0010㶃\u0000",
-        "􄋬sR𭚉\u000b牢?'\u0014\r.\u0005=": "阬y\"J!>'􃳬}/Y􃎓?󾐈𑢠󼽎崡\u000e‿\\=莶I𘐯`~7",
-        "\u0019K9\u0014'`zu~\\𫖲X+\u0011𡛂\u0003\u0010*0\n殟": "y",
-        "𪋷?": "𖺓\u0019\u0002\u0001\u0015T󲯖帰`􍜐\u000b",
-        "^8OeZneC": "\u000eD\u0007󱧲󾢏H䵕􋋰􃓙Eh󳀤G\u0012mp瘀",
-        "I𬠅z𫛕$\u000fGf&><h\u0001𡟟\u001bZ􌲇": "Gw\u0006\u001f𮎹\u0019􌷚\u0002md\u0006\u0001%_mS=󷋕Z",
-        "E灗\u000e": "􁟡\u0004",
-        "\u001fE\t3\u0015$󺈆X􆉑𐡥哉􂻋4\u001b=QU\u0016%#􆍉%hT\u0004󻲗": "\u001eZm3",
-        "Et\u000fz)\u0011\u0015|mp􎩉\u0006仓󳛟\u0011v𨄞\u0001]\u0002": "euR\u0004𠣔KC\t\u001a婏𢖨𒄙M\u001d\u0006P0􆎿o\"j",
-        "ͦ\u000f4𪋱\rN*\u001euG\u0013\u0002f\n\u001b𦄜\u0003\u0014􊺿𔔔󴸞W󺜨": "\u00053MꙄ􌲓\u000ck𬉼\u0018🦁b>e\u0002 XKB咑{1",
-        "ՙ𨌮4:𤘄t97": "CS)붯_\r",
-        "\u0003󷌑B": "\u001bnd\u0015\u001b;Ch셇d @\u001f\u001c􉳊}17Hb=x􍗁⠱\u0017",
-        "T\u0010\u000f9􀡚\u001ds\u0015\u0015": ".\rᎣP\u0019s󲃇"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_1.json b/libs/wire-api/test/golden/testObject_RmClient_user_1.json
index 6e3249f0799..9a86aed61df 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_1.json
@@ -1,3 +1,3 @@
 {
     "password": ",b>\u0015H'𤘧𫿊Q\u0019\u0019𪻈{FX𧉞\nu\u0015Z𫗥w󾦍Pou􌘊WkQ󼉴e\u0002Wa𮆑\u001c㾬W󴎂P𛁲J\u0017󱙝J\u0019𣫥󰲀M􍴙t _𧟰􅮴~{.𓊆u􍍨\u000bCۉ#b鋒<🤠𨹝􆼫鄖\u001c?n\u0006e\u000b𨹅\u0019h󻳍\u0001m\\T8tX3b󹐆C$*􎧵++|ln|𨴟s\r􄰢嚠K5d剞| Vtꧯ𤞊"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_10.json b/libs/wire-api/test/golden/testObject_RmClient_user_10.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_10.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_10.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_11.json b/libs/wire-api/test/golden/testObject_RmClient_user_11.json
index 29eb491fbc4..f81c2ba8f7c 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_11.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_11.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0017\u0007'\\@)m􂤃\u0019^𑨉󷻵k\"dx\u0017\u001bk\u0007\nh\u001f15\u000e\u0007k餑􇿘\u0002\u0003\u0003e\u001cgPVGxoq~𧏅m?􊞂pf$$\u0008wW\u001b󺭊𡤳6𡱝([$\u0011󴳇\u0010􁐵󰷌G_KQ.\u0002;\u0018󾂝Op󽶁\u000cz娂􏓍^󲒘\u0016FZ붚$iW𪡢\u0018MF4SCdf𬵎'\u0019vO􉨟𐴈Fg!a5=&\"wGT\u0003\re𧌾􄯫􅐢I\u0000Q􇪞W}\"iI\u0011󶩅GW󵳶bn@\u0006マ\u0012U󳬌ࡈ*0\u0019􊅊-\tH󾄮y󻧐S󹥋𬕯󠀷􀛳^𣅈Po\u0015C\u0010G􊮠0\\V𡍛\u0010?\u0010%󾅒𓀋\u0017<t>𮡗'H휕;v>+w4\u0019𮓕L󿖈73>z􌬁\u001d󿢢C;m\u0007#􍉶F\u0004eE 󸔆7S;\u0019\u001ac𗗗ᖯ𢣝-ꆿ8Rwm\ni\u001f𥣌𧠸(k[Q􉪻J󵧝\u000c>5#𫜛\u0013>󴗷󴉸vL|𭴖#𫒛𥭺\u0018h:⛷􊃴𘏔\u00014H\u0005Q𮧈*,;k阠\u000e󵱔\u0008\u001f䘢􇁫\u0010\tGL8J影Al󶼼hg𫐹:\u0010鬮{g􈩦\u0007T􎣗o]|􇣟M􈓽+󴡷nf8m㩰𝦗\u00104 𥪗jI􏳏]\u001c냷|3i\u0013解#🨕A􃕙i{𦈏\n2:\u0010&p鸶􈉙#59󾻀:F肧誘y^𥑙07\u000b?M\u0006\u0008HŰ偤}Xt;\u00050C\n!􇃶䪅𨸒O3o_\u001b\u0002NbB(𠑀󸞠W󸣛HA􉷱𨉺F\u0014N􂔵=pk\u0007L⾐8~b1\u0017%J\u0010m󲊇𝤄TI􃛺\t\u001eM<1 U剀-7Wn!w􇓅\u0013\u001a \u0010\u001djx\"`\u001a􁯧\u0004]tc0]\"Lk􊆥\u001c䛹\u0002.uO\u001a/s󵫖3T\u0006󶟗.^􎭱D􁪺7Ic􌆋\u00160,;:M:G\u0017^\u000e.􍓰\u001a􀢢bᜑ抛'\u0000R\u000cgy\u0015蘎\u0004\u001d\u0003$𡞑*\u001e|皈\u0013Tᖙ\rWY(1&8\u0013􄔐𦹄\u0016􉡤􏻆\u0016]JC8#?\u0005qtkp*\u0010j\u0016􌅖@\u0006LzE&\u0014𛋫/2jBel|B}\u000fe𮝢vM-󸴏\u0019Y+\t󷝶J𩠲G􇓷y\u000bm󸭙&\nf\u001d􍐯ꁓ\u0012DꮪA숃\u0008 .w\u000eg󸔡󴣒?'0굧խ\u0018O􇂹齅,𖦦󷊇\r󶼻B􆋌$𡗅,\u001fGn\u000e跂\u00020Q􏋣5\u0000N+a\u000e&SQ躘R𗪑efu􆏗E􃡜𑂸\u001b\u0012cb\u0010\u0018snz찾󷴌_􄓓\u000bI4􎓰\u000b7\u001d󳶞\u0015\u001d󰺬󳷶􋝱􀋨𡖀NT𫔷8NP嵻M󳯻}L\u0017􎒆\u0005𠩪\"-\ri+𧱡\u0002􄥕dYK】gNI\u0002\t􊣰r󶙞p󲂳傢k,+􆶯cJU\u0006c2𫳏d\u0013\u0006\u0000\u00170􍤬\u0001꽈t\u0010Ứ;L\u0005𠴿󳷍4\u001e\u0008𮊡􇋂\u0001h󸨹\u0007B\u0011J宁Pz𐜃d𭲸p憏\u000b )<!䒼펖J\r\"ﵼ\u0016t\u0019D4Fx\u0006( GEZd􍺡Rf𦿅𝅘𝅥𝅰CH?/O\u000eU𬸏긟!t\u001b&Cw^G_\"\\;\u0012𖡅W\u0013vC\u0003)󻂧l2𣩇\u000b|g6󷾡鮱\u001d􀆘*QC􆞽k9R𥮞,𝄱𡮤18ខ6i\u0005􏯵;u𑠂=󸐧z󱡿D𭢄M􈂁𡑓\u001b(\u001d󿛐~w)\u0018l\u0001+􍊹\u0001tᰬB\u0017\u001ef\u0016)ku󴘺Z\u0015$􈵩h\u0012󳁟wbW󺦧w󺁹<P\n\u000b\u001a𘨤nTE􂋎?6\u0006fBnf\u0016𧟨󽜰𑍂y𪨴"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_12.json b/libs/wire-api/test/golden/testObject_RmClient_user_12.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_12.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_12.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_13.json b/libs/wire-api/test/golden/testObject_RmClient_user_13.json
index 5814a6b1f90..138be8f6fe1 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_13.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_13.json
@@ -1,3 +1,3 @@
 {
     "password": "𬎴󿴩𬩯\"𣇥;r𘁙e\u0019=km-y.𑚯\u0015ZZ󴪲]0\\2𢸒[I􀳒峏r\\#m𠇎^|q\u001e|]L𡶞𢒄_~jLFMlz\u0015󲠄4퉢󾋉󳣾)\u001e\u0006\u0013x>.\u0016𧾂\u0015%󸁇ﱑ󴷖􃄴\n󺗝oe󷂶\u0002;\u0019/\t!il󷈘O\u0007􋼺r-BSLX$8\n\u0006BF$e󴠕\u0018r󸕺\u0017𬬧\u0004q󳇮nrqAeT;􌦽⢾%7\u0010\u0015vP*pJ'觐Ur\"y\n\u001a\u001c讼𩪲q󹾿iW𒎖j獺\u0019XPv2\u001a8V𒑆Y𭅣x\u0015ﵬEfH\"9􉾡<@𢦻>\u000c􊫌𗿴}QO6$ZI\u0006\u0007\u0016xLa􆍴\u0013qwGZx\u0013&cc􆆝\t?󻜥􃔐S\u0012xNC(:\u0005\u001b!:52=𢬠:,' 𓎨\u0011`GHZ𫯓𧹕𗵏\t薑,\u0016=X􍄵;x封(iT\u0013𪃙Ni.\t􇳇0L0\u0002ln\u00155b?!\u0008􏩞堬𦬗r\u0005󶾤\"G}\u0012\u0010𠢱0\u0014\u001cU𦿚"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_14.json b/libs/wire-api/test/golden/testObject_RmClient_user_14.json
index d388f45a59d..f5a6f4e651c 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_14.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_14.json
@@ -1,3 +1,3 @@
 {
     "password": "JS,)\u0007pP&^\u001f\u000cP\n{\u0014bwQPl𢃌􋜥*`9\\\u0004\u0002D8\u0018⧷𤋣󵣘,𢽀󵠡&@\u000f墐2\u0012🕽'U=64Z<ﭒa\u000ce璥U讍dMJ|\t%?\u00071𒃴;\u001d𮤣d\u000f&\u0006jgC󾛕\u0003WP\u0013ZNοXv𡡕󼣴c\u000c>􇠴udVB􊴐A}RHF􎺻\"𞴦S\u001e9󰠺g➢y,󺼙Q7n\u000e􁴓\u0014<􅣚-\"\u00196겡Yq\u000b󹭺6䎬qN𤯊\u0019yV\u0010f\"xt􅥲{󷌔~I?\u0011Z\u000c𢩫OEz􈞁JGdEb􌰱C\u001a󻚪𩻚v􋑔𔖊󳁬4䥀{R\u001c:\u001d\u0005A󰣓􀓿+5\"𦸡VxN𠅎c|\u0001𬄏O􄭱􋦥𬏇W<𫚽{v)\u001d\u000e脒b)\u000b󱳥騏\u001b{'P4\u001e𡜏yu<t+SV2-\u000c\u0005🨑2󹼂^%\\x\u0002?]OS\u0017󼎪𦴩bF\u0001\u001c󶅉e-厩[\u000c3o𒋥*𖫚Q:\u0007v\u00009U􇨥\u001er5󽿕Ad\u0003\u00052\u000b}E󿕧JQ􉎙u𦽾\u0014\u0016\u001b󻯨𠕽󽲩􋄝49b\u0012D\u0015묄􂶐 vm4\\\u000eO󸵓𥩊[nq씲\u0007+󿇝\r-{L󻺪lꝊl-􋕜H1V晁\u000f􌷁\u0000\u0001㱈􅦜􂵶\u0004󻉞W\\U\u000e#%r{󻓍\u000b(\u001e\u0017{/GA\re\u0004W2 vJ5􏕒+Ux𥷵𥓎\u0014󼂈\n$\u000cL􋕤c𡈺\u0005\u0019\u001eYM椥󳩹m􉛑N7P,`yk\u00046%\u0003ut=3?\u0008𗫤\u001b􀇔(E󽻲bGR􌮠𦇧/\u0018󶻛v4)v)𨧹 𡶬\u0012W\noQ\u0017\u000f=n\u00033>\u0003(X+1&􎔨5󽉈󱗂f🗦6/{􅳫࠺A\u0015#󹙗^󰫑\u001a􃅫\u0019~{f􅝅􁽻\u000eE\u0001VF(&zL􃍌f@~졠\u001b7V\u001a#𧋝\u0014\u001dq\u000bd03\u0001oX6􇑴\u0011\u0013􋲡󳱿󶹜O1\u000e𢨲䜏\t;\u0013󼜘\u0006\u001d9𬅣eY🍫D~􃪢c\u0019\u0001n󳣣\u0004󴕴Y􉔣k(\n?n\u0017?󼔒g\u0001K;N󰴺9\u0003󳢫耓􌹰𭳨)쫲\u0000\u0015𦘫\u0016w9b󶩲@h􌟳)\u0016Y􍹤𤛊2󷙋Iv6!􉋑\u0013Q\u0019Aq^BK\u0006Ohm~g\u000f\u0008-35󲯶H𤽆V𬘞\u0005\u0006\u0005\r\u0011𬲚jꞸ3\u001c𦞡(𤙦􌁹|CCꨕ󳝻z%𮣟oq<}𪯒󴋮G}\u0005󴪿 \u0013\u0011o𧓣Z2-⬃[h\u00044#>􄝫Mn\u0007R\u0005y󵫳j\t\r􁞞s\u0016𦯽􁏯( 䔤B䛭@L\u0010󴉟􆞽🇼Z趯pDf3|􋸲T𨷞󾥲E\r\u0010\u0001􅋚𪨎녜\u000b15eR,\u0006 gQ%fhE𡬇-o􍄤(J􄛎knt\u0006󵙕[O\rx\u001e\nﳣi􌬋𬪣tQ8핑3`;\u001c+􌕶鎐7?$o󻼃|𭛫\u0018𡿏姿Z\u0012[\u000fv\u001a\u000f\u0017\u0017R8𝣒z\u0011!H}!\u0019L遅𩫮J\u001b𒑌%k^􊱿B󴽇/Efm存Gv\u0018{"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_15.json b/libs/wire-api/test/golden/testObject_RmClient_user_15.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_15.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_15.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_16.json b/libs/wire-api/test/golden/testObject_RmClient_user_16.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_16.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_16.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_17.json b/libs/wire-api/test/golden/testObject_RmClient_user_17.json
index 496eff7c22b..a897a43a9ec 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_17.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_17.json
@@ -1,3 +1,3 @@
 {
     "password": ":^􃴣rW]𑗇[C\u0017th𪉥c\\i%Bh62xX\u0003󴼛7􉴚󷸢\n\u0012g&\r\u000e𘃽U\tܹ𧜞􉇜>􁆏Qk,$i\u0018aj?厪󵢎^𭛎\u0007lB󽀻Y2Hj󹁩󱶬嫖1.d󶘙}$󻼖󻞗Wg=HR𓉖ev$\u001b\u0007𑴴󽥖ㅹ🥈5\u000c溕􀰍v󳓈X0匕J+틠;\u00122l#Ikr3\\\u0015('HA)q_m\u001f?zDcx4𩆌1y𤡅m⇢𪛔\u0019cx\\꺧\t>\u000f\"3\u001d\u0002𦡴;DtMbXu녆􂈤!1Z咝Y>5􅻵9\u000f:̖_$}\u0019H\u0001y/\u0007jc=\u001eof?0\u0001𦪍𫞼zZ\u001e-\u0013󲴇2<5\u0018H🄽𮫖j𢋂8/A#-V@IgQ󻎆\u0002qNi%I).i\u0012󿃖'y~[\u0019,럡o=\u0010c􌣫i\u001c0󴨊4RA<S7]𦮲NY#󿱫1/ﾺI⩺ꅪw𐚝𠤆\u0007g\u0003XHF;^]\u00106\u0006\u0019;󳜰*\u00195n駬3Hg(E*F3e4\u00107v\u0015U)s\u001bTt\u000ftm_􏅡啜d,𓐋[S[`􌧢𪽢Q󴅪􈕳\\𘫁9B]f!+q\u001d(-[I\u0004^F\u0001|󿉲\u0015,4󾛈\u0013;zuy𧏩󱵔K\u000cUD􃙵𪒒𦽬o\u000c`X!󷀐5􆕆Y􍟶j󱌤𥐂mG󼼗.\u00087fB🞦T{2\u0004ab8V#!t\u0007qh)vh(T\u001aj󶀞Hn󵐎I\n𭿭*R噿d\u001a&:\u0002FW\u001e𤧧􌑞2W󱝨,31󾁸􏆬Avਰｓ󸥺d\u001byVO\u001b􁎔u𔖻#(5(e\u0001)O\u0002h,Ig\u001eC\u0000􉙁=#\u0015󿙇Kt䕝5𐮑𞄸cp퓏𥸾\u001b`󿭣󾹡􏞙󲶒O=P󿲤\u0011Q\u001f\u000f\u001f:t)Z:􄁛]홅󳏶𒀊j\u000f#J8m\u0003#Xn󹗠y􋉳u/^7d3$󵝜\u0017.\u0019^k%􍟉\u0017\u000f\u0013o\u0001'\u0001\u00038LJu􊈳ﻳ93\u0018-\r诸O⍳\\\u0015a\u0018􁸒󾴸𬽊!\u0003`󿷽<\u0015\u0011\u0018O 􉚚\u0012rZS);t\u0001QCJ\\Ue\u0001S\u0005*􁨪\"X薆bU0IF\u0000⩗\u0012\u0007h,󾋝m.L[𢶓f􏬲\u000fmv𪸿󷋏筴}v =𔗍E~\u0003􅍯Y\u0013󸋴𗤒e+\u001d\u000f,r𫔧~k|f􃂯􍞚􀘓鮕\u0016\\o剹\u001a{􈴆ᬣ􆡪,󿕼CJ踠s𥾷F󰥤te.|l\u001f\u0005:\u0019Q󰜘d6􋦖\u0008𬂐xO7<I\r~{S\u0014U\u0004Oi|\u000e^5\r𩐱}re1眠􀌡lWs&"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_18.json b/libs/wire-api/test/golden/testObject_RmClient_user_18.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_18.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_18.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_19.json b/libs/wire-api/test/golden/testObject_RmClient_user_19.json
index 779a340ab18..b80105d991b 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_19.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_19.json
@@ -1,3 +1,3 @@
 {
     "password": "6@󷗯q\u0014󳽱mcj𒈋\u000e\u0010􀊀\u0002Z 󾯔> \u0001Nx󿄦5`6P󰠭𥪺/l󼹢A|\u0001@}\u0000!R7*􄩾Y\u0004\u000e>\u0004\u00004𪿐\tQLZ㧋\u0014𨫏\u0016%󸸁x󼣐%\u0002mRk=KI􃒘󶧉\u001b󲈓\u001f\u001c𨰕\u0004󲹲<>\u0000Rt\u000ev􆍃𘁗\u000cSl7썒𝣊 U_\u001c􉐭FY+\u0005Y𭷨􉁄QVuo]bH矨Z\u001c䵳䗡p-^pD3\u0014ZH\u0015G,t\u001cU\u0010q:haf@􋽂@󸜼JsNQ\u0006􋃃7\u0001f\u0010􆆶\u001ew3􅱟\u001c𣆐tw𧤄Su^h󳃂 􆏫ᦔ;_\"𐴶=\\U𢀀+󼜏1\u000b􋙛ꮣRl𠺦-u;\u0001T\u000e\u0001y]a󲦜𤜕𑗐p5&ub\u0000\u000f}ѓ󹻂󿐲𬟑\u0013(m|􋜈󼗦\u0011\npQ1􃹷\u0014NH{;@,Y\t\u001aRi8_]\u0002󹃐󹨉􄏈󿝱\u000f𠸔0E)1F󶲮\u0012𦪋H\u000e\u0011􍀄瀲𡆦i𠱦c'O󴮈\"憤\u001a S~)󼚅྾&V H𪍆w'𮃗-\"af\"8A pXN,a{sVN>8;Z󳇔𤫪/\u000c/\u000c𗌽\u0013e뷥\u000eಾ6wH\tl&\u0011H󳉀\u000c\u0018\u0000`\n~\\𦮦1\u0001"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_2.json b/libs/wire-api/test/golden/testObject_RmClient_user_2.json
index 9e561d77994..530c9cf0ce2 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_2.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_2.json
@@ -1,3 +1,3 @@
 {
     "password": "|镋𣪽􍦐𐦡󵸶cyJ\u0011/1W \u00083}樣O&\u0001?2\u001dbT𑃘OEg\u001b\u001e$phd􎂉"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_20.json b/libs/wire-api/test/golden/testObject_RmClient_user_20.json
index 686eff2eb5a..1a7f010b6f2 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_20.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_20.json
@@ -1,3 +1,3 @@
 {
     "password": "\\𫻒\u0003􃯄gq\u0012\u0018𥁤=䮼k𓃂󵫛\u001ddPY9𞺮􆣬\n\u0017s;\"\u001fJ’\u0016}s\\𤤟\u0014󶜿W􄝵\"h􀗝𥪿𪠇&衬\u001c\u0013@\u0010\tpC!\u0000j󼖾\u0001긋}RsW󴵄[ㅅ)\u001cTy<\u001a\u0016\u001d􍆖g,[􀍖A𒊵c8g\u0010(g쭞G%rmt󲑨󷣓j\u0017\u0001󱬒􏉚搚𦼉N't\u0017)[d\u0010)T\u000e=䣴\u0006\u0014L~r󼛙;I$z󳓛XI(ia5]C=\u000eOk(85\u0002\u000eb&V𧴯;텤UIHhrO`\u0015vpx\u0008[U\u0003􅫲*\u0007z􋇜\u00147>xS\u000f\u001eU\u000cU\u0016&𥰌(?Ju\u0000􆭋6Of)󶲨J挻^𩶞𝧳(\u0014\n\u000b𪋎觝#𘊔7跒_\u0004􌱍%()P\u0006T7􈵭g\u0012Eq𫧗󶮡ZGV+𗾦K\tl􆣪󲔨ej𣾯\u000f󵤬𫔖k9Y:\u001cI{𧳣WHD𩞛4<6\u001c/7\tM4Js6𘛼𦄔7Wo+7䖛S\u0010d^f𬽶?\u0014%쒨􎪧\u0019o\u0008mR-j𢮼GE\u000b#Hm%j\u0019}~u\u00003e\nn􃧯_t5[󲴮By\u0008n,\r𭴭\u0016\u000bo𢱵[𗺵$:5󽇁+!\u0005A2UL4𩅩`𬍬3󵽔\u0019%\\\u0008󵝚T\u0011\u000c.𑱧wK~\u0011^~𣃔i\u0010\u000e􇿺\u0010b\nz\u001b絼6𮎜𗙶\u0016玚9\u0008X\n=j.􋆋\u0007)BB󸵅󼯈\u001cD󴖶jw𪽋3[LhSu)𢡛Ko!\n\u0018y󸋓T\u0004A\u0003𘋖Sm'􀁊,幢f$\u0006汕ӂN_[*􆤵𔐲\u0008\u001c\u001a:󿋵N󳲪ay\u001b`󰌞d\nBy􉩨Hn\u001f3?𮫈𮛺r'L\u001e*[S𣚏o􃩖i\u0002p#w^;\u0011x\u0005S\u0003(X\u0011e>󸯁+M.o[􍮦:[N"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_3.json b/libs/wire-api/test/golden/testObject_RmClient_user_3.json
index 879289d07bd..a475d0503a8 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_3.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_3.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0011C$\u001a&☳ 𒓷m?Ao_i󲹜5|(𒊅󲤏􇬇\ry廉f\u0019𐡆󿴘𡚒󴽙L􇶭yJ.𬟑8\u000f!.\u0008ck􍮋p\u0003𪐥\u001b\u0006媹Ye󶃁\u001e\n󰣗𬻉𗑊\r𪶁􎡇D\u0014Q,''\u0015𧉡󳃃7l𝝏@A􊹦􎛔Dd\n󿤦󹸧f󻕮p.N\u0016󳫟\t\u0007^󰸷R\\<𥯚q o~􋚔=zN\t*B𨵩-x\u0004𮚰\u0016-\u0002V\u000fHbXi^\u0011􋴆\u0013N\u0006PMu(\u001b+VW5_H𭍐\u000eG\u001e\"H`F0󵝐A\u0015]𒔖\u0014\r𗃘◵kqk\\IV􌋠ᖒ󷲊-󵞧M:'6C*𩆨𬧷b4C@\u0011co\u000e\u001a=껆􄼒vV%\u0008M\u0011l~GI􎰈\t<ﯹ\u0014.Yጇx6{𫡋󵅠\u000e󱴴􀐮\u001d\u0010i󹐇\u000fG#IDo#􈢻𣴃T𖩛Y1𮥁\u00033U_ᐾ,GND0xT\u0004\u0003bT󽜻=󹲀􄔢a\u0011\u0013(o󲿧~e\u0011\u000bnj𖣈\u000boU\u001b9󾊝\u0006P%󺷏M`KT𗇻Bp5m%Gd\u0008?M􎣳\u0019M􊽏W\u001e\u0008d\u0016\u0005].Jj䭇.\t\u001f𦪁k𫑆%5.W󵶶dwbE넞tlAYC8?󸪊r,\u0008\u000f:\u0002𪄃A․\u001e\u0011,􉠇𣪠-z􏔁W󴠓b𮮾𤃿\r\u0002L𘨫\"􃲔4\u000cK𡅼B\u001d𞢹>󰵑󰁬!j􇁃\u0001\u001b𧒭YN#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_4.json b/libs/wire-api/test/golden/testObject_RmClient_user_4.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_4.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_4.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_5.json b/libs/wire-api/test/golden/testObject_RmClient_user_5.json
index 8ec779b1e36..4f3ea1cbd74 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_5.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_5.json
@@ -1,3 +1,3 @@
 {
     "password": "u\r\u001eKc\u000bwqO\u0011\u001b`\u001c^T\u000e𓆙ଶ,\u0015]:𮘿b{ㅶ\u0005>󷌮퀑wv\u001c?\u0011Y]\u001dJ4>𧓻🀼\u000fDt\u00157𤕋G\u001dL\u0001I~?𥖦􇥴M3𤻓𧍻Q𣫦𡚗𪯐j/d\u0014[\u001dh@sX2\u0010迖傽\r􁟤n?\u0015X󹔈:\u0015:S\u001c%4󴎥󹲕􋉏泪\u0000Fv~2\tdY&􄲸{V[\u0013Obྼ􏴨Q7𮘍xR*y8B!Z+1s<f4\u0014󷅢F\u000cJ@𮊅?+O\u0014r\u0001􅫊O\u0013b8a\u001e𬴝#\u0001𣛓쳯k􊺾\u001d𪮃\u001d>}􇘚\u0004\u001b@􂵮􃳅9􁑆t\u0004\u001e7􈔆-.\u0005灒\u0001󺋞m\u0019u\u0011󿒓侾W2C-eXl󻛶펀L^X\u0007=E󳐰'󹿟Kf\t󼬦[6􄤷Er4\u0013􄫦󼞪𠽖0󶳷'~ri􀈇6fHra󴓗d\u0010\\跦U􎴁􀍚󴐇v􇨹S\u0003\u0004渝\u000b쪤!*cU^>~~ꃬﰐ~F[ EA~6Ff􏡂FP/𛆨OAa餴6GY8*C%\u0004􉥨\u0001I\u0015\u0004Yov\u0002'󹼜\u0013\u000f\u001c{N𭺹\u0013}eIr\u001e＇Ꙁ\u0003\u0018N%\u0019v6柟刹3S\u0004\u0017f c츫r𑑕d"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_6.json b/libs/wire-api/test/golden/testObject_RmClient_user_6.json
index 32b983d9821..9358c639b55 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_6.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_6.json
@@ -1,3 +1,3 @@
 {
     "password": "f􄸸mj)𬵿P󲛥\u001f􇩡0sc\u0005𨷮\u001cf,쐉\u000f󱖿󻾐\u0000zRen)+.7O8\u00128ⷘ8z1𡟠<}oQ GLfC􌆍\u001a􎩱\u0005Hc𫪍3Z7+\u0018Pg|\u0016~󼧤@>8.E2𤖴"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_7.json b/libs/wire-api/test/golden/testObject_RmClient_user_7.json
index 7a36a3961b7..466ba5326f7 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_7.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_7.json
@@ -1,3 +1,3 @@
 {
     "password": "𥃳잋9_󵕕ETt䷀\u0010󵢪+𤜣CE􄚐c\u001e􀙨􁵇\u0007\u000e\u0007􈫧?󳅇i􀈳o\u0018h9\u0008F,{𬵸xd'F\n𨬌dfh얲z􄤞\\j滉\u001e\u001e?쩄\t\r'\tN5'j"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_8.json b/libs/wire-api/test/golden/testObject_RmClient_user_8.json
index 72abde2a2c9..ab7dc8fd5f6 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_8.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_8.json
@@ -1,3 +1,3 @@
 {
     "password": "\\k\u0002lDk𩊽&2M\u0008\u0013$gY\u0011痡\u000eGN\u0015󹋤렩\u0005$\u0019p\u001a>\u0007;2簝D/VktO\u0017𗉂F\u0017􃨇𢑉tGN\u001ej􌃄H󼊳D?􋻁}>⼄w􊔨\u0003t0𝜥n􈦣䪵+@I𬕤x\u0012𢁴jaoz'\u001dP\u0003𠒆|\u0017h3\u0004𡰰r?7\u0012($􁠩\u0016@䙝鬖>jL􉅑4𨒴𭞑\u000c;\u0013QO􀥾⛒G\u001c𦷧T󽅣=4󳛱𢙒𢿤\u001f\u00067⪷`󺢤H#\u0010bvb*\u0016*r\u0017\u0018U&7'𗮀N𠟖𢉌 4\t􃤅YJ󱶸R7EJ'Cz~\u000b\"Z􊹎􏔐鄼\u001c6b\u0011틇􈴰𬍕e􄟣\u0003M󾴅t限[vg􃚞c,h&\tc0bm󶓜=\u001fr\u0016'0\u001d\u0001\u0010`\u0018q\u0017/s􌔡𦩙\u0001𗰬\u0011@󻸟󼕰P揥􏘺횖􂜐FH𐇻獴\n􆨛󳙵?\u0015\u0002\u0003RE3\u001c\u0008􃨸2􆜬uH+q𭑖\u0015b󳅘5\\U_\u001d\u0004,=\u0005\nR餉󷡙􀴲Z;Hg󾽸!G\u0012VUR9L􊕹𦦋d(\u0011[s)wo6/3{\u0018nxbq\"8􍳎;쎿􈎷e󽺝3Y󻛘d󹁚\u0002>\u0015RH\u0015𫂰\u001cn𨼔\u0016.\\|􌙢\u0018L!H'\u001b:󻧄􎮅𣉨󾱷Z\rs\u0016rN腞5f󱒥s\u001e2𤡓􅂫𫒓􂌷󹳀v`󿕠𢝠/\u001b𫇍,dȶuG󳋫󺋤\u0005𝀜󰝭.uii \u0019L\u0018\u0007.􊫶𡞘Pl𝐳HK&\u0003_4𗆍\u001b\u0019qW𫣁\u001fUM\u001ba\u0016\u0002\taV𨕾g󷘦訶󻙇Oz𫛋c\u001e\u0011\u0019\u0004Z>:#L\u0010\u0014󺿴.+_\u0008h攏`B!}ፐ\r#𠍬\n;.𗽻3+E\u000b+󰯆c3h@𨄜j\u0004l퉝2I㼲]𩇓󷼥+󿴉&\u0015󶰱WF\\󲱒𬎽7\r$e\u000e\u000f󹤾\\\u001b9^󰆽E|HW~<a􈡛\u0012s󵋶\u0008bAl\u0005𡝴풰\u0004RyrI?m􇦐泛􋃝,\u001f𦤸7-E􅮵%H𫌋K\u001aIm;,BⴍGtk𨶥^ૉ?\u001dksd󴹫w󵲵\u0003-]􂀇;􇝃6􄇱q-󾒷|𣺙p3{\u001f\u0000\u0006𗎞\u000by0𣅻𦨸𑅨􃧙𫍕L쵤􆘍󱢖f\u001fD8+萮hy󿺳Y𧴻􊰦6co7G[\u000c\u0012@YY丵|{e)\u0019󵿣(V\u0001kw\u0012􊗘𛈼脔]󰅯\r\u0003\n\u0014L$&𡍶r\u001bJ6􆊼!𣂅z􍘞XDD+y􉛳\u0018u󿁹[]`P\u0001\u001c\u001d\u000f󱞨,W􁡏S𠠉qjB\u001f]7h}󱂨󵄤\u000b%NDx\u0014􈔒|91}\u0018𒌈g=\u0016G\u0004WS:\rVs󲕌\u0013􂁍󴱫Z𮞬\u0002Tg,󵉜\rbNw𐂿\u0016\u0014󼌗\u0003㊷☱5\u000bc󷒷|\u0002z\t>*b󲿔󷷼\u0008B𠡖󺇠(\u0010磓\u001e󸇏\u0012"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RmClient_user_9.json b/libs/wire-api/test/golden/testObject_RmClient_user_9.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_RmClient_user_9.json
+++ b/libs/wire-api/test/golden/testObject_RmClient_user_9.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_1.json b/libs/wire-api/test/golden/testObject_RoleName_user_1.json
index 78c1407ff6e..1a9bb0736ce 100644
--- a/libs/wire-api/test/golden/testObject_RoleName_user_1.json
+++ b/libs/wire-api/test/golden/testObject_RoleName_user_1.json
@@ -1 +1 @@
-"pbxml8pq27ntqg5b4_63mfi67f8840kpnvcoi06drb7qq1py8k617sly2sg8i"
\ No newline at end of file
+"pbxml8pq27ntqg5b4_63mfi67f8840kpnvcoi06drb7qq1py8k617sly2sg8i"
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_10.json b/libs/wire-api/test/golden/testObject_RoleName_user_10.json
deleted file mode 100644
index 83038db7d70..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"z5a6748jcjtxbd97waofvuc1towcsmi2giisptv423owfz22vl7wqt7oo0l95kx27kygctnr43284s"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_11.json b/libs/wire-api/test/golden/testObject_RoleName_user_11.json
deleted file mode 100644
index cbd536624cd..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"7q71wcd9n5m4yx6f3pyv4xtg29mf3f2"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_12.json b/libs/wire-api/test/golden/testObject_RoleName_user_12.json
deleted file mode 100644
index bc6dec64e95..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"nps2b9lcc14oue1ktuh90vl9cftwx8tgqqk8cs39b"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_13.json b/libs/wire-api/test/golden/testObject_RoleName_user_13.json
deleted file mode 100644
index 375a1f17c10..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"4fwlon_vim0rzhe8uwvqtgbibum3ujljee9jur3jknbwrupzq_2ld5uk3xew4usyfmx3hcbziuswy0bimwswpd1y8y2hrazpy"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_14.json b/libs/wire-api/test/golden/testObject_RoleName_user_14.json
deleted file mode 100644
index c14ed721bf1..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"udj29bnlfwiqzwc12do1gdsn9ea9_rvbenw7h0vpv9d1ko_9tgq2"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_15.json b/libs/wire-api/test/golden/testObject_RoleName_user_15.json
deleted file mode 100644
index 5ca81c2aaa5..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"1wtcnz0qyoixy7atn0emhqal_4vv0rqlif9oxv4aytxao2"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_16.json b/libs/wire-api/test/golden/testObject_RoleName_user_16.json
deleted file mode 100644
index 21f914763d8..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"sbko1kbw1amklw9dfwfba5etnsha9b9ox_fwcxw7yi_x5v53056jtpr7_h8m"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_17.json b/libs/wire-api/test/golden/testObject_RoleName_user_17.json
deleted file mode 100644
index 3014b952fe9..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"059yo35eotsfmktp3xvhhn0mr23gvkkbi6"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_18.json b/libs/wire-api/test/golden/testObject_RoleName_user_18.json
deleted file mode 100644
index a92f2a47ec0..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"8lvi4rvmzpv8z4vo2nytv5kz1iu85kzmofbqs5of4c6x_q0qc30_ozx4m0mzb"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_19.json b/libs/wire-api/test/golden/testObject_RoleName_user_19.json
deleted file mode 100644
index 7af713a869a..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"6yibyw2twtza6cleonm05dn9w0jruyblm_lsdbfmn9v0panffnjxoo8r0kp6itvqfll"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_2.json b/libs/wire-api/test/golden/testObject_RoleName_user_2.json
deleted file mode 100644
index c1bb2ed5816..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-"gq6zygi8btu9kwebf77kabsf7vjdnk1jm31z0kx9uzjc2nt1g2h4hjl6s3x3igg0mcccosd2"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_20.json b/libs/wire-api/test/golden/testObject_RoleName_user_20.json
deleted file mode 100644
index 202b3acdeb0..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"ee4_fwxwpe4y164gtg3h8q6ss22ocbgh3vv965avw9sfexzudgimyi34nbucixs7u7lo_b4dnlnc5yuzuo6x7ij5y66ku5j_u4vozp26mhi0tkq6qrz19_wshh"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_3.json b/libs/wire-api/test/golden/testObject_RoleName_user_3.json
deleted file mode 100644
index db2c3b05268..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"5wrzchlsgzn6w0xam_t_v6qjtssrwxpf7h5uhz5np4okrpmviv2u5srhr85wf7ymvi2_vrd5w_lc4m_nelecakrjecpfxsbi2uhspwrv"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_4.json b/libs/wire-api/test/golden/testObject_RoleName_user_4.json
deleted file mode 100644
index bb75fc96501..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"dnw29kl7bj6q6g492tkafzidc94re8c6evo042z54rqzlpm6yixqvpo_4artjd22geao8639htp_whsyplcsr4pme91zlevuby96b6us3kleey12d"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_5.json b/libs/wire-api/test/golden/testObject_RoleName_user_5.json
deleted file mode 100644
index 19eba948b72..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"nz9_bblydqr1sggt_2ynt"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_6.json b/libs/wire-api/test/golden/testObject_RoleName_user_6.json
deleted file mode 100644
index 4d24f6d3d83..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"tih5h608yyzxmecep1o8q8ylsjvmxmfk0i7yz32i88kh2coln056vh6uvl2512r2g0e6jtkhumjju2xh4si63fegxaf9dkjfx42ny_5fixbzis76c"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_7.json b/libs/wire-api/test/golden/testObject_RoleName_user_7.json
deleted file mode 100644
index c37ead72d46..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"zz5agzor7qxnzn4nivm65hquuz6vvugqsb3ybg5kz_m8hvky8nd7tinnmd1dicuhi0ptmkr3nmigsyn4dphevw67fo1e9xrs5k7r_ab26hc29pv3fl1m6vz0rp7"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_8.json b/libs/wire-api/test/golden/testObject_RoleName_user_8.json
deleted file mode 100644
index 5b9c5d512ae..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"uhdnvgyuhx3jddx13oedm"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_RoleName_user_9.json b/libs/wire-api/test/golden/testObject_RoleName_user_9.json
deleted file mode 100644
index a31719f5e63..00000000000
--- a/libs/wire-api/test/golden/testObject_RoleName_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"brwo3gw982sasf4pgq1t5rvbeb8qg4slg5gnon2fky1d1ttb601lnx2sy304dy9x2lo4ky1t43vyoonf6ibpsqb2j4g6acl1cmpn70k8ems"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Role_team_1.json b/libs/wire-api/test/golden/testObject_Role_team_1.json
index b0e898ad0ef..859b6c49bbe 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_1.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_1.json
@@ -1 +1 @@
-"admin"
\ No newline at end of file
+"admin"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_10.json b/libs/wire-api/test/golden/testObject_Role_team_10.json
index 0d82d9a9417..dd81e090b9b 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_10.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_10.json
@@ -1 +1 @@
-"partner"
\ No newline at end of file
+"partner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_11.json b/libs/wire-api/test/golden/testObject_Role_team_11.json
index 38389710c7b..322e3e3f8bd 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_11.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_11.json
@@ -1 +1 @@
-"owner"
\ No newline at end of file
+"owner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_12.json b/libs/wire-api/test/golden/testObject_Role_team_12.json
index 0d82d9a9417..dd81e090b9b 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_12.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_12.json
@@ -1 +1 @@
-"partner"
\ No newline at end of file
+"partner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_13.json b/libs/wire-api/test/golden/testObject_Role_team_13.json
index b0e898ad0ef..859b6c49bbe 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_13.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_13.json
@@ -1 +1 @@
-"admin"
\ No newline at end of file
+"admin"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_14.json b/libs/wire-api/test/golden/testObject_Role_team_14.json
index 38389710c7b..322e3e3f8bd 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_14.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_14.json
@@ -1 +1 @@
-"owner"
\ No newline at end of file
+"owner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_15.json b/libs/wire-api/test/golden/testObject_Role_team_15.json
index 38389710c7b..322e3e3f8bd 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_15.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_15.json
@@ -1 +1 @@
-"owner"
\ No newline at end of file
+"owner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_16.json b/libs/wire-api/test/golden/testObject_Role_team_16.json
index b0e898ad0ef..859b6c49bbe 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_16.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_16.json
@@ -1 +1 @@
-"admin"
\ No newline at end of file
+"admin"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_17.json b/libs/wire-api/test/golden/testObject_Role_team_17.json
index a2d0b042259..fea5f859549 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_17.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_17.json
@@ -1 +1 @@
-"member"
\ No newline at end of file
+"member"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_18.json b/libs/wire-api/test/golden/testObject_Role_team_18.json
index a2d0b042259..fea5f859549 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_18.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_18.json
@@ -1 +1 @@
-"member"
\ No newline at end of file
+"member"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_19.json b/libs/wire-api/test/golden/testObject_Role_team_19.json
index 38389710c7b..322e3e3f8bd 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_19.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_19.json
@@ -1 +1 @@
-"owner"
\ No newline at end of file
+"owner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_2.json b/libs/wire-api/test/golden/testObject_Role_team_2.json
index 0d82d9a9417..dd81e090b9b 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_2.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_2.json
@@ -1 +1 @@
-"partner"
\ No newline at end of file
+"partner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_20.json b/libs/wire-api/test/golden/testObject_Role_team_20.json
index b0e898ad0ef..859b6c49bbe 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_20.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_20.json
@@ -1 +1 @@
-"admin"
\ No newline at end of file
+"admin"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_3.json b/libs/wire-api/test/golden/testObject_Role_team_3.json
index 38389710c7b..322e3e3f8bd 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_3.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_3.json
@@ -1 +1 @@
-"owner"
\ No newline at end of file
+"owner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_4.json b/libs/wire-api/test/golden/testObject_Role_team_4.json
index b0e898ad0ef..859b6c49bbe 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_4.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_4.json
@@ -1 +1 @@
-"admin"
\ No newline at end of file
+"admin"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_5.json b/libs/wire-api/test/golden/testObject_Role_team_5.json
index 38389710c7b..322e3e3f8bd 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_5.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_5.json
@@ -1 +1 @@
-"owner"
\ No newline at end of file
+"owner"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_6.json b/libs/wire-api/test/golden/testObject_Role_team_6.json
index b0e898ad0ef..859b6c49bbe 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_6.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_6.json
@@ -1 +1 @@
-"admin"
\ No newline at end of file
+"admin"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_7.json b/libs/wire-api/test/golden/testObject_Role_team_7.json
index a2d0b042259..fea5f859549 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_7.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_7.json
@@ -1 +1 @@
-"member"
\ No newline at end of file
+"member"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_8.json b/libs/wire-api/test/golden/testObject_Role_team_8.json
index a2d0b042259..fea5f859549 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_8.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_8.json
@@ -1 +1 @@
-"member"
\ No newline at end of file
+"member"
diff --git a/libs/wire-api/test/golden/testObject_Role_team_9.json b/libs/wire-api/test/golden/testObject_Role_team_9.json
index a2d0b042259..fea5f859549 100644
--- a/libs/wire-api/test/golden/testObject_Role_team_9.json
+++ b/libs/wire-api/test/golden/testObject_Role_team_9.json
@@ -1 +1 @@
-"member"
\ No newline at end of file
+"member"
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_1.json b/libs/wire-api/test/golden/testObject_SFTServer_user_1.json
index bf278895176..957a0ccbff7 100644
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SFTServer_user_1.json
@@ -2,4 +2,4 @@
     "urls": [
         "https://example.com"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_10.json b/libs/wire-api/test/golden/testObject_SFTServer_user_10.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_10.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_11.json b/libs/wire-api/test/golden/testObject_SFTServer_user_11.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_11.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_12.json b/libs/wire-api/test/golden/testObject_SFTServer_user_12.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_12.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_13.json b/libs/wire-api/test/golden/testObject_SFTServer_user_13.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_13.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_14.json b/libs/wire-api/test/golden/testObject_SFTServer_user_14.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_14.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_15.json b/libs/wire-api/test/golden/testObject_SFTServer_user_15.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_15.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_16.json b/libs/wire-api/test/golden/testObject_SFTServer_user_16.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_16.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_17.json b/libs/wire-api/test/golden/testObject_SFTServer_user_17.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_17.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_18.json b/libs/wire-api/test/golden/testObject_SFTServer_user_18.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_18.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_19.json b/libs/wire-api/test/golden/testObject_SFTServer_user_19.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_19.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_2.json b/libs/wire-api/test/golden/testObject_SFTServer_user_2.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_2.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_20.json b/libs/wire-api/test/golden/testObject_SFTServer_user_20.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_20.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_3.json b/libs/wire-api/test/golden/testObject_SFTServer_user_3.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_3.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_4.json b/libs/wire-api/test/golden/testObject_SFTServer_user_4.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_4.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_5.json b/libs/wire-api/test/golden/testObject_SFTServer_user_5.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_5.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_6.json b/libs/wire-api/test/golden/testObject_SFTServer_user_6.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_6.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_7.json b/libs/wire-api/test/golden/testObject_SFTServer_user_7.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_7.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_8.json b/libs/wire-api/test/golden/testObject_SFTServer_user_8.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_8.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SFTServer_user_9.json b/libs/wire-api/test/golden/testObject_SFTServer_user_9.json
deleted file mode 100644
index bf278895176..00000000000
--- a/libs/wire-api/test/golden/testObject_SFTServer_user_9.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "urls": [
-        "https://example.com"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_1.json b/libs/wire-api/test/golden/testObject_Scheme_user_1.json
index bf3835fd338..87a72a09943 100644
--- a/libs/wire-api/test/golden/testObject_Scheme_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Scheme_user_1.json
@@ -1 +1 @@
-"turns"
\ No newline at end of file
+"turns"
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_10.json b/libs/wire-api/test/golden/testObject_Scheme_user_10.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_11.json b/libs/wire-api/test/golden/testObject_Scheme_user_11.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_12.json b/libs/wire-api/test/golden/testObject_Scheme_user_12.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_13.json b/libs/wire-api/test/golden/testObject_Scheme_user_13.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_14.json b/libs/wire-api/test/golden/testObject_Scheme_user_14.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_15.json b/libs/wire-api/test/golden/testObject_Scheme_user_15.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_16.json b/libs/wire-api/test/golden/testObject_Scheme_user_16.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_17.json b/libs/wire-api/test/golden/testObject_Scheme_user_17.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_18.json b/libs/wire-api/test/golden/testObject_Scheme_user_18.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_19.json b/libs/wire-api/test/golden/testObject_Scheme_user_19.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_2.json b/libs/wire-api/test/golden/testObject_Scheme_user_2.json
index c104d1b9c7b..34b95168b07 100644
--- a/libs/wire-api/test/golden/testObject_Scheme_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Scheme_user_2.json
@@ -1 +1 @@
-"turn"
\ No newline at end of file
+"turn"
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_20.json b/libs/wire-api/test/golden/testObject_Scheme_user_20.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_3.json b/libs/wire-api/test/golden/testObject_Scheme_user_3.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_4.json b/libs/wire-api/test/golden/testObject_Scheme_user_4.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_5.json b/libs/wire-api/test/golden/testObject_Scheme_user_5.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_6.json b/libs/wire-api/test/golden/testObject_Scheme_user_6.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_7.json b/libs/wire-api/test/golden/testObject_Scheme_user_7.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_8.json b/libs/wire-api/test/golden/testObject_Scheme_user_8.json
deleted file mode 100644
index bf3835fd338..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Scheme_user_9.json b/libs/wire-api/test/golden/testObject_Scheme_user_9.json
deleted file mode 100644
index c104d1b9c7b..00000000000
--- a/libs/wire-api/test/golden/testObject_Scheme_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_1.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_1.json
index f5075c0b4a2..18b6cbdb27d 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_1.json
@@ -1,6 +1,6 @@
 {
-    "took": 1,
-    "found": -6,
     "documents": [],
-    "returned": 0
-}
\ No newline at end of file
+    "found": -6,
+    "returned": 0,
+    "took": 1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_10.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_10.json
index 94edd379b77..c9231b07179 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_10.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_10.json
@@ -1,6 +1,6 @@
 {
-    "took": -5,
-    "found": 0,
     "documents": [],
-    "returned": -7
-}
\ No newline at end of file
+    "found": 0,
+    "returned": -7,
+    "took": -5
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_11.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_11.json
index 478dce1896c..ec5f938e955 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_11.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_11.json
@@ -1,29 +1,29 @@
 {
-    "took": -7,
-    "found": -1,
     "documents": [
         {
+            "accent_id": 0,
             "handle": null,
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "",
             "qualified_id": {
                 "domain": "bza.j",
                 "id": "00000000-0000-0000-0000-000000000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": null,
-            "id": "00000000-0000-0000-0000-000000000001"
+            "team": null
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "",
             "qualified_id": {
                 "domain": "zwv.u6-f",
                 "id": "00000001-0000-0000-0000-000000000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": null,
-            "id": "00000001-0000-0000-0000-000000000001"
+            "team": null
         }
     ],
-    "returned": 3
-}
\ No newline at end of file
+    "found": -1,
+    "returned": 3,
+    "took": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_12.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_12.json
index e514569fce5..dc6aa1c3b3d 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_12.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_12.json
@@ -1,6 +1,6 @@
 {
-    "took": 3,
-    "found": 7,
     "documents": [],
-    "returned": 5
-}
\ No newline at end of file
+    "found": 7,
+    "returned": 5,
+    "took": 3
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_13.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_13.json
index 1f1fcd07df4..629398aa62e 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_13.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_13.json
@@ -1,51 +1,51 @@
 {
-    "took": -1,
-    "found": 3,
     "documents": [
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "795n1zf6-he8-97ur4w.o7r---053",
                 "id": "00000000-0000-0001-0000-000000000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000000000000"
+            "team": "00000000-0000-0000-0000-000100000000"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "v-t6qc.e.so7jqwv",
                 "id": "00000000-0000-0001-0000-000000000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "id": "00000000-0000-0001-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000000000001"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "335.a3.p49c--e-fjz337",
                 "id": "00000000-0000-0000-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000000000001"
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "g.g3n",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "accent_id": null,
-            "name": "",
-            "team": null,
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": null
         }
     ],
-    "returned": 2
-}
\ No newline at end of file
+    "found": 3,
+    "returned": 2,
+    "took": -1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_14.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_14.json
index 3693214f8e7..68e71d3135f 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_14.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_14.json
@@ -1,29 +1,29 @@
 {
-    "took": 2,
-    "found": 1,
     "documents": [
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "c00y0ks9-6.q",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000000",
-            "id": "00000000-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0000-0000-000000000000"
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000001-0000-0001-0000-000000000001",
+            "name": "",
             "qualified_id": {
                 "domain": "g.44.s3dq77",
                 "id": "00000001-0000-0001-0000-000000000001"
             },
-            "accent_id": null,
-            "name": "",
-            "team": null,
-            "id": "00000001-0000-0001-0000-000000000001"
+            "team": null
         }
     ],
-    "returned": 6
-}
\ No newline at end of file
+    "found": 1,
+    "returned": 6,
+    "took": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_15.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_15.json
index b5753ea6fa9..d83541152fb 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_15.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_15.json
@@ -1,6 +1,6 @@
 {
-    "took": 4,
-    "found": 3,
     "documents": [],
-    "returned": 2
-}
\ No newline at end of file
+    "found": 3,
+    "returned": 2,
+    "took": 4
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_16.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_16.json
index a3c065429ad..db1bdb2026d 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_16.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_16.json
@@ -1,6 +1,6 @@
 {
-    "took": -7,
-    "found": -4,
     "documents": [],
-    "returned": 4
-}
\ No newline at end of file
+    "found": -4,
+    "returned": 4,
+    "took": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_17.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_17.json
index 97f49043804..3db94126754 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_17.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_17.json
@@ -1,6 +1,6 @@
 {
-    "took": -1,
-    "found": 6,
     "documents": [],
-    "returned": -1
-}
\ No newline at end of file
+    "found": 6,
+    "returned": -1,
+    "took": -1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_18.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_18.json
index f6aba550721..f159d1deacf 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_18.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_18.json
@@ -1,6 +1,6 @@
 {
-    "took": -5,
-    "found": -4,
     "documents": [],
-    "returned": 0
-}
\ No newline at end of file
+    "found": -4,
+    "returned": 0,
+    "took": -5
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_19.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_19.json
index 266da862259..4ba9a1b04eb 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_19.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_19.json
@@ -1,29 +1,29 @@
 {
-    "took": -5,
-    "found": 4,
     "documents": [
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "5de.v-6",
                 "id": "00000000-0000-0001-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000100000001"
+            "team": null
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "z76.kcuxql-9",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "accent_id": null,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0000-0000-000000000001"
         }
     ],
-    "returned": 2
-}
\ No newline at end of file
+    "found": 4,
+    "returned": 2,
+    "took": -5
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_2.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_2.json
index 4a66d1e2801..833b308d8ce 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_2.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_2.json
@@ -1,6 +1,6 @@
 {
-    "took": -5,
-    "found": -4,
     "documents": [],
-    "returned": 6
-}
\ No newline at end of file
+    "found": -4,
+    "returned": 6,
+    "took": -5
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_20.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_20.json
index 41c7a4dc095..187d019ebba 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_20.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_20.json
@@ -1,150 +1,150 @@
 {
-    "took": -1,
-    "found": 7,
     "documents": [
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "66h.j",
                 "id": "00000000-0000-0001-0000-000000000000"
             },
-            "accent_id": null,
-            "name": "",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000000000000"
+            "team": null
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "7s.k881-q-42",
                 "id": "00000000-0000-0000-0000-000100000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0000-0000-000100000001"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "1ux.dy",
                 "id": "00000001-0000-0001-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000000000001"
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "o.xi",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "accent_id": null,
-            "name": "",
-            "team": null,
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": null
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "x5c.v",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "accent_id": null,
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "id": "00000000-0000-0001-0000-000100000000"
+            "team": "00000001-0000-0000-0000-000000000000"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "9p-8z5.i",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000001-0000-0001-0000-000000000001",
-            "id": "00000001-0000-0000-0000-000100000001"
+            "team": "00000001-0000-0001-0000-000000000001"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "h1t7.9.j492",
                 "id": "00000000-0000-0000-0000-000100000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0000-0000-000000000001"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "p9.y",
                 "id": "00000000-0000-0000-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": null,
-            "id": "00000000-0000-0000-0000-000100000001"
+            "team": null
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "saz.d0v8",
                 "id": "00000000-0000-0000-0000-000100000001"
             },
-            "accent_id": null,
-            "name": "",
-            "team": null,
-            "id": "00000000-0000-0000-0000-000100000001"
+            "team": null
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "gpz.28--u.1646.v5",
                 "id": "00000000-0000-0001-0000-000000000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000000-0000-0001-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "8p.5.x11-s",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000100000000"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": "",
             "qualified_id": {
                 "domain": "q4x5z.mwi3",
                 "id": "00000000-0000-0001-0000-000000000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "id": "00000000-0000-0001-0000-000000000001"
+            "team": "00000000-0000-0001-0000-000000000000"
         },
         {
+            "accent_id": 0,
             "handle": null,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "38.b7",
                 "id": "00000000-0000-0000-0000-000000000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000000-0000-0000-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000100000000"
         }
     ],
-    "returned": 6
-}
\ No newline at end of file
+    "found": 7,
+    "returned": 6,
+    "took": -1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_3.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_3.json
index 70230e0e29f..a837fae9d4d 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_3.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_3.json
@@ -1,18 +1,18 @@
 {
-    "took": 7,
-    "found": 4,
     "documents": [
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "guh.e",
                 "id": "00000001-0000-0001-0000-000100000000"
             },
-            "accent_id": null,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0000-0000-000100000000"
         }
     ],
-    "returned": 0
-}
\ No newline at end of file
+    "found": 4,
+    "returned": 0,
+    "took": 7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_4.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_4.json
index fa7338dd5cf..07d4484354a 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_4.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_4.json
@@ -1,73 +1,73 @@
 {
-    "took": 3,
-    "found": -5,
     "documents": [
         {
+            "accent_id": null,
             "handle": null,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "2.60--1n1.ds",
                 "id": "00000000-0000-0000-0000-000000000000"
             },
-            "accent_id": null,
-            "name": "",
-            "team": "00000001-0000-0000-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000000000000"
+            "team": "00000001-0000-0000-0000-000100000001"
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "onrg.u",
                 "id": "00000000-0000-0000-0000-000100000001"
             },
-            "accent_id": null,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0000-0000-000100000001"
+            "team": "00000000-0000-0000-0000-000100000000"
         },
         {
+            "accent_id": 0,
             "handle": null,
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "660.v1.8z2.a-4dv.y",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "accent_id": null,
             "handle": "",
+            "id": "00000001-0000-0001-0000-000000000001",
+            "name": "",
             "qualified_id": {
                 "domain": "t102d9m3.tb-dryc9.ws300w5xc4",
                 "id": "00000001-0000-0001-0000-000000000001"
             },
-            "accent_id": null,
-            "name": "",
-            "team": null,
-            "id": "00000001-0000-0001-0000-000000000001"
+            "team": null
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "54up.l8h-b-g-i.x-c.9-7.we35781l0b",
                 "id": "00000000-0000-0000-0000-000100000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "id": "00000000-0000-0000-0000-000100000000"
+            "team": "00000000-0000-0001-0000-000000000000"
         },
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "",
             "qualified_id": {
                 "domain": "a.h9-1",
                 "id": "00000000-0000-0001-0000-000100000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0000-0000-000000000000",
-            "id": "00000000-0000-0001-0000-000100000000"
+            "team": "00000000-0000-0000-0000-000000000000"
         }
     ],
-    "returned": -7
-}
\ No newline at end of file
+    "found": -5,
+    "returned": -7,
+    "took": 3
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_5.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_5.json
index 87285584983..4a3b7adea90 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_5.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_5.json
@@ -1,18 +1,18 @@
 {
-    "took": -1,
-    "found": -6,
     "documents": [
         {
+            "accent_id": 1,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "z",
             "qualified_id": {
                 "domain": "1b-y90e265f.l-c",
                 "id": "00000001-0000-0000-0000-000000000001"
             },
-            "accent_id": 1,
-            "name": "z",
-            "team": "00000001-0000-0000-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000000000001"
+            "team": "00000001-0000-0000-0000-000100000001"
         }
     ],
-    "returned": -6
-}
\ No newline at end of file
+    "found": -6,
+    "returned": -6,
+    "took": -1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_6.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_6.json
index a703c08c03b..d6976f9b1a2 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_6.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_6.json
@@ -1,6 +1,6 @@
 {
-    "took": 5,
-    "found": -5,
     "documents": [],
-    "returned": -4
-}
\ No newline at end of file
+    "found": -5,
+    "returned": -4,
+    "took": 5
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_7.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_7.json
index 7f25faf0b02..d3575a1b405 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_7.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_7.json
@@ -1,29 +1,29 @@
 {
-    "took": -6,
-    "found": 7,
     "documents": [
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "",
             "qualified_id": {
                 "domain": "1386---3-nddry.o",
                 "id": "00000001-0000-0000-0000-000000000000"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000001-0000-0000-0000-000000000000"
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "accent_id": 0,
             "handle": null,
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "j-cz923pu.l6.73-6.qq05n.4ig.dl3",
                 "id": "00000001-0000-0000-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000100000000"
         }
     ],
-    "returned": 0
-}
\ No newline at end of file
+    "found": 7,
+    "returned": 0,
+    "took": -6
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_8.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_8.json
index 508d736de4f..124a473f512 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_8.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_8.json
@@ -1,18 +1,18 @@
 {
-    "took": -7,
-    "found": -7,
     "documents": [
         {
+            "accent_id": 0,
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "",
             "qualified_id": {
                 "domain": "6n.n08ejr-a",
                 "id": "00000001-0000-0001-0000-000100000001"
             },
-            "accent_id": 0,
-            "name": "",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000100000001"
+            "team": "00000000-0000-0001-0000-000100000000"
         }
     ],
-    "returned": -5
-}
\ No newline at end of file
+    "found": -7,
+    "returned": -5,
+    "took": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_9.json b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_9.json
index 09766bcaa3b..831c7d108a8 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_9.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20Contact_user_9.json
@@ -1,6 +1,6 @@
 {
-    "took": 3,
-    "found": -5,
     "documents": [],
-    "returned": -6
-}
\ No newline at end of file
+    "found": -5,
+    "returned": -6,
+    "took": 3
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_1.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_1.json
index 343605ae291..8d3bac38460 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_1.json
@@ -1,31 +1,31 @@
 {
-    "took": 0,
-    "found": -4,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T20:48:17.263Z",
             "email": "@",
             "handle": null,
+            "id": "00000001-0000-0001-0000-000100000000",
             "managed_by": null,
-            "role": "admin",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T20:48:17.263Z",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000001-0000-0001-0000-000100000000",
-            "saml_idp": ""
+            "role": "admin",
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000000000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T17:17:18.225Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000000",
             "managed_by": "wire",
-            "role": "partner",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T17:17:18.225Z",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000100000000",
-            "saml_idp": null
+            "role": "partner",
+            "saml_idp": null,
+            "team": "00000000-0000-0000-0000-000000000001"
         }
     ],
-    "returned": 2
-}
\ No newline at end of file
+    "found": -4,
+    "returned": 2,
+    "took": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_10.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_10.json
index c65769e4a13..d248f22b43f 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_10.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_10.json
@@ -1,6 +1,6 @@
 {
-    "took": -4,
-    "found": -3,
     "documents": [],
-    "returned": -3
-}
\ No newline at end of file
+    "found": -3,
+    "returned": -3,
+    "took": -4
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_11.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_11.json
index 892373e3c2d..c932c9de481 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_11.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_11.json
@@ -1,103 +1,103 @@
 {
-    "took": 1,
-    "found": -5,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T23:32:15.171Z",
             "email": null,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000001",
             "managed_by": "wire",
-            "role": "partner",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T23:32:15.171Z",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000000000001",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": "00000001-0000-0001-0000-000100000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T09:36:08.567Z",
             "email": "@",
             "handle": null,
+            "id": "00000001-0000-0000-0000-000000000001",
             "managed_by": "scim",
-            "role": "owner",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T09:36:08.567Z",
-            "team": "00000001-0000-0000-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000000000001",
-            "saml_idp": ""
+            "role": "owner",
+            "saml_idp": "",
+            "team": "00000001-0000-0000-0000-000100000001"
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T11:56:16.082Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000000",
             "managed_by": "wire",
-            "role": "admin",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T11:56:16.082Z",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000001-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "admin",
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000000000001"
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T00:23:34.413Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000000",
             "managed_by": "scim",
-            "role": null,
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T00:23:34.413Z",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000100000000",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0001-0000-000000000000",
             "managed_by": "wire",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": "00000001-0000-0000-0000-000000000000",
-            "id": "00000001-0000-0001-0000-000000000000",
-            "saml_idp": null
+            "role": null,
+            "saml_idp": null,
+            "team": "00000001-0000-0000-0000-000000000000"
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T02:39:28.838Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000001",
             "managed_by": null,
-            "role": "partner",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T02:39:28.838Z",
-            "team": null,
-            "id": "00000001-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000001",
             "managed_by": null,
-            "role": "owner",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": "00000000-0000-0001-0000-000000000000",
-            "id": "00000000-0000-0001-0000-000100000001",
-            "saml_idp": null
+            "role": "owner",
+            "saml_idp": null,
+            "team": "00000000-0000-0001-0000-000000000000"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T01:15:59.694Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0001-0000-000000000001",
             "managed_by": "wire",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T01:15:59.694Z",
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0001-0000-000000000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": "00000000-0000-0001-0000-000100000001"
         }
     ],
-    "returned": 7
-}
\ No newline at end of file
+    "found": -5,
+    "returned": 7,
+    "took": 1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_12.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_12.json
index 53cf54294df..e75ed6faa84 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_12.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_12.json
@@ -1,19 +1,19 @@
 {
-    "took": 0,
-    "found": 0,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T06:59:36.374Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000000000001",
             "managed_by": null,
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T06:59:36.374Z",
-            "team": null,
-            "id": "00000000-0000-0000-0000-000000000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": null
         }
     ],
-    "returned": 0
-}
\ No newline at end of file
+    "found": 0,
+    "returned": 0,
+    "took": 0
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_13.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_13.json
index 78b06a63834..994796262d9 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_13.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_13.json
@@ -1,43 +1,43 @@
 {
-    "took": 1,
-    "found": -6,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T17:55:15.951Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000001",
             "managed_by": "wire",
-            "role": "member",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T17:55:15.951Z",
-            "team": null,
-            "id": "00000001-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T05:08:55.558Z",
             "email": "@",
             "handle": null,
+            "id": "00000001-0000-0000-0000-000000000001",
             "managed_by": "scim",
-            "role": "member",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T05:08:55.558Z",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "id": "00000001-0000-0000-0000-000000000001",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": "00000000-0000-0001-0000-000000000000"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T11:18:47.121Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000001",
             "managed_by": "scim",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T11:18:47.121Z",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "id": "00000001-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": "00000001-0000-0000-0000-000000000000"
         }
     ],
-    "returned": 3
-}
\ No newline at end of file
+    "found": -6,
+    "returned": 3,
+    "took": 1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_14.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_14.json
index 1ea848848ce..5a224f59409 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_14.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_14.json
@@ -1,19 +1,19 @@
 {
-    "took": -4,
-    "found": 1,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T06:35:15.745Z",
             "email": null,
             "handle": null,
+            "id": "00000001-0000-0000-0000-000100000000",
             "managed_by": "wire",
-            "role": "admin",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T06:35:15.745Z",
-            "team": null,
-            "id": "00000001-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "admin",
+            "saml_idp": "",
+            "team": null
         }
     ],
-    "returned": 4
-}
\ No newline at end of file
+    "found": 1,
+    "returned": 4,
+    "took": -4
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_15.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_15.json
index fee28991382..790bbfe0fde 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_15.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_15.json
@@ -1,19 +1,19 @@
 {
-    "took": -6,
-    "found": 2,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000001",
             "managed_by": "wire",
-            "role": "owner",
-            "accent_id": null,
             "name": "",
-            "created_at": null,
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0000-0000-000100000001",
-            "saml_idp": null
+            "role": "owner",
+            "saml_idp": null,
+            "team": "00000001-0000-0000-0000-000100000000"
         }
     ],
-    "returned": 6
-}
\ No newline at end of file
+    "found": 2,
+    "returned": 6,
+    "took": -6
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_16.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_16.json
index d449c952a4c..c4a3bccf296 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_16.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_16.json
@@ -1,43 +1,43 @@
 {
-    "took": -5,
-    "found": 2,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T23:38:23.560Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000001",
             "managed_by": "wire",
-            "role": "admin",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T23:38:23.560Z",
-            "team": null,
-            "id": "00000001-0000-0000-0000-000000000001",
-            "saml_idp": ""
+            "role": "admin",
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": null,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0001-0000-000000000000",
             "managed_by": "scim",
-            "role": "admin",
-            "accent_id": null,
             "name": "",
-            "created_at": null,
-            "team": "00000000-0000-0000-0000-000100000001",
-            "id": "00000001-0000-0001-0000-000000000000",
-            "saml_idp": null
+            "role": "admin",
+            "saml_idp": null,
+            "team": "00000000-0000-0000-0000-000100000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T18:46:45.154Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000000",
             "managed_by": "scim",
-            "role": "admin",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T18:46:45.154Z",
-            "team": "00000000-0000-0001-0000-000000000000",
-            "id": "00000001-0000-0000-0000-000000000000",
-            "saml_idp": ""
+            "role": "admin",
+            "saml_idp": "",
+            "team": "00000000-0000-0001-0000-000000000000"
         }
     ],
-    "returned": 2
-}
\ No newline at end of file
+    "found": 2,
+    "returned": 2,
+    "took": -5
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_17.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_17.json
index 67eab2b1212..d5d2786070e 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_17.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_17.json
@@ -1,19 +1,19 @@
 {
-    "took": 4,
-    "found": -7,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T02:22:14.746Z",
             "email": null,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000000",
             "managed_by": "wire",
-            "role": "partner",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T02:22:14.746Z",
-            "team": null,
-            "id": "00000001-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": null
         }
     ],
-    "returned": -5
-}
\ No newline at end of file
+    "found": -7,
+    "returned": -5,
+    "took": 4
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_18.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_18.json
index 8e6209403b9..40eec32bcb2 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_18.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_18.json
@@ -1,19 +1,19 @@
 {
-    "took": -7,
-    "found": 1,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T12:35:16.437Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000000000000",
             "managed_by": null,
-            "role": "owner",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T12:35:16.437Z",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000000000000",
-            "saml_idp": ""
+            "role": "owner",
+            "saml_idp": "",
+            "team": "00000001-0000-0001-0000-000100000001"
         }
     ],
-    "returned": -7
-}
\ No newline at end of file
+    "found": 1,
+    "returned": -7,
+    "took": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_19.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_19.json
index 3e90ff32610..8361d5800ed 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_19.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_19.json
@@ -1,6 +1,6 @@
 {
-    "took": -2,
-    "found": -6,
     "documents": [],
-    "returned": -1
-}
\ No newline at end of file
+    "found": -6,
+    "returned": -1,
+    "took": -2
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_2.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_2.json
index b6910cb1e6b..1b62fdfb204 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_2.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_2.json
@@ -1,6 +1,6 @@
 {
-    "took": 6,
-    "found": -5,
     "documents": [],
-    "returned": 4
-}
\ No newline at end of file
+    "found": -5,
+    "returned": 4,
+    "took": 6
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_20.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_20.json
index 7db60479e3f..8e62d841e7d 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_20.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_20.json
@@ -1,6 +1,6 @@
 {
-    "took": 1,
-    "found": -6,
     "documents": [],
-    "returned": -5
-}
\ No newline at end of file
+    "found": -6,
+    "returned": -5,
+    "took": 1
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_3.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_3.json
index 6fced2bc7f6..394c3fe4cfc 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_3.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_3.json
@@ -1,43 +1,43 @@
 {
-    "took": -7,
-    "found": -5,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": null,
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000000000000",
             "managed_by": "wire",
-            "role": "admin",
-            "accent_id": null,
             "name": "",
-            "created_at": null,
-            "team": "00000001-0000-0001-0000-000000000000",
-            "id": "00000000-0000-0000-0000-000000000000",
-            "saml_idp": null
+            "role": "admin",
+            "saml_idp": null,
+            "team": "00000001-0000-0001-0000-000000000000"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T04:59:07.086Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000001",
             "managed_by": "wire",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T04:59:07.086Z",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T05:39:37.370Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000000",
             "managed_by": "scim",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T05:39:37.370Z",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000000000000",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": null
         }
     ],
-    "returned": -2
-}
\ No newline at end of file
+    "found": -5,
+    "returned": -2,
+    "took": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_4.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_4.json
index 9e1bc70a29f..08178b115c0 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_4.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_4.json
@@ -1,55 +1,55 @@
 {
-    "took": 2,
-    "found": -2,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": null,
             "email": "@",
             "handle": null,
+            "id": "00000000-0000-0000-0000-000000000001",
             "managed_by": "wire",
-            "role": "owner",
-            "accent_id": null,
             "name": "",
-            "created_at": null,
-            "team": "00000001-0000-0000-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000000000001",
-            "saml_idp": null
+            "role": "owner",
+            "saml_idp": null,
+            "team": "00000001-0000-0000-0000-000000000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T01:29:06.597Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000001",
             "managed_by": "scim",
-            "role": "admin",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T01:29:06.597Z",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "admin",
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T17:38:20.677Z",
             "email": null,
             "handle": null,
+            "id": "00000000-0000-0001-0000-000100000001",
             "managed_by": "wire",
-            "role": "partner",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T17:38:20.677Z",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": "00000001-0000-0000-0000-000100000000"
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000000",
             "managed_by": "scim",
-            "role": "partner",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": null,
-            "id": "00000001-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": null
         }
     ],
-    "returned": 4
-}
\ No newline at end of file
+    "found": -2,
+    "returned": 4,
+    "took": 2
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_5.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_5.json
index 2e585520b75..0af69b51841 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_5.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_5.json
@@ -1,19 +1,19 @@
 {
-    "took": -7,
-    "found": -2,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T12:39:20.984Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000000",
             "managed_by": "scim",
-            "role": "partner",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T12:39:20.984Z",
-            "team": null,
-            "id": "00000000-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": null
         }
     ],
-    "returned": -3
-}
\ No newline at end of file
+    "found": -2,
+    "returned": -3,
+    "took": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_6.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_6.json
index c2376c1d72a..95242f6f6d5 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_6.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_6.json
@@ -1,163 +1,163 @@
 {
-    "took": -4,
-    "found": -4,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000000",
             "managed_by": "wire",
-            "role": "owner",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": "00000000-0000-0000-0000-000000000000",
-            "id": "00000000-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "owner",
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000000000000"
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000001",
             "managed_by": "wire",
-            "role": "owner",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": null,
-            "id": "00000001-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "owner",
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T10:59:12.538Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000001",
             "managed_by": "scim",
-            "role": null,
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T10:59:12.538Z",
-            "team": "00000000-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0000-0000-000100000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": "00000000-0000-0001-0000-000100000000"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T23:24:12.000Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000000000000",
             "managed_by": "scim",
-            "role": "owner",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T23:24:12.000Z",
-            "team": "00000000-0000-0000-0000-000000000000",
-            "id": "00000000-0000-0000-0000-000000000000",
-            "saml_idp": ""
+            "role": "owner",
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000000000000"
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000001",
             "managed_by": null,
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": null,
-            "id": "00000000-0000-0001-0000-000000000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T19:59:50.883Z",
             "email": null,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000001",
             "managed_by": "scim",
-            "role": "member",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T19:59:50.883Z",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000000000001",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": "00000001-0000-0001-0000-000100000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T13:56:02.433Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000001",
             "managed_by": "wire",
-            "role": "admin",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T13:56:02.433Z",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000100000001",
-            "saml_idp": null
+            "role": "admin",
+            "saml_idp": null,
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T01:45:42.970Z",
             "email": "@",
             "handle": null,
+            "id": "00000001-0000-0001-0000-000000000000",
             "managed_by": null,
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T01:45:42.970Z",
-            "team": "00000001-0000-0001-0000-000100000000",
-            "id": "00000001-0000-0001-0000-000000000000",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": "00000001-0000-0001-0000-000100000000"
         },
         {
+            "accent_id": null,
+            "created_at": null,
             "email": null,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000000",
             "managed_by": "wire",
-            "role": "partner",
-            "accent_id": null,
             "name": "",
-            "created_at": null,
-            "team": "00000000-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000100000000",
-            "saml_idp": null
+            "role": "partner",
+            "saml_idp": null,
+            "team": "00000000-0000-0001-0000-000100000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T23:36:06.671Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000000000001",
             "managed_by": "scim",
-            "role": "owner",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T23:36:06.671Z",
-            "team": "00000001-0000-0001-0000-000000000001",
-            "id": "00000000-0000-0000-0000-000000000001",
-            "saml_idp": ""
+            "role": "owner",
+            "saml_idp": "",
+            "team": "00000001-0000-0001-0000-000000000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T14:01:50.906Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000001",
             "managed_by": "scim",
-            "role": "member",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T14:01:50.906Z",
-            "team": "00000001-0000-0000-0000-000000000000",
-            "id": "00000000-0000-0000-0000-000100000001",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": "00000001-0000-0000-0000-000000000000"
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000100000000",
             "managed_by": "scim",
-            "role": "partner",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": "00000001-0000-0001-0000-000100000000",
-            "id": "00000000-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": "00000001-0000-0001-0000-000100000000"
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000001",
             "managed_by": "scim",
-            "role": "partner",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": null,
-            "id": "00000001-0000-0000-0000-000000000001",
-            "saml_idp": null
+            "role": "partner",
+            "saml_idp": null,
+            "team": null
         }
     ],
-    "returned": -7
-}
\ No newline at end of file
+    "found": -4,
+    "returned": -7,
+    "took": -4
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_7.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_7.json
index a44a2096f67..de3058a2da0 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_7.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_7.json
@@ -1,79 +1,79 @@
 {
-    "took": 5,
-    "found": 1,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T19:22:39.660Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000001",
             "managed_by": null,
-            "role": null,
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T19:22:39.660Z",
-            "team": null,
-            "id": "00000001-0000-0000-0000-000100000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T19:42:55.525Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000000",
             "managed_by": "wire",
-            "role": "member",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T19:42:55.525Z",
-            "team": null,
-            "id": "00000000-0000-0001-0000-000100000000",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000000000000",
             "managed_by": "wire",
-            "role": "partner",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": "00000000-0000-0000-0000-000000000000",
-            "id": "00000001-0000-0000-0000-000000000000",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000000000000"
         },
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": null,
             "handle": "",
+            "id": "00000001-0000-0001-0000-000000000001",
             "managed_by": "wire",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": null,
-            "id": "00000001-0000-0001-0000-000000000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T00:45:08.016Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000001",
             "managed_by": "scim",
-            "role": "member",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T00:45:08.016Z",
-            "team": "00000000-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000100000000"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T21:18:46.647Z",
             "email": null,
             "handle": "",
+            "id": "00000001-0000-0001-0000-000100000001",
             "managed_by": "scim",
-            "role": "partner",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T21:18:46.647Z",
-            "team": "00000001-0000-0001-0000-000100000001",
-            "id": "00000001-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": "00000001-0000-0001-0000-000100000001"
         }
     ],
-    "returned": 5
-}
\ No newline at end of file
+    "found": 1,
+    "returned": 5,
+    "took": 5
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_8.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_8.json
index 1fa611df07b..ffedd1b7894 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_8.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_8.json
@@ -1,55 +1,55 @@
 {
-    "took": -7,
-    "found": 7,
     "documents": [
         {
+            "accent_id": null,
+            "created_at": null,
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000001",
             "managed_by": "scim",
-            "role": "owner",
-            "accent_id": null,
             "name": "",
-            "created_at": null,
-            "team": "00000001-0000-0000-0000-000100000001",
-            "id": "00000001-0000-0000-0000-000100000001",
-            "saml_idp": ""
+            "role": "owner",
+            "saml_idp": "",
+            "team": "00000001-0000-0000-0000-000100000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T13:46:22.701Z",
             "email": "@",
             "handle": null,
+            "id": "00000000-0000-0000-0000-000000000000",
             "managed_by": "wire",
-            "role": "owner",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T13:46:22.701Z",
-            "team": null,
-            "id": "00000000-0000-0000-0000-000000000000",
-            "saml_idp": null
+            "role": "owner",
+            "saml_idp": null,
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T09:25:11.685Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0000-0000-000000000000",
             "managed_by": "wire",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T09:25:11.685Z",
-            "team": "00000001-0000-0000-0000-000100000001",
-            "id": "00000000-0000-0000-0000-000000000000",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": "00000001-0000-0000-0000-000100000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T11:37:20.763Z",
             "email": "@",
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000000",
             "managed_by": "wire",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T11:37:20.763Z",
-            "team": "00000000-0000-0001-0000-000000000001",
-            "id": "00000000-0000-0001-0000-000000000000",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": "00000000-0000-0001-0000-000000000001"
         }
     ],
-    "returned": 2
-}
\ No newline at end of file
+    "found": 7,
+    "returned": 2,
+    "took": -7
+}
diff --git a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_9.json b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_9.json
index da444990a36..c84c6405ee7 100644
--- a/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_9.json
+++ b/libs/wire-api/test/golden/testObject_SearchResult_20TeamContact_user_9.json
@@ -1,55 +1,55 @@
 {
-    "took": -3,
-    "found": 2,
     "documents": [
         {
+            "accent_id": 0,
+            "created_at": null,
             "email": null,
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000000",
             "managed_by": "wire",
-            "role": "member",
-            "accent_id": 0,
             "name": "",
-            "created_at": null,
-            "team": null,
-            "id": "00000001-0000-0000-0000-000100000000",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": null
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T16:22:05.429Z",
             "email": "@",
             "handle": "",
+            "id": "00000001-0000-0000-0000-000100000001",
             "managed_by": "scim",
-            "role": null,
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T16:22:05.429Z",
-            "team": "00000000-0000-0000-0000-000000000001",
-            "id": "00000001-0000-0000-0000-000100000001",
-            "saml_idp": ""
+            "role": null,
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000000000001"
         },
         {
+            "accent_id": 0,
+            "created_at": "1864-05-09T17:19:11.439Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000100000001",
             "managed_by": "scim",
-            "role": "member",
-            "accent_id": 0,
             "name": "",
-            "created_at": "1864-05-09T17:19:11.439Z",
-            "team": "00000001-0000-0000-0000-000100000000",
-            "id": "00000000-0000-0001-0000-000100000001",
-            "saml_idp": ""
+            "role": "member",
+            "saml_idp": "",
+            "team": "00000001-0000-0000-0000-000100000000"
         },
         {
+            "accent_id": null,
+            "created_at": "1864-05-09T05:44:15.175Z",
             "email": null,
             "handle": "",
+            "id": "00000000-0000-0001-0000-000000000001",
             "managed_by": "wire",
-            "role": "partner",
-            "accent_id": null,
             "name": "",
-            "created_at": "1864-05-09T05:44:15.175Z",
-            "team": "00000000-0000-0000-0000-000100000001",
-            "id": "00000000-0000-0001-0000-000000000001",
-            "saml_idp": ""
+            "role": "partner",
+            "saml_idp": "",
+            "team": "00000000-0000-0000-0000-000100000001"
         }
     ],
-    "returned": 3
-}
\ No newline at end of file
+    "found": 2,
+    "returned": 3,
+    "took": -3
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_1.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_1.json
index fae91a1e947..e7612c1bf6c 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_1.json
@@ -1,22 +1,22 @@
 {
+    "accent_id": 1,
+    "assets": [],
     "email": "\u0007@",
-    "phone": "+6171884202",
+    "expires_at": "1864-05-07T21:09:29.342Z",
     "handle": "do9-5",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000000-0000-0001-0000-000000000001"
-    },
+    "id": "00000002-0000-0002-0000-000200000002",
     "locale": "gl-PA",
     "managed_by": "scim",
+    "name": "@ֱਦ𐋂\u001f􍱇l+𡡖6󳒏^𧦣Mu\t",
+    "phone": "+6171884202",
+    "picture": [],
     "qualified_id": {
         "domain": "n0-994.m-226.f91.vg9p-mj-j2",
         "id": "00000001-0000-0000-0000-000000000002"
     },
-    "accent_id": 1,
-    "picture": [],
-    "name": "@ֱਦ𐋂\u001f􍱇l+𡡖6󳒏^𧦣Mu\t",
-    "expires_at": "1864-05-07T21:09:29.342Z",
-    "team": "00000001-0000-0002-0000-000000000002",
-    "id": "00000002-0000-0002-0000-000200000002",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "provider": "00000000-0000-0001-0000-000000000001"
+    },
+    "team": "00000001-0000-0002-0000-000000000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_10.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_10.json
index fa264da5cc3..e72220941b4 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_10.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_10.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": -2,
+    "assets": [],
+    "deleted": true,
+    "expires_at": "1864-05-11T13:37:46.490Z",
     "handle": "tq-xm3ywkgplimqfqyd76v696af.zcb2e-svk45z3uw2ba8gxok1gyjy1st01f3ocq6",
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000001",
-        "provider": "00000000-0000-0001-0000-000100000001"
-    },
+    "id": "00000001-0000-0000-0000-000000000000",
     "locale": "tr-GG",
     "managed_by": "wire",
+    "name": "\u000fdW󳲝T\u001d\rpx\u001bc\"􍟰䄯@𢵲\u0007􉘊x;\u0000􌅖*沷拣(𗏇𩷓B$6G(\\st\u001aiQ蹆$",
+    "picture": [],
     "qualified_id": {
         "domain": "0.orr",
         "id": "00000000-0000-0002-0000-000000000001"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "\u000fdW󳲝T\u001d\rpx\u001bc\"􍟰䄯@𢵲\u0007􉘊x;\u0000􌅖*沷拣(𗏇𩷓B$6G(\\st\u001aiQ蹆$",
-    "expires_at": "1864-05-11T13:37:46.490Z",
-    "team": "00000000-0000-0000-0000-000100000002",
-    "id": "00000001-0000-0000-0000-000000000000",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0000-0000-000000000001",
+        "provider": "00000000-0000-0001-0000-000100000001"
+    },
+    "team": "00000000-0000-0000-0000-000100000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_11.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_11.json
index 5f2b1d21720..7582453b4e6 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_11.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_11.json
@@ -1,31 +1,31 @@
 {
+    "accent_id": -2,
+    "assets": [
+        {
+            "key": "",
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "email": "@",
+    "expires_at": "1864-05-08T20:12:10.459Z",
     "handle": "qk",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000001",
-        "provider": "00000001-0000-0000-0000-000000000000"
-    },
+    "id": "00000001-0000-0002-0000-000000000002",
     "locale": "rm-TH",
     "managed_by": "wire",
+    "name": "tWWWXt\u001eﰍi\u001b\u0014\u0017\u000fSɬD\u00143\u0019Q󠆈}G4r󹠠-\u0013eyf2竭􁶿f,\u0004~\u0019𭮩q𑜽𨌊𒆽8W􃾼B󽥯Mhj\n􌼺\u0005)o\"O\u0002\u0016;􋣞\u0014􏰒􇂷c9s\u001c,\u001a-w솵Y!<\u0005|\u0003訙",
+    "picture": [],
     "qualified_id": {
         "domain": "j.8-1.of",
         "id": "00000000-0000-0000-0000-000200000000"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "tWWWXt\u001eﰍi\u001b\u0014\u0017\u000fSɬD\u00143\u0019Q󠆈}G4r󹠠-\u0013eyf2竭􁶿f,\u0004~\u0019𭮩q𑜽𨌊𒆽8W􃾼B󽥯Mhj\n􌼺\u0005)o\"O\u0002\u0016;􋣞\u0014􏰒􇂷c9s\u001c,\u001a-w솵Y!<\u0005|\u0003訙",
-    "expires_at": "1864-05-08T20:12:10.459Z",
-    "team": "00000000-0000-0001-0000-000200000001",
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000001",
+        "provider": "00000001-0000-0000-0000-000000000000"
+    },
     "sso_id": {
         "scim_external_id": ""
     },
-    "id": "00000001-0000-0002-0000-000000000002",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "team": "00000000-0000-0001-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_12.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_12.json
index c235f8e4bd7..c9be8b555d2 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_12.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_12.json
@@ -1,16 +1,16 @@
 {
+    "accent_id": -2,
+    "assets": [],
     "email": "렱@U",
     "handle": "iz.9z-r0txd10beaq3awhdi00as2ttk4w_-sb73-qa0e-bj9q-do_d.1wivilwgag_da6hy_nx._d_ranqfh94mv4-tisuwevxjcw94-h60ae6-x1tptoboa-x2a1s08q4wywul3rusm37hl.vjn8en__837eodq8134tecr8qzpm2c2hle7ao_wa85hk",
+    "id": "00000002-0000-0001-0000-000100000001",
     "locale": "ca-OM",
     "managed_by": "wire",
+    "name": "\u0019桑f+\u000b=]􉽞u9\u0016v􄢇\u0000aT\u001eKK𑊖o87g2TꋲaOU\r;_jUZ`/\u001dR\u0004s\u001fo@:\u0007󸸬we4g􉟹􂳖 \u0000j",
+    "picture": [],
     "qualified_id": {
         "domain": "i-w8.nea5",
         "id": "00000000-0000-0000-0000-000000000000"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "\u0019桑f+\u000b=]􉽞u9\u0016v􄢇\u0000aT\u001eKK𑊖o87g2TꋲaOU\r;_jUZ`/\u001dR\u0004s\u001fo@:\u0007󸸬we4g􉟹􂳖 \u0000j",
-    "team": "00000002-0000-0002-0000-000000000000",
-    "id": "00000002-0000-0001-0000-000100000001",
-    "assets": []
-}
\ No newline at end of file
+    "team": "00000002-0000-0002-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_13.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_13.json
index ff3d3a3c7c9..baa4959c187 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_13.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_13.json
@@ -1,26 +1,26 @@
 {
+    "accent_id": 2,
+    "assets": [
+        {
+            "key": "",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "email": "@",
+    "expires_at": "1864-05-07T20:25:30.218Z",
+    "id": "00000001-0000-0002-0000-000100000000",
     "locale": "id",
     "managed_by": "wire",
+    "name": "􈧣yc襘y􏹯&\u0019\u0002󾪲{N>\u001c䊈O=]픝i<`\u00081mBS𑨋𨔕t账)x𩲬[􈎼􉵐m퀌5𧹟􂂟\u0012p\u001c􁎛\u0019 ,T*\u0003s.\u001dT:\u0010󸌎z/#8-e*W𪤢W\r󻁩\u000f\u0005*}𮟻%􊤷𪣩{厯\u0012'N\u001f/윬Z*E𣰦\u0017",
+    "picture": [],
     "qualified_id": {
         "domain": "7.kr1-96m-s--x1g3",
         "id": "00000000-0000-0000-0000-000000000002"
     },
-    "accent_id": 2,
-    "picture": [],
-    "name": "􈧣yc襘y􏹯&\u0019\u0002󾪲{N>\u001c䊈O=]픝i<`\u00081mBS𑨋𨔕t账)x𩲬[􈎼􉵐m퀌5𧹟􂂟\u0012p\u001c􁎛\u0019 ,T*\u0003s.\u001dT:\u0010󸌎z/#8-e*W𪤢W\r󻁩\u000f\u0005*}𮟻%􊤷𪣩{厯\u0012'N\u001f/윬Z*E𣰦\u0017",
-    "expires_at": "1864-05-07T20:25:30.218Z",
-    "team": "00000000-0000-0000-0000-000200000001",
     "sso_id": {
         "subject": "",
         "tenant": ""
     },
-    "id": "00000001-0000-0002-0000-000100000000",
-    "deleted": true,
-    "assets": [
-        {
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_14.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_14.json
index aa09feebdc1..47f0cad00d1 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_14.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_14.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": 1,
+    "assets": [],
     "email": "􌪽@",
-    "phone": "+3606473750",
     "handle": "9_hc2_-en1a8jck-tkni14wqqw6mx16tzlmo87gw3xu811i9424ku8fbmpl_hf06nus61lza7_kslu",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000000",
-        "provider": "00000001-0000-0001-0000-000100000001"
-    },
+    "id": "00000000-0000-0002-0000-000000000002",
     "locale": "ss-SN",
     "managed_by": "scim",
+    "name": "󸀭dp\u001eW@\u0013$i$)𥛪R󸖱\u0014d\u0013\u0014B.\u0003㥿\u0001\u0011x󾵸g𠛚􄞫\u0019)\u0014K)e=\u000f#s먁d𨷱Q􄗚ㄍ𥵅󾏲:mZ􌶵V󴴎􀶻􁐈^y\u001f𫧾􌴢N𝘯;%\u0004󴮤(eW&C@yh\u0014%᥉i\u0017",
+    "phone": "+3606473750",
+    "picture": [],
     "qualified_id": {
         "domain": "o33xllsl.br.w1a-cl",
         "id": "00000001-0000-0000-0000-000200000002"
     },
-    "accent_id": 1,
-    "picture": [],
-    "name": "󸀭dp\u001eW@\u0013$i$)𥛪R󸖱\u0014d\u0013\u0014B.\u0003㥿\u0001\u0011x󾵸g𠛚􄞫\u0019)\u0014K)e=\u000f#s먁d𨷱Q􄗚ㄍ𥵅󾏲:mZ􌶵V󴴎􀶻􁐈^y\u001f𫧾􌴢N𝘯;%\u0004󴮤(eW&C@yh\u0014%᥉i\u0017",
-    "team": "00000002-0000-0000-0000-000100000000",
-    "id": "00000000-0000-0002-0000-000000000002",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000000",
+        "provider": "00000001-0000-0001-0000-000100000001"
+    },
+    "team": "00000002-0000-0000-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_15.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_15.json
index 3d1361b8e63..42d14c2d30e 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_15.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_15.json
@@ -1,26 +1,9 @@
 {
-    "email": "󶉌@(",
-    "handle": "ncyk2udev3vg1bl_ujr0ff4fwymv_j_5lcse8b.c99i--lwnquz4mpbqzmrc_2ok_ytgqeov4bkkn_l",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000001-0000-0000-0000-000100000000"
-    },
-    "locale": "co-FM",
-    "managed_by": "scim",
-    "qualified_id": {
-        "domain": "w-csl2vx.rpb.fq2",
-        "id": "00000000-0000-0002-0000-000000000000"
-    },
     "accent_id": 1,
-    "picture": [],
-    "name": "2\u0008󼕮\"\u000c\u000f{?b\"\n>q\u000fe8D󲣡􊞚􅁩{{eX|-q\u00083*59v󼳒s죠\u001b􃩧󠁼wG!uAO\rBZ\u001dF[4ᾗ\u000b|\"\u00154b\u0018tE\u0012YB\u0006\u0015l5D>%P`𧶐\u0008Z",
-    "team": "00000002-0000-0002-0000-000200000002",
-    "id": "00000000-0000-0002-0000-000000000000",
-    "deleted": true,
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -28,9 +11,26 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "email": "󶉌@(",
+    "handle": "ncyk2udev3vg1bl_ujr0ff4fwymv_j_5lcse8b.c99i--lwnquz4mpbqzmrc_2ok_ytgqeov4bkkn_l",
+    "id": "00000000-0000-0002-0000-000000000000",
+    "locale": "co-FM",
+    "managed_by": "scim",
+    "name": "2\u0008󼕮\"\u000c\u000f{?b\"\n>q\u000fe8D󲣡􊞚􅁩{{eX|-q\u00083*59v󼳒s죠\u001b􃩧󠁼wG!uAO\rBZ\u001dF[4ᾗ\u000b|\"\u00154b\u0018tE\u0012YB\u0006\u0015l5D>%P`𧶐\u0008Z",
+    "picture": [],
+    "qualified_id": {
+        "domain": "w-csl2vx.rpb.fq2",
+        "id": "00000000-0000-0002-0000-000000000000"
+    },
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "provider": "00000001-0000-0000-0000-000100000000"
+    },
+    "team": "00000002-0000-0002-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_16.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_16.json
index 5cb94ce7706..7e802c25408 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_16.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_16.json
@@ -1,35 +1,35 @@
 {
-    "phone": "+673892193308",
+    "accent_id": 2,
+    "assets": [
+        {
+            "key": "",
+            "type": "image"
+        },
+        {
+            "key": "",
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "expires_at": "1864-05-11T06:04:44.922Z",
     "handle": "v36sek51j__9i-w67.0foj6fpsrb_8-54_4c7yqld4cxu4emk0s67-f0oqyippzwxh9hmbrc-i0vpl0m-ww53-pku0kjb_6uprh4n6wg.xn7n9xp0t_5t.r_itjjmxjgkxud0ih083c6vscdlb-wex8no_4vlo.2llhidhq0awu3xr0craik",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000000-0000-0001-0000-000000000001"
-    },
+    "id": "00000002-0000-0002-0000-000200000000",
     "locale": "zh-NF",
     "managed_by": "scim",
+    "name": "\u001a􀸖\u0018p\u001d􁻨𣱚k󹖝󶛋纃􅸵𤑺󼲰󸕓mzSJ",
+    "phone": "+673892193308",
+    "picture": [],
     "qualified_id": {
         "domain": "76y01l79xajp.u5p8-qo--om",
         "id": "00000000-0000-0000-0000-000000000000"
     },
-    "accent_id": 2,
-    "picture": [],
-    "name": "\u001a􀸖\u0018p\u001d􁻨𣱚k󹖝󶛋纃􅸵𤑺󼲰󸕓mzSJ",
-    "expires_at": "1864-05-11T06:04:44.922Z",
-    "team": "00000000-0000-0001-0000-000000000000",
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "provider": "00000000-0000-0001-0000-000000000001"
+    },
     "sso_id": {
         "subject": "",
         "tenant": ""
     },
-    "id": "00000002-0000-0002-0000-000200000000",
-    "assets": [
-        {
-            "key": "",
-            "type": "image"
-        },
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "team": "00000000-0000-0001-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_17.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_17.json
index 63115c8397a..8d29e0c81a1 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_17.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_17.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": -2,
+    "assets": [],
     "email": "@",
-    "phone": "+023372401614100",
+    "expires_at": "1864-05-09T08:41:37.172Z",
     "handle": "6huo",
+    "id": "00000001-0000-0001-0000-000200000002",
     "locale": "ts-FI",
     "managed_by": "scim",
+    "name": "T󻁎\u000eK\u0015Iwh%𖤝C\u000f!􆉧(*Iq󼅽'W𤰎c=\u0002MAK@먃\u001f\t)^x\u0018\u0018\\^'s9\u0011Qﾀ.3\u00075􅐬\u001b\u0019퐄\u001a􍂻󼆞\u0004g+W(;W[\u0012!ꁂ>𑀡:5󶇺\u0019Y-,\u0013\u0016i扡\u0010\t𢀴!a\u000e=􉠼󻧒𭬬\u0018=0\u00026,\u001czr(",
+    "phone": "+023372401614100",
+    "picture": [],
     "qualified_id": {
         "domain": "2.dh4",
         "id": "00000001-0000-0001-0000-000000000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "T󻁎\u000eK\u0015Iwh%𖤝C\u000f!􆉧(*Iq󼅽'W𤰎c=\u0002MAK@먃\u001f\t)^x\u0018\u0018\\^'s9\u0011Qﾀ.3\u00075􅐬\u001b\u0019퐄\u001a􍂻󼆞\u0004g+W(;W[\u0012!ꁂ>𑀡:5󶇺\u0019Y-,\u0013\u0016i扡\u0010\t𢀴!a\u000e=􉠼󻧒𭬬\u0018=0\u00026,\u001czr(",
-    "expires_at": "1864-05-09T08:41:37.172Z",
-    "team": "00000001-0000-0001-0000-000200000002",
     "sso_id": {
         "scim_external_id": ""
     },
-    "id": "00000001-0000-0001-0000-000200000002",
-    "assets": []
-}
\ No newline at end of file
+    "team": "00000001-0000-0001-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_18.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_18.json
index c7005a5e7f5..fcd48c5d44b 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_18.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_18.json
@@ -1,30 +1,30 @@
 {
-    "service": {
-        "id": "00000001-0000-0001-0000-000000000000",
-        "provider": "00000001-0000-0000-0000-000000000001"
-    },
-    "locale": "bs-SB",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "1.t3yc3",
-        "id": "00000002-0000-0000-0000-000200000002"
-    },
     "accent_id": 0,
-    "picture": [],
-    "name": "}Mr$铨Fi~O\u0019b\\䬇k􉁜󽭜\r^n􏧷8𭪵󶨩\u0018\u0012xj\u001e󻟎\u0007h\u0019𭾱)WJ>Y􅐺[\u0018󱣒ed􏺬,端=\u001eHmMV%x-^;_\u000fun",
-    "expires_at": "1864-05-11T16:10:28.222Z",
-    "team": "00000002-0000-0000-0000-000100000002",
-    "id": "00000002-0000-0002-0000-000200000002",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "expires_at": "1864-05-11T16:10:28.222Z",
+    "id": "00000002-0000-0002-0000-000200000002",
+    "locale": "bs-SB",
+    "managed_by": "wire",
+    "name": "}Mr$铨Fi~O\u0019b\\䬇k􉁜󽭜\r^n􏧷8𭪵󶨩\u0018\u0012xj\u001e󻟎\u0007h\u0019𭾱)WJ>Y􅐺[\u0018󱣒ed􏺬,端=\u001eHmMV%x-^;_\u000fun",
+    "picture": [],
+    "qualified_id": {
+        "domain": "1.t3yc3",
+        "id": "00000002-0000-0000-0000-000200000002"
+    },
+    "service": {
+        "id": "00000001-0000-0001-0000-000000000000",
+        "provider": "00000001-0000-0000-0000-000000000001"
+    },
+    "team": "00000002-0000-0000-0000-000100000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_19.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_19.json
index f60a6127ccd..901f5e59d69 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_19.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_19.json
@@ -1,32 +1,32 @@
 {
-    "email": "?@S",
-    "handle": "-bc4hz9hn8ep81cxp.9_jy4wl-w2h8o34wb1we4.77yp9oai6le1fm_lshwh4_j5dhzzpkidmg23t75bzjvms7x-7v.ru1l7cqkkci9uynit6kbwinsy4fug55j5p6pek_9d5g90sx7jgixu3teh_dvo.a-l79pgpxs4iov569j4bnpv-4lck0qj5vjv.5sb9p47w_.5lfyuqcwrpeq.fqfl9miil.epxsert-dh1",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000001",
-        "provider": "00000001-0000-0000-0000-000000000000"
-    },
-    "locale": "hr-BG",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "8y.o9",
-        "id": "00000002-0000-0002-0000-000200000000"
-    },
     "accent_id": -2,
-    "picture": [],
-    "name": "󳖔2􎣀𖦂\u0013B\u00155􄕿",
-    "team": "00000000-0000-0000-0000-000200000002",
-    "id": "00000001-0000-0000-0000-000200000000",
-    "deleted": true,
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "email": "?@S",
+    "handle": "-bc4hz9hn8ep81cxp.9_jy4wl-w2h8o34wb1we4.77yp9oai6le1fm_lshwh4_j5dhzzpkidmg23t75bzjvms7x-7v.ru1l7cqkkci9uynit6kbwinsy4fug55j5p6pek_9d5g90sx7jgixu3teh_dvo.a-l79pgpxs4iov569j4bnpv-4lck0qj5vjv.5sb9p47w_.5lfyuqcwrpeq.fqfl9miil.epxsert-dh1",
+    "id": "00000001-0000-0000-0000-000200000000",
+    "locale": "hr-BG",
+    "managed_by": "wire",
+    "name": "󳖔2􎣀𖦂\u0013B\u00155􄕿",
+    "picture": [],
+    "qualified_id": {
+        "domain": "8y.o9",
+        "id": "00000002-0000-0002-0000-000200000000"
+    },
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000001",
+        "provider": "00000001-0000-0000-0000-000000000000"
+    },
+    "team": "00000000-0000-0000-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_2.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_2.json
index 391bacb2f03..c1226df8762 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_2.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_2.json
@@ -1,21 +1,5 @@
 {
-    "phone": "+28532238745460",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
-    "locale": "az",
-    "managed_by": "scim",
-    "qualified_id": {
-        "domain": "h2rphp.47t1.pw0",
-        "id": "00000000-0000-0000-0000-000200000000"
-    },
     "accent_id": -2,
-    "picture": [],
-    "name": "􍚜৪SYMﶒ\nem\u0013\u000e\u0002𫙣THme郾꼴_Bo>%G<u𥟕i𤭱a:%*\u0011\n:Y",
-    "expires_at": "1864-05-08T07:51:14.715Z",
-    "team": "00000000-0000-0000-0000-000200000000",
-    "id": "00000002-0000-0001-0000-000200000002",
     "assets": [
         {
             "key": "",
@@ -30,9 +14,25 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "expires_at": "1864-05-08T07:51:14.715Z",
+    "id": "00000002-0000-0001-0000-000200000002",
+    "locale": "az",
+    "managed_by": "scim",
+    "name": "􍚜৪SYMﶒ\nem\u0013\u000e\u0002𫙣THme郾꼴_Bo>%G<u𥟕i𤭱a:%*\u0011\n:Y",
+    "phone": "+28532238745460",
+    "picture": [],
+    "qualified_id": {
+        "domain": "h2rphp.47t1.pw0",
+        "id": "00000000-0000-0000-0000-000200000000"
+    },
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "provider": "00000000-0000-0000-0000-000000000000"
+    },
+    "team": "00000000-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_20.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_20.json
index 3445bf8b002..b10bff10567 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_20.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_20.json
@@ -1,17 +1,5 @@
 {
-    "phone": "+23457350508",
-    "handle": "v89lg6khwz.ruz1ngo032582p5z2qvmk92m58_5x688fqurqg..j2p9wa.pipqhunk.q-cdtnvntvv16whxmbay63licg.v9nm_bnn1xdlovj7_wa..hwx-horp6oj8yzqne_49qpsdh.shj8q9rjh7384.mhk1244pay9tiale9433tmz7q9upc0lh5wurqo5wpnyidivhrtgk-jm.6wc-02ptct33e",
-    "locale": "oj",
-    "managed_by": "scim",
-    "qualified_id": {
-        "domain": "l2.y",
-        "id": "00000001-0000-0002-0000-000000000002"
-    },
     "accent_id": 0,
-    "picture": [],
-    "name": "􋂇𪁭o󵡺🤝.b𠷏\u000c5UDRv8T(\u000eT󳠍N*GQ\u0005\u001bjtl\u000fDK_;\"v􌙄\u001ar\u0006I𠫍Y앯z%5$[\u0013\rQji.\u0000󿽟j\n\u001b\u000c𨝃\"I\u0017",
-    "team": "00000002-0000-0000-0000-000000000001",
-    "id": "00000001-0000-0002-0000-000200000000",
     "assets": [
         {
             "key": "",
@@ -21,5 +9,17 @@
             "key": "",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "handle": "v89lg6khwz.ruz1ngo032582p5z2qvmk92m58_5x688fqurqg..j2p9wa.pipqhunk.q-cdtnvntvv16whxmbay63licg.v9nm_bnn1xdlovj7_wa..hwx-horp6oj8yzqne_49qpsdh.shj8q9rjh7384.mhk1244pay9tiale9433tmz7q9upc0lh5wurqo5wpnyidivhrtgk-jm.6wc-02ptct33e",
+    "id": "00000001-0000-0002-0000-000200000000",
+    "locale": "oj",
+    "managed_by": "scim",
+    "name": "􋂇𪁭o󵡺🤝.b𠷏\u000c5UDRv8T(\u000eT󳠍N*GQ\u0005\u001bjtl\u000fDK_;\"v􌙄\u001ar\u0006I𠫍Y앯z%5$[\u0013\rQji.\u0000󿽟j\n\u001b\u000c𨝃\"I\u0017",
+    "phone": "+23457350508",
+    "picture": [],
+    "qualified_id": {
+        "domain": "l2.y",
+        "id": "00000001-0000-0002-0000-000000000002"
+    },
+    "team": "00000002-0000-0000-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_3.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_3.json
index a60ab50f75f..ccd097b91a5 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_3.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_3.json
@@ -1,23 +1,23 @@
 {
+    "accent_id": 1,
+    "assets": [],
+    "deleted": true,
     "email": "\u0000@",
-    "phone": "+3387841470",
+    "expires_at": "1864-05-09T19:59:51.146Z",
     "handle": "6o7n9",
-    "service": {
-        "id": "00000000-0000-0000-0000-000100000001",
-        "provider": "00000001-0000-0001-0000-000100000000"
-    },
+    "id": "00000000-0000-0001-0000-000000000001",
     "locale": "uk",
     "managed_by": "scim",
+    "name": "Sbv\u0019B\u001e/\tzoCrN꓿\u0015>udt􁆶Ⳅ𮐞M󷶉𪢇W+uU[5*\u0000󴵻\u0001􋥶\"\u000b=aV3P\u0002􋵚\u0006𫔖@\tjUS\"􋈛Sng:3m^\\𪘎5䎈抠6l􃴬\u0018⽗􍚠4[\u0016bL!",
+    "phone": "+3387841470",
+    "picture": [],
     "qualified_id": {
         "domain": "60.3pc.a7t75j.9-3sx0.au-rt.y",
         "id": "00000002-0000-0000-0000-000000000000"
     },
-    "accent_id": 1,
-    "picture": [],
-    "name": "Sbv\u0019B\u001e/\tzoCrN꓿\u0015>udt􁆶Ⳅ𮐞M󷶉𪢇W+uU[5*\u0000󴵻\u0001􋥶\"\u000b=aV3P\u0002􋵚\u0006𫔖@\tjUS\"􋈛Sng:3m^\\𪘎5䎈抠6l􃴬\u0018⽗􍚠4[\u0016bL!",
-    "expires_at": "1864-05-09T19:59:51.146Z",
-    "team": "00000000-0000-0001-0000-000200000001",
-    "id": "00000000-0000-0001-0000-000000000001",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0000-0000-000100000001",
+        "provider": "00000001-0000-0001-0000-000100000000"
+    },
+    "team": "00000000-0000-0001-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_4.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_4.json
index a2d066dfa93..f43d3266ab2 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_4.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_4.json
@@ -1,22 +1,22 @@
 {
+    "accent_id": 2,
+    "assets": [],
     "email": "@",
-    "phone": "+30745803086",
+    "expires_at": "1864-05-10T10:07:20.481Z",
     "handle": "sncnzzz_ffzdy-8.70xb9gni-jtexm4lbr4h9an",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000001-0000-0001-0000-000100000000"
-    },
+    "id": "00000002-0000-0001-0000-000200000001",
     "locale": "af-MV",
     "managed_by": "scim",
+    "name": "/RCd𧶤𭉜:\u001ba%[⣐𭓍𛃶F\u000c@#{U\rn𫆕",
+    "phone": "+30745803086",
+    "picture": [],
     "qualified_id": {
         "domain": "fa3gz465.g-2",
         "id": "00000002-0000-0000-0000-000200000000"
     },
-    "accent_id": 2,
-    "picture": [],
-    "name": "/RCd𧶤𭉜:\u001ba%[⣐𭓍𛃶F\u000c@#{U\rn𫆕",
-    "expires_at": "1864-05-10T10:07:20.481Z",
-    "team": "00000000-0000-0000-0000-000100000002",
-    "id": "00000002-0000-0001-0000-000200000001",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "provider": "00000001-0000-0001-0000-000100000000"
+    },
+    "team": "00000000-0000-0000-0000-000100000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_5.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_5.json
index 4b5b7e58fb9..4fd48c024ad 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_5.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_5.json
@@ -1,28 +1,28 @@
 {
-    "phone": "+11141922",
+    "accent_id": 2,
+    "assets": [
+        {
+            "key": "𐒒",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
+    "expires_at": "1864-05-10T10:30:21.640Z",
     "handle": "29",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000001",
-        "provider": "00000000-0000-0000-0000-000100000001"
-    },
+    "id": "00000001-0000-0000-0000-000100000001",
     "locale": "tr-CZ",
     "managed_by": "scim",
+    "name": "\u0004𭸣dE0K𪑬:􌚀^v𢼐􏕨G0𮖀_7𡕳a\u0006󵃸&p\u001a`\r6\ro\\􁠥[\u0016>9lx叻V諛p\u001c󷞮<>j{",
+    "phone": "+11141922",
+    "picture": [],
     "qualified_id": {
         "domain": "90i1.84arbm9252qg.b",
         "id": "00000002-0000-0001-0000-000100000000"
     },
-    "accent_id": 2,
-    "picture": [],
-    "name": "\u0004𭸣dE0K𪑬:􌚀^v𢼐􏕨G0𮖀_7𡕳a\u0006󵃸&p\u001a`\r6\ro\\􁠥[\u0016>9lx叻V諛p\u001c󷞮<>j{",
-    "expires_at": "1864-05-10T10:30:21.640Z",
-    "team": "00000001-0000-0002-0000-000200000002",
-    "id": "00000001-0000-0000-0000-000100000001",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "preview",
-            "key": "𐒒",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000001",
+        "provider": "00000000-0000-0000-0000-000100000001"
+    },
+    "team": "00000001-0000-0002-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_6.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_6.json
index f5320b4b3c5..79fce062540 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_6.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_6.json
@@ -1,20 +1,5 @@
 {
-    "phone": "+73308549330",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000000",
-        "provider": "00000000-0000-0001-0000-000000000000"
-    },
-    "locale": "mi-VE",
-    "managed_by": "scim",
-    "qualified_id": {
-        "domain": "u54.h8--m0--752",
-        "id": "00000002-0000-0002-0000-000000000001"
-    },
     "accent_id": 2,
-    "picture": [],
-    "name": "􃫍\"3@n􂃩𬾹z6w3lCo+🐩]6\u0005􄷦2􂬒EVQ\u0000􁺗1\u0002\u001c^勯}C",
-    "team": "00000001-0000-0001-0000-000200000001",
-    "id": "00000000-0000-0002-0000-000100000000",
     "assets": [
         {
             "key": "",
@@ -25,9 +10,24 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "id": "00000000-0000-0002-0000-000100000000",
+    "locale": "mi-VE",
+    "managed_by": "scim",
+    "name": "􃫍\"3@n􂃩𬾹z6w3lCo+🐩]6\u0005􄷦2􂬒EVQ\u0000􁺗1\u0002\u001c^勯}C",
+    "phone": "+73308549330",
+    "picture": [],
+    "qualified_id": {
+        "domain": "u54.h8--m0--752",
+        "id": "00000002-0000-0002-0000-000000000001"
+    },
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000000",
+        "provider": "00000000-0000-0001-0000-000000000000"
+    },
+    "team": "00000001-0000-0001-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_7.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_7.json
index c30b3928d60..dd73f46992f 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_7.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_7.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": 0,
+    "assets": [],
     "email": ":@\u0007",
+    "expires_at": "1864-05-09T09:08:35.327Z",
     "handle": "_5dpks7l",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000001",
-        "provider": "00000001-0000-0001-0000-000000000001"
-    },
+    "id": "00000001-0000-0001-0000-000000000000",
     "locale": "zh-AX",
     "managed_by": "scim",
+    "name": "\u001cz󴓣􊍿(Y噫Z5FGu'<pv\r\"󾅳?󾦡&$]e􂧤}􅴬\u0014\u0006\u001ekSQ`f绿`\u0011!𐴅𘎋\u000eJ🢑𨇇\u001e2lZ𬈆 𞤺:M\t[𦈋p{$\u000f\u0016]DP.𠄑\u0003𣟂\u000e󴘄@s4w \u000bI㙯0󻗴􅎀 ",
+    "picture": [],
     "qualified_id": {
         "domain": "8.071.c",
         "id": "00000001-0000-0001-0000-000000000002"
     },
-    "accent_id": 0,
-    "picture": [],
-    "name": "\u001cz󴓣􊍿(Y噫Z5FGu'<pv\r\"󾅳?󾦡&$]e􂧤}􅴬\u0014\u0006\u001ekSQ`f绿`\u0011!𐴅𘎋\u000eJ🢑𨇇\u001e2lZ𬈆 𞤺:M\t[𦈋p{$\u000f\u0016]DP.𠄑\u0003𣟂\u000e󴘄@s4w \u000bI㙯0󻗴􅎀 ",
-    "expires_at": "1864-05-09T09:08:35.327Z",
-    "team": "00000002-0000-0001-0000-000100000000",
-    "id": "00000001-0000-0001-0000-000000000000",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000001",
+        "provider": "00000001-0000-0001-0000-000000000001"
+    },
+    "team": "00000002-0000-0001-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_8.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_8.json
index 984c7f60809..19059701a32 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_8.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_8.json
@@ -1,31 +1,31 @@
 {
-    "locale": "mi-SY",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "f-s.w",
-        "id": "00000002-0000-0000-0000-000100000001"
-    },
     "accent_id": -1,
-    "picture": [],
-    "name": "F黂ᚬf䰍z􋃏𨬽8]\u0004+􅝕󰒰",
-    "expires_at": "1864-05-11T19:17:59.357Z",
-    "team": "00000000-0000-0001-0000-000100000000",
-    "id": "00000000-0000-0002-0000-000200000000",
-    "deleted": true,
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
             "key": "",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "expires_at": "1864-05-11T19:17:59.357Z",
+    "id": "00000000-0000-0002-0000-000200000000",
+    "locale": "mi-SY",
+    "managed_by": "wire",
+    "name": "F黂ᚬf䰍z􋃏𨬽8]\u0004+􅝕󰒰",
+    "picture": [],
+    "qualified_id": {
+        "domain": "f-s.w",
+        "id": "00000002-0000-0000-0000-000100000001"
+    },
+    "team": "00000000-0000-0001-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_SelfProfile_user_9.json b/libs/wire-api/test/golden/testObject_SelfProfile_user_9.json
index 1ffd8726931..77800457367 100644
--- a/libs/wire-api/test/golden/testObject_SelfProfile_user_9.json
+++ b/libs/wire-api/test/golden/testObject_SelfProfile_user_9.json
@@ -1,23 +1,23 @@
 {
+    "accent_id": -2,
+    "assets": [
+        {
+            "key": "=",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "email": "\n@0",
+    "expires_at": "1864-05-08T16:59:33.440Z",
     "handle": "l62ooa",
+    "id": "00000001-0000-0000-0000-000000000000",
     "locale": "uz",
     "managed_by": "scim",
+    "name": "H뵺\u0013\u0003􁴊b󲢫3q\u0007$&5\u001d\u0014~;郂H󻏐34螿\u001dlYfn,a\u001c󼇑\u0008VT󺜻wd仰d\u000f2\u000c􃠩!~P;",
+    "picture": [],
     "qualified_id": {
         "domain": "8amhh5l.m59x.pkki81",
         "id": "00000001-0000-0000-0000-000200000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "H뵺\u0013\u0003􁴊b󲢫3q\u0007$&5\u001d\u0014~;郂H󻏐34螿\u001dlYfn,a\u001c󼇑\u0008VT󺜻wd仰d\u000f2\u000c􃠩!~P;",
-    "expires_at": "1864-05-08T16:59:33.440Z",
-    "team": "00000002-0000-0000-0000-000200000002",
-    "id": "00000001-0000-0000-0000-000000000000",
-    "deleted": true,
-    "assets": [
-        {
-            "key": "=",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "team": "00000002-0000-0000-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_1.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_1.json
index 8de9207368e..a39d00e47d9 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_1.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+77566129334842",
     "locale": "cu-VI",
+    "phone": "+77566129334842",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_10.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_10.json
index cc1fdbf0c86..e795282853d 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_10.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_10.json
@@ -1,4 +1,4 @@
 {
     "email": "\t󽿸\u00002𧎖t𥓵@^s",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_11.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_11.json
index 106a1759ff3..e04d0ceeb17 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_11.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_11.json
@@ -2,4 +2,4 @@
     "email": "rT@a\tL\u0014",
     "locale": "hy-BB",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_12.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_12.json
index b899ecfa5c1..0a19921bde4 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_12.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_12.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+6599921229041",
     "locale": "ve-MU",
+    "phone": "+6599921229041",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_13.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_13.json
index 2ba644744f4..d2eabe6a707 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_13.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_13.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+260369295110",
     "locale": "kk",
+    "phone": "+260369295110",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_14.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_14.json
index ea9bd805d0f..18965585b6e 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_14.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_14.json
@@ -2,4 +2,4 @@
     "email": "B;b𨈅\u0011\u000fHm\u0013{@?犯Jd\u000c",
     "locale": "kw-PM",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_15.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_15.json
index fd20d769415..baa6bade271 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_15.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_15.json
@@ -2,4 +2,4 @@
     "email": "󺌼\u0011@t=𑁦꓂󼃹,AG2",
     "locale": "iu-FR",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_16.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_16.json
index 4f9bfcaa927..b8fa488f950 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_16.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_16.json
@@ -2,4 +2,4 @@
     "email": "O_酛󹰔^t@",
     "locale": "fi",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_17.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_17.json
index 4efdf171e90..60571ae2c55 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_17.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_17.json
@@ -2,4 +2,4 @@
     "email": "T\u000bI9H}C\u0002\u000e󸠬@𤾡諣=N",
     "locale": "pa-AO",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_18.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_18.json
index 8f2a5678032..3257e9ba67b 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_18.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_18.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+715068856505655",
     "locale": "tg",
+    "phone": "+715068856505655",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_19.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_19.json
index 271aac6ea48..0e4d72c8efa 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_19.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_19.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+22888251856",
     "locale": "gd-FI",
+    "phone": "+22888251856",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_2.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_2.json
index 7c829061227..5b837631353 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_2.json
@@ -2,4 +2,4 @@
     "email": "󹛃@nK",
     "locale": "de",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_20.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_20.json
index cdb53cefc07..d0eaf2f61a7 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_20.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_20.json
@@ -1,4 +1,4 @@
 {
     "phone": "+8943652812",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_3.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_3.json
index 51847e8641c..b8458051991 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_3.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_3.json
@@ -2,4 +2,4 @@
     "email": "#\u0006􍖄l􅋋F𤀞@-\u00132􌳵1\u0012󷮾𨿲\u000e𐨵",
     "locale": "gn-VU",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_4.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_4.json
index 12225cc1cb4..a8e10dca5f2 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_4.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_4.json
@@ -1,4 +1,4 @@
 {
     "email": "b@4M􆳤P𤣛$[\u0012j",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_5.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_5.json
index 5eb501904a2..c56050936c5 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_5.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_5.json
@@ -1,4 +1,4 @@
 {
     "phone": "+883124214493",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_6.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_6.json
index 2d151501917..5bbfc19425c 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_6.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_6.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+38093636958",
     "locale": "dv-IN",
+    "phone": "+38093636958",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_7.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_7.json
index e73fcb0ff7f..0dc4689fc29 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_7.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_7.json
@@ -1,4 +1,4 @@
 {
     "email": "B+l􁕧􈌤@\u0007%",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_8.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_8.json
index cc1b221a77b..6cd81e432ad 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_8.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_8.json
@@ -2,4 +2,4 @@
     "email": "\u00003@g𦅞⺖Ea?\u0012\\\u0014",
     "locale": "ho",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendActivationCode_user_9.json b/libs/wire-api/test/golden/testObject_SendActivationCode_user_9.json
index ce8f2980523..6ddc3167e02 100644
--- a/libs/wire-api/test/golden/testObject_SendActivationCode_user_9.json
+++ b/libs/wire-api/test/golden/testObject_SendActivationCode_user_9.json
@@ -1,4 +1,4 @@
 {
     "email": "Rn\u0002v@(\u0000N",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_1.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_1.json
index bd842556a91..1bafe991f61 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_1.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+7852237164",
     "force": false,
+    "phone": "+7852237164",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_10.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_10.json
index 6cbf3448e9e..5dacbe14be0 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_10.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_10.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+43915096382846",
     "force": false,
+    "phone": "+43915096382846",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_11.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_11.json
index df51a6f3e45..6a4551985f9 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_11.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_11.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+08251498",
     "force": false,
+    "phone": "+08251498",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_12.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_12.json
index 86fb4451270..8b562bf8bd7 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_12.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_12.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+8151944856397",
     "force": true,
+    "phone": "+8151944856397",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_13.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_13.json
index c01e9f231f2..bd154b75205 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_13.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_13.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+40692963",
     "force": true,
+    "phone": "+40692963",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_14.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_14.json
index 5d9874e2c1e..f737860916b 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_14.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_14.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+661842350866268",
     "force": true,
+    "phone": "+661842350866268",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_15.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_15.json
index f65199abdee..c16cc5f52f8 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_15.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_15.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+921771798513",
     "force": false,
+    "phone": "+921771798513",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_16.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_16.json
index 850486bbfa7..db2431d5583 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_16.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_16.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+250712302",
     "force": false,
+    "phone": "+250712302",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_17.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_17.json
index 7f025331878..190eb5fc0ed 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_17.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_17.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+073544070484537",
     "force": false,
+    "phone": "+073544070484537",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_18.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_18.json
index c026cf96211..f4e69f0d7da 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_18.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_18.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+938837684",
     "force": false,
+    "phone": "+938837684",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_19.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_19.json
index 59ef726a6f3..50aa6c62499 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_19.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_19.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+8081583978",
     "force": true,
+    "phone": "+8081583978",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_2.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_2.json
index 588377649f6..46953585e10 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_2.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_2.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+1361303129",
     "force": true,
+    "phone": "+1361303129",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_20.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_20.json
index 805388a62b4..ada6762a401 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_20.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_20.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+55901961505705",
     "force": false,
+    "phone": "+55901961505705",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_3.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_3.json
index 61fb17d3b6b..1902ecd0bc7 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_3.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_3.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+0278364030",
     "force": false,
+    "phone": "+0278364030",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_4.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_4.json
index 30b403f8807..47ff049e6ce 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_4.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_4.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+7017081269",
     "force": true,
+    "phone": "+7017081269",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_5.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_5.json
index 0d59505856f..6a1b8d2ea0b 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_5.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_5.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+7210550349",
     "force": true,
+    "phone": "+7210550349",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_6.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_6.json
index 7cef9163dda..7f083fdd29a 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_6.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_6.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+57561912568",
     "force": true,
+    "phone": "+57561912568",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_7.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_7.json
index e05deb3d6fc..2965c03f43a 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_7.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_7.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+0478831396",
     "force": true,
+    "phone": "+0478831396",
     "voice_call": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_8.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_8.json
index a46e422ee97..f99c81f3bc8 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_8.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_8.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+731463104296",
     "force": false,
+    "phone": "+731463104296",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SendLoginCode_user_9.json b/libs/wire-api/test/golden/testObject_SendLoginCode_user_9.json
index bd1615da770..6050998c9a1 100644
--- a/libs/wire-api/test/golden/testObject_SendLoginCode_user_9.json
+++ b/libs/wire-api/test/golden/testObject_SendLoginCode_user_9.json
@@ -1,5 +1,5 @@
 {
-    "phone": "+95425609807",
     "force": false,
+    "phone": "+95425609807",
     "voice_call": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_1.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_1.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_10.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_10.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_11.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_11.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_12.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_12.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_13.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_13.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_14.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_14.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_15.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_15.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_16.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_16.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_17.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_17.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_18.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_18.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_19.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_19.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_2.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_2.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_20.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_20.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_3.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_3.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_4.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_4.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_5.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_5.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_6.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_6.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_7.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_7.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_8.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_8.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_9.json
index 611a8fc2469..21ba68f0c2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyPEM_provider_9.json
@@ -1 +1 @@
-"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
\ No newline at end of file
+"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_1.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_1.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_10.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_10.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_11.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_11.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_12.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_12.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_13.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_13.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_14.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_14.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_15.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_15.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_16.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_16.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_17.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_17.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_18.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_18.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_19.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_19.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_2.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_2.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_20.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_20.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_3.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_3.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_4.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_4.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_5.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_5.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_6.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_6.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_7.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_7.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_8.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_8.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_9.json
index 3b0703eef06..a8c829d3a17 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKeyType_provider_9.json
@@ -1 +1 @@
-"rsa"
\ No newline at end of file
+"rsa"
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_1.json
index 22720f42a2d..8e337a5f9ec 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_1.json
@@ -1,5 +1,5 @@
 {
-    "size": -12,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -12,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_10.json
index 34f6b373425..174c042cecd 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_10.json
@@ -1,5 +1,5 @@
 {
-    "size": -10,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -10,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_11.json
index 8e958b42e11..472aff0bbbd 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_11.json
@@ -1,5 +1,5 @@
 {
-    "size": 21,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": 21,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_12.json
index ff45f2fc358..ef4babb24d5 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_12.json
@@ -1,5 +1,5 @@
 {
-    "size": -26,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -26,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_13.json
index 9ec87ed86ae..51daa4de047 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_13.json
@@ -1,5 +1,5 @@
 {
-    "size": -3,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -3,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_14.json
index cbf2a33810f..5a3ab069d6c 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_14.json
@@ -1,5 +1,5 @@
 {
-    "size": -31,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -31,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_15.json
index babaf3f0c43..3e2d4a8e5f1 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_15.json
@@ -1,5 +1,5 @@
 {
-    "size": 5,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": 5,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_16.json
index caa370c6ed6..4ffd3e457c1 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_16.json
@@ -1,5 +1,5 @@
 {
-    "size": -20,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -20,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_17.json
index 9c8119bcb8c..66cb5d941ee 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_17.json
@@ -1,5 +1,5 @@
 {
-    "size": 6,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": 6,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_18.json
index be40e44e4b3..fede5f65df8 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_18.json
@@ -1,5 +1,5 @@
 {
-    "size": -9,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -9,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_19.json
index 8908f2dd9eb..63a7e486afd 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_19.json
@@ -1,5 +1,5 @@
 {
-    "size": 31,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": 31,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_2.json
index 25ca634fb36..4c8e794d8d7 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_2.json
@@ -1,5 +1,5 @@
 {
-    "size": -15,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -15,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_20.json
index 9ae0529d429..8850a3e68be 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_20.json
@@ -1,5 +1,5 @@
 {
-    "size": 17,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": 17,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_3.json
index 30954ad9058..2761dc673de 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_3.json
@@ -1,5 +1,5 @@
 {
-    "size": -4,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -4,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_4.json
index 8aec5796420..65024d81b53 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_4.json
@@ -1,5 +1,5 @@
 {
-    "size": -25,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -25,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_5.json
index d1543906b77..b0fc5e6aa7b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_5.json
@@ -1,5 +1,5 @@
 {
-    "size": 1,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": 1,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_6.json
index 0e6c0d9bd46..0f5beaa04fc 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_6.json
@@ -1,5 +1,5 @@
 {
-    "size": -2,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -2,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_7.json
index 0fbb5d88d67..dd6d01ef71c 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_7.json
@@ -1,5 +1,5 @@
 {
-    "size": -1,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -1,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_8.json
index 18168af4dff..6525c5a2fec 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_8.json
@@ -1,5 +1,5 @@
 {
-    "size": -27,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": -27,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceKey_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceKey_provider_9.json
index 7b2d265bb3e..423b1006763 100644
--- a/libs/wire-api/test/golden/testObject_ServiceKey_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceKey_provider_9.json
@@ -1,5 +1,5 @@
 {
-    "size": 4,
     "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "size": 4,
     "type": "rsa"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_1.json
index d9ab49dfe24..161d40385fb 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_1.json
@@ -2,64 +2,64 @@
     "has_more": false,
     "services": [
         {
-            "summary": "",
-            "enabled": false,
-            "name": "&m󺰀縥\u00135𬺄􉡤\\w\u0012𨬾\u0012\t\\/SRd󵲀\u0008|\u0005􃤺 n\n0ᾔl愁\u0004྿\u001et𛁐䙴C5Ucg\u001f𖬸8\u0013)u\u0012f\u001cF#i&鋎\u001e\u0004qv0\u0018􂘞\\Nq%􎡲\u001d_𗙍",
-            "id": "00000001-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "&m󺰀縥\u00135𬺄􉡤\\w\u0012𨬾\u0012\t\\/SRd󵲀\u0008|\u0005􃤺 n\n0ᾔl愁\u0004྿\u001et𛁐䙴C5Ucg\u001f𖬸8\u0013)u\u0012f\u001cF#i&鋎\u001e\u0004qv0\u0018􂘞\\Nq%􎡲\u001d_𗙍",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "遜\u001aᶠx𫞅Z8x1Zu@ꐠy8I􆳁7)􆏭_+屛\u000fxQJ^TT\n󳠱\"\u0013",
-            "id": "00000000-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "遜\u001aᶠx𫞅Z8x1Zu@ꐠy8I􆳁7)􆏭_+屛\u000fxQJ^TT\n󳠱\"\u0013",
             "provider": "00000001-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "󷅁􉆇🕱\u0016-BD4\r|󼄤C\u00161<t<3󷭭K\u0008\u000b2B󷟲vF𭁟Y\u0006󾄸W𩷦)vVh\u001b󸨱.\u0010c|D\u00047\u001aG\u000e𭟾/YH\u0004Na\\s𝣧Di?\u0017yrbu\u001d\u001a\t𪚋pQ魽󼒦v\u0000_\u0018w\u0019\u0003묿XME\u0014#;嗠+\u0007􇨀􅛉\u0001s-𬌢d\u0011풦󹌃&H~",
-            "id": "00000000-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": "󷅁􉆇🕱\u0016-BD4\r|󼄤C\u00161<t<3󷭭K\u0008\u000b2B󷟲vF𭁟Y\u0006󾄸W𩷦)vVh\u001b󸨱.\u0010c|D\u00047\u001aG\u000e𭟾/YH\u0004Na\\s𝣧Di?\u0017yrbu\u001d\u001a\t𪚋pQ魽󼒦v\u0000_\u0018w\u0019\u0003묿XME\u0014#;嗠+\u0007􇨀􅛉\u0001s-𬌢d\u0011풦󹌃&H~",
             "provider": "00000000-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "'+!60H\u000f󹡓4\u0004cO溛h|A,, yꕮ\u0017\u0011􆆮􎈁sU7𨉓𧀉ZLu􎼿]\u000f`c}\u0015􃺥\n9#T[\u0007i\u0012l𮨴?Ckb󱨷nI󰖸c󺵅\u0003l𮄯",
-            "id": "00000001-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "'+!60H\u000f󹡓4\u0004cO溛h|A,, yꕮ\u0017\u0011􆆮􎈁sU7𨉓𧀉ZLu􎼿]\u000f`c}\u0015􃺥\n9#T[\u0007i\u0012l𮨴?Ckb󱨷nI󰖸c󺵅\u0003l𮄯",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "cYM0ke\u000240u꼅+\u0004mb P\u0015cmXI\u0012g𐘔\u0018\u0001|\u001cW􏈎􄍠\u001f\u000b\u000e)\u0011\u0005(Pi",
-            "id": "00000000-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "cYM0ke\u000240u꼅+\u0004mb P\u0015cmXI\u0012g𐘔\u0018\u0001|\u001cW􏈎􄍠\u001f\u000b\u000e)\u0011\u0005(Pi",
             "provider": "00000000-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "*𤧉}󸢛\u0011rఄ􃞠|􂅤?􌖊J􄤙𘇞Qa󻕢Fp>?",
-            "id": "00000000-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "*𤧉}󸢛\u0011rఄ􃞠|􂅤?􌖊J􄤙𘇞Qa󻕢Fp>?",
             "provider": "00000000-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_10.json
index 5653e7deb18..f1e7122e760 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_10.json
@@ -2,34 +2,34 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": false,
-            "name": "yk󶔗󵹣\u001a\u0018$Z\u0001*q𪄜􂨨K,𠯁󼤇0s",
-            "id": "00000001-0000-0001-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0001-0000-000000000001",
+            "name": "yk󶔗󵹣\u001a\u0018$Z\u0001*q𪄜􂨨K,𠯁󼤇0s",
             "provider": "00000000-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "N󿢚?R\u0012SJ􅽪ⅴt=)62&K󳓃󲃃\u001b𦊰dO[\u0000\rn\r9}􍯎{*x𗊠Q|0c󶫥I􋊁+爷􍵌􈂶9𤰃iE듺\u001e\u0005􃭌sMᮦ",
-            "id": "00000000-0000-0001-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "N󿢚?R\u0012SJ􅽪ⅴt=)62&K󳓃󲃃\u001b𦊰dO[\u0000\rn\r9}􍯎{*x𗊠Q|0c󶫥I􋊁+爷􍵌􈂶9𤰃iE듺\u001e\u0005􃭌sMᮦ",
             "provider": "00000000-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "3\u001b鼌\u00151}󱞖1惱H󴴏ro\u0001\u0003􊻩$C$*ej\u0001.󴇋i-󵡲𧆙鹦紧\u0017r\u0006c]q@^𑨾\u00082s󶙻b=s~K􂏧/\n4\u0005",
-            "id": "00000000-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "3\u001b鼌\u00151}󱞖1惱H󴴏ro\u0001\u0003􊻩$C$*ej\u0001.󴇋i-󵡲𧆙鹦紧\u0017r\u0006c]q@^𑨾\u00082s󶙻b=s~K􂏧/\n4\u0005",
             "provider": "00000001-0000-0000-0000-000100000000",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_11.json
index e7f45e09281..5de6225d157 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_11.json
@@ -2,20 +2,20 @@
     "has_more": false,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": ":\u0005]𧇁䇽T󶟑hhT\u000e􎩰󱕚$iu\r`=󾬫;𧱥^%\"𢀱𬥓nF-%\u0015䒻\u0002QDJ?Ls6󳫦o\u000f謆}Z􏢏\u000b\u0005\"$`􎬪𥐯S\u0008Ft,k\u0001Q\u0017w􏸔𫀔􎴺𥟈&;𑖧:A􀌣r𪿻eC;\u001d+)@[2縟|S\u0005x[|y𪵞Fh{𗗴𝕐󶚓cN󳉎+𠿯6",
-            "id": "00000000-0000-0001-0000-000000000001",
             "assets": [
                 {
-                    "size": "preview",
                     "key": "",
+                    "size": "preview",
                     "type": "image"
                 }
             ],
             "description": "꒺",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": ":\u0005]𧇁䇽T󶟑hhT\u000e􎩰󱕚$iu\r`=󾬫;𧱥^%\"𢀱𬥓nF-%\u0015䒻\u0002QDJ?Ls6󳫦o\u000f謆}Z􏢏\u000b\u0005\"$`􎬪𥐯S\u0008Ft,k\u0001Q\u0017w􏸔𫀔􎴺𥟈&;𑖧:A􀌣r𪿻eC;\u001d+)@[2縟|S\u0005x[|y𪵞Fh{𗗴𝕐󶚓cN󳉎+𠿯6",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_12.json
index b2f38fdd330..383fbdb7731 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_12.json
@@ -2,14 +2,14 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": false,
-            "name": "h\u0018",
-            "id": "00000001-0000-0001-0000-000000000000",
             "assets": [],
             "description": "\u001c",
+            "enabled": false,
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": "h\u0018",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_13.json
index 4c29ea516f6..54b15b2af9e 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_13.json
@@ -1,4 +1,4 @@
 {
     "has_more": true,
     "services": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_14.json
index ea2f5275e2d..d0092746066 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_14.json
@@ -2,34 +2,34 @@
     "has_more": false,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "M鮿d󱣍|\u000b.5􃈦P𞸖\u0011\u000bvfpH𦢒\u000b`󹉌Yv󿦪\u0000sj\u0008-liD󺃪",
-            "id": "00000000-0000-0001-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "M鮿d󱣍|\u000b.5􃈦P𞸖\u0011\u000bvfpH𦢒\u000b`󹉌Yv󿦪\u0000sj\u0008-liD󺃪",
             "provider": "00000001-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "w0󸓴!.i+iz0@86X]\u0008뜭U",
-            "id": "00000000-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "w0󸓴!.i+iz0@86X]\u0008뜭U",
             "provider": "00000000-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "e󹾁𤓾\u0014\u00108X\nB𗾋󲒽=!t;~^*qZ[IW𭚪m;Y\u0002",
-            "id": "00000000-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "e󹾁𤓾\u0014\u00108X\nB𗾋󲒽=!t;~^*qZ[IW𭚪m;Y\u0002",
             "provider": "00000001-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_15.json
index d125025de7e..440773089da 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_15.json
@@ -2,54 +2,54 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\u001b6O*𮜷[|\"\u0016C<]󹕜\"K􌉣um\u0017^\u0000E7oiv\u0012Xs\u0019󴏮;\u001d\u001ehm5T\u001b＾\u0008;P\tk/]5Fp𤚥\n\u0005r4 \"",
-            "id": "00000000-0000-0001-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": "\u001b6O*𮜷[|\"\u0016C<]󹕜\"K􌉣um\u0017^\u0000E7oiv\u0012Xs\u0019󴏮;\u001d\u001ehm5T\u001b＾\u0008;P\tk/]5Fp𤚥\n\u0005r4 \"",
             "provider": "00000000-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "7Y\u0007{\u0002\u000f(5~b\u0019\u0011V}􅺒m􈾶5yOo'j\u0002QER\u001e󠅚'Xn􉞣󵓶\tW#\u0017\u0015.m\u0013\u001bW𬭻!~\n,5𮊄U_p\u0002W\u0006꼆\u000b󰢌􎽾0@i󼌙hKm$f󶵖\u0008\\𝍣p𥧥Y\u0000AG*_PvoGi􈄉L7IA󴑇0􅞹d\u001d\u0001W\u001bv:$\u0011;TJX\"8\t",
-            "id": "00000001-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "7Y\u0007{\u0002\u000f(5~b\u0019\u0011V}􅺒m􈾶5yOo'j\u0002QER\u001e󠅚'Xn􉞣󵓶\tW#\u0017\u0015.m\u0013\u001bW𬭻!~\n,5𮊄U_p\u0002W\u0006꼆\u000b󰢌􎽾0@i󼌙hKm$f󶵖\u0008\\𝍣p𥧥Y\u0000AG*_PvoGi􈄉L7IA󴑇0􅞹d\u001d\u0001W\u001bv:$\u0011;TJX\"8\t",
             "provider": "00000001-0000-0001-0000-000100000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "n⯲􌎁􈲨󷾴r􋑩^\u0018!Go늢r󶾀\u0003V\u001f3L#᎘WX+􊭉Zv\r%qhS얻\u0015\u0003\u001f𫐁\u0005􌦣P􊳿BWk\u001d𣄁O󴎹챺ࣹ%w󻼝5^k\u0011{RYT\u001d󳉅􊚾C%\u0011\u0012\u0015\u0004m\u001d~\u0015𪜣|h*",
-            "id": "00000001-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "n⯲􌎁􈲨󷾴r􋑩^\u0018!Go늢r󶾀\u0003V\u001f3L#᎘WX+􊭉Zv\r%qhS얻\u0015\u0003\u001f𫐁\u0005􌦣P􊳿BWk\u001d𣄁O󴎹챺ࣹ%w󻼝5^k\u0011{RYT\u001d󳉅􊚾C%\u0011\u0012\u0015\u0004m\u001d~\u0015𪜣|h*",
             "provider": "00000000-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "􉝋0\u0017>1=\u0005\u001c,Q\u0007J&􆎼!󽣎󺵜\t􈢁(\u0011􀻰\u000f[o~&.\u0015,-U􈆳e/ZﴦB6Jy𣕉3𭫼\u000eT>\u0018KY\u001aD-􋗊9tr󴯄pK02rEy\"`✓XO.󳢠B:P<󻤓𡼮#󱵫}>\u0012,\\\u001d\u001aUg3F󻏈z/",
-            "id": "00000001-0000-0001-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000000000001",
+            "name": "􉝋0\u0017>1=\u0005\u001c,Q\u0007J&􆎼!󽣎󺵜\t􈢁(\u0011􀻰\u000f[o~&.\u0015,-U􈆳e/ZﴦB6Jy𣕉3𭫼\u000eT>\u0018KY\u001aD-􋗊9tr󴯄pK02rEy\"`✓XO.󳢠B:P<󻤓𡼮#󱵫}>\u0012,\\\u001d\u001aUg3F󻏈z/",
             "provider": "00000000-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "*ao(\u0004\u0011􎲬B\u000bu\u0002\u001fxU\u0002\u0000󳌦e󴍵Zp\u0011~m!S󳡱\u00069-d\u0010t#`\u0008?􋬚<G\u001e&%q𠖀5\u001b\u0019:𤈏\u0018J𮠆\u0015\u0003PtHu1\t\u001f\u00023󳸅",
-            "id": "00000001-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "*ao(\u0004\u0011􎲬B\u000bu\u0002\u001fxU\u0002\u0000󳌦e󴍵Zp\u0011~m!S󳡱\u00069-d\u0010t#`\u0008?􋬚<G\u001e&%q𠖀5\u001b\u0019:𤈏\u0018J𮠆\u0015\u0003PtHu1\t\u001f\u00023󳸅",
             "provider": "00000001-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_16.json
index 8a47b53a14e..b2beea18f92 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_16.json
@@ -2,16 +2,16 @@
     "has_more": false,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u0017dm\u001b􈅑*秸󵆈\u0019\u0014H=t\u00147BQv\u001bf􊎪\\嶨.𡽭)>(O㰜o",
-            "id": "00000001-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "\u0017dm\u001b􈅑*秸󵆈\u0019\u0014H=t\u00147BQv\u001bf􊎪\\嶨.𡽭)>(O㰜o",
             "provider": "00000001-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": [
                 "business"
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_17.json
index 4240fe8696c..08cff2a316f 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_17.json
@@ -1,4 +1,4 @@
 {
     "has_more": false,
     "services": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_18.json
index e51d23f3235..b2ee1a413c5 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_18.json
@@ -2,24 +2,24 @@
     "has_more": false,
     "services": [
         {
-            "summary": "",
-            "enabled": false,
-            "name": "(B:}Y%\u0003Zfv\u001fe\u001fx􅀵􅭅\u001dᗩ`|1(\r\u00049🦏\u001f􇨙7􇰱翗\rn󸿗\u0015L\u0013HD󾪖1󳞤󽠃_ୣd\u0003􎎔Q(KZR󴾐?q-9\u0019\\󸙛nt?켚\u0003𢳭\u0015\u0015󽻮\u0016𩡶􍤱!\u0000攐bV𤒅\r!󻚃J&xJ{Gb2",
-            "id": "00000000-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": "(B:}Y%\u0003Zfv\u001fe\u001fx􅀵􅭅\u001dᗩ`|1(\r\u00049🦏\u001f􇨙7􇰱翗\rn󸿗\u0015L\u0013HD󾪖1󳞤󽠃_ୣd\u0003􎎔Q(KZR󴾐?q-9\u0019\\󸙛nt?켚\u0003𢳭\u0015\u0015󽻮\u0016𩡶􍤱!\u0000攐bV𤒅\r!󻚃J&xJ{Gb2",
             "provider": "00000001-0000-0001-0000-000100000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "|GR􎛈($\u001bM𥀸#uX\u000b&􄣽\u0005\u0000.7o-J~𗸣~M>r",
-            "id": "00000001-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "|GR􎛈($\u001bM𥀸#uX\u000b&􄣽\u0005\u0000.7o-J~𗸣~M>r",
             "provider": "00000000-0000-0001-0000-000100000000",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_19.json
index 794df2c1a86..f8f6a12c748 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_19.json
@@ -2,64 +2,64 @@
     "has_more": false,
     "services": [
         {
-            "summary": "",
-            "enabled": false,
-            "name": "Cu8a\u000b\u0003𡭆\u0005X?A㔃\u000bNap\u00120\u0011\n\u0000=\u001b\"󾵥\u00042􌯨\u0010𬉞[,b\u0008𭅀ijG$𗾏PG\u000e\u0000󶬊c\u001e4_X}{n?h\u0010󿰟.\u000f@)\u001d^𭎫$X:𘪃􈘧&阽\u0015S,𬰙􇡳_𧗤y$#}O𬹼bE\n8(i`O5bC鋋W䘹@𖤴W'󷣬𛆐\ra",
-            "id": "00000000-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "Cu8a\u000b\u0003𡭆\u0005X?A㔃\u000bNap\u00120\u0011\n\u0000=\u001b\"󾵥\u00042􌯨\u0010𬉞[,b\u0008𭅀ijG$𗾏PG\u000e\u0000󶬊c\u001e4_X}{n?h\u0010󿰟.\u000f@)\u001d^𭎫$X:𘪃􈘧&阽\u0015S,𬰙􇡳_𧗤y$#}O𬹼bE\n8(i`O5bC鋋W䘹@𖤴W'󷣬𛆐\ra",
             "provider": "00000000-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "𣖭p𤪤#=𡘵-\n𧣜\r􄳤𧨇𩕸\u001c;むlK^<o=𢤧R𡢰+䖂wo\u001a\u000b\u0017,!PXRY䣩cUG0KU\u001c\u0011`e{󹚔.󲑾\u001c\u000cB\r\u001f\u00081<Y^e=\u001f𢴡|V\u000c4\u0017H\u000biMr𭅫k-󷐷t?\tPo𣸡ሳ\u0004\u0000􎻲5vzg@\u0017𦳬s&Q9#&Xsr<􍀗\u000c\u0015F<]􊇒\u0010󷻊#\rS",
-            "id": "00000000-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": "𣖭p𤪤#=𡘵-\n𧣜\r􄳤𧨇𩕸\u001c;むlK^<o=𢤧R𡢰+䖂wo\u001a\u000b\u0017,!PXRY䣩cUG0KU\u001c\u0011`e{󹚔.󲑾\u001c\u000cB\r\u001f\u00081<Y^e=\u001f𢴡|V\u000c4\u0017H\u000biMr𭅫k-󷐷t?\tPo𣸡ሳ\u0004\u0000􎻲5vzg@\u0017𦳬s&Q9#&Xsr<􍀗\u000c\u0015F<]􊇒\u0010󷻊#\rS",
             "provider": "00000001-0000-0001-0000-000100000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "􃍾.󷉻T𭯐\u001a󺊔󷵞\u0012_x󼴻􄃡mm",
-            "id": "00000000-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "􃍾.󷉻T𭯐\u001a󺊔󷵞\u0012_x󼴻􄃡mm",
             "provider": "00000000-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "W!􄫭Gx0K$_|/U[H",
-            "id": "00000001-0000-0001-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0001-0000-000000000001",
+            "name": "W!􄫭Gx0K$_|/U[H",
             "provider": "00000001-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u0011z\u0012첫",
-            "id": "00000000-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "\u0011z\u0012첫",
             "provider": "00000000-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "BgU}_𝑉:𑊺\u0019m󴴧𦭐uO󿳥􍒥G>󿥳y5K/e]hJ(𣯣;𣡉Y􍅅n􎴄5\u0006\"O𦎼k\u0015V􈋨\u0019\u0003zd8Z􍫊?3𨛑J\u0016/✃𣁱%놸 \\\u0018eu􆚼E||􅕼L𝆟뗪mfo(𢵕킺\u0007\u001deQ𥿸󵸕,",
-            "id": "00000000-0000-0001-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": "BgU}_𝑉:𑊺\u0019m󴴧𦭐uO󿳥􍒥G>󿥳y5K/e]hJ(𣯣;𣡉Y􍅅n􎴄5\u0006\"O𦎼k\u0015V􈋨\u0019\u0003zd8Z􍫊?3𨛑J\u0016/✃𣁱%놸 \\\u0018eu􆚼E||􅕼L𝆟뗪mfo(𢵕킺\u0007\u001deQ𥿸󵸕,",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_2.json
index 60fffce49c6..466022bef3f 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_2.json
@@ -2,34 +2,34 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u000c繗u\u001d\t󱻔,\u000bRG*\u0003g\u0015\u0018O𒃲𪡚\u0013햽x4A𨵷\u0002\u0000歄%󿵚J_\u0018ᨯaL|󶌜$w󰦑\u0007󱜈+&Hbf𘅐鑩𞥇􁛀DQjJ8;􋧔𗥲󲴟􅺸Ꞽ􃮋\u0006𘝃󳖒l𡯗􆛜H=\"n)\u001d󹼈u0d}\"2N\u0019",
-            "id": "00000001-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "\u000c繗u\u001d\t󱻔,\u000bRG*\u0003g\u0015\u0018O𒃲𪡚\u0013햽x4A𨵷\u0002\u0000歄%󿵚J_\u0018ᨯaL|󶌜$w󰦑\u0007󱜈+&Hbf𘅐鑩𞥇􁛀DQjJ8;􋧔𗥲󲴟􅺸Ꞽ􃮋\u0006𘝃󳖒l𡯗􆛜H=\"n)\u001d󹼈u0d}\"2N\u0019",
             "provider": "00000000-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "~\u0001\"\u001f\u001c?\u0002&󾛨H𬵺wKJ𐀍~h\u000e[P󱡓a𤳏8󻢘\u0007F𩆷do1\\cT􇀢󺥰\\lk􄂞u󾾪Ca􀮢!syBL;+𢨋Ly*Z\u0008hR`\u0015NꈘQ􋿪􅎹\u0008c󺩬x󺏟V\u0005󲑷z􅈂%6nAgh\u0003Q\u0008&.1𧾥9𤸭QnS 5KD^嫃Ah𤪂⥢𭢛+HKt\u0006U\\\u000f0[@\u0019:",
-            "id": "00000000-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "~\u0001\"\u001f\u001c?\u0002&󾛨H𬵺wKJ𐀍~h\u000e[P󱡓a𤳏8󻢘\u0007F𩆷do1\\cT􇀢󺥰\\lk􄂞u󾾪Ca􀮢!syBL;+𢨋Ly*Z\u0008hR`\u0015NꈘQ􋿪􅎹\u0008c󺩬x󺏟V\u0005󲑷z􅈂%6nAgh\u0003Q\u0008&.1𧾥9𤸭QnS 5KD^嫃Ah𤪂⥢𭢛+HKt\u0006U\\\u000f0[@\u0019:",
             "provider": "00000000-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "!N䛉(W\u000e\u00084\u001fz\u001eT𒂀B𗇙󼗎CC毣􄓂󼢽9🟅%\u0012-Q풹娽\u0004>p%􇢻89a\u0017,\u0002𪘮ZF\t\u000f\u0014D\u001eS:\u001e,D􏱸\u00085P\u000b󳼠pjhXpJy\u0001\u000e\u0011'\u001d\u001f𡒿:􂒂;\t0U\u0014\u001fM􊢥yE.\u001eD8󰽚㹇=󾸌~(\\cp𬩥蟙\u000e`HU\u0014ꒋ<플𨱝﹫𠲅𣶟*L󳵥<\u0017%K2𝣯戲QWXH\u000b",
-            "id": "00000001-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "!N䛉(W\u000e\u00084\u001fz\u001eT𒂀B𗇙󼗎CC毣􄓂󼢽9🟅%\u0012-Q풹娽\u0004>p%􇢻89a\u0017,\u0002𪘮ZF\t\u000f\u0014D\u001eS:\u001e,D􏱸\u00085P\u000b󳼠pjhXpJy\u0001\u000e\u0011'\u001d\u001f𡒿:􂒂;\t0U\u0014\u001fM􊢥yE.\u001eD8󰽚㹇=󾸌~(\\cp𬩥蟙\u000e`HU\u0014ꒋ<플𨱝﹫𠲅𣶟*L󳵥<\u0017%K2𝣯戲QWXH\u000b",
             "provider": "00000001-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_20.json
index 75475e5278b..136aad67617 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_20.json
@@ -2,44 +2,44 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "􄤯!2Rlox󴔭\t𦆵愖􎋆􊕿 'T1󴃀P𭶿YzF5Qe\t>|}C\u001e\u0015G\u0019e켌x껼􈛮\u0018Ce􆽮𘈊')\n􇫤7🨇D\u00043p19!O𡲝^󹄶􇟞\nL}Cj&\u001fX'hP{Pux>괚\u0014\u0014\u0001\u0007[\\5\t",
-            "id": "00000001-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "􄤯!2Rlox󴔭\t𦆵愖􎋆􊕿 'T1󴃀P𭶿YzF5Qe\t>|}C\u001e\u0015G\u0019e켌x껼􈛮\u0018Ce􆽮𘈊')\n􇫤7🨇D\u00043p19!O𡲝^󹄶􇟞\nL}Cj&\u001fX'hP{Pux>괚\u0014\u0014\u0001\u0007[\\5\t",
             "provider": "00000000-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "!􌜶\u0002\u0003 1\u0007\u0004\u000e(C\u0002\r􁍠a\\\u001d􍤭~D𓆜On\u000f6\u0014𥽁4\u0016\u0014𡚆f􋹝T\u000f\u000821X,!˝􋨱7𠤬EM*𨪧d𗷶\u0007A爎7\\󰾀󴲧>7\u0006s􄝀!\u0013Bq0\u001c𭍍-i{)󶞁􅉕K㣢Y\u001aK\u000e\u0013W\u0005􁴘E(VD]S&%𫯶@E'x`\u0019H􂎒窕빇f\u000e",
-            "id": "00000000-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "!􌜶\u0002\u0003 1\u0007\u0004\u000e(C\u0002\r􁍠a\\\u001d􍤭~D𓆜On\u000f6\u0014𥽁4\u0016\u0014𡚆f􋹝T\u000f\u000821X,!˝􋨱7𠤬EM*𨪧d𗷶\u0007A爎7\\󰾀󴲧>7\u0006s􄝀!\u0013Bq0\u001c𭍍-i{)󶞁􅉕K㣢Y\u001aK\u000e\u0013W\u0005􁴘E(VD]S&%𫯶@E'x`\u0019H􂎒窕빇f\u000e",
             "provider": "00000001-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\u0013\u0014yY􆫲I\u0002\u00031o𡸢ers ]A^5\u001b`@\\\u0016QD8'=,:(󾽬𣠮? 󺃄B+\u0019n\u0005􉝹\u0006r#z;]󸁞\u0007t\u0002􏿛3􉡼󸏋{\rL\\ᜱ'l𩊙\u0004[\u001f\u001eR(\u0019PfT󷸰\u0002J󶋴ﱇ󸫚\u0015[\u000c\n힌B`H𬽿􅭊v)5\u0002])~\u0004y|G\u0016􇠲󳖩:h\u0010𗯁n(",
-            "id": "00000001-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "\u0013\u0014yY􆫲I\u0002\u00031o𡸢ers ]A^5\u001b`@\\\u0016QD8'=,:(󾽬𣠮? 󺃄B+\u0019n\u0005􉝹\u0006r#z;]󸁞\u0007t\u0002􏿛3􉡼󸏋{\rL\\ᜱ'l𩊙\u0004[\u001f\u001eR(\u0019PfT󷸰\u0002J󶋴ﱇ󸫚\u0015[\u000c\n힌B`H𬽿􅭊v)5\u0002])~\u0004y|G\u0016􇠲󳖩:h\u0010𗯁n(",
             "provider": "00000000-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "읤> \u0014rM]\u001a𦜵\u0011\n$0󾷩P\u0006-G𛇬☁",
-            "id": "00000000-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "읤> \u0014rM]\u001a𦜵\u0011\n$0󾷩P\u0006-G𛇬☁",
             "provider": "00000001-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_3.json
index e27f3ee6b28..5319c078e05 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_3.json
@@ -2,14 +2,14 @@
     "has_more": false,
     "services": [
         {
-            "summary": "뷇",
-            "enabled": false,
-            "name": "Y\u0004󾕃􊎖{g+c\u0008)F\nR$㚸𩯽L/󳞵\u0005jd𧎓Q7{\\I0󰯅S\u0001\u0012𡉗I>c.)\t\u0019KQ\u001a󽺻N!;K\"F󾍧k켳𩯢F󽄌.c [5U\u0008/􄋇g󲜉x𤉎昚\u0001/_'\u0019\u00109QW|6󿂽%㤸,4PH@j􂇷󽜶=蔠􍿣`8L4\rqCJDq𬤱\u0006+𢱶%􁑳S멄j1<",
-            "id": "00000001-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "Y\u0004󾕃􊎖{g+c\u0008)F\nR$㚸𩯽L/󳞵\u0005jd𧎓Q7{\\I0󰯅S\u0001\u0012𡉗I>c.)\t\u0019KQ\u001a󽺻N!;K\"F󾍧k켳𩯢F󽄌.c [5U\u0008/􄋇g󲜉x𤉎昚\u0001/_'\u0019\u00109QW|6󿂽%㤸,4PH@j􂇷󽜶=蔠􍿣`8L4\rqCJDq𬤱\u0006+𢱶%􁑳S멄j1<",
             "provider": "00000001-0000-0000-0000-000000000001",
+            "summary": "뷇",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_4.json
index 5d77bbb033d..ed701eeb32e 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_4.json
@@ -2,124 +2,124 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u0012ਔ\u0004?\rE59 5\u001a󺞲IE旈䘬\\\u001a􋙭\u0017𮛓v􊞸z\u001e颼\u0010𡅋􍅓>Dohc%v\"􋷃钤ㅫ󷡽oku\t J󼫲._TG􁞅𝥯𭍸^󴙐M𝝭➵\u0000!r?\u0019ᖝ󰺥󲢨x𨨩\u0006썟+\u0012\u0004𒅟N\u0007,􊵨p>􃵍I~\n0\u001d\u0006\u0014𮨎Z閻ው\u0006%c𫚨-[捧cK",
-            "id": "00000001-0000-0001-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": "\u0012ਔ\u0004?\rE59 5\u001a󺞲IE旈䘬\\\u001a􋙭\u0017𮛓v􊞸z\u001e颼\u0010𡅋􍅓>Dohc%v\"􋷃钤ㅫ󷡽oku\t J󼫲._TG􁞅𝥯𭍸^󴙐M𝝭➵\u0000!r?\u0019ᖝ󰺥󲢨x𨨩\u0006썟+\u0012\u0004𒅟N\u0007,􊵨p>􃵍I~\n0\u001d\u0006\u0014𮨎Z閻ው\u0006%c𫚨-[捧cK",
             "provider": "00000001-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "~󿸼M\tq\u0000D悾.!󹹱\u0007홒r(𧎤>OFM\u000c􌞖(\u0005a󴯟󻰖",
-            "id": "00000000-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "~󿸼M\tq\u0000D悾.!󹹱\u0007홒r(𧎤>OFM\u000c􌞖(\u0005a󴯟󻰖",
             "provider": "00000001-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "B\n\u000b/m𭵓,ိ+/-*􍟹Z+",
-            "id": "00000000-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "B\n\u000b/m𭵓,ိ+/-*􍟹Z+",
             "provider": "00000000-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u0018\u001a\u001bf\u0018\u0008E\u0010\u0005B0㺫\u0002\u00109vs\u0014)􁞀\t𡬬dmH7UD\u0011􄪖𡗨\u001b7^!A6pJHS\u000c\u0013OK[7\u0017g",
-            "id": "00000000-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "\u0018\u001a\u001bf\u0018\u0008E\u0010\u0005B0㺫\u0002\u00109vs\u0014)􁞀\t𡬬dmH7UD\u0011􄪖𡗨\u001b7^!A6pJHS\u000c\u0013OK[7\u0017g",
             "provider": "00000000-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "V5Fa𠢍CSDmKNpM\u0005EQ-\u001b뽗󲱂8􈃊O\u000f?dT跾AEWXm󾪔Wo\u001e\u001bu\\+L\n\u001dZRAu-,󹖍󺃗\r􀀪\u0011쇢󶓻\u000e\u0012cn\u0019",
-            "id": "00000000-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "V5Fa𠢍CSDmKNpM\u0005EQ-\u001b뽗󲱂8􈃊O\u000f?dT跾AEWXm󾪔Wo\u001e\u001bu\\+L\n\u001dZRAu-,󹖍󺃗\r􀀪\u0011쇢󶓻\u000e\u0012cn\u0019",
             "provider": "00000000-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "s\t3\u0016n𬚶J䯵uTA󹟩\u0013O󲙶i0\u0013\u0013\u0019N\u0016N\u0006xF<\u0019\u0018<c\u0003\u0017\u000bw=\u0017\nr,fߎ\u0002\u0001𮋴(\u0003\u0003\u000e_\u0007\u0016\u0015d|LG󹕽D#𥑗x{叕M𠯝y󳾬􈩺'M􁓱\u0019N𦃾",
-            "id": "00000000-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "s\t3\u0016n𬚶J䯵uTA󹟩\u0013O󲙶i0\u0013\u0013\u0019N\u0016N\u0006xF<\u0019\u0018<c\u0003\u0017\u000bw=\u0017\nr,fߎ\u0002\u0001𮋴(\u0003\u0003\u000e_\u0007\u0016\u0015d|LG󹕽D#𥑗x{叕M𠯝y󳾬􈩺'M􁓱\u0019N𦃾",
             "provider": "00000001-0000-0000-0000-000100000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "C󲈧􆢎i錤",
-            "id": "00000000-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "C󲈧􆢎i錤",
             "provider": "00000001-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "a$\u0004E\u0008&󶓯;b&\u0002Zsy\u0013tT𥗝Rje\u001d\u001cn𢆖󷸥箍i\u0007DolXo\u0018k􍯝>iNJR󵑷m`\u000fR\u0019T󸎜?GV\u0004%#^a(;;j-􉩍uS\u0003\u001di:\u001bZ\u0013𥿋?饑\u001aVItQ󴸶$𮔹P􀼠\u0018𮫲",
-            "id": "00000000-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "a$\u0004E\u0008&󶓯;b&\u0002Zsy\u0013tT𥗝Rje\u001d\u001cn𢆖󷸥箍i\u0007DolXo\u0018k􍯝>iNJR󵑷m`\u000fR\u0019T󸎜?GV\u0004%#^a(;;j-􉩍uS\u0003\u001di:\u001bZ\u0013𥿋?饑\u001aVItQ󴸶$𮔹P􀼠\u0018𮫲",
             "provider": "00000000-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "㯊tP!+䣤.\r0\n󼂏\u000b\\\u001b\u0003qW􍢩x'S2_󹥧15b󴔙jm𭸻𩍙x듣`􀪓&k󹟼\r?󾟏𭵮\u0006L",
-            "id": "00000000-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": "㯊tP!+䣤.\r0\n󼂏\u000b\\\u001b\u0003qW􍢩x'S2_󹥧15b󴔙jm𭸻𩍙x듣`􀪓&k󹟼\r?󾟏𭵮\u0006L",
             "provider": "00000000-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\n􁤋\u0015VYO{󸅖\u0006󸿮𠲪\u000f4\u0017󽶪\u000bS'~􋾚v𘥖􎠼b(*8󴄳\u000e\u0001𠩀&H3LAG􂫡\u0011\u00135\\<\u000fU絿5t𢨌j\rOe􊈯t􏕁P_OW;|L`\"e@v\u0011:e7e㴆8h1\u0017[w󶵠\u0007",
-            "id": "00000001-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000100000000",
+            "name": "\n􁤋\u0015VYO{󸅖\u0006󸿮𠲪\u000f4\u0017󽶪\u000bS'~􋾚v𘥖􎠼b(*8󴄳\u000e\u0001𠩀&H3LAG􂫡\u0011\u00135\\<\u000fU絿5t𢨌j\rOe􊈯t􏕁P_OW;|L`\"e@v\u0011:e7e㴆8h1\u0017[w󶵠\u0007",
             "provider": "00000000-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u0008\u0014S\u00141\u0001.􀲤\tw􆧲𫽳\u0015*\t\u001b􇐟1jp􂥝蛃􌅖3(ܫ􉍩\u00108᠌-􋝨 텀co\u001b\u00033\nt\u0006\u0008M)}􆹫r\n|xrZ􆰤D@\u000e谮0A8\u0007󿰃󽒩Q|QqiB%󿓭\u0015$>u􇀬A<\ro&p\n\rmMC9b.󻡥𗃲]􌇳P>\u0015𭳀yXg~j[􄀦\u0010ᷨ,􄈿 \u0006\u0003i􁥲󶸓d0\u0017X󴑧%!f\u0003\u0014",
-            "id": "00000001-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0000-0000-000100000000",
+            "name": "\u0008\u0014S\u00141\u0001.􀲤\tw􆧲𫽳\u0015*\t\u001b􇐟1jp􂥝蛃􌅖3(ܫ􉍩\u00108᠌-􋝨 텀co\u001b\u00033\nt\u0006\u0008M)}􆹫r\n|xrZ􆰤D@\u000e谮0A8\u0007󿰃󽒩Q|QqiB%󿓭\u0015$>u􇀬A<\ro&p\n\rmMC9b.󻡥𗃲]􌇳P>\u0015𭳀yXg~j[􄀦\u0010ᷨ,􄈿 \u0006\u0003i􁥲󶸓d0\u0017X󴑧%!f\u0003\u0014",
             "provider": "00000000-0000-0001-0000-000100000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "𫏛'gK\u000c𥰅U\u0019]^\u0002\u0006:\t\\􂻋_𭮊􆧰3n𦪺~􈴮\u000e\u0003v𮙮۷W󸖆K\u0008󹝦\r􆊻4!et%􂚊줒w2􏫎⁧f\u001c\u00062󵁽U\u0007\\􄜟𮋺s󺐓9{\u0002Oac𩒃hdak𩞡|\u001b󺯸􁫭+b\u0011\u0008_𪵼5𮓮>:\u0019\u000e^U9\u0001\u0018𑗕p\u001f\u001a5ſ𗫓KN0L&S\n\u0003QR󽥦YjR,t\"b\u0005\u000c'",
-            "id": "00000000-0000-0001-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000000000001",
+            "name": "𫏛'gK\u000c𥰅U\u0019]^\u0002\u0006:\t\\􂻋_𭮊􆧰3n𦪺~􈴮\u000e\u0003v𮙮۷W󸖆K\u0008󹝦\r􆊻4!et%􂚊줒w2􏫎⁧f\u001c\u00062󵁽U\u0007\\􄜟𮋺s󺐓9{\u0002Oac𩒃hdak𩞡|\u001b󺯸􁫭+b\u0011\u0008_𪵼5𮓮>:\u0019\u000e^U9\u0001\u0018𑗕p\u001f\u001a5ſ𗫓KN0L&S\n\u0003QR󽥦YjR,t\"b\u0005\u000c'",
             "provider": "00000000-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_5.json
index 337506e6929..78c10f899e9 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_5.json
@@ -2,44 +2,44 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "𩆼\u001fA4𩃐󵻙bx𨤋G=7tdW5UW\\𭱅8\u0003h𦙏y)YiF􇫐 \u0018𧹨\u001a*nuV=@L󾝫c苾",
-            "id": "00000000-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "𩆼\u001fA4𩃐󵻙bx𨤋G=7tdW5UW\\𭱅8\u0003h𦙏y)YiF􇫐 \u0018𧹨\u001a*nuV=@L󾝫c苾",
             "provider": "00000000-0000-0001-0000-000100000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\"\u000c󽑺\u0014\u0007\u000cdP]%k",
-            "id": "00000000-0000-0001-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": "\"\u000c󽑺\u0014\u0007\u000cdP]%k",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "vDj!\u0015\u000c&𗡼`􊪥􅔏x]𩔠\u000f\u001e𫔁\u001eF^N\u0016uW\t)\u0017\u000fxB\u0017䬊yr􃤮𪄹\u0014􌴠#J\u0008k`t&}󻆝\u0007AhUOh&>:V3᪨ED`S𤱈T\u000f𐂸똧^^B􈍎󽫺􉟍xy醤摆\u0012o\u001f􃔀\u000fr*]𓃇cP⛱E􁓂|\u001aWlhtY\u000eH\u000c􆛫\\A!\u0008+\u000cg肮a\u000fG𪕩\n<\u0018𧶋r\u0001l",
-            "id": "00000001-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "vDj!\u0015\u000c&𗡼`􊪥􅔏x]𩔠\u000f\u001e𫔁\u001eF^N\u0016uW\t)\u0017\u000fxB\u0017䬊yr􃤮𪄹\u0014􌴠#J\u0008k`t&}󻆝\u0007AhUOh&>:V3᪨ED`S𤱈T\u000f𐂸똧^^B􈍎󽫺􉟍xy醤摆\u0012o\u001f􃔀\u000fr*]𓃇cP⛱E􁓂|\u001aWlhtY\u000eH\u000c􆛫\\A!\u0008+\u000cg肮a\u000fG𪕩\n<\u0018𧶋r\u0001l",
             "provider": "00000000-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "$􊋡&?f6󿔑\u0008𥄉/:󸢾-\u001d9®`_b􆃾\u0000𩕳Y;xA?8!22*K\u0012\u0012~\u0016􀖐Pg\u0007\u0013#𣁃\u0010􄴉􊭊ⅸ6𦵒",
-            "id": "00000001-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": "$􊋡&?f6󿔑\u0008𥄉/:󸢾-\u001d9®`_b􆃾\u0000𩕳Y;xA?8!22*K\u0012\u0012~\u0016􀖐Pg\u0007\u0013#𣁃\u0010􄴉􊭊ⅸ6𦵒",
             "provider": "00000001-0000-0001-0000-000100000000",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_6.json
index 0a4b43c6f6d..d4774032044 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_6.json
@@ -2,16 +2,16 @@
     "has_more": false,
     "services": [
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\u0002𛉓󵇵/g𭑮\u001b𐘠/u󳩇䷈`\u0015{@.\u0005^k Z\u0016QiL􅯻h|Y\u0015y\u00174s󾱑V𔑙N@N\u000fu5􎊰𧀾dqs9\u0017w,\u0017\u0016hr9\u0014􅼰",
-            "id": "00000000-0000-0000-0000-000000000000",
             "assets": [],
             "description": "%",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "\u0002𛉓󵇵/g𭑮\u001b𐘠/u󳩇䷈`\u0015{@.\u0005^k Z\u0016QiL􅯻h|Y\u0015y\u00174s󾱑V𔑙N@N\u000fu5􎊰𧀾dqs9\u0017w,\u0017\u0016hr9\u0014􅼰",
             "provider": "00000000-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": [
                 "music"
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_7.json
index 4240fe8696c..08cff2a316f 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_7.json
@@ -1,4 +1,4 @@
 {
     "has_more": false,
     "services": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_8.json
index f46bb7817c9..6e53114e045 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_8.json
@@ -2,84 +2,84 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "8\u001e斮\u0000𭉽􆇢\u001a\u0001];\u001f\u001b%􂃫BpW\u0001~ᣬmF\u0015;q􁍦tV𥞢7\u001d􅎂T+;j\u0003].\u0013\u0012kcr\u0000󵕆􀠅2",
-            "id": "00000000-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "8\u001e斮\u0000𭉽􆇢\u001a\u0001];\u001f\u001b%􂃫BpW\u0001~ᣬmF\u0015;q􁍦tV𥞢7\u001d􅎂T+;j\u0003].\u0013\u0012kcr\u0000󵕆􀠅2",
             "provider": "00000000-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\u001d+G4謰SvT&膻Gp4>𗀇U\u0014nQL\"𠔍Rg􆅴>*OX0𡒩1|/󲝛C𤴄\n\u000eXE\u001aD{n\u0001\u0019\u0012\u0017>\u0001蠎\u000e'U2m𘚏r;'y\\\u001c\u000c@󶾚-ZP#󴽅믾𘝯!j􎒪,꯱\u0002\u0017\u001e\u001c\u0010Q\u0001󵴢𗁋\u0010",
-            "id": "00000001-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "\u001d+G4謰SvT&膻Gp4>𗀇U\u0014nQL\"𠔍Rg􆅴>*OX0𡒩1|/󲝛C𤴄\n\u000eXE\u001aD{n\u0001\u0019\u0012\u0017>\u0001蠎\u000e'U2m𘚏r;'y\\\u001c\u000c@󶾚-ZP#󴽅믾𘝯!j􎒪,꯱\u0002\u0017\u001e\u001c\u0010Q\u0001󵴢𗁋\u0010",
             "provider": "00000000-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\u0019􂿁󲉟M\u000c\u0005\u0007\u000eM\r\u001c>𓄇/􅼍3↟\u0000󾧯󽦷􁷁[󺿱󴢚M f\u0013z5􀄱\"󼌝⥺\u001cL􇒥𘘁}kwA𬵢Cn㠏𖧮\u0015E\u0003󽇤휎\u0007#`\u0018sFIAk슶`𣶧;\u0001􍬃Lf\u0007\u001d=\u0005}􏍟6y璊_",
-            "id": "00000000-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": "\u0019􂿁󲉟M\u000c\u0005\u0007\u000eM\r\u001c>𓄇/􅼍3↟\u0000󾧯󽦷􁷁[󺿱󴢚M f\u0013z5􀄱\"󼌝⥺\u001cL􇒥𘘁}kwA𬵢Cn㠏𖧮\u0015E\u0003󽇤휎\u0007#`\u0018sFIAk슶`𣶧;\u0001􍬃Lf\u0007\u001d=\u0005}􏍟6y璊_",
             "provider": "00000001-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u001f!e",
-            "id": "00000000-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "\u001f!e",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\u0019􀑼A󾑩M⍫𛰊\t&^\"\nⱫ勭J\u000e0Z􊯢&\u0011\u0018l𣁇),yQ󻘴8󸘳d􈃍𥿒🉥3𮮴ﰉev\u0017Y+H\u000fXf🂁t𫞡_􃳈a🥅1󳎑󰔓'\r\rQ7|􉂀\u0016p𪑸\u0000}𘍘)\u0008\u0000Ἥn敂󹴓j\u000e唹2I\rSN𦫇I󷱿[\u0012\u0002Q딜-􋯃",
-            "id": "00000001-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "\u0019􀑼A󾑩M⍫𛰊\t&^\"\nⱫ勭J\u000e0Z􊯢&\u0011\u0018l𣁇),yQ󻘴8󸘳d􈃍𥿒🉥3𮮴ﰉev\u0017Y+H\u000fXf🂁t𫞡_􃳈a🥅1󳎑󰔓'\r\rQ7|􉂀\u0016p𪑸\u0000}𘍘)\u0008\u0000Ἥn敂󹴓j\u000e唹2I\rSN𦫇I󷱿[\u0012\u0002Q딜-􋯃",
             "provider": "00000000-0000-0000-0000-000100000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "/e\u0014>P𤀍\u0004\u0001\u0003A-\u0006𩊒E'􏻨h\\󵄳V1󸢛",
-            "id": "00000001-0000-0001-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": "/e\u0014>P𤀍\u0004\u0001\u0003A-\u0006𩊒E'􏻨h\\󵄳V1󸢛",
             "provider": "00000000-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u0011<I+i\u0004􌤿묎󲩥􁛖텉ᔹ薻lE\u0006-S>󺄪3𑩬\u0008𮩹7H>\u0003-$C\u0003>􀹓~\u0003𗩤\u0004Y~\u000b\u001by+\\􃹠D?𘁄tn5*\u0018\u0002\u0008\u0006IG:yW𛱛\u0004𨴤\u0002g󰒦S\"\u0008v58\u001e^􄛤\u0018:\u001f\t \u0001􍵑\u000cd6:m\t돊S\u00140\u0016\u0017\u0004🖎kb󻴟\u0008𘞳o=\u001e⓷􎻽f𡐝=𛱉g\u001d26",
-            "id": "00000001-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "\u0011<I+i\u0004􌤿묎󲩥􁛖텉ᔹ薻lE\u0006-S>󺄪3𑩬\u0008𮩹7H>\u0003-$C\u0003>􀹓~\u0003𗩤\u0004Y~\u000b\u001by+\\􃹠D?𘁄tn5*\u0018\u0002\u0008\u0006IG:yW𛱛\u0004𨴤\u0002g󰒦S\"\u0008v58\u001e^􄛤\u0018:\u001f\t \u0001􍵑\u000cd6:m\t돊S\u00140\u0016\u0017\u0004🖎kb󻴟\u0008𘞳o=\u001e⓷􎻽f𡐝=𛱉g\u001d26",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "dT𤋍祇\u0019\u00039k%🄝\u000cd톶O\u0002􁶼\u0000]]b$AB8\t\u0018\u001d)y\u001a 4􈦻7`𤙱A3(O􉮂\u001f 􊨦b𧡴!c@󹮖&h$\u001d|F\u0004\u000b-Xqt\u0002>𧚻\u000c𣠤q{\u0011\t\u0010㣗d6잎\u001fwA􀒞\u001a􎪸􄖖\u0004\u0017N]\u0007󽶘I\u00177󺈷ᬶ\u000b8𪼏(",
-            "id": "00000000-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "dT𤋍祇\u0019\u00039k%🄝\u000cd톶O\u0002􁶼\u0000]]b$AB8\t\u0018\u001d)y\u001a 4􈦻7`𤙱A3(O􉮂\u001f 􊨦b𧡴!c@󹮖&h$\u001d|F\u0004\u000b-Xqt\u0002>𧚻\u000c𣠤q{\u0011\t\u0010㣗d6잎\u001fwA􀒞\u001a􎪸􄖖\u0004\u0017N]\u0007󽶘I\u00177󺈷ᬶ\u000b8𪼏(",
             "provider": "00000000-0000-0000-0000-000100000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_9.json
index 12fc6dbc09e..76dcd575d22 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfilePage_provider_9.json
@@ -2,114 +2,114 @@
     "has_more": true,
     "services": [
         {
-            "summary": "",
-            "enabled": true,
-            "name": "1rq𦔣KEi\u0008𥆮#U\\󺒝>W5y+=*.\\*&r􅌖#&nL𣿢\no\u000bv",
-            "id": "00000000-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "1rq𦔣KEi\u0008𥆮#U\\󺒝>W5y+=*.\\*&r􅌖#&nL𣿢\no\u000bv",
             "provider": "00000001-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "\u0013\u0013B0\u0004\u0004=[ⲿ㗖1\n?KegvHn5\rK󶋝D{ >!{}󶤻5\u000b1\u001b@\t&\u0011r6𫁴󴭐-i􏺱-:\u0019𥪽\n} ^M󴉌\u001dĪ􈶼y]쥨\u0005|l󶧛[󾌭5OdZJ{",
-            "id": "00000001-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "\u0013\u0013B0\u0004\u0004=[ⲿ㗖1\n?KegvHn5\rK󶋝D{ >!{}󶤻5\u000b1\u001b@\t&\u0011r6𫁴󴭐-i􏺱-:\u0019𥪽\n} ^M󴉌\u001dĪ􈶼y]쥨\u0005|l󶧛[󾌭5OdZJ{",
             "provider": "00000000-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "O𝗸>\\js|󷯁门\u000f/\u000ch𘦛2b\"􀡿𐭎󿵨6𩚉U󸜍ࠥZ\u0015&\u001di􋶥\u0002\u0012\u0011􌉥ꇅ쫟縵\u0016.*\u0012lPV\u0002\nwe𪞓=\"􋮒-Q _s\u001b󱠁\u0019p\u0015F",
-            "id": "00000001-0000-0001-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "O𝗸>\\js|󷯁门\u000f/\u000ch𘦛2b\"􀡿𐭎󿵨6𩚉U󸜍ࠥZ\u0015&\u001di􋶥\u0002\u0012\u0011􌉥ꇅ쫟縵\u0016.*\u0012lPV\u0002\nwe𪞓=\"􋮒-Q _s\u001b󱠁\u0019p\u0015F",
             "provider": "00000001-0000-0001-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "N\n3\u0018%3Ep0ZG3b􉃤)\u0007橵8貌L\u0018Bi󴗝u#W𗆴\t􁝢K\u0012c \u001dL𠩢hL5K,zh?V󿐴-\u0002ztZ\rX:=W\u00161Z㕢e`􁍥\u0002l7psf\u000e󼟹\u0001'􀂜\u0000z5>dL𨶗\n􉳹,08󻘨Q\u0018AF𗛞K[\t󽇡􏙂󽪨\u0011}𠑽!I\u000f0e 󿶮;\u0003P[!g𫲶",
-            "id": "00000001-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0000-0000-000100000000",
+            "name": "N\n3\u0018%3Ep0ZG3b􉃤)\u0007橵8貌L\u0018Bi󴗝u#W𗆴\t􁝢K\u0012c \u001dL𠩢hL5K,zh?V󿐴-\u0002ztZ\rX:=W\u00161Z㕢e`􁍥\u0002l7psf\u000e󼟹\u0001'􀂜\u0000z5>dL𨶗\n􉳹,08󻘨Q\u0018AF𗛞K[\t󽇡􏙂󽪨\u0011}𠑽!I\u000f0e 󿶮;\u0003P[!g𫲶",
             "provider": "00000000-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "󻥗%D󾥤𩀕ZT\u0001󲹿􊷌N&z\u000bq\u0018\u0018Za𪇕u\rWIu薘JeJ(\u0002𫵙\u001c􍮙\u0017u\u000e𨗰\u0012CP\u0005xgmPMhRb\u0004*DS]P^q󷿤Wl𗳕\u0007;bQ7䇖C",
-            "id": "00000000-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000001",
+            "name": "󻥗%D󾥤𩀕ZT\u0001󲹿􊷌N&z\u000bq\u0018\u0018Za𪇕u\rWIu薘JeJ(\u0002𫵙\u001c􍮙\u0017u\u000e𨗰\u0012CP\u0005xgmPMhRb\u0004*DS]P^q󷿤Wl𗳕\u0007;bQ7䇖C",
             "provider": "00000001-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "_%#𮈻T",
-            "id": "00000001-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "_%#𮈻T",
             "provider": "00000000-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "\u000c㰛\u0015\nJ􃱅茢\n\u0000\u001b\u0008(\u001deIi𩞂鉉}X􅋻{4e􆉠𠞐fESi\u0006􏫺m\u0018󸓻",
-            "id": "00000001-0000-0001-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": "\u000c㰛\u0015\nJ􃱅茢\n\u0000\u001b\u0008(\u001deIi𩞂鉉}X􅋻{4e􆉠𠞐fESi\u0006􏫺m\u0018󸓻",
             "provider": "00000000-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": true,
-            "name": "'Y\u0002􋱐虨\u001a\u0006~\u0015􎔏.;1\u0008>9𮙴8.Cn%𠋍J⼦4\u0007󶉇\\Q)ힾAD[/~5=sl眂s@𫵄s1f잮",
-            "id": "00000000-0000-0000-0000-000000000000",
             "assets": [],
             "description": "",
+            "enabled": true,
+            "id": "00000000-0000-0000-0000-000000000000",
+            "name": "'Y\u0002􋱐虨\u001a\u0006~\u0015􎔏.;1\u0008>9𮙴8.Cn%𠋍J⼦4\u0007󶉇\\Q)ힾAD[/~5=sl眂s@𫵄s1f잮",
             "provider": "00000001-0000-0001-0000-000100000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "=踶JN'W𭭠yVb\u0014X=`\u001fGL'3󺇾𐪌\n\u0018O\\!ti<\u000e\\𢊁󳱛I&<",
-            "id": "00000000-0000-0000-0000-000100000000",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": "=踶JN'W𭭠yVb\u0014X=`\u001fGL'3󺇾𐪌\n\u0018O\\!ti<\u000e\\𢊁󳱛I&<",
             "provider": "00000001-0000-0000-0000-000000000001",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "ꍎK\u001dj𠃕\u0014\n(k<Dp\u001bpNa𢂚3𢪟0\u0008p\u001c\u000b 𢐳K$\u00129t 䙷E𒀖)lL󽝋(𫚗湚#造鯭\u0011𨕁@\u0006RfL,6󴟨\u0002?􀆫􂗠B!k\u0014M\u000b􉢆Y$ES$\u000c\u001aQmꊽ\u0012Gn􏯬>𬼥󳓋|􇦕@)󵠝mA}얼D]=qcW􀥇8mc\u0010w4\u0015\u0010",
-            "id": "00000001-0000-0000-0000-000000000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": "ꍎK\u001dj𠃕\u0014\n(k<Dp\u001bpNa𢂚3𢪟0\u0008p\u001c\u000b 𢐳K$\u00129t 䙷E𒀖)lL󽝋(𫚗湚#造鯭\u0011𨕁@\u0006RfL,6󴟨\u0002?􀆫􂗠B!k\u0014M\u000b􉢆Y$ES$\u000c\u001aQmꊽ\u0012Gn􏯬>𬼥󳓋|􇦕@)󵠝mA}얼D]=qcW􀥇8mc\u0010w4\u0015\u0010",
             "provider": "00000001-0000-0000-0000-000000000000",
+            "summary": "",
             "tags": []
         },
         {
-            "summary": "",
-            "enabled": false,
-            "name": "P􄀉\nl&\"\u000c\u0001慁5;󷂃\u0005阘1,\n-􏟎𧛝c\\􂖟dIl\u0017󻂉𪙣ற`\u0012똱~\u0018\u0001.{q\u0001\"Al􎕣𭵻|\u0015x\u0010􌶸t\u0014\u001a\u001e\u000cN\u0006󺗦󰢌\u0000K9%2扃jA\u001d􇕱/􈂴𬻏\u000c<􌗟𣕲\"",
-            "id": "00000001-0000-0000-0000-000100000001",
             "assets": [],
             "description": "",
+            "enabled": false,
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": "P􄀉\nl&\"\u000c\u0001慁5;󷂃\u0005阘1,\n-􏟎𧛝c\\􂖟dIl\u0017󻂉𪙣ற`\u0012똱~\u0018\u0001.{q\u0001\"Al􎕣𭵻|\u0015x\u0010􌶸t\u0014\u001a\u001e\u000cN\u0006󺗦󰢌\u0000K9%2扃jA\u001d􇕱/􈂴𬻏\u000c<􌗟𣕲\"",
             "provider": "00000000-0000-0001-0000-000000000001",
+            "summary": "",
             "tags": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_1.json
index d23071fcfb6..f489283e9eb 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_1.json
@@ -1,8 +1,4 @@
 {
-    "summary": "󶒂",
-    "enabled": true,
-    "name": "i`\"𤂧Oep𓋒_󻯖᮶7g􊧝(V𧩯\u001e/zT2皟󺽦?󲚸u7\u0016k\u0003𣙈󼥁=)跡\u001cp{𥛕w;Q!M|􇳡\u0019<滭􃈘$_.𮌥\u001d&I𢈐􀻰􂀉\u0015OA鸌\u0000\u0001􇀸[|垻ሏc3^H\u0012\u0018~\u0014􊽊鎺Ed7塻􄜔\u000cHk\u000bv\u0011)Mc:",
-    "id": "00000002-0000-0000-0000-000000000001",
     "assets": [
         {
             "key": "\u001b",
@@ -10,6 +6,10 @@
         }
     ],
     "description": "/Q",
+    "enabled": true,
+    "id": "00000002-0000-0000-0000-000000000001",
+    "name": "i`\"𤂧Oep𓋒_󻯖᮶7g􊧝(V𧩯\u001e/zT2皟󺽦?󲚸u7\u0016k\u0003𣙈󼥁=)跡\u001cp{𥛕w;Q!M|􇳡\u0019<滭􃈘$_.𮌥\u001d&I𢈐􀻰􂀉\u0015OA鸌\u0000\u0001􇀸[|垻ሏc3^H\u0012\u0018~\u0014􊽊鎺Ed7塻􄜔\u000cHk\u000bv\u0011)Mc:",
     "provider": "00000001-0000-0000-0000-000200000002",
+    "summary": "󶒂",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_10.json
index bb44d39d6bc..d7a79140493 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_10.json
@@ -1,12 +1,8 @@
 {
-    "summary": ",AD",
-    "enabled": false,
-    "name": ":h[􂧒󼎂ΑY$\u0005\u0015E􉕑𭞨\u0002\u001f灐",
-    "id": "00000001-0000-0002-0000-000100000001",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -15,6 +11,10 @@
         }
     ],
     "description": "s&𝂾",
+    "enabled": false,
+    "id": "00000001-0000-0002-0000-000100000001",
+    "name": ":h[􂧒󼎂ΑY$\u0005\u0015E􉕑𭞨\u0002\u001f灐",
     "provider": "00000000-0000-0000-0000-000200000000",
+    "summary": ",AD",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_11.json
index 21f2f629b16..d92203b4663 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_11.json
@@ -1,14 +1,14 @@
 {
-    "summary": "yF",
-    "enabled": false,
-    "name": "$c󿤻\u0016VQ宁𬼺3\u0015@\"}e|bBr󵤡󺖛􆇃􄄤\n\u001euCS🔴0t􇟭9𡗀\"\u0014dO+^t\u0016\u001a\u001a\u0010xT𞸁`4V\u001dDf\u000b\u0002\"\\\u0006T`9+\u0010 󳠚𐓫率c%⪜fv𨓨d{z\u0017󿍖𬯫s\u0005䤂P",
-    "id": "00000002-0000-0000-0000-000100000002",
     "assets": [],
     "description": "",
+    "enabled": false,
+    "id": "00000002-0000-0000-0000-000100000002",
+    "name": "$c󿤻\u0016VQ宁𬼺3\u0015@\"}e|bBr󵤡󺖛􆇃􄄤\n\u001euCS🔴0t􇟭9𡗀\"\u0014dO+^t\u0016\u001a\u001a\u0010xT𞸁`4V\u001dDf\u000b\u0002\"\\\u0006T`9+\u0010 󳠚𐓫率c%⪜fv𨓨d{z\u0017󿍖𬯫s\u0005䤂P",
     "provider": "00000000-0000-0000-0000-000000000000",
+    "summary": "yF",
     "tags": [
         "music",
         "rating",
         "tutorial"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_12.json
index 4b7ff3b308c..820073bbda5 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_12.json
@@ -1,14 +1,14 @@
 {
-    "summary": "\u000ev",
-    "enabled": false,
-    "name": "H{eal2\u000eq!Eb)􋘹X,\u0008<𡺓%쒟𐦍\u001c虇\u0015\u001d6𝗨󴥎`JE@𝃑D졲%{\u0006.\u000b𭅐얁\u0007Av􋝸䇟Tk9\u0007𗭞3#*_+𩱝o",
-    "id": "00000000-0000-0000-0000-000000000000",
     "assets": [],
     "description": "WR􏧧",
+    "enabled": false,
+    "id": "00000000-0000-0000-0000-000000000000",
+    "name": "H{eal2\u000eq!Eb)􋘹X,\u0008<𡺓%쒟𐦍\u001c虇\u0015\u001d6𝗨󴥎`JE@𝃑D졲%{\u0006.\u000b𭅐얁\u0007Av􋝸䇟Tk9\u0007𗭞3#*_+𩱝o",
     "provider": "00000000-0000-0001-0000-000000000000",
+    "summary": "\u000ev",
     "tags": [
         "education",
         "medical",
         "productivity"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_13.json
index 229503db73f..7d4a6540b94 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_13.json
@@ -1,8 +1,4 @@
 {
-    "summary": "",
-    "enabled": false,
-    "name": ":[\".𥌂\u001fvU􁲅",
-    "id": "00000001-0000-0001-0000-000200000001",
     "assets": [
         {
             "key": "B",
@@ -10,8 +6,12 @@
         }
     ],
     "description": "A",
+    "enabled": false,
+    "id": "00000001-0000-0001-0000-000200000001",
+    "name": ":[\".𥌂\u001fvU􁲅",
     "provider": "00000000-0000-0002-0000-000000000002",
+    "summary": "",
     "tags": [
         "productivity"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_14.json
index 1b4cc934f58..7d0a07ce9b0 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_14.json
@@ -1,13 +1,13 @@
 {
-    "summary": "",
-    "enabled": true,
-    "name": "8Y#1L𗬯2𩋤Si𦸃􆇯p",
-    "id": "00000002-0000-0000-0000-000200000002",
     "assets": [],
     "description": "\u0019",
+    "enabled": true,
+    "id": "00000002-0000-0000-0000-000200000002",
+    "name": "8Y#1L𗬯2𩋤Si𦸃􆇯p",
     "provider": "00000002-0000-0000-0000-000100000000",
+    "summary": "",
     "tags": [
         "entertainment",
         "productivity"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_15.json
index f75a012a970..40320f66c4e 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_15.json
@@ -1,8 +1,4 @@
 {
-    "summary": "*P`",
-    "enabled": false,
-    "name": "=𥎰\u00169󾡷󾪃\u001e\u0016\u0004㓯!𤛇b􀚸NV\u0008(G𭣕.AD\u001f!陋\r79P6<𘉛𘙓􄧃y􀦑KVw!텞-鄱􄥘7\r{/(6􂥥𡧲\u0003𡻡m􆱳B\u001f%}ag\u0001􆫘L𨛤哗𗶵~`;4󴉛w\u0019\\`%2u𘍢P􇩉dmꉻf\u00077)fUWBYt𐫝\u000f￭#u\u0008\u0019P:J嫡^L􏛱",
-    "id": "00000001-0000-0000-0000-000200000000",
     "assets": [
         {
             "key": "*",
@@ -10,9 +6,13 @@
         }
     ],
     "description": "u`\u0005",
+    "enabled": false,
+    "id": "00000001-0000-0000-0000-000200000000",
+    "name": "=𥎰\u00169󾡷󾪃\u001e\u0016\u0004㓯!𤛇b􀚸NV\u0008(G𭣕.AD\u001f!陋\r79P6<𘉛𘙓􄧃y􀦑KVw!텞-鄱􄥘7\r{/(6􂥥𡧲\u0003𡻡m􆱳B\u001f%}ag\u0001􆫘L𨛤哗𗶵~`;4󴉛w\u0019\\`%2u𘍢P􇩉dmꉻf\u00077)fUWBYt𐫝\u000f￭#u\u0008\u0019P:J嫡^L􏛱",
     "provider": "00000001-0000-0001-0000-000000000000",
+    "summary": "*P`",
     "tags": [
         "music",
         "rating"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_16.json
index 65153249439..0939bdefb07 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_16.json
@@ -1,21 +1,21 @@
 {
-    "summary": "U,",
-    "enabled": false,
-    "name": "𗣧\r7]􈽠\u0012m/𤠾󵳢,VKS['􆸿􎯳s􇱡\u0001󷹣\u000c𫧫aDP\u0004\u0003󳥀0",
-    "id": "00000002-0000-0000-0000-000100000002",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
     "description": "S\n",
+    "enabled": false,
+    "id": "00000002-0000-0000-0000-000100000002",
+    "name": "𗣧\r7]􈽠\u0012m/𤠾󵳢,VKS['􆸿􎯳s􇱡\u0001󷹣\u000c𫧫aDP\u0004\u0003󳥀0",
     "provider": "00000000-0000-0002-0000-000200000001",
+    "summary": "U,",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_17.json
index 27ac9c75d00..add08735159 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_17.json
@@ -1,21 +1,21 @@
 {
-    "summary": "\u000e4c",
-    "enabled": false,
-    "name": ":n\u0008󷦫D\r\tk󼌠Q𭱞􎞈\u00016\u0002𮅖t\u00168hz,􌖤mk\nI𢽫!𡫏(1Y앜\u0007,𪂸󸬻𬻠o\u0016󻫦𥬷󲨷y{k+􊳭-\u0001j\u0014J\u0011qC{P𥔣w\u0016\u000b\u001b𝠍`{B\u001b\u000e^(N蔖\t󻖕􀡪6󼖉\u0012$󴂨,\u001e\u000c篧Wh𤬑@􁋊\u0006e\tb%𫱤xQ{u\u0000e备7D:缱A󳭈w#@xB\u0004fsb󻾣ꈅ,뚩͘x%P",
-    "id": "00000000-0000-0002-0000-000200000002",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
     "description": "\u000f",
+    "enabled": false,
+    "id": "00000000-0000-0002-0000-000200000002",
+    "name": ":n\u0008󷦫D\r\tk󼌠Q𭱞􎞈\u00016\u0002𮅖t\u00168hz,􌖤mk\nI𢽫!𡫏(1Y앜\u0007,𪂸󸬻𬻠o\u0016󻫦𥬷󲨷y{k+􊳭-\u0001j\u0014J\u0011qC{P𥔣w\u0016\u000b\u001b𝠍`{B\u001b\u000e^(N蔖\t󻖕􀡪6󼖉\u0012$󴂨,\u001e\u000c篧Wh𤬑@􁋊\u0006e\tb%𫱤xQ{u\u0000e备7D:缱A󳭈w#@xB\u0004fsb󻾣ꈅ,뚩͘x%P",
     "provider": "00000002-0000-0002-0000-000000000000",
+    "summary": "\u000e4c",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_18.json
index 754324dbd78..00c4732228f 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_18.json
@@ -1,12 +1,12 @@
 {
-    "summary": "",
-    "enabled": true,
-    "name": "3픙\u0005𢮔Vj:\u0015츠\r\u0010o𭛺",
-    "id": "00000002-0000-0002-0000-000200000001",
     "assets": [],
     "description": "儴",
+    "enabled": true,
+    "id": "00000002-0000-0002-0000-000200000001",
+    "name": "3픙\u0005𢮔Vj:\u0015츠\r\u0010o𭛺",
     "provider": "00000001-0000-0000-0000-000200000000",
+    "summary": "",
     "tags": [
         "rating"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_19.json
index f4bdf4aef49..df455f69e29 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_19.json
@@ -1,14 +1,14 @@
 {
-    "summary": "󾝅𖼻ჺ",
-    "enabled": false,
-    "name": "\u0006󴬲\u000f􌖙􈞎𘍏\u0014\u0001\u0014󵡾􆄩\u000f􌿻뒱_D?𐇚%",
-    "id": "00000001-0000-0000-0000-000200000001",
     "assets": [],
     "description": "󼑖",
+    "enabled": false,
+    "id": "00000001-0000-0000-0000-000200000001",
+    "name": "\u0006󴬲\u000f􌖙􈞎𘍏\u0014\u0001\u0014󵡾􆄩\u000f􌿻뒱_D?𐇚%",
     "provider": "00000000-0000-0001-0000-000000000001",
+    "summary": "󾝅𖼻ჺ",
     "tags": [
         "food-drink",
         "medical",
         "video"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_2.json
index 5a3fff58812..c4f71c210a3 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_2.json
@@ -1,34 +1,34 @@
 {
-    "summary": ")/",
-    "enabled": true,
-    "name": "\u0018&8\u0005T􉓸A犯KU%BH4,❯s/􅑴 C4\u0016PS~\u000c󱸑䒧􅚶`𐎛\u0012EI$%K0狑]w㔒3X\u0000󽧌x\u001e0h𮕋\u000fLk#F2YXw􏺈󵯗8𥼥뒻!􎲣􋝋⠬t\u001a{,",
-    "id": "00000001-0000-0001-0000-000100000002",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
     "description": "",
+    "enabled": true,
+    "id": "00000001-0000-0001-0000-000100000002",
+    "name": "\u0018&8\u0005T􉓸A犯KU%BH4,❯s/􅑴 C4\u0016PS~\u000c󱸑䒧􅚶`𐎛\u0012EI$%K0狑]w㔒3X\u0000󽧌x\u001e0h𮕋\u000fLk#F2YXw􏺈󵯗8𥼥뒻!􎲣􋝋⠬t\u001a{,",
     "provider": "00000002-0000-0001-0000-000100000002",
+    "summary": ")/",
     "tags": [
         "food-drink",
         "travel"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_20.json
index 673222de203..b750b71ac92 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_20.json
@@ -1,12 +1,12 @@
 {
-    "summary": "㘈",
-    "enabled": false,
-    "name": "b:/-B􁩉L\u0004lQ\u0013빴\u0015𭳗𫖖𐫚P\u0016}F󲄲(\u000f\u001c􌃿2,]o𭲭",
-    "id": "00000000-0000-0002-0000-000200000002",
     "assets": [],
     "description": "6𭌫?",
+    "enabled": false,
+    "id": "00000000-0000-0002-0000-000200000002",
+    "name": "b:/-B􁩉L\u0004lQ\u0013빴\u0015𭳗𫖖𐫚P\u0016}F󲄲(\u000f\u001c􌃿2,]o𭲭",
     "provider": "00000000-0000-0000-0000-000100000002",
+    "summary": "㘈",
     "tags": [
         "games"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_3.json
index 5881f648862..5aea13d2406 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_3.json
@@ -1,20 +1,20 @@
 {
-    "summary": "\u0003* ",
-    "enabled": true,
-    "name": "􎼗󹀊\u0004|6U𦫤􈞣𤥉0&+\u0014𗟗\u0011p𫏓v𒓞\u001d\u000cn\u0004f \r󽾁+2O",
-    "id": "00000000-0000-0001-0000-000100000002",
     "assets": [
         {
             "key": "",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
     "description": "𡙔It",
+    "enabled": true,
+    "id": "00000000-0000-0001-0000-000100000002",
+    "name": "􎼗󹀊\u0004|6U𦫤􈞣𤥉0&+\u0014𗟗\u0011p𫏓v𒓞\u001d\u000cn\u0004f \r󽾁+2O",
     "provider": "00000000-0000-0001-0000-000100000002",
+    "summary": "\u0003* ",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_4.json
index 84687e05d81..20897d07227 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_4.json
@@ -1,19 +1,19 @@
 {
-    "summary": "4E",
-    "enabled": true,
-    "name": "𭲌A\u0007󰇻􃥭R𢉬O\u0017+\u0001[L#\u0006󰍖𖤷\u0015^􊀖q@\u001a!';#𪜆?z􄦳`\u0010#\u0019:\u0006\u0014nH)A􎋽􂱉ev\u0017y\u0013􀐋@\u001dte󻿾",
-    "id": "00000002-0000-0000-0000-000200000001",
     "assets": [
         {
-            "size": "complete",
             "key": "1",
+            "size": "complete",
             "type": "image"
         }
     ],
     "description": "(",
+    "enabled": true,
+    "id": "00000002-0000-0000-0000-000200000001",
+    "name": "𭲌A\u0007󰇻􃥭R𢉬O\u0017+\u0001[L#\u0006󰍖𖤷\u0015^􊀖q@\u001a!';#𪜆?z􄦳`\u0010#\u0019:\u0006\u0014nH)A􎋽􂱉ev\u0017y\u0013􀐋@\u001dte󻿾",
     "provider": "00000001-0000-0001-0000-000000000001",
+    "summary": "4E",
     "tags": [
         "audio",
         "rating"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_5.json
index 85d93a045fb..4d4a7825197 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_5.json
@@ -1,10 +1,10 @@
 {
-    "summary": "\u0013",
-    "enabled": true,
-    "name": "Y\u0014~-%5>p9𗸕ⶲ󺀐獇Ne~",
-    "id": "00000002-0000-0000-0000-000200000000",
     "assets": [],
     "description": "󸝅Y",
+    "enabled": true,
+    "id": "00000002-0000-0000-0000-000200000000",
+    "name": "Y\u0014~-%5>p9𗸕ⶲ󺀐獇Ne~",
     "provider": "00000002-0000-0002-0000-000000000002",
+    "summary": "\u0013",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_6.json
index 8adc8280c22..06d9b7c11d5 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_6.json
@@ -1,21 +1,17 @@
 {
-    "summary": "4>#",
-    "enabled": false,
-    "name": "QN\u0002\"[􅤋_\u000e嗝:#𩴦c\u000c@wqW\rLV􄖪~_D:u󷻟3'I\u0001\r`9𢸌􏍴􉹃c77~P\"\u000e\u0013*9\u001c\u0008𡱉[ូs뚯\\4􅺮(\u001c-E:2*I'>{axLT/r}9넬🗭RC􂝇󶜬!𡔃v>`󵱐oG쨈SJ\u0016o󻃔𬚶𒅴𥅐",
-    "id": "00000001-0000-0002-0000-000100000000",
     "assets": [
         {
             "key": "",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -23,12 +19,16 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
     "description": "D",
+    "enabled": false,
+    "id": "00000001-0000-0002-0000-000100000000",
+    "name": "QN\u0002\"[􅤋_\u000e嗝:#𩴦c\u000c@wqW\rLV􄖪~_D:u󷻟3'I\u0001\r`9𢸌􏍴􉹃c77~P\"\u000e\u0013*9\u001c\u0008𡱉[ូs뚯\\4􅺮(\u001c-E:2*I'>{axLT/r}9넬🗭RC􂝇󶜬!𡔃v>`󵱐oG쨈SJ\u0016o󻃔𬚶𒅴𥅐",
     "provider": "00000002-0000-0002-0000-000100000001",
+    "summary": "4>#",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_7.json
index c2a5a29e73c..5ce6da2e004 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_7.json
@@ -1,13 +1,13 @@
 {
-    "summary": "0󲘻",
-    "enabled": false,
-    "name": "Yi󳁻f💖9􁓛~\u0000\u0017\u000e𫻐j󵻃vyQq#^(a\u001e􋳘)󾄭2Tu$:\u000f鲕`&ik󸀄𝔁b\u001eB󼝙g5\u0013D;\u001b\u001fꦪ\"쾎\u0019#i󷴅iP\r󶣩𠱏\u0011I𦖋\u0008\u0017\"𨣼\u000e>A窞",
-    "id": "00000001-0000-0002-0000-000000000002",
     "assets": [],
     "description": "11*",
+    "enabled": false,
+    "id": "00000001-0000-0002-0000-000000000002",
+    "name": "Yi󳁻f💖9􁓛~\u0000\u0017\u000e𫻐j󵻃vyQq#^(a\u001e􋳘)󾄭2Tu$:\u000f鲕`&ik󸀄𝔁b\u001eB󼝙g5\u0013D;\u001b\u001fꦪ\"쾎\u0019#i󷴅iP\r󶣩𠱏\u0011I𦖋\u0008\u0017\"𨣼\u000e>A窞",
     "provider": "00000002-0000-0002-0000-000200000000",
+    "summary": "0󲘻",
     "tags": [
         "audio",
         "tutorial"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_8.json
index a99293dbdc4..45594ea8e05 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_8.json
@@ -1,14 +1,14 @@
 {
-    "summary": "",
-    "enabled": true,
-    "name": "X,󳥒\u001b𥬹􃫉𡼴:t魪f\u001bj􈄪Is4𩸼A*􌆔\u0017u\t_Xw\u0001",
-    "id": "00000002-0000-0000-0000-000100000002",
     "assets": [],
     "description": "\u0006",
+    "enabled": true,
+    "id": "00000002-0000-0000-0000-000100000002",
+    "name": "X,󳥒\u001b𥬹􃫉𡼴:t魪f\u001bj􈄪Is4𩸼A*􌆔\u0017u\t_Xw\u0001",
     "provider": "00000001-0000-0001-0000-000000000000",
+    "summary": "",
     "tags": [
         "books",
         "business",
         "games"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_9.json
index 3a3ba968acc..ccbb904285c 100644
--- a/libs/wire-api/test/golden/testObject_ServiceProfile_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceProfile_provider_9.json
@@ -1,8 +1,4 @@
 {
-    "summary": "a􉶾",
-    "enabled": false,
-    "name": "\u0019𒂕+\u0012\u0000!\u001fV\u000c󺕴􎋋_􎎙H#4\u0002􍭀",
-    "id": "00000002-0000-0001-0000-000100000000",
     "assets": [
         {
             "key": "\u0011",
@@ -10,10 +6,14 @@
         }
     ],
     "description": "AU",
+    "enabled": false,
+    "id": "00000002-0000-0001-0000-000100000000",
+    "name": "\u0019𒂕+\u0012\u0000!\u001fV\u000c󺕴􎋋_􎎙H#4\u0002􍭀",
     "provider": "00000001-0000-0000-0000-000000000000",
+    "summary": "a􉶾",
     "tags": [
         "business",
         "finance",
         "poll"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_1.json
index 78d5a70f887..827f056b94b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_1.json
@@ -1,4 +1,4 @@
 {
     "id": "0000001b-0000-0079-0000-00770000000d",
     "provider": "00000001-0000-0002-0000-008000000059"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_10.json
index 7e75ed7ed5c..157ac5168d8 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_10.json
@@ -1,4 +1,4 @@
 {
     "id": "00000045-0000-003a-0000-00290000002d",
     "provider": "0000003f-0000-001b-0000-001c00000079"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_11.json
index 7113ea9f26f..9aef695e374 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_11.json
@@ -1,4 +1,4 @@
 {
     "id": "00000026-0000-0047-0000-000100000019",
     "provider": "00000078-0000-0041-0000-005c00000008"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_12.json
index 14148615ee3..b9de1570d58 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_12.json
@@ -1,4 +1,4 @@
 {
     "id": "0000002e-0000-004e-0000-007200000079",
     "provider": "00000053-0000-0053-0000-005700000059"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_13.json
index 91b8931765f..1e975fd4f62 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_13.json
@@ -1,4 +1,4 @@
 {
     "id": "0000003f-0000-005a-0000-001d00000057",
     "provider": "0000005c-0000-0056-0000-006e0000004c"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_14.json
index 868d57f92da..aea7c414960 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_14.json
@@ -1,4 +1,4 @@
 {
     "id": "00000023-0000-001c-0000-00050000004d",
     "provider": "0000000b-0000-0029-0000-007300000038"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_15.json
index 1fbb85ddc85..928b189e656 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_15.json
@@ -1,4 +1,4 @@
 {
     "id": "0000002d-0000-0030-0000-004000000057",
     "provider": "0000005a-0000-0037-0000-001e00000051"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_16.json
index 7233719b326..bcc4e2dc8c3 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_16.json
@@ -1,4 +1,4 @@
 {
     "id": "00000076-0000-000b-0000-005e0000007d",
     "provider": "00000071-0000-0020-0000-006b00000051"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_17.json
index 396e712cc7d..d9076723b5d 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_17.json
@@ -1,4 +1,4 @@
 {
     "id": "00000065-0000-0041-0000-00010000001a",
     "provider": "0000007b-0000-0018-0000-005b00000065"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_18.json
index 2b825dab0ea..0505a26973b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_18.json
@@ -1,4 +1,4 @@
 {
     "id": "00000074-0000-005d-0000-004100000057",
     "provider": "00000011-0000-0033-0000-004200000003"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_19.json
index 16a5fbbefaf..e2a1ae73d71 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_19.json
@@ -1,4 +1,4 @@
 {
     "id": "00000041-0000-0011-0000-00190000004b",
     "provider": "00000070-0000-002f-0000-007000000046"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_2.json
index 7c1c172f9ce..8bb030029ec 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_2.json
@@ -1,4 +1,4 @@
 {
     "id": "00000024-0000-0064-0000-00010000004b",
     "provider": "00000063-0000-000c-0000-003e00000073"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_20.json
index 5b18adb0635..d97f1efffed 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_20.json
@@ -1,4 +1,4 @@
 {
     "id": "00000030-0000-0057-0000-00760000002d",
     "provider": "00000061-0000-0075-0000-000200000069"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_3.json
index 9c2d4356281..d1f908dbe42 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_3.json
@@ -1,4 +1,4 @@
 {
     "id": "00000016-0000-0046-0000-002a00000067",
     "provider": "0000006f-0000-0046-0000-000400000043"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_4.json
index 52856162140..fb6e66b19a3 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_4.json
@@ -1,4 +1,4 @@
 {
     "id": "00000010-0000-007a-0000-005d0000005c",
     "provider": "00000046-0000-0080-0000-001400000049"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_5.json
index 6c3e2d3b460..8bad880e824 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_5.json
@@ -1,4 +1,4 @@
 {
     "id": "0000000e-0000-0043-0000-004000000065",
     "provider": "00000024-0000-0019-0000-00300000004b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_6.json
index 9c795467890..573e8cf9ac3 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_6.json
@@ -1,4 +1,4 @@
 {
     "id": "00000039-0000-001e-0000-00000000002a",
     "provider": "0000005f-0000-0000-0000-00110000007f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_7.json
index 325bf9204c0..bd2fbf3de28 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_7.json
@@ -1,4 +1,4 @@
 {
     "id": "00000064-0000-007c-0000-003c00000051",
     "provider": "0000001f-0000-0058-0000-004400000068"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_8.json
index bf35a4e05d6..33929b9f01f 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_8.json
@@ -1,4 +1,4 @@
 {
     "id": "0000002c-0000-0077-0000-004f0000002b",
     "provider": "00000039-0000-0051-0000-002d00000080"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceRef_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceRef_provider_9.json
index a9acecf0d63..4148ef330ec 100644
--- a/libs/wire-api/test/golden/testObject_ServiceRef_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceRef_provider_9.json
@@ -1,4 +1,4 @@
 {
     "id": "0000006f-0000-001a-0000-00780000002f",
     "provider": "00000050-0000-0011-0000-001200000028"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_1.json
index a21e6a7282f..c9bed54f37d 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_1.json
@@ -18,4 +18,4 @@
     "quiz",
     "music",
     "entertainment"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_10.json
index f42af010e7b..e48230390aa 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_10.json
@@ -5,4 +5,4 @@
     "news",
     "movies",
     "social"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_11.json
index 25000b951e4..a9f3ebd2e50 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_11.json
@@ -14,4 +14,4 @@
     "design",
     "movies",
     "fitness"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_12.json
index fd77e2d0a9f..9cb7afd776a 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_12.json
@@ -29,4 +29,4 @@
     "entertainment",
     "productivity",
     "health"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_13.json
index c2443dc4724..941b9901bd9 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_13.json
@@ -4,4 +4,4 @@
     "tutorial",
     "integration",
     "poll"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_14.json
index 74e73242c3e..de4fba073a3 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_14.json
@@ -8,4 +8,4 @@
     "movies",
     "travel",
     "design"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_15.json
index 27f14adb13c..13b0a93ba3b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_15.json
@@ -13,4 +13,4 @@
     "social",
     "fitness",
     "media"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_16.json
index 4d5d7de3e50..139ff41715c 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_16.json
@@ -8,4 +8,4 @@
     "lifestyle",
     "shopping",
     "finance"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_17.json
index 50f600e7792..aa12928f916 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_17.json
@@ -15,4 +15,4 @@
     "photography",
     "weather",
     "integration"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_18.json
index 7ca7492980b..ffce929b41e 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_18.json
@@ -20,4 +20,4 @@
     "productivity",
     "games",
     "tutorial"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_19.json
index 4bedf2e1b38..2da78dcf315 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_19.json
@@ -15,4 +15,4 @@
     "business",
     "food-drink",
     "lifestyle"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_2.json
index 48026afa2d1..594a920cefe 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_2.json
@@ -1,4 +1,4 @@
 [
     "education",
     "finance"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_20.json
index 1e476a72434..d35e53f464a 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_20.json
@@ -11,4 +11,4 @@
     "music",
     "shopping",
     "books"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_3.json
index 16b667deb63..8340be94af1 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_3.json
@@ -1,3 +1,3 @@
 [
     "video"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_4.json
index 8b2702efd97..a2268581617 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_4.json
@@ -13,4 +13,4 @@
     "news",
     "poll",
     "music"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_5.json
index 3f35fe14f21..ab6eae05318 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_5.json
@@ -13,4 +13,4 @@
     "social",
     "weather",
     "books"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_6.json
index 2f79eb2f103..6b9137d690d 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_6.json
@@ -4,4 +4,4 @@
     "video",
     "entertainment",
     "education"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_7.json
index 49b4837195d..82e3db6f098 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_7.json
@@ -18,4 +18,4 @@
     "design",
     "lifestyle",
     "sports"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_8.json
index dab3ce8d38d..8f5dbbed32f 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_8.json
@@ -13,4 +13,4 @@
     "weather",
     "travel",
     "video"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_9.json
index f4e24f7de07..111ea4973a0 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTagList_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTagList_provider_9.json
@@ -9,4 +9,4 @@
     "rating",
     "integration",
     "movies"
-]
\ No newline at end of file
+]
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_1.json
index 9209897cf17..64a134aa986 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_1.json
@@ -1 +1 @@
-"weather"
\ No newline at end of file
+"weather"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_10.json
index d1979604c8e..0087f80ae35 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_10.json
@@ -1 +1 @@
-"social"
\ No newline at end of file
+"social"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_11.json
index 9209897cf17..64a134aa986 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_11.json
@@ -1 +1 @@
-"weather"
\ No newline at end of file
+"weather"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_12.json
index 3ca2aa85511..6d244ea5cd6 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_12.json
@@ -1 +1 @@
-"shopping"
\ No newline at end of file
+"shopping"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_13.json
index bfc74e4473f..a4f90349b22 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_13.json
@@ -1 +1 @@
-"music"
\ No newline at end of file
+"music"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_14.json
index 9209897cf17..64a134aa986 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_14.json
@@ -1 +1 @@
-"weather"
\ No newline at end of file
+"weather"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_15.json
index b1226b97d1b..bcf11dae405 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_15.json
@@ -1 +1 @@
-"sports"
\ No newline at end of file
+"sports"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_16.json
index a1f74bb5693..b6be7c84324 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_16.json
@@ -1 +1 @@
-"video"
\ No newline at end of file
+"video"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_17.json
index bfc74e4473f..a4f90349b22 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_17.json
@@ -1 +1 @@
-"music"
\ No newline at end of file
+"music"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_18.json
index 8d84685ff68..a80b6852db8 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_18.json
@@ -1 +1 @@
-"graphics"
\ No newline at end of file
+"graphics"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_19.json
index 8d84685ff68..a80b6852db8 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_19.json
@@ -1 +1 @@
-"graphics"
\ No newline at end of file
+"graphics"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_2.json
index 6c7513330df..1e660142be7 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_2.json
@@ -1 +1 @@
-"fitness"
\ No newline at end of file
+"fitness"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_20.json
index 13cb48b34a7..85c3ea7fa2b 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_20.json
@@ -1 +1 @@
-"medical"
\ No newline at end of file
+"medical"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_3.json
index bfc74e4473f..a4f90349b22 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_3.json
@@ -1 +1 @@
-"music"
\ No newline at end of file
+"music"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_4.json
index eb54e468129..89df14486d7 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_4.json
@@ -1 +1 @@
-"productivity"
\ No newline at end of file
+"productivity"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_5.json
index 15a787550ae..f42f682fbd3 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_5.json
@@ -1 +1 @@
-"business"
\ No newline at end of file
+"business"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_6.json
index 304db232c64..fcdd932b465 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_6.json
@@ -1 +1 @@
-"integration"
\ No newline at end of file
+"integration"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_7.json
index bfc74e4473f..a4f90349b22 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_7.json
@@ -1 +1 @@
-"music"
\ No newline at end of file
+"music"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_8.json
index b1226b97d1b..bcf11dae405 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_8.json
@@ -1 +1 @@
-"sports"
\ No newline at end of file
+"sports"
diff --git a/libs/wire-api/test/golden/testObject_ServiceTag_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceTag_provider_9.json
index eabcdfd1921..795a9e55a3d 100644
--- a/libs/wire-api/test/golden/testObject_ServiceTag_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceTag_provider_9.json
@@ -1 +1 @@
-"lifestyle"
\ No newline at end of file
+"lifestyle"
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_1.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_1.json
index 6e7944f7f29..753fe432f37 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_1.json
@@ -1 +1 @@
-"V1srydDCyQ=="
\ No newline at end of file
+"V1srydDCyQ=="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_10.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_10.json
index 055cbcc4b32..2960d78f729 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_10.json
@@ -1 +1 @@
-"WzFBduViWNGq46-pywEE1KtDivs="
\ No newline at end of file
+"WzFBduViWNGq46-pywEE1KtDivs="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_11.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_11.json
index 9c19c2a79ca..34fe4e885ec 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_11.json
@@ -1 +1 @@
-"dUVhthRe"
\ No newline at end of file
+"dUVhthRe"
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_12.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_12.json
index 7490a2c6b37..68ae30deabc 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_12.json
@@ -1 +1 @@
-"LxO8Yetkiw=="
\ No newline at end of file
+"LxO8Yetkiw=="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_13.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_13.json
index e4db038923f..7f3cadbcd34 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_13.json
@@ -1 +1 @@
-"sodNVoFqls-45A7-P1u9RgISgeTDPlpx1CpxcAE="
\ No newline at end of file
+"sodNVoFqls-45A7-P1u9RgISgeTDPlpx1CpxcAE="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_14.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_14.json
index f89c005a5df..426e39f74e5 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_14.json
@@ -1 +1 @@
-"nf5djv1f0VJStHFdqqntMirCdFcjQ1A="
\ No newline at end of file
+"nf5djv1f0VJStHFdqqntMirCdFcjQ1A="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_15.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_15.json
index 0699650da23..9c3f7580774 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_15.json
@@ -1 +1 @@
-"PjxnUW7Pgb6WQy-Llq8CpX1Q90cD"
\ No newline at end of file
+"PjxnUW7Pgb6WQy-Llq8CpX1Q90cD"
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_16.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_16.json
index f29fd96a645..d63dbac61c4 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_16.json
@@ -1 +1 @@
-"6w=="
\ No newline at end of file
+"6w=="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_17.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_17.json
index 29244920fbf..0c755b326de 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_17.json
@@ -1 +1 @@
-"HkAiI2q0CAtMTwnqXuuAqYF8lRfzariDrpxhLCg="
\ No newline at end of file
+"HkAiI2q0CAtMTwnqXuuAqYF8lRfzariDrpxhLCg="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_18.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_18.json
index 0f137cd262b..2c2f37cd272 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_18.json
@@ -1 +1 @@
-"5UFP75w="
\ No newline at end of file
+"5UFP75w="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_19.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_19.json
index 4c4329deabe..274f656c7b2 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_19.json
@@ -1 +1 @@
-"OsXGs-8XGz9MJArpwkZpexaomKV5Xg=="
\ No newline at end of file
+"OsXGs-8XGz9MJArpwkZpexaomKV5Xg=="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_2.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_2.json
index 480d8cc4d40..33c0ec0dfc9 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_2.json
@@ -1 +1 @@
-"Za4="
\ No newline at end of file
+"Za4="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_20.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_20.json
index 65eaca30b5d..7d4bb46bb9f 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_20.json
@@ -1 +1 @@
-"tjiTereTUbmfAMwwIi1dQPk="
\ No newline at end of file
+"tjiTereTUbmfAMwwIi1dQPk="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_3.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_3.json
index 319258f8e12..1afc722571a 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_3.json
@@ -1 +1 @@
-"sC9FtVElsunEoBPLsgMA8Y1omvZ4"
\ No newline at end of file
+"sC9FtVElsunEoBPLsgMA8Y1omvZ4"
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_4.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_4.json
index 475b3dc9a0a..2b2d8a81024 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_4.json
@@ -1 +1 @@
-"P3nGe5OyrKSlCyN1NVI_yGOZM61u120="
\ No newline at end of file
+"P3nGe5OyrKSlCyN1NVI_yGOZM61u120="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_5.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_5.json
index 0544a5eb351..3c2bcc2e17a 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_5.json
@@ -1 +1 @@
-"a6t043kTszYx0AXSSNI2i0U="
\ No newline at end of file
+"a6t043kTszYx0AXSSNI2i0U="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_6.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_6.json
index 82ea5ea9fc9..c141d9b8c41 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_6.json
@@ -1 +1 @@
-"-XYFjqWLjSywi6BDFCV0_JPBhva_zkcS9Q=="
\ No newline at end of file
+"-XYFjqWLjSywi6BDFCV0_JPBhva_zkcS9Q=="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_7.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_7.json
index c154f2e2b41..daf85dbb2a3 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_7.json
@@ -1 +1 @@
-"OKVkjsnwvtYyHV4M85BTQPGikkwiJYmdDfAFk7I="
\ No newline at end of file
+"OKVkjsnwvtYyHV4M85BTQPGikkwiJYmdDfAFk7I="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_8.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_8.json
index 4e60acf13d8..807ced9db34 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_8.json
@@ -1 +1 @@
-"9Ybx78vkjjA3yrZzr1DBlA=="
\ No newline at end of file
+"9Ybx78vkjjA3yrZzr1DBlA=="
diff --git a/libs/wire-api/test/golden/testObject_ServiceToken_provider_9.json b/libs/wire-api/test/golden/testObject_ServiceToken_provider_9.json
index 3b8bb5b85f0..1b71d933cb6 100644
--- a/libs/wire-api/test/golden/testObject_ServiceToken_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_ServiceToken_provider_9.json
@@ -1 +1 @@
-"KxTUvDyDJ_7KHkQDKGGNbQNpFg=="
\ No newline at end of file
+"KxTUvDyDJ_7KHkQDKGGNbQNpFg=="
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_1.json b/libs/wire-api/test/golden/testObject_Service_provider_1.json
index 714473df55e..c7220a41a95 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_1.json
@@ -1,39 +1,39 @@
 {
-    "summary": "y",
+    "assets": [],
+    "auth_tokens": [
+        "RA==",
+        "",
+        "",
+        "",
+        "",
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "z\u0014",
+    "enabled": false,
+    "id": "00000000-0000-0002-0000-000000000002",
+    "name": "a$AAr<\u000e)@\u0019Wcke\u0015殩\u0019􇾯􇘯8Fﾾ􈫋~(IA:􆆫\u000f8\u0017󰁂\u001d*!􊈆aa\u001dW3\u000e\u0017-L.Ze􎙚\u0017󲃹*<\u001eTC6\u0015C󿲀vE ",
     "public_keys": [
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "a$AAr<\u000e)@\u0019Wcke\u0015殩\u0019􇾯􇘯8Fﾾ􈫋~(IA:􆆫\u000f8\u0017󰁂\u001d*!􊈆aa\u001dW3\u000e\u0017-L.Ze􎙚\u0017󲃹*<\u001eTC6\u0015C󿲀vE ",
-    "auth_tokens": [
-        "RA==",
-        "",
-        "",
-        "",
-        "",
-        ""
-    ],
-    "id": "00000000-0000-0002-0000-000000000002",
-    "assets": [],
-    "description": "z\u0014",
+    "summary": "y",
     "tags": [
         "business",
         "fitness",
         "sports"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_10.json b/libs/wire-api/test/golden/testObject_Service_provider_10.json
index 132fc31ed48..e01d1de2b21 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_10.json
@@ -1,28 +1,28 @@
 {
-    "summary": "",
+    "assets": [],
+    "auth_tokens": [
+        "ZQ=="
+    ],
+    "base_url": "https://example.com",
+    "description": "",
+    "enabled": true,
+    "id": "00000000-0000-0000-0000-000100000001",
+    "name": "􇌩0󵃇\u0012AhO)ZzoZ{\u0004􁤄z\u001f􉅄`JJsBj#𒊟\u0001$r\u0013P\u0004@#l􇝻\u0007w滳\n𑣆N𛋱m?X\u0014Ԁ#0QKKdPiH%N-1*\u0005/D潴𭯤\u0014&\u000cg𬜰𡋈vY2c<󶍞A俳􋔃z\u000b󽀆;\u0001g;\u001f@\u0005󸝝󱵼{ks`UW\u0000v𪶮\u001d.󾮗𦐼/𥀦鍻\u0004\u0018/q\u0007",
     "public_keys": [
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "􇌩0󵃇\u0012AhO)ZzoZ{\u0004􁤄z\u001f􉅄`JJsBj#𒊟\u0001$r\u0013P\u0004@#l􇝻\u0007w滳\n𑣆N𛋱m?X\u0014Ԁ#0QKKdPiH%N-1*\u0005/D潴𭯤\u0014&\u000cg𬜰𡋈vY2c<󶍞A俳􋔃z\u000b󽀆;\u0001g;\u001f@\u0005󸝝󱵼{ks`UW\u0000v𪶮\u001d.󾮗𦐼/𥀦鍻\u0004\u0018/q\u0007",
-    "auth_tokens": [
-        "ZQ=="
-    ],
-    "id": "00000000-0000-0000-0000-000100000001",
-    "assets": [],
-    "description": "",
+    "summary": "",
     "tags": [
         "media",
         "poll"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_11.json b/libs/wire-api/test/golden/testObject_Service_provider_11.json
index e7fe1947395..a6f0e648e72 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_11.json
@@ -1,44 +1,44 @@
 {
-    "summary": "KD^",
-    "public_keys": [
-        {
-            "size": -1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
-        },
+    "assets": [
         {
-            "size": 0,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "complete",
+            "type": "image"
         },
         {
-            "size": 1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "complete",
+            "type": "image"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "s􉝱폏\u00051\u000cm⫪2󵅲3bpJld󼭍\u0017^\u000f􄔠+\u0004*&^r\u0000誴7Xf'𖢍𥩨%\u001bt됦$h𘒸manS𗁔\u0007VV\t\u0014BYCy􋋌𮇋s𡬷Q\u0000\u0010𑢶\te\u000c}",
     "auth_tokens": [
         "Ros=",
         "",
         "",
         ""
     ],
+    "base_url": "https://example.com",
+    "description": "",
+    "enabled": false,
     "id": "00000000-0000-0002-0000-000200000001",
-    "assets": [
+    "name": "s􉝱폏\u00051\u000cm⫪2󵅲3bpJld󼭍\u0017^\u000f􄔠+\u0004*&^r\u0000誴7Xf'𖢍𥩨%\u001bt됦$h𘒸manS𗁔\u0007VV\t\u0014BYCy􋋌𮇋s𡬷Q\u0000\u0010𑢶\te\u000c}",
+    "public_keys": [
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
+            "type": "rsa"
         },
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
+            "type": "rsa"
+        },
+        {
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
+            "type": "rsa"
         }
     ],
-    "description": "",
+    "summary": "KD^",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_12.json b/libs/wire-api/test/golden/testObject_Service_provider_12.json
index 8a9595a7486..4de5b9715ee 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_12.json
@@ -1,55 +1,55 @@
 {
-    "summary": "􁜵",
-    "public_keys": [
-        {
-            "size": 1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
-        },
+    "assets": [
         {
-            "size": 1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "preview",
+            "type": "image"
         },
         {
-            "size": 1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "complete",
+            "type": "image"
         },
         {
-            "size": -1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "complete",
+            "type": "image"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "1\\$r~WnIAG𢷱󳺖fG%)4m\u0004\u000e𠨔X\u00174~",
     "auth_tokens": [
         ""
     ],
+    "base_url": "https://example.com",
+    "description": "+N",
+    "enabled": false,
     "id": "00000000-0000-0000-0000-000100000000",
-    "assets": [
+    "name": "1\\$r~WnIAG𢷱󳺖fG%)4m\u0004\u000e𠨔X\u00174~",
+    "public_keys": [
         {
-            "size": "preview",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
+            "type": "rsa"
         },
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
+            "type": "rsa"
         },
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
+            "type": "rsa"
+        },
+        {
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
+            "type": "rsa"
         }
     ],
-    "description": "+N",
+    "summary": "􁜵",
     "tags": [
         "medical",
         "travel",
         "weather"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_13.json b/libs/wire-api/test/golden/testObject_Service_provider_13.json
index e1e7da25152..7259671be23 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_13.json
@@ -1,36 +1,36 @@
 {
-    "summary": "R0m",
-    "public_keys": [
-        {
-            "size": 1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
-        },
+    "assets": [
         {
-            "size": 1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "complete",
+            "type": "image"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "\u0010dy>kx􊩝4f\u001b*󳓊y5Lp?I+p\u0014ᴒ\u000bq􉽇|\u000b7CIg\u000e\u0000/󼣲H󳇉\u001c%t􏿷0𖥌\u000cp@^󼼛0M}",
     "auth_tokens": [
         "",
         ""
     ],
+    "base_url": "https://example.com",
+    "description": "",
+    "enabled": false,
     "id": "00000000-0000-0001-0000-000100000000",
-    "assets": [
+    "name": "\u0010dy>kx􊩝4f\u001b*󳓊y5Lp?I+p\u0014ᴒ\u000bq􉽇|\u000b7CIg\u000e\u0000/󼣲H󳇉\u001c%t􏿷0𖥌\u000cp@^󼼛0M}",
+    "public_keys": [
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
+            "type": "rsa"
+        },
+        {
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
+            "type": "rsa"
         }
     ],
-    "description": "",
+    "summary": "R0m",
     "tags": [
         "education",
         "movies",
         "shopping"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_14.json b/libs/wire-api/test/golden/testObject_Service_provider_14.json
index f4c6f5a638c..d3e8f5e933e 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_14.json
@@ -1,42 +1,42 @@
 {
-    "summary": "\u0003󱗵",
+    "assets": [
+        {
+            "key": "A",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "auth_tokens": [
+        "Pw==",
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": ")R",
+    "enabled": true,
+    "id": "00000000-0000-0002-0000-000000000000",
+    "name": "Q}\u00079\u001a(􆖚\u000f􀳟\u001c~v\u000b𮈗\u000c\u0017p\u0000𫀎牖L􏚺Z󸑿𘫊AR0㉋O𫞃1\u0016\u0001mF\u0012\u000e􍉃)\u0002=3Rq:G\u0010􅮌􋫕􆜮.\u0017i\u001e\u001fU\u0007H\u0000覴Pd 9I\u0001tLf@aZ枔]7hO5\u0007",
     "public_keys": [
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "Q}\u00079\u001a(􆖚\u000f􀳟\u001c~v\u000b𮈗\u000c\u0017p\u0000𫀎牖L􏚺Z󸑿𘫊AR0㉋O𫞃1\u0016\u0001mF\u0012\u000e􍉃)\u0002=3Rq:G\u0010􅮌􋫕􆜮.\u0017i\u001e\u001fU\u0007H\u0000覴Pd 9I\u0001tLf@aZ枔]7hO5\u0007",
-    "auth_tokens": [
-        "Pw==",
-        ""
-    ],
-    "id": "00000000-0000-0002-0000-000000000000",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "A",
-            "type": "image"
-        }
-    ],
-    "description": ")R",
+    "summary": "\u0003󱗵",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_15.json b/libs/wire-api/test/golden/testObject_Service_provider_15.json
index 8f1dcb6a7e7..113b41b921a 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_15.json
@@ -1,43 +1,23 @@
 {
-    "summary": "",
-    "public_keys": [
-        {
-            "size": 0,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
-        },
-        {
-            "size": -1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
-        }
-    ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "X􍄗 \u0018\u001a𪆬\u0007'YNs\u0003%ꄆ(􂒍􄏽\t\u0016\u000e󽢮\"u⸵7\u0004W𪦯\u0008qO8W|T$Wtw\u0000󳱽tI􇷣􎑔qg잫<$𭍓WtXD>O󸴛W󱽁PZo.\u0005􋋗\u0018h𬀙\u0019QV𑖰7\"2_𐩾𭥊!𣻭\u0011inq\u001ciJ)_𪝗;􃨾",
-    "auth_tokens": [
-        "yA=="
-    ],
-    "id": "00000002-0000-0002-0000-000200000000",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -49,15 +29,35 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "auth_tokens": [
+        "yA=="
+    ],
+    "base_url": "https://example.com",
     "description": "",
+    "enabled": true,
+    "id": "00000002-0000-0002-0000-000200000000",
+    "name": "X􍄗 \u0018\u001a𪆬\u0007'YNs\u0003%ꄆ(􂒍􄏽\t\u0016\u000e󽢮\"u⸵7\u0004W𪦯\u0008qO8W|T$Wtw\u0000󳱽tI􇷣􎑔qg잫<$𭍓WtXD>O󸴛W󱽁PZo.\u0005􋋗\u0018h𬀙\u0019QV𑖰7\"2_𐩾𭥊!𣻭\u0011inq\u001ciJ)_𪝗;􃨾",
+    "public_keys": [
+        {
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
+            "type": "rsa"
+        },
+        {
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
+            "type": "rsa"
+        }
+    ],
+    "summary": "",
     "tags": [
         "design",
         "lifestyle",
         "quiz"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_16.json b/libs/wire-api/test/golden/testObject_Service_provider_16.json
index 9e391fbbbe9..8013b050279 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_16.json
@@ -1,37 +1,37 @@
 {
-    "summary": "?`x",
-    "public_keys": [
+    "assets": [
         {
-            "size": 0,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "type": "image"
         },
         {
-            "size": 1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "complete",
+            "type": "image"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "\u0011𢭫\u000bG0(H\u0018𩭶󻳲\u0015BtQZ1S*Kk~􄗯\u0000o𨞭o𔓃󴟊@Y𖢣(}\u0005k\u000b􎕞\u0003nx\u000c\u0019W\u00081r󴘷x :r󵥵𦑋E7󻑎󼤴[PU\u000c\u001cz\t\u000bx<󸆖I0)(0",
     "auth_tokens": [
         ""
     ],
+    "base_url": "https://example.com",
+    "description": "",
+    "enabled": false,
     "id": "00000001-0000-0001-0000-000100000000",
-    "assets": [
+    "name": "\u0011𢭫\u000bG0(H\u0018𩭶󻳲\u0015BtQZ1S*Kk~􄗯\u0000o𨞭o𔓃󴟊@Y𖢣(}\u0005k\u000b􎕞\u0003nx\u000c\u0019W\u00081r󴘷x :r󵥵𦑋E7󻑎󼤴[PU\u000c\u001cz\t\u000bx<󸆖I0)(0",
+    "public_keys": [
         {
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
+            "type": "rsa"
         },
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
+            "type": "rsa"
         }
     ],
-    "description": "",
+    "summary": "?`x",
     "tags": [
         "poll"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_17.json b/libs/wire-api/test/golden/testObject_Service_provider_17.json
index 2240c76bb55..6a039e06184 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_17.json
@@ -1,25 +1,25 @@
 {
-    "summary": "󲥄",
+    "assets": [],
+    "auth_tokens": [
+        "BA==",
+        "Fm4="
+    ],
+    "base_url": "https://example.com",
+    "description": "𬲻",
+    "enabled": true,
+    "id": "00000002-0000-0000-0000-000100000001",
+    "name": "0\u0013)NU𫥍\rr\u0018cYpN1\u0004𘕞𓉰V沍\u0002Ql\u0004􃓺\u0001󺢺KtA##j\u0015Qᓞk󶒪Z(\u0019|\u0015ga􎖗n\u0002'",
     "public_keys": [
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "0\u0013)NU𫥍\rr\u0018cYpN1\u0004𘕞𓉰V沍\u0002Ql\u0004􃓺\u0001󺢺KtA##j\u0015Qᓞk󶒪Z(\u0019|\u0015ga􎖗n\u0002'",
-    "auth_tokens": [
-        "BA==",
-        "Fm4="
-    ],
-    "id": "00000002-0000-0000-0000-000100000001",
-    "assets": [],
-    "description": "𬲻",
+    "summary": "󲥄",
     "tags": [
         "audio",
         "entertainment",
         "medical"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_18.json b/libs/wire-api/test/golden/testObject_Service_provider_18.json
index f01f4468587..2848bb868ee 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_18.json
@@ -1,39 +1,39 @@
 {
-    "summary": "|n",
+    "assets": [],
+    "auth_tokens": [
+        "5jM=",
+        "",
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "􍚲am",
+    "enabled": false,
+    "id": "00000001-0000-0000-0000-000000000002",
+    "name": "\u0006\u000c􍴡nw蚟$㬌􁼺6󽁦󾄛OS` H/&y?坋്6􄪝𝔖\u0012e󼩟w)z.g\u0016󷷾󱀦y@\u0017󷔥H\u0000M^\u001c[B3$􆳇S8\u0016􌢦N𨀚Vk/𑨣\u0001",
     "public_keys": [
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         },
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "\u0006\u000c􍴡nw蚟$㬌􁼺6󽁦󾄛OS` H/&y?坋്6􄪝𝔖\u0012e󼩟w)z.g\u0016󷷾󱀦y@\u0017󷔥H\u0000M^\u001c[B3$􆳇S8\u0016􌢦N𨀚Vk/𑨣\u0001",
-    "auth_tokens": [
-        "5jM=",
-        "",
-        ""
-    ],
-    "id": "00000001-0000-0000-0000-000000000002",
-    "assets": [],
-    "description": "􍚲am",
+    "summary": "|n",
     "tags": [
         "food-drink"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_19.json b/libs/wire-api/test/golden/testObject_Service_provider_19.json
index 2eb64f73339..bb1eb1256c2 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_19.json
@@ -1,24 +1,24 @@
 {
-    "summary": "",
+    "assets": [],
+    "auth_tokens": [
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "PSG",
+    "enabled": true,
+    "id": "00000001-0000-0000-0000-000000000000",
+    "name": ";<됀󷻫",
     "public_keys": [
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": ";<됀󷻫",
-    "auth_tokens": [
-        ""
-    ],
-    "id": "00000001-0000-0000-0000-000000000000",
-    "assets": [],
-    "description": "PSG",
+    "summary": "",
     "tags": [
         "fitness",
         "food-drink",
         "productivity"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_2.json b/libs/wire-api/test/golden/testObject_Service_provider_2.json
index e1eee2e9460..a129126c8eb 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_2.json
@@ -1,15 +1,16 @@
 {
-    "summary": "J@",
-    "public_keys": [
+    "assets": [
         {
-            "size": -1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
+            "key": "",
+            "size": "complete",
+            "type": "image"
+        },
+        {
+            "key": "",
+            "size": "complete",
+            "type": "image"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "󰸵t&\u0017􋨟㭉n𥋷\u0004󴃖𥳛S~!𦻨;\u000e\r󾳫􅓺镴Sm􃸃𤭝𫲀xm+~@sgR𧮅n閨?\u000f 󹥔6󿩈\u0000󷄏p􆎌𐇞'my?1󲦄\u0019%|\u0001󻕱𡧂7𮗈;S\r𨾌(7𗓼􉋢 x𣧪􁓉|WI℃𧕽\u001f𬶀F6𬌽MpL>𥛛\u001e",
     "auth_tokens": [
         "",
         "",
@@ -19,19 +20,18 @@
         "",
         ""
     ],
+    "base_url": "https://example.com",
+    "description": "􎅠쁰",
+    "enabled": true,
     "id": "00000002-0000-0002-0000-000100000000",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        },
+    "name": "󰸵t&\u0017􋨟㭉n𥋷\u0004󴃖𥳛S~!𦻨;\u000e\r󾳫􅓺镴Sm􃸃𤭝𫲀xm+~@sgR𧮅n閨?\u000f 󹥔6󿩈\u0000󷄏p􆎌𐇞'my?1󲦄\u0019%|\u0001󻕱𡧂7𮗈;S\r𨾌(7𗓼􉋢 x𣧪􁓉|WI℃𧕽\u001f𬶀F6𬌽MpL>𥛛\u001e",
+    "public_keys": [
         {
-            "size": "complete",
-            "key": "",
-            "type": "image"
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
+            "type": "rsa"
         }
     ],
-    "description": "􎅠쁰",
+    "summary": "J@",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_20.json b/libs/wire-api/test/golden/testObject_Service_provider_20.json
index 33efc6a1217..45aabaf4d1f 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_20.json
@@ -1,20 +1,20 @@
 {
-    "summary": "p\u001e",
+    "assets": [],
+    "auth_tokens": [
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "\u000bZK",
+    "enabled": true,
+    "id": "00000000-0000-0002-0000-000000000001",
+    "name": "$󴭯垼z\u000e$\u0007iC$z)𫳀𘂔\u0000w=0OU􊼝\u0002󶥪\u0006󽄰(Hi􋘾􃂦L{Q\"](%𘝓L4ks􋐒𤓷⣭tf󳇛\u0002᠉C𛆉@􊫌P𩅛􃾤󽙷U󼛩)eH7硜7\u00061neF \u0011j􍋺\u0000ゕ1):𑚉>Qt\u001b,\\n易D\u000e6J[𦘌T\u0008\u000f𫟩HO4\u0001[\u000f7󷓩*7\u001dH\u001cl",
     "public_keys": [
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "$󴭯垼z\u000e$\u0007iC$z)𫳀𘂔\u0000w=0OU􊼝\u0002󶥪\u0006󽄰(Hi􋘾􃂦L{Q\"](%𘝓L4ks􋐒𤓷⣭tf󳇛\u0002᠉C𛆉@􊫌P𩅛􃾤󽙷U󼛩)eH7硜7\u00061neF \u0011j􍋺\u0000ゕ1):𑚉>Qt\u001b,\\n易D\u000e6J[𦘌T\u0008\u000f𫟩HO4\u0001[\u000f7󷓩*7\u001dH\u001cl",
-    "auth_tokens": [
-        ""
-    ],
-    "id": "00000000-0000-0002-0000-000000000001",
-    "assets": [],
-    "description": "\u000bZK",
+    "summary": "p\u001e",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_3.json b/libs/wire-api/test/golden/testObject_Service_provider_3.json
index 97fc20737cd..457e2391bf3 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_3.json
@@ -1,32 +1,32 @@
 {
-    "summary": "i󼴣",
+    "assets": [],
+    "auth_tokens": [
+        "9JE=",
+        "",
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "x",
+    "enabled": true,
+    "id": "00000000-0000-0000-0000-000100000002",
+    "name": "\u0007\u0017;𓁜ꔯ\u000f\u0019<{wDꌱ\u0014\u0008𣒁GG쫹=H-㧵:\u000e󳸒0`\u000b􀎨𫹐=FWj\u001b􃄕Ꮫ\u0001C􂌟G㏖JDqUp\nL󳂭􈺻rx\u001bg\u001e5𢏕h*󽢄}\u001cdi;Q]󰎠\u0010\u0016a􋣶󷞳\u0019nb`襦\n\u0006~3;@]~󲒫P@l+𒁋𗽢l%*𗮙{n\u0002x@4󾳓ⵣ)\u001d\u001f<ev󻇰9=󲑷[",
     "public_keys": [
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "\u0007\u0017;𓁜ꔯ\u000f\u0019<{wDꌱ\u0014\u0008𣒁GG쫹=H-㧵:\u000e󳸒0`\u000b􀎨𫹐=FWj\u001b􃄕Ꮫ\u0001C􂌟G㏖JDqUp\nL󳂭􈺻rx\u001bg\u001e5𢏕h*󽢄}\u001cdi;Q]󰎠\u0010\u0016a􋣶󷞳\u0019nb`襦\n\u0006~3;@]~󲒫P@l+𒁋𗽢l%*𗮙{n\u0002x@4󾳓ⵣ)\u001d\u001f<ev󻇰9=󲑷[",
-    "auth_tokens": [
-        "9JE=",
-        "",
-        ""
-    ],
-    "id": "00000000-0000-0000-0000-000100000002",
-    "assets": [],
-    "description": "x",
+    "summary": "i󼴣",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_4.json b/libs/wire-api/test/golden/testObject_Service_provider_4.json
index 462089cc9d7..b227bc0a2ac 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_4.json
@@ -1,46 +1,46 @@
 {
-    "summary": "g􁒪L",
+    "assets": [
+        {
+            "key": "",
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "auth_tokens": [
+        "ZGU=",
+        "",
+        "",
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "󰛕Vf",
+    "enabled": false,
+    "id": "00000000-0000-0002-0000-000200000002",
+    "name": "OR\u001a6h󽌨韦^􊂂➣􊒞\u00084N\u0018S7􌸋𧕬NgKC∛걡TAskw}󰍀Ig[􍢴%\u0018=\u0014􌕴𢧵;OL\u0007lE𠍚c*nT\u0002\u000f",
     "public_keys": [
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "OR\u001a6h󽌨韦^􊂂➣􊒞\u00084N\u0018S7􌸋𧕬NgKC∛걡TAskw}󰍀Ig[􍢴%\u0018=\u0014􌕴𢧵;OL\u0007lE𠍚c*nT\u0002\u000f",
-    "auth_tokens": [
-        "ZGU=",
-        "",
-        "",
-        ""
-    ],
-    "id": "00000000-0000-0002-0000-000200000002",
-    "assets": [
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "description": "󰛕Vf",
+    "summary": "g􁒪L",
     "tags": [
         "media"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_5.json b/libs/wire-api/test/golden/testObject_Service_provider_5.json
index c94ec8f2ceb..3d473116fe8 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_5.json
@@ -1,28 +1,28 @@
 {
-    "summary": "D\u0008\r",
+    "assets": [],
+    "auth_tokens": [
+        "hQ=="
+    ],
+    "base_url": "https://example.com",
+    "description": "𩬀",
+    "enabled": false,
+    "id": "00000002-0000-0001-0000-000200000001",
+    "name": "󰖱5'!)\u000e\u001a\u0014痒\"q󶑢dCS9􈡈Jv[t\u0011\u0004\rXP\u000b=_󴇜=@𩽔I󷨮\u0004J\"簵C{;𪺽𡕫𫠙Do\u0013󽲈\u000b+Sz\u0001v@\u0004󾶜\u0007gR𥙿u+aw݈}0B~\u0006嗹8PT[\u0019F",
     "public_keys": [
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "󰖱5'!)\u000e\u001a\u0014痒\"q󶑢dCS9􈡈Jv[t\u0011\u0004\rXP\u000b=_󴇜=@𩽔I󷨮\u0004J\"簵C{;𪺽𡕫𫠙Do\u0013󽲈\u000b+Sz\u0001v@\u0004󾶜\u0007gR𥙿u+aw݈}0B~\u0006嗹8PT[\u0019F",
-    "auth_tokens": [
-        "hQ=="
-    ],
-    "id": "00000002-0000-0001-0000-000200000001",
-    "assets": [],
-    "description": "𩬀",
+    "summary": "D\u0008\r",
     "tags": [
         "lifestyle",
         "tutorial"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_6.json b/libs/wire-api/test/golden/testObject_Service_provider_6.json
index f135df9bdd3..ef2d363e957 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_6.json
@@ -1,35 +1,13 @@
 {
-    "summary": "V",
-    "public_keys": [
-        {
-            "size": 0,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
-        },
-        {
-            "size": -1,
-            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-            "type": "rsa"
-        }
-    ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "\u000bႺX𒒧B\u001d\u0006𨒔s)\u000bq􀙇(\u000c{\u0017~0󻂌L𠊴",
-    "auth_tokens": [
-        "jK0=",
-        "",
-        ""
-    ],
-    "id": "00000001-0000-0001-0000-000000000002",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -37,20 +15,42 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "auth_tokens": [
+        "jK0=",
+        "",
+        ""
+    ],
+    "base_url": "https://example.com",
     "description": "󹝪",
+    "enabled": true,
+    "id": "00000001-0000-0001-0000-000000000002",
+    "name": "\u000bႺX𒒧B\u001d\u0006𨒔s)\u000bq􀙇(\u000c{\u0017~0󻂌L𠊴",
+    "public_keys": [
+        {
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
+            "type": "rsa"
+        },
+        {
+            "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
+            "type": "rsa"
+        }
+    ],
+    "summary": "V",
     "tags": [
         "finance",
         "fitness",
         "movies"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_7.json b/libs/wire-api/test/golden/testObject_Service_provider_7.json
index bf478b7acd2..5c3fdd8cd07 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_7.json
@@ -1,44 +1,44 @@
 {
-    "summary": ")S",
+    "assets": [
+        {
+            "key": "",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "auth_tokens": [
+        "Csg=",
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "󺄲",
+    "enabled": true,
+    "id": "00000002-0000-0001-0000-000100000002",
+    "name": "\u0007󰓮󱺨^*%􁞰𝝖;+(\u00023I\u0001;4􉴔q2􏏕5U\u0004􅔖C\"\u0008𣩩x𪲇=%[􈚠adK!1∼𢊂𠁅Y\u0004X󺦾3\u0006󱬬\t\u000eB\u0005PV[bb\u000cW\"\u000bO𣘙\u00052=;S0w`󲁓滺\u0014V/_銫\u000c𢃐\u000f\u000c-XM𭆦q\u00199\u0013\u001a􇯛􈤉\u00059",
     "public_keys": [
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "\u0007󰓮󱺨^*%􁞰𝝖;+(\u00023I\u0001;4􉴔q2􏏕5U\u0004􅔖C\"\u0008𣩩x𪲇=%[􈚠adK!1∼𢊂𠁅Y\u0004X󺦾3\u0006󱬬\t\u000eB\u0005PV[bb\u000cW\"\u000bO𣘙\u00052=;S0w`󲁓滺\u0014V/_銫\u000c𢃐\u000f\u000c-XM𭆦q\u00199\u0013\u001a􇯛􈤉\u00059",
-    "auth_tokens": [
-        "Csg=",
-        ""
-    ],
-    "id": "00000002-0000-0001-0000-000100000002",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ],
-    "description": "󺄲",
+    "summary": ")S",
     "tags": [
         "movies"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_8.json b/libs/wire-api/test/golden/testObject_Service_provider_8.json
index 289437a0616..2362ca85b8a 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_8.json
@@ -1,47 +1,47 @@
 {
-    "summary": "\u0015MV",
+    "assets": [],
+    "auth_tokens": [
+        "ow==",
+        "",
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "\rJ",
+    "enabled": true,
+    "id": "00000000-0000-0000-0000-000100000002",
+    "name": "n󰙯5\u0001􃽌\u001f36􇔩\u0001􍶛y퇦\u000e\u0005={Hu9\u001e/\u0007𢡘􂙑",
     "public_keys": [
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         },
         {
-            "size": -1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": -1,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         },
         {
-            "size": 1,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 1,
             "type": "rsa"
         }
     ],
-    "enabled": true,
-    "base_url": "https://example.com",
-    "name": "n󰙯5\u0001􃽌\u001f36􇔩\u0001􍶛y퇦\u000e\u0005={Hu9\u001e/\u0007𢡘􂙑",
-    "auth_tokens": [
-        "ow==",
-        "",
-        ""
-    ],
-    "id": "00000000-0000-0000-0000-000100000002",
-    "assets": [],
-    "description": "\rJ",
+    "summary": "\u0015MV",
     "tags": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Service_provider_9.json b/libs/wire-api/test/golden/testObject_Service_provider_9.json
index 00d9c8f959a..3cbda6c7656 100644
--- a/libs/wire-api/test/golden/testObject_Service_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_Service_provider_9.json
@@ -1,22 +1,22 @@
 {
-    "summary": "",
+    "assets": [],
+    "auth_tokens": [
+        ""
+    ],
+    "base_url": "https://example.com",
+    "description": "",
+    "enabled": false,
+    "id": "00000002-0000-0001-0000-000200000001",
+    "name": "\u000f!sC(𮛣􎏏oh,坄󲫁ﯬ\u001a󲠬~!\u0003 𭑺9\rH𨒡c<\u0013\u0000\u000b\u0010󰨭\u000e\u0014j",
     "public_keys": [
         {
-            "size": 0,
             "pem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+            "size": 0,
             "type": "rsa"
         }
     ],
-    "enabled": false,
-    "base_url": "https://example.com",
-    "name": "\u000f!sC(𮛣􎏏oh,坄󲫁ﯬ\u001a󲠬~!\u0003 𭑺9\rH𨒡c<\u0013\u0000\u000b\u0010󰨭\u000e\u0014j",
-    "auth_tokens": [
-        ""
-    ],
-    "id": "00000002-0000-0001-0000-000200000001",
-    "assets": [],
-    "description": "",
+    "summary": "",
     "tags": [
         "lifestyle"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_1.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_1.json
index 80eaac005a9..78fffd48e69 100644
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SimpleMember_user_1.json
@@ -1,8 +1,8 @@
 {
-    "conversation_role": "wire_admin",
+    "conversation_role": "wire_member",
+    "id": "0000003a-0000-0042-0000-007500000037",
     "qualified_id": {
         "domain": "faraway.example.com",
         "id": "0000003a-0000-0042-0000-007500000037"
-    },
-    "id": "0000003a-0000-0042-0000-007500000037"
-}
\ No newline at end of file
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_10.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_10.json
deleted file mode 100644
index 207a5662724..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_10.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "paru",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000001d-0000-000f-0000-002900000072"
-    },
-    "id": "0000001d-0000-000f-0000-002900000072"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_11.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_11.json
deleted file mode 100644
index bd484ba060c..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_11.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "e0u15rrzql4y8jymut86vv84l4tjzpfti0_b1w44gy13j3d0dq1y22ws75tkgd4n_9tju4pq34_ddk_g9qpypwu4z3b5",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000007d-0000-0076-0000-001e00000019"
-    },
-    "id": "0000007d-0000-0076-0000-001e00000019"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_12.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_12.json
deleted file mode 100644
index 17bf66944e4..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_12.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "telj17ej33ilgtqvqajp0ofng9qm6v9b1n32n_l6_vw_xxtk4o7n6r50ea3w1xgzh3eapah1jytfpz0f65utf9xqc4pv",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000003c-0000-0001-0000-004a00000014"
-    },
-    "id": "0000003c-0000-0001-0000-004a00000014"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_13.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_13.json
deleted file mode 100644
index 84463a68ceb..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_13.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "bfamau83n6sskso4rod8fz1tb4tf1zfz8mfd1v0ae1sx17po1",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000052-0000-002c-0000-004500000067"
-    },
-    "id": "00000052-0000-002c-0000-004500000067"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_14.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_14.json
deleted file mode 100644
index 4f9ce06a973..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_14.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "tu7zi7d5va224nfegt84g0argkadivw4hlvkj_bpixff19r8j2lf1uhde2rex9ery9xskxm2f_2mpbgutdj6kt56n5proalpciwttcomv3j1pzev6qw3ism",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000018-0000-006d-0000-000600000017"
-    },
-    "id": "00000018-0000-006d-0000-000600000017"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_15.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_15.json
deleted file mode 100644
index 4d0e2fcf4ba..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_15.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "rt25zies0df",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000006e-0000-0037-0000-00610000007e"
-    },
-    "id": "0000006e-0000-0037-0000-00610000007e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_16.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_16.json
deleted file mode 100644
index 06b82a17bbf..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_16.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "pknq1f2x",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000042-0000-006a-0000-000800000052"
-    },
-    "id": "00000042-0000-006a-0000-000800000052"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_17.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_17.json
deleted file mode 100644
index eb9e4b7ab4b..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_17.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "w1bcl23oz4ax6dg14h3y8nxqb77sx9ajonsvx7qd",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000020-0000-0000-0000-00500000005c"
-    },
-    "id": "00000020-0000-0000-0000-00500000005c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_18.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_18.json
deleted file mode 100644
index bf78e9cbd6c..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_18.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "u1c8n7lhvsnr5cdavje5wbezt4an_h92yp0bma6l_6h6dn67lh8_jpk8_eznfja7qhh7wkczfanq5esl7b9y2g16afnnsvgt6i48pmjeo1msq7uuvm",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000049-0000-000c-0000-004d00000043"
-    },
-    "id": "00000049-0000-000c-0000-004d00000043"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_19.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_19.json
deleted file mode 100644
index f87a616748f..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_19.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "jzmvwd4h3ji2yc2wbog57546ono56qpsobzbszmed5y5436ub8lrvfydxmfleq4j6yj04vdivxpagt5lm5luplyy9zwcbjwyhgcom2njlzvj3ydbmol2onhp75p3",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000031-0000-003d-0000-003800000024"
-    },
-    "id": "00000031-0000-003d-0000-003800000024"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_2.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_2.json
deleted file mode 100644
index 67ad5b26c31..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "wire_member",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000046-0000-0027-0000-003c00000022"
-    },
-    "id": "00000046-0000-0027-0000-003c00000022"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_20.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_20.json
deleted file mode 100644
index 7d86e716092..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_20.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "qbb0jgv5yq8ur0ogawcj0gx3f6yau5cnc5x3q8rnq5pn3mn4160ipvryoa2cpz0beg34ur64klqk5a2r9rqvc38w_gp6rbli54r46417_5mmylx5usc9",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000074-0000-0010-0000-001600000078"
-    },
-    "id": "00000074-0000-0010-0000-001600000078"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_3.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_3.json
deleted file mode 100644
index b74eaec28bc..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_3.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "7uzp7961dyf_666xqxwvq6uro",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000039-0000-0070-0000-005700000019"
-    },
-    "id": "00000039-0000-0070-0000-005700000019"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_4.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_4.json
deleted file mode 100644
index f834cecdf8f..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_4.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "4vr9oed4nvhs625ri_cz1cv5kodntk3edmkpu",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000007c-0000-0075-0000-005b00000049"
-    },
-    "id": "0000007c-0000-0075-0000-005b00000049"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_5.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_5.json
deleted file mode 100644
index 3117b34574c..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_5.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "wst92x",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000004c-0000-004e-0000-002400000009"
-    },
-    "id": "0000004c-0000-004e-0000-002400000009"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_6.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_6.json
deleted file mode 100644
index 75de83ef78a..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_6.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "nkyx6ypx0p0b_fvx6mt6w5w6n2qpivv9svj2myn5n86isy7n2e07m92t7ostflj4lq1py50bqzdi4smzd",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "00000052-0000-0053-0000-000400000000"
-    },
-    "id": "00000052-0000-0053-0000-000400000000"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_7.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_7.json
deleted file mode 100644
index cc213dd2767..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_7.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "d8027w_w7pr9fj",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000003d-0000-006f-0000-00480000006e"
-    },
-    "id": "0000003d-0000-006f-0000-00480000006e"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_8.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_8.json
deleted file mode 100644
index 7c4a65c39d4..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_8.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "_rgnqtn1bdc2eb4nr8ilpka1sm6kt5bvonqm742npdpro1s4b_ydcahfm4q7i0getmnp0vdpod_eye8c_1kb72d_96qypb",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000004c-0000-006c-0000-000800000044"
-    },
-    "id": "0000004c-0000-006c-0000-000800000044"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMember_user_9.json b/libs/wire-api/test/golden/testObject_SimpleMember_user_9.json
deleted file mode 100644
index c247cf598ac..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMember_user_9.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "conversation_role": "sr5pfubd0_cpdp",
-    "qualified_id": {
-        "domain": "faraway.example.com",
-        "id": "0000000a-0000-007a-0000-003f0000001b"
-    },
-    "id": "0000000a-0000-007a-0000-003f0000001b"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_1.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_1.json
index 28d67a6c568..05bc2447cab 100644
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_1.json
+++ b/libs/wire-api/test/golden/testObject_SimpleMembers_user_1.json
@@ -1,168 +1,15 @@
 {
+    "user_ids": [
+        "0000001f-0000-002b-0000-005500000013"
+    ],
     "users": [
         {
-            "conversation_role": "py49zu8bed53ta2nhrhtkv1ck923pk8x70h1zzgp1h15yf6_vcqq7aeckcwpgonge096jg1l2xm4qogs3gucm_s8c_djl718bnwnm6x16rtxttlb47fiazreiew8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000048-0000-0011-0000-002300000050"
-            },
-            "id": "00000048-0000-0011-0000-002300000050"
-        },
-        {
-            "conversation_role": "qslp25fyjfvydgtfk3v3ibh8eqdq3kpek7rb11xteg2y5_0a1mv14v5n79jznd5zjfes70nqyeacesqi8v62fmzsc_4zss75er",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000030-0000-003d-0000-00620000002a"
-            },
-            "id": "00000030-0000-003d-0000-00620000002a"
-        },
-        {
-            "conversation_role": "n0_wuagfmm6ltcjr0n2ib7l2mdg3i0zwtzmb6aribmg2107sirkgo17wjt9d2h66nj3lerw_blivsh6by09a",
+            "conversation_role": "n0_wu2h66nj3lerw_blivsh6by09a",
+            "id": "0000001f-0000-002b-0000-005500000013",
             "qualified_id": {
                 "domain": "faraway.example.com",
                 "id": "0000001f-0000-002b-0000-005500000013"
-            },
-            "id": "0000001f-0000-002b-0000-005500000013"
-        },
-        {
-            "conversation_role": "4q8i3kin7cuo_xpa",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000062-0000-0017-0000-005a00000019"
-            },
-            "id": "00000062-0000-0017-0000-005a00000019"
-        },
-        {
-            "conversation_role": "e52wem88ym9kubyydku",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000065-0000-002e-0000-00730000002f"
-            },
-            "id": "00000065-0000-002e-0000-00730000002f"
-        },
-        {
-            "conversation_role": "yson37f_88qcp5chnwpjnwin427qoptb7bmlx5u2454vw95vvt241red8i1pkavlha4l9vx3cr1ajgklb",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000048-0000-0068-0000-002300000042"
-            },
-            "id": "00000048-0000-0068-0000-002300000042"
-        },
-        {
-            "conversation_role": "q24o118lbfa5zisiltltauh2qyf2lo_vu10hohqtf157wiasc4old5lwbn0g5xarmmu91kfqczv1om08v81k_a",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000021-0000-0057-0000-005d00000055"
-            },
-            "id": "00000021-0000-0057-0000-005d00000055"
-        },
-        {
-            "conversation_role": "0otsqpgjh2ctmp22nsof114767_vow59km_e",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000080-0000-0071-0000-003400000066"
-            },
-            "id": "00000080-0000-0071-0000-003400000066"
-        },
-        {
-            "conversation_role": "406ogeb8o68w",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000036-0000-0050-0000-002a0000005b"
-            },
-            "id": "00000036-0000-0050-0000-002a0000005b"
-        },
-        {
-            "conversation_role": "vgwq1mfqei0embh6msg2q0ucobreh9jl61ql0fge66e9xe",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000044-0000-0025-0000-002e00000026"
-            },
-            "id": "00000044-0000-0025-0000-002e00000026"
-        },
-        {
-            "conversation_role": "rmv3a7k_p9vlj1l324wnlko6fa0ve13nnf9n0qmey0dgacxewoyss9wih9k0oddw3q634r8ewtj43os8jwg5ka7m58vcqlq2ci6n0a139_g3avnchq9uvi0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000059-0000-0000-0000-002e0000002d"
-            },
-            "id": "00000059-0000-0000-0000-002e0000002d"
-        },
-        {
-            "conversation_role": "9pryu0zv3nw_xtb3xr1naukqs0e",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000014-0000-0003-0000-002600000025"
-            },
-            "id": "00000014-0000-0003-0000-002600000025"
-        },
-        {
-            "conversation_role": "iy",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002c-0000-0006-0000-007300000061"
-            },
-            "id": "0000002c-0000-0006-0000-007300000061"
-        },
-        {
-            "conversation_role": "bv0fkxi4521qi41njnulwsz6lp4qwsm0mgbkis1pwjc4bxatdie460vepfj11u_osup17wizy3clm31t_z827yzkw_zcgs",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003f-0000-002c-0000-00670000002f"
-            },
-            "id": "0000003f-0000-002c-0000-00670000002f"
-        },
-        {
-            "conversation_role": "5v6_cttr3ctgrijw4h1_gsyi41f4t3dgyh64dhcgeoxvao1h68",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006c-0000-0072-0000-00400000002d"
-            },
-            "id": "0000006c-0000-0072-0000-00400000002d"
-        },
-        {
-            "conversation_role": "x0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000064-0000-0070-0000-000800000049"
-            },
-            "id": "00000064-0000-0070-0000-000800000049"
-        },
-        {
-            "conversation_role": "ss07m2lagw1v7yvn_swpeauvqdyktrcjreq86gx7shm4xkc3rtimrykvblvtc52pnc8obmsdz475yeet1sxlp0hq7wcaagr2hdi7a7d801khmybj",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006a-0000-002e-0000-006000000070"
-            },
-            "id": "0000006a-0000-002e-0000-006000000070"
-        },
-        {
-            "conversation_role": "vb_ng523gxc0ci13cmxscmusff8uw12hvbsvfsa",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000059-0000-005a-0000-002300000061"
-            },
-            "id": "00000059-0000-005a-0000-002300000061"
+            }
         }
-    ],
-    "user_ids": [
-        "00000048-0000-0011-0000-002300000050",
-        "00000030-0000-003d-0000-00620000002a",
-        "0000001f-0000-002b-0000-005500000013",
-        "00000062-0000-0017-0000-005a00000019",
-        "00000065-0000-002e-0000-00730000002f",
-        "00000048-0000-0068-0000-002300000042",
-        "00000021-0000-0057-0000-005d00000055",
-        "00000080-0000-0071-0000-003400000066",
-        "00000036-0000-0050-0000-002a0000005b",
-        "00000044-0000-0025-0000-002e00000026",
-        "00000059-0000-0000-0000-002e0000002d",
-        "00000014-0000-0003-0000-002600000025",
-        "0000002c-0000-0006-0000-007300000061",
-        "0000003f-0000-002c-0000-00670000002f",
-        "0000006c-0000-0072-0000-00400000002d",
-        "00000064-0000-0070-0000-000800000049",
-        "0000006a-0000-002e-0000-006000000070",
-        "00000059-0000-005a-0000-002300000061"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_10.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_10.json
deleted file mode 100644
index 0b9e7a7d9ae..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_10.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "buaqu8i1j2czfkdn3jyq1u3m5w3ohl9tuy9c8kihit3s9cax_4f62sr7kj7wfk6gtf6bsrkl6fcvh59idymwykehmvnqfo232q4m2gnc05237ikemuoto",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000047-0000-0044-0000-005c0000003c"
-            },
-            "id": "00000047-0000-0044-0000-005c0000003c"
-        },
-        {
-            "conversation_role": "64s251imkzo_1fnf4o14i68wjowm02yfae3casjqc6fo_qjhhep50tjlir_i1ggt5qfri_1lk07y7ue81lwykuv9m2se6t8rtkm98zaz1k30",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000068-0000-006a-0000-002c00000071"
-            },
-            "id": "00000068-0000-006a-0000-002c00000071"
-        },
-        {
-            "conversation_role": "5eugts7sax037o6wowr1yoccc3hp8t226kk3y6h0dqdljvkktrxse2ci788qpulg7o48nco0x5jn1ahwll0vmsmpdzx_oqt9bpejkcd6w2sqrevyfoxei",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000040-0000-0068-0000-001300000019"
-            },
-            "id": "00000040-0000-0068-0000-001300000019"
-        }
-    ],
-    "user_ids": [
-        "00000047-0000-0044-0000-005c0000003c",
-        "00000068-0000-006a-0000-002c00000071",
-        "00000040-0000-0068-0000-001300000019"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_11.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_11.json
deleted file mode 100644
index 773cc8c4c30..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_11.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "yprw788nm_1n_l3i6g1xn1xjokilmavqko9otxa26hobs7e7s1fgruka4iom01i00aoyui37so",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000069-0000-0074-0000-006800000058"
-            },
-            "id": "00000069-0000-0074-0000-006800000058"
-        },
-        {
-            "conversation_role": "095o8ll6js3jmhid4vk1j7vc2x_cxq4u7wqr8quf2ndx7wre1525bpa89_k5b6bvy8ypjlkk5xe1u7jqy40dk7blp3fmp0l1vfzg1em2pkpv8dtzp50rgqy_s1c",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001c-0000-007e-0000-003300000074"
-            },
-            "id": "0000001c-0000-007e-0000-003300000074"
-        },
-        {
-            "conversation_role": "n9yc3pd38tzb9y_h0oi_d_4r01bpumk0puut8s72kdztlrl3k89d49_07kz_z2br0vey8b1fyo4o_45j7vrpz3wiyrdsjr6l3rg8lwhwk_u5flh_62ld3t",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000025-0000-0064-0000-007000000046"
-            },
-            "id": "00000025-0000-0064-0000-007000000046"
-        },
-        {
-            "conversation_role": "15firv29l22tvugxzg9x0g59_29h02jqnfg9c5p5e7tr2m64u5bnmsp1fzs8mcvqsb17ym4k1q1ap96v9wxgs1",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000037-0000-000a-0000-00140000001a"
-            },
-            "id": "00000037-0000-000a-0000-00140000001a"
-        },
-        {
-            "conversation_role": "tddu3qs3p60da19ibmx92unwy8mu9goocijbeamqw4bn3d5kt6_zkm2x1j2mawr_ygt",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004b-0000-004b-0000-005000000005"
-            },
-            "id": "0000004b-0000-004b-0000-005000000005"
-        },
-        {
-            "conversation_role": "_ooid3_m9x6065k4n_ka4m0n9hf9anvvmlosi6v4a9e7960cc1elsy7h_7i_bjq3573eh2q7d65zhsqkc69uef7lnv4qqnr8disz4y3idhnvvw_7z8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005b-0000-004a-0000-000f00000029"
-            },
-            "id": "0000005b-0000-004a-0000-000f00000029"
-        },
-        {
-            "conversation_role": "u757zclatb90zyqr29fhuyho0ll2ks90fjji59df50j5aj4tga82k5qsv6ltqbabgx2j3tiofb1iorkzw_d6mhe_g9lzt8cb0iqwa7vag0pqrwfhs5lf7b8qm9f",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000069-0000-003e-0000-002300000076"
-            },
-            "id": "00000069-0000-003e-0000-002300000076"
-        },
-        {
-            "conversation_role": "ku38a6jk6fswgsgegqka_b33d6gqkwcy7egbx2rpr4pyravsymugig8l6flqxjyyl",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003e-0000-0047-0000-005e0000006a"
-            },
-            "id": "0000003e-0000-0047-0000-005e0000006a"
-        },
-        {
-            "conversation_role": "x3th543fq4asgv",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003d-0000-0034-0000-001100000003"
-            },
-            "id": "0000003d-0000-0034-0000-001100000003"
-        },
-        {
-            "conversation_role": "qc679x0r4twf5feu87fjf1dukbgbjil0otcoyim397",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000042-0000-0018-0000-006f00000063"
-            },
-            "id": "00000042-0000-0018-0000-006f00000063"
-        },
-        {
-            "conversation_role": "neniwbge16i_igh4jj_02qflp698pz5xy6hv435ma6q2qlxn3dyz2oao0b43gg93m",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000066-0000-0065-0000-00640000006c"
-            },
-            "id": "00000066-0000-0065-0000-00640000006c"
-        },
-        {
-            "conversation_role": "mbsnb3cb9i2dxlbz6h0l9_ocpa6zdmtt6708g6bi6b5o59v3s",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005b-0000-0068-0000-006300000031"
-            },
-            "id": "0000005b-0000-0068-0000-006300000031"
-        },
-        {
-            "conversation_role": "bv8e7m3xfc3bt639goa1tied4",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000025-0000-000d-0000-000000000008"
-            },
-            "id": "00000025-0000-000d-0000-000000000008"
-        },
-        {
-            "conversation_role": "oejuw0rpkxojd7lwdvvmypnw5jga0w0i7kf84ryviznjgm_3nd1ls5ykcij2b_xqx9dc36hafa1lvk4x_vo_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000010-0000-0007-0000-005700000011"
-            },
-            "id": "00000010-0000-0007-0000-005700000011"
-        },
-        {
-            "conversation_role": "nzqm5_qyv5uj1f47xveo_2hlkqt5n6jrb5o14invzlhe2ddo66",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000059-0000-0001-0000-005e00000073"
-            },
-            "id": "00000059-0000-0001-0000-005e00000073"
-        },
-        {
-            "conversation_role": "i2_ymg4hcm7bl3ll_9azdlhrur24lolk388v7o2dz1d_zvgyi4btbztoucql64gwoxoilsegph5rpc6n6u2tj9uunlgk29xvqntt8_q41l0cuc7pof26ea5wbzg91e3w",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000063-0000-0061-0000-005f00000045"
-            },
-            "id": "00000063-0000-0061-0000-005f00000045"
-        },
-        {
-            "conversation_role": "o7n8q1ocx3r99s32sb4_3xg24xz1akvsjebh_kn5cgaxo3e9j5f31cuewnzay80hngq6jjmpqxzde9da5etny",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002e-0000-001e-0000-00350000001a"
-            },
-            "id": "0000002e-0000-001e-0000-00350000001a"
-        },
-        {
-            "conversation_role": "32ph0fihxtoawktwdjjd8680nz_mx8tlawldvwm8jba2kjd6tjwi4obhmpnnfqzcdcz31y_1e00gtmrugnjfwh8_nmhgca17jla9s9yy9q",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000013-0000-005c-0000-006100000023"
-            },
-            "id": "00000013-0000-005c-0000-006100000023"
-        },
-        {
-            "conversation_role": "c3ydrescfgmvsgks6xy866xluancois0b4vl6ypsl6810rlnu",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000e-0000-0031-0000-00300000000c"
-            },
-            "id": "0000000e-0000-0031-0000-00300000000c"
-        },
-        {
-            "conversation_role": "nvmtteg8vpg28a9srnw_vn7er1krdecoovramdcin7qdpvrx6bildn885wlfcav9nooubk1hs6g0u5v1v8t0p8vip08o2x1pqj",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007e-0000-002a-0000-007c0000004f"
-            },
-            "id": "0000007e-0000-002a-0000-007c0000004f"
-        },
-        {
-            "conversation_role": "bhpymrq9y__8p",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000011-0000-001e-0000-001e00000054"
-            },
-            "id": "00000011-0000-001e-0000-001e00000054"
-        },
-        {
-            "conversation_role": "mmhox9z9kjhkvj_0l8me0ecnp1m2slotp389sts11f43v71arii5z19n8tb6ct2d4hyyjd45vvwwa_qtuejbwvguyje",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005f-0000-000d-0000-004e00000016"
-            },
-            "id": "0000005f-0000-000d-0000-004e00000016"
-        },
-        {
-            "conversation_role": "xyep0gej_kghofx50j3bbolxbm2i58wwp0t_l0pscq4",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001f-0000-005c-0000-00570000002a"
-            },
-            "id": "0000001f-0000-005c-0000-00570000002a"
-        },
-        {
-            "conversation_role": "5ozb9c3tnkwaiu4bpw2_nn1o3ib55gjnwen6lw4ltaoitt0ngnxbwahqj631w3pfgphrp0yoh19ip0qfn29p84zijlnystitjm8_v39o4swr2xs3ahs8s2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000003-0000-0050-0000-00110000004d"
-            },
-            "id": "00000003-0000-0050-0000-00110000004d"
-        },
-        {
-            "conversation_role": "04n6",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000055-0000-006f-0000-002f0000007a"
-            },
-            "id": "00000055-0000-006f-0000-002f0000007a"
-        },
-        {
-            "conversation_role": "m1vbstno19orwr77zwq8q8ak1xxdhotqyn30kdv9fq44n2zr0rn46gqfrw8lxp7mt7eywgku3gudup",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005a-0000-0067-0000-00600000006b"
-            },
-            "id": "0000005a-0000-0067-0000-00600000006b"
-        },
-        {
-            "conversation_role": "v_ahoalwm78dh_ggai7wusblsnlwhibegsuxe5w1ibm2cnj79a64r_s72hwigx1cw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000048-0000-007b-0000-001500000034"
-            },
-            "id": "00000048-0000-007b-0000-001500000034"
-        }
-    ],
-    "user_ids": [
-        "00000069-0000-0074-0000-006800000058",
-        "0000001c-0000-007e-0000-003300000074",
-        "00000025-0000-0064-0000-007000000046",
-        "00000037-0000-000a-0000-00140000001a",
-        "0000004b-0000-004b-0000-005000000005",
-        "0000005b-0000-004a-0000-000f00000029",
-        "00000069-0000-003e-0000-002300000076",
-        "0000003e-0000-0047-0000-005e0000006a",
-        "0000003d-0000-0034-0000-001100000003",
-        "00000042-0000-0018-0000-006f00000063",
-        "00000066-0000-0065-0000-00640000006c",
-        "0000005b-0000-0068-0000-006300000031",
-        "00000025-0000-000d-0000-000000000008",
-        "00000010-0000-0007-0000-005700000011",
-        "00000059-0000-0001-0000-005e00000073",
-        "00000063-0000-0061-0000-005f00000045",
-        "0000002e-0000-001e-0000-00350000001a",
-        "00000013-0000-005c-0000-006100000023",
-        "0000000e-0000-0031-0000-00300000000c",
-        "0000007e-0000-002a-0000-007c0000004f",
-        "00000011-0000-001e-0000-001e00000054",
-        "0000005f-0000-000d-0000-004e00000016",
-        "0000001f-0000-005c-0000-00570000002a",
-        "00000003-0000-0050-0000-00110000004d",
-        "00000055-0000-006f-0000-002f0000007a",
-        "0000005a-0000-0067-0000-00600000006b",
-        "00000048-0000-007b-0000-001500000034"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_12.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_12.json
deleted file mode 100644
index 87a716ba820..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_12.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "r812vw__xb9t_hgb5ryc52eujh_ss6aem87h1hakj2u8wvjshpwqrar6ndm5cuka0pkezokcvziv93_8ay2q5a",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003b-0000-0016-0000-003600000008"
-            },
-            "id": "0000003b-0000-0016-0000-003600000008"
-        },
-        {
-            "conversation_role": "xf6x34y4hcbgklhrr9a7jkjiclu5dv89m59b5sn40ui8iof88mse47t57ti7zch5cf866tzqua171us",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000056-0000-0050-0000-00040000006d"
-            },
-            "id": "00000056-0000-0050-0000-00040000006d"
-        },
-        {
-            "conversation_role": "07bbbbgwl0gkv1pfj719wn3z0n8nehby_fk3h6gs39csow68u4_3pbly54fqkng37jqxwr6ym6injx",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006e-0000-004e-0000-005200000050"
-            },
-            "id": "0000006e-0000-004e-0000-005200000050"
-        },
-        {
-            "conversation_role": "bj5m",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000069-0000-001a-0000-005c0000007b"
-            },
-            "id": "00000069-0000-001a-0000-005c0000007b"
-        },
-        {
-            "conversation_role": "ze5lhmk1d8rrjto9615pcoluink8ybkouqa90kogtrbokfv2tdbypoi8inkbi9snsymli7r9bk_ilqjq8ktb7ia2nr2bf6k667nry",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004d-0000-0002-0000-005700000067"
-            },
-            "id": "0000004d-0000-0002-0000-005700000067"
-        },
-        {
-            "conversation_role": "z3dbyprvipeu8kl4fabnh24fo77t7gqcs0chxw34ovuru0mxeu6e_jl3s744uggcnwqcyhuzkn1ueko_k0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001b-0000-0076-0000-002800000008"
-            },
-            "id": "0000001b-0000-0076-0000-002800000008"
-        },
-        {
-            "conversation_role": "sq4pc2q1xo14fl8yiegpw0_5y24vohkynzm6zselylhu2xtd3vi4w7odhh1yv9ux01q31s02lv0p337do46bqsjfjywxu1mv",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000032-0000-0007-0000-000400000047"
-            },
-            "id": "00000032-0000-0007-0000-000400000047"
-        },
-        {
-            "conversation_role": "dnrdny",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000054-0000-0055-0000-002800000002"
-            },
-            "id": "00000054-0000-0055-0000-002800000002"
-        },
-        {
-            "conversation_role": "gf52",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001c-0000-004b-0000-002c00000037"
-            },
-            "id": "0000001c-0000-004b-0000-002c00000037"
-        },
-        {
-            "conversation_role": "yo2r0bi1rrfg2rws_v18eravmdit0igdaksg3atrzjek7u03ip5fjoo6stxjn2xpie700ejkalgzw0zhl3t3j_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000034-0000-007e-0000-006100000061"
-            },
-            "id": "00000034-0000-007e-0000-006100000061"
-        },
-        {
-            "conversation_role": "hnoqjm2owsv7yrc899nidzee4ib07r40vfplmxyi9_uf2l49gd5htfmckn3bscip7tygw5hc1bdnd66i9ojjc0bzrpxq9blro73yov2xsb940g7dnijsvvkji",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000030-0000-000b-0000-00790000002a"
-            },
-            "id": "00000030-0000-000b-0000-00790000002a"
-        },
-        {
-            "conversation_role": "gnpcz5crw82yyqtlvvvfdps3b5uxqr0a",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004f-0000-0043-0000-004c0000002b"
-            },
-            "id": "0000004f-0000-0043-0000-004c0000002b"
-        },
-        {
-            "conversation_role": "h84nu68fxxen4b8d5i8br4gixwyntx3o597v_ds147th29_vkuxblstg9af6x3p7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000079-0000-004b-0000-005e00000033"
-            },
-            "id": "00000079-0000-004b-0000-005e00000033"
-        },
-        {
-            "conversation_role": "uboc5sab9w92",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003b-0000-006c-0000-000f00000059"
-            },
-            "id": "0000003b-0000-006c-0000-000f00000059"
-        },
-        {
-            "conversation_role": "1mcw_zxelu_doxdkqrc5tf660toco4vdv99oecl106z1ygzfnqo6buoysg_s",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000080-0000-001e-0000-002100000043"
-            },
-            "id": "00000080-0000-001e-0000-002100000043"
-        },
-        {
-            "conversation_role": "jv38u3mzfcdi7xln9al3yepden29o1y6a1xtblfi98cg_bpehklvyf8twyfwinev0ozfokbw71iyh_98ajkyd2z1c2d3a9c09ig14r0tcwy6pqpo",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000069-0000-0047-0000-00000000004e"
-            },
-            "id": "00000069-0000-0047-0000-00000000004e"
-        },
-        {
-            "conversation_role": "v5l6fw_m_1lakwhcd6g0uz0gpba82jwjdad0qyypc0plx1t1hnu_6zhi3cg6cy25rj3l5aj50pezusaueat8mnfkj_uescuilehc6b6prp8f4lm_ae0dxxvwp3rgu2e",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001d-0000-007e-0000-004300000036"
-            },
-            "id": "0000001d-0000-007e-0000-004300000036"
-        },
-        {
-            "conversation_role": "xyb65ic8vzt9x9k1i_a81f6cngzuoii",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000061-0000-005f-0000-00280000002d"
-            },
-            "id": "00000061-0000-005f-0000-00280000002d"
-        }
-    ],
-    "user_ids": [
-        "0000003b-0000-0016-0000-003600000008",
-        "00000056-0000-0050-0000-00040000006d",
-        "0000006e-0000-004e-0000-005200000050",
-        "00000069-0000-001a-0000-005c0000007b",
-        "0000004d-0000-0002-0000-005700000067",
-        "0000001b-0000-0076-0000-002800000008",
-        "00000032-0000-0007-0000-000400000047",
-        "00000054-0000-0055-0000-002800000002",
-        "0000001c-0000-004b-0000-002c00000037",
-        "00000034-0000-007e-0000-006100000061",
-        "00000030-0000-000b-0000-00790000002a",
-        "0000004f-0000-0043-0000-004c0000002b",
-        "00000079-0000-004b-0000-005e00000033",
-        "0000003b-0000-006c-0000-000f00000059",
-        "00000080-0000-001e-0000-002100000043",
-        "00000069-0000-0047-0000-00000000004e",
-        "0000001d-0000-007e-0000-004300000036",
-        "00000061-0000-005f-0000-00280000002d"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_13.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_13.json
deleted file mode 100644
index 0a3846bb9a7..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_13.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "auzu2e8pwoe6c0gqamygef4xzybb4o1_yoxbelgaw2012jz9owv9stt14y2d_yi1yi8huvqyhele83b_99fg8ncenqi40pqjl18nkgvwilzo8kahww",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000050-0000-0074-0000-00260000002b"
-            },
-            "id": "00000050-0000-0074-0000-00260000002b"
-        },
-        {
-            "conversation_role": "8zkp0il16289nuuv9n3h2p8e7znc_4npg5qzdnt18t1l3yx0m40xugm9z_b1w_p98k0b02oq7enifxr4r9b1zyvax",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000000-0000-001d-0000-005f00000055"
-            },
-            "id": "00000000-0000-001d-0000-005f00000055"
-        },
-        {
-            "conversation_role": "4kkuwyima3ztybzpf3ccy2_mrgcz2sv0nvb29bxjm90dgk6ft_14r7p0qyy12crv_z",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000005-0000-0010-0000-003b00000043"
-            },
-            "id": "00000005-0000-0010-0000-003b00000043"
-        },
-        {
-            "conversation_role": "pcod0980px6sue9r5cjn7ok4ad9sl6rqpmlmhwu1ju8kp7m757o2axicjqha4e9wz_v3wx3ixb6swh3bujsxpc9g0rjd_und",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000040-0000-0065-0000-007000000049"
-            },
-            "id": "00000040-0000-0065-0000-007000000049"
-        },
-        {
-            "conversation_role": "qylzcwu0dvtjvra93ocg8fyuyzzowac5yo5410wh4sveczmfq0t2y2e6cae4fux96q",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000015-0000-007f-0000-006c0000004d"
-            },
-            "id": "00000015-0000-007f-0000-006c0000004d"
-        },
-        {
-            "conversation_role": "z3id3idffe8rl53wpyrd3f2l0y56qxz",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000e-0000-007b-0000-003400000043"
-            },
-            "id": "0000000e-0000-007b-0000-003400000043"
-        },
-        {
-            "conversation_role": "2voj8d_5ydou6phiassv9tzhnw185814n90y8rbx5i",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005d-0000-000d-0000-004500000021"
-            },
-            "id": "0000005d-0000-000d-0000-004500000021"
-        },
-        {
-            "conversation_role": "09y9r0sl0or7yvw_ztcg3_5xioeq6hk0lwmycvqtfnmhtg84qeotcl3yltg1ibzwdkgw3qz397otoa3xsqvn2uzsvqyzt87_6is2zotb4cgc5m8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002d-0000-003c-0000-003e0000000f"
-            },
-            "id": "0000002d-0000-003c-0000-003e0000000f"
-        },
-        {
-            "conversation_role": "tw7z9ajikrm79pv0q2gq5fjndf940qdzyjznb052bb9b_6zhhdunxgm91cj6mf04yp1rzapwrx1sox8z9sfijxy1xxn61b0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000b-0000-0042-0000-00740000003b"
-            },
-            "id": "0000000b-0000-0042-0000-00740000003b"
-        },
-        {
-            "conversation_role": "nmhc57h6qa7lzv0d0scl8_53iwuitrlmmujkwf_vgjgn4s027b5i9hbt2nxhm1d",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000048-0000-0039-0000-008000000004"
-            },
-            "id": "00000048-0000-0039-0000-008000000004"
-        }
-    ],
-    "user_ids": [
-        "00000050-0000-0074-0000-00260000002b",
-        "00000000-0000-001d-0000-005f00000055",
-        "00000005-0000-0010-0000-003b00000043",
-        "00000040-0000-0065-0000-007000000049",
-        "00000015-0000-007f-0000-006c0000004d",
-        "0000000e-0000-007b-0000-003400000043",
-        "0000005d-0000-000d-0000-004500000021",
-        "0000002d-0000-003c-0000-003e0000000f",
-        "0000000b-0000-0042-0000-00740000003b",
-        "00000048-0000-0039-0000-008000000004"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_14.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_14.json
deleted file mode 100644
index d52587c9011..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_14.json
+++ /dev/null
@@ -1,231 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "5qxti74lbqe_tgvvnq7ub2xxn0e2w0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000049-0000-0018-0000-002200000071"
-            },
-            "id": "00000049-0000-0018-0000-002200000071"
-        },
-        {
-            "conversation_role": "mwzccu_p4zazafbgnvf",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003f-0000-004e-0000-005800000030"
-            },
-            "id": "0000003f-0000-004e-0000-005800000030"
-        },
-        {
-            "conversation_role": "rmr13bsn9lo1dil9j12jj31qdod3izckzpsrflf653suq328bmnd_kirumpr",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000017-0000-007e-0000-006f00000027"
-            },
-            "id": "00000017-0000-007e-0000-006f00000027"
-        },
-        {
-            "conversation_role": "_tae",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000005-0000-003f-0000-00280000005e"
-            },
-            "id": "00000005-0000-003f-0000-00280000005e"
-        },
-        {
-            "conversation_role": "kaa5_qbk5nvvgx4jowierx",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002b-0000-0003-0000-004a0000002d"
-            },
-            "id": "0000002b-0000-0003-0000-004a0000002d"
-        },
-        {
-            "conversation_role": "2hco6n9dqp4qph8alctzrcw91aiw1d4eb5g6ebeb3739i31b4o8seok8krf1z95t3zft4gif5ib9qtsuuzvb0ip17svpfk21akw0d_hz46u",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005d-0000-0054-0000-002500000028"
-            },
-            "id": "0000005d-0000-0054-0000-002500000028"
-        },
-        {
-            "conversation_role": "o1bfk_p6xvxp7t1i6f3d57jv2_yl4nq5or1zy4vd2dh22ue895yoduwjo3wc5qzostuhbw369j",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005e-0000-0002-0000-004b00000045"
-            },
-            "id": "0000005e-0000-0002-0000-004b00000045"
-        },
-        {
-            "conversation_role": "vf6s6yc5eavaytm7_6",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005e-0000-0027-0000-003d00000065"
-            },
-            "id": "0000005e-0000-0027-0000-003d00000065"
-        },
-        {
-            "conversation_role": "n7r9vlgda6kn7ehvrz_hrl6t1p07xr42_rgp",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000035-0000-0035-0000-00010000001f"
-            },
-            "id": "00000035-0000-0035-0000-00010000001f"
-        },
-        {
-            "conversation_role": "qtfn187ab22rzoan9jy9ug2qyjisshxdeo184e8cjm",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000054-0000-0069-0000-002e0000007c"
-            },
-            "id": "00000054-0000-0069-0000-002e0000007c"
-        },
-        {
-            "conversation_role": "lxynbdsl575ahtb1fzz_0ucdcsmeiu4baq0ziei5",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000056-0000-005a-0000-006a0000004c"
-            },
-            "id": "00000056-0000-005a-0000-006a0000004c"
-        },
-        {
-            "conversation_role": "q4m0kblmex11x_k__yurqoqixdbhbcluk60_kpje7xvt5drk0jdp2jh29ql4hlvz_af8yx61ptki414nip32h59m1m_spku9ac9v8pfxo_ue6",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000041-0000-0013-0000-007700000017"
-            },
-            "id": "00000041-0000-0013-0000-007700000017"
-        },
-        {
-            "conversation_role": "xt24wodqlibu4gtj128oj8e61z4gt_5d_we5m9jk35crgs8levtcul1pwak1vxn95q9h4vqss5qlezj4r3igvmyv4y",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000022-0000-0071-0000-000f00000072"
-            },
-            "id": "00000022-0000-0071-0000-000f00000072"
-        },
-        {
-            "conversation_role": "vitd82h50v",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003b-0000-003c-0000-003500000028"
-            },
-            "id": "0000003b-0000-003c-0000-003500000028"
-        },
-        {
-            "conversation_role": "io1uuzbdi7sfvy93f6kgdq31xskuwc8mxphwwrpv9rxc4o8ycdu4l4_0_26hm1g03g2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000047-0000-0005-0000-001a0000007b"
-            },
-            "id": "00000047-0000-0005-0000-001a0000007b"
-        },
-        {
-            "conversation_role": "cksijt3o36xuu324i61apsuwdi32k3l1x_oalfaqqtk",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000a-0000-0039-0000-00530000006f"
-            },
-            "id": "0000000a-0000-0039-0000-00530000006f"
-        },
-        {
-            "conversation_role": "ru1kksg2ef5_yo7i5uwq",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000047-0000-0062-0000-007700000025"
-            },
-            "id": "00000047-0000-0062-0000-007700000025"
-        },
-        {
-            "conversation_role": "lyspep_wcyu0fegqwpmns9lzjpy49i_6ufmhkft3bbmf_yi76hzdacj7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000049-0000-000c-0000-002400000060"
-            },
-            "id": "00000049-0000-000c-0000-002400000060"
-        },
-        {
-            "conversation_role": "q8upik7s6rzlcqfbtrx0ty9_pjrqeq02b4nkdnggfu_y_ey8h430k8l900czggrlngyvz0hezpfqg0ta7dv7enlsujqhv9w2qcmrye97ozaswyg671b6cqk5_yprgn5",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000028-0000-001d-0000-005000000045"
-            },
-            "id": "00000028-0000-001d-0000-005000000045"
-        },
-        {
-            "conversation_role": "e3xri9yngsx6817txk_k58ybfykismurlmmhsa7k5xv5l8g5qgx48h9sp9ir4tp2n7i01wc4780lwvl9o31yacvdashtu82108yevwv1rnh1co8bzws28_01ao5jhv7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000071-0000-0014-0000-002000000080"
-            },
-            "id": "00000071-0000-0014-0000-002000000080"
-        },
-        {
-            "conversation_role": "tzu6fq7owrz3hkm_7tmtmzr4oj9pyo1oi0bq4hvp3lrn3e5t6ep0x4g84nnmg79kag8tdaoopluff0eavzqpp57ij3us0xat7jua1g2iuhfjlrpoen2dyw1eulrqa5",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000037-0000-004c-0000-006800000015"
-            },
-            "id": "00000037-0000-004c-0000-006800000015"
-        },
-        {
-            "conversation_role": "r7xed76rtgltedolcrxbq67tyo5u5arm9ip49bo5szs24skzui_3h65_2j0md66gjlz850waloiuiqsd",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005a-0000-0014-0000-005c0000000b"
-            },
-            "id": "0000005a-0000-0014-0000-005c0000000b"
-        },
-        {
-            "conversation_role": "80_0tuom0zml0hz7q8ioxscxusk7ghx63wp5o83lax5",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000c-0000-0059-0000-004600000053"
-            },
-            "id": "0000000c-0000-0059-0000-004600000053"
-        },
-        {
-            "conversation_role": "ae3h61opsksj5x5if1tt3a74ehzw02ds6dqisz_5l",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000050-0000-0080-0000-00350000007c"
-            },
-            "id": "00000050-0000-0080-0000-00350000007c"
-        },
-        {
-            "conversation_role": "c_fbjpth0u2yni1mwed8xyjo7hvrev2ojjb3g8vu2sij81cjnehtpaq5mkd_55qf0eavaxtmrhzv20vbhrxssewk5m7rmxgveuva24e05xs",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000014-0000-0046-0000-008000000048"
-            },
-            "id": "00000014-0000-0046-0000-008000000048"
-        }
-    ],
-    "user_ids": [
-        "00000049-0000-0018-0000-002200000071",
-        "0000003f-0000-004e-0000-005800000030",
-        "00000017-0000-007e-0000-006f00000027",
-        "00000005-0000-003f-0000-00280000005e",
-        "0000002b-0000-0003-0000-004a0000002d",
-        "0000005d-0000-0054-0000-002500000028",
-        "0000005e-0000-0002-0000-004b00000045",
-        "0000005e-0000-0027-0000-003d00000065",
-        "00000035-0000-0035-0000-00010000001f",
-        "00000054-0000-0069-0000-002e0000007c",
-        "00000056-0000-005a-0000-006a0000004c",
-        "00000041-0000-0013-0000-007700000017",
-        "00000022-0000-0071-0000-000f00000072",
-        "0000003b-0000-003c-0000-003500000028",
-        "00000047-0000-0005-0000-001a0000007b",
-        "0000000a-0000-0039-0000-00530000006f",
-        "00000047-0000-0062-0000-007700000025",
-        "00000049-0000-000c-0000-002400000060",
-        "00000028-0000-001d-0000-005000000045",
-        "00000071-0000-0014-0000-002000000080",
-        "00000037-0000-004c-0000-006800000015",
-        "0000005a-0000-0014-0000-005c0000000b",
-        "0000000c-0000-0059-0000-004600000053",
-        "00000050-0000-0080-0000-00350000007c",
-        "00000014-0000-0046-0000-008000000048"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_15.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_15.json
deleted file mode 100644
index 6ba205a0cc9..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_15.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "da1vnxfznxggp6c2qcjdx4sbo4usg7jb58hmd_ylzyr_97m9rpyg6gmw9ikw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006a-0000-0032-0000-004f0000001e"
-            },
-            "id": "0000006a-0000-0032-0000-004f0000001e"
-        },
-        {
-            "conversation_role": "asfpn3xoxsvsz8ubdt6b3b",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001f-0000-005a-0000-001a00000078"
-            },
-            "id": "0000001f-0000-005a-0000-001a00000078"
-        },
-        {
-            "conversation_role": "ftkjnuoy9i1h0yyf1x87m97flhx21n2475_rsnn76nkpl9toieae7wk0y_f83ji",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001a-0000-0017-0000-007e0000000c"
-            },
-            "id": "0000001a-0000-0017-0000-007e0000000c"
-        },
-        {
-            "conversation_role": "g22_kcj2fae4nspxpz30n5f6ib5bhrb",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001e-0000-0019-0000-00180000004c"
-            },
-            "id": "0000001e-0000-0019-0000-00180000004c"
-        },
-        {
-            "conversation_role": "qzkowgmbm3t4ck1lzb96ero0d6yw79kzdf2q",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006d-0000-001b-0000-00050000003f"
-            },
-            "id": "0000006d-0000-001b-0000-00050000003f"
-        },
-        {
-            "conversation_role": "cyiw0yfayzt_ynv0h94pdv0hl5u46adyyyb6n",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000037-0000-001c-0000-000c0000002f"
-            },
-            "id": "00000037-0000-001c-0000-000c0000002f"
-        },
-        {
-            "conversation_role": "x3x3gfejb_1d1g9nsyw0rey0_tm9zs6pyuily3nrjsue7p1mp_15kffuojhi66z_t_lmnr_lq79wzvcjm3czs7i_9lvokkakhmfwkdg3f",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000047-0000-0014-0000-007e00000049"
-            },
-            "id": "00000047-0000-0014-0000-007e00000049"
-        },
-        {
-            "conversation_role": "s1cu0tibrwjvgpa49x9sk9kuzyd4hco7pj3gnbcc8ie519vmobd70ln2im2dx_yg_qoh4rc8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000028-0000-002f-0000-004a00000063"
-            },
-            "id": "00000028-0000-002f-0000-004a00000063"
-        },
-        {
-            "conversation_role": "e6t98s2m_0jqjwibfan257dq0tbxl452q0dcs5mkl4kn",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000027-0000-0075-0000-003f00000016"
-            },
-            "id": "00000027-0000-0075-0000-003f00000016"
-        },
-        {
-            "conversation_role": "9jjkkwb5spu0x_honfioztulhgg2vu7dwcxngha4581j3dj73mo01oh3r6kdbpbxiwrt2k8q6ixcuu97qzpc962rlz4c7en9do885ykjstaru6yjm6w",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000045-0000-007a-0000-003900000015"
-            },
-            "id": "00000045-0000-007a-0000-003900000015"
-        },
-        {
-            "conversation_role": "wb1qwb0yfrwzna1gx4xcjrb9uvilio5pv_glva_sy8s9zr5udj10oy3ygf6jvbl0e92z6ucw2c3fur9ebha005gpr45jqkf3_hs40e3f6dssc",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000000-0000-0040-0000-002e0000007c"
-            },
-            "id": "00000000-0000-0040-0000-002e0000007c"
-        },
-        {
-            "conversation_role": "hq3mg17cd7p27q00dhyjrdu7pr4kdplicp4ipm",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000057-0000-0060-0000-006e0000001d"
-            },
-            "id": "00000057-0000-0060-0000-006e0000001d"
-        },
-        {
-            "conversation_role": "v6z1f27bvomf76x_tp5e3yik4qfx6xmohuu7sr40ijtw8b0v10746aja2yyhomb9yov9f4acq0pwng2cg76gqdh8moow_tzeonmqol6wz191m8oo4j7c8_wq",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000037-0000-0007-0000-006600000055"
-            },
-            "id": "00000037-0000-0007-0000-006600000055"
-        },
-        {
-            "conversation_role": "8_lth324f81q1zr6nhz1jw5oeu4ovjqnl8lobb9t3azlu7hj3s62_xm30b3fie4s",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000032-0000-0078-0000-005100000021"
-            },
-            "id": "00000032-0000-0078-0000-005100000021"
-        }
-    ],
-    "user_ids": [
-        "0000006a-0000-0032-0000-004f0000001e",
-        "0000001f-0000-005a-0000-001a00000078",
-        "0000001a-0000-0017-0000-007e0000000c",
-        "0000001e-0000-0019-0000-00180000004c",
-        "0000006d-0000-001b-0000-00050000003f",
-        "00000037-0000-001c-0000-000c0000002f",
-        "00000047-0000-0014-0000-007e00000049",
-        "00000028-0000-002f-0000-004a00000063",
-        "00000027-0000-0075-0000-003f00000016",
-        "00000045-0000-007a-0000-003900000015",
-        "00000000-0000-0040-0000-002e0000007c",
-        "00000057-0000-0060-0000-006e0000001d",
-        "00000037-0000-0007-0000-006600000055",
-        "00000032-0000-0078-0000-005100000021"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_16.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_16.json
deleted file mode 100644
index 21032df838d..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_16.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "z2z2ju3pgvxysob_3e2wg_tyxfp1wruzek4c6iuyk23e5qxuieyz3tg436tvzl9l8k5aa_bexy1m9ggauxms8pug1f",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001c-0000-0079-0000-006800000001"
-            },
-            "id": "0000001c-0000-0079-0000-006800000001"
-        },
-        {
-            "conversation_role": "5roj3c12kqt7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005c-0000-0056-0000-00780000001a"
-            },
-            "id": "0000005c-0000-0056-0000-00780000001a"
-        },
-        {
-            "conversation_role": "r_ivn3ruci8x4pl6bl1g_jex4",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000032-0000-007f-0000-00270000002a"
-            },
-            "id": "00000032-0000-007f-0000-00270000002a"
-        },
-        {
-            "conversation_role": "x__i5068zhcdautdjavpic3zi7u950hdw_iy63gdd0h6zbs1pfviyyui2zl",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002b-0000-000e-0000-003400000009"
-            },
-            "id": "0000002b-0000-000e-0000-003400000009"
-        },
-        {
-            "conversation_role": "g5ignr39a41zundyudm1rovkz6a3rjy3dodkwk0ht3jnsqp1maz2ulc7yx93z7uy_dyqso9ofxblm2xqs",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007a-0000-0017-0000-005800000050"
-            },
-            "id": "0000007a-0000-0017-0000-005800000050"
-        },
-        {
-            "conversation_role": "ltmubflt4eswsuurwvqxkd_ngfbkyilt00dzsjckdyh2eod2v804nw0xc8jbkz8bg29nud9oe3mlgvwoml4t8cmukd7un3ycogbvojmf12ktaxx",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000061-0000-0036-0000-006700000071"
-            },
-            "id": "00000061-0000-0036-0000-006700000071"
-        },
-        {
-            "conversation_role": "ox94nzepea1423z47_yd1txi",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000060-0000-007e-0000-004f0000005a"
-            },
-            "id": "00000060-0000-007e-0000-004f0000005a"
-        },
-        {
-            "conversation_role": "dvrbz7c9_igfu5vl3_9ujy5dqwaevjrb7f1n2kchbxroz8ccnktv6nrybj9s0ogviznxyzw6r6ebu72su9hsz9l62fly8cf_kkf6aeri9thd4z2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002e-0000-0016-0000-001e0000001a"
-            },
-            "id": "0000002e-0000-0016-0000-001e0000001a"
-        },
-        {
-            "conversation_role": "307w5bmxkox9r8klphxtmjge_8jgawjnotx_r0krsadx_n7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006b-0000-0038-0000-006a0000004d"
-            },
-            "id": "0000006b-0000-0038-0000-006a0000004d"
-        },
-        {
-            "conversation_role": "j6_h0zam0_k8x6coroh4ixk9m3pk5acmwx_cg1q7mpnmn1zha_i",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000043-0000-003e-0000-005a0000007d"
-            },
-            "id": "00000043-0000-003e-0000-005a0000007d"
-        },
-        {
-            "conversation_role": "9j1_jkemhozgdmdcoh39j4gxbccuysthtljfwf7qwgjk50tkamk2p_xcw7i9cclp35faxipa5qt2i23_u2n35anfp9jihl8fj2jebisxmgkfnmh89z",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002d-0000-0010-0000-00010000000f"
-            },
-            "id": "0000002d-0000-0010-0000-00010000000f"
-        },
-        {
-            "conversation_role": "ds4scvwxorxgxtlskf27hu",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000043-0000-0070-0000-006400000045"
-            },
-            "id": "00000043-0000-0070-0000-006400000045"
-        },
-        {
-            "conversation_role": "1j2p5d49kfu8omp83fr67o4qpdb07",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000026-0000-002a-0000-00150000005d"
-            },
-            "id": "00000026-0000-002a-0000-00150000005d"
-        },
-        {
-            "conversation_role": "j6xf6yvyevf8aweam9h70ga1gs4lr_5n7khmou70p2_g1qzjpsgpdkf45scpqggc2rve2aqrev88u91sj3sny4cavowa1hosih61ycaq0pf41inxqhwzhc",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000079-0000-0040-0000-006100000033"
-            },
-            "id": "00000079-0000-0040-0000-006100000033"
-        },
-        {
-            "conversation_role": "u0lw_wyfzjmmu17s65cau3i295l_0c4hu823csp473bry2cn2zr24vsay4w2m2936y9ja0mvapjxafww89o",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007b-0000-0033-0000-005a00000007"
-            },
-            "id": "0000007b-0000-0033-0000-005a00000007"
-        },
-        {
-            "conversation_role": "u5wny30naytnu39dwahr_5trcz66uqb4qrbvvhiu2juwbbkv8udp8whvw3jhy2o2s5jwmwesp_6qx_ceatpyex9xssv4z38p1xs3mpau7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000078-0000-0058-0000-006300000019"
-            },
-            "id": "00000078-0000-0058-0000-006300000019"
-        },
-        {
-            "conversation_role": "cgx4sx81so7w8wyohtqvr53bzf_8od3j77",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000068-0000-0042-0000-007b0000002b"
-            },
-            "id": "00000068-0000-0042-0000-007b0000002b"
-        },
-        {
-            "conversation_role": "p35w8lh2_arnf44pbqrk3g4ln0881ml0b4t",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004b-0000-002a-0000-007000000043"
-            },
-            "id": "0000004b-0000-002a-0000-007000000043"
-        },
-        {
-            "conversation_role": "0z7pdm65ezdilg_qqnzz34l5e1zi8gsw78qbwitnu2ng",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006d-0000-007b-0000-006b00000005"
-            },
-            "id": "0000006d-0000-007b-0000-006b00000005"
-        }
-    ],
-    "user_ids": [
-        "0000001c-0000-0079-0000-006800000001",
-        "0000005c-0000-0056-0000-00780000001a",
-        "00000032-0000-007f-0000-00270000002a",
-        "0000002b-0000-000e-0000-003400000009",
-        "0000007a-0000-0017-0000-005800000050",
-        "00000061-0000-0036-0000-006700000071",
-        "00000060-0000-007e-0000-004f0000005a",
-        "0000002e-0000-0016-0000-001e0000001a",
-        "0000006b-0000-0038-0000-006a0000004d",
-        "00000043-0000-003e-0000-005a0000007d",
-        "0000002d-0000-0010-0000-00010000000f",
-        "00000043-0000-0070-0000-006400000045",
-        "00000026-0000-002a-0000-00150000005d",
-        "00000079-0000-0040-0000-006100000033",
-        "0000007b-0000-0033-0000-005a00000007",
-        "00000078-0000-0058-0000-006300000019",
-        "00000068-0000-0042-0000-007b0000002b",
-        "0000004b-0000-002a-0000-007000000043",
-        "0000006d-0000-007b-0000-006b00000005"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_17.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_17.json
deleted file mode 100644
index ad3cbd0ccf0..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_17.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "ui5u6nk8og1da9q8_ha4hhv2v_qrs_mveewm6h5_4384yf4ovtp67w_z6x9_waqln013ahg3rw9oky5o4yff6v",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000071-0000-0050-0000-006200000041"
-            },
-            "id": "00000071-0000-0050-0000-006200000041"
-        },
-        {
-            "conversation_role": "qsowevndt0gqwh1yvpqxd_4u3junr66dhuerv38qrhzv5kf9i38fkd",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000003-0000-0074-0000-004e0000003c"
-            },
-            "id": "00000003-0000-0074-0000-004e0000003c"
-        },
-        {
-            "conversation_role": "dq1mag9bzqoenu3chbc2mn91ivbh",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000b-0000-003a-0000-003900000026"
-            },
-            "id": "0000000b-0000-003a-0000-003900000026"
-        },
-        {
-            "conversation_role": "9ij9p1jla54lbtk66mhbakd7m7p502p6tz1ryyaep94rz7upsquixaaf6eoewz_oziw_ok7xbo49",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001b-0000-0058-0000-000500000057"
-            },
-            "id": "0000001b-0000-0058-0000-000500000057"
-        },
-        {
-            "conversation_role": "13tjs8e20xxqd296duhver4er47dj47v2yyspcpfz5pdhbmnmlxyzar0w2recatb6r4_20zcd",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007a-0000-001d-0000-005800000052"
-            },
-            "id": "0000007a-0000-001d-0000-005800000052"
-        },
-        {
-            "conversation_role": "gy3s_2c0r9lzi08hjnkbc9pbhdu3yvg409ipjztpmthie_j834nn12zjq_m56w1dqqi8mpde",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001a-0000-001e-0000-00360000007b"
-            },
-            "id": "0000001a-0000-001e-0000-00360000007b"
-        }
-    ],
-    "user_ids": [
-        "00000071-0000-0050-0000-006200000041",
-        "00000003-0000-0074-0000-004e0000003c",
-        "0000000b-0000-003a-0000-003900000026",
-        "0000001b-0000-0058-0000-000500000057",
-        "0000007a-0000-001d-0000-005800000052",
-        "0000001a-0000-001e-0000-00360000007b"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_18.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_18.json
deleted file mode 100644
index 0e5a73d5dea..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_18.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "3me5rxn2utoa25v5xxht8ulguq6yxi7tp38dwoyvs_4o40u1to2j5nrtykcbqmxuefqoulfptt90s",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000013-0000-003e-0000-006000000058"
-            },
-            "id": "00000013-0000-003e-0000-006000000058"
-        },
-        {
-            "conversation_role": "934awteu5wur99l7fnw80clvhm_gza7sdsh12wm_ppvma27jwl2ry8u4q3pdm2sqae_w4bqn1l7k3bscfww2c6i",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000002-0000-0026-0000-005d00000007"
-            },
-            "id": "00000002-0000-0026-0000-005d00000007"
-        },
-        {
-            "conversation_role": "ykd2zkk62g1dcm7nnuwr3xbho312yshv5ies_zgv954zlari0ayv9x6gnxdckc4s36vvdfdg3ohsr__e5_tlo_y6lbnmhilm_gwblmnzgiqxxmhvegnbh6haxg",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000078-0000-005b-0000-00580000004f"
-            },
-            "id": "00000078-0000-005b-0000-00580000004f"
-        },
-        {
-            "conversation_role": "tg_h0qkv4aijetsz83m1kgblaem7q",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000054-0000-0053-0000-00340000006e"
-            },
-            "id": "00000054-0000-0053-0000-00340000006e"
-        },
-        {
-            "conversation_role": "wxx0aq41xb9dkhyi1gai4twn840_gv26hyjwwo8xaycbju4xowxt40eimnud63h61y56aacmio7reb1u7xhbkdpkvzr7uw_pu_o",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000023-0000-002f-0000-002000000063"
-            },
-            "id": "00000023-0000-002f-0000-002000000063"
-        },
-        {
-            "conversation_role": "8axn63dyge68i43hczeorjbtz3cyd9nv316fhppz7bfn6ev57rxedqhohixccni74vrd5mujd3xudu1s5jrw5fjcpo5uy52z6mxjpnsi14md10_6o",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000022-0000-0057-0000-006f00000014"
-            },
-            "id": "00000022-0000-0057-0000-006f00000014"
-        },
-        {
-            "conversation_role": "b72qpthui23k7cbxz8m3226h",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000003-0000-0013-0000-003b0000002d"
-            },
-            "id": "00000003-0000-0013-0000-003b0000002d"
-        },
-        {
-            "conversation_role": "4ndtltebfabogp8i9skodvx86xbu_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000052-0000-0046-0000-002e0000003a"
-            },
-            "id": "00000052-0000-0046-0000-002e0000003a"
-        },
-        {
-            "conversation_role": "r9jg4",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000048-0000-0028-0000-001b00000006"
-            },
-            "id": "00000048-0000-0028-0000-001b00000006"
-        },
-        {
-            "conversation_role": "1_r3da_nqzfzbs_6j8sztfleq4ov3zk7e6lhjg04",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007b-0000-004d-0000-005500000006"
-            },
-            "id": "0000007b-0000-004d-0000-005500000006"
-        },
-        {
-            "conversation_role": "_v361ue5c23jdmlu43s7eckol6hzqgdvd49z_ga87_gtfu6s6j49c2g12tfsv",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000f-0000-0056-0000-002a00000066"
-            },
-            "id": "0000000f-0000-0056-0000-002a00000066"
-        },
-        {
-            "conversation_role": "woty16_d9_5ot5k0aur_vvud9z_3f41om2hxf7bc4bc1dagzzecnhmnl2asd_slndkj81g2p_9kibhfw71_7wlj9n",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000014-0000-006d-0000-00600000005f"
-            },
-            "id": "00000014-0000-006d-0000-00600000005f"
-        },
-        {
-            "conversation_role": "gwad3aujch9jwn8wgs36djkofbhgc80q3xpg08kziibyr249qor8xzyhn724zmj57mup_15ik_ts3985q94t2ycjatnt5jzurfb8jy06y4dqiyh3aowp0bgn",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005c-0000-0022-0000-007c00000001"
-            },
-            "id": "0000005c-0000-0022-0000-007c00000001"
-        },
-        {
-            "conversation_role": "0_lettu8qvkqk6krt4_nez4e95b7y",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000008-0000-0042-0000-00250000007a"
-            },
-            "id": "00000008-0000-0042-0000-00250000007a"
-        },
-        {
-            "conversation_role": "z3o8c78vi1ynsrc_s6ebpnz96960dez7lnlijjz843un77jtnj9a5pah",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001f-0000-0022-0000-007c00000028"
-            },
-            "id": "0000001f-0000-0022-0000-007c00000028"
-        },
-        {
-            "conversation_role": "4qwvs96y63anponvr9dm5rlixyqhi3jumk9q5827hpksw8n63u_mcg90c3ymz6flf4g5hfcczn3j6rvoiushsvltz30mou0m6_swr8p9ajzs67a1bkc7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000022-0000-0045-0000-007d00000007"
-            },
-            "id": "00000022-0000-0045-0000-007d00000007"
-        },
-        {
-            "conversation_role": "fnxibm1l1089wzrxa",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007f-0000-006c-0000-006f0000005a"
-            },
-            "id": "0000007f-0000-006c-0000-006f0000005a"
-        },
-        {
-            "conversation_role": "2ty62trmvnnqkyblir4w1hdba9r10gfkxjb8ddj0riit2i7ymxpprtrcgs2p6w05prtzxuhj_07nuntgsk8x4o2e1pe6cijkk1igi45_e49d38x4b_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000022-0000-0020-0000-006900000033"
-            },
-            "id": "00000022-0000-0020-0000-006900000033"
-        },
-        {
-            "conversation_role": "b6fsp76pbub9rakkxrs7lk8gsh005ajo5m8ap4apvxjxoak95s",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000000-0000-002f-0000-007000000064"
-            },
-            "id": "00000000-0000-002f-0000-007000000064"
-        },
-        {
-            "conversation_role": "hinbqrmh843xzsvpu_a6ifnc6lc164f58gkhv",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000002-0000-0042-0000-000000000058"
-            },
-            "id": "00000002-0000-0042-0000-000000000058"
-        },
-        {
-            "conversation_role": "18os8cjhuuv8ng",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005f-0000-0052-0000-005400000002"
-            },
-            "id": "0000005f-0000-0052-0000-005400000002"
-        },
-        {
-            "conversation_role": "4k62w0mz4j2hsstjelh8zx0gpg927v3ggod9z17i",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004b-0000-0046-0000-006e00000024"
-            },
-            "id": "0000004b-0000-0046-0000-006e00000024"
-        }
-    ],
-    "user_ids": [
-        "00000013-0000-003e-0000-006000000058",
-        "00000002-0000-0026-0000-005d00000007",
-        "00000078-0000-005b-0000-00580000004f",
-        "00000054-0000-0053-0000-00340000006e",
-        "00000023-0000-002f-0000-002000000063",
-        "00000022-0000-0057-0000-006f00000014",
-        "00000003-0000-0013-0000-003b0000002d",
-        "00000052-0000-0046-0000-002e0000003a",
-        "00000048-0000-0028-0000-001b00000006",
-        "0000007b-0000-004d-0000-005500000006",
-        "0000000f-0000-0056-0000-002a00000066",
-        "00000014-0000-006d-0000-00600000005f",
-        "0000005c-0000-0022-0000-007c00000001",
-        "00000008-0000-0042-0000-00250000007a",
-        "0000001f-0000-0022-0000-007c00000028",
-        "00000022-0000-0045-0000-007d00000007",
-        "0000007f-0000-006c-0000-006f0000005a",
-        "00000022-0000-0020-0000-006900000033",
-        "00000000-0000-002f-0000-007000000064",
-        "00000002-0000-0042-0000-000000000058",
-        "0000005f-0000-0052-0000-005400000002",
-        "0000004b-0000-0046-0000-006e00000024"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_19.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_19.json
deleted file mode 100644
index 6b68097086f..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_19.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "4fex2pu__ri6dlr68us285w6yv4alufdibfd_b8zt7ckdo7ej590lkosvd4be8cg4acr7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000036-0000-0080-0000-004600000006"
-            },
-            "id": "00000036-0000-0080-0000-004600000006"
-        },
-        {
-            "conversation_role": "6lab82iykqaweibdnw89206lrz9vs16h6ae31uruwd0dat90ms",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000078-0000-007c-0000-004d0000001c"
-            },
-            "id": "00000078-0000-007c-0000-004d0000001c"
-        },
-        {
-            "conversation_role": "9lhsg7v6b93dyc9mrbtoh8upg5uotf4sygb7ivnzssk0vaj_i7dxoxttzeklh8am0dkzxlm5shu_xht44i7q2ngu5i9itakyus38vfxwhlo9vv14tbtky4do2gy",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002b-0000-0013-0000-006900000050"
-            },
-            "id": "0000002b-0000-0013-0000-006900000050"
-        },
-        {
-            "conversation_role": "u9dnn4lg0fkq7wjm352pnvivghndsyu5dc1v7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000037-0000-0053-0000-00300000001c"
-            },
-            "id": "00000037-0000-0053-0000-00300000001c"
-        },
-        {
-            "conversation_role": "1zrz9vvgb_owenushueadxheydq3xj7p6qnshwytttwuihgplc3swswxt7135l61u719cxyckizmc0tvss209e_u0vs9cq3g7iotw6_rjv1xekwz59jvxbf",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001a-0000-0014-0000-004100000073"
-            },
-            "id": "0000001a-0000-0014-0000-004100000073"
-        },
-        {
-            "conversation_role": "du5q_xfl5_euursw0bgwzmmfikr1jql29qf58tworxnj4c5z3oxp4g2y9hwk9l0azincl_yj7cygwz_k2lse_xhs4j1vj56g58",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000001-0000-003c-0000-007f00000051"
-            },
-            "id": "00000001-0000-003c-0000-007f00000051"
-        },
-        {
-            "conversation_role": "b3pojvx2wmrpy7q6adcuo5szs",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000023-0000-001f-0000-001b0000007f"
-            },
-            "id": "00000023-0000-001f-0000-001b0000007f"
-        },
-        {
-            "conversation_role": "tai2j6zt1iloa7k4lvhete0ia1lixhu0aakslmc3hnva6iiv4lmb7yjspyjz74wcwhg1hwligz1nvc4hkhwijrnf96epf3yc1sdzwe3ml2tj2stucgz",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000055-0000-004d-0000-006900000053"
-            },
-            "id": "00000055-0000-004d-0000-006900000053"
-        },
-        {
-            "conversation_role": "xbu28z6zird3kd4iqv0j2r7_e0b2qdxzpdeuzvxb__idnrzhib1rud5o98b4",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000047-0000-0003-0000-000500000001"
-            },
-            "id": "00000047-0000-0003-0000-000500000001"
-        },
-        {
-            "conversation_role": "rl_mm",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004b-0000-003b-0000-007f0000005a"
-            },
-            "id": "0000004b-0000-003b-0000-007f0000005a"
-        },
-        {
-            "conversation_role": "59kuc3qc4e8bi2a47kw9irbr56x1p95x5qpmapy5q8e_obwek1a356gjb_pekd0oujb08e8u7536n416v4a3k574xz_m6shboen7iq_lihb",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000006-0000-0034-0000-007e00000030"
-            },
-            "id": "00000006-0000-0034-0000-007e00000030"
-        },
-        {
-            "conversation_role": "u2p8qhkz55ga7ay_lyst30ei5_7mg46cj60uhe0pj2tjbcwaoamnzmlqlwyv6thsr_k36dr69gusa838_a9aoh",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006d-0000-007e-0000-000f00000060"
-            },
-            "id": "0000006d-0000-007e-0000-000f00000060"
-        },
-        {
-            "conversation_role": "vcan3ha2ahaaaxbs_rks5vygwuny8zp6st17fv9pk04f_2onxvw_guw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000075-0000-0022-0000-001100000044"
-            },
-            "id": "00000075-0000-0022-0000-001100000044"
-        },
-        {
-            "conversation_role": "1ilr38ti5n1mbpm3qysh5e4wou0251c7iarmlo5p8x0dm9gc4wtmuzy1gpc6kubnxcc0tkyjmkhxpncffog4u5n_x7qhwwnyzbqlo_kpz33iwjwqtub8a",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000069-0000-0024-0000-00790000005f"
-            },
-            "id": "00000069-0000-0024-0000-00790000005f"
-        },
-        {
-            "conversation_role": "6rtysqt18oeenfxoi3n5751fia55yfvpiz9bfmy2g31sibwv7ewjl737n6yb_zmc2q3fhikqwtvp9tyynm6wu0p",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000068-0000-0040-0000-003100000045"
-            },
-            "id": "00000068-0000-0040-0000-003100000045"
-        },
-        {
-            "conversation_role": "_g3yp9j43gm8l8d5vgx3kq2as1e0q2qwtro_ah8s5tp4mpzd4syw1kjno1lb_u2qaoqqg3cp5xq873oi3f95llejnd31s3nhzi6m8r",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004a-0000-0007-0000-005f0000003d"
-            },
-            "id": "0000004a-0000-0007-0000-005f0000003d"
-        },
-        {
-            "conversation_role": "qq2hd0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000068-0000-0008-0000-006f00000067"
-            },
-            "id": "00000068-0000-0008-0000-006f00000067"
-        },
-        {
-            "conversation_role": "8hsl7yd_1raa4a",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000002-0000-000d-0000-00320000006b"
-            },
-            "id": "00000002-0000-000d-0000-00320000006b"
-        },
-        {
-            "conversation_role": "ftgvbfyalwkdozipte",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000001-0000-000f-0000-001800000008"
-            },
-            "id": "00000001-0000-000f-0000-001800000008"
-        },
-        {
-            "conversation_role": "ubqu_ach_3pmq8xmxniwo1ddu7poprzvvorzmxytdpmavfeond4do7p9g7txo2n9pxvazodp_bxro6ej6kb_qj5m",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004e-0000-001f-0000-001e0000007d"
-            },
-            "id": "0000004e-0000-001f-0000-001e0000007d"
-        }
-    ],
-    "user_ids": [
-        "00000036-0000-0080-0000-004600000006",
-        "00000078-0000-007c-0000-004d0000001c",
-        "0000002b-0000-0013-0000-006900000050",
-        "00000037-0000-0053-0000-00300000001c",
-        "0000001a-0000-0014-0000-004100000073",
-        "00000001-0000-003c-0000-007f00000051",
-        "00000023-0000-001f-0000-001b0000007f",
-        "00000055-0000-004d-0000-006900000053",
-        "00000047-0000-0003-0000-000500000001",
-        "0000004b-0000-003b-0000-007f0000005a",
-        "00000006-0000-0034-0000-007e00000030",
-        "0000006d-0000-007e-0000-000f00000060",
-        "00000075-0000-0022-0000-001100000044",
-        "00000069-0000-0024-0000-00790000005f",
-        "00000068-0000-0040-0000-003100000045",
-        "0000004a-0000-0007-0000-005f0000003d",
-        "00000068-0000-0008-0000-006f00000067",
-        "00000002-0000-000d-0000-00320000006b",
-        "00000001-0000-000f-0000-001800000008",
-        "0000004e-0000-001f-0000-001e0000007d"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_2.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_2.json
index dda3aa5869a..1cb594600c4 100644
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_2.json
+++ b/libs/wire-api/test/golden/testObject_SimpleMembers_user_2.json
@@ -1,267 +1,4 @@
 {
-    "users": [
-        {
-            "conversation_role": "s_l79fneq3swkwha5llyp8_b7hw9tyi906s7c5c3n1t_v1rkax_gx88gbc8tti9z8e5ad1y0n3irysgradbjj8_ykfkhjv2xu70",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004c-0000-0022-0000-00720000007c"
-            },
-            "id": "0000004c-0000-0022-0000-00720000007c"
-        },
-        {
-            "conversation_role": "jhrez7dufl3ne050doxot1f7mhup7a0rr59472xmcvukln0cw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002c-0000-0079-0000-004b0000002a"
-            },
-            "id": "0000002c-0000-0079-0000-004b0000002a"
-        },
-        {
-            "conversation_role": "t9e5nbirc5uv1n4jda1bo8mwc72si1wi0_hngmo0sw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006d-0000-0033-0000-006d00000070"
-            },
-            "id": "0000006d-0000-0033-0000-006d00000070"
-        },
-        {
-            "conversation_role": "fee9mv0u39pyxfjffutut9ahag22y4_bjd_gcflwenmgndeztyuur4ypax_3kwt2i4extz5mg30c6l_6lwtff1tmbh_82uo9y7ni42m2yjjfvwu13gqx2ucw3iv_wh",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000018-0000-0022-0000-001b00000048"
-            },
-            "id": "00000018-0000-0022-0000-001b00000048"
-        },
-        {
-            "conversation_role": "4o0ctcw73niokwjhjo8_65khxlxx_1o9ktctoq5kdmm39640gc2f3uc3nq99bq_93sgnhvd04wx3pgw1n1l",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000000-0000-004e-0000-002f00000038"
-            },
-            "id": "00000000-0000-004e-0000-002f00000038"
-        },
-        {
-            "conversation_role": "4x1goxovt1vshlij0yhfb9hu_adl4dvucsylf6o32fdsrmx0yr1lan69pyz4o50025mqtu1xi9b5h6zky7y31mkw3_lunyoglxxm0mn4loue8wa5c9kqtw3",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003e-0000-005f-0000-004b00000038"
-            },
-            "id": "0000003e-0000-005f-0000-004b00000038"
-        },
-        {
-            "conversation_role": "g1lrkbr7ouvsrch981kwrz1k8un",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000008-0000-0030-0000-004000000062"
-            },
-            "id": "00000008-0000-0030-0000-004000000062"
-        },
-        {
-            "conversation_role": "7zc5bbxmb4igwsjplqmnttlwrhs4k5dangjj0zvpflv6q6kqfksglq1xq5992v7ce34w3s_s08jfco91s_c4dhbzcyygwfxaty7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000071-0000-0074-0000-007500000032"
-            },
-            "id": "00000071-0000-0074-0000-007500000032"
-        },
-        {
-            "conversation_role": "yqpt1iljztlmcsh2u3gt5s_gg1t7x81iwpp8ui501",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000025-0000-003f-0000-000c0000000a"
-            },
-            "id": "00000025-0000-003f-0000-000c0000000a"
-        },
-        {
-            "conversation_role": "vq6envh0bnegl9x1t",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006f-0000-007f-0000-007300000013"
-            },
-            "id": "0000006f-0000-007f-0000-007300000013"
-        },
-        {
-            "conversation_role": "3ehnf28yt11ip57arzrw7pow5m1jsjmcvd3dd5v36aftd38n0612dzjp2pofintyzuue89h_vgk47j0r4jsz4anewa_vko96m",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000001-0000-006b-0000-00200000006a"
-            },
-            "id": "00000001-0000-006b-0000-00200000006a"
-        },
-        {
-            "conversation_role": "de169f9r4vegvo0tcmv0wd8_tp0jw8c2hpv_q2ya_48gner4ablbfke36imbne2wz2miqc_wsbfp5nmgklu1sv9dnar5ftny4s7_w",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000000-0000-0009-0000-003f00000060"
-            },
-            "id": "00000000-0000-0009-0000-003f00000060"
-        },
-        {
-            "conversation_role": "191um99jwj93l_cv5zdb6op2a5j3tkismgxlv0jzf90zbw4hi9i611nilzp2i3dq16fj1naa0mdqou9",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000071-0000-0077-0000-004600000064"
-            },
-            "id": "00000071-0000-0077-0000-004600000064"
-        },
-        {
-            "conversation_role": "b0oxc3cm4deaiuhqlip8cerktwoqbdp_z56h8jeyfc5any",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005d-0000-0060-0000-000500000063"
-            },
-            "id": "0000005d-0000-0060-0000-000500000063"
-        },
-        {
-            "conversation_role": "pti7ldmszyimj_wsjq9k0p0z5jb5z3kar759v7tmwifoxgv1mkz2n4igze26p53mr34a4ghcv67fhvdqq4p7h6klye7ndhoezo6hd243gtibdr",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000074-0000-0013-0000-005700000074"
-            },
-            "id": "00000074-0000-0013-0000-005700000074"
-        },
-        {
-            "conversation_role": "5tsp_2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000063-0000-0078-0000-001000000046"
-            },
-            "id": "00000063-0000-0078-0000-001000000046"
-        },
-        {
-            "conversation_role": "xn825hf3etf479oc7vjahb",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006c-0000-0062-0000-00440000002e"
-            },
-            "id": "0000006c-0000-0062-0000-00440000002e"
-        },
-        {
-            "conversation_role": "6lyro5zz2erfgps9u1hpzlefe364l1uhhfmynczytotfna4wta_z9gkbxkhsn4zcz6ct1yyliz6fkb1fo4fqlgjs5toi44o81j1e8_oldj",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000070-0000-0030-0000-000e00000075"
-            },
-            "id": "00000070-0000-0030-0000-000e00000075"
-        },
-        {
-            "conversation_role": "iabgwa1qc9g1jvz8qvs2zf8knqstfk7uxbg8ok9i6jgb7ngqk9f441bxnxgb35uerdky5atdda5g0h8ywv3x83qt",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007b-0000-0058-0000-003000000071"
-            },
-            "id": "0000007b-0000-0058-0000-003000000071"
-        },
-        {
-            "conversation_role": "88__aymok2p9flpv0xp5nujwww7ubyxmojd74cim22ixoig78e7ov7vf4s39x3nh85wtr2z0wvsd5lcr48ut9gjgrt1bc7qpo",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007f-0000-0070-0000-007700000034"
-            },
-            "id": "0000007f-0000-0070-0000-007700000034"
-        },
-        {
-            "conversation_role": "2ogp8swsxisn1w2bohi8rcvl_1rtx0m34lr6x8sqkt9",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000042-0000-001c-0000-005900000054"
-            },
-            "id": "00000042-0000-001c-0000-005900000054"
-        },
-        {
-            "conversation_role": "xu52_xbb5yijobss5ls1kkdn_mhgvqkasyfcn1o99ds1pi7zp8lbypszkarhji_bbsdpqylore9zd_woft67s",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000c-0000-0072-0000-001100000014"
-            },
-            "id": "0000000c-0000-0072-0000-001100000014"
-        },
-        {
-            "conversation_role": "pma4ikgggpi_q0rvtdvjoff8fztnbolrl6oty_yvxm3qksaeg0l9bh8byrde5mto2f2a1rmn",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000073-0000-0042-0000-005a0000001c"
-            },
-            "id": "00000073-0000-0042-0000-005a0000001c"
-        },
-        {
-            "conversation_role": "njm9ltp6fr3yk2ke5skszy0xspo7blk",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000029-0000-0042-0000-001a00000071"
-            },
-            "id": "00000029-0000-0042-0000-001a00000071"
-        },
-        {
-            "conversation_role": "2itlnpkl2w0wh1pso963adsg8psnf8sql_ez6o9qcmy_scfvcvjcin6khn6ye_fqh5z1n52nyqis3wllwnnym6itdqccgr9fk9ttne_h0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000057-0000-0025-0000-002400000040"
-            },
-            "id": "00000057-0000-0025-0000-002400000040"
-        },
-        {
-            "conversation_role": "x61tv07e4higron1y",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000009-0000-0034-0000-006c00000009"
-            },
-            "id": "00000009-0000-0034-0000-006c00000009"
-        },
-        {
-            "conversation_role": "y7ttveh1qbqrww6el6rpjbz13kla3873tu2t",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000071-0000-0069-0000-00310000002b"
-            },
-            "id": "00000071-0000-0069-0000-00310000002b"
-        },
-        {
-            "conversation_role": "y2791q0e6ve5oof9ep",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007a-0000-0016-0000-005a0000001f"
-            },
-            "id": "0000007a-0000-0016-0000-005a0000001f"
-        },
-        {
-            "conversation_role": "db051rwfps8foxf3bqqk8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003b-0000-0075-0000-000500000008"
-            },
-            "id": "0000003b-0000-0075-0000-000500000008"
-        }
-    ],
-    "user_ids": [
-        "0000004c-0000-0022-0000-00720000007c",
-        "0000002c-0000-0079-0000-004b0000002a",
-        "0000006d-0000-0033-0000-006d00000070",
-        "00000018-0000-0022-0000-001b00000048",
-        "00000000-0000-004e-0000-002f00000038",
-        "0000003e-0000-005f-0000-004b00000038",
-        "00000008-0000-0030-0000-004000000062",
-        "00000071-0000-0074-0000-007500000032",
-        "00000025-0000-003f-0000-000c0000000a",
-        "0000006f-0000-007f-0000-007300000013",
-        "00000001-0000-006b-0000-00200000006a",
-        "00000000-0000-0009-0000-003f00000060",
-        "00000071-0000-0077-0000-004600000064",
-        "0000005d-0000-0060-0000-000500000063",
-        "00000074-0000-0013-0000-005700000074",
-        "00000063-0000-0078-0000-001000000046",
-        "0000006c-0000-0062-0000-00440000002e",
-        "00000070-0000-0030-0000-000e00000075",
-        "0000007b-0000-0058-0000-003000000071",
-        "0000007f-0000-0070-0000-007700000034",
-        "00000042-0000-001c-0000-005900000054",
-        "0000000c-0000-0072-0000-001100000014",
-        "00000073-0000-0042-0000-005a0000001c",
-        "00000029-0000-0042-0000-001a00000071",
-        "00000057-0000-0025-0000-002400000040",
-        "00000009-0000-0034-0000-006c00000009",
-        "00000071-0000-0069-0000-00310000002b",
-        "0000007a-0000-0016-0000-005a0000001f",
-        "0000003b-0000-0075-0000-000500000008"
-    ]
-}
\ No newline at end of file
+    "user_ids": [],
+    "users": []
+}
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_20.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_20.json
deleted file mode 100644
index c73e366fa1c..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_20.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "wmx8molqscfxab9_imrcssdgf0_4m2ik51npx6i23vig82mer1rji1xwvddqxasyw6jqmy0xzykd2ums",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000001-0000-0026-0000-00580000001f"
-            },
-            "id": "00000001-0000-0026-0000-00580000001f"
-        },
-        {
-            "conversation_role": "u0n8uiinlswpdr1oqstlmu1hfv3pfoo7ew8z00r2jvzkpkjpfd3u6kb39_sj73exbhv6a0779b1y69momnis84f5w_3uqlmqcp6on3zj6of7t63nwuxn",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002b-0000-003b-0000-007600000012"
-            },
-            "id": "0000002b-0000-003b-0000-007600000012"
-        },
-        {
-            "conversation_role": "lvczhtpd0dgdsvzxtzyelmrbh6dkl17j3drta713mm4i",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005b-0000-005f-0000-006500000034"
-            },
-            "id": "0000005b-0000-005f-0000-006500000034"
-        },
-        {
-            "conversation_role": "mhpxkbgdx02x3v2hsjtfm3phl92n4w9ka70i004and0apz620h97vhlp2pxy_moo1op2ipoettcczcxdugw_wus5inhfxzd4fn_jndz0n6wb0kapf76e5r4hldsqqft8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002b-0000-0003-0000-001700000060"
-            },
-            "id": "0000002b-0000-0003-0000-001700000060"
-        },
-        {
-            "conversation_role": "sjkd77e2wg_ddyj59wpadnncaup_41e7m8ayhs936zwkfy5",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000072-0000-0012-0000-000500000052"
-            },
-            "id": "00000072-0000-0012-0000-000500000052"
-        },
-        {
-            "conversation_role": "3bvwtadqp5w2ode0z",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003a-0000-002b-0000-00050000002d"
-            },
-            "id": "0000003a-0000-002b-0000-00050000002d"
-        },
-        {
-            "conversation_role": "2x_5ctyin9ildjj5gs1kwwiw1ipbsdeaqslm8dn8zh02vs1q7id3_whp40e2jgkogpdza5_zm8czqm9ykl_v1",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000047-0000-006c-0000-00500000003b"
-            },
-            "id": "00000047-0000-006c-0000-00500000003b"
-        },
-        {
-            "conversation_role": "rspqdh94do5jxbxub9t7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000000-0000-0075-0000-000b0000000b"
-            },
-            "id": "00000000-0000-0075-0000-000b0000000b"
-        },
-        {
-            "conversation_role": "fqkwb05s1i7aww45jcx5hptvdzd856n2y_8uy5v35zcxhu07jp6v19ax1juyczkgtiiw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006d-0000-002b-0000-003800000003"
-            },
-            "id": "0000006d-0000-002b-0000-003800000003"
-        },
-        {
-            "conversation_role": "fq7zom614_e",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005c-0000-003c-0000-003d00000059"
-            },
-            "id": "0000005c-0000-003c-0000-003d00000059"
-        },
-        {
-            "conversation_role": "j3kukcuzzfid3ecr70nzd",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000015-0000-0050-0000-002200000061"
-            },
-            "id": "00000015-0000-0050-0000-002200000061"
-        },
-        {
-            "conversation_role": "4r6cieh3t_a2ydpm8shzvl_q9ellq1k4sfdpvng5xzqfnwrwwet5wb0m2nzu8ze_dd7nxnauw2ylvv2y57ykt5k9899capc4ke2l2h2yq1wfjzb4zck38xmec61bvl",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002e-0000-002e-0000-006100000030"
-            },
-            "id": "0000002e-0000-002e-0000-006100000030"
-        },
-        {
-            "conversation_role": "5v8e6cih_ueu_a2wd28uj8boqxv3gmfx15u1chfrbf_1fupa7fo_yqd",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000010-0000-0030-0000-006c0000006b"
-            },
-            "id": "00000010-0000-0030-0000-006c0000006b"
-        },
-        {
-            "conversation_role": "dxwk4qalr3oi4jh6v8e3r4agor5vce0b_5w_b3fwmdwfhc3_mqsk94ngdw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000037-0000-0048-0000-00460000006a"
-            },
-            "id": "00000037-0000-0048-0000-00460000006a"
-        }
-    ],
-    "user_ids": [
-        "00000001-0000-0026-0000-00580000001f",
-        "0000002b-0000-003b-0000-007600000012",
-        "0000005b-0000-005f-0000-006500000034",
-        "0000002b-0000-0003-0000-001700000060",
-        "00000072-0000-0012-0000-000500000052",
-        "0000003a-0000-002b-0000-00050000002d",
-        "00000047-0000-006c-0000-00500000003b",
-        "00000000-0000-0075-0000-000b0000000b",
-        "0000006d-0000-002b-0000-003800000003",
-        "0000005c-0000-003c-0000-003d00000059",
-        "00000015-0000-0050-0000-002200000061",
-        "0000002e-0000-002e-0000-006100000030",
-        "00000010-0000-0030-0000-006c0000006b",
-        "00000037-0000-0048-0000-00460000006a"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_3.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_3.json
deleted file mode 100644
index 72d2a3c36e0..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_3.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "cfz_d4ungmducvtxdmamhrfwox3_ixnvu3lgxutif4hvhqh2gpcdheclk_t1tc2fo6o1f1l4olzojelbqaktba77gshp4jsodxnlvuhfjv_2yc3xd4hqcjatvqibrf0t",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000003-0000-001c-0000-004200000050"
-            },
-            "id": "00000003-0000-001c-0000-004200000050"
-        },
-        {
-            "conversation_role": "3qmhpz4xwoe0esh_q57fof2a0dntyt1rzwsrii_srhk067ashevn25ypd9ulscohnonbk99kka6lo1fvh2405_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000025-0000-000b-0000-005200000004"
-            },
-            "id": "00000025-0000-000b-0000-005200000004"
-        },
-        {
-            "conversation_role": "so7mgd7pd8f5bl2hc28161aqhqht1ii3ysfmj",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000022-0000-0022-0000-00560000005b"
-            },
-            "id": "00000022-0000-0022-0000-00560000005b"
-        },
-        {
-            "conversation_role": "dcd0mqj2i4w35js",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000065-0000-001d-0000-00530000001a"
-            },
-            "id": "00000065-0000-001d-0000-00530000001a"
-        },
-        {
-            "conversation_role": "0n5d40stfqajajw2_q70xrtjct7oursrdqbr",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000021-0000-003e-0000-00140000005d"
-            },
-            "id": "00000021-0000-003e-0000-00140000005d"
-        },
-        {
-            "conversation_role": "6xsb6xh6qstehp328c8pbh4z4nnkjqtv8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000016-0000-001d-0000-002400000078"
-            },
-            "id": "00000016-0000-001d-0000-002400000078"
-        }
-    ],
-    "user_ids": [
-        "00000003-0000-001c-0000-004200000050",
-        "00000025-0000-000b-0000-005200000004",
-        "00000022-0000-0022-0000-00560000005b",
-        "00000065-0000-001d-0000-00530000001a",
-        "00000021-0000-003e-0000-00140000005d",
-        "00000016-0000-001d-0000-002400000078"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_4.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_4.json
deleted file mode 100644
index 6378f102c82..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_4.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "ev2phc8z5r_qnawlxzgf7ba70oq8yebweiuaoe0cslzfoffdpos4edxi24p1fi09o7535laz7vuh4c96g2tracz4ofyu5fw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007f-0000-007b-0000-002c00000013"
-            },
-            "id": "0000007f-0000-007b-0000-002c00000013"
-        },
-        {
-            "conversation_role": "2dpw9m0sf8_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000079-0000-0021-0000-007000000061"
-            },
-            "id": "00000079-0000-0021-0000-007000000061"
-        }
-    ],
-    "user_ids": [
-        "0000007f-0000-007b-0000-002c00000013",
-        "00000079-0000-0021-0000-007000000061"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_5.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_5.json
deleted file mode 100644
index be881b86578..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_5.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "rus8lexaw6nztct_zjcjucxjrs4_atd_3spmbofo3nzlh5ia3llctfiqjs46jw8l6mqazv2pwp93akrkbh6ialmv23yk58_52c34qnbkgdvvephp28",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000053-0000-0076-0000-00100000004e"
-            },
-            "id": "00000053-0000-0076-0000-00100000004e"
-        },
-        {
-            "conversation_role": "rirdp8hwy4qbgbjktu7oonchq2s_kpntqqffd7eh24isbfkwwq0lgmeo3o7rxbuehhwe6dt99xhao3fswgm0xqa2_ag5as",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000001-0000-0075-0000-006500000014"
-            },
-            "id": "00000001-0000-0075-0000-006500000014"
-        },
-        {
-            "conversation_role": "48idob6a3qg0k4cyr4x5b3gvqafdeogqtnh_69ov347xwn54j",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000a-0000-0068-0000-00100000000c"
-            },
-            "id": "0000000a-0000-0068-0000-00100000000c"
-        },
-        {
-            "conversation_role": "u4ruh9mhqk3m_u6e4guj7ee40_svakap_92pwi89sdme0pkh6inwk4ttg1xmoottx1uy6ryv52w_2lf340g7ohndxa2r3iwue2k3r6c084kifr914ulcon",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000070-0000-000f-0000-002400000032"
-            },
-            "id": "00000070-0000-000f-0000-002400000032"
-        },
-        {
-            "conversation_role": "rc779wbhz5nabuxyzdrv6n9oiq06olf0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002c-0000-0000-0000-007500000037"
-            },
-            "id": "0000002c-0000-0000-0000-007500000037"
-        },
-        {
-            "conversation_role": "1yeunp1yvablh18tnsoaa8xnggbpbviyabkfh6abd9vw0mrcy3x3gu3m2jvnjhroe44y55c9",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005c-0000-0009-0000-001700000033"
-            },
-            "id": "0000005c-0000-0009-0000-001700000033"
-        },
-        {
-            "conversation_role": "opmdgq5u1h4ersm_ydrpyydfv2cdlsj7uwkqaz892ajcmuwi28c197",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000011-0000-004f-0000-007400000055"
-            },
-            "id": "00000011-0000-004f-0000-007400000055"
-        },
-        {
-            "conversation_role": "nkencc_183b83h8xpvgbgub80wyn9y2mrdj4b3at0t1iuc39e4szcufloiluzpfm1p63ozppoj_xrd0yen3ain9jpmb6nbhjw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005b-0000-0076-0000-007f00000034"
-            },
-            "id": "0000005b-0000-0076-0000-007f00000034"
-        },
-        {
-            "conversation_role": "q12f4o68fsu7kmvmha9h7pqadr37mr7anszmrm4gzyij_ejo78kbtxr85ko8ewzbrz6wuuzm1fwjir67o_0x66_gca2up99w4dzvtjhwsonumkcxx8ffhkln2y7i",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000044-0000-0065-0000-004f00000039"
-            },
-            "id": "00000044-0000-0065-0000-004f00000039"
-        },
-        {
-            "conversation_role": "d87qu8t82u8q8isnqw_0_55hpuuwnjfvra2ieaogqqdn6iwv8b",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000f-0000-0059-0000-002100000019"
-            },
-            "id": "0000000f-0000-0059-0000-002100000019"
-        },
-        {
-            "conversation_role": "flgbw825uiqbe3zydw97iha4be77fnoey3ppqzf6nmwkm8w8gqlwidk6dubc6id4iqqrxb8gbgdrfwwiye1j371xkb2_786vzon9",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000076-0000-0044-0000-00110000002b"
-            },
-            "id": "00000076-0000-0044-0000-00110000002b"
-        },
-        {
-            "conversation_role": "g43z_vqs1w3nubu3uuvq7eycshex3ug1mz7h50o8k4mu9q1tm_z",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007c-0000-0016-0000-001200000027"
-            },
-            "id": "0000007c-0000-0016-0000-001200000027"
-        },
-        {
-            "conversation_role": "toatgflm9kmzec4xpbt596ti99yjqh96g4tp",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000003b-0000-0005-0000-002a00000003"
-            },
-            "id": "0000003b-0000-0005-0000-002a00000003"
-        },
-        {
-            "conversation_role": "xgpcwa43",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002c-0000-005d-0000-005e0000005e"
-            },
-            "id": "0000002c-0000-005d-0000-005e0000005e"
-        },
-        {
-            "conversation_role": "jpp1rdcx0mto46xxx26moxicgo2c2voj_ufk9czxpjt9na71urpd9pyllrnpot4cfj7hjqr1renpy0d2tntwnsq303mws_vxbiyitlavo9yszzlv4s4b996336bt",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000004b-0000-004c-0000-001300000001"
-            },
-            "id": "0000004b-0000-004c-0000-001300000001"
-        }
-    ],
-    "user_ids": [
-        "00000053-0000-0076-0000-00100000004e",
-        "00000001-0000-0075-0000-006500000014",
-        "0000000a-0000-0068-0000-00100000000c",
-        "00000070-0000-000f-0000-002400000032",
-        "0000002c-0000-0000-0000-007500000037",
-        "0000005c-0000-0009-0000-001700000033",
-        "00000011-0000-004f-0000-007400000055",
-        "0000005b-0000-0076-0000-007f00000034",
-        "00000044-0000-0065-0000-004f00000039",
-        "0000000f-0000-0059-0000-002100000019",
-        "00000076-0000-0044-0000-00110000002b",
-        "0000007c-0000-0016-0000-001200000027",
-        "0000003b-0000-0005-0000-002a00000003",
-        "0000002c-0000-005d-0000-005e0000005e",
-        "0000004b-0000-004c-0000-001300000001"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_6.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_6.json
deleted file mode 100644
index 5c0ce6fb0fa..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_6.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "9adipks6ebghvg1g9a9w1h_oto9w98k8v6i81qpp7l0hk874ixzqqt3qcsjfbscqfyszyz_miodcsoxoz8qlc4405cth5mlo646en1e",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000079-0000-002a-0000-004d0000001d"
-            },
-            "id": "00000079-0000-002a-0000-004d0000001d"
-        },
-        {
-            "conversation_role": "99uoa6zruc85ailr9e9lu5537qrixoaq1ufioh4uepukbae",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001f-0000-0042-0000-00530000002e"
-            },
-            "id": "0000001f-0000-0042-0000-00530000002e"
-        },
-        {
-            "conversation_role": "v7wd6iz93y9034f6eq7u__okr92zkjvkwgtbidzo1wm1r2g1qv7r9vab4mgqiicw3k1i_z21zrf3tfp717rb04q7e",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000049-0000-0022-0000-003f00000045"
-            },
-            "id": "00000049-0000-0022-0000-003f00000045"
-        },
-        {
-            "conversation_role": "xxj8_x7sgu_7j6fjxshorrc5pn_nwrx1_kft7yl8w2383w5eti15qiu0xzmaqa3913938f_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000011-0000-002d-0000-004e0000003c"
-            },
-            "id": "00000011-0000-002d-0000-004e0000003c"
-        },
-        {
-            "conversation_role": "jr8qjzzzoqzxh67eh8qsqp531s0a7ji3a7vtji48tcf56g_fnjn3nax",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000039-0000-0032-0000-006b0000007c"
-            },
-            "id": "00000039-0000-0032-0000-006b0000007c"
-        },
-        {
-            "conversation_role": "74mkhdsejovwuzzul9lpdysdt1viedz37o1li8o5lxay9hy2il4_7puyks95krk_7w2t4m9lbadx1ay3abk_mxkq0d6ufg2f9ytx_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000071-0000-0033-0000-006e00000063"
-            },
-            "id": "00000071-0000-0033-0000-006e00000063"
-        },
-        {
-            "conversation_role": "rk088vrknhjb1qmbzz5b44yziqkeospcorqg3y3f01phq9d7c5ngwhlnq7lich87au3m2yas35ss1vnscom1wv",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005e-0000-0062-0000-00220000003f"
-            },
-            "id": "0000005e-0000-0062-0000-00220000003f"
-        },
-        {
-            "conversation_role": "v3m955rl1j5st0fk3t8l0ist2rq5lefq_wt2uwd_h6b1obaa3mt115ph0ukx",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000036-0000-003e-0000-00330000002b"
-            },
-            "id": "00000036-0000-003e-0000-00330000002b"
-        },
-        {
-            "conversation_role": "zay_s86wwogz16lz8f7rsq40uxgt1j7z0wgj6_t0e6pjvj1n9ri0cpjmjywyqq951ye3jhql4yqb2tjtgc7g6u9yp2_92dcesgftj6l",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000026-0000-0070-0000-006f00000029"
-            },
-            "id": "00000026-0000-0070-0000-006f00000029"
-        },
-        {
-            "conversation_role": "l_1m2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000059-0000-0053-0000-005e00000079"
-            },
-            "id": "00000059-0000-0053-0000-005e00000079"
-        },
-        {
-            "conversation_role": "e65xwo7h8khwqvfvmvj02jj2jkz3wa8bei_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001a-0000-0069-0000-002e00000072"
-            },
-            "id": "0000001a-0000-0069-0000-002e00000072"
-        },
-        {
-            "conversation_role": "ly60ylpqtqx3vqe00gw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006c-0000-000a-0000-00470000007f"
-            },
-            "id": "0000006c-0000-000a-0000-00470000007f"
-        },
-        {
-            "conversation_role": "0obmr5yj455s75alew",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001c-0000-0019-0000-007300000070"
-            },
-            "id": "0000001c-0000-0019-0000-007300000070"
-        },
-        {
-            "conversation_role": "zlbldhai8hpxijlergrh38ixsxhau35d5_gkejdkgeuz1w6_ojxzrscj3r2wbmhyi175ls73yp0w4schak_f_e8",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000017-0000-0046-0000-003e0000005c"
-            },
-            "id": "00000017-0000-0046-0000-003e0000005c"
-        },
-        {
-            "conversation_role": "y9dwyc8k9u40pa5h684208vcrlnoryjjekb_l623h1f05gm__mwvcr41m08r4t1kcjrvyfm559vc3_h63gpe2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000f-0000-005f-0000-006200000042"
-            },
-            "id": "0000000f-0000-005f-0000-006200000042"
-        },
-        {
-            "conversation_role": "_b64sbeqrp8ou_09bincmxn3",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000d-0000-0027-0000-002300000072"
-            },
-            "id": "0000000d-0000-0027-0000-002300000072"
-        },
-        {
-            "conversation_role": "vm28h5wk3tzyeng8e0_kge5k61ws2ab21l5hl5fhf63n2171lxrnibaju6wy9oqhy9804c5sry_0xqw6_hb4ebrddbb1i3huqtz_cbdudqglp3yap74qjol1m2vtx",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005a-0000-004f-0000-00700000006b"
-            },
-            "id": "0000005a-0000-004f-0000-00700000006b"
-        },
-        {
-            "conversation_role": "jstp31co2rpas6er_oyazeow51_1aho0uqvdvu6uqv2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000001-0000-0015-0000-000a0000000c"
-            },
-            "id": "00000001-0000-0015-0000-000a0000000c"
-        },
-        {
-            "conversation_role": "0gk_nlyr50ot8v0s39c1wgjry6z3e78hcjtv2wmcb397ojix5l8p47tlmsvw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005f-0000-003c-0000-007600000061"
-            },
-            "id": "0000005f-0000-003c-0000-007600000061"
-        },
-        {
-            "conversation_role": "cm",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000076-0000-002c-0000-002d00000016"
-            },
-            "id": "00000076-0000-002c-0000-002d00000016"
-        },
-        {
-            "conversation_role": "e9kre1i15j22d",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000074-0000-001e-0000-007400000071"
-            },
-            "id": "00000074-0000-001e-0000-007400000071"
-        },
-        {
-            "conversation_role": "nb8blnutjrsntylz671x",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000051-0000-007c-0000-007b00000025"
-            },
-            "id": "00000051-0000-007c-0000-007b00000025"
-        },
-        {
-            "conversation_role": "sq3if4ijdg5pndfza05zyqz5u6ae3oa2u23bazsc870ijzlsvgj41s2b88zu2d3gvi7h3s_byd35y2izjlblss3v712a3_7v",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000046-0000-0031-0000-004400000018"
-            },
-            "id": "00000046-0000-0031-0000-004400000018"
-        }
-    ],
-    "user_ids": [
-        "00000079-0000-002a-0000-004d0000001d",
-        "0000001f-0000-0042-0000-00530000002e",
-        "00000049-0000-0022-0000-003f00000045",
-        "00000011-0000-002d-0000-004e0000003c",
-        "00000039-0000-0032-0000-006b0000007c",
-        "00000071-0000-0033-0000-006e00000063",
-        "0000005e-0000-0062-0000-00220000003f",
-        "00000036-0000-003e-0000-00330000002b",
-        "00000026-0000-0070-0000-006f00000029",
-        "00000059-0000-0053-0000-005e00000079",
-        "0000001a-0000-0069-0000-002e00000072",
-        "0000006c-0000-000a-0000-00470000007f",
-        "0000001c-0000-0019-0000-007300000070",
-        "00000017-0000-0046-0000-003e0000005c",
-        "0000000f-0000-005f-0000-006200000042",
-        "0000000d-0000-0027-0000-002300000072",
-        "0000005a-0000-004f-0000-00700000006b",
-        "00000001-0000-0015-0000-000a0000000c",
-        "0000005f-0000-003c-0000-007600000061",
-        "00000076-0000-002c-0000-002d00000016",
-        "00000074-0000-001e-0000-007400000071",
-        "00000051-0000-007c-0000-007b00000025",
-        "00000046-0000-0031-0000-004400000018"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_7.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_7.json
deleted file mode 100644
index 419ca63fb14..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_7.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "eldahjnjgyux49p6u4qxz9a0q7e",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000054-0000-0012-0000-005900000011"
-            },
-            "id": "00000054-0000-0012-0000-005900000011"
-        },
-        {
-            "conversation_role": "yw31a4ikpn_zfb5fd0vee3e1536ak74rqp_qtok7xrhsn5pa",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000e-0000-004f-0000-003b0000004e"
-            },
-            "id": "0000000e-0000-004f-0000-003b0000004e"
-        },
-        {
-            "conversation_role": "9unyjjpklvq_r33t7qkqerx02wummtzrlrscqdm7gyi3vp4t9elyttg0rob3cv3lz8gni_fqr_df3rvt2o7gv",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000062-0000-0055-0000-00600000003d"
-            },
-            "id": "00000062-0000-0055-0000-00600000003d"
-        },
-        {
-            "conversation_role": "810s8rqja",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000049-0000-0058-0000-005000000000"
-            },
-            "id": "00000049-0000-0058-0000-005000000000"
-        },
-        {
-            "conversation_role": "yb41udiftgjzo36lbvwtw9xj5qlohvljde90frfx0r26jzgpq08xeo4xw2tepnvx",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005a-0000-0020-0000-005400000016"
-            },
-            "id": "0000005a-0000-0020-0000-005400000016"
-        },
-        {
-            "conversation_role": "eyqn_qzpmumu9cvf_6zn8ya0eucpkdjjwwb41pce90xd4buem9o1tp4bprvjzkudtsyvphunmxanf0ej4uad7pbj48t5xemr93bcqb1j97owyuome59njkvznhlpew",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000018-0000-002f-0000-006b00000044"
-            },
-            "id": "00000018-0000-002f-0000-006b00000044"
-        },
-        {
-            "conversation_role": "zze7ew9qk8gurfh",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007a-0000-0058-0000-001200000069"
-            },
-            "id": "0000007a-0000-0058-0000-001200000069"
-        },
-        {
-            "conversation_role": "n_roifhghi_l_9b_75beixjh703zyg806b1hin3fui2nj3nj040_7r3ijtyfox4o3o",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006f-0000-0018-0000-006f00000076"
-            },
-            "id": "0000006f-0000-0018-0000-006f00000076"
-        },
-        {
-            "conversation_role": "pgdgmdhjek3iah8ywvcdue4k6yn43l5_zme6o6_yatkktrw5s_ovqmyrwgu_z_5rp9z97jgtv620f0_177cv1s3urmbx406w50dot_yojdsjncunk9hqnl8j",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002d-0000-0074-0000-003f00000059"
-            },
-            "id": "0000002d-0000-0074-0000-003f00000059"
-        },
-        {
-            "conversation_role": "kue8gimoaxn3wdbzwb2l9ygk0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000057-0000-0078-0000-005700000001"
-            },
-            "id": "00000057-0000-0078-0000-005700000001"
-        },
-        {
-            "conversation_role": "jzojg1avl60svt8cnpecbdisbcd6eq9ru2nql33f9ccivtelrga_ls_3iao_dlfh9vj8jrne_nbwmb_73ay2bs3qoyamx5qgd",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000078-0000-0080-0000-002b0000005c"
-            },
-            "id": "00000078-0000-0080-0000-002b0000005c"
-        },
-        {
-            "conversation_role": "oz_bg293nizgs3gz2bm2mnulgpnb9jm_pd8uox2qiok86rndsgyqpj5c6l4iqrh4sj8y5ifgo23lja2tq6kwj9e9m07s59112xdypqgaxzf9py_muyd9",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000004-0000-007f-0000-007c00000022"
-            },
-            "id": "00000004-0000-007f-0000-007c00000022"
-        },
-        {
-            "conversation_role": "hdirky_2tz3se2ehu7by2csj7a_jy7qyo1oghueqc_4h118v79xz49olrwkojns",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006f-0000-0011-0000-004100000002"
-            },
-            "id": "0000006f-0000-0011-0000-004100000002"
-        },
-        {
-            "conversation_role": "9122iz2g941gnqs08mcaqa33l58irkmohj5r",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000042-0000-002f-0000-00030000007d"
-            },
-            "id": "00000042-0000-002f-0000-00030000007d"
-        },
-        {
-            "conversation_role": "0lyosg4pvc5q1dazb5z1v59plf2nqgs",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000027-0000-0014-0000-00250000003b"
-            },
-            "id": "00000027-0000-0014-0000-00250000003b"
-        },
-        {
-            "conversation_role": "01yernwfzht9wjtfyi_jr3mq9cjcsobvwlenbkhpqlmhu9clagiiyoaw2b48mfzx_mgqib99ol3vezr0t0qeu",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000e-0000-0055-0000-002200000000"
-            },
-            "id": "0000000e-0000-0055-0000-002200000000"
-        },
-        {
-            "conversation_role": "qb122l4lbi0oy7n5jsv1brin8k4gn1c_5_w0dq4avhnbvd32flikjynd_s0myf3sn2l1c7freo1uvflhcvjuvtrtpwumg5h8atn933stgizpnrc_1kfo0",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006a-0000-0009-0000-003d0000007f"
-            },
-            "id": "0000006a-0000-0009-0000-003d0000007f"
-        },
-        {
-            "conversation_role": "mzqpku2_1n5f5_c8_zcmv4tejpe4ny41dkg1n067dupdvy7snm24y8syoe2agwc1h8yts_lp59v1aj4dr4sna8cpsgpd2td66xlw1hj_rm27lpiqn",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000018-0000-000d-0000-006d00000072"
-            },
-            "id": "00000018-0000-000d-0000-006d00000072"
-        },
-        {
-            "conversation_role": "hcy75iscpnouf9aqpon3edkh4uln4gma0niecrde5",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000031-0000-0023-0000-005f0000004a"
-            },
-            "id": "00000031-0000-0023-0000-005f0000004a"
-        },
-        {
-            "conversation_role": "3jw7u98t20zwu57swxs82genekuvg_hol6pcq5597l858iwgx8vs6anpiguoxetm8_l2e18ww09_xeiytzs64m5dadcmzpn5okzf35moy271z",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000063-0000-0061-0000-006900000077"
-            },
-            "id": "00000063-0000-0061-0000-006900000077"
-        },
-        {
-            "conversation_role": "y0u0avpt3orbo6xcee13613ik0sb8xcz308vkb5u33q9np2ws_pvhakw3gjbtihe3",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002e-0000-0003-0000-00790000001d"
-            },
-            "id": "0000002e-0000-0003-0000-00790000001d"
-        },
-        {
-            "conversation_role": "ltula3ev2qfdixfbbpspfniw6xgmt4nmn0l1omcihhhkezinnxivgv81d13juourjrc0uqyl7gia0igc4keazm2avjra_ncnbfwy34uv95nbqopikwtb8d2",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000052-0000-0054-0000-003e0000005b"
-            },
-            "id": "00000052-0000-0054-0000-003e0000005b"
-        },
-        {
-            "conversation_role": "3n2q64e9ea8hxbcwm9n4mlyy330f1zoiaq_ao1d_t90kr4sahr365ji7svmbr6k58bx7o0bjeqij",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000062-0000-0049-0000-005000000022"
-            },
-            "id": "00000062-0000-0049-0000-005000000022"
-        },
-        {
-            "conversation_role": "x7shwqzfrj3qnlvus111ufwgzstnmmob_xhzern6niel5pahgi1_",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000007-0000-0069-0000-000f00000032"
-            },
-            "id": "00000007-0000-0069-0000-000f00000032"
-        },
-        {
-            "conversation_role": "1tv5og06r1a2al4kc",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000003-0000-0057-0000-00680000003c"
-            },
-            "id": "00000003-0000-0057-0000-00680000003c"
-        },
-        {
-            "conversation_role": "l_qq7b7wyz3ulnpim8dbd9g9bfv89yo_ioq9txnktyl81tkyvw0kx35u658o2_xuiuabbdslo9gxvb7p3i93nc7_tqm",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000047-0000-006c-0000-003200000031"
-            },
-            "id": "00000047-0000-006c-0000-003200000031"
-        },
-        {
-            "conversation_role": "uvsqtx_7v0_odhu95uke30sh454iruq9",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000074-0000-0059-0000-006800000037"
-            },
-            "id": "00000074-0000-0059-0000-006800000037"
-        },
-        {
-            "conversation_role": "gs2uzo7gnwot5qm61hyvd7n12n3mra138j0wex17zdhp01hwewiklyvz39e554xf_8us1abd_pysw_rjso9ujz35prg5g68omtevrtb7n1pcp9io681k77jpvj474tkw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000050-0000-0053-0000-006f0000005d"
-            },
-            "id": "00000050-0000-0053-0000-006f0000005d"
-        },
-        {
-            "conversation_role": "ccqqr3w57f9exl7xuhqnr305fqteeziw7hr374is9pkpjtt_z",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000037-0000-004d-0000-003e00000004"
-            },
-            "id": "00000037-0000-004d-0000-003e00000004"
-        },
-        {
-            "conversation_role": "cbowqop368_f44bm2whf8hhkcu5ljs7u930a2lpwirkq4k3sgl56hvj4t8xj33sikbtxznli2ireniu5zvcm4",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000039-0000-0024-0000-003500000002"
-            },
-            "id": "00000039-0000-0024-0000-003500000002"
-        }
-    ],
-    "user_ids": [
-        "00000054-0000-0012-0000-005900000011",
-        "0000000e-0000-004f-0000-003b0000004e",
-        "00000062-0000-0055-0000-00600000003d",
-        "00000049-0000-0058-0000-005000000000",
-        "0000005a-0000-0020-0000-005400000016",
-        "00000018-0000-002f-0000-006b00000044",
-        "0000007a-0000-0058-0000-001200000069",
-        "0000006f-0000-0018-0000-006f00000076",
-        "0000002d-0000-0074-0000-003f00000059",
-        "00000057-0000-0078-0000-005700000001",
-        "00000078-0000-0080-0000-002b0000005c",
-        "00000004-0000-007f-0000-007c00000022",
-        "0000006f-0000-0011-0000-004100000002",
-        "00000042-0000-002f-0000-00030000007d",
-        "00000027-0000-0014-0000-00250000003b",
-        "0000000e-0000-0055-0000-002200000000",
-        "0000006a-0000-0009-0000-003d0000007f",
-        "00000018-0000-000d-0000-006d00000072",
-        "00000031-0000-0023-0000-005f0000004a",
-        "00000063-0000-0061-0000-006900000077",
-        "0000002e-0000-0003-0000-00790000001d",
-        "00000052-0000-0054-0000-003e0000005b",
-        "00000062-0000-0049-0000-005000000022",
-        "00000007-0000-0069-0000-000f00000032",
-        "00000003-0000-0057-0000-00680000003c",
-        "00000047-0000-006c-0000-003200000031",
-        "00000074-0000-0059-0000-006800000037",
-        "00000050-0000-0053-0000-006f0000005d",
-        "00000037-0000-004d-0000-003e00000004",
-        "00000039-0000-0024-0000-003500000002"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_8.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_8.json
deleted file mode 100644
index 5c9aef25354..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_8.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "bmgvnfheg7304j1af2ha8kzlrdsd94sla01p8e32cfuchc4n4d4j_1",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000067-0000-003f-0000-003300000052"
-            },
-            "id": "00000067-0000-003f-0000-003300000052"
-        },
-        {
-            "conversation_role": "3z44kbvkfmhwt3cxvztk91xwigzfsqgmwx43rsi2ew7_663q5kd04afdhwes23ea8_7nn4j6hol2k1o",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000066-0000-001c-0000-005900000006"
-            },
-            "id": "00000066-0000-001c-0000-005900000006"
-        },
-        {
-            "conversation_role": "_5xab39_3f5_n1jexf9q06jn5c0kx2wszftbp77dq3p5wxon_cg0sgxn38hr4p28i1u20rtg01mhf_xjn3tradschh7vm2ek6hpp788h4w47cnmzwo17lp56h5k",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000013-0000-0072-0000-005000000019"
-            },
-            "id": "00000013-0000-0072-0000-005000000019"
-        },
-        {
-            "conversation_role": "qann8z5wp43fncbnzkxuqeskdrnxclmj1qoiri6zb4ro8jzbsewewgi27xi6pnc",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006d-0000-003f-0000-007f00000025"
-            },
-            "id": "0000006d-0000-003f-0000-007f00000025"
-        },
-        {
-            "conversation_role": "552en9ubk7gjrv",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000019-0000-003a-0000-006500000036"
-            },
-            "id": "00000019-0000-003a-0000-006500000036"
-        },
-        {
-            "conversation_role": "4fq8ylocoheanwuq9kg6amnrks",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000005d-0000-0008-0000-006000000011"
-            },
-            "id": "0000005d-0000-0008-0000-006000000011"
-        },
-        {
-            "conversation_role": "9ptg6nyzbr58czopzu0a26w3d1kvnl1zbyqij9j2p10o75869aargj9p3b5vxl9r27eryt6z5o85rlhgvrb4l50tb3jfil3hrlylru05",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000007b-0000-0072-0000-00690000000e"
-            },
-            "id": "0000007b-0000-0072-0000-00690000000e"
-        },
-        {
-            "conversation_role": "tq",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000032-0000-0039-0000-007700000022"
-            },
-            "id": "00000032-0000-0039-0000-007700000022"
-        },
-        {
-            "conversation_role": "as91oohpdy",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001a-0000-003b-0000-001e00000080"
-            },
-            "id": "0000001a-0000-003b-0000-001e00000080"
-        },
-        {
-            "conversation_role": "0jr8eycubw7cut6ukuegnxp5b2obst6ry8y76fe2qjro3xpp3bjvxg4c707rs1jlf",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000056-0000-005b-0000-007c00000078"
-            },
-            "id": "00000056-0000-005b-0000-007c00000078"
-        }
-    ],
-    "user_ids": [
-        "00000067-0000-003f-0000-003300000052",
-        "00000066-0000-001c-0000-005900000006",
-        "00000013-0000-0072-0000-005000000019",
-        "0000006d-0000-003f-0000-007f00000025",
-        "00000019-0000-003a-0000-006500000036",
-        "0000005d-0000-0008-0000-006000000011",
-        "0000007b-0000-0072-0000-00690000000e",
-        "00000032-0000-0039-0000-007700000022",
-        "0000001a-0000-003b-0000-001e00000080",
-        "00000056-0000-005b-0000-007c00000078"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_SimpleMembers_user_9.json b/libs/wire-api/test/golden/testObject_SimpleMembers_user_9.json
deleted file mode 100644
index 061568889f3..00000000000
--- a/libs/wire-api/test/golden/testObject_SimpleMembers_user_9.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-    "users": [
-        {
-            "conversation_role": "85wkc4m6uzi3t_s5sb488cxhjl7i_av_erwfdtgya58oc",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001a-0000-0051-0000-001100000064"
-            },
-            "id": "0000001a-0000-0051-0000-001100000064"
-        },
-        {
-            "conversation_role": "34mo_jfmsyatdcjbdl_o0hpvrc8uutf8ni3vukdy6bozbmf5itp3wsy502jw3b3y9oudqo2lh71ro8id7yvebq_4pxi98i3jdzyrx",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000053-0000-007f-0000-00140000007a"
-            },
-            "id": "00000053-0000-007f-0000-00140000007a"
-        },
-        {
-            "conversation_role": "pc12u7vhdqloizph96i1elxofyps02qanrr2z6_kdvl3zakyappxu7nksvj6oe6yz_ygrgii0v",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001b-0000-0042-0000-003800000032"
-            },
-            "id": "0000001b-0000-0042-0000-003800000032"
-        },
-        {
-            "conversation_role": "3v2qmyq9xk_tk7nywcco8dz4s_hgsd99cyu73lq8imj7xi09i8ha6nxj0mid6meivcq5wanubww2kpdpiousiel3ea7g5g7e1dggpuctjvbo9n5",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000032-0000-0032-0000-002000000005"
-            },
-            "id": "00000032-0000-0032-0000-002000000005"
-        },
-        {
-            "conversation_role": "jcr0d3sv5pm89mkbhinm7aw5njyj0oft6vh8ste7xfn6feqkmx176x93ie9lc58kcik7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000001-0000-0021-0000-007000000010"
-            },
-            "id": "00000001-0000-0021-0000-007000000010"
-        },
-        {
-            "conversation_role": "x2qhpqv6n90nosm7tt6xs_zwathnk0l2jgp3om52fmpsz7x54y9061oxncf4v_3_10tlvx11vi57riuxn25gotw7",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001b-0000-004b-0000-00480000000a"
-            },
-            "id": "0000001b-0000-004b-0000-00480000000a"
-        },
-        {
-            "conversation_role": "xeyznxh248frdc3jix0_32kir1jobft0g60b75rx9c0x4wk171xseai9irwra9eypmmbplmw6hckha8f0i6zz",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000012-0000-0000-0000-00690000005d"
-            },
-            "id": "00000012-0000-0000-0000-00690000005d"
-        },
-        {
-            "conversation_role": "40d1mp1rlpq_toli_xsrzzp6azj7abwn9kwyyexu8mzqanezqlkwgzs_maqszagustta7197hluh",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000024-0000-002c-0000-000a0000002b"
-            },
-            "id": "00000024-0000-002c-0000-000a0000002b"
-        },
-        {
-            "conversation_role": "bcxu51qy7gzxryiesnjqirt5dn7kb0lz0nsdf2fbgxjatcf486n210ndta21lli8b64ub3xnerb84atj9_1xjz4kaowbda_rhxgz5qq264g6ikd6r7m1",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000000e-0000-002f-0000-006c0000007e"
-            },
-            "id": "0000000e-0000-002f-0000-006c0000007e"
-        },
-        {
-            "conversation_role": "8qz3xbrnjl34e24fvc96wl34jw",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000001d-0000-000c-0000-001200000072"
-            },
-            "id": "0000001d-0000-000c-0000-001200000072"
-        },
-        {
-            "conversation_role": "3mcna2fo1fuhmz50gevjyc5iacna3hon9fylu4o9u48",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000065-0000-0005-0000-00160000007a"
-            },
-            "id": "00000065-0000-0005-0000-00160000007a"
-        },
-        {
-            "conversation_role": "q451zrfmym52a86mm41yg1zhb3hgv38i_3qe5l4uhjlz0cum77qlytubryh5s8oya7ql_s5cnseh27vi1rzzcow",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000002e-0000-0028-0000-00240000001f"
-            },
-            "id": "0000002e-0000-0028-0000-00240000001f"
-        },
-        {
-            "conversation_role": "cxx03t4219b0e3b7u5lwxb4ua_3qif069vharpluygxmxq5vd1hcx4_3yjmtgw99yz",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000061-0000-0035-0000-005100000068"
-            },
-            "id": "00000061-0000-0035-0000-005100000068"
-        },
-        {
-            "conversation_role": "p5ro0m08a808fnqrib4ikm2bz71wvwxs_qa0b7xeneh6q38ucu8n3nq6uw3w3yelajevfdbsw64vqbsbvx0fsmpis3zbwr73pm7srdls_8nrdr4urapsui3goem5zy",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000003-0000-0034-0000-00520000005a"
-            },
-            "id": "00000003-0000-0034-0000-00520000005a"
-        },
-        {
-            "conversation_role": "op23mrkoau967yyy74znf7smfsr1j46m",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000007-0000-0049-0000-004c00000028"
-            },
-            "id": "00000007-0000-0049-0000-004c00000028"
-        },
-        {
-            "conversation_role": "zzcga0i7uawt0riq_mknqyn98zmawbd__zaf1s0hihhmp3o8vucuv3hlmeem5247e_1i2vml18qcoez3epg9kpnufn_w704s3t74u4yc27d0hkg3a6flr",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "0000006c-0000-0074-0000-004100000005"
-            },
-            "id": "0000006c-0000-0074-0000-004100000005"
-        },
-        {
-            "conversation_role": "66z2l9nijttcg_yu5krtv_llxbwwkdyosut9qmra_3bpeithetio5snkbicofi58z6gr4a_benvx87km99ffgi320rz454xd9s_42kzu8h8g3x0rx98xymh_3",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000000-0000-004d-0000-002a00000020"
-            },
-            "id": "00000000-0000-004d-0000-002a00000020"
-        },
-        {
-            "conversation_role": "uw5x_u9rn2zu0nc6f7eb_v40",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000058-0000-005d-0000-00100000000a"
-            },
-            "id": "00000058-0000-005d-0000-00100000000a"
-        },
-        {
-            "conversation_role": "u0pnq5ipcjjbf2tdndpn5pt0hic9tj6hjrzbscf9_mr5dimm_5e1i1xvo1lppo3ccvlh610tldxpgg2tjpf_nhhqz_gff",
-            "qualified_id": {
-                "domain": "faraway.example.com",
-                "id": "00000045-0000-0044-0000-00070000005c"
-            },
-            "id": "00000045-0000-0044-0000-00070000005c"
-        }
-    ],
-    "user_ids": [
-        "0000001a-0000-0051-0000-001100000064",
-        "00000053-0000-007f-0000-00140000007a",
-        "0000001b-0000-0042-0000-003800000032",
-        "00000032-0000-0032-0000-002000000005",
-        "00000001-0000-0021-0000-007000000010",
-        "0000001b-0000-004b-0000-00480000000a",
-        "00000012-0000-0000-0000-00690000005d",
-        "00000024-0000-002c-0000-000a0000002b",
-        "0000000e-0000-002f-0000-006c0000007e",
-        "0000001d-0000-000c-0000-001200000072",
-        "00000065-0000-0005-0000-00160000007a",
-        "0000002e-0000-0028-0000-00240000001f",
-        "00000061-0000-0035-0000-005100000068",
-        "00000003-0000-0034-0000-00520000005a",
-        "00000007-0000-0049-0000-004c00000028",
-        "0000006c-0000-0074-0000-004100000005",
-        "00000000-0000-004d-0000-002a00000020",
-        "00000058-0000-005d-0000-00100000000a",
-        "00000045-0000-0044-0000-00070000005c"
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_1.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_1.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_1.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_10.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_10.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_10.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_11.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_11.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_11.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_12.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_12.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_12.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_13.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_13.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_13.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_14.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_14.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_14.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_15.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_15.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_15.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_16.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_16.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_16.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_17.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_17.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_17.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_18.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_18.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_18.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_19.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_19.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_19.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_2.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_2.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_2.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_20.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_20.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_20.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_3.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_3.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_3.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_4.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_4.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_4.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_5.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_5.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_5.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_6.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_6.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_6.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_7.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_7.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_7.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_8.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_8.json
index 02e4a84d62c..c508d5366f7 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_8.json
@@ -1 +1 @@
-false
\ No newline at end of file
+false
diff --git a/libs/wire-api/test/golden/testObject_TeamBinding_team_9.json b/libs/wire-api/test/golden/testObject_TeamBinding_team_9.json
index f32a5804e29..27ba77ddaf6 100644
--- a/libs/wire-api/test/golden/testObject_TeamBinding_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamBinding_team_9.json
@@ -1 +1 @@
-true
\ No newline at end of file
+true
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_1.json b/libs/wire-api/test/golden/testObject_TeamContact_user_1.json
index 7df6d3d2e1b..c039fcbaa0f 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_1.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": null,
+    "created_at": "1864-05-11T12:52:22.086Z",
     "email": "({@q",
     "handle": null,
+    "id": "00000000-0000-0001-0000-000200000001",
     "managed_by": null,
-    "role": "admin",
-    "accent_id": null,
     "name": "",
-    "created_at": "1864-05-11T12:52:22.086Z",
-    "team": null,
-    "id": "00000000-0000-0001-0000-000200000001",
-    "saml_idp": "r"
-}
\ No newline at end of file
+    "role": "admin",
+    "saml_idp": "r",
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_10.json b/libs/wire-api/test/golden/testObject_TeamContact_user_10.json
index 2b9d5a1e6b5..cb729492c69 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_10.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": 2,
+    "created_at": "1864-05-06T05:51:36.680Z",
     "email": null,
     "handle": "",
+    "id": "00000002-0000-0000-0000-000100000001",
     "managed_by": "scim",
-    "role": "member",
-    "accent_id": 2,
     "name": "or",
-    "created_at": "1864-05-06T05:51:36.680Z",
-    "team": null,
-    "id": "00000002-0000-0000-0000-000100000001",
-    "saml_idp": "P-\u0019"
-}
\ No newline at end of file
+    "role": "member",
+    "saml_idp": "P-\u0019",
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_11.json b/libs/wire-api/test/golden/testObject_TeamContact_user_11.json
index ddd975da0bf..7b8320f50bd 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_11.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -3,
+    "created_at": null,
     "email": "m@𬯅",
     "handle": null,
+    "id": "00000000-0000-0000-0000-000000000002",
     "managed_by": "scim",
-    "role": "partner",
-    "accent_id": -3,
     "name": "\u0006",
-    "created_at": null,
-    "team": null,
-    "id": "00000000-0000-0000-0000-000000000002",
-    "saml_idp": null
-}
\ No newline at end of file
+    "role": "partner",
+    "saml_idp": null,
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_12.json b/libs/wire-api/test/golden/testObject_TeamContact_user_12.json
index 8d5b975115f..cf560ef7bd5 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_12.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": null,
+    "created_at": "1864-05-06T13:09:44.601Z",
     "email": "@(-",
     "handle": "",
+    "id": "00000002-0000-0000-0000-000200000000",
     "managed_by": null,
-    "role": null,
-    "accent_id": null,
     "name": "⦜w",
-    "created_at": "1864-05-06T13:09:44.601Z",
-    "team": "00000001-0000-0001-0000-000000000000",
-    "id": "00000002-0000-0000-0000-000200000000",
-    "saml_idp": "\u001a:"
-}
\ No newline at end of file
+    "role": null,
+    "saml_idp": "\u001a:",
+    "team": "00000001-0000-0001-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_13.json b/libs/wire-api/test/golden/testObject_TeamContact_user_13.json
index b6436e6397c..6a3ad82dd8c 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_13.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": 0,
+    "created_at": null,
     "email": "\u0001㗅@_C",
     "handle": "S",
+    "id": "00000002-0000-0002-0000-000100000001",
     "managed_by": "scim",
-    "role": "member",
-    "accent_id": 0,
     "name": "\u001a󰈀P",
-    "created_at": null,
-    "team": "00000000-0000-0002-0000-000200000000",
-    "id": "00000002-0000-0002-0000-000100000001",
-    "saml_idp": "󲥹\u0007"
-}
\ No newline at end of file
+    "role": "member",
+    "saml_idp": "󲥹\u0007",
+    "team": "00000000-0000-0002-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_14.json b/libs/wire-api/test/golden/testObject_TeamContact_user_14.json
index c88203c9535..77ec2f2ddbb 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_14.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -3,
+    "created_at": "1864-05-08T20:31:37.388Z",
     "email": "4)=@I\u0010",
     "handle": "\"\u001f\u0014",
+    "id": "00000001-0000-0001-0000-000100000000",
     "managed_by": "scim",
-    "role": "partner",
-    "accent_id": -3,
     "name": "`+",
-    "created_at": "1864-05-08T20:31:37.388Z",
-    "team": null,
-    "id": "00000001-0000-0001-0000-000100000000",
-    "saml_idp": null
-}
\ No newline at end of file
+    "role": "partner",
+    "saml_idp": null,
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_15.json b/libs/wire-api/test/golden/testObject_TeamContact_user_15.json
index 4db1b0287a3..1433938f399 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_15.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": null,
+    "created_at": "1864-05-11T14:15:19.890Z",
     "email": "9L@(",
     "handle": "J",
+    "id": "00000002-0000-0002-0000-000100000002",
     "managed_by": null,
-    "role": "partner",
-    "accent_id": null,
     "name": "퓵}O",
-    "created_at": "1864-05-11T14:15:19.890Z",
-    "team": null,
-    "id": "00000002-0000-0002-0000-000100000002",
-    "saml_idp": ""
-}
\ No newline at end of file
+    "role": "partner",
+    "saml_idp": "",
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_16.json b/libs/wire-api/test/golden/testObject_TeamContact_user_16.json
index 66f24a3a345..7e4332cf64e 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_16.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -1,
+    "created_at": "1864-05-08T15:43:05.866Z",
     "email": "@j",
     "handle": null,
+    "id": "00000001-0000-0000-0000-000000000002",
     "managed_by": "wire",
-    "role": null,
-    "accent_id": -1,
     "name": "\u00066J",
-    "created_at": "1864-05-08T15:43:05.866Z",
-    "team": "00000001-0000-0002-0000-000200000001",
-    "id": "00000001-0000-0000-0000-000000000002",
-    "saml_idp": "k"
-}
\ No newline at end of file
+    "role": null,
+    "saml_idp": "k",
+    "team": "00000001-0000-0002-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_17.json b/libs/wire-api/test/golden/testObject_TeamContact_user_17.json
index 6baa91b858e..8ab961c44be 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_17.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -3,
+    "created_at": "1864-05-10T20:50:28.410Z",
     "email": "X󵿆@D(0",
     "handle": null,
+    "id": "00000000-0000-0001-0000-000200000001",
     "managed_by": "wire",
-    "role": "owner",
-    "accent_id": -3,
     "name": "/MB",
-    "created_at": "1864-05-10T20:50:28.410Z",
-    "team": "00000002-0000-0000-0000-000200000001",
-    "id": "00000000-0000-0001-0000-000200000001",
-    "saml_idp": "𡭄"
-}
\ No newline at end of file
+    "role": "owner",
+    "saml_idp": "𡭄",
+    "team": "00000002-0000-0000-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_18.json b/libs/wire-api/test/golden/testObject_TeamContact_user_18.json
index 5207ea3ce19..55b57dbd3d4 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_18.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": 3,
+    "created_at": null,
     "email": "􎲮]L@屰",
     "handle": null,
+    "id": "00000002-0000-0001-0000-000000000002",
     "managed_by": "wire",
-    "role": "owner",
-    "accent_id": 3,
     "name": "[􇎬C",
-    "created_at": null,
-    "team": "00000001-0000-0002-0000-000000000000",
-    "id": "00000002-0000-0001-0000-000000000002",
-    "saml_idp": "\u0012"
-}
\ No newline at end of file
+    "role": "owner",
+    "saml_idp": "\u0012",
+    "team": "00000001-0000-0002-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_19.json b/libs/wire-api/test/golden/testObject_TeamContact_user_19.json
index 5f4bcd2ee81..2a8d06be1e5 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_19.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -3,
+    "created_at": "1864-05-10T11:20:36.673Z",
     "email": "N@",
     "handle": null,
+    "id": "00000001-0000-0002-0000-000200000002",
     "managed_by": null,
-    "role": "partner",
-    "accent_id": -3,
     "name": "",
-    "created_at": "1864-05-10T11:20:36.673Z",
-    "team": "00000001-0000-0002-0000-000200000002",
-    "id": "00000001-0000-0002-0000-000200000002",
-    "saml_idp": null
-}
\ No newline at end of file
+    "role": "partner",
+    "saml_idp": null,
+    "team": "00000001-0000-0002-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_2.json b/libs/wire-api/test/golden/testObject_TeamContact_user_2.json
index 0d61913f54b..d7fdb73363b 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_2.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": 2,
+    "created_at": "1864-05-08T03:35:20.125Z",
     "email": "\u000f5g@",
     "handle": "",
+    "id": "00000001-0000-0001-0000-000000000002",
     "managed_by": null,
-    "role": "partner",
-    "accent_id": 2,
     "name": "𧋕裤",
-    "created_at": "1864-05-08T03:35:20.125Z",
-    "team": "00000002-0000-0000-0000-000200000001",
-    "id": "00000001-0000-0001-0000-000000000002",
-    "saml_idp": "N\u0014"
-}
\ No newline at end of file
+    "role": "partner",
+    "saml_idp": "N\u0014",
+    "team": "00000002-0000-0000-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_20.json b/libs/wire-api/test/golden/testObject_TeamContact_user_20.json
index ae3601889e8..ca12632c1ad 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_20.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -3,
+    "created_at": "1864-05-06T18:23:32.240Z",
     "email": "</o@C31",
     "handle": "0􈿛󹘉",
+    "id": "00000001-0000-0001-0000-000100000000",
     "managed_by": "scim",
-    "role": "owner",
-    "accent_id": -3,
     "name": "",
-    "created_at": "1864-05-06T18:23:32.240Z",
-    "team": "00000001-0000-0002-0000-000100000001",
-    "id": "00000001-0000-0001-0000-000100000000",
-    "saml_idp": ""
-}
\ No newline at end of file
+    "role": "owner",
+    "saml_idp": "",
+    "team": "00000001-0000-0002-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_3.json b/libs/wire-api/test/golden/testObject_TeamContact_user_3.json
index 22ee9d1265f..f0c50500339 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_3.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": null,
+    "created_at": "1864-05-09T04:40:28.583Z",
     "email": "@A%s",
     "handle": "",
+    "id": "00000002-0000-0000-0000-000000000000",
     "managed_by": "scim",
-    "role": "member",
-    "accent_id": null,
     "name": "",
-    "created_at": "1864-05-09T04:40:28.583Z",
-    "team": "00000002-0000-0002-0000-000100000000",
-    "id": "00000002-0000-0000-0000-000000000000",
-    "saml_idp": "\"c`"
-}
\ No newline at end of file
+    "role": "member",
+    "saml_idp": "\"c`",
+    "team": "00000002-0000-0002-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_4.json b/libs/wire-api/test/golden/testObject_TeamContact_user_4.json
index 7b48820775f..27003a4ef16 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_4.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": null,
+    "created_at": null,
     "email": "@ot󴋚",
     "handle": "U6",
+    "id": "00000002-0000-0001-0000-000000000002",
     "managed_by": null,
-    "role": null,
-    "accent_id": null,
     "name": "",
-    "created_at": null,
-    "team": null,
-    "id": "00000002-0000-0001-0000-000000000002",
-    "saml_idp": null
-}
\ No newline at end of file
+    "role": null,
+    "saml_idp": null,
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_5.json b/libs/wire-api/test/golden/testObject_TeamContact_user_5.json
index cdbbf528478..5504543333f 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_5.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -3,
+    "created_at": "1864-05-09T19:22:27.168Z",
     "email": null,
     "handle": "\u001e",
+    "id": "00000000-0000-0001-0000-000200000000",
     "managed_by": null,
-    "role": "partner",
-    "accent_id": -3,
     "name": "8",
-    "created_at": "1864-05-09T19:22:27.168Z",
-    "team": "00000002-0000-0000-0000-000200000000",
-    "id": "00000000-0000-0001-0000-000200000000",
-    "saml_idp": "ㅡ"
-}
\ No newline at end of file
+    "role": "partner",
+    "saml_idp": "ㅡ",
+    "team": "00000002-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_6.json b/libs/wire-api/test/golden/testObject_TeamContact_user_6.json
index 6d48c8997f3..3c53cc9f4b3 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_6.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": null,
+    "created_at": null,
     "email": null,
     "handle": null,
+    "id": "00000001-0000-0000-0000-000000000000",
     "managed_by": "wire",
-    "role": null,
-    "accent_id": null,
     "name": "z",
-    "created_at": null,
-    "team": null,
-    "id": "00000001-0000-0000-0000-000000000000",
-    "saml_idp": null
-}
\ No newline at end of file
+    "role": null,
+    "saml_idp": null,
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_7.json b/libs/wire-api/test/golden/testObject_TeamContact_user_7.json
index 2d217ac3b37..bfb9612538f 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_7.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": null,
+    "created_at": "1864-05-06T11:54:20.119Z",
     "email": "\u0003𮋵@",
     "handle": null,
+    "id": "00000002-0000-0002-0000-000000000000",
     "managed_by": "wire",
-    "role": "admin",
-    "accent_id": null,
     "name": "7",
-    "created_at": "1864-05-06T11:54:20.119Z",
-    "team": null,
-    "id": "00000002-0000-0002-0000-000000000000",
-    "saml_idp": null
-}
\ No newline at end of file
+    "role": "admin",
+    "saml_idp": null,
+    "team": null
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_8.json b/libs/wire-api/test/golden/testObject_TeamContact_user_8.json
index 74d75d32702..11976fb71d8 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_8.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": -1,
+    "created_at": "1864-05-06T04:27:11.179Z",
     "email": "@\u0017",
     "handle": "\u0008dL",
+    "id": "00000001-0000-0000-0000-000000000000",
     "managed_by": "scim",
-    "role": "member",
-    "accent_id": -1,
     "name": "􄫇Z",
-    "created_at": "1864-05-06T04:27:11.179Z",
-    "team": "00000002-0000-0000-0000-000100000002",
-    "id": "00000001-0000-0000-0000-000000000000",
-    "saml_idp": ""
-}
\ No newline at end of file
+    "role": "member",
+    "saml_idp": "",
+    "team": "00000002-0000-0000-0000-000100000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamContact_user_9.json b/libs/wire-api/test/golden/testObject_TeamContact_user_9.json
index 755e6ff0d75..36552012986 100644
--- a/libs/wire-api/test/golden/testObject_TeamContact_user_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamContact_user_9.json
@@ -1,12 +1,12 @@
 {
+    "accent_id": 2,
+    "created_at": "1864-05-11T18:31:16.554Z",
     "email": "𭧲&󾆚@U",
     "handle": null,
+    "id": "00000001-0000-0000-0000-000000000000",
     "managed_by": "wire",
-    "role": "admin",
-    "accent_id": 2,
     "name": "h,",
-    "created_at": "1864-05-11T18:31:16.554Z",
-    "team": "00000001-0000-0000-0000-000200000001",
-    "id": "00000001-0000-0000-0000-000000000000",
-    "saml_idp": "𨊾\u001f"
-}
\ No newline at end of file
+    "role": "admin",
+    "saml_idp": "𨊾\u001f",
+    "team": "00000001-0000-0000-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_1.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_1.json
index a3632ad43af..41110defa64 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_1.json
@@ -69,4 +69,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_10.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_10.json
index 219f7a25c4c..cad7fd3c3a0 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_10.json
@@ -25,4 +25,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_11.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_11.json
index ffeecd4e99f..ec81eabb4c9 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_11.json
@@ -17,4 +17,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_12.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_12.json
index 9152b97d05e..656f2f172bb 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_12.json
@@ -89,4 +89,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_13.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_13.json
index b8b9841fd40..08c6bfd87e8 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_13.json
@@ -85,4 +85,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_14.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_14.json
index 302b94ffbe9..bb5f5dc09f2 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_14.json
@@ -81,4 +81,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_15.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_15.json
index e00a62e70d4..8eaf78dade9 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_15.json
@@ -25,4 +25,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_16.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_16.json
index 2385a7e24ad..0b984a33263 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_16.json
@@ -109,4 +109,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_17.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_17.json
index 9054a8719c9..b94c027a5d7 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_17.json
@@ -109,4 +109,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_18.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_18.json
index bde672b0822..821999129ba 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_18.json
@@ -69,4 +69,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_19.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_19.json
index 8cef323f00a..9da6005c025 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_19.json
@@ -97,4 +97,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_2.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_2.json
index f94eb21da36..69323ad2c61 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_2.json
@@ -109,4 +109,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_20.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_20.json
index 3aac681cf96..e89ec253558 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_20.json
@@ -9,4 +9,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_3.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_3.json
index 30a7827dcc9..ee0b5f72fad 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_3.json
@@ -41,4 +41,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_4.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_4.json
index a6e08c976db..32de2044cf4 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_4.json
@@ -117,4 +117,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_5.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_5.json
index 190f7427da8..fcabdfcd1cc 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_5.json
@@ -13,4 +13,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_6.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_6.json
index 7f1cfa1fde4..9a5247fb31d 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_6.json
@@ -37,4 +37,4 @@
             "managed": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_7.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_7.json
index 4af71baa3b1..cfe09817a41 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_7.json
@@ -37,4 +37,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_8.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_8.json
index 1184aeef569..492bf3e33c5 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_8.json
@@ -121,4 +121,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversationList_team_9.json b/libs/wire-api/test/golden/testObject_TeamConversationList_team_9.json
index c5ebcc77ff9..c83346051a0 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversationList_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversationList_team_9.json
@@ -117,4 +117,4 @@
             "managed": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_1.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_1.json
index 6b735a7a16c..47466b6c01f 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_1.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000054-0000-0032-0000-001d0000003e",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_10.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_10.json
index e5a8fb8f6ef..ee720e2f877 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_10.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000023-0000-0024-0000-003200000067",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_11.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_11.json
index c0091bacdbb..c3ed7357a11 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_11.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000003-0000-0041-0000-002600000041",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_12.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_12.json
index 22ea79678a4..815df368e29 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_12.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000007d-0000-0049-0000-001f00000034",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_13.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_13.json
index 1f151e0a9b5..08af5f0cbc1 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_13.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000025-0000-003c-0000-003d00000032",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_14.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_14.json
index 8db0cb70349..0e57b1c36d9 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_14.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000005b-0000-0065-0000-002a00000060",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_15.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_15.json
index 453dd03c6c7..d57937b90e8 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_15.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000001f-0000-0037-0000-005a0000004d",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_16.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_16.json
index df7a65ec9a2..842886be695 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_16.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000044-0000-000a-0000-007f0000001d",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_17.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_17.json
index 4ca7081da97..6cee0ea4117 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_17.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000009-0000-0060-0000-005c00000049",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_18.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_18.json
index 3359ab0ac3a..c74e29a2206 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_18.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000005f-0000-0051-0000-003d00000026",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_19.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_19.json
index 31f0b92a304..e89e0e335b8 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_19.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000003d-0000-0025-0000-00170000002e",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_2.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_2.json
index c868ea63dbc..98867bb28cc 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_2.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000021-0000-0059-0000-00390000004c",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_20.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_20.json
index 912dabbc35f..685a331cb2b 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_20.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000007-0000-0053-0000-001500000035",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_3.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_3.json
index 5e58e33f149..9f73a8d7200 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_3.json
@@ -1,4 +1,4 @@
 {
     "conversation": "00000020-0000-0022-0000-00550000003b",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_4.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_4.json
index 6c5d4f359ee..4649545ec67 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_4.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000002d-0000-0034-0000-004600000023",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_5.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_5.json
index b6533799df0..de418778915 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_5.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000007d-0000-005d-0000-003d00000076",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_6.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_6.json
index 2dcad0fe602..16a96402ac7 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_6.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000000a-0000-0013-0000-00420000002e",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_7.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_7.json
index 7eeec9af279..56c320cc2cb 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_7.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000005d-0000-0080-0000-002800000080",
     "managed": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_8.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_8.json
index 65be92da57a..4c6909cb827 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_8.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000002e-0000-006d-0000-003700000042",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamConversation_team_9.json b/libs/wire-api/test/golden/testObject_TeamConversation_team_9.json
index 2914e32b946..62036a981f9 100644
--- a/libs/wire-api/test/golden/testObject_TeamConversation_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamConversation_team_9.json
@@ -1,4 +1,4 @@
 {
     "conversation": "0000000d-0000-001b-0000-006800000047",
     "managed": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_1.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_1.json
index 901c00ef8c6..9e633f8c0a8 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_1.json
@@ -1,3 +1,3 @@
 {
     "password": "i>Lx}$\\\u001e?󼃩k𢮇󺟛`8\u0000Y뱔|\u001b?S|\u00196X-XK𫬬(\u0016@]_𪽵󴖌b1\u0008𔐛󲍹􄒜􍩥\u001ds𦀼ᦎ􆄭C􅓹:e9]x𣞇\u0017Pxh짷G⏞h𤕲𠁣\u0013\u0014hbY\u000f󿢨3𝠯B0\u0007쾯𪏵󳉭\u001f-\u0017O󰊓9𪭺%\u001d𗔴W\u001f\u0005+\u0015\u0008\u0018!,h@\u0010R󷿕緙󿪛,ㅂ}.{^􊉕K*\\󳘭_X|9T\rM~\u0008\u0001KsC=󶬴w􂐉=\u001c\u001b\u001e\u0000wFM%CXf\r@/NU􁤍5v\u000b\u001a2U􁒣K4᱑r𡵑Q􍽴[Z\u0014#)\u0016\u0003sR!\u000bt\u0019\u001f󼻡{\u0015z󿽎􈲎󾪈|@럭\\𨆦[놆󼯕D];s𑆃c\u0019􉩳q\u0000饐]F};f\u0011mz􉼎$\t\r&SuI!,\u000b[,\u001ac8=􈚫 \u0013𢌧v𝙜J]\u001b\u0018-\u001dF\u0017\u0014\u0001FD@𡥶􌾟\u001a󲲪<\u0014𨈏\u0012\u0012U􈐤9𢡻MQjmAb+\u001e🢛\u0017\u0005K􉄆૦v;\nQ鶫𗹅[uD􀹲{𮍭\u0006O㨖@7\u001e:+:1ၸ𪃊Mr(蝁f􊛶􄡱S骛b󾇉􅦻\u000bF謑󱯛\r\u0008􉶔 􉟵m⏫E\u0004𡢛𦹂{\u0008=S\u0015=󶖠ḫ⊣\u0011\u0000󻅦\u0001h\u0010\u001a󺋼RPt\u000b7􏶜𦺜\u000bD􍪽S󳞗.\u0012}zP뢅E^?泂𧡧S\\S􌌄`\u000e&\tU𛆫🩧𬓖{jj􋳒\u000f|1\u0001R\u0007\u000c9\u0016,󶧬b\t^󼸰?V\n\u001dz\u001e?=@袽􍟗\u00139'\u0008\u00198y\u0003&󾺣􄋞\u0000u􃐧\u000e,)\u001fb&|h~軯X\u0003D󱉑\\~'\u0004\u001d%\u001c\u0010|\u0003󾌳3s\u0004\u000e\r]|7J􄅺Jhi镉ᖡ𤗜\u0000\u001a%󰨥\u000e\u0012vjc|m깞VDN4kW󼦖𝃬$\u0019\u0011r呣]@􉎖K𦯝𭍣:u󵅗\u0019G𗇽8qN2;\u0014)X[p\u000c\u00011󻼰󻱀뛸􈓽x.P𨜸l\"s#n0\u0003~\u001f\t𒊨[􀦆󿞆㨄`􉤡\u0014􍔡1L𡊸󲱉b𘁘\u001b,\u0005#\u0002@A\u000e𫦶\u0003{\u000e殭1sX䯌}|EZJ\u001e\u001dxoSe楌l:0g3\u0006"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_10.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_10.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_10.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_11.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_11.json
index 21a6fb93a07..1a960164b9f 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_11.json
@@ -1,3 +1,3 @@
 {
     "password": "𣥔vO醍A󿻵꼀\r􋜐󾻓R\u001cVXd\u0013\u001c\u0016zlz?4\u0013b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_12.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_12.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_12.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_13.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_13.json
index 83cd759e6a1..e7655a95267 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_13.json
@@ -1,3 +1,3 @@
 {
     "password": "룤\u0003\"𦶝;UJ1k浜㥜9\u0019c\u0016~󲾄9\t𗫿\u0004\"\u0003飦𭓇b\u0013.p􃈗yM󰘀#f\t7𐳍h-2\u0010\u0012\u0002\u001b\u0016󸴹]hi/䘿X𩑙簓_)'𠖤􊹔Y:hj1𥵻X.rS~`{䖔􅫔"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_14.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_14.json
index 0a04bc641d5..6dd5b4fbf7a 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_14.json
@@ -1,3 +1,3 @@
 {
     "password": "\u001c<㠬D\u0007湝|펈𦞣cl𦅾E\u00040\u0013\r\"5􋓺r{#[C𥊂󿈗簷u樀/𭚚E崙\u001cW죔Dꄗ\u0006f\u0018Ozi\u0002d\u0013c𥬉9 k\u0012LL󶣃􏦝-𪩳\u0005u󺵳tzSNZ􃚅K:fU\u0001 \u0019ꎽ郵㌿C\u0005<󻜋S􉠢󺄚\u001dR$Fz􂗫gEM𑫅\u0008𠶔󹴂쵋R<t\u001f~󼛝󼺻\u0019󴛗:\u0010@\t\u0006Ww7󻁻yJzB𡦬􎄑度pX\u0003󷳀9H󱝇Rs\u001fH\u000c<C|\tI9\u000e\u0014U\u001cp𐬳x"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_15.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_15.json
index e02990e0b90..0012bcd5071 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_15.json
@@ -1,3 +1,3 @@
 {
     "password": "Pp\u001f\\S󳺊󷭆bk\u0005K􌰑@󵁄L2𥴹󾍦𭃞󰚯{#o\u0006|<Mv󿓢𩺝鉡PX7NL\u00179.􄓨:^𬯦􁜀d\u0008𬍽/\u0006\u001bf󲖣V9q61\u0008\u001e\u000fo\u001ed\\e,&󲆕AQvJ𑆪S𫉞-E󰺯N󴫧{?\u0011n𘧕lpUL\u0003덊E鹝B查󱸵e賺瘨EH{'􍯎%w𮓖􏱶=\r0󴻖!<N󿒙􎮈鈄󴫵𥚣rw𧄖\\@􍢀d\u000c󽄞8WIf-𗝷RvKD㙄1v%2󸕙+\u0004Q􈇡􂔡𐛵HJ󿤠t\\_lF\u0002'\u000bX9l𩳗􇢤%\u0011"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_16.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_16.json
index 9df6b49d5c1..61d0f8fba9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_16.json
@@ -1,3 +1,3 @@
 {
     "password": "l\u0003c\u0006=1\u001df\u0003x󳉸𤀼\n\u000c036J𗟶6𫞮V{}t\u001d?TR\"\u0018)\u00186h:i\u0017Z9\\i\u0012b\u001d󼣢6(IvY \u000e:삓𢓰\u0006\u0010\u001ced􆚲\u0004}OK𗙸H󰡲W9_u󽦃`𪪆􂱃󲷒\u000b\rIAy\t\u0002y􍥂L;\u0017Xz\u0019+g\u0002\u0017􌖍E\u001e\u0008F󾈠DK󸼶_\u001b\u001b𫻒xMah6*􄶵󾺾s\u001d﹝J𦢑)N7J\u0010𭼴\u000e<^\u0006𡂨9ὓZ󱣁#,E􇺺yNG𗃎)~c\u00015wC𠻌:\n&5􇧏g𨋶\u0015𘪉w\\C\u0017\u0018􁞦.𩒱}k\u0017~􋟁ᨛ􁱦9󶳃󻚨i\u0010\u0003\tDg\u0016a\t\u001e𥁪\u001b𬐎_C\u0012\u000bGbu\u001c[zo(󰘽󾵺g\u001bfe\u000e=𒀓筡M\u000b@𝌓󲆡\u0018uq\u000f8펟EJ􈴉\u0008𑱦;\u000f,c\u000b稆𩐱.1K\u0018@\u000c媾𨟋W\u000bX\u001ek󻩵\u000f󲛲%\u001b󹷯>\u0005I󾼢DXL6I\u001bB.Pཚ􊒕\u000f7\u0017Pu\u000fK:\u001eὑ}S>\u001d󳚐\u000b\u0005r;~`Co,/,𤍂\u001fU絉\\ngr󳞔i𤜝\u001d􆦙Y􏅫\u000b5FajE#!\u0007F쑼z+\u001d~Ly󰳦􋡿\u001aExbmgxU[囖]b\u0005mo󰌞k^h󲍝\u0015D𪘻𣒀B\u00052󵫾f𠎯PWU\u000c}𨪝3d%y𨖂꼁MN钜r𦹧?K虩\u0006\u0004귘𓃴\u0010O㴼G~1 g󰭶ne㕥􆢜U􂻊\"B\u001a󸍻\u0010󲹲Bj\u001c\u0001}wDG𫯝\u0019#</󸕡uCs!\u0014d.\tg􇾇Do􋴉7\ni𫤔Tw\u0019(mf柀𑓇\u000c􂷁𭝻k>\u0014Vc\\\u000cz9'\u00062\u001a\u000eI\t􍄃\nb𑐁\u000bR%\t\u0005庄DJA3>\u001eD󰲋V\u0018]\u0003\u000f󰪻Rꛥ􍳎dGFO\u000c󺻐㜼{\u0002𧕀'􃦎󷰾𬵨\u0002\u000fjb\tQf-9\n-󷒉r𓇱m𫾞pJlc 𠩗󱘑'\u001f\u0006>c?sXEN3󶃣\u0012l󻙿\u0004Ju'𒋔y\u000b󳋧oM[ிQB&淌􁉻毖2\u000b􅸊\u001b<t𥛟'Og\u000b#4\u000b\u001f\u0011bY∌r􂂔m𐀩\u00160􈈘Y,󽚀{X󷧤1~)\u001a\u001dyj?􀯧\u0014肩}0.𗗄󴶃ꚷm$nuo\"Wf\u0015\u0013@EC:\u001e󸬇4唠:Y`tp/\u0008㪘佣/\u000ce\u0017\u0008[=𤞧𭇉􅴭J\u0016􌗢𪧼7g𩁑}%\u0019􁖃.z󵵩Z5􏳽nᛌO_􀕰j\n􏒔*_拙S\u0016𘠈🌖𥨽󠅒GA𗜍󸶔㞞\u0004󹿛;\u0013>𠚻󴙢C[O~h\\8*c𣙰O \u0007DQZ󻹯yb \u001dX󵉃`󱩫\u0008􋪣\u0010􉀠\u0013􂂂w󳧻)\u0011\u0019.ⰺ𤙲𦩳K-G󻔷\u0012Hg3\"t\u0001\u0004􃁚b$@𫋔\u0012OP\u001b󽜚Ip渣9ty󽆄!"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_17.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_17.json
index ecee20c5362..572a08f78e9 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_17.json
@@ -1,3 +1,3 @@
 {
     "password": "*⽎m,b󲯰OTCM{x:'\u000f,󽽔\u00112ffV󱇒􅎻\u000c􎺫uf\u0016(-@ B<쑽*H9􌢛Qa.%`.6\u0012GQ\u0005\u001ft􂘓Mge_gL\t#\u0018\u0003􏒟vG\u0003g\n:;x1󼲂n\u001a:<p6<􊳼(Na WM𬚊G\u0019\u0016􏈪졭\u0011Y^Y\u001e7\\ࣨ|옩NF0♥Q􂁪\u0008􈖵!+\u0006jWv𥨣􅇝0cgP󵭈J)4:\u0000\u0013@\n<K55\u0016q6\u0011sZ\u000b᷾\u0001?E+SX\u0000𡵉=)2)K\u0003󶤮\t[\t=\u0018u𞸡= /D\u0010E\u0017ꊍ󴥔􅿜Wi\u001b\"􀆽I\u0001𮫮K󾧳>l`^󿍯73]IiN􀂦/\u0008Os"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_18.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_18.json
index 2ab2033414f..324c2b0bde9 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_18.json
@@ -1,3 +1,3 @@
 {
     "password": "􃪏;7/\u0012猉𖽃\u0013n𞀂稚S9\u0006]༊8P\t􈯠2𒁃#𬘷7~`􌨷𪲱󻇣~n짟\u0004\u001c\u000b4?nPy5\u0019\u0019􋛭;C\nW𓅄4\u001aTd𤁔\u0018yR7\u001b/V􉿶\u0002\u000b󴎦,\u0012bv𨇂K𖡽{mU􃀞)\u0011𒃶.T\nB=\u0002lsux\u0014􆾷1:\u0018L􏋗Hh\u0000𪟲n/􍊽𧱩󲝘q됏*)}􌏺󽕄􍂒􉨕\u0015\u0018\u00188\u001fU\u0008@jr\u0014&󲃶􆠢_a\u0004+\u0016mႳ\u0016\u0014Kw\u0012m:P拯6V'G5@\u0019 Z\u0011s𢯳cq\u001aP\u0014.d跡\u0000K樱\u0015뤒s󻹘j/\tu𦧁\u0003󶲸\u0001T뻤f:C[\u000cJf􉚖𢶑[&hi%)𡓍2𭊎j\\􅽏eM􉀞uvK\u000b\u0018\u001cCw\u000b󻵩$\u00047\u0002󺺏\u001c0ү2L;N􅾳\"H[k􆀚\u0012󶝝f\u0019wuSE^􎘱\u000bf\u0002f\u0011㜡\u0019`XY券5B㒸󹫇侓w쫁Ot갅2T3Wb\u000e9!:\u001e\u001c󵲮􋿿j\u001b~DY\u0001aN\n􄆥Jw"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_19.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_19.json
index 3b0b7b92f4f..74a1673eef2 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_19.json
@@ -1,3 +1,3 @@
 {
     "password": "_\r}u􆡣Z!X3𧅦\u0006KOM􇿈%\u0012𐃂B\u000e𫽓L%w\"\u0005 q]\u0006'\u0007.Ox􍹚􂆓\\7c\r葈剺{\u0011o􍳢uO\u001842n[k4\rn𥑲O\u0016P𡆜􏄹\n󾢵N􃇜䀵\\H\u0016br^󵃶􃀞i􎾗\u001ay<\nO\u0006Tp\u000f謇N`f栢}!~􈖯\u0015cp*!8l\u0006\u0012 銦\u0013f\u00001齴\u0015T憛𫱾 _𗉋0q%;𝄶f8E0<󳥲u\u000e}󻯤h襆+a\n󶈑N󾍅I`\u0011󼇘𮬛􏷦𠁣.3Kj邫\u001e骕H\u000fzI'\u0015H𑁊𥍲dN𪿣󱿮󱱗`L\ttN󷚁QjV\u001f1i#Ag\u00106.􏣶eZ*r\u0004󺀓-b`􍍸8\u000c\u0001󶪳nK𩨯fp𭱞RW\u001cs󲺕mH󿌸瞌>\u000b􀉻r!}쾯'W󲨑􌈸qE\u0019𬑠#y\u000cW?#\u0013􅯞G\\l5􄯲󰸚󽣔𢞋􍏵#vsV󸄢8PP\u0004\u0014TZm?𨱢CC\u001bR;\u001fw\\Df[JjbN`X𗒺ꮔx胸9^𗻒🅎~\u0017\u0008zWl&\r󼄊K󳔆𥫡\u0008!\u001aL\u0007􁂀t-w2N㡇\u0008\u0019𫛯鑅iG󷭹e\u0003:q\u000c4qKRr\u001748DJTS􏷌[\u000b\r\u0011𘜆TF󾾖8s!}SS7\u000b/𨗸)T\u001d\ncjR𦒑󹹪\u0015\u000b𩀁-%&^\u0004𨳐󲷋I(\"B\u0019Pbl\u0014\u001dl􍻖\u0000􋨚&鹓&\u000e$\u001dU\u0003:}l&j\u0008Q􍦬S1v􀊶%Q𬌸^󲴄󾜲\u0019\u0003,%\"𧛩s\u000erfB\u0002暓\u001f7i\u0013\u0006晓\"G(ⶕ%\u001an>􃦇4󳄕c\u0016q@オ*I\u0005㛣o;\u0006󾷶)\"B|󶣣𩨤􀭊壊3\u001cg\u0013?􌰵}\u000e8%Xl\u0013㿌[O,𞤏g%S𧋝l\u0005\"(H;+\u0002}J\u0012􊗻\u0016\u001e?7𬛖\u000b\u001eX~Y$\u001e^䞚󼽰\u0010𣑃"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_2.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_2.json
index 881af010b25..c1cf25e0c77 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_2.json
@@ -1,3 +1,3 @@
 {
     "password": "?𨰾􂯯u𨢶V𦈮uk󷧈W\u001c\u0001\u0002₈CP6􇱟p\u000brꝴF>nX9\u0017I󼐽H𭯈WIt]\u0000󺃡!i11p\u001b+'𭳒\u001b\u000f\u0003z🝌\u0019皹S󵏝`𐫶詰\u0001\"𥜦O%\u0004\u0010l􇼙#FO\u0002N3K\u0006>\u0019\u000bq셪f󿩵𧩿\tG􅪺iK\u0001^𤆕O'\u001e\u0014𗧠G.􍊈k:J\u0005󻬂\u001aAM\u0003'遑\"6y~4<JU䍘C𪝮Il\u0018\u0001V󷐭AKcaw\u0006ho􅅘Y\\(+\u00047E\u000f\u001a톃⏎S]\r𧏆%\u0019茶gn\u0011\u0013)\u0005otL\u001f.j󻝋\u0014\u001f{%80 \u0001$X\u001eB8\u0015.􋏷\u0015S􁌃\u000ef-꺫\u0000𬶲| FvV𠬲/\u0002u󹟤_y\u0014\u0006M󶵙jNF?巍𭳨c\u0000\u0008Z,\u001d\u000e`\u000eO\u0005\u0015ic6F'\u0008㹐\u0014C\u0000\u000c)|󰉾9G\r􅫽3𡒝𥯳\u0017(aN\u001fP󽥔\u001cњl󽹜\u0004x_\u001d􀍄K󳎻\u000c\u0012M!8C\u000c酮cc\u0017$Qx,=P0\u001e≲D󾴆`rx\u001a*`\u0005m-\u0001\u0015󺩯kcY\u0003m\u000c⟅𣆠\u0008f𔔒\u0006\u0019/𦂳󺗖j\u0014^G\"\r`/{\u0000^@\u000fv𮜁U&`\u0003󿗮,/I\u000b\u0007􊰥C#Y_\nw,\u000e\\\u00034Q\u000e$o4`\u001d\u00180쵾􆯅L􁵚?\u000fi\u001c𢠖\u0014C(\u001eX󹟘Q\u0006\n\u0001XK^y𠥡)\u0005Z{q𝪉󴬚.Qk\u0010?t\u0002UQ%`V-~O\u0016􋈶󴁧P\\\u0016\u001b/Fv5\u001ayKI8s$X|\u001b\"7\u0004<s8}\u000ccy𞋥􇟘\u000c\u0005\ng,𪴐ᖊ~\u0000fw]􊊇𐁅Rk\t덦sgwm"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_20.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_20.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_20.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_3.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_3.json
index 8428cb3fb49..f40e90705d7 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_3.json
@@ -1,3 +1,3 @@
 {
     "password": "D𦹛􃰐𩩌/>mI𦩁(\u001881cA㖲l\u0003\u0014\\󺓆4P怰􋷗t?zd%s\u0000#I꺷31𢞘㹧l+a7{\u0004<􉹭z\u001e󶰻𧗖/빌\u0010jx\u0008B\u0010\u001f㫷&i\u0012\u0001󳎖\u0010V🚨e\u0008~󵘆􍅡r󵭰sHW/L᪙xC2𥠴M􉸀\u0005,\u001a𝂏󾖰𫝫U􂆐\u000c\t𢼐\u0006<\n\u0011h􂞠#4N\u0018:󾾜󰩦7\u0004P󻻖\u000fu5\u0016\u0007\u000cuS\u0016\"Z\u0000?􁃬𘔙\u0012N􅸹㸪\u000b\u0004b^w􃣹tbt診uCg'\n\u000c\u0007󿭛x\u001dSt씋󾄚Zke$|~󻈉KixS͉\u0013􋛻j󲽳A`Fa2𭅨ꆱ\u0015uOy\u0012@\\fKr\u000bpnu[W\u0004vU𐀊@\u0001x䭜V\"𣉮\u0007\u0008sQl\u0013\u0018𗱎D󺑵\u0006\tH\u0015QWPjJ^S+󰼰󷲭􀚜𨺀􋶢🧢􅷮㸔=𢤆\u0019\u000c󿖤6\u0007d'f\u0000\u0000\u000b𪖙昬%Vu4􈝼󼍕7\u0002\u0014W􅍷\u0000\u000bY𨮯f퀕\tb~W𧞜\u001f\u000b쥈걧\r*\u0014'{Js󵩓&6𗒲c_9Yc\\z𭶺𣳵\u001a,󺿗\u0017􀰽􅴚󽂴\u0011fVI\u0015#i􊀕pi􊾆8􇫍􀜰\u0012􈉺L󽅗\t𒌣\u001a<􊮆~;썘􁫟{󼌱{3L𣻐\u001aX[\u0019𤝍\\_𦣒\u0019𫝋vv6𣇗:xn@𘧇X􇀭E)\r󰦴q1Ν>>t㤅say#\u000fX\u0012𪆴U9𬅻Vc󳚂{\u0011\u0001󵫡\u0002^.\u001f`Ad\u001d`n\"wI#}D|p)78+54$\u0007㖕\r\u0015\u00031𡮛H9JKpqyg;󰚀᪢L@rYᅙ𮚚?W\u000c-S\u001aX\u000b􇧩TK𥄴 "
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_4.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_4.json
index 010267b5615..a4266c217e4 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_4.json
@@ -1,3 +1,3 @@
 {
     "password": "𨸾>(=Oz\u001e.&\u001c6𩤑\u0019󴶰j\u0011𗹥'HsG\u0010乛\u001dzaJ\u0000􇲓XF$ 􂽒𣦑\r:)뿿􆌠F\u001d3]\u0007𭋅\"죓_w)d🞲㭬\u00049􏒋Z\rFs󴿳\u000b&h렴6JaT= 󿃪cy􀝰\u0005𛊴P!'\u0005@>;G-|SY󹙼􌍇wM\u0001,􁭀fጓ􆵸𦃅𐨟5󿦒+^󱻅O󵥧:0(#x4\u001euj􇙽𬤷\r@n\"#]󶞪n􃜽j\u0000\u0007o0P􊤯qu𧍢+\\d,\u0002𩛾qtN\u0016􌚵퇮DvD'𪊬\u000f🤓\u000b[\u0004󷠪\\%󱺻QS\u001a)𓈂󼭱pg4𭂡󸋪}𬚳\u0016󽊮\u000f\u001cHu|,/𤀎󽥕c􄿽\r|\u0010􏒋􈾪\u000e𬢆󶀱𒊝󶵵𢑵\u0004(󱜔􂟁'X<󱳚`]뫖 ?c󲺭\u0007f\r?X𫯂&F􂿐𐊀Mꜱ󸈙\u0013]𭪠𘗖@\u0008\u00008\u0012TOT𧼿\u000b\u0001V\u001e\u0002\u0013𝦲󱂣<\u0011𮮛b𭁟P_\u0000Z.􍞥'司1𤥱􉋐\u0013𧎏􇶁贀􅯚[~𗒕Q~󵄟󰪿\u0004<DX25O2-\u00129R}t\tkc􏍮 U:yJ𢟓(󻒭id-DGr.󰎄"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_5.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_5.json
index f69da598866..b88a403626a 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_5.json
@@ -1,3 +1,3 @@
 {
     "password": "꧈h󼋚~􃐰\u0008'N󴷰xh\u0017\u0006(].XO*𗤹U\u0007@*M3𢤗넭𠈆8X!𠐖Q\u0017\r𡪹𬳂\u0013m|R斘2>vd􊆐 \u0017h@.\u0017 G4Q􊗒0I!?](\u0019󶗄\rd\u0018\r\u0019=󿜿8󾄜ᾦ5=􍻷䝮諛>󰌢E\u0013d&O҃_\u0004DM帽*󷄌<+9\u000c𛉡\u0005\u0010\u0017zU9Bq\u0008s9𮁐MY5a󾅬!눠H2o<W􉹲MJ\u001bA\r\u001d52_\u00047\u0001𥁔\u0001唍!󿆿Ys \u0015y\r\r\u000b3[J䂻)\u0001^?\u001f|)\u001ek@@𐃀B􌷮\u0013\\㼗𬖜0\u0014\\$k~Jꎐ𣔏Y~\u000f𢲣\u0016U`oꕝ<󹃀𬌢\u0007]ijw𘧒Vj\"8\u0018IL\u000cP'󰇥ⵜ\u0006\u0002'\u001a6Mm\u001d◧䟖\u000c+𩁫f>󴂌\u0016\u0013P|뤇𬞻2\\\u0003e\u0005K󿌳8?\u001aq🇺,𘓂;%\u0010𪪹\u001c\u0005]\u0006𪟧F3𩒥\u0003𫤣\u001f3Ph\u001b𠵡\u000f󾭴lJRL\t&\u0010nU$)🧗􃀞󽷙\u000c\u001bK\u00044􋰌:𦑐󺶳􇣞U\u001c𝍖zz{g^H󸹻O\u0008a5bo\u0002\u0013i;:㞄鐴󺵯\u001eJW>󱌈\u0019V􌄊B<󼍷󴯻*'\u0001􂯰1d;􂸧aꋶH惂M𓆲:li=r~`嵽zC􈭦s\u000b󺵗T~2􂤑X+I\u0014^BQ􎺛\u0001X\n𢬇w\u0005􅀵C𬽦􆄸P𞀑𫙬\u001f\u001c>ᴙ􁞎LI|?\u0001􂐊IE🏸􎦂⯬+󳳙쳁I􁘭)\u0010\u0011\u0007𤛼>楲(\u00125X􏊚𐰧i{8V[i𮛀v\u0018j\u001dRq\u001eʽE|𥷬3B/;9駻\u00110\u0010\\g𥜳cDG󰧷i<Z𠍕x-\u0007WB\u0007gN󸡃L\u0005*\u0002#󱍩|j𥍡䢃\u001a,b𧆽㽫\u0008*<9󵼫JG󳟺`􍰔+Dz$\u001fs𥾦PG똠?𭠫\tds\u001d\u0012󴾐n󾨱\u0012#%h\u0000􎺍c2󴰚\t2q󽚚𫅁\ng􂓿b\u0003G\u000c\u0011􌣂KK\u0008􎝽?󼧦\u0013\u0008?𡗘ub𥦴􀪏\u0004QwCO󾕮o󽰏􍁐p~w󽟚Z\u0012]>1\u001c$\u0000󼗴\"a?N\\􍋥c$W:󰀧L󾼱a􌯙J)]x\u00123\u000eB\u000b𑠃󾦟Q\u0011Gg\u0007\u00153嫥rI\u0003􃺸>I󰏋zIX\u0010\u000b󰝴4u{X􇌥𥶐\\Xv@\n𤁛\u001b\u001e13A㒑W !\u000c􍪋􎮭謁3yr\u001aC26\rU7\u0001/ E𘈍}\u000b\u001fV\u0012O2;Z|F󾁵\u00027𬷰􌩘L\u001f󲃂󹵫]K:/-󿂍󰥄U1lꆊ\u001cRn ]∾"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_6.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_6.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_6.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_7.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_7.json
index b6b511a98a3..c74ca7291ac 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_7.json
@@ -1,3 +1,3 @@
 {
     "password": "|\u0016􁊦R\u0006㛍􌲮𢝠!􏦲Xw󾫧a(\u001eX󱣏B3󶗦J;?'󱥒glvrF𫤂ci󽺷\u0012hh-:g𢧅\u001a뱷􀴞\u000f>$𣌧󱗩L$󳔶\u00152sq>c%{􃎋zXX]􃗧\u0008d𧈺 C#Y\u001ew\u001d\u001e󽞎􇽆\u0004}\u0017(F\u000fg:􈚍4+i󶹂>b_\u001b𮭒􁿼\u0006m󷖪~c1𣉪z7BM\n\u0004\u000c}bo􋨅'󲀻󶁶&<5\u000eU\u001a\u0011𠂣+􀣶A\u001cS-D$N𮦯w뾕S-L𣐞􋄁i𨾀}EC􈉣\"󼩜𘄧bq󽔻\u0001𥚿C菐Jh󹏊e𓄂􈟽1%\u0002_BD􎳮\u0000𣌆g<.𨵦\u0018\u00059:𬤮\u001f:󼩯\u0019T\u001aSH\"􍝘\u0011\u0017V\u0014{!\u001cW\u0007㐜{𬡺@A4!yV\u000c\u0004VY\u0017P#􂦨󵂵􎏙sysSo􌉮h1Bᗂ\"⒆!\u0012󻲰\u0000􌡜\u0005\u0018\nZUk𬸭󰱸\u0014\u001aG􎜝jv󾂠35F𫥣"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_8.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_8.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_8.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_9.json b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_9.json
index cae2a44c5c2..086a90dbaf9 100644
--- a/libs/wire-api/test/golden/testObject_TeamDeleteData_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamDeleteData_team_9.json
@@ -1,3 +1,3 @@
 {
     "password": "5\tt\u001f\u0002.-:𤮶󶒱􎢶ᲆ𬆈!z\u0006)󽊦,贾cH|\u001b`󰄼,􁷤\u0010_jb\u0016\u0010󴃀\u000f(Y츖@\u0002$膻m!;P\u000e𨜍t\u001c?l􈭹}Ui\\\u0005b𥷖RJ󽅿\u0006鰑*W󸺜\u0011󰯃\u0013Q􉕙Jh\u0001Y5i-𢷸\u0013K@W󽣂i㡞p\u001b2[,J\u0013\u0006\u001e\u000c\u000c/󿸸!ᙷ-\u0001XBq;V𘁂󸣧\u000e)u\u000e>(💯𡭝k􊪀\u0002R诗\u0006?1\u0007w<\u00013\rH:\u001eYA\u000f|IOV\u0018X\u00156\tM󰭇Z􈡈*󰱤\\\u000cl𠰀9􉚯\u001a\u0018\u0011\\\u0007\u0011􉷊H0\nk\u0004\u0012\u0014\u001a󴰤XO𩾂|!𧈿 􉳾齧􌩛W\u0000Xd󲧳L𢍠\u001d\u0010𘀾c#s=g𥿟\r0$\r\u000bD|\u001d󲡠:H4\u0002Mg櫕Qfꢌ/,zi\u0007󿼛#𗔗hmF􃮧]h􉿀Z󱡧\u001a*􌔌6\u0018\u0013Bq𩛞l􊇘󼜸\u0003=-8QP\u00053􈩁爣i쭤\u001fXG:E3(\u001b/󽏯 𭺆3\u0006󽗻熏Y𧶡\nn󶆊7SN\u001a4<󹀘E\u0007UDeBUIJLꗼw_󶔐hGI\u0011w:nJ\u0006fW촰󲫷\u00072v\ts`𝄚󵖹\u00081'j:􃫺\u0003<'﨨\u001c91i>T:XD\u0018\u0007􇛑!M\u0019wc@𪟠\u000c_|\u0018M쏎tm󿭇\u0016斡:+Xt󸄏󻌥㷏䖝󶈮^ )!\u000eꛗ󻓲y&󲕉캊k󳒚\\􄗽-&\u0011\u001a󴵌𥫑\r맟\u000bS􋚪c,􍨔4\u00000E^i􈃉󷿪↷\t𘡃]p󵛫𡩆\u000eq<E+^ᘣ􂿕%\r뭎\u0012\tZ􌤽\u001c\n),Rb󳳱S\u000bsd:󺾳o\u001d𮒇k;v}+󶣾\u0012v1\u0005􈖛󾎰\u001dD%𘡠􂩞󺼆W&\u001dTU-rjX󲅨󿢩\u0006!*?𮨟멱^]𣄎\"\u001fJ%Q𐲤F𫡌y铖L\u001f\u0015󰈁Q@󲿺d􍐙et󰓾+Zjf^(\\􀏏󺋧􂲱g|\\'P\\𡙳󱏜a%􄙾𪭹-\u0005GMY7P\u0010@J$􎶭8󸳬󵌹R􏻃}|l+\u0016'󹆅빌`YIQ}\u0016s\u0019𓏪𧵹}􌶥s$\r􍉢\u000c+_Oj\u0002{(\t\u0016􎏿S\n\u0004🜿󱷊y]rw\u000c\t\u00048𪚖}h\u001b=M8/U\u0005dLA󸍃WF$\u0017𝥗\u001dk\u001a:Z퓲󵦈s邫+\nDbJE𧬺H碦󶳀@\u0006\"a𢣫umQ趖V􏋡xPA38U)vj\\𪯁𦧢\rBF[\n󳝹f\u0011v𮟚8EX𮡱>{Z8􉂶K㮩躀]\\\u001a`a|縉\u001d𡰚uk#E,z=+!/\u001a𧲧\u000f$bᆭ5\tio𘗁\u0016/ಪ𢐏<􊕐o\u001d\u0003\u0019껫$U'󽔔󴀹vuQr07䰑\t5🟈\u0018󰃱󲷶\u0018D𠃎<A\u0007&󴪺󾆱m􆯞m@𫉰K􍥱uZEs#􂛺󷮈􌺋'𭼝x\u0002#80\u0012,1QW\u0017.;􀯅sR𘕇\u0018y@,􋼸cb󷔐碫\u0017N\u0014􃁴DGU󷺁\u000f𭵭^\u001f1{p`p\u000e.*\u001f@:􂑓\u0012037*󱷦\u0003+잭󲤂\u0001L'\"8.Ne6V𦉒ݩ7\u0013\u000b!\u0005);dCd\t􇦋plk`鼧튐v[R(𡞒𦣎𨗃J\u0018[R1⥱&󻰘𧶔w꤯􅌪9\u0011FS ^e@[􆼳gmVy/r\u001en\u001c𢸈༈ 󶤂:\rsg\u0016\u0019ZT𧠕[8O\u0011颥+E\u0018rSTb=Vnf􆑕􉚰𡲪"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_1.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_1.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_1.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_10.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_10.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_10.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_11.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_11.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_11.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_12.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_12.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_12.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_13.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_13.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_13.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_14.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_14.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_14.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_15.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_15.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_15.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_16.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_16.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_16.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_17.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_17.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_17.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_18.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_18.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_18.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_19.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_19.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_19.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_2.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_2.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_2.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_20.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_20.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_20.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_3.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_3.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_3.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_4.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_4.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_4.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_5.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_5.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_5.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_6.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_6.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_6.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_7.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_7.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_7.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_8.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_8.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_8.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_9.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_9.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusNoConfig_team_9.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_1.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_1.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_1.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_10.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_10.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_10.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_11.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_11.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_11.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_12.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_12.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_12.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_13.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_13.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_13.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_14.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_14.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_14.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_15.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_15.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_15.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_16.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_16.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_16.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_17.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_17.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_17.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_18.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_18.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_18.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_19.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_19.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_19.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_2.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_2.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_2.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_20.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_20.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_20.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_3.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_3.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_3.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_4.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_4.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_4.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_5.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_5.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_5.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_6.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_6.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_6.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_7.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_7.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_7.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_8.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_8.json
index b4fa36ddc14..78bf971c5a4 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_8.json
@@ -1 +1 @@
-"enabled"
\ No newline at end of file
+"enabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_9.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_9.json
index 71a6384a039..a0760977f71 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusValue_team_9.json
@@ -1 +1 @@
-"disabled"
\ No newline at end of file
+"disabled"
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_1.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_1.json
index a211e9cf8b9..66a69f69b1f 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_1.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": -98
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_10.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_10.json
index 1fdd48451fb..75f0b001c52 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_10.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": 120
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_11.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_11.json
index 501e4c822d2..eafc7e40804 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_11.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": 62
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_12.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_12.json
index 9a1351cd114..43f961c2500 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_12.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": -50
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_13.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_13.json
index 16c61bb94a0..139bac441da 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_13.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": -99
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_14.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_14.json
index 6b26aea7199..e8271d3d4b5 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_14.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": -96
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_15.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_15.json
index 80b6889711b..954360479ff 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_15.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": -12
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_16.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_16.json
index 963d506b9e4..9aa6c4cf472 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_16.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": -60
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_17.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_17.json
index 0cbd31b9162..e8b6267e67b 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_17.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": 100
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_18.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_18.json
index fe4fa4c9b6a..6e2a810f3fd 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_18.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": 74
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_19.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_19.json
index 04813e0bdad..06a02b31411 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_19.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": -125
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_2.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_2.json
index 9b64f7e69bc..e566224c5f3 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_2.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": 14
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_20.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_20.json
index d3677964df0..e65c5f047ac 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_20.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": 69
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_3.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_3.json
index d202a38cb75..19451686892 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_3.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": 92
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_4.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_4.json
index 61cbbcb32ad..5d98e6f2af7 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_4.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": 45
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_5.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_5.json
index ec8fe410658..7469262bb92 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_5.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": 119
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_6.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_6.json
index 6046c05cc52..1f5e32f39bc 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_6.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": -50
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_7.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_7.json
index dd504a5c700..9c0cdda20d8 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_7.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": -50
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_8.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_8.json
index 24fac5549fd..18831a5159c 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_8.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": true,
         "inactivityTimeoutSecs": -76
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_9.json b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_9.json
index 00c0c25b757..705400444f1 100644
--- a/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_9.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "config": {
         "enforceAppLock": false,
         "inactivityTimeoutSecs": 96
-    }
-}
\ No newline at end of file
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_1.json b/libs/wire-api/test/golden/testObject_TeamList_team_1.json
index f6b20528691..9253c096fd3 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_1.json
@@ -2,27 +2,27 @@
     "has_more": false,
     "teams": [
         {
+            "binding": false,
             "creator": "00000000-0000-0000-0000-000100000000",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0001-0000-000000000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0001-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0000-0000-000000000001",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0001-0000-000100000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0000-0000-000000000001",
             "icon": "",
-            "name": "",
             "id": "00000001-0000-0000-0000-000000000000",
-            "binding": false
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_10.json b/libs/wire-api/test/golden/testObject_TeamList_team_10.json
index 300d4226377..a774ef8bd00 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_10.json
@@ -1,4 +1,4 @@
 {
     "has_more": false,
     "teams": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_11.json b/libs/wire-api/test/golden/testObject_TeamList_team_11.json
index 300d4226377..a774ef8bd00 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_11.json
@@ -1,4 +1,4 @@
 {
     "has_more": false,
     "teams": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_12.json b/libs/wire-api/test/golden/testObject_TeamList_team_12.json
index 2f9a80fc07c..ed1c32bbfdf 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_12.json
@@ -2,12 +2,12 @@
     "has_more": true,
     "teams": [
         {
+            "binding": false,
             "creator": "00000002-0000-0000-0000-000100000000",
             "icon": "bi",
-            "name": "/锟",
-            "id": "00000000-0000-0002-0000-000200000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0002-0000-000200000001",
+            "name": "/锟"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_13.json b/libs/wire-api/test/golden/testObject_TeamList_team_13.json
index b0de8c04674..524f87e2c2f 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_13.json
@@ -1,4 +1,4 @@
 {
     "has_more": true,
     "teams": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_14.json b/libs/wire-api/test/golden/testObject_TeamList_team_14.json
index da69b85270a..88c4fec2777 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_14.json
@@ -2,51 +2,51 @@
     "has_more": true,
     "teams": [
         {
+            "binding": false,
             "creator": "00000000-0000-0001-0000-000000000000",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000000000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000000000001",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000100000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0001-0000-000100000001",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000000000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0001-0000-000100000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000100000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000100000000",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000100000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0000-0000-000000000000",
             "icon": "",
-            "name": "",
             "id": "00000000-0000-0001-0000-000100000001",
-            "binding": false
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_15.json b/libs/wire-api/test/golden/testObject_TeamList_team_15.json
index f08b0cf111b..6596778c10f 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_15.json
@@ -2,41 +2,41 @@
     "has_more": false,
     "teams": [
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000000000001",
             "icon": "",
-            "name": "",
             "id": "00000001-0000-0001-0000-000000000000",
-            "binding": false
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0000-0000-000100000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0000-0000-000100000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000001-0000-0000-0000-000000000001",
             "icon": "",
-            "name": "",
             "id": "00000000-0000-0001-0000-000100000000",
-            "binding": true
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0000-0000-000100000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0000-0000-000100000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000001-0000-0000-0000-000000000000",
             "icon": "",
-            "name": "",
             "id": "00000001-0000-0001-0000-000000000001",
-            "binding": true
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_16.json b/libs/wire-api/test/golden/testObject_TeamList_team_16.json
index e3cc3eccc39..0cf64604e2b 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_16.json
@@ -2,12 +2,12 @@
     "has_more": true,
     "teams": [
         {
+            "binding": true,
             "creator": "00000002-0000-0000-0000-000200000000",
             "icon": "e乥",
-            "name": "𩬟",
-            "id": "00000001-0000-0001-0000-000100000002",
             "icon_key": "􏵷(",
-            "binding": true
+            "id": "00000001-0000-0001-0000-000100000002",
+            "name": "𩬟"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_17.json b/libs/wire-api/test/golden/testObject_TeamList_team_17.json
index b0de8c04674..524f87e2c2f 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_17.json
@@ -1,4 +1,4 @@
 {
     "has_more": true,
     "teams": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_18.json b/libs/wire-api/test/golden/testObject_TeamList_team_18.json
index ee6c802abbc..c6c35099637 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_18.json
@@ -2,11 +2,11 @@
     "has_more": true,
     "teams": [
         {
+            "binding": false,
             "creator": "00000002-0000-0000-0000-000000000000",
             "icon": "!",
-            "name": "W1",
             "id": "00000000-0000-0000-0000-000000000002",
-            "binding": false
+            "name": "W1"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_19.json b/libs/wire-api/test/golden/testObject_TeamList_team_19.json
index 1fc7fde0cfa..0a14a863117 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_19.json
@@ -2,12 +2,12 @@
     "has_more": false,
     "teams": [
         {
+            "binding": true,
             "creator": "00000001-0000-0001-0000-000200000002",
             "icon": "7",
-            "name": "",
-            "id": "00000001-0000-0002-0000-000200000000",
             "icon_key": "𮏥(",
-            "binding": true
+            "id": "00000001-0000-0002-0000-000200000000",
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_2.json b/libs/wire-api/test/golden/testObject_TeamList_team_2.json
index 1426889482a..d9bbcfc9d92 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_2.json
@@ -2,20 +2,20 @@
     "has_more": false,
     "teams": [
         {
+            "binding": true,
             "creator": "00000001-0000-0001-0000-000000000001",
             "icon": "𪤬",
-            "name": "7",
-            "id": "00000000-0000-0001-0000-000100000000",
             "icon_key": "@",
-            "binding": true
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": "7"
         },
         {
+            "binding": true,
             "creator": "00000000-0000-0000-0000-000000000000",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000000000000",
             "icon_key": "",
-            "binding": true
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_20.json b/libs/wire-api/test/golden/testObject_TeamList_team_20.json
index 4df29fc6851..d2d074718a3 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_20.json
@@ -2,34 +2,34 @@
     "has_more": false,
     "teams": [
         {
+            "binding": true,
             "creator": "00000000-0000-0000-0000-000000000001",
             "icon": "",
-            "name": "",
             "id": "00000001-0000-0001-0000-000000000000",
-            "binding": true
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000000-0000-0001-0000-000000000000",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000000000000",
             "icon_key": "",
-            "binding": true
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000000-0000-0001-0000-000000000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000100000001",
             "icon_key": "",
-            "binding": true
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000000000000",
             "icon": "",
-            "name": "",
             "id": "00000001-0000-0001-0000-000000000001",
-            "binding": false
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_3.json b/libs/wire-api/test/golden/testObject_TeamList_team_3.json
index a3f5755e962..93425d17390 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_3.json
@@ -2,11 +2,11 @@
     "has_more": false,
     "teams": [
         {
+            "binding": false,
             "creator": "00000000-0000-0001-0000-000100000002",
             "icon": "",
-            "name": "",
             "id": "00000001-0000-0002-0000-000200000000",
-            "binding": false
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_4.json b/libs/wire-api/test/golden/testObject_TeamList_team_4.json
index f4dd8c94ed5..ee8f255d4cd 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_4.json
@@ -2,20 +2,20 @@
     "has_more": false,
     "teams": [
         {
+            "binding": false,
             "creator": "00000000-0000-0001-0000-000100000000",
             "icon": "",
-            "name": "􄃌",
-            "id": "00000001-0000-0001-0000-000100000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0001-0000-000100000001",
+            "name": "􄃌"
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000100000000",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000100000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0000-0000-000100000001",
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_5.json b/libs/wire-api/test/golden/testObject_TeamList_team_5.json
index 9b1674a8b4d..5c31ced6d52 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_5.json
@@ -2,59 +2,59 @@
     "has_more": true,
     "teams": [
         {
+            "binding": false,
             "creator": "00000000-0000-0001-0000-000100000001",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000000000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0000-0000-000000000001",
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000001-0000-0001-0000-000100000001",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000000000000",
             "icon_key": "",
-            "binding": true
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000000000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000000000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000100000000",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000000000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000000-0000-0000-0000-000100000000",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0000-0000-000100000001",
             "icon_key": "",
-            "binding": true
+            "id": "00000000-0000-0000-0000-000100000001",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000000000000",
             "icon": "",
-            "name": "",
             "id": "00000000-0000-0000-0000-000100000000",
-            "binding": false
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0000-0000-000100000000",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0001-0000-000100000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0001-0000-000100000000",
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_6.json b/libs/wire-api/test/golden/testObject_TeamList_team_6.json
index 7b3e52a20e5..de67b8024a0 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_6.json
@@ -2,11 +2,11 @@
     "has_more": true,
     "teams": [
         {
+            "binding": false,
             "creator": "00000001-0000-0000-0000-000000000000",
             "icon": "󺯟",
-            "name": " ",
             "id": "00000000-0000-0001-0000-000000000000",
-            "binding": false
+            "name": " "
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_7.json b/libs/wire-api/test/golden/testObject_TeamList_team_7.json
index 3baabfce29f..7a6e537de35 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_7.json
@@ -2,19 +2,19 @@
     "has_more": false,
     "teams": [
         {
+            "binding": false,
             "creator": "00000001-0000-0001-0000-000100000001",
             "icon": "\u0011",
-            "name": "",
             "id": "00000001-0000-0000-0000-000000000001",
-            "binding": false
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000000-0000-0001-0000-000000000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000100000001",
             "icon_key": "",
-            "binding": true
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_8.json b/libs/wire-api/test/golden/testObject_TeamList_team_8.json
index b0de8c04674..524f87e2c2f 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_8.json
@@ -1,4 +1,4 @@
 {
     "has_more": true,
     "teams": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamList_team_9.json b/libs/wire-api/test/golden/testObject_TeamList_team_9.json
index 6df0f29bc58..da14cb80b1f 100644
--- a/libs/wire-api/test/golden/testObject_TeamList_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamList_team_9.json
@@ -2,51 +2,51 @@
     "has_more": true,
     "teams": [
         {
+            "binding": false,
             "creator": "00000001-0000-0000-0000-000000000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000000000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0001-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0000-0000-000000000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000100000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0001-0000-000100000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000001-0000-0000-0000-000000000001",
             "icon": "",
-            "name": "",
             "id": "00000000-0000-0000-0000-000100000000",
-            "binding": false
+            "name": ""
         },
         {
+            "binding": true,
             "creator": "00000000-0000-0000-0000-000100000000",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0000-0000-000100000000",
             "icon_key": "",
-            "binding": true
+            "id": "00000000-0000-0000-0000-000100000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0000-0000-000000000000",
             "icon": "",
-            "name": "",
-            "id": "00000001-0000-0000-0000-000000000000",
             "icon_key": "",
-            "binding": false
+            "id": "00000001-0000-0000-0000-000000000000",
+            "name": ""
         },
         {
+            "binding": false,
             "creator": "00000000-0000-0000-0000-000100000001",
             "icon": "",
-            "name": "",
-            "id": "00000000-0000-0001-0000-000100000001",
             "icon_key": "",
-            "binding": false
+            "id": "00000000-0000-0001-0000-000100000001",
+            "name": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_1.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_1.json
index 5836905a7aa..8ac278aeaf9 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_1.json
@@ -1,3 +1,3 @@
 {
     "password": "&2B)^5橑󳣫=\u001da􌅼􋧕􀔅\u0016TRK􄶌lVx,􍲈5\u0002\u0005\u00169&CN\u000bp􊦴\u0004󷐻ꌳ\u001d'􋰏Z㜁𥪆𬊞3\u001fa􌤴5\u0003\u0007<􂡌E}󲶬𢲢V(\t4󽄎\u0004ziG𬗨t􊖃mXH\u000c\tc7P&\u001e󻘻&\u001f\u00196[|Y,\u001d\u001aF\u001b𑱘\u001b7s\u000bB;0X󱎚@S\u0000~󷼲+󹹃gA7􃋕1\u001c𤅖#`\u0004vK\r3\u0004r)U\"p,\u00196|\u000ez𠌾\u0001􎳭V𫸗\u000egL#􊓷𬏌\u001d\u0006􊱎\u001fV𛰝𮨂\u0005b𤻨e\u0017>\"𤪲W1\u001f#W{𬿻tP좽p㣃󼌄c󺗯󺠴4G\u0006ms\u00026e\u0002S󻌥7ꟽ@\u000e遖c0藽𦝗\u001b\t\u0006󺤕\u000c\rG􎃪\u001de􂉟󶽋ự쾣\u001b𧱯+8\u0003,hr6\u0010l=i;v𐋊􁓏\u0010􎛖Mv\u000e\u0017t\ttj􆨧\u000f󶾞ᖃ8\u0012섊M0𫞵'#2@J\n*wQL\u000f󷌗L\u0017\u0006\u0004\u0007V}󳳜\u0013T\u0010庌lmp􂝝[\u001cY\u0004o\\􇳍$c竘H,𦴉;𢸡`rvK􉂯􇟓`𐘶CJ󳺃\u001b󸛝`􅆵\u0004Y\u0000\u0006􌠁;\u000fH|A𠋽\u0011x\u0004󶬆󶢝\u0001o󶮵󱥯u𬦚\u000bO-\u0016\u0014\u0019󽵖[[OSE~ᎰrK\u0010Ky`@衑\u0018#G'󼊂i9\u0010a\u0002稼돂\u0003D󱌆P󶧼\u0000J\u0012<rl@v_.\\槏bCb\u0018\u001b𪄏-\n󰕞PM𝤬􂱣\u0008hYˆ\u000e=d:\u0005\u000cU𫖲\u001e􊚏e/󿃃Q(2\u0007⽃\u0000(G\u0006^_$𢦶kny@~p_)􎗢u]>J􏴡MX\u0007@\u0002YV]𠂱\u00153R\u001d?R'􃼃u󻵑ภ\u0016kq󽇪j )𘈮@󰴰`r󾅍\u0015󼉞􂒆X󾐺\u001e􈩃𥠰4𠦄\u0012b<\u0018>G2\u0002\u0001)K𗿧󴱃𣸇k\u0003U?􋢳I󸶀0Op揳P:3MmU:蓹Z"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_10.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_10.json
index 35a6a45726a..7b67a7a831b 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_10.json
@@ -1,3 +1,3 @@
 {
     "password": "𔗔AgPJEyG𒈹0J󾴀w𗓤4Xe9弼󼖺m\u000c\u0011\u0004c#􃷲\nO\u0000p!/P􇉡󳂌|=u\u0002\u000f1\t􇧩􀖷\rc\u0013A󰅟\u000f\u0019$p\u0011qvM\u0006\u000b!𧹎󰘷q󺭸\u001a󴫖T󳥽/󲢺m>􁡿(\\𑀗d\n[@ь+%󷺑OI\u0010\u0003\u0010\u0008|<𠫙\u0015􏹞<􏆶⫬󼵩%\u0016\u001e#vD~t󺅒\u0006W\u000e𫡴𐲠K\u00101NK\"󺿆\u001fⴷH\u0017𭇙@\u000eQ^b|𗫚\u001d\r`)\u0004颅2J󽢓𬙨F\u000b\u001c\u001d\u0015O\u0010G<M𪍚\u001e𞋱\u0017𐃵3\u001cx3\u0006h7V4\u0013|\u0011[T\\󶋢(\u0019Zca((d+𔗩\u0005_Ӿ%ଡ଼灓􉠜􆡗]#Q𘖕DY󸻁n揺o-\u0007NT\u0018􉓎&?z󶛡R\nf󸡃B}\u0008\u00047+X>﮶\u001e󵷭 󰪎=J'=-qo󾌬hv\u0001Rh􏐺M 󷺮𩦳v瓯󱆰\u0019㉖i*\u000fTS𦑤󿃛G쳬\u0016]Q\u0007󸉯Q𮫠󽙖BL.\n~\u0013\u0011n\u000b\u0014\t榘|𦒘뷠Y\u0005Nᬜ+\"\u0017\tp㱭Z_󺃭󺂪\u0014\u001eYGM]l􎘁dkj􄭈1\u0010ns𭼚\"\u00109\u000bY󷉟\u000cJ[􀣁;t\u0008ಱH\u001fC󰑅􌄍\t\u0014n(AE􉷮?{g+(⭿􉚒\u001f\u0010\u0006\u001b󹼘󲅧R􏋐j+f󱔦兦\u000e\u0016U\u0011𖽉C􄷴{棅Y󾲐闍\u000f􅩄,<)󺫱{`ຮ繈\u0003􀍣 󿙚f(󾏲nEsb*R𦕝\u0011\u00124F!\\\u0017꾷󻕫uX$\u0008􈕞2SLvᖚye𖹸𥬯u󱊗\u0012\u0016dp<\u00041􅈆鄏Ղ𠍠uEK􍊲󺕋d\u000e:󺿓g􁜇\u000c󸷁$\n\u0003𩑊wᖿ𝋱⛩8V\u0004􎢆3󰎇􁦎#󺊡\u001f\u0013􈓏􅫒𮫓\"r\u0002%\u001dx\u0016t\\W\u0003湱𓐑qxrPse\u0005dR󵙜R\u0002Sx\u0008󹀓_sQ\u001d\u0011􏹰󳃼ak:옷𩭥m𘣯𝒛\rl𪋀q󱊄OC|𨷄f\u0005\u0015W𗖯􀳼Wo󺽀􌕬􉞹0s|󴊺`5\u001ekN-9\u0008vs\u000f󻒠p9\u0014\u0007Yt眧X\u0000y\u0016EGyc\\v\n\u00143󰮚O8\u001fꙥ\u0000㛢\u000b\u0019e2q\r퉺𗞉&𡤫𗟥\u00079(j𮃓󲿈􎒂\u001c::S\r~_𘊅=󴇉l?#󶕻2}\u0002\u0006O'a𦦀\u000fDDW􆖂\n$𩶄\u0013\u0006q{1b|`𦱽boLT\u0004j+Q􍻀\u001f􆳱󹋓E􉦃$Nz\u0005~o2|𥚔𬫗{\u0013\u0006󰯠5n\rZ(cZcS*~w\u0011\u0000/1)\u001d\\V魎󼅌\u0014q\u0004`6)􄓎SiD\u00068\u0017k𫌓\u0015\u0013U󺥂􃶐n[\u0012-ﴋ\u001c^䚀rZ~\u0011~\u0014ꇏ&\u001f\u001bqK𬘇|Sil~𑶋\u000ej󼖯\t\u00003\u0011\u00012}󵡂\u0015]A[oy~jjTg8IK|􉙲\u001dH\u000c\u000b\n_󽓺􉜛j\u001f𠌆Na#!\"󲬏'W􃩶𢌚\u0010\u0015O`m#7E\u001d:\u001dS\u0019\t\u0004\u0003A딤􈕙𗋹\u001cXn\r)c\u001e\u001b\n8m=.䕤\u0012u􁓬.o"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_11.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_11.json
index ddc2c0a450c..f259dbca650 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_11.json
@@ -1,3 +1,3 @@
 {
     "password": "1Ll\u001e蛦^𪢱𪼥MkP\t\u0008\r\u00023/|eDY6~V􏹯\u0011𨸢󼞂=\u001dU\u0006k7\u000f\u001f䎗!<󱺪wQ\\󾀆􀪈\u0008𗌉噆0𦉛𡕋\u0007\u0014𝈯&,}\u0016G?齤唅𒂢.n􂧞Y󼗋󽋶􄅺' !C~{.󾶽2ට\u0019:\u000e k渐\r􈜐G􁹕3]'hIw5\u0005ꇱ􈌓pO\t󴤏Kyj\u000bP4l<𠴵 􊇄𡢪􆤆cM𨺄󳍝\u000e\u0017h绻#􂞈􉣧),/w𨍽TM[g􍡸\u0012%,)膊+􅻴5熑>𫄥\u001f\u001e\u001d\\𗼒r\u000f\u001d󵥮\t󺋾NQ\r\u0003zEaw\u0007趤1$󺼩\u0014􃵂𤳢\r\u0018m𭂐󿏠?d𦎤5i<\t󸼹Ӎ\u0013\u0013󸺱󻘃飴􍦹\u0005M,𪞑Jq9󿷋\"􊣛&\u0005t=:c 稖7\u001e\u0014\u0004􆈮,󸤨e𬪜\u0004\\\u0011b)&rN領پb\u0018\u0007\u0006w=:pC :.@JZ󽴓ST\u0015\u0010\u0011u~*q䷫&􂶽U󴌂~`󽧂bN(􋚠𗏄\u001a]e𫐕#􄄬󷪖𣜓pb@󽧥\u0012􋍇v\u000f\"Io껎􈯷\u001a\u001et􋙂𗨁G𢀳\u0016i󸨫􍵖d\u0002?K\u0005we\\M\u000c\u000b𗉓TDSt\\𨵡\u0005󺷪􂩨K+|䪿:\u001dM1c􈿜\u000c􃩙\no\u0003~A \u001cA㹖N𤉱𬆅6𔔃.􏿌\u0008𪨂7W𢒶酎􃙸\u0006􊵖aX𗰖\u0002p\u0000.%\u001dhU􈨚_𢦧7[M𬭹t󻒳𢬒h@󻩏7i􍆉h\u000e󠁕󵛖0\u0005\u0003RoTUGS𫀒𗩴ꇟ\"𢑾𐕆m𪭋\u0004􉔄𨝀J!𘦊b\u0000zBqu34hG;$mj䍟𢴦RIoT^C\u0016\u0005$8ｏႶb0<􇧯\u001b%\u0006偣𫛢\ta\tv:㽁\n5z􉽲𘖍4\u001c8J7F\u00159i􄊀䍭\u0004𨣄O\u001f\u0002;􃗉󸁏pOSp􍻩􏣔U\u0005􏓱$F󶏕􌮸 icGo⇓౷~𭮝\u000e\u0005p/?n=s=QMU孷~𗤨𭄌L\rE\u0007C\u0000D:(`'k 餵=\u00124`\u0010𭸴󿱴􏈼~Ql9j6jྮ^cpq)US𤌍?􎾨寚􎧠辘𨎫𢓳;u􁧣#𒇱􁒺Rq󰦱\u0006\u0000hMxe-\u0011/\u0007\nv\u0004;+7\u0010q󷌣L󽤤􃾟=k亾ZhxnI󾝉\u000b~\u001cP3?,쐕Q\tp5󾲏j􈿀i󷃭Zxe\u0007􂕣}\u0016s\u001a󶄋b󴻶\u0007C󵟽\u0002H0\u0012𧂖\u0016wU􈂲\u0007𘠵cr>􈬊\u000eL2􂰷d\u000f\u001e\u0012)3P5%𪻀b\u000f+ry\u001bV)e褬􆏵\\\u00046k\u00125N𗜙􉭽㼰]􁠅􈸉\u0003\tRmj4\u001a\u0019yh𝝮@\u000b𧥥𐇓Au*\u0017󲭬El\u0008\u0006z5𫧞𬝧CtvX𦱗<P3[`i𐩃𫅯S􏴰4%L𗾄 zᾈ𭢻\u0019}:M𡽔5𭿀Av8OXk\u0001𨹺QO\u0011\u000eB亯𥥹sk􌣆𤘘#􈊭(k􊒭Q噝\u0002.𬯭A􇄑\r\u0000􋹨^m􁹆\u0016{{i\"HzO\u000ej1\u0018\u0012IｒK􆄱aoe\\󶣢ᴚpEw\"\u001d\u0016󴻢Zd󷕿G\u0007󼜒\"&Q\n嵼􆝚i􀴽g(\u0008🗝5T{􍧷gS\u0012z:%=\u00073*𔗝𐄊𪥒I#􏈣􅂼i\nE츏\r\u0002DQ\u001b\u0019~v/\u0001y>5횛󾵦l\u001fi󰙿Y!V\u001d󰜁\u0010󰟍﹆zy\u0001W􊗜C6\u0015硡r/w𠉪j"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_12.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_12.json
index e70cf2f88d0..a44811b6754 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_12.json
@@ -1,3 +1,3 @@
 {
     "password": "N巏􋴆𥍪6;\u0010\u001b󰲵p\u0000\u001e\u001d󽅝s􄼟𭖍#󽳈=þ癘C\u00162%1\u0002\u0015\u000bo󱌑|p\u0018#\\𡩲|𪫧럓\u0014\u001b7\u0002y.[\u0010+7y-𢡻\u001aJ󶇽𞤋\u0011X\u001dA𧏩􉙳s푕/𗫸蛜⢕𫦓􆣄H𝛘繜G?ac{󽜣;\tg􆪧44\u001d\u0006p\u0008_VG^'=\u001fT,T_>ࠬ[\u00105󼩬|e6n𔕏X\u0015썗\u001b𘊵󾕈𮁬)𮙐g\u000cY\u0019D󴜿墾W)Cᆥ􇖇>\u0002%\u001dN󵴿􁴺y🄑𧌝KOuZC\u001a\u0016𢐶b🢭^=􆨕<'|Pyi\nSCq𤾨􌮙\u0005跖tbce\u0017 \\)x{%䯵󺲨𩡑\\Ws\"/ U/V~!\u000e?􆥔󴮨廣C󸤒轙$􂊉Z2p􅩶`󺞺Q𛱸M:䇒\u0012䍡(\u0016>k贾抱v*+\u0006󶂃<4漀G1~󾄉Ej󽧿􀨚Ồ􋎮0m}\u0006󶤅\u0001􎫘U]q\u0008􍤴N:􁼜󿦁qX󳄥<􍉽v\u001dxf󿹿o󾳋􄣓o!J0<\u000c\u0018H󿳢c􅒌\u0019.\u001fa\u0003:\te6D𫊥(𤅞V􊋊\u0011􊞶G\u0012+\t\u0008󾐌័rt𭎊f]\"\u0010P慕\\\u001epο.抢y􃄼\u001e󲙫 > J\u0006\u001d􇁩\t\u0018w_u\u0004SUK\u000f絭\u001a0eqO냣6\u001c北ﳪ$Gi3WrR3}\u0015x𑴛\u001c~艟O*+𘕼'r칑H𬩂}ꣶjnhc\\X\u001c􄃼𪿶w\u0015\u001c8g􈹧󼻃盾\u001e\u000cc|*@T{c󿤾R9ᄾWyx\u0000B𨤛\u0008󴋕\u00175PP%󳭱芽Ꜷ䞴퀸e3􈩊\u000c#p\u000e\u0007nj3E\u0015Z\u0002\u0002𫰖\u000bJT\u0014\u001c\u0000c07[熯:;uX󳍎󹬤󶗙\u000f\u000f\u0017j;Ox􊔘<𣮚V𧳥)a󽬕F􃏭𘑫\u00119𪨯{\u0003\u0015\u001enhY\u0007s􎨣781\u0011𭅏6𮨛𨁙?E\u001b5;ZP\u000f\u0002𓁗赧.\u0011𤾋*=劦 \u0004󻴔p@_czئ\u0006󵦎%𡞤9𢶻}P5𥡻\u0000󴙡􋧋f\u001c\u0004\u000baZI|,SW\u0012k􎌇ꁒ43\u0006c\u0001\u0010y\u0007W일𮈀!᱅kj`)󺑄\u0017O~3S\t\u001b󶊤6?vK\u0013u|\u0002𑚰􌝤󵱮\u001bp\u001c􃸙81𤴓*準=Y级毊MS󹎶@cchi\u001bHBpd󶿋x\u000b\\맻j\u001c󾎵J\u0003C)􀵓󲘒询s𑅕D|$x65\u0004UX𮨆\u00141=fn𗭮󷳧:\u001a1(󷢵􋛥X𣒁\u0007v8<Xz-㛪(󼴡㬠,𩑻\u001c\u0002W\u0010\u0007}_爛􋻺󵻌LFs^\u00147\u0006g)I&a 8𤅪\u001aE944\u0013􈜚\u000e~𬴀󿅖3\u001b,>\r"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_13.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_13.json
index cf441312905..d1e9e4c436b 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_13.json
@@ -1,3 +1,3 @@
 {
     "password": "膨\u0018mf>67Q>u\u001c󼏅󷘍e\u0014^TX}lUk5\u0019\u000f􃕍𬲂󴺱󸱑𧶥-\u000bcw3\u001fa\r(e\u000f\u0002>Hr\u0003\u0019R𪓬)TC􈌑g3h􀽗밶BT\rA]EZZ󱯑ቇ𭲕躾=9'𡸬􍩰#0\u001cw8y𝒏^\u0004𫭑􈾨𮗑沛0oZ4𗘮4b1󻳲!{n\\dꐌ'u󿷸3nk@e𤘚+<;\u0006MA𗹑O0;Zv]\u0013I1\u000f7f𭩼<뽯E􁧄󵢁r𗓶㲍\u001dqZDU궊𘇗󹴼P􌫼\u001a𘗜"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_14.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_14.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_14.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_15.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_15.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_15.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_16.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_16.json
index ced1e3287c4..3686e88dbbd 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_16.json
@@ -1,3 +1,3 @@
 {
     "password": "㳥9󶡃\r\u0004\u00199ꊱZ 4\u0015P𦌨q􎚧꺖I1K[:E\u0001󱟼\u0015m4Zu𨦰7<\u0000@FM\u0002W𨩊1󰒛O 󻎰\"\n𣤼\u0003PI/\u0005띕7\u000f'C􇦃PcJOz箼4ng&􇑋3Z嵄\u001bg8_𪔒\u0001F`\u001e󱐥𠃶F$힟𦺚qAUfmY\\2A\u0019s]:,Rw\u000e\u0012\u0004+Cs󿆩_biqB(o*-o\rir𗑜􂣖{\u0013Z\u0008𩒺:4􉗯燜\u001d𠮔󰩰󷥙꧅𧌏Q\u0003Q- \u0019\u000f.󰔏\nlw\"\u0014,껁\u001b\u0011\u00180K􎎐R\u0002ICH󿤔`𠠀|-X肧㯚NX\u001a)m坑h0\u0011%\u001d䩺D2wἈA*5+FN6\u000f𡾧FN𧄺蜬f1#z\nX𪶩pBf\u0000ꇼV`n4\u00180t\u001c\u0018Q\u000b𣲶i/pEqW􂼺𭌏'f\r?􏖈\u0006􊾯𐦒a顏w\u0016􄄋R󾕚\u001eB\u0003?𗔞MW󰃾\t𗒙󱠵𩼚o峨𔖐󶗆i󸉐@𧠠챞󶒄/2=eG犌\u0010𠺳\rAK\u000c\rqN=\n2诤𩦴l8𩵼􅓂&󾡰-\u0018\n@y􁲐󴢾\u0013F𮪫𠻺:[\u001co\u0012𪑯\u001b챤{\u0001;\u0018䬿\u0000fꩽ$ILgeS=*\u000b쐥\u000e\u0007`L"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_17.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_17.json
index 56fce75971b..9ad90d5b9b9 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_17.json
@@ -1,3 +1,3 @@
 {
     "password": "\u0015$elꚻᎷ@󽚙xUC돿\u001a󰒒 󼪒⸇\u00052\\sB\u00144R󹎋6=􋊟hkp\u0017>fA*gw3=h􆛱𝇐Djj3Erk\u001e\u0015Zt'􋈞be􄠮k+.2󼒘\"\u001e_\u000ec\u0015'?6󸸳\u000cSY􀀃󺫦k\u000c\u0005󴱼𤌓\u001f2􌫆2\u001fꔟ\u000ba8Ở\u0004Xv[T\t1h󸧱󶖂\u0015𢿧{\u0010{(Bj𫠾\u0010P=N􇊗𢤮\u001b["
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_18.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_18.json
index 653a3772777..ee0c497b9a3 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_18.json
@@ -1,3 +1,3 @@
 {
     "password": "\u000e􇞳,i።잜Nb0󿿝[;螑}􎒩jN\u0002\u000c\u0008\u000c6Sd󻠌\u0003Fe􇿘$\u0011A􉇑Am\u001b\u00089\u001aD{'R\u0003􄚿\u000e𔑔lᘟ{P_\u0013i󵹼􃃛\u00151oa\u0018\u0001ꔤ)gB\u0006𠐊[𓉁𤄫Z\u0000{󸍦\u0012𠮎𧫴>􈫹\u0002󵆤󵇒d\u0019C𤩛J𬾒%< \u001a\u001d𮃭\u0004!B􋔛X􏒚𠞏r@𘕦󺼼󽊓䳪$`Ua?kW^\nK𦢭'\u001a;\u0002L𥬌}\u0007h蛈w$\u0007𝁊ty󶊁匞@W&#3󾥥󻼒%㿖vYN@\u001fF\u00103퓽(42\u001fC&󷏶{u𒇈\u0008*\"󺥖/bw\u0016pU+i\u001a󾜰\u0000+\u0013󼪈P09􂷋WVt~Cyꗜg\u0001Cy􅡴C]\u0008兖PVy\u001cB5\u0014W󹉎I:\"𧤢3X1T,5􅄿𥫆\u001ar󺥭<+0]\u0004E_𦅐7:,󾧩<\u001d𭴣燹_􏒟𩠑\u00076CP􍬐~_?a_|𪧉􃀳+󷥔󳊾\u001fBR\u001e\nC󺝹b9􄆕ng󲺇7􍛍Ox󿯸:\u000c1쒈&T\u000cAH󷌰e\u000eq+o󲊒\u001a􏻛\u0003P}h𭑺蹁\u0005p逛q$I𪠚[󺫆$󼳬!􄮻\u0014co\u001f7'X󽹐牦[|𫷶<V\n\nZYd\u00129@\u0010󽎪얿𓃢\u0013-M\u0005󷸲􂘭6\u001bd󺹍:􆹛%n\u001ce𥋘$\u0016𥚥\u001e\u001b\u000f\u001a,s-\u0011􌓥Ey,󻶠[떑J\u0014\u0007-:Od\u0002M\u0010kQ}\u0004􃻌\\𥝋Z􃑨jS埾ﶺOC(S|B<\u001eB행C+9\u000c趒o4􈺔𧗵\u0015\u0016\u0007􌩙l💇𑑇y􇃒􍠕b&\u0011𠴓\u0010𬷦󺊔qp􀯋𥃌\u0003}+4󷜶.\u0002\u0015,勘k>w!网(?燪]𖢣Q𑰕𗇕\u0018󺢕?댔E𡚢~􆫾\u00052RN'K+𡃨ᇼ\u0012Q_떔𮒌𧸼\u0014d􊙪iI#-86,諷B󽓔p*Y󷗃uKK󶤼Q󿞾z諨x=t𗰖P秆(9\u0003Xe8\u0019_bb|V\u0016F{$\u0003v\u000bEy\u000c𨄠\\~P}󹃷3\u0003W󹬕V\tvt8𮍥􀒁`%\u000c\u0007-{b扵􈱦?\u000b𣥤]8i厂k+kMW\u001b\t𪀧A\u000b8M\u001f𥐧nH郝\u001a􉬡M􁴓\u001c\u001aEP󿻍耔=]󴲋pV6􉋾.姟\u0012ﱘ𡘥􃰲\u0005b𧴓\u0000\u0016\u001a󹫮\u001aP𧲦􅀲.0𭐮𘟳􉗓1B|a󻏊䐓Z􌰒i󺗝\r&\u001d𠚌Ao􌸴隔􋋶0,󴚆󰈍2􂋣䉸\u0016􀘆󲶱u{0V'b48~Rd93\u0013\u0000 d曡:𢔷T氟6\u0001\u0010|\u0018󻮹r𡪆_H𣧎\"\\;􈹁􍿉)𨲘,_𦠢{}_%yQ1\u001b7^_𤉨\u0017Rct#𗔊\u0014ZH􌧾􎙾/󿲅C=)\u000eb7`\u001cK𨓋\\~wബ𗃧6\n󰑬l􆑻J맍aD󳜜)z\u0015\u000e䩈\u001aG3gX𨞮􌡭:\u000fଃ>3-\t\u00072\u0002󲈱\n%\"𛈸J􇵾)8觘𘗰q\u0016􂷆ka󷱳\nbQ󶝗􍫮\u0008n+4􇓂_\\Y_+N\u000en󷙆\u0000_\u000f8+r\u001d0\"\u001a(so\u001e𖧆􌈘!𪺀\t\u000br~N)>z\u0010p󾩟4%\u001d\u001c<\u001aM冰z􏄲d)OyH􊧯s󽘄\u0019zo􋃌\u0011l4t\u001e5=\u0002䖶g\u001f^1d𨛠*S\u000c㧵]𭲋e`<𢑦f\n9\u0000\u0002Y>P𒀽db0MJ0/󽂋&5#\u0015_d]X\u0016\u0004:f::k𣰭㯑􅛋𧨚g(%%$d𩄎xh{6l\u0019`"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_19.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_19.json
index e441ad8e5e6..6fd6b7c8b8b 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_19.json
@@ -1,3 +1,3 @@
 {
     "password": "🨅L\u001ct􁕯\u0019aig=󾜗dVJ7T\u0001𗘥Z\r\u001ey\u001b_󲮃.\u0014\u000c|#󺇲1(@\u0016\u001a-]􅟖N|\\B{\u0001\u0019L\u0003𘎐M􅌁󵕂7i\u0002𧹦F쉅e~H(&qR􎐜􇤽S/\u0016\u0002_8'Gya4\t󶅑\u000fb\u0004𪆂Iﶁ俱𦠄:󼌳mA&}[􁊰\\H\u000e^􀕺{b.N\u0018\u0006M.奁𠧝,󸄈𡎥v*𨻒x85S𣳘퀃)|B'\u0006\u0004)3ie􀴜\\eq^L\u0005N󵵫J8ᠫ\\!𧌿~󿺻)𫀈󹚴\u001dNu􍬢􈯵d4\u0016'2𝣍m}7烈O\"\u0013􁃹V\u001dfM;Hdz\u0000xꥐ󺓝\u000c𤒶\"N󰼘0#\u0014Wccw󱁫굩#6\u0013T8*]\u000e\u000fu%䏮w>\u0008\u001e\ngiKb\u0013􈿼~ily\u000b#<f\u001a~𗥃\u0012GD=\n󱛵3+𥩫𬛊\u0017볳􁳼l]ꩦ{EP𠽢D5\u0016!𐆘\u000b\u0016\u001dH&𪋉62𤋣Lh桿\u001d\u001evB􂥿N\u0005!𭏓1V\"󸮂mk{􄎸n\u0008􍨦\u00195p\u0004G\u0018H󳗂󷟥Gy󼛞N\u0008𗣟󱦙H\u0014􁅉6\u0002\u000fjF󺪲\u0018eccj󿾖B𠨬󹊄D🌐𥩎𩤯𡴋󰹫#p;f쌦𮝎\u001a=L8wZ蟹el\u001d\u0016i\u001aM\tY\u0019H*\u00122L󷋦礖be'ma𣱾Q:%[d\u0010u􄪩[\u0001􎤕;T\u001eJ㞙H\u0002!0;\u0015\u001a4􅙘;a\u0006󰫨v;𥳳RB ᮋ\u000eHx\u0006BTF*\t􌑘\u0001𗁾uj􎽝GF𣵤􄜦s𬤌`^M\u00022􊆐G\u000b_zp\u001e5c\u000fe𘀃𐪇Ầ7}𠻿*󲶇\tP\"3 P澺tV\n渀,%W\r\u001e\u0000􁎅'lS\u0007GrK5\u000f53\u001b􀽾𧼯a[`ZV\u0004ov\u000cb\u001aN<9;D]:Ჺ:\u0003검/㤉􇘋*\u0007P>HD𗈍sG:*q8􍔲F􈇓e\u0010\u0010᭢똽:𪫚X#󰙵𩵳t\u0018{:𮌒\tV@+A\\T𩻙\u0017t𩐂p\u0002>􂴕\u0010󴻘\u0014T+I≿}\u0004y?f\u001c?*􁰮`󻫤󶶒󻒢𬩧𪦏^􊊩q䰾\u001e𝘻\u0015𩥂!3vvq\u0002Gұ\u001aprsw\u000fsWq􅉠헇\u001cSNsA\u001b𢕍ꌟꡊ>𨷁 ij*U/\u0003\u0005\u001b|\u0006;󺊎􀣜Y4zE[춑5騆0#ig\u0007.=旓󰍸~\u0001@kF;&E𡥤Id9􉭩\u001d\n<%𨳍t#T􊎬1\n\u0007cU^V@󰼹􌟂􂬀\n4\u000c_\u0016𑜁𪫎*𨆘𫿅HঞQN@{뜂􇟷\u000b\u0004󽡊\u00054p\u0002UG+\u0019\u0013cy󾨔\u000b\\\r{𨿱󼻘[=+aKCx'鹩QB;a1\u0003@w3-쌕d3I)\u0016]􍸩𫏼H\t+)헲\u0001!{GH𩏵𧿃$E\u001b󶯽S<:rO*w!1!)\u000e\u001c􏑜?x`\u001a\u0008󱩉g{𬈙\u001f􂕧\u001f[|7𩩽$󷨞;h𥰔󱧉\u0006􄅉􀍈MO3"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_2.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_2.json
index e4f31b6cc6f..79299e4ec18 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_2.json
@@ -1,3 +1,3 @@
 {
     "password": "acb]K𫞞e\u001fB^\u0001;\n𧼄􅥫%\u0005}嵆\nyvi+\u000eh\u000f𤚝䉁|4\u001f󼌃*sdj/\u000c󵤑<V\u001b𢇧<@$􄅂!􊌮RbE7,!pi𩶬􆳸 𤝂􈉕\u001f\u0016s\u0019k\u0002]S𐛎z뜻\u000e\u000f\n􍔝O𣵛^BNuS\u0002\u0018X\u001c\u0016.^󾋟㙕𫿰󴒑&\u0005濬/\u0012e$鎅\u000eT𨟕屚\u0007|\u001a􇟉ࣛ[)+m㏌9󵲵h~X󶙭\u0019/S􏡉ﷴ􌩣.y󾜢m7ᲙXL$!0|s𢔗<#\u00020\u001e\u001a\\M\u0015􈣯𨳱j\u0008^1\u0002:6yR􁕮-,&l\u001eY􅕘@\u0014-?Xm󾨉\t}F:) t􍉺\u0005h820󽁎)x/$X\tY;\u0012\u0013 󠅘|𑒂UDB.𥗽}1􊨘9瘕􀷍𫃊j󾌛E\u0007#lR\u0008d\u000fH%黼eT󰐕\u001f_\u0014\u0015\u0000`N.\r에􂛂\\[􃟆GqN\u000bA_􉹏oOf\t\u0017\u0000]\u0017w]\\\u0012\u0007b𗁧sbwOn4^G𨰒𦔲􂡚􋗲\u000f󳩅沃q󷹛?ROC\u0015@Zvb \u0008@𬩗%󼊃{{r嚁-\u0004S?OO>\"󹁀m􆩒󱝡b[3g\u001e􇩻$Y\u0003c;e\u001f仡,\u0001; 'U𔐜`XFC1𡁥󺪇\u000bZ98gD2𝪆j󳉵K𭲞\u0014tcCSU󸊨@P\u0002^*\u0000g䬕A0𗲠>QT󶢜\u001d0O𖢼\u0018jHH^\tD\u000f󾌨𪝎z\u001e\u0015j􂈙\u0000􁬊J<rMFM \u0001\u001fa󺙚D\u0014\u001b\u0007󠄝X􊹕𮇶=\u001b𣎪3r\u00180md:\\𬈿\u0019D𤝣\u0015𥳼}[4\\F^𬉩􎻤TsM\u0014-5r)󵑛\"l)ZDࠜO󺃑\u0019n\u000e5\u0003f>Sm􇜍􈎡􃾓𩩯􍎍,\u0011\\oL\u0004\u0015\"kdJn\u0000𗁔󶄽\u0012\u0019\u001cM*-\u000cE𝝤\u001f􍽸{-z󿣋qჅ􃷬oꎕh絭q&𡊸l󺉃F󹗛vCCw\u0017\"𣹸:\u0015&싄Zb\u000e6t\r\\ㆫ憭u\u000eG4\u0003'􏀗\u0001n􊱙䥙\u001bW􍮣\u0008nW=\u001a#􈲥\u00049쎄|k\u0008\u0013$\u0012􀥡,X􍚓IpgT鷊􉉌\u0002PNz\u000b8𤼞Rt\u001c􈎺\u0007𥤝󼓠W7fL\u0019xTh\u000b*􎌯v!T􇩧\u0008]OM}}=;\n󺍏􈶕N)I𗬨󸈙Pe\u0019󸈒F󺔨Z\u0010vL󺨛R\\􉀽\u0000}󳥌RS23\u001b󾐻伓墴C}s~惹􌮨*30#𝞌󹰟.l\u001c𐀽𨁑𬏯T뤇􆋡d\u0002t䫩f􋒕􏾈,-󼠬𝞜^o𞄦3c\u0014@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_20.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_20.json
index 96aa0d616d1..9d6a11f522c 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_20.json
@@ -1,3 +1,3 @@
 {
     "password": "𘏄.7|󱧒󱥗\u0016~\u0002\u001d\u0007\n𘛨j:Fu(f}F𢵲M<<ꓟH󺬣:󹟑A7Db󼁨\u0018HDS𗨑LG𣭸^D=􄞓􏫃,N:𖹸𬘮\u0008PN𠙥\"\u001220𗳀\u000b󹡕󲷡c]O􀤾󹝆:d𝠮󵰟>c\u0011\u0013!p5e󳚌\u0001\u00132\\\u000b~􀆹Ixu4E'_\u0017䩍\u0006\u0013nG\u000f 𢅯t6^󾭗^􎇮󽚾$7\u000fo虉􁲰󴵟j\u001f|`\rX\n􏨘mfJ𑋔\u001e􌸌􄝘󳌿𠼙􇗂\u0006\u0013􊍭𪴡jR[8-lIu\u001bj$􏕅􋆂\u0015XB􂣠y(䑩E<􀌏\u0005~B󴒷\u0012SLP\u001b#𡀦\u0015\"𤵺W*\u0015>𮣀d󷁎I𠂥:DiJ█og6P'􌨘\r%󸚮tSnw􉍲 l''\u0006󴀳畼~嘥𠽲9w>夆=U9\u0015a=𪤒󲴠4\u001am􌤽􈱐L\u001el\u0001`\\3󿜤qG:\u0001B*8U \rAZ\r𘎷G\u0001hU)/𮉍\u00174\u000e􃭅]\u001dEQ󰮐\u001a.󼍅\u0017􆆳J+󶮞\u0010ee>4Y%/Ezh􅟆.5𢻤]\u000e󼌭{>\u000b\u0014\u0000󸬋=I\u001b\u0000\\p\u001e􉵩`r\u001b'\u000e⸷Ga^󵵈;\u0010XP\u0019;^𪿘\u0011󲱛4;𑄸\u000bg:w뚢f\u000b󿇪i\u0019ya\u0004湛RSt.Vw𭣈𢎟Tr}hTw\u000f𫏞\n$)󸅎^q\u0006CAZK1WR\u000b\u0003y\u001bN𠣺􅄵oV\u000f\u0018$u}9;;:5𡊅U垬HA\u001a􂔕v󹕶MevꔅR}l董U5\nHA\u0018\u0004\u0014=\u0017y\u001e}Hny$\\󻁒󲃽#􎠿􍢔]󳔕>󰘦w}􈣢`k\u0005<z~𭫍\u0015􌢄{\u0011\u001a(f\u0007-􁞷s󴨦Q󷦌\u0002\"04iA\u000f𑠚J\u0018`\u0012-𝤘󿈨L􅉏|\t<+N\u0006\u0019r\u0000𡆯F20l^)-OMUi􂂰l󹶞\u0006\u0004\u001d󲕞N􋌧r𩂓􇦥)xj]\\󺳣\u0005􎛊𦥯c\u001f22􈀻􃭖G\u0004\t𒓨J\u0016%YHM6%Zk\u001e\u000c󽮚<k㭚󴔬w\r\"a\n\u001f𗍖]:禖\u001bS󷀪4W\r~Sv󶖃.5Bt1*)!C𮅆x^\u001e}\u0003s\u0018qa󴑤\u000b3#K멿W𭴶q\u001fU\u001c󽝡B\u0001C􏜡\u0004/cq9𫓆\u000c]􌄅}􅅌\u0015o􎱌h󵾳\u0008\\N\u001b/L\u000ch\u0016󸨻켌N󽬽T-/b\nr𪷬'己􃋎{Y[a닪c󼻦I\u0001ែ𥆠T𩵨\u0004}ZTMZ􊉒y8&\u0008𫮽oMDr_fd\u0010􋒭Orｋ\u000e󹲺\u0010V2\u0018𡸇𓃶@\u0006𤇅)󲁀Z\u000b󳶝cP_􂡄\u0019𒆡\u000b\\P8𮒁\u0002􇁀-{\tQ􏒹cjBo\u001c%r𠨶tb\"\u0002+􌽄\rHu\r쌬P\"\rHg𩽹2\u0007䶵􄳟脀\u0008𞺴Mb􁏹JX<\r*Y恖8M2+}𖩧&\u0011Nl`&Y\u0007􄳀gcV$𨘒]􃃘c`섐\u0001󿚚9\u0000[B9\">𫙴V\u0003􍿬\u001eAx~_9q>𐅻𮮮󸊾kd*붘5\u001aOn\u0010\\ns"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_3.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_3.json
index e03e2037f8d..dbfe5e84a47 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_3.json
@@ -1,3 +1,3 @@
 {
     "password": "\u001eAt}󺋫*墪e􂊨3'􀅃󰍐3\n\u0006𤥛.\n𦾰T(KLRbW7\u00007y𩛝S2hDRvXySE_𪂔􅭈\u0019 󸌃4\u0013:R=G󱄪=\u0001\u0005^󷸇u9h9^bk蕍~aVIJ🛤O𗮥fs\u001e𩪝󰾟I<􌳣O7)y𭁏\"&󱎭*\u0005\u0008C祿\u0010\u0015C<n\"[/\u0003H5}Z\u001dbQj*s3\u001c_􎧬\u0001𧏑󿅙󰿟\u0000\u0010bU&𡕻9b\u0019􌉋\ru󴃰)64-𤡎7\u0014T󰶲Xc+𥙰6>z(󶶉𮑗dnZ1\u0011󹯖i\t𧟴0﹌􋚬􂁢2ए\u0014\u001c^%}'󷤵𬸞\u0011𞲔&8Tca\u001f;󳝑#iM\ri04:lv\u0015u𬶍㦷$*X}𧊐*Y\u001e㎊\u001dO!􇑿\u0011G\u0002𖾒7W>􀰡\u0005𬙤\u0004\u001ey𨢾K=!ڨ\u001d\u001c􇋤n􈭴\u0004󿲼􋻽wvgh\u001dg)RrR\u0002󸤜,6%\u0016ZJx\u0013\u0006G/S>&娺5\\\u0004D?\u0017r\u000c@{𣴾96QQ\u00189\u001b\u0011𓈔\u0013\u0013:NXt\rNQ\t\u001d\u0019𭞮\u0016%󿡭󴺯<C-\u0014\u000es\u0018𬎍VlK\u000fv砷K04Is;VNy$􊳎vCh\u001do?\u0005f289\tN𗟳+2d\n#Q\u0010􏣰H_-M\u001f+\u0008OOf\u001d\u000f󽋶}b*V𠣵𨠈􂯧uQ0\u000bgl𫟍𘋁󶖡G𩮒􈛿\u0005n侈5\u0013\u000c'\u001c\u001b`\u0007\t\u0012 M`r􌓴玊B-Zf􋤱Z$\u0005g󻚲1b𠿜쾨%g𦹟\u0010SvG\u0004oI*v\u0008P/9X)@Mn\u001b⤪q8G𬂓\u001e󸵣󳣋@}:>\r𦐛𡱍n6a②󷄴Jl\u0008󺒔\u0015\u000fL)z𧫸@󽎁𫵪--󳎥rT띩pR\u0000IaW􊒑ᰟ4Z\u0000QR⃙􂶑!\u001c@𞤩\n<8C\u0012LGC󻑡p𒃨\u001b_􊠖\r\u001bL𩔵;z$(=wQ\u0004\u0013uN!&𗔤\u0003 GF|$\u0018q𣐾\r𑩓󿇠e\u001e\u0017󳕚f\u0001NM𘞶HL𤎓\u0011r&ZJ/\u0001Ჶ:\u0007ns𠼚#L\u001cUq\u0014Tc.󹷉p4[檷*\u001a떬\u0002\u0011~\u0017l$ᇁ䀒\u0013\u000e󾶍𥒅A𘪯L%`t\u000ca\u0018\r\u001b@\u0015𧉧y3.q\u0007j󶇘𡋕|\u0008tJ󷟢=\u0014\u0006Ve􆩰𐔞\u0001󾝳(<3#\nW𑙩X􉍁f\u0011\u0016\u0006\u000bN3\t􀹎^\u0016􀻟*􈏏T\u000fX󴼤🎊􇂆􌤯􏉣01𐅸⸄kID𣉷\u0008\u0007uᜪ[\u001aW𨰇nX䶋Fl)𦰤󷩇7ycD2SA䌒\r\u000c|牡p󽲆Z%^bO\u0008Ms/x􂓠颉\u0001X􇎶𤪂cs㳥\u0001㷀\u001e|q#脗*\r'\u000e!Cgᅵ\n\u0018sꄼ\u000en\u000b먒\"ම6偸.􅔪𪰘󱻆e\u0013𭛳󵊄Y󺁛9㵠R.h!4_|sG]\u001dQf\u0004𝝠󱃢M2𝌦dO3x\u0012}Xw珉auU`􉖽􅙴#𭺭\u0019%['􎅔fg棕\u00141𨂀𭽛j𣘏0􊞖\u0002z筹H>'H1>P𩫳-mn\u0001𢮹􉽡󴖖DM뭡l𩖣\u0004)x,Y_\r`mFB<󷚣.𦼪"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_4.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_4.json
index ea26b7b3ceb..15f7359367c 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_4.json
@@ -1,3 +1,3 @@
 {
     "password": ";:􈼒𢷧\u0003 m􂜂Y\u000c𤿯P󳷟~\u0016\u001fD󾢻.􍎩?U\u0006`ux5\u001c\u0010􈉰󷇍9>G\"\u0008X􌡈|Q\u00193􌛑𭍰,𨜀𨏎f󷋉󳺊􉓾䔕Tblk+#LLR}Jꏉ\u0004y}\u001caG;􈥯2tbJ^m!\u00141\u001b\u0011\u0004O3\u00031䰶􅶄.;lb䪒~i𛀯􈂰󱾗B}0𑨛\u0011\u0007𭃘𐰪j[O䕟u􇠘Rq􎷣T\u0018?,]\t􊖄w棒𢄱𫐢𩭥3]\u0012qS䁠r\u001eA暢,T\u0003b$\u0002\u0016\u0008\"\u0019\u0019\"x&\u000bOE9\u000f\u001bV/(󰔳跺󴣲@j {1HW\"R\u0003𩇟𗰔y^􀳂^6\u000bx]$\u0008!8ZI^W"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_5.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_5.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_5.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_6.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_6.json
index 0bd213d2ee0..b774f989075 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_6.json
@@ -1,3 +1,3 @@
 {
     "password": "ඟ/W`𥥿s%\u000bU<Mov󸣴|>􏦼/(ｩ􃷷'􀝱(𐘘k\u00072\u0013:l\u0002\u0007\u001cl\u001b\u0003🨷C/\u000e󰃩􊈃?舽3S\n@\u0011C|gY\u0008\u0006E\r2鬹i}󾒏 5\u0005/]p󴘄\u0012\u000f􉦦6@\u0011􎙥\u001b󸗟􌚢V4\"\u0004.󴠏􅪼$)Pt􁵙\u0013rrqfzO#{\u000e(n_PB􆬠g\u001a\u001dvGOH/A\u0019>2ꌡ o\u0017&\tAu󱙇1}\u001e]DG\u0012䳍f󱳹\u0012S5k􏈻ℌG\tG\u0017(𠪿5-𝀧􄚬󷖥_󴲜\u0019,􌌚󺉝h𗳼vu9J\u001f\\)\u0016a𡠜\u001bh\u001c\u0007LB!󾫩󽎺𝟐\u0005\u001b􆄴U\u0004󿱿Y}zA麃i\nU𗐮󵿆ty\u00017[󷶫_?0꺨H\u0011r󺝛!1F9Q`Am𮠣G𑰡󰁗:\u0011󸗇W\u0010\u0018󽒑𨱿\\\u000cW𡬍m􃐓\u000c\u000b聇󰱤췣L~\u0017O\"􄲵󵃒缋󷣒`𣢷􎛍S𩔁tj𐦲a9먼l𦠅\u0017\u001a𣷌x%[􁅩c/Z-X\u0012g\u001d|\u000fs󷹄*ax*g🈦Z𫵓m 􅔜d𝈇\u000c2i\u0007r\u0002U􀡭\u0017rk\u00018\u0018+\u000cJ\u0002-:\u001d𢿷ꝃB4\u0005\u000ebe!|3>F􈅾籛􏦠dp\u000co|\u0005}􌥒.\u0008󶎳\u0007C$\u0019\\[h닋􎉁%S$l懄Hv􄕯L\u0012\u0019m༱8]f󱾀(𭜄⏁􏗜\u0007UL) #镦𠲠0󿕬᧺D(󾶻𣏄\r\u000bgRb%􆮁\u0018]`|aU\t?󻹑^%\u0002Q\u001c𭩿 (0𬏩G^xbS)𨐹t\u001f𪇝a􋀎̙㟕\u0001\u000fVL\u0005䚢󻳡{ 𐰗\u0003󷂋𭨕`\u001f\u0006 a/䎕􇕅38􃼣k\u0015\u0004kTmCq😠𐚮Zy,\t\u0007\u0018𤤥C\u000e\u001dZ𨜠v&\u0013\u000c\u0005)g𛁢\u0018TM1N|2s焪i\u000b?(x􅠥𠃡𢗹\u0001h-=D=\u0004T􂫱e􇜴B~\u0013𡢗\n􃟴|+&ᢉr𫫫z 𣐖􄭲f+\r𝧲\u001c𨅒䀧䒓\u0015'\u0017f2u45󵔾i\u0006\u0003\u0013챒󴦋\u0019D@󰀖\u0001\u0015\u0010錌\u0000R-'Y\u001e\u0008`~nlS{Ak\u0001Y𪿟󿐶\u000e𢤡\u001bcQS􀫊𨴓􆪮b甤屈ZC6􇦍g\u0005r%𡔦󼚻臯\u000eu|.=4)S\u000c􋗀\n\u00129\"TE\u0003󺥚|CO󶄢𦠈N:\u000f􍸊t\u0002O􏣺\u0019/P\u0010U^𥣆0􇐂F4M􅗀@U𝜘𮃎5DEZ\nT<h\u0001Q󸱯\u000f4󾐛Llp$􀖪\u0006󻕃\u0012􋓓\u001aj#Rl𬲥\u001doeCM𠛓𣶃Mv,mK-|\u000f𫏻Tj\u0017𣖰`𩫮\u0001𢤇\u001f<𝤋8&:𧠀􋤞󷇨>􀲕𣵆\u0002U󷂋//[󷯔귮󱭫al烲\u0001C𤛞\\܌𠊋剘\r󾠷QWP>7𡶴ᓑT;hs*󿽊I𠥧􋭸k=𖩈􊫿N\u001a4𬁊m\u0008\u0004\u000b}H\u0019\t{{𣵬x1L\u0013\n#靨x,`\r\u0005&\r󷃃\u0007b愺𝡣-󷟾iQ\u0010󱽜\u000fo轼󾓟⇧0\tᔔ\u0000T\u001d𠕵D\u0010.gOBt󴅅\u000e\u0008󿏪JNBJ2\u0001𛊒%M\u001c\u0018k$\u0003o7*\u0008HQ\"J\u0011\u0014󾼴9+消y􂨠\n焪5\u001d󶋓\u0017qV\u0016pE\u0005\u0003\u0017\u000bp-:c6m:\u0014'\u0007nS\t𖬓\u000f󹈭\u0008Bn𘞻𩍻𫽟kbU𨯡a2<􄥵D3p\"&q󰎰@\nV\\O'rE\u0011􈨒\u0008\u0008Mm\u0002\u0015􄙮"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_7.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_7.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_7.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_8.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_8.json
index dcfa1d9e16e..8b4da3fe750 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_8.json
@@ -1,3 +1,3 @@
 {
     "password": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_9.json b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_9.json
index c3ef20b400a..cb16a293fff 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberDeleteData_team_9.json
@@ -1,3 +1,3 @@
 {
     "password": "O􀜹eam\u0017!\n\u001a𡋼􌏇l􈝰J\u0006􉌺T􌈑M𑵸𧍍󼝣󱌥𮓯g0\u001dL\\y\u0012+9n󳪢%9'\u001fGz󱘘^\u00101f􃮙\u0000,5𥴯I-D!5p@\u0004?D&䟍|𫷬𒉨(Y僸\u0012\u0019\u000f󼄎e\u0001-`=􊷷f􅗣O𢫗\u0014􉞹M\u0016\u00120Q􊑙X𧼹v\u0013\u000c:2`dP*vm𡃈9\u000f􇘅󿩈A􂫊앬Y\u001b\t\r~\u0005􉶿aDOI甫\u001f\u0013\nUB,郾\u0018\tT\u0018_걀I\u0006D>\u000f_􍃿\u0006\u001d$牍\u0014󸩦\u001cjLBiW(w𮟏\u001a\u001fRe~J>/rH}儶\u000cM𓊅\u0017Z󶩽󼯫hW󼎙}x󹘩&𢵹𣪯m&􀡐佐\u0007G󵋐󸹗\u001f[0`\u00170*󴭳pw􁎭y𩍶\u000f.M0􉹨ꒅ􂄺 􌠂3􃠰'o$\u001dj\u0019𦈓\u000083\u001a\u001d\u000f\r\u0014\u0003B􈚤\u000f4N󽣾􇙙8mb\u0000&󱢿󳺂P1𡵷{\u0014pO椷\u0008i 嵛5􍓻 5]󴪦F⥃q䋺V9d'I󻰱z\u001c𒒴e𓍰𥞼𭬨$2^Dcy$7d c\u001f\u001d\u0010쏠p`j􊰆%\u000eP$f\"4𦧮`𧇭􄃵\u001cv\\rUN󱘄[\u0014\u001e\u000f|\u000cP2q,r𪯭􃇭󸭾𮁰)_W􏈯Fu\u0001i=\u0003&W󵴋𢭫􈊳􅀥\u001f_􋡜etw􍻘N\u0002󿐱\u0001X0f\"\u001e𐬔󼁇x󴝔@𭘡\u0010􆭉(!%6峧A􃬷E󵈎\u001e󻦫E\"uyI3\u0001$K\"晖𫝆\u0002?\u0016O\rQ󽃔Gg5櫤􃨔\u000e<MzeV(6J\u0011\"SNhh>m<\u000f\u001b\u0013v󽲝𝄘lAO俨 .H.\n\u001d[;pZ\u0004ij\u0004d\r\u000cr8􍝕􏵾􌽍⼹8\u0006JS4Ud~󵦪ﰡ*𢍕k`T\\B\u0014\u0015)#=􇎌gz5H~h{'S󺹪\tJ􅎏󿛭\u001b<\\z}eV\n􇭺럹󳂁O)抆b\u00160W\u0005𔔈\"ꍚ󴩞𩹕i\u0003\u0007OV􅲈f[7Gm\u000f)\u00165on\u0006\u001f\n􍌞h7\u0003c􇴼A𠳊傺RbD\u0008<𨀿qn󲶢&􏐰e𡁓~j􋬜􎀚J*绀o\u0019􋕁_먾wf墣󴲊𦙣𨏌-\u0011𭞭\njh7\u000c\u00085\u0007%Cs둘cr\u001f+J9􇖯:忼􎙡cZ0󳢘􃎸𦻸\u0010𠳔\u001d${X\\􅰆:𡃧𥲫jz󳻾𤂖hWC\u001cQ8u`\u000e􏆢󠅋B\u0008Ay󱮋/Kr󶪩\u001dꐞFa<󶛽Y7\u0014A􈞒\n\u0016CsU\u0004􊮽\u0002覑󳕃󻁯\u0005\u0013UX3\u0003coﶄ{\u0001k\u0017)P\u001b.T灟IliCpx1L\u00130C\u000e]𧑌\u0010f.;m,긴\u000e氕\u000e𨞭j\u0004>𛇧𥊠(qK6𤜸\u0017al󿭩9cT󹂷\u0000a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_1.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_1.json
index ee0e2864619..9f9bec87036 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_1.json
@@ -1,4 +1,4 @@
 {
-    "members": [],
-    "hasMore": false
-}
\ No newline at end of file
+    "hasMore": false,
+    "members": []
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_10.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_10.json
index 4d88f2617ee..e7f748c5b3c 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_10.json
@@ -1,225 +1,225 @@
 {
+    "hasMore": false,
     "members": [
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T04:44:28.366Z",
             "created_by": "00000000-0000-0000-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T04:44:28.366Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T06:22:04.036Z",
             "created_by": "00000001-0000-0000-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T06:22:04.036Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T12:10:11.701Z",
             "created_by": "00000000-0000-0001-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T12:10:11.701Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T21:54:05.305Z",
             "created_by": "00000000-0000-0001-0000-000100000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T21:54:05.305Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T00:26:06.221Z",
             "created_by": "00000000-0000-0001-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T00:26:06.221Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T20:12:04.856Z",
             "created_by": "00000000-0000-0001-0000-000000000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T20:12:04.856Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T23:35:44.986Z",
             "created_by": "00000000-0000-0000-0000-000100000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T23:35:44.986Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T07:36:17.730Z",
             "created_by": "00000001-0000-0000-0000-000100000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T07:36:17.730Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T19:36:57.529Z",
             "created_by": "00000000-0000-0000-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T19:36:57.529Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T19:45:56.914Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T19:45:56.914Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T13:42:17.107Z",
             "created_by": "00000000-0000-0001-0000-000100000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T13:42:17.107Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T03:42:46.106Z",
             "created_by": "00000000-0000-0001-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T03:42:46.106Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T09:41:44.679Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T09:41:44.679Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T09:26:44.717Z",
             "created_by": "00000000-0000-0001-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T09:26:44.717Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T00:40:00.056Z",
             "created_by": "00000000-0000-0000-0000-000100000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T00:40:00.056Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "enabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T07:47:20.635Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T07:47:20.635Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000000",
+            "created_at": "1864-05-09T15:58:21.895Z",
             "created_by": "00000001-0000-0000-0000-000100000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T15:58:21.895Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T19:25:51.873Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T19:25:51.873Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T03:19:55.569Z",
             "created_by": "00000001-0000-0000-0000-000100000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T03:19:55.569Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         }
-    ],
-    "hasMore": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_11.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_11.json
index 86b8d8c3811..17271461a87 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_11.json
@@ -1,135 +1,135 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000001-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T06:08:50.626Z",
             "created_by": "00000000-0000-0001-0000-000100000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T06:08:50.626Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T08:23:53.653Z",
             "created_by": "00000001-0000-0000-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T08:23:53.653Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T16:28:42.815Z",
             "created_by": "00000000-0000-0001-0000-000000000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T16:28:42.815Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T11:47:57.498Z",
             "created_by": "00000001-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T11:47:57.498Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T17:22:07.538Z",
             "created_by": "00000000-0000-0001-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T17:22:07.538Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T19:14:48.836Z",
             "created_by": "00000000-0000-0001-0000-000100000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T19:14:48.836Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T14:53:49.059Z",
             "created_by": "00000001-0000-0001-0000-000100000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T14:53:49.059Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T10:44:04.209Z",
             "created_by": "00000001-0000-0000-0000-000100000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T10:44:04.209Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T23:34:24.831Z",
             "created_by": "00000001-0000-0000-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T23:34:24.831Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_12.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_12.json
index be21d092046..8aaf00ee325 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_12.json
@@ -1,45 +1,45 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000001-0000-0001-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "enabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T15:59:09.462Z",
             "created_by": "00000000-0000-0001-0000-000000000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T15:59:09.462Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "enabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T00:27:17.631Z",
             "created_by": "00000000-0000-0000-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T00:27:17.631Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000001"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_13.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_13.json
index dafd96c3413..d8be327088a 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_13.json
@@ -1,35 +1,35 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000000",
+            "created_at": "1864-05-10T04:37:19.686Z",
             "created_by": "00000000-0000-0001-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-10T04:37:19.686Z",
             "permissions": {
                 "copy": 0,
                 "self": 512
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T13:22:20.368Z",
             "created_by": "00000001-0000-0001-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T13:22:20.368Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_14.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_14.json
index 053d3324c15..032d7cc660a 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_14.json
@@ -1,155 +1,155 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T07:01:56.077Z",
             "created_by": "00000000-0000-0000-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T07:01:56.077Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T09:34:46.900Z",
             "created_by": "00000000-0000-0000-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T09:34:46.900Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T10:40:24.034Z",
             "created_by": "00000001-0000-0001-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T10:40:24.034Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T10:17:53.056Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T10:17:53.056Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T18:37:38.894Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T18:37:38.894Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T06:25:10.534Z",
             "created_by": "00000000-0000-0000-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T06:25:10.534Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T02:42:16.433Z",
             "created_by": "00000001-0000-0000-0000-000000000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T02:42:16.433Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T07:25:18.248Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T07:25:18.248Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T15:31:36.237Z",
             "created_by": "00000001-0000-0000-0000-000000000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T15:31:36.237Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T15:23:38.616Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T15:23:38.616Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "enabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000000"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_15.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_15.json
index 36a050382ea..486f8cb1f67 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_15.json
@@ -1,55 +1,55 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T20:33:17.912Z",
             "created_by": "00000001-0000-0000-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T20:33:17.912Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T09:03:59.579Z",
             "created_by": "00000000-0000-0001-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T09:03:59.579Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "enabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_16.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_16.json
index ee0e2864619..9f9bec87036 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_16.json
@@ -1,4 +1,4 @@
 {
-    "members": [],
-    "hasMore": false
-}
\ No newline at end of file
+    "hasMore": false,
+    "members": []
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_17.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_17.json
index 6329f933bc5..4f67a818e80 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_17.json
@@ -1,55 +1,55 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T10:04:36.715Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T10:04:36.715Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T03:02:37.641Z",
             "created_by": "00000001-0000-0000-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T03:02:37.641Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T23:21:44.944Z",
             "created_by": "00000001-0000-0001-0000-000000000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T23:21:44.944Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T08:47:48.774Z",
             "created_by": "00000000-0000-0000-0000-000100000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T08:47:48.774Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_18.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_18.json
index 3adee903e85..d9e908ad0c8 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_18.json
@@ -1,55 +1,55 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T17:44:12.611Z",
             "created_by": "00000001-0000-0001-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T17:44:12.611Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T05:14:06.040Z",
             "created_by": "00000000-0000-0001-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T05:14:06.040Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T05:24:40.864Z",
             "created_by": "00000000-0000-0001-0000-000000000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T05:24:40.864Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T20:09:48.156Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T20:09:48.156Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T20:09:31.059Z",
             "created_by": "00000000-0000-0000-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T20:09:31.059Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_19.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_19.json
index 7243519fa08..f6d2f880417 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_19.json
@@ -1,15 +1,15 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000000-0000-0002-0000-000200000000",
+            "created_at": "1864-05-09T19:12:15.962Z",
             "created_by": "00000000-0000-0002-0000-000200000002",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T19:12:15.962Z",
             "permissions": {
                 "copy": 0,
                 "self": 4353
-            }
+            },
+            "user": "00000000-0000-0002-0000-000200000000"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_2.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_2.json
index 41949da35c8..39da2452101 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_2.json
@@ -1,15 +1,15 @@
 {
+    "hasMore": false,
     "members": [
         {
-            "user": "00000002-0000-0000-0000-000000000002",
+            "created_at": "1864-05-10T10:05:44.332Z",
             "created_by": "00000001-0000-0000-0000-000000000002",
             "legalhold_status": "pending",
-            "created_at": "1864-05-10T10:05:44.332Z",
             "permissions": {
                 "copy": 0,
                 "self": 4160
-            }
+            },
+            "user": "00000002-0000-0000-0000-000000000002"
         }
-    ],
-    "hasMore": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_20.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_20.json
index b2fb51ada86..413abfa9f37 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_20.json
@@ -1,25 +1,25 @@
 {
+    "hasMore": false,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "enabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-08T15:41:51.601Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-08T15:41:51.601Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         }
-    ],
-    "hasMore": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_3.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_3.json
index 6679f10a239..7f0204a7dc6 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_3.json
@@ -1,75 +1,75 @@
 {
+    "hasMore": false,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T06:07:36.175Z",
             "created_by": "00000001-0000-0001-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T06:07:36.175Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T14:28:10.448Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T14:28:10.448Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T16:05:37.642Z",
             "created_by": "00000001-0000-0000-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T16:05:37.642Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T13:06:20.504Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T13:06:20.504Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T16:37:10.774Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T16:37:10.774Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T04:36:55.388Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T04:36:55.388Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         }
-    ],
-    "hasMore": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_4.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_4.json
index 415cd478346..08629f70752 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_4.json
@@ -1,25 +1,25 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000000-0000-0001-0000-000100000000",
+            "created_at": "1864-05-08T16:05:11.696Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-08T16:05:11.696Z",
             "permissions": {
                 "copy": 0,
                 "self": 1024
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000000",
+            "created_at": "1864-05-08T07:09:26.753Z",
             "created_by": "00000001-0000-0000-0000-000100000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-08T07:09:26.753Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000000"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_5.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_5.json
index 2f0a55c6a15..505dbeb1b48 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_5.json
@@ -1,45 +1,45 @@
 {
+    "hasMore": false,
     "members": [
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T23:10:04.963Z",
             "created_by": "00000001-0000-0000-0000-000000000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T23:10:04.963Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000001",
+            "created_at": "1864-05-09T15:40:17.119Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T15:40:17.119Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T00:40:38.004Z",
             "created_by": "00000000-0000-0001-0000-000100000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T00:40:38.004Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T07:30:49.028Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T07:30:49.028Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         }
-    ],
-    "hasMore": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_6.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_6.json
index 4815e43c061..023889b56a0 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_6.json
@@ -1,105 +1,105 @@
 {
+    "hasMore": false,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T17:07:48.156Z",
             "created_by": "00000001-0000-0000-0000-000100000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T17:07:48.156Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T00:04:10.559Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T00:04:10.559Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T10:39:19.860Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T10:39:19.860Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T13:40:56.648Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T13:40:56.648Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000000",
+            "created_at": "1864-05-09T12:13:40.273Z",
             "created_by": "00000000-0000-0001-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T12:13:40.273Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T13:28:04.561Z",
             "created_by": "00000001-0000-0001-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T13:28:04.561Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000100000000",
+            "created_at": "1864-05-09T02:59:55.584Z",
             "created_by": "00000000-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T02:59:55.584Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T22:57:33.947Z",
             "created_by": "00000000-0000-0001-0000-000000000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T22:57:33.947Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T01:02:39.691Z",
             "created_by": "00000001-0000-0000-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T01:02:39.691Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T13:39:38.488Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T13:39:38.488Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000001"
         }
-    ],
-    "hasMore": false
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_7.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_7.json
index fdb58d6363e..6d11863e107 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_7.json
@@ -1,35 +1,35 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000001-0000-0000-0000-000000000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000001",
+            "created_at": "1864-05-10T03:11:36.961Z",
             "created_by": "00000000-0000-0000-0000-000100000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-10T03:11:36.961Z",
             "permissions": {
                 "copy": 0,
                 "self": 256
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "enabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_8.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_8.json
index 623ab7bb02d..289e1508feb 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_8.json
@@ -1,115 +1,115 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000100000000",
+            "created_at": "1864-05-09T07:35:03.629Z",
             "created_by": "00000001-0000-0001-0000-000100000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T07:35:03.629Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000100000001",
+            "created_at": "1864-05-09T00:48:38.818Z",
             "created_by": "00000000-0000-0001-0000-000000000000",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T00:48:38.818Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000100000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000001",
+            "created_at": "1864-05-09T06:12:10.151Z",
             "created_by": "00000000-0000-0001-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T06:12:10.151Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000000-0000-0000-0000-000000000000",
+            "created_at": "1864-05-09T03:45:53.520Z",
             "created_by": "00000001-0000-0000-0000-000000000000",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-09T03:45:53.520Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T17:14:59.798Z",
             "created_by": "00000000-0000-0000-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T17:14:59.798Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000000",
+            "created_at": "1864-05-09T17:51:55.340Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T17:51:55.340Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T01:38:35.880Z",
             "created_by": "00000000-0000-0001-0000-000000000001",
             "legalhold_status": "disabled",
-            "created_at": "1864-05-09T01:38:35.880Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000100000000",
+            "created_at": "1864-05-09T18:06:10.660Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T18:06:10.660Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0000-0000-000100000000"
         },
         {
-            "user": "00000000-0000-0001-0000-000000000001",
+            "created_at": "1864-05-09T07:30:46.880Z",
             "created_by": "00000001-0000-0000-0000-000000000000",
             "legalhold_status": "pending",
-            "created_at": "1864-05-09T07:30:46.880Z",
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000000-0000-0001-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000000",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "disabled",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000000"
         },
         {
-            "user": "00000001-0000-0001-0000-000000000001",
+            "created_at": null,
             "created_by": null,
             "legalhold_status": "pending",
-            "created_at": null,
             "permissions": {
                 "copy": 0,
                 "self": 0
-            }
+            },
+            "user": "00000001-0000-0001-0000-000000000001"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMemberList_team_9.json b/libs/wire-api/test/golden/testObject_TeamMemberList_team_9.json
index 4b65b3b1b6f..619ce6be084 100644
--- a/libs/wire-api/test/golden/testObject_TeamMemberList_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamMemberList_team_9.json
@@ -1,25 +1,25 @@
 {
+    "hasMore": true,
     "members": [
         {
-            "user": "00000000-0000-0000-0000-000000000001",
+            "created_at": "1864-05-08T22:16:59.050Z",
             "created_by": "00000000-0000-0001-0000-000000000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-08T22:16:59.050Z",
             "permissions": {
                 "copy": 0,
                 "self": 4
-            }
+            },
+            "user": "00000000-0000-0000-0000-000000000001"
         },
         {
-            "user": "00000001-0000-0000-0000-000000000001",
+            "created_at": "1864-05-08T21:43:37.550Z",
             "created_by": "00000001-0000-0001-0000-000100000001",
             "legalhold_status": "enabled",
-            "created_at": "1864-05-08T21:43:37.550Z",
             "permissions": {
                 "copy": 0,
                 "self": 1
-            }
+            },
+            "user": "00000001-0000-0000-0000-000000000001"
         }
-    ],
-    "hasMore": true
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_1.json b/libs/wire-api/test/golden/testObject_TeamMember_team_1.json
index 762c2a000a2..1e46efbda1e 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_1.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000007-0000-0005-0000-000500000002",
+    "created_at": "1864-05-12T22:05:34.634Z",
     "created_by": "00000001-0000-0003-0000-000300000004",
     "legalhold_status": "pending",
-    "created_at": "1864-05-12T22:05:34.634Z",
     "permissions": {
         "copy": 64,
         "self": 6720
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000007-0000-0005-0000-000500000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_10.json b/libs/wire-api/test/golden/testObject_TeamMember_team_10.json
index 232c6bca3ec..a0be5d79ca5 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_10.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000002-0000-0000-0000-000100000006",
+    "created_at": "1864-05-03T19:02:13.669Z",
     "created_by": "00000008-0000-0005-0000-000000000002",
     "legalhold_status": "disabled",
-    "created_at": "1864-05-03T19:02:13.669Z",
     "permissions": {
         "copy": 0,
         "self": 6
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000002-0000-0000-0000-000100000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_11.json b/libs/wire-api/test/golden/testObject_TeamMember_team_11.json
index a06ff20e588..830c4ce822a 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_11.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000004-0000-0001-0000-000400000007",
+    "created_at": "1864-05-04T18:20:29.420Z",
     "created_by": "00000003-0000-0001-0000-000100000005",
     "legalhold_status": "enabled",
-    "created_at": "1864-05-04T18:20:29.420Z",
     "permissions": {
         "copy": 0,
         "self": 4355
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000004-0000-0001-0000-000400000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_12.json b/libs/wire-api/test/golden/testObject_TeamMember_team_12.json
index 9cfefc04c97..3f870a4e1ae 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_12.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000002-0000-0006-0000-000200000005",
+    "created_at": "1864-05-10T22:34:18.259Z",
     "created_by": "00000005-0000-0001-0000-000300000003",
     "legalhold_status": "pending",
-    "created_at": "1864-05-10T22:34:18.259Z",
     "permissions": {
         "copy": 0,
         "self": 1024
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000002-0000-0006-0000-000200000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_13.json b/libs/wire-api/test/golden/testObject_TeamMember_team_13.json
index 58f8759a210..50307d9fd49 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_13.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000006-0000-0001-0000-000800000006",
+    "created_at": "1864-05-06T08:18:27.514Z",
     "created_by": "00000000-0000-0003-0000-000400000007",
     "legalhold_status": "disabled",
-    "created_at": "1864-05-06T08:18:27.514Z",
     "permissions": {
         "copy": 1,
         "self": 513
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000006-0000-0001-0000-000800000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_14.json b/libs/wire-api/test/golden/testObject_TeamMember_team_14.json
index cbf7e9afb1b..0b77b1ae283 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_14.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000004-0000-0000-0000-000300000007",
+    "created_at": "1864-05-12T15:53:41.144Z",
     "created_by": "00000008-0000-0000-0000-000200000002",
     "legalhold_status": "disabled",
-    "created_at": "1864-05-12T15:53:41.144Z",
     "permissions": {
         "copy": 576,
         "self": 582
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000004-0000-0000-0000-000300000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_15.json b/libs/wire-api/test/golden/testObject_TeamMember_team_15.json
index 373ede6ab11..cf937951ac9 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_15.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000005-0000-0006-0000-000800000006",
+    "created_at": "1864-05-04T06:15:13.870Z",
     "created_by": "00000008-0000-0000-0000-000500000003",
     "legalhold_status": "enabled",
-    "created_at": "1864-05-04T06:15:13.870Z",
     "permissions": {
         "copy": 2048,
         "self": 2048
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000005-0000-0006-0000-000800000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_16.json b/libs/wire-api/test/golden/testObject_TeamMember_team_16.json
index 90228edb818..864a56f67fa 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_16.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000000-0000-0008-0000-000200000008",
+    "created_at": "1864-05-10T04:27:37.101Z",
     "created_by": "00000006-0000-0000-0000-000400000002",
     "legalhold_status": "pending",
-    "created_at": "1864-05-10T04:27:37.101Z",
     "permissions": {
         "copy": 0,
         "self": 1026
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000000-0000-0008-0000-000200000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_17.json b/libs/wire-api/test/golden/testObject_TeamMember_team_17.json
index 9fca79e4b6e..74e9974e826 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_17.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000006-0000-0006-0000-000500000007",
+    "created_at": "1864-05-07T23:22:37.991Z",
     "created_by": "00000006-0000-0003-0000-000700000004",
     "legalhold_status": "disabled",
-    "created_at": "1864-05-07T23:22:37.991Z",
     "permissions": {
         "copy": 16,
         "self": 1392
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000006-0000-0006-0000-000500000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_18.json b/libs/wire-api/test/golden/testObject_TeamMember_team_18.json
index be148745b8b..6ab87ec08c2 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_18.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000005-0000-0005-0000-000200000008",
+    "created_at": "1864-05-15T14:48:55.847Z",
     "created_by": "00000007-0000-0008-0000-000500000006",
     "legalhold_status": "pending",
-    "created_at": "1864-05-15T14:48:55.847Z",
     "permissions": {
         "copy": 4096,
         "self": 4648
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000005-0000-0005-0000-000200000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_19.json b/libs/wire-api/test/golden/testObject_TeamMember_team_19.json
index 624f04fca90..82fed0b844b 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_19.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000003-0000-0002-0000-000200000008",
+    "created_at": "1864-05-12T01:37:35.003Z",
     "created_by": "00000006-0000-0001-0000-000200000008",
     "legalhold_status": "pending",
-    "created_at": "1864-05-12T01:37:35.003Z",
     "permissions": {
         "copy": 4096,
         "self": 4324
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000003-0000-0002-0000-000200000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_2.json b/libs/wire-api/test/golden/testObject_TeamMember_team_2.json
index 2ce9f16c854..d10b6c1d764 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_2.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000003-0000-0000-0000-000500000005",
+    "created_at": "1864-05-03T14:56:52.508Z",
     "created_by": "00000000-0000-0000-0000-000000000004",
     "legalhold_status": "disabled",
-    "created_at": "1864-05-03T14:56:52.508Z",
     "permissions": {
         "copy": 0,
         "self": 4128
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000003-0000-0000-0000-000500000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_20.json b/libs/wire-api/test/golden/testObject_TeamMember_team_20.json
index b15d1ef6aa7..3cc2be61bd8 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_20.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000005-0000-0007-0000-000100000005",
+    "created_at": "1864-05-04T22:12:50.096Z",
     "created_by": "00000005-0000-0001-0000-000800000007",
     "legalhold_status": "enabled",
-    "created_at": "1864-05-04T22:12:50.096Z",
     "permissions": {
         "copy": 0,
         "self": 101
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000005-0000-0007-0000-000100000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_3.json b/libs/wire-api/test/golden/testObject_TeamMember_team_3.json
index c83001cb76d..207b3a8d3fe 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_3.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000005-0000-0003-0000-000400000003",
+    "created_at": "1864-05-06T14:02:04.371Z",
     "created_by": "00000000-0000-0005-0000-000200000007",
     "legalhold_status": "pending",
-    "created_at": "1864-05-06T14:02:04.371Z",
     "permissions": {
         "copy": 64,
         "self": 86
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000005-0000-0003-0000-000400000003"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_4.json b/libs/wire-api/test/golden/testObject_TeamMember_team_4.json
index 0592ec54dab..ab5d913384c 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_4.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000008-0000-0005-0000-000100000006",
+    "created_at": "1864-05-12T15:36:56.285Z",
     "created_by": "00000006-0000-0002-0000-000500000001",
     "legalhold_status": "enabled",
-    "created_at": "1864-05-12T15:36:56.285Z",
     "permissions": {
         "copy": 4096,
         "self": 4128
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000008-0000-0005-0000-000100000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_5.json b/libs/wire-api/test/golden/testObject_TeamMember_team_5.json
index f84e8092293..1b2961e82b5 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_5.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000007-0000-0000-0000-000200000001",
+    "created_at": "1864-05-07T21:02:57.104Z",
     "created_by": "00000004-0000-0002-0000-000300000007",
     "legalhold_status": "pending",
-    "created_at": "1864-05-07T21:02:57.104Z",
     "permissions": {
         "copy": 514,
         "self": 706
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000007-0000-0000-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_6.json b/libs/wire-api/test/golden/testObject_TeamMember_team_6.json
index 5cca9580d89..93430b84749 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_6.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000006-0000-0007-0000-000800000005",
+    "created_at": "1864-05-09T03:11:26.909Z",
     "created_by": "00000005-0000-0007-0000-000800000000",
     "legalhold_status": "enabled",
-    "created_at": "1864-05-09T03:11:26.909Z",
     "permissions": {
         "copy": 0,
         "self": 405
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000006-0000-0007-0000-000800000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_7.json b/libs/wire-api/test/golden/testObject_TeamMember_team_7.json
index 66f986a42e7..25c895f7133 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_7.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000007-0000-0000-0000-000200000001",
+    "created_at": null,
     "created_by": null,
     "legalhold_status": "pending",
-    "created_at": null,
     "permissions": {
         "copy": 0,
         "self": 5266
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000007-0000-0000-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_8.json b/libs/wire-api/test/golden/testObject_TeamMember_team_8.json
index 82ea0d40348..c1bf966bb05 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_8.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000005-0000-0007-0000-000300000000",
+    "created_at": "1864-05-05T18:40:11.956Z",
     "created_by": "00000007-0000-0003-0000-000400000003",
     "legalhold_status": "disabled",
-    "created_at": "1864-05-05T18:40:11.956Z",
     "permissions": {
         "copy": 0,
         "self": 6448
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000005-0000-0007-0000-000300000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamMember_team_9.json b/libs/wire-api/test/golden/testObject_TeamMember_team_9.json
index d919e3683f7..30f44931ee5 100644
--- a/libs/wire-api/test/golden/testObject_TeamMember_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamMember_team_9.json
@@ -1,10 +1,10 @@
 {
-    "user": "00000008-0000-0006-0000-000300000003",
+    "created_at": null,
     "created_by": null,
     "legalhold_status": "pending",
-    "created_at": null,
     "permissions": {
         "copy": 32,
         "self": 36
-    }
-}
\ No newline at end of file
+    },
+    "user": "00000008-0000-0006-0000-000300000003"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_1.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_1.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_1.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_10.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_10.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_10.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_11.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_11.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_11.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_12.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_12.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_12.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_13.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_13.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_13.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_14.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_14.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_14.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_15.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_15.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_15.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_16.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_16.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_16.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_17.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_17.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_17.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_18.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_18.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_18.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_19.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_19.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_19.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_2.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_2.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_2.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_20.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_20.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_20.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_3.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_3.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_3.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_4.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_4.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_4.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_5.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_5.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_5.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_6.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_6.json
index ccd0e765326..4d5a198dd9b 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_6.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "standard"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_7.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_7.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_7.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_8.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_8.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_8.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_9.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_9.json
index 6870378be02..64e3b2361d2 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibilityView_team_9.json
@@ -1,3 +1,3 @@
 {
     "search_visibility": "no-name-outside-team"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_1.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_1.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_1.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_10.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_10.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_10.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_11.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_11.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_11.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_12.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_12.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_12.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_13.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_13.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_13.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_14.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_14.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_14.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_15.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_15.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_15.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_16.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_16.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_16.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_17.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_17.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_17.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_18.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_18.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_18.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_19.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_19.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_19.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_2.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_2.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_2.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_20.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_20.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_20.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_3.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_3.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_3.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_4.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_4.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_4.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_5.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_5.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_5.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_6.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_6.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_6.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_7.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_7.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_7.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_8.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_8.json
index 1a74a79dcfd..99d6719ab0a 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_8.json
@@ -1 +1 @@
-"standard"
\ No newline at end of file
+"standard"
diff --git a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_9.json b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_9.json
index 5e9d6a19539..ecd14a00e63 100644
--- a/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamSearchVisibility_team_9.json
@@ -1 +1 @@
-"no-name-outside-team"
\ No newline at end of file
+"no-name-outside-team"
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_1.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_1.json
index 18720175e2b..b5350e59d4f 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_1.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_1.json
@@ -1,5 +1,5 @@
 {
     "icon": "\u001cH\n0󽯝L\u001b􏰉\u0011􇴗MT\u001ek\u001bC𒅔􈽏S~X󲾏\u0006𬖀~Lm괼\u0016𬀚6\u000f\u0010=􇰹􂅱U8h\u0003=𣆨􇦗\u0002b7Q\u0005t\u000b*|I{Ps𑿟W,\u001b\u0013m5ᒊ\u0004\u001f𭟧I\u0013󿅉X8\u000c\u0013a2(Ic􈨥t\u001dS\u001e\u0014M\u0017\u00104;0)j\u000e\u000e2yN\u001a𮟈L\u0012P$8𡚷V󼚗U𑚷𬿋\r\u0008󺅖\u001c𥨋bx㣂3;[Qb!i뤥J|ca$0n-\u000fAZ9\"9\u00175=𤌆\u0007\rZ\u0019n󽇀\u000cZevj}$`ᄄn\u0002\u00018𨽨8􁆁)|\u001b\u0011󵙵\u0019X8eLZ\u0012⡙U\u00034aI\u0003972GQF\u000eU*F󿵯\r3󾑘?d󳄚u<\u000c\u0011t𢥽\\gᅄ)c4꼵eP󺆳^\r_𦓫h󼶧Z\u0006𨁭􉫨\u0005\u000c{Y\u0016p\u0000𮓘&'\u0000\u001d*\n-\u001e\u0003\u001e[",
-    "name": "@t􍰳K􍒠\u000b藥\u0003e^󰖰x~U;^􉎤\u0008\u0016wn\\aS󹨾g\u0018󷺬\u0005'+\u0012~yJ𮢟%y𛁁!#3\u0018tZ􋞹[&{?\u0016X`욢f\u001c=j\u001f󿡧+d\u001b0𛇳쓨Ft`U𗶂g𦯯􅯺󱄤F\u0007vEBjP𥘻𗅆c𢭕󾐒e𫂿\u000fL𮐓􇸥GW󳃛I(XBV8\u0003\u0004󸞑C霥􆣚\u0000,𮘶/P󴒻[y\u0015Z \u001f즗c\u0014X`%􄙚8@\tP>em󠄵E\u0001",
-    "icon_key": "󹬄d^\u001d\u0005\u0018𨁾ey{𠌍􇘀q8󱞆^\u001d\u0007(\u0015春1𢺽(U!w\u001fqC\u0000#g\u0018=󴠦󾁀\u000e𨫿zEJ\u001d御𧱋𠮔\u0002e0󴜡D\u0003\u00089x@`VN7𨧰i𑦣uq\u000fdjL\u001c\u001d\u000e􈍚<\\􇎼%.\u000b0K䯄;5h\u0010flQr\u0004\u0010%󻮢x\u000c\u001cL&:/IK𐘻:𫰖E􏇍n7~󱜫*tOI3\u0001\u001e󱭒pp-㿤吺󽥚@O𬋭\t9]27󲺠U􄸼짎3[􋂅B9𬳺+\u0015S󲇞\u0018~\u001d92sLo􃍻t\u000f🀦𡳔2𝞪,\\𠚩􏦢ⰹ^Q𣼝W헃dY型\u001d𠣐N𒍒;\u0001󹗩'𨽕𨚇|𤰇(􋹽]\u001d!􏨪$\u001f𥤴)hloBRpT􆳝\u000c<"
-}
\ No newline at end of file
+    "icon_key": "󹬄d^\u001d\u0005\u0018𨁾ey{𠌍􇘀q8󱞆^\u001d\u0007(\u0015春1𢺽(U!w\u001fqC\u0000#g\u0018=󴠦󾁀\u000e𨫿zEJ\u001d御𧱋𠮔\u0002e0󴜡D\u0003\u00089x@`VN7𨧰i𑦣uq\u000fdjL\u001c\u001d\u000e􈍚<\\􇎼%.\u000b0K䯄;5h\u0010flQr\u0004\u0010%󻮢x\u000c\u001cL&:/IK𐘻:𫰖E􏇍n7~󱜫*tOI3\u0001\u001e󱭒pp-㿤吺󽥚@O𬋭\t9]27󲺠U􄸼짎3[􋂅B9𬳺+\u0015S󲇞\u0018~\u001d92sLo􃍻t\u000f🀦𡳔2𝞪,\\𠚩􏦢ⰹ^Q𣼝W헃dY型\u001d𠣐N𒍒;\u0001󹗩'𨽕𨚇|𤰇(􋹽]\u001d!􏨪$\u001f𥤴)hloBRpT􆳝\u000c<",
+    "name": "@t􍰳K􍒠\u000b藥\u0003e^󰖰x~U;^􉎤\u0008\u0016wn\\aS󹨾g\u0018󷺬\u0005'+\u0012~yJ𮢟%y𛁁!#3\u0018tZ􋞹[&{?\u0016X`욢f\u001c=j\u001f󿡧+d\u001b0𛇳쓨Ft`U𗶂g𦯯􅯺󱄤F\u0007vEBjP𥘻𗅆c𢭕󾐒e𫂿\u000fL𮐓􇸥GW󳃛I(XBV8\u0003\u0004󸞑C霥􆣚\u0000,𮘶/P󴒻[y\u0015Z \u001f즗c\u0014X`%􄙚8@\tP>em󠄵E\u0001"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_10.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_10.json
index 7bdfe432886..f93a378ce46 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_10.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_10.json
@@ -1,5 +1,5 @@
 {
     "icon": "𗍽m\u0010,6\u0000\"`􉴇𦎶*]4]\u0002𦶑󽡧\n𤇷;q$^V􀣭𬭄𐨝jG$𫋽S$fO[i=$􄿨\u0003\"􃵬􈑀𝣼;i\"@\u001d\u0012𝧟ඩIpA\u001a󲡈󿏺\\􉣊jnu𮪰:<\u0016\u0019\u0017'\u00189Q􅅵󶑌𩾴𗱐\u001fp%\u001f._b[􏂵75Z􁽬6􃐽g\u0003󶖠+\u0019\u000b\u0017𭯢Z:f\u0014\u0001I7#<//󹀐\u001cd\u0005u\n1g $󱋊$+WYr\u0019􊗥狟\u0019Z7\u0004\u0006𫇬)󿵧ધB< R\u0012\u0016l|S\u000f\u000c2xgtt\u001aD\u0002\n&𮕕󺁟𭥳4𥇿-F\u000eq􉦨\\(􍤳꿉󼞉QWbSg󱿨󸁖\u0004􉎇\u0017$A?㕊es\u0006􋫝\u000b􄒭𐘅\u0002N\u0005",
-    "name": "s󺞑D􋅃\u001c@?\u001bZ\u001e[\u0011w*!?p\u0013󺕤L\n\u0008GI\u001d",
-    "icon_key": "8󹘇\u0002.󴳪.G毰􀿗\u0006在\u001e\u00062h汉c(􏠬S󲣌j󷭩\u001f]􀃧Vrh%:\u0006\u0019u9z줯!枎\u0011\u001d\u0017Q:𡬁􏖝􇿿൞\u0019󺖚\"$q\"􉎹\u000c1OcD𥑗\u0010𣒿𪏾pc\u0011𬡜7\u0001TE<󺵖cVC7})9n|2es\u001b7I=h𓃎[$\u000b#\u0007X\u000f;󲗬Rr􊜗􍱿\u0016\u0002UP얛9\u0004𬚐F7$\u000bs\u0011􀊛𨚏𨑨퐧o𫥚\t\u0015u婪,􎚽􋦸@|@uJ\u0004\\TT\u000fveg-𮍸H"
-}
\ No newline at end of file
+    "icon_key": "8󹘇\u0002.󴳪.G毰􀿗\u0006在\u001e\u00062h汉c(􏠬S󲣌j󷭩\u001f]􀃧Vrh%:\u0006\u0019u9z줯!枎\u0011\u001d\u0017Q:𡬁􏖝􇿿൞\u0019󺖚\"$q\"􉎹\u000c1OcD𥑗\u0010𣒿𪏾pc\u0011𬡜7\u0001TE<󺵖cVC7})9n|2es\u001b7I=h𓃎[$\u000b#\u0007X\u000f;󲗬Rr􊜗􍱿\u0016\u0002UP얛9\u0004𬚐F7$\u000bs\u0011􀊛𨚏𨑨퐧o𫥚\t\u0015u婪,􎚽􋦸@|@uJ\u0004\\TT\u000fveg-𮍸H",
+    "name": "s󺞑D􋅃\u001c@?\u001bZ\u001e[\u0011w*!?p\u0013󺕤L\n\u0008GI\u001d"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_11.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_11.json
index db6a30fa82e..c4a9ccbee1d 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_11.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_11.json
@@ -1,4 +1,4 @@
 {
     "icon": "2n70\u000f\\B\u0017$\u001f\u00029䅩􊌊e\t裺\u000c𦅐􈯓󶂤iv𘢺QE\u0017I\u0013\u0003𬇨5]P|\r.ဉB:6\u000f󰁷\u0000sL8S2j󸏆𐘳zH0H\u0010\u0015󺫿\u001f|7O𧦱&\u0006𬧂ᚄ󳟩\t\u0006㩋􅼐B[횰댅DXsz𫊲S\u0010p[F\u0007g爀𦅏\r􍀧\u0010󻑈$~⇟0𬪁\u001b'_<쓔𗊋b􏯢5P\u0002󵙢",
     "name": "\u000cu^\u000c\u001a\u0004\u0010]􍜦􅾵B\u0006\u000e􆄙4cS𢲾:\u0014`摶\u001b9\u0013\u000eF??Ev1,\u0017~M\u001ez{☁\r?4𭃻s䬐􂵼ᾊQ\u000c\r}N)\u001417G\u000fS􍪁ǿ+A󰚅􇍇M;7𘘙P􊏭)v!_&\u0011𢪖𝓗凷􋰇*b􀞛~-剨\u0015w􇔆(\u0017ݔ󳭨\u001bm삝\"b𓇵r&\u0013i贕\u00115\u000c&\u001f􂋞5\u0011\t贞\u0016-(^XI\\\u0014p]}\u0002rL􍋞gW`􀨺\u0007|\u0010P)iAꇡ\u0017\"`\u0008"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_12.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_12.json
index 8b408e06acf..849a4b0c01a 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_12.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_12.json
@@ -1,5 +1,5 @@
 {
     "icon": "8\"􋺅􀈞CGBmk󱕠r𢟎{\u000b@󽓤\u0008􇅺𭎹-od\u000e\u0019ꘙzꕨ\u0019=\u0019j􏠓𠅏xC\u0013Y-|1x\r,BOb\u001c\u000e_-𗈻󳮻_An\u000b\u001d󷓂t짇:QL𒂽󻑍/wQ\nY\u001a\"嚁\u0015G􍀧sJ@𤨀~\rf\u000c𤼈\u000f\u0007l\u00160𬾅~@jX;`0𨰋󾧬\u0007󼫤믲󾤅@:􂂱TfJ䡱37z2c[\ra􇽓漬\u000br{􁪆^\u0004 \u0012Y󱨌 Jz󿟙󿾭,𥀍?\u000bU^1;z𦾚嬗z{",
-    "name": "v􅰣!\u001fc\u0000F\u0003\u0014\u0010>\u0005)󵈦;󿏈\u001aF\u000b󱁼I\u0016g\u000cb\nXB37\u0012HHhO\u0013\u0007D\u0003\u001cmm𐂩W*󿐸d\u000b\u001a^󽌼ow𨮣&9𭕴B󸂽\nK!i\u0011􍘦\\𡝕󾸶𗑹4󾌳J8g\u0006􆶶𧿡􆔎N쩦|^􌂌@􅫆􋚼,Wi헝4\u000f\u0000`\u000f;\u000f=<?5󲁢􇤚,^f\u0016(\n􀳃e\rn⥆𪿃\u001d|Ryyz= (lTvJ[7k\u000b𩠗4G0𪆫<\u0005=􃖴RM^0\u001f<9􏗏k󵛘􅑱\u0003勩󽬑@&I\u001cg\u0011L'*\u000e2\u000e\u001etYZCdY\u001a~\u0001p<#.\na&G\u000eJteDn\u00061^\u000b0Z󷱻)HF𥳆rcu𨹥󾥃Y𣸢12𛁐\u000fW!󸪭?0Zy\u001a:󾵫󽤸󼼌\tTg\u0012#b;OzD쟊J\u0006􇺻Xo󸥙hJ󴡢P$8@",
-    "icon_key": "ifk\u000b􅩖;uNl(\u00193W\u0003;g\n󵸒􊴫\\'t@#U\u001cpqA$vLᛆ𒀿\u0015C\\􈎇T\u001eR\u001b{𠁕;\u0012󼖨춤󶶗\u0019p<=\t𠐕c􄚇&\\\u0019􈷳7\u0017T笱􇇢L􂟭IqYܲ󼘚>PK,\u0001􅌩<(3\u0006\u001fp􂠓e\u0015i^%c\u000eh􇤳%o\u0015𔐪􈱇\u001cE40u \u0007aR󻦥0<'~\"\u001b/􂯧𦷸[󿇳<\u0019H$LLV{\nfze\u0003j\u000c\u001b踰\u0006xoi\u0012~󺣯ϊy\rv\u000fM悍^X\u0008!锦\u0002*G\u0002m\u000bU\u0014\u0018"
-}
\ No newline at end of file
+    "icon_key": "ifk\u000b􅩖;uNl(\u00193W\u0003;g\n󵸒􊴫\\'t@#U\u001cpqA$vLᛆ𒀿\u0015C\\􈎇T\u001eR\u001b{𠁕;\u0012󼖨춤󶶗\u0019p<=\t𠐕c􄚇&\\\u0019􈷳7\u0017T笱􇇢L􂟭IqYܲ󼘚>PK,\u0001􅌩<(3\u0006\u001fp􂠓e\u0015i^%c\u000eh􇤳%o\u0015𔐪􈱇\u001cE40u \u0007aR󻦥0<'~\"\u001b/􂯧𦷸[󿇳<\u0019H$LLV{\nfze\u0003j\u000c\u001b踰\u0006xoi\u0012~󺣯ϊy\rv\u000fM悍^X\u0008!锦\u0002*G\u0002m\u000bU\u0014\u0018",
+    "name": "v􅰣!\u001fc\u0000F\u0003\u0014\u0010>\u0005)󵈦;󿏈\u001aF\u000b󱁼I\u0016g\u000cb\nXB37\u0012HHhO\u0013\u0007D\u0003\u001cmm𐂩W*󿐸d\u000b\u001a^󽌼ow𨮣&9𭕴B󸂽\nK!i\u0011􍘦\\𡝕󾸶𗑹4󾌳J8g\u0006􆶶𧿡􆔎N쩦|^􌂌@􅫆􋚼,Wi헝4\u000f\u0000`\u000f;\u000f=<?5󲁢􇤚,^f\u0016(\n􀳃e\rn⥆𪿃\u001d|Ryyz= (lTvJ[7k\u000b𩠗4G0𪆫<\u0005=􃖴RM^0\u001f<9􏗏k󵛘􅑱\u0003勩󽬑@&I\u001cg\u0011L'*\u000e2\u000e\u001etYZCdY\u001a~\u0001p<#.\na&G\u000eJteDn\u00061^\u000b0Z󷱻)HF𥳆rcu𨹥󾥃Y𣸢12𛁐\u000fW!󸪭?0Zy\u001a:󾵫󽤸󼼌\tTg\u0012#b;OzD쟊J\u0006􇺻Xo󸥙hJ󴡢P$8@"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_13.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_13.json
index fc8c9ee80af..3f1c6756ac9 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_13.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_13.json
@@ -1,5 +1,5 @@
 {
     "icon": "􍷳fO𡏘#s󿔌 e]+黡P\u001e􅂡I\u001a᳝k\u0008㵍\u000b\u0004'nY􀡱hc\u0001C\u0018=9I\u0013Z􂷊:DNj𒀾~{󷬷􍕖Cֲu\\6刬𤘱gZ􈣕\u0007\u0007􄵵𪱺󰡄v$9\u000fa\tAg)T}􉻻󱑬'\u001d􍉏ng}毦<\u0007𠵨􃄼s+󻤪􄨱`z[\u0018,\u0008:TX\u0015)U?\u0000 |𡨙xI\u001d𥭦S",
-    "name": "L\\\u000e7W󽚻\u001e\u0014S}\u000bj\u000c0,\u0007􀼞cz9󳭺𧪄tw𮙈x舋𫂯\u0011𬆛o+r;ntv\u0001t\u001d\r6􏤿G|󴈙S\u0008󾐓~eR9󺊘\u0004.9<􇾡\u0010\u0014掎󸘸HFꮀs텕𗡊i󿞹D$9M용駩'S􆿙5\u0005n\u001d󼶤:j(w(d\r􄶏\u001dO\u0008\u001e𩢬f\u001f󲈳Zj𩰨􎺯\u001aꋺ\u00198c􈄛\u0014`𤸓w*Cj-󸓄8{l\u00170#ꀀ)􆐵\u000b􅒀w!k𡉥󹢮ᬧ7󠇔𭸐x<銰0󴙳\u0006)󾍈( 󷪘K贂5ijLj\u000f𬲰zK𨭉c\u0007r􀝼󺓙{U+\u0010#𭱫2\rsH]\\'􈃳ㄐ#􂼦F>}jY󲧙:𬦖f:M󱿩􍚄󳁙#5𪃳\u0010𡿆*𘐵U𦃃\u0003\u0012U󰄳웾PU\u000b\u00021\u0008",
-    "icon_key": "i𨘿􈴫𑑘󰞀r𢽗\u001ciL\u0001)I\u0019\n9l>\u0001Pu]\u0000螗Q##\u0003𭔜\u0012"
-}
\ No newline at end of file
+    "icon_key": "i𨘿􈴫𑑘󰞀r𢽗\u001ciL\u0001)I\u0019\n9l>\u0001Pu]\u0000螗Q##\u0003𭔜\u0012",
+    "name": "L\\\u000e7W󽚻\u001e\u0014S}\u000bj\u000c0,\u0007􀼞cz9󳭺𧪄tw𮙈x舋𫂯\u0011𬆛o+r;ntv\u0001t\u001d\r6􏤿G|󴈙S\u0008󾐓~eR9󺊘\u0004.9<􇾡\u0010\u0014掎󸘸HFꮀs텕𗡊i󿞹D$9M용駩'S􆿙5\u0005n\u001d󼶤:j(w(d\r􄶏\u001dO\u0008\u001e𩢬f\u001f󲈳Zj𩰨􎺯\u001aꋺ\u00198c􈄛\u0014`𤸓w*Cj-󸓄8{l\u00170#ꀀ)􆐵\u000b􅒀w!k𡉥󹢮ᬧ7󠇔𭸐x<銰0󴙳\u0006)󾍈( 󷪘K贂5ijLj\u000f𬲰zK𨭉c\u0007r􀝼󺓙{U+\u0010#𭱫2\rsH]\\'􈃳ㄐ#􂼦F>}jY󲧙:𬦖f:M󱿩􍚄󳁙#5𪃳\u0010𡿆*𘐵U𦃃\u0003\u0012U󰄳웾PU\u000b\u00021\u0008"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_14.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_14.json
index 1fbb113ad49..f93c3fbc59d 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_14.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_14.json
@@ -1,5 +1,5 @@
 {
     "icon": "i\u001b\u0014I\u001b>X\u0018擯q+?\u00074J焛􎔤,뉆􊡝\u0016o,􉜲#O\u00184􂶇\r􏓬5.\u0011\u0002B*F\u0015𧘋l󷟕𫦤zJ\u0013'5.R\u0019\u0002󰃞\u00028M􎄫󻿵𩔓D𫞝\"\u0019\\!Z[ t\u001502t=\u001f􁈰󼬸􀓞A>4\u0014晴`₿\u0012d\\oB깶󹬿\u0003\u0007p!B厍􀒒\na^\u0018U!󽯫𘂏QOjEm𐂒`g𘟠\r\u000c\u001f褘\u0012n1\tD:S𐜩<8\r<󵁰bVi\u001doS'2o\u0017}𞡽=q􉊵\u0004\u0002w}\u0000궽hK󿟦+gud:W!󷟢\u000c𒐠}\r\u0004$L\n𡚉`\u0007𞴑M4y󴞥􀔳zYW\u0019󵼌􂜃Ty󿷐\u001c3\u0002V7윗j\u001d\u0007y7i\u0013\r􎔹l􈗮􀣸𘒼缷H%,(1j󳯌\u000b󰴯H:\u0016󵺳W\u0007i)𬎡C𧙮rm{1\u001b\u001brde\u0016$80%𠫲\u0019䄹O",
-    "name": "W\u000b👾삇\u0014\u0002\u0001􅨐􉺀0𫐗󹇜􌁡N􋳍j؏7]v\u0010\u0003􃶦􉫤do]?\"飙4\u0000^I5⌞{𥞏{\u000c>\u000eTx\n!dR8%󶔻N5\u000bI𡽠R\u0014\u0014uo󲟍2𪅩[V\u0010\u001d\u000f\u0008n𝤝J𫓷\u0004^x<𠇽W􇸬H#oF(t\tQ阘􆣔V3𫽪𥽝\u000f*T]r5G􊜹𦪽>礊𘑯󻔭qwVi|󸬢𧽄^b^/\\%\u0014𢳁A\u0003gL뚕Zt^Y\u0000 \u0006cv4𮊈f𬒿\u00135𡉢u秢\nOI부􍌾~􋂶𫢸4\u0000)%X󲏵Ar p􇖜󷫐y{DB|]lbI:3$䒢1bX+ 󼇸N󹖕\u000e󰒕\r짳\u000c~%\"{&𖹺jME\u001fmg{\u0010烱Q/𗝃XW",
-    "icon_key": "yG𨄺|􀞂c󸒺\"N\u0002j\u000fb\u001aH\u001dNt𦇷􄿘?p,l!䱵o뫧),k\u0007󲅁쵷-\u0001qT@󲏋S\u0019𣋎7頪\r^T:=𐎮𥴉,DV\u0014𤊼􉁸iῑ\u000f𩽁Kx\u0017𫑖\u000ftLw󹳹􇶰􃗲\u0002Af莁􀆎亄􀛦*}0󶶽\u000e󼳦􌰫en[𠠦\u000fG\u0018i𛈡U.\u000c@\u0000Cr㋣\u0006\u001c@󺳊PX\u0018\u0019\u0001㺌0ꑔ\u0000A𠠻\u00075ﷸM􅌦"
-}
\ No newline at end of file
+    "icon_key": "yG𨄺|􀞂c󸒺\"N\u0002j\u000fb\u001aH\u001dNt𦇷􄿘?p,l!䱵o뫧),k\u0007󲅁쵷-\u0001qT@󲏋S\u0019𣋎7頪\r^T:=𐎮𥴉,DV\u0014𤊼􉁸iῑ\u000f𩽁Kx\u0017𫑖\u000ftLw󹳹􇶰􃗲\u0002Af莁􀆎亄􀛦*}0󶶽\u000e󼳦􌰫en[𠠦\u000fG\u0018i𛈡U.\u000c@\u0000Cr㋣\u0006\u001c@󺳊PX\u0018\u0019\u0001㺌0ꑔ\u0000A𠠻\u00075ﷸM􅌦",
+    "name": "W\u000b👾삇\u0014\u0002\u0001􅨐􉺀0𫐗󹇜􌁡N􋳍j؏7]v\u0010\u0003􃶦􉫤do]?\"飙4\u0000^I5⌞{𥞏{\u000c>\u000eTx\n!dR8%󶔻N5\u000bI𡽠R\u0014\u0014uo󲟍2𪅩[V\u0010\u001d\u000f\u0008n𝤝J𫓷\u0004^x<𠇽W􇸬H#oF(t\tQ阘􆣔V3𫽪𥽝\u000f*T]r5G􊜹𦪽>礊𘑯󻔭qwVi|󸬢𧽄^b^/\\%\u0014𢳁A\u0003gL뚕Zt^Y\u0000 \u0006cv4𮊈f𬒿\u00135𡉢u秢\nOI부􍌾~􋂶𫢸4\u0000)%X󲏵Ar p􇖜󷫐y{DB|]lbI:3$䒢1bX+ 󼇸N󹖕\u000e󰒕\r짳\u000c~%\"{&𖹺jME\u001fmg{\u0010烱Q/𗝃XW"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_15.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_15.json
index 8bfe020e59c..acb9d2adff0 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_15.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_15.json
@@ -1,5 +1,5 @@
 {
     "icon": "𨑋Vn\u0002󶤆I𡷮靍􁢄w㝯@\u0015R7\u0000\r&3Lc\u0014?-𗄧\u0017hu􇒺$𬮍\u0016󿏘󿶭􃸉\u000c'ꜜ=\\鼝Bw\u0013\u0008󳖙=a\u001fF/Lx􏤆'\u0018\nkF􅇴􌸞\u001a*缮\u001fT&.􄹺*t\u0002\u001f􏇶rq4u3Frr𬦕$\u001fX&􏛮1U+8Tg𤅮뺻+􅷯~j\u0015F@\u0015%x\r|\u0013􊜗xC\u001b𑇮\u0003\u0011_*wA 􇊙𥞘X󽶣xx󿯶p\n?𗃷􈇩𬌚\u0002󹫆d䛺󽒀멊:wmx𧋔\u0001􆳫\u00138V;𞴧𣩓􉐀K侟𢱇v𒃳0a\u000f􊴇\u0011a8=@􆽇>\u00044J$e\u001c\u0008WP&\u0008󷗑􃡌􍝪5[ฦlYC􀦈z8\u0010󵖖\u001f䟥𗥷\u0011􉃵g𠂪\u0015𥣉RS􎺌Q󶘃𭟗tᜑ\u0002LAS3I~ 9\u0000󰩋rj𤪛C􂠎794&􏒺\u000evk`h?",
-    "name": "p\u0003맲\u001d\u0000_🎦n4􆦬6Vﹼ\u0002𦏎a􇯺97ퟣX躸)Y］󼷀t􃾨\u0011󱹍􅱡冗G`\tV\u001b0&\u0012tᄾ&󰛉oq\u0010M𬪊)+>Dh7󷀍c𦚣卮R𪻢a󲉨H󲐝􌒮\r_pU\r\u0006XP-\raR8P\u0019T5RD􆨟j>\u001e<G\u0004\u001dt\u0005Tu",
-    "icon_key": "`Ai(se􃳝q󷕚O\\wꈺz(.\u0006@g𐰮\r@􂻔\u000b\u001a8\u0001c䚏;\u001cq𝥽\u0013󶏲\u0002𫐧w#\\<\u0001𗂶v𨎳ĪK鐒AB\u000f㽬󽈪k(􂣎\u0010<􊽬\u001ae[\u0006dHU'^=rX織Gv\u00134𧀘o𢤌3*󳬁)"
-}
\ No newline at end of file
+    "icon_key": "`Ai(se􃳝q󷕚O\\wꈺz(.\u0006@g𐰮\r@􂻔\u000b\u001a8\u0001c䚏;\u001cq𝥽\u0013󶏲\u0002𫐧w#\\<\u0001𗂶v𨎳ĪK鐒AB\u000f㽬󽈪k(􂣎\u0010<􊽬\u001ae[\u0006dHU'^=rX織Gv\u00134𧀘o𢤌3*󳬁)",
+    "name": "p\u0003맲\u001d\u0000_🎦n4􆦬6Vﹼ\u0002𦏎a􇯺97ퟣX躸)Y］󼷀t􃾨\u0011󱹍􅱡冗G`\tV\u001b0&\u0012tᄾ&󰛉oq\u0010M𬪊)+>Dh7󷀍c𦚣卮R𪻢a󲉨H󲐝􌒮\r_pU\r\u0006XP-\raR8P\u0019T5RD􆨟j>\u001e<G\u0004\u001dt\u0005Tu"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_16.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_16.json
index bf6ee70dd40..82ad3bd7927 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_16.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_16.json
@@ -1,5 +1,5 @@
 {
     "icon": "\u0004>D0.𞄑\u001dtW􅯜YER)M@jid\u0003𤄝\u000eSQ-\u0010O@\u0008o\u0005@iV𒊫󴥐P}s걎f3\u0013\u001eAN=*^[󺐈\t𮐸q\u000f,s3?𪳶D􌜍*𠗧6𩗤!*\u001bTk􂪗Fyc\"L\rlv!𡕺NxB\u0005\rs&>M[\u0010\u000e𬽆q\u000e6n:\u001bb\u000fV\u0005LNT<V결\u001a𮔪s\u0014z%󷌢\u0019\u0001S*􇃊Y\\\u0008X|N𨏶hvXf2*gA󠆇\u001c󱞢a#𢓞𘨟&bk`:Y\u0007􁹹\u0010\u0014*c􉀜~^A-󸎢\u0018􌬒\u0008􃙦\u000e\u00033 \r)mt<\u0015𣉆^t64#𗚘Tu􏭨􏁻}#𫧜{%N\u0002In􊇛X?9􃍺\u0005L󲾐􈔾Nsvᙊ]%",
-    "name": "{,W𛰽j𐔳VW,|\u0011-\u0019𖢤챍􉈧\u0005SdM𬺜~𭵠𨮗\u000b뙅󷉂󶎋ⷺm󴧒{R\\勢𬼩(\u0010@􎀈Eiw𬒃󱬅7􉱯쾥\u000bc[L[\u0015⑭_\u0018](H\u0007Oj󲧍\u001cgdV𫳿",
-    "icon_key": "󽠢󴎞\u0011X5rX\u0011+j𢛢[Jt)㚳󱆐pm󴗃󴟂\u001b%y\u0002\u0003>𫷠"
-}
\ No newline at end of file
+    "icon_key": "󽠢󴎞\u0011X5rX\u0011+j𢛢[Jt)㚳󱆐pm󴗃󴟂\u001b%y\u0002\u0003>𫷠",
+    "name": "{,W𛰽j𐔳VW,|\u0011-\u0019𖢤챍􉈧\u0005SdM𬺜~𭵠𨮗\u000b뙅󷉂󶎋ⷺm󴧒{R\\勢𬼩(\u0010@􎀈Eiw𬒃󱬅7􉱯쾥\u000bc[L[\u0015⑭_\u0018](H\u0007Oj󲧍\u001cgdV𫳿"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_17.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_17.json
index a9642f8b900..3b2bb052b73 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_17.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_17.json
@@ -1,4 +1,4 @@
 {
     "icon": "𭪌𐫎𐪇􋉟(!WtCYcX$\u0018e-9Gr󳼒=M){w\u0012𦐆\\􏉻_\u0011*j\u001f.􏌅􅱅󺭅Ԣ;􌖖go\u000b:Dr0ΠWom􌠁P*𑩷\u0000𬎬􁎢 󺙖𩕺Ad_i?r蠸󸠽㥥𩓇~y~𭚲\"ByOiY1𭨜 \u001e+qaG9󺸄b\u000c\u000fW!􄢍srx~jᠵ\u001a􃻢Z𧅖􈯏􋱲\u0001~𑨂\u0008\u0000C=H\u000c9𫽷+𛱟󺠘𠁕\u0014p\u0008",
     "name": "\u0003\u001cS\u000ff𘩄6,/󴯪𠖆,𗲱𨜣D𨺎~𥓃🃕av-W\n􈥳s(y`D;䉻n\u0001G\"]\u000f𦜫\"''A𩥅G\u0017eu𣶝􌧛 pM!4r􆞒\u001aK󻶤R⪤\u0011\u001c\u0005\u000bNu\r|{\u0001\u0006𢑍v-𤃌砀} 6]\u0006p󲖘>\u0003?𩩠[\u001f8􌒋jT1𡼧y\u0018)"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_18.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_18.json
index d1c892db418..9c88c852df5 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_18.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_18.json
@@ -1,4 +1,4 @@
 {
     "icon": "jc3h󵢳8􍫜j2𧻺s𣞂nw󻋏ꤾ\u000ckOO\u000e쑜3Adqz0\u0007^AU\u0000/?\u001ez\t󷜳.[\u001c𗵑\u0006K𭼐g𤃧Y\u001f􀫓OZ\u0007𨄓(H븹𣉏\u00028(􇳚ﮡ􂥘?e󰖻_M𤑢Q~o钥X6WAL\u001a!󳩿⟄A2\u001a7𦗥a󴌒\u000b[T驼I󰟶􌒺\u001c$(\u0008q􋮒\u0007🗿\u0014\u0014f􆒙3Vc\u001d􈦻u🈙V\t밈󷱯\\\u001b\u0003𝒋𣦪f􌘛󵙌'𩪋w\u0013􌩁M3􍝭&6\u000b\u0010M \u001e",
     "name": "􇦬g^\u000f4\u0016􂛖(󶘆dn㬱ᓚ􎈙8ಷ\u001c\u0000d}W􇃪􏢛a󿍤8.DV􏩫\u0012Q!\u001a󷵊\u0000𨙰|k𢠧Y\u0008&]P\u0015M嶻{\u0001\u001f􈳼⇦fEL5􌖲^xy.􇿽􋺫ZD2EOw􄯗􍔠Z󱯱v\u001a䕲:U,yu3)*穐]6t:Q\nQ𑇟\u0013\u0003Cd󰍖&𨜉p􎜺u|􋽘wh:%KJQB>I倥W𩟏ⴔ𡃹\u000bIP+|9CꤧXBM􅓷$FR𐫔J5d\u001dK𩀬\u0018􎐹\u0019t'\u001e[zmz\u001b-􊉿􁋊{o𥜹/\u0010\u0015􅥿\u0010\u0012z~>iz󼴯j`𦐂G\rat{\u0008&􊤛𪰌,W􍆰􍍎󾔽𬊉G󼊽􀫼Q\u000f緓\u001eg^&>\u0004&BB]\u001a𬶀^^n𔔋􁴯\u0013舏\u001e2𝜾^I>^e􉪥2􂳖$+􌣄2\u0013>&4%4􀔘\u0011󰧩M𗌱𘖳0⧕\u001bM\u001du"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_19.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_19.json
index c0373f1960c..216f3824b26 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_19.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_19.json
@@ -1,5 +1,5 @@
 {
     "icon": "'𫇌􎤀\u001eSD􇗎\u0001􌇵\u000b\u0015d\u001f<R~gヰaJ\u0008俆C󱍓\u000c󺿳选e塧\u000e\u001bt\u001bIbTE'􎰎b𝔱\u0013痋i",
-    "name": "{ag𣻺<-ꀪ\"􇱉Ad%畉󹼂U>潦<>g\u0008t玱:􈞡^=6􆹭󴞒𗘘\u0011􈥥\r\u001bIu%b\u0012\u0008`/-+`􅟾\\\u0017^\u0017w\u0011L\u001fb?'󵏉\u0003\u0010\u001b\u000b􉹲𧙨}􇓪\\⡴$\u0014OE\u0017\u001e\u001d)Vej􅼿𪬋!\u0011W*s\u0012U%-𢘡KC`B\\k󿷑\u001e:\u0014􋞅\u001fN\u0013\u001b:ns\u001dj\u0012&-\u0003.h\u001aJN󻞢x1c\u0015\u0006ʆ+\u000fb\u0012mnp􆠝\u0003󳗶)\u0004 ;u𩙸5\u0019;\u000c ᧀ",
-    "icon_key": "𠬠RaQ"
-}
\ No newline at end of file
+    "icon_key": "𠬠RaQ",
+    "name": "{ag𣻺<-ꀪ\"􇱉Ad%畉󹼂U>潦<>g\u0008t玱:􈞡^=6􆹭󴞒𗘘\u0011􈥥\r\u001bIu%b\u0012\u0008`/-+`􅟾\\\u0017^\u0017w\u0011L\u001fb?'󵏉\u0003\u0010\u001b\u000b􉹲𧙨}􇓪\\⡴$\u0014OE\u0017\u001e\u001d)Vej􅼿𪬋!\u0011W*s\u0012U%-𢘡KC`B\\k󿷑\u001e:\u0014􋞅\u001fN\u0013\u001b:ns\u001dj\u0012&-\u0003.h\u001aJN󻞢x1c\u0015\u0006ʆ+\u000fb\u0012mnp􆠝\u0003󳗶)\u0004 ;u𩙸5\u0019;\u000c ᧀ"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_2.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_2.json
index 677f0012bb4..d5e42c5ed6c 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_2.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_2.json
@@ -1,5 +1,5 @@
 {
     "icon": "l𭧺t\u0018u~z􏕊x󳀁􉸳𣠩&\u0011󸵗\u0014󳶎𭏟SRv𔗉8\u0005\\L*􈴌:Y",
-    "name": "𮕯ZV\u001b􎧶:RV\u00060%U\r\u0005ᒹ\u000bg\u001a\u0013𐙘\u000b䉭\u000b𨑩\u0013\u0018`\t𥛮\t_󻟩䪰\u001f\r\"𬣬𗖚󶻦\u000e@鰢\u0010\u0006y8*𠻄P;o`53L\u0006󴄍\t㼝e쐖\u0016$\u0001􍁯􊺸\u0015󻴥𘝺\u0008\u001ceW,􈒳#UU\u0011%岻dF𐼇Z^󲠵u𬫓v󺟜gb􉧟\u001fR 뿭\u0001m\u0005+\u001edHcX󾰀\u00161ꉚ\t.r^\n\u0013掜^\u0019p嶇h>󶉼%􄋕#:仰\u0011EB.󳏄0H6𪠬𮣛䭈󷏤o>Lᢑ_\u0003󱙢7.9􆁖\u0011WQ\u000br3󷪝g\u001f𫪌dZ\u0014󱀯\\󼚗󳷑~磟R\tl3Fz\u001d\u0013\u001a\u0006D󻾗Kj<W\u0019\u001b^d껐\u00107^",
-    "icon_key": "8Q(󳁰\"慒􈚬]1'N𪊠?7&\n􈖕\u0007\u000c𭯵K\u00152󳧦𓐐e7󳵋)Gm􍋗ueG󷔏􀧟^\u0016\u0004i\u001fXKLxz􍱪\u0019󸫧I\u0018@p𣯲􋴽 4|D\rg𠜵K\u001e􁝙bHr􎀭󲊁\u0001R𥷇󺳟\u0002r)\u0017t\u0000y>􉊫lE\"􄯠\u0005𗳛v'T󹛫(VJn\u0014옋feOI󶞮D&saC\u000c)k73\u0001Cp9o\u0016𗺃鸫􎰫󸹅IO􈒱󽈂􋒎K*w`xc8%ᔴ\u0008Q􎪣󺡶\u0013\u0015\t𭣔\u0008d󻙒~󾺑\u0002pźF󱺸󿸞-\u0002\u000b𩔁!􉒊\u0017𨶑+\u0011&A\u000b\u001f$\u001c4􍡗𬻧C\u000f􋮺W6{BNO<\u0011\u0008@!a󴶙r.-󴣞𪴵󿛊⍾b"
-}
\ No newline at end of file
+    "icon_key": "8Q(󳁰\"慒􈚬]1'N𪊠?7&\n􈖕\u0007\u000c𭯵K\u00152󳧦𓐐e7󳵋)Gm􍋗ueG󷔏􀧟^\u0016\u0004i\u001fXKLxz􍱪\u0019󸫧I\u0018@p𣯲􋴽 4|D\rg𠜵K\u001e􁝙bHr􎀭󲊁\u0001R𥷇󺳟\u0002r)\u0017t\u0000y>􉊫lE\"􄯠\u0005𗳛v'T󹛫(VJn\u0014옋feOI󶞮D&saC\u000c)k73\u0001Cp9o\u0016𗺃鸫􎰫󸹅IO􈒱󽈂􋒎K*w`xc8%ᔴ\u0008Q􎪣󺡶\u0013\u0015\t𭣔\u0008d󻙒~󾺑\u0002pźF󱺸󿸞-\u0002\u000b𩔁!􉒊\u0017𨶑+\u0011&A\u000b\u001f$\u001c4􍡗𬻧C\u000f􋮺W6{BNO<\u0011\u0008@!a󴶙r.-󴣞𪴵󿛊⍾b",
+    "name": "𮕯ZV\u001b􎧶:RV\u00060%U\r\u0005ᒹ\u000bg\u001a\u0013𐙘\u000b䉭\u000b𨑩\u0013\u0018`\t𥛮\t_󻟩䪰\u001f\r\"𬣬𗖚󶻦\u000e@鰢\u0010\u0006y8*𠻄P;o`53L\u0006󴄍\t㼝e쐖\u0016$\u0001􍁯􊺸\u0015󻴥𘝺\u0008\u001ceW,􈒳#UU\u0011%岻dF𐼇Z^󲠵u𬫓v󺟜gb􉧟\u001fR 뿭\u0001m\u0005+\u001edHcX󾰀\u00161ꉚ\t.r^\n\u0013掜^\u0019p嶇h>󶉼%􄋕#:仰\u0011EB.󳏄0H6𪠬𮣛䭈󷏤o>Lᢑ_\u0003󱙢7.9􆁖\u0011WQ\u000br3󷪝g\u001f𫪌dZ\u0014󱀯\\󼚗󳷑~磟R\tl3Fz\u001d\u0013\u001a\u0006D󻾗Kj<W\u0019\u001b^d껐\u00107^"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_20.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_20.json
index 30419902f94..01beaeae2cd 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_20.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_20.json
@@ -1,5 +1,5 @@
 {
     "icon": "]\u0007\n􍸦3ℑ􆨈7JAbsh*vw𪯇𒓼6PiI\\4\u0005􍻫􃢶ObG\u000cW𬚎!,K󵃰𣸒$\ncw𮪃󽵓\\^𦍈흮􋪮𣿚4W^􉯷\u001f䱎\u0001\u0002$!𐎁oc,𩡍;󷺙^:S9|Gq2aD𡄙M0󷟶^𞡬\u000e\u000f\u0010z󼴦\u0001\u000eI\u0017󳴬PE𥨊@󻜏-n`Zo⊕\u0003 칡NG<i8",
-    "name": "C-𭴁k\u000eO􏂧{􆂢Qv􈵓fQ:ᚼX7󻻑H{\u000fRmi\u0001Z􃯃:󺨜p𐹲@!󿩊l\u001d6𫫟􄯋\u001b:\u0013􍩭𩖒\u0013p=𪹞栠\u0001𢉎B+䝁;u􆬮q(1a􎍨DJ䓅𧎫7DC󼍑J\u0010\u001b+󵌙sg󽁋\u000bZ\u001eK]",
-    "icon_key": "~ndy\u0007􂆜1H2𭌿󵣒\u0017\n$3w𨎗fsE怺▦jjG􇝈"
-}
\ No newline at end of file
+    "icon_key": "~ndy\u0007􂆜1H2𭌿󵣒\u0017\n$3w𨎗fsE怺▦jjG􇝈",
+    "name": "C-𭴁k\u000eO􏂧{􆂢Qv􈵓fQ:ᚼX7󻻑H{\u000fRmi\u0001Z􃯃:󺨜p𐹲@!󿩊l\u001d6𫫟􄯋\u001b:\u0013􍩭𩖒\u0013p=𪹞栠\u0001𢉎B+䝁;u􆬮q(1a􎍨DJ䓅𧎫7DC󼍑J\u0010\u001b+󵌙sg󽁋\u000bZ\u001eK]"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_3.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_3.json
index d98419c23b4..8421f773429 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_3.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_3.json
@@ -1,5 +1,5 @@
 {
     "icon": "呖hVe1`kK\u0002&]}%(p壡􈞹󴺨r􎘠歙x\r\"󾴭\u0006㨥󺛸m󵼐󷄪\u001f⅖j;f-󼡻=4@1O$𗊖\u0005\u0015",
-    "name": "𐃟Z(􉔐솷h󽋞\u0005Sy~F\u001d[\u0003\u001b3q􋴲\u0005􇖍#咯\u000b𪎳膄\u0015𬒤'􀸜[􅋧𠔴\u001bJXn$\u001a<\u000c\u0015\u0015@'c\n𗙋%⦙nO󿻩㧕b귖WW`5\rA2C\u0015F)\u0018B𢝱𘫢*:\u001b\u0010>M\u001c^\u000f,鯲Rjve\u0015$\u0014!\\\u000f/13xE𫋩ꐌX:B\u0011h闰0㸸>􈪡\u000b5\u001d'󻌊\u0003\u0001gj*𬙯#P",
-    "icon_key": "`m$󼂄깴`𥉟b􀸃\"\u001cT\u0016iA%ZnO_\u0008\u0000b"
-}
\ No newline at end of file
+    "icon_key": "`m$󼂄깴`𥉟b􀸃\"\u001cT\u0016iA%ZnO_\u0008\u0000b",
+    "name": "𐃟Z(􉔐솷h󽋞\u0005Sy~F\u001d[\u0003\u001b3q􋴲\u0005􇖍#咯\u000b𪎳膄\u0015𬒤'􀸜[􅋧𠔴\u001bJXn$\u001a<\u000c\u0015\u0015@'c\n𗙋%⦙nO󿻩㧕b귖WW`5\rA2C\u0015F)\u0018B𢝱𘫢*:\u001b\u0010>M\u001c^\u000f,鯲Rjve\u0015$\u0014!\\\u000f/13xE𫋩ꐌX:B\u0011h闰0㸸>􈪡\u000b5\u001d'󻌊\u0003\u0001gj*𬙯#P"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_4.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_4.json
index 0909bab7a95..68f374519ee 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_4.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_4.json
@@ -1,5 +1,5 @@
 {
     "icon": "破5\u001c㒞\u0003\t5l𘩪j\u0011iuﴄ󴢆􀧻\u0013)$M82pC,Hwy\u0003>Vf\u000ez\u001a،\u0017_4B\u000c􋵓󾰋𦉓a􍈂𭞺FZ",
-    "name": "💆e\u0010\u001acs॓􆟔|\u001f\u001au\u001c챆𥢈&@\u0004󳹄,D,<𤆺󹼋RVpe}[𤑠쮽xN\tz,T-d*𦷃\u0019\u001da􉋃𮅣\u0002|>]\u000b𮮶:7𮞿󴰍b󷌥|c𠋳,깅󸒀O𝓊l=󺮠QA勸볷E󿹅#J\u000focH&\u000f𮬿h\u001a^\t\u0000󰽇󾇛n[􌝁o𝂘\u0012ꬽꐉ,\u001a\u0007\u0005\u0019亟*m􂳸&𩰲􂒿\u0004E#W'\u0007;+I\u0016\u001cg\n^i[󾿁\u0002.\u0018]卢b\\􎆳󵓞\u0014J󶦗􎾌s:D\u001c\u000eBwpPF\u001b\\\u000c󾬺𦚏羍H󽣤󸱌j􄷒䮺𝅨\u0001\\̑NE쪼𑦮\u0011\rU\t𤤑j\u0016X\n󾜆}󾗉󿧵􅈈\u000bS󹬝{􃧂𑧇\u001fi󾫛\u0012􌋸^8𓈅\u0006\u000ebGᢽX􎙼\u001a!R^\u0016qjf}|\u0002$\u001b0Q\u000f\u0006󺒳\u0007뎿F𪗴~\u0014T􏌫𠾚j+I\u0019\u001eWK\u0012f",
-    "icon_key": "ch=\u0013zyXV֮􌶐🚽[4N𗭾􏸳(sN􋏊=J\u0018\u0006uZ󺗾[L\u0016f-󾸁S+zKX\u0013 L\u0015\u0004𦿥,\u0014𩆴'􌓗#b<q\u0018OS\u000eS\u000bz\u0019\u000c\u0003\u0014*ᒁ\u0002n󴸤[(⃘ 𖢕\u0013𩪏6퍥\u001d\u0005x矋5\u0002)􁯟]f4\r󷖑X%䰭TE􄓓\u001d\u0005[d\u0005x󽗪c⎏ꗭ󳷢4\u0013\tfT,6vࡄ,d@{1s\"Ya󱾤c\u0005XX5#𫳷𭳶;!鱃x󽸕TZ'4蒥)𤈃n𦻨\u0018uL􈦳\u0002Z󴄞"
-}
\ No newline at end of file
+    "icon_key": "ch=\u0013zyXV֮􌶐🚽[4N𗭾􏸳(sN􋏊=J\u0018\u0006uZ󺗾[L\u0016f-󾸁S+zKX\u0013 L\u0015\u0004𦿥,\u0014𩆴'􌓗#b<q\u0018OS\u000eS\u000bz\u0019\u000c\u0003\u0014*ᒁ\u0002n󴸤[(⃘ 𖢕\u0013𩪏6퍥\u001d\u0005x矋5\u0002)􁯟]f4\r󷖑X%䰭TE􄓓\u001d\u0005[d\u0005x󽗪c⎏ꗭ󳷢4\u0013\tfT,6vࡄ,d@{1s\"Ya󱾤c\u0005XX5#𫳷𭳶;!鱃x󽸕TZ'4蒥)𤈃n𦻨\u0018uL􈦳\u0002Z󴄞",
+    "name": "💆e\u0010\u001acs॓􆟔|\u001f\u001au\u001c챆𥢈&@\u0004󳹄,D,<𤆺󹼋RVpe}[𤑠쮽xN\tz,T-d*𦷃\u0019\u001da􉋃𮅣\u0002|>]\u000b𮮶:7𮞿󴰍b󷌥|c𠋳,깅󸒀O𝓊l=󺮠QA勸볷E󿹅#J\u000focH&\u000f𮬿h\u001a^\t\u0000󰽇󾇛n[􌝁o𝂘\u0012ꬽꐉ,\u001a\u0007\u0005\u0019亟*m􂳸&𩰲􂒿\u0004E#W'\u0007;+I\u0016\u001cg\n^i[󾿁\u0002.\u0018]卢b\\􎆳󵓞\u0014J󶦗􎾌s:D\u001c\u000eBwpPF\u001b\\\u000c󾬺𦚏羍H󽣤󸱌j􄷒䮺𝅨\u0001\\̑NE쪼𑦮\u0011\rU\t𤤑j\u0016X\n󾜆}󾗉󿧵􅈈\u000bS󹬝{􃧂𑧇\u001fi󾫛\u0012􌋸^8𓈅\u0006\u000ebGᢽX􎙼\u001a!R^\u0016qjf}|\u0002$\u001b0Q\u000f\u0006󺒳\u0007뎿F𪗴~\u0014T􏌫𠾚j+I\u0019\u001eWK\u0012f"
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_5.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_5.json
index e275aca2fdd..f9aefa1e1ba 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_5.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_5.json
@@ -1,4 +1,4 @@
 {
     "icon": "0yl+Ej0A)D\u0015\u0017}󽳮􃨰FB쑻𗸟𣭈蝜+꜏2&\u0016􉺛\u0003?𥈕[Td*K!c󸦓𧶥<󾪩􁑒󼴝󰏜ecC𭷔ᑇ\u000c􌻒{-\\\u0004󹥥\u001c1qhH\u0002\u0006Nq\u0015f\u0008{&ጮ󼘮𢍞\u0016\u00133\u0013-.:K𪼊F7I\u0003􋺄il􎳋𫷵A𨿢F~N\u0008𘡪큔螌Z!\u0014?𦚍ꕕn\u001b􉧝",
     "name": "c\u0014嗅􈛊Am\u0001,0ᘂ󷁚\u0010\u0011􀀕\u001b>\u0011rj5Hd􃇁I'$.𗾧\u0012}\u0005\u0012󶟡𦯷𘜥|\u001c\r\u0010^⅚t𮝋􂲿vf󿪄`d' '={4뼐\u00085][T𨕋7A1缃\u0015Y\\frek5$f6b_4%🧩\u0012󿱀!\u00116\u000c\u0003K[SQH\n语󸚲􉳟\u0019d\\@RQB􏵺𒔺A^ l􈺄󼗷X^i󷦷\u0001󾧱𫀳I􎟩\u001f3󿄚xIC#C-􁝢\u001a𡎥r诣\u000c,\u0016=\u0001J鹮I=󱆙"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_6.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_6.json
index c27319a0b9a..4f28b738c0f 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_6.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_6.json
@@ -1,3 +1,3 @@
 {
     "icon_key": "𨛫󹘚!itB3􂠏D\ro𝕻xW'𤄾-𭭒XM􄽾\u000bGM.`3\u0014\u0007#)R*󲸨􁎢By^Dh􊷣!"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_7.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_7.json
index e1f4b742172..bcbb9f5e80f 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_7.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_7.json
@@ -1,4 +1,4 @@
 {
     "icon": "󱸑\u0018萾3􌁠EE\u001etQb\u001c`:;ህ=󳤀P2\u0013\\\u0015Z􀤾\u0011p'WrP3\u001b𥍖9o\u001c,H\u0012.&𛄃💛\u0001o\u001e ^Jak&\u0012󶫛㌙W\u00185\t?;/󰍫\u0010A𢉡A\u000b*Q𐓀<𨧋i80\u000b%c{U\u000e\u0006W􇁲&~{R>iP\u0016쉂\u0005I󶿵*K󳕸a君\"gi\u0015􋉔.􅦕􇅟L\u0015𠛸<󸗚\u0017\u0014\u0018𘢗U󳥾f🕜𧥿~\u0004b\t󴴞\u000e꧶󼍺ት\u0008\u0015ᴳ𨂤QaZ)\u001ft\u0005\u0008.󶍳^𮑐\u0014󲭨{S𡭳sRGr󺠤󸘖$􈴘2~b𡨑",
     "name": "n{􂇭oZn\u0011\u001bJt kj\u0006\r󶛟\"'{\u001aX𬵓?@􅵡Ly󼝟\u0005@$𞱾W𬩠𥏕mW󻺕\u0011\u0010^c)𭖇󱋢𩎓곽9󺣐􇻱􉭓\u0017\u0014\u0012My\u0019󳷤\u0018𦁩gmi䙓\u000fy:r[󻋻i.\\\u0001󷣯\u00175𭃩H#\u0012𘛸#l\u000f@𤞏@\u0015)𦀗Jg㺽c\u0006V\u0004􀷓𨫛􎅎\u0013Ჴ󷬹󽭮fQ躼󷱚􌞸|Ik\u0011X\u0016\u001c}ii󿂹M&.)𧽠\u0016L󵰲\u001bk\u0007! \u001a􈤅𤵬+\u001eRW\\x\u001f\u001dt󱏮􂸛芝\u0018\u0002쟲+\u0012􀬤,\\F%,w𪨎a\\]\u001e𢥟~X;f𠵒 􄋀p\u0011d8mhY7w\u001ee\u0003\u0011􏡱l\u0017{3&뾄\u0006\u0014V=D\u0000\u0005\u000f𖼅\u0007K_di=,"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_8.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_8.json
index 02fcda27d0d..cc83832c2e0 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_8.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_8.json
@@ -1,3 +1,3 @@
 {
     "icon_key": ")\u001fi6V𪯒>F9>\u0010\u0008OqU\u0014𐤪l󺧚"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_9.json b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_9.json
index 3488c21f63e..26171e0268a 100644
--- a/libs/wire-api/test/golden/testObject_TeamUpdateData_team_9.json
+++ b/libs/wire-api/test/golden/testObject_TeamUpdateData_team_9.json
@@ -1,5 +1,5 @@
 {
     "icon": "A\u001f𪔆𪑂\u0016\u0006ZmN\u00009RY\t1;\u001dp#'带\u0010l\n󴻉󰻅T𤲸\u0017󸽵 r+𞤪P/P𦕦1󲥺-w𦅒𪟠y\u000fC86\taO_􌈄;\u001e@\n\u0000𣪑\u0011󼨚𧅼7QX󾾢ᵪ7󼌹𭗻􃚐JP\n",
-    "name": "QJ􋵇G\"g\u000f~jG%\u0013o\u000f2Zb瞌󵛌𣤒vb\u001f,N9@󿇒\u0005\u0011𥄖:嵹H\u000b\u0004𐓚\u0017/1ຩ:\u001b𮁻3X𣰩5g)3xq7隫𢏚o%PvWF\u000bF-vF|\u0007􅧋k }󶒇𝝯!\u0000Z$md𗭒𝃤'󼶏𠃟*Tj\u0006h\\TK$~ *ٺ䲧*P/=W\u001d獮󸸎~_$~𘘭:\u001b=𥢷󵙶rﺦ\\/o<rzSpw뛦\u0007󰭥Q􋘙B𩧑a*H뱊\u0016\u000ei+fV)+\u000f\u0012m텅󶛃\u0003H􎱖\u0002]𖭧4Hj,󺉘w&(W4󼏓󴶉􄭲\u0005-\u001c>RB\u000b\u0004K􆀍䚍$䎺\u0019~-}S󳐔ipLl𮧕IJ\u001d\u0016\u0008u渨\u0018kq@1m𞹒5|\u0012O1<'<U󽔮?CE봌\u0008\u0002,lHL􎸝!lja3?\u0002\u0004\u0007k󻙓fq󿦻M㤶1a䯡",
-    "icon_key": "F;\u0003O\rTm\u0011𨈙0󼴪\u0014􂤗􁆌뫲7\u0004𭼴![\u0002󼐫󿧺\u0012\u0001\u0008\n\u000emV󼍵􏤁\u0006B𭻻z&𣏄\u0014HP౨WS𬤕\u0001QT\u001e\u0003$b_𭞁臭\u0000􈅃􎻠@~\u0010.~𢝞sl\u0018\u0005\u0019􇤃䈌V(^|𮦱\u001d䛔\u000er􏷱\u0019eb2(#*!𭄔B\u0007^󰊳\u001a{\u0012t\\𛀟\u000cu\"\u0017\u000e\np􀉷[\u0001lB𧖽lꭦL녿\u000f𡰯/\n\u001d2Gw~y𢻄uᅳ1󳶀\t𝢊l8CE\u0011L𮄖󳸎CB\u001d{Xl𤒯󲂺,भ#{^􁧮S=.g\u0016\u0003%\u0002b􏳊𬖏4:숸󿺀􎑞u󶪸\u001d\u0003!𝣟q\u001d.J􍃐􆲁*2􅎧\u0002􄹰x,.\u0013\u000cR\u001b\u0008󵉰/=2n^f\u001f<xYz􊃍kW\u0010教EU0c5s"
-}
\ No newline at end of file
+    "icon_key": "F;\u0003O\rTm\u0011𨈙0󼴪\u0014􂤗􁆌뫲7\u0004𭼴![\u0002󼐫󿧺\u0012\u0001\u0008\n\u000emV󼍵􏤁\u0006B𭻻z&𣏄\u0014HP౨WS𬤕\u0001QT\u001e\u0003$b_𭞁臭\u0000􈅃􎻠@~\u0010.~𢝞sl\u0018\u0005\u0019􇤃䈌V(^|𮦱\u001d䛔\u000er􏷱\u0019eb2(#*!𭄔B\u0007^󰊳\u001a{\u0012t\\𛀟\u000cu\"\u0017\u000e\np􀉷[\u0001lB𧖽lꭦL녿\u000f𡰯/\n\u001d2Gw~y𢻄uᅳ1󳶀\t𝢊l8CE\u0011L𮄖󳸎CB\u001d{Xl𤒯󲂺,भ#{^􁧮S=.g\u0016\u0003%\u0002b􏳊𬖏4:숸󿺀􎑞u󶪸\u001d\u0003!𝣟q\u001d.J􍃐􆲁*2􅎧\u0002􄹰x,.\u0013\u000cR\u001b\u0008󵉰/=2n^f\u001f<xYz􊃍kW\u0010教EU0c5s",
+    "name": "QJ􋵇G\"g\u000f~jG%\u0013o\u000f2Zb瞌󵛌𣤒vb\u001f,N9@󿇒\u0005\u0011𥄖:嵹H\u000b\u0004𐓚\u0017/1ຩ:\u001b𮁻3X𣰩5g)3xq7隫𢏚o%PvWF\u000bF-vF|\u0007􅧋k }󶒇𝝯!\u0000Z$md𗭒𝃤'󼶏𠃟*Tj\u0006h\\TK$~ *ٺ䲧*P/=W\u001d獮󸸎~_$~𘘭:\u001b=𥢷󵙶rﺦ\\/o<rzSpw뛦\u0007󰭥Q􋘙B𩧑a*H뱊\u0016\u000ei+fV)+\u000f\u0012m텅󶛃\u0003H􎱖\u0002]𖭧4Hj,󺉘w&(W4󼏓󴶉􄭲\u0005-\u001c>RB\u000b\u0004K􆀍䚍$䎺\u0019~-}S󳐔ipLl𮧕IJ\u001d\u0016\u0008u渨\u0018kq@1m𞹒5|\u0012O1<'<U󽔮?CE봌\u0008\u0002,lHL􎸝!lja3?\u0002\u0004\u0007k󻙓fq󿦻M㤶1a䯡"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_1.json b/libs/wire-api/test/golden/testObject_Team_team_1.json
index b146b205743..1e19543ce8c 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_1.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_1.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000003-0000-0001-0000-000100000002",
     "icon": "Jw\u001fTB",
-    "name": "TJ\u0004",
-    "id": "00000004-0000-0003-0000-000200000000",
     "icon_key": "󾄡V",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000004-0000-0003-0000-000200000000",
+    "name": "TJ\u0004"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_10.json b/libs/wire-api/test/golden/testObject_Team_team_10.json
index 0cf73384c56..140e0689a6f 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_10.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_10.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000000-0000-0004-0000-000300000000",
     "icon": " ",
-    "name": "󾶆",
-    "id": "00000002-0000-0000-0000-000300000004",
     "icon_key": "􎕩",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000002-0000-0000-0000-000300000004",
+    "name": "󾶆"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_11.json b/libs/wire-api/test/golden/testObject_Team_team_11.json
index beb53077469..a1d1d1b4971 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_11.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_11.json
@@ -1,7 +1,7 @@
 {
+    "binding": false,
     "creator": "00000001-0000-0001-0000-000200000003",
     "icon": "b@\u0002룾",
-    "name": "",
     "id": "00000002-0000-0004-0000-000300000003",
-    "binding": false
-}
\ No newline at end of file
+    "name": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_12.json b/libs/wire-api/test/golden/testObject_Team_team_12.json
index 7a0913b6b61..442197f003c 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_12.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_12.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000003-0000-0001-0000-000200000001",
     "icon": "P𭑁",
-    "name": "yR\u0004U}",
-    "id": "00000001-0000-0002-0000-000000000001",
     "icon_key": "J\u000f`􆍑",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000001-0000-0002-0000-000000000001",
+    "name": "yR\u0004U}"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_13.json b/libs/wire-api/test/golden/testObject_Team_team_13.json
index 7f62873db11..61098e5eb86 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_13.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_13.json
@@ -1,7 +1,7 @@
 {
+    "binding": false,
     "creator": "00000003-0000-0002-0000-000200000004",
     "icon": "",
-    "name": "E\u001b",
     "id": "00000001-0000-0000-0000-000200000002",
-    "binding": false
-}
\ No newline at end of file
+    "name": "E\u001b"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_14.json b/libs/wire-api/test/golden/testObject_Team_team_14.json
index 15531e2736d..94c180ac811 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_14.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_14.json
@@ -1,8 +1,8 @@
 {
+    "binding": false,
     "creator": "00000002-0000-0002-0000-000100000003",
     "icon": "",
-    "name": ".橠,",
-    "id": "00000000-0000-0004-0000-000100000004",
     "icon_key": "N\u0019\u0003",
-    "binding": false
-}
\ No newline at end of file
+    "id": "00000000-0000-0004-0000-000100000004",
+    "name": ".橠,"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_15.json b/libs/wire-api/test/golden/testObject_Team_team_15.json
index ea7fcc0130b..a2f8c404988 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_15.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_15.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000004-0000-0000-0000-000400000002",
     "icon": "yM\u001e\u0005",
-    "name": "#k\u0000,;",
-    "id": "00000003-0000-0004-0000-000000000003",
     "icon_key": "T\u000c)\tR",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000003-0000-0004-0000-000000000003",
+    "name": "#k\u0000,;"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_16.json b/libs/wire-api/test/golden/testObject_Team_team_16.json
index 6ab9786cd39..d67c357b648 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_16.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_16.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000001-0000-0000-0000-000400000004",
     "icon": "Se",
-    "name": "",
-    "id": "00000000-0000-0002-0000-000200000000",
     "icon_key": "\u0001C",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000000-0000-0002-0000-000200000000",
+    "name": ""
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_17.json b/libs/wire-api/test/golden/testObject_Team_team_17.json
index 17301bba6e2..7cbd2e7cb3b 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_17.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_17.json
@@ -1,7 +1,7 @@
 {
+    "binding": true,
     "creator": "00000003-0000-0001-0000-000000000004",
     "icon": "A󻘪'W",
-    "name": "\t\u0008 ",
     "id": "00000003-0000-0004-0000-000400000004",
-    "binding": true
-}
\ No newline at end of file
+    "name": "\t\u0008 "
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_18.json b/libs/wire-api/test/golden/testObject_Team_team_18.json
index e1dc01a2b34..bd9e0f25a87 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_18.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_18.json
@@ -1,8 +1,8 @@
 {
+    "binding": false,
     "creator": "00000002-0000-0001-0000-000100000002",
     "icon": "_󻓑𩢓",
-    "name": "孙󿞪",
-    "id": "00000002-0000-0002-0000-000200000002",
     "icon_key": "x:鿪L",
-    "binding": false
-}
\ No newline at end of file
+    "id": "00000002-0000-0002-0000-000200000002",
+    "name": "孙󿞪"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_19.json b/libs/wire-api/test/golden/testObject_Team_team_19.json
index 9750218958b..5faec888a31 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_19.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_19.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000004-0000-0003-0000-000200000004",
     "icon": ")\u0017\u0005",
-    "name": "P𭷓;gi",
-    "id": "00000003-0000-0000-0000-000100000001",
     "icon_key": "V>A",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000003-0000-0000-0000-000100000001",
+    "name": "P𭷓;gi"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_2.json b/libs/wire-api/test/golden/testObject_Team_team_2.json
index 3732f8b5408..895a61e70d1 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_2.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_2.json
@@ -1,8 +1,8 @@
 {
+    "binding": false,
     "creator": "00000000-0000-0004-0000-000000000001",
     "icon": "􍬵\t5",
-    "name": "Ycᛄ",
-    "id": "00000004-0000-0003-0000-000000000004",
     "icon_key": "虱R3q",
-    "binding": false
-}
\ No newline at end of file
+    "id": "00000004-0000-0003-0000-000000000004",
+    "name": "Ycᛄ"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_20.json b/libs/wire-api/test/golden/testObject_Team_team_20.json
index e384ec69ec1..a2e88fc5df0 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_20.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_20.json
@@ -1,8 +1,8 @@
 {
+    "binding": false,
     "creator": "00000000-0000-0004-0000-000000000004",
     "icon": "󸷚I\u0002\u0003",
-    "name": "𮩶c",
-    "id": "00000000-0000-0004-0000-000400000003",
     "icon_key": "v0􌡴3",
-    "binding": false
-}
\ No newline at end of file
+    "id": "00000000-0000-0004-0000-000400000003",
+    "name": "𮩶c"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_3.json b/libs/wire-api/test/golden/testObject_Team_team_3.json
index 7132ed14585..d06ee96c92f 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_3.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_3.json
@@ -1,8 +1,8 @@
 {
+    "binding": false,
     "creator": "00000003-0000-0004-0000-000100000000",
     "icon": "",
-    "name": "2E􊴕",
-    "id": "00000004-0000-0003-0000-000000000003",
     "icon_key": "s􁺴",
-    "binding": false
-}
\ No newline at end of file
+    "id": "00000004-0000-0003-0000-000000000003",
+    "name": "2E􊴕"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_4.json b/libs/wire-api/test/golden/testObject_Team_team_4.json
index 9082b12acaf..e2c72e1c830 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_4.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_4.json
@@ -1,8 +1,8 @@
 {
+    "binding": false,
     "creator": "00000004-0000-0000-0000-000100000003",
     "icon": "􇓞u\u001cC\u0001",
-    "name": "𫑂\u0008k",
-    "id": "00000000-0000-0002-0000-000100000004",
     "icon_key": "X",
-    "binding": false
-}
\ No newline at end of file
+    "id": "00000000-0000-0002-0000-000100000004",
+    "name": "𫑂\u0008k"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_5.json b/libs/wire-api/test/golden/testObject_Team_team_5.json
index c8cdb9a15bf..5b259bd37a0 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_5.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_5.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000000-0000-0004-0000-000200000002",
     "icon": "􆊅",
-    "name": "\u0006𘐼仄",
-    "id": "00000004-0000-0003-0000-000000000004",
     "icon_key": "?&\u001b",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000004-0000-0003-0000-000000000004",
+    "name": "\u0006𘐼仄"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_6.json b/libs/wire-api/test/golden/testObject_Team_team_6.json
index 36ccfad8efd..b9ce15d026b 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_6.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_6.json
@@ -1,7 +1,7 @@
 {
+    "binding": false,
     "creator": "00000000-0000-0003-0000-000000000003",
     "icon": "_'\u0011\u0002",
-    "name": "󸭬x󼬐]㹱",
     "id": "00000000-0000-0002-0000-000000000001",
-    "binding": false
-}
\ No newline at end of file
+    "name": "󸭬x󼬐]㹱"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_7.json b/libs/wire-api/test/golden/testObject_Team_team_7.json
index 7bf758dce6a..6ed09fa61bd 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_7.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_7.json
@@ -1,8 +1,8 @@
 {
+    "binding": true,
     "creator": "00000001-0000-0002-0000-000400000000",
     "icon": "X\n|󾒚",
-    "name": "⛉􁓖󸙰7􂩽",
-    "id": "00000002-0000-0003-0000-000000000002",
     "icon_key": "𗤥",
-    "binding": true
-}
\ No newline at end of file
+    "id": "00000002-0000-0003-0000-000000000002",
+    "name": "⛉􁓖󸙰7􂩽"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_8.json b/libs/wire-api/test/golden/testObject_Team_team_8.json
index 9df96c223bb..3b010018380 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_8.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_8.json
@@ -1,7 +1,7 @@
 {
+    "binding": false,
     "creator": "00000002-0000-0003-0000-000400000001",
     "icon": "󻎖",
-    "name": "\r釖{\u0013\\",
     "id": "00000003-0000-0004-0000-000000000001",
-    "binding": false
-}
\ No newline at end of file
+    "name": "\r釖{\u0013\\"
+}
diff --git a/libs/wire-api/test/golden/testObject_Team_team_9.json b/libs/wire-api/test/golden/testObject_Team_team_9.json
index 7aed87a892b..2765bd238bb 100644
--- a/libs/wire-api/test/golden/testObject_Team_team_9.json
+++ b/libs/wire-api/test/golden/testObject_Team_team_9.json
@@ -1,7 +1,7 @@
 {
+    "binding": false,
     "creator": "00000002-0000-0000-0000-000000000004",
     "icon": "d\u0003U",
-    "name": "G[Hu{",
     "id": "00000004-0000-0002-0000-000200000003",
-    "binding": false
-}
\ No newline at end of file
+    "name": "G[Hu{"
+}
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_1.json b/libs/wire-api/test/golden/testObject_TokenType_user_1.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_1.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_10.json b/libs/wire-api/test/golden/testObject_TokenType_user_10.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_10.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_10.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_11.json b/libs/wire-api/test/golden/testObject_TokenType_user_11.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_11.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_11.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_12.json b/libs/wire-api/test/golden/testObject_TokenType_user_12.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_12.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_12.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_13.json b/libs/wire-api/test/golden/testObject_TokenType_user_13.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_13.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_13.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_14.json b/libs/wire-api/test/golden/testObject_TokenType_user_14.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_14.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_14.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_15.json b/libs/wire-api/test/golden/testObject_TokenType_user_15.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_15.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_15.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_16.json b/libs/wire-api/test/golden/testObject_TokenType_user_16.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_16.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_16.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_17.json b/libs/wire-api/test/golden/testObject_TokenType_user_17.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_17.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_17.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_18.json b/libs/wire-api/test/golden/testObject_TokenType_user_18.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_18.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_18.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_19.json b/libs/wire-api/test/golden/testObject_TokenType_user_19.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_19.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_19.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_2.json b/libs/wire-api/test/golden/testObject_TokenType_user_2.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_2.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_2.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_20.json b/libs/wire-api/test/golden/testObject_TokenType_user_20.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_20.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_20.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_3.json b/libs/wire-api/test/golden/testObject_TokenType_user_3.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_3.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_3.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_4.json b/libs/wire-api/test/golden/testObject_TokenType_user_4.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_4.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_4.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_5.json b/libs/wire-api/test/golden/testObject_TokenType_user_5.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_5.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_5.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_6.json b/libs/wire-api/test/golden/testObject_TokenType_user_6.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_6.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_6.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_7.json b/libs/wire-api/test/golden/testObject_TokenType_user_7.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_7.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_7.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_8.json b/libs/wire-api/test/golden/testObject_TokenType_user_8.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_8.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_8.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_TokenType_user_9.json b/libs/wire-api/test/golden/testObject_TokenType_user_9.json
index 4cd0983942d..674d0241d39 100644
--- a/libs/wire-api/test/golden/testObject_TokenType_user_9.json
+++ b/libs/wire-api/test/golden/testObject_TokenType_user_9.json
@@ -1 +1 @@
-"Bearer"
\ No newline at end of file
+"Bearer"
diff --git a/libs/wire-api/test/golden/testObject_Token_user_1.json b/libs/wire-api/test/golden/testObject_Token_user_1.json
index a1d44095608..cebf7a66e3c 100644
--- a/libs/wire-api/test/golden/testObject_Token_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Token_user_1.json
@@ -1 +1 @@
-"\u0003\u0004\u0000\u0000v,𬨿뚏􈵱;)􈆞(s=Ou"
\ No newline at end of file
+"\u0003\u0004\u0000\u0000v,𬨿뚏􈵱;)􈆞(s=Ou"
diff --git a/libs/wire-api/test/golden/testObject_Token_user_10.json b/libs/wire-api/test/golden/testObject_Token_user_10.json
deleted file mode 100644
index 7c45927fe16..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"\"`󴸬\\G\r"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_11.json b/libs/wire-api/test/golden/testObject_Token_user_11.json
deleted file mode 100644
index bf5273b5cee..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"^\u0005%\u0019\n𮇐\rr󱇮X\u000bvPM"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_12.json b/libs/wire-api/test/golden/testObject_Token_user_12.json
deleted file mode 100644
index 01ef1691f81..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"耥iN􊽱\u0012]/R]?\u001f𬒩Bw*/o\u001d\u000c⊬𝚎𞀩\u0010X􁸑󶫾\u001fA"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_13.json b/libs/wire-api/test/golden/testObject_Token_user_13.json
deleted file mode 100644
index 6a1457231c7..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"Y􏵇+H\u0007'0"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_14.json b/libs/wire-api/test/golden/testObject_Token_user_14.json
deleted file mode 100644
index 3799b403a50..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"🠇\u0012b󿏺z𤾟󾸱E𢐏\u0017NYmg\u00042w0"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_15.json b/libs/wire-api/test/golden/testObject_Token_user_15.json
deleted file mode 100644
index 6552fe8893e..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"ⱥ=\u0019힊\u0007K𝘊\t\nd\u000c󿻠-󿎊2;쫝C9C\u0006T"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_16.json b/libs/wire-api/test/golden/testObject_Token_user_16.json
deleted file mode 100644
index 3c951aa3a40..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"齊16QGyKz*p󹟚􎢅\u0019{帬󱪗P2􅉄F\u0001>F鏤󼮸lyZ"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_17.json b/libs/wire-api/test/golden/testObject_Token_user_17.json
deleted file mode 100644
index 17591a2b7de..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"𠐋9𮨴G?M\nX\u00080\u000b𤴝7MR\u001d󾃎]`많󰞵🀫o\u000eO𡣃"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_18.json b/libs/wire-api/test/golden/testObject_Token_user_18.json
deleted file mode 100644
index 3cc762b5501..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-""
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_19.json b/libs/wire-api/test/golden/testObject_Token_user_19.json
deleted file mode 100644
index 482ffe6de47..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"f\tZ\r\tU𧍦2b\u001a𠒬vZ,󵅴N\u0002\u0004\u0007􃯻􃉍rzBEO~\u0015}J"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_2.json b/libs/wire-api/test/golden/testObject_Token_user_2.json
deleted file mode 100644
index bf3f9c656aa..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-"HXPo\u001baJLCCS鏈\u0014\u0019\u0007\u0002bwXJ𫵆\u0010\u001e󲋶􏕇S[\u0018o"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_20.json b/libs/wire-api/test/golden/testObject_Token_user_20.json
deleted file mode 100644
index 23845c29bb2..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"I?􅴔󽏯\u000eWS\u0017b\u001fg1nK𐹨C?𥯀\\r}􂻛\u001d\u0003􊣑X*sK"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_3.json b/libs/wire-api/test/golden/testObject_Token_user_3.json
deleted file mode 100644
index b6474557626..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"􏢤Hcuwt3MZD"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_4.json b/libs/wire-api/test/golden/testObject_Token_user_4.json
deleted file mode 100644
index 3cc762b5501..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-""
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_5.json b/libs/wire-api/test/golden/testObject_Token_user_5.json
deleted file mode 100644
index 1ee9cc3f4b2..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"{PVg"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_6.json b/libs/wire-api/test/golden/testObject_Token_user_6.json
deleted file mode 100644
index 21927ab254d..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"̮T꽿툫)\u0005\u000e􌪥\u0008𑀷"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_7.json b/libs/wire-api/test/golden/testObject_Token_user_7.json
deleted file mode 100644
index 637a428395a..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"}󻨐􍐯0K3<'m69a\u0013"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_8.json b/libs/wire-api/test/golden/testObject_Token_user_8.json
deleted file mode 100644
index 696a01dff3c..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"핮\u0019LdrOO'𩣬f􁫞w↸𥀟\u0017EZ\u0016􉰊"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Token_user_9.json b/libs/wire-api/test/golden/testObject_Token_user_9.json
deleted file mode 100644
index 23133e50621..00000000000
--- a/libs/wire-api/test/golden/testObject_Token_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"oj󴴏z\u000f\u000e/\\9𩫋󿴏\u000c\u0012\u0010\u0016🨬>"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_1.json b/libs/wire-api/test/golden/testObject_TotalSize_user_1.json
index f11c82a4cb6..ec635144f60 100644
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TotalSize_user_1.json
@@ -1 +1 @@
-9
\ No newline at end of file
+9
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_10.json b/libs/wire-api/test/golden/testObject_TotalSize_user_10.json
deleted file mode 100644
index ca7bf83ac53..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-13
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_11.json b/libs/wire-api/test/golden/testObject_TotalSize_user_11.json
deleted file mode 100644
index 301160a9306..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-8
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_12.json b/libs/wire-api/test/golden/testObject_TotalSize_user_12.json
deleted file mode 100644
index da2d3988d7d..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_13.json b/libs/wire-api/test/golden/testObject_TotalSize_user_13.json
deleted file mode 100644
index da2d3988d7d..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_14.json b/libs/wire-api/test/golden/testObject_TotalSize_user_14.json
deleted file mode 100644
index ca7bf83ac53..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-13
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_15.json b/libs/wire-api/test/golden/testObject_TotalSize_user_15.json
deleted file mode 100644
index a5c750feac4..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-27
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_16.json b/libs/wire-api/test/golden/testObject_TotalSize_user_16.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_17.json b/libs/wire-api/test/golden/testObject_TotalSize_user_17.json
deleted file mode 100644
index 3cacc0b93c9..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-12
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_18.json b/libs/wire-api/test/golden/testObject_TotalSize_user_18.json
deleted file mode 100644
index 8580e7b684b..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-30
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_19.json b/libs/wire-api/test/golden/testObject_TotalSize_user_19.json
deleted file mode 100644
index da2d3988d7d..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_2.json b/libs/wire-api/test/golden/testObject_TotalSize_user_2.json
deleted file mode 100644
index a5c750feac4..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-27
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_20.json b/libs/wire-api/test/golden/testObject_TotalSize_user_20.json
deleted file mode 100644
index 56a6051ca2b..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_3.json b/libs/wire-api/test/golden/testObject_TotalSize_user_3.json
deleted file mode 100644
index 7813681f5b4..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_4.json b/libs/wire-api/test/golden/testObject_TotalSize_user_4.json
deleted file mode 100644
index bf0d87ab1b2..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_5.json b/libs/wire-api/test/golden/testObject_TotalSize_user_5.json
deleted file mode 100644
index b5045cc4046..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-21
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_6.json b/libs/wire-api/test/golden/testObject_TotalSize_user_6.json
deleted file mode 100644
index d8263ee9860..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_7.json b/libs/wire-api/test/golden/testObject_TotalSize_user_7.json
deleted file mode 100644
index 8580e7b684b..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-30
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_8.json b/libs/wire-api/test/golden/testObject_TotalSize_user_8.json
deleted file mode 100644
index 8580e7b684b..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-30
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TotalSize_user_9.json b/libs/wire-api/test/golden/testObject_TotalSize_user_9.json
deleted file mode 100644
index 368f89ceef1..00000000000
--- a/libs/wire-api/test/golden/testObject_TotalSize_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-28
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_1.json b/libs/wire-api/test/golden/testObject_Transport_user_1.json
index aefc161578c..e85b4faa534 100644
--- a/libs/wire-api/test/golden/testObject_Transport_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Transport_user_1.json
@@ -1 +1 @@
-"udp"
\ No newline at end of file
+"udp"
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_10.json b/libs/wire-api/test/golden/testObject_Transport_user_10.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_11.json b/libs/wire-api/test/golden/testObject_Transport_user_11.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_12.json b/libs/wire-api/test/golden/testObject_Transport_user_12.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_13.json b/libs/wire-api/test/golden/testObject_Transport_user_13.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_14.json b/libs/wire-api/test/golden/testObject_Transport_user_14.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_15.json b/libs/wire-api/test/golden/testObject_Transport_user_15.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_16.json b/libs/wire-api/test/golden/testObject_Transport_user_16.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_17.json b/libs/wire-api/test/golden/testObject_Transport_user_17.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_18.json b/libs/wire-api/test/golden/testObject_Transport_user_18.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_19.json b/libs/wire-api/test/golden/testObject_Transport_user_19.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_2.json b/libs/wire-api/test/golden/testObject_Transport_user_2.json
index 6bf3d677597..91d3af5e94f 100644
--- a/libs/wire-api/test/golden/testObject_Transport_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Transport_user_2.json
@@ -1 +1 @@
-"tcp"
\ No newline at end of file
+"tcp"
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_20.json b/libs/wire-api/test/golden/testObject_Transport_user_20.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_3.json b/libs/wire-api/test/golden/testObject_Transport_user_3.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_4.json b/libs/wire-api/test/golden/testObject_Transport_user_4.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_5.json b/libs/wire-api/test/golden/testObject_Transport_user_5.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_6.json b/libs/wire-api/test/golden/testObject_Transport_user_6.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_7.json b/libs/wire-api/test/golden/testObject_Transport_user_7.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_8.json b/libs/wire-api/test/golden/testObject_Transport_user_8.json
deleted file mode 100644
index aefc161578c..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_Transport_user_9.json b/libs/wire-api/test/golden/testObject_Transport_user_9.json
deleted file mode 100644
index 6bf3d677597..00000000000
--- a/libs/wire-api/test/golden/testObject_Transport_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_1.json b/libs/wire-api/test/golden/testObject_TurnHost_user_1.json
index ab36b0f1be7..90314af4bf5 100644
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TurnHost_user_1.json
@@ -1,4 +1,4 @@
 {
-    "tag": "TurnHostName",
-    "contents": "007.com"
-}
\ No newline at end of file
+    "contents": "007.com",
+    "tag": "TurnHostName"
+}
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_10.json b/libs/wire-api/test/golden/testObject_TurnHost_user_10.json
deleted file mode 100644
index 1ff3c98f1cc..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_10.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostIp",
-    "contents": "2684:ab8d:3fda:e8a2:a86c:843:2597:9c9a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_11.json b/libs/wire-api/test/golden/testObject_TurnHost_user_11.json
deleted file mode 100644
index 72a4d0fbc5b..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_11.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostIp",
-    "contents": "f11:2ce9:9ae4:162f:db64:e52:41c7:d9ef"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_12.json b/libs/wire-api/test/golden/testObject_TurnHost_user_12.json
index 6b239dc3500..a065c5f2ee4 100644
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_12.json
+++ b/libs/wire-api/test/golden/testObject_TurnHost_user_12.json
@@ -1,4 +1,4 @@
 {
-    "tag": "TurnHostName",
-    "contents": "xn--mgbh0fb.xn--kgbechtv"
-}
\ No newline at end of file
+    "contents": "xn--mgbh0fb.xn--kgbechtv",
+    "tag": "TurnHostName"
+}
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_13.json b/libs/wire-api/test/golden/testObject_TurnHost_user_13.json
deleted file mode 100644
index 6b239dc3500..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_13.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostName",
-    "contents": "xn--mgbh0fb.xn--kgbechtv"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_14.json b/libs/wire-api/test/golden/testObject_TurnHost_user_14.json
index 54299ddfad0..442d3182b0d 100644
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_14.json
+++ b/libs/wire-api/test/golden/testObject_TurnHost_user_14.json
@@ -1,4 +1,4 @@
 {
-    "tag": "TurnHostName",
-    "contents": "a-c"
-}
\ No newline at end of file
+    "contents": "a-c",
+    "tag": "TurnHostName"
+}
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_15.json b/libs/wire-api/test/golden/testObject_TurnHost_user_15.json
deleted file mode 100644
index ab36b0f1be7..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_15.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostName",
-    "contents": "007.com"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_16.json b/libs/wire-api/test/golden/testObject_TurnHost_user_16.json
deleted file mode 100644
index 74cd7b4f830..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_16.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostIp",
-    "contents": "43.50.81.171"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_17.json b/libs/wire-api/test/golden/testObject_TurnHost_user_17.json
deleted file mode 100644
index 6cd0d10c76e..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_17.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostIp",
-    "contents": "cafc:3e71:5359:2b79:ee8f:2baf:4f0f:f824"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_18.json b/libs/wire-api/test/golden/testObject_TurnHost_user_18.json
deleted file mode 100644
index db0355ba7cd..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_18.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostName",
-    "contents": "host.name"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_19.json b/libs/wire-api/test/golden/testObject_TurnHost_user_19.json
deleted file mode 100644
index 54299ddfad0..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_19.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostName",
-    "contents": "a-c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_2.json b/libs/wire-api/test/golden/testObject_TurnHost_user_2.json
index 1d6a91b484e..cbd5bff13c5 100644
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_2.json
+++ b/libs/wire-api/test/golden/testObject_TurnHost_user_2.json
@@ -1,4 +1,4 @@
 {
-    "tag": "TurnHostIp",
-    "contents": "135.104.207.206"
-}
\ No newline at end of file
+    "contents": "135.104.207.206",
+    "tag": "TurnHostIp"
+}
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_20.json b/libs/wire-api/test/golden/testObject_TurnHost_user_20.json
index 68e5fc87bb9..66d213f88db 100644
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_20.json
+++ b/libs/wire-api/test/golden/testObject_TurnHost_user_20.json
@@ -1,4 +1,4 @@
 {
-    "tag": "TurnHostName",
-    "contents": "123"
-}
\ No newline at end of file
+    "contents": "123",
+    "tag": "TurnHostName"
+}
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_3.json b/libs/wire-api/test/golden/testObject_TurnHost_user_3.json
deleted file mode 100644
index ab36b0f1be7..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostName",
-    "contents": "007.com"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_4.json b/libs/wire-api/test/golden/testObject_TurnHost_user_4.json
deleted file mode 100644
index 6b239dc3500..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_4.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostName",
-    "contents": "xn--mgbh0fb.xn--kgbechtv"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_5.json b/libs/wire-api/test/golden/testObject_TurnHost_user_5.json
deleted file mode 100644
index 54299ddfad0..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_5.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostName",
-    "contents": "a-c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_6.json b/libs/wire-api/test/golden/testObject_TurnHost_user_6.json
deleted file mode 100644
index cf12e4e8515..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_6.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostIp",
-    "contents": "136.254.52.77"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_7.json b/libs/wire-api/test/golden/testObject_TurnHost_user_7.json
deleted file mode 100644
index 0d0fb19e051..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_7.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tag": "TurnHostIp",
-    "contents": "99.219.232.78"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_8.json b/libs/wire-api/test/golden/testObject_TurnHost_user_8.json
index db0355ba7cd..c1c5f1611f3 100644
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_8.json
+++ b/libs/wire-api/test/golden/testObject_TurnHost_user_8.json
@@ -1,4 +1,4 @@
 {
-    "tag": "TurnHostName",
-    "contents": "host.name"
-}
\ No newline at end of file
+    "contents": "host.name",
+    "tag": "TurnHostName"
+}
diff --git a/libs/wire-api/test/golden/testObject_TurnHost_user_9.json b/libs/wire-api/test/golden/testObject_TurnHost_user_9.json
index 8719c02580f..276f8f53e2c 100644
--- a/libs/wire-api/test/golden/testObject_TurnHost_user_9.json
+++ b/libs/wire-api/test/golden/testObject_TurnHost_user_9.json
@@ -1,4 +1,4 @@
 {
-    "tag": "TurnHostIp",
-    "contents": "b486:27e7:a56f:d885:984b:2ff8:2031:b6d9"
-}
\ No newline at end of file
+    "contents": "b486:27e7:a56f:d885:984b:2ff8:2031:b6d9",
+    "tag": "TurnHostIp"
+}
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_1.json b/libs/wire-api/test/golden/testObject_TurnURI_user_1.json
index 3ceebfbe6b2..eb44b3699e8 100644
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TurnURI_user_1.json
@@ -1 +1 @@
-"turns:007.com:4?transport=tcp"
\ No newline at end of file
+"turns:007.com:4?transport=tcp"
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_10.json b/libs/wire-api/test/golden/testObject_TurnURI_user_10.json
deleted file mode 100644
index ba4e0746bf3..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:123:0?transport=tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_11.json b/libs/wire-api/test/golden/testObject_TurnURI_user_11.json
deleted file mode 100644
index c269a885532..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:44.65.131.165:0?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_12.json b/libs/wire-api/test/golden/testObject_TurnURI_user_12.json
deleted file mode 100644
index dbb639bf2dd..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn:007.com:0?transport=tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_13.json b/libs/wire-api/test/golden/testObject_TurnURI_user_13.json
deleted file mode 100644
index 2e3f8ddb607..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn:37.234.77.74:1?transport=tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_14.json b/libs/wire-api/test/golden/testObject_TurnURI_user_14.json
deleted file mode 100644
index 203c2d900b8..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:a-c:4?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_15.json b/libs/wire-api/test/golden/testObject_TurnURI_user_15.json
deleted file mode 100644
index 1689f2813ce..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn:5.194.243.81:8?transport=tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_16.json b/libs/wire-api/test/golden/testObject_TurnURI_user_16.json
deleted file mode 100644
index 21f15b72947..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:xn--mgbh0fb.xn--kgbechtv:0?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_17.json b/libs/wire-api/test/golden/testObject_TurnURI_user_17.json
deleted file mode 100644
index b01e963a0c0..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:217.142.35.220:4?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_18.json b/libs/wire-api/test/golden/testObject_TurnURI_user_18.json
deleted file mode 100644
index 84caf8e06b9..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:007.com:6?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_19.json b/libs/wire-api/test/golden/testObject_TurnURI_user_19.json
deleted file mode 100644
index e49b4e1b4c0..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:xn--mgbh0fb.xn--kgbechtv:4?transport=tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_2.json b/libs/wire-api/test/golden/testObject_TurnURI_user_2.json
deleted file mode 100644
index 7f26c3cd401..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_2.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:102.69.197.199:0?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_20.json b/libs/wire-api/test/golden/testObject_TurnURI_user_20.json
deleted file mode 100644
index 67241ca2376..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:host.name:7?transport=tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_3.json b/libs/wire-api/test/golden/testObject_TurnURI_user_3.json
deleted file mode 100644
index ea8a4fe8529..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:203.95.154.51:0?transport=tcp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_4.json b/libs/wire-api/test/golden/testObject_TurnURI_user_4.json
deleted file mode 100644
index 4a6126ebb5f..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:123:3"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_5.json b/libs/wire-api/test/golden/testObject_TurnURI_user_5.json
deleted file mode 100644
index f78e05f58a5..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:a-c:8?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_6.json b/libs/wire-api/test/golden/testObject_TurnURI_user_6.json
deleted file mode 100644
index 78249ea1f13..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:xn--mgbh0fb.xn--kgbechtv:8?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_7.json b/libs/wire-api/test/golden/testObject_TurnURI_user_7.json
deleted file mode 100644
index b016a5acb90..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"turn:xn--mgbh0fb.xn--kgbechtv:8?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_8.json b/libs/wire-api/test/golden/testObject_TurnURI_user_8.json
deleted file mode 100644
index 4c0d9a16f75..00000000000
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"turns:150.156.243.74:8?transport=udp"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TurnURI_user_9.json b/libs/wire-api/test/golden/testObject_TurnURI_user_9.json
index 87906dbb15f..3985addeddd 100644
--- a/libs/wire-api/test/golden/testObject_TurnURI_user_9.json
+++ b/libs/wire-api/test/golden/testObject_TurnURI_user_9.json
@@ -1 +1 @@
-"turn:6.222.51.171:1"
\ No newline at end of file
+"turn:6.222.51.171:1"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_1.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_1.json
index 6fecd732a91..0a21571fc37 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_1.json
@@ -1 +1 @@
-"d=15527713.v=18.k=4829.t=;.r=ptwsd7g5za2solzq6qhub3"
\ No newline at end of file
+"d=15527713.v=18.k=4829.t=;.r=ptwsd7g5za2solzq6qhub3"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_10.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_10.json
index bfce2824652..f96acf4bc1e 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_10.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_10.json
@@ -1 +1 @@
-"d=2632630.v=30.k=19902.t=\u000b.r=yagwhzw2d8tddoj4"
\ No newline at end of file
+"d=2632630.v=30.k=19902.t=\u000b.r=yagwhzw2d8tddoj4"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_11.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_11.json
index f09202932c1..875751de5b3 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_11.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_11.json
@@ -1 +1 @@
-"d=3719294.v=15.k=20428.t=潽.r=xevuwd5vsfydbvo5"
\ No newline at end of file
+"d=3719294.v=15.k=20428.t=潽.r=xevuwd5vsfydbvo5"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_12.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_12.json
index fcf7d271d02..0f974d9878c 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_12.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_12.json
@@ -1 +1 @@
-"d=11821785.v=29.k=14407.t=@.r=1t2k2a3ua0pwp196rs"
\ No newline at end of file
+"d=11821785.v=29.k=14407.t=@.r=1t2k2a3ua0pwp196rs"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_13.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_13.json
index 95f4c65d052..6bf826bc5dc 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_13.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_13.json
@@ -1 +1 @@
-"d=5664368.v=28.k=1216.t=􆲣.r=w"
\ No newline at end of file
+"d=5664368.v=28.k=1216.t=􆲣.r=w"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_14.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_14.json
index 3ec5ca1f8b9..115dc8670e0 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_14.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_14.json
@@ -1 +1 @@
-"d=3247777.v=3.k=21012.t=`.r=83sca0pn0dxoizci0g"
\ No newline at end of file
+"d=3247777.v=3.k=21012.t=`.r=83sca0pn0dxoizci0g"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_15.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_15.json
index 1c65427790f..abe19ce1484 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_15.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_15.json
@@ -1 +1 @@
-"d=11893034.v=18.k=28830.t=J.r=09x4jnuekod"
\ No newline at end of file
+"d=11893034.v=18.k=28830.t=J.r=09x4jnuekod"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_16.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_16.json
index 71eaa544a66..4d5882f6136 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_16.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_16.json
@@ -1 +1 @@
-"d=8117361.v=19.k=2488.t=,.r=ao8bs8og70"
\ No newline at end of file
+"d=8117361.v=19.k=2488.t=,.r=ao8bs8og70"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_17.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_17.json
index b86c540c4bf..be0bbf539dd 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_17.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_17.json
@@ -1 +1 @@
-"d=716501.v=1.k=5062.t=⤋.r=nct4"
\ No newline at end of file
+"d=716501.v=1.k=5062.t=⤋.r=nct4"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_18.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_18.json
index ff3be781c97..3cc65c50d72 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_18.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_18.json
@@ -1 +1 @@
-"d=5517978.v=11.k=20637.t=\u001c.r=mxlyrynabc3fkdt9ze9"
\ No newline at end of file
+"d=5517978.v=11.k=20637.t=\u001c.r=mxlyrynabc3fkdt9ze9"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_19.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_19.json
index 827bd2d8660..0d8ceff486d 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_19.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_19.json
@@ -1 +1 @@
-"d=12116794.v=8.k=19266.t=:.r=pfa5lx43lko41m"
\ No newline at end of file
+"d=12116794.v=8.k=19266.t=:.r=pfa5lx43lko41m"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_2.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_2.json
index b9b4255791f..11c9b70b9c4 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_2.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_2.json
@@ -1 +1 @@
-"d=13392461.v=9.k=13335.t=r.r=ehn30n10n6op"
\ No newline at end of file
+"d=13392461.v=9.k=13335.t=r.r=ehn30n10n6op"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_20.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_20.json
index 7d78b908b0e..68d1af82fdb 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_20.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_20.json
@@ -1 +1 @@
-"d=3040922.v=15.k=30634.t=\u000f.r=csp6eh0ti"
\ No newline at end of file
+"d=3040922.v=15.k=30634.t=\u000f.r=csp6eh0ti"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_3.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_3.json
index 83fdaab09a4..f0179f931e7 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_3.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_3.json
@@ -1 +1 @@
-"d=11177852.v=20.k=10953.t=9.r=txrqjvuzw5uokh21hitqy070mjmj"
\ No newline at end of file
+"d=11177852.v=20.k=10953.t=9.r=txrqjvuzw5uokh21hitqy070mjmj"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_4.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_4.json
index d386e2b7314..2e17f40d29a 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_4.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_4.json
@@ -1 +1 @@
-"d=14690986.v=1.k=2644.t=+.r=st5xpvjb3"
\ No newline at end of file
+"d=14690986.v=1.k=2644.t=+.r=st5xpvjb3"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_5.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_5.json
index a2a8bae695c..b40f4fce949 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_5.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_5.json
@@ -1 +1 @@
-"d=4615190.v=8.k=9984.t=S.r=u86l0yvllw39"
\ No newline at end of file
+"d=4615190.v=8.k=9984.t=S.r=u86l0yvllw39"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_6.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_6.json
index dc9531192de..cc2c3951863 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_6.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_6.json
@@ -1 +1 @@
-"d=13876542.v=9.k=544.t=\u0013.r=eg21qov6rkavdo4etld2agglp6q"
\ No newline at end of file
+"d=13876542.v=9.k=544.t=\u0013.r=eg21qov6rkavdo4etld2agglp6q"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_7.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_7.json
index 36ed692d182..d5a2f7760f6 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_7.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_7.json
@@ -1 +1 @@
-"d=604256.v=28.k=10304.t=􂀆.r=v3ectdcmttrhx8qi2jtqhmy"
\ No newline at end of file
+"d=604256.v=28.k=10304.t=􂀆.r=v3ectdcmttrhx8qi2jtqhmy"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_8.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_8.json
index 973f41c4202..680eaa6c741 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_8.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_8.json
@@ -1 +1 @@
-"d=11461340.v=30.k=32328.t==.r=55dox167gmdusgejbcu3p0kk"
\ No newline at end of file
+"d=11461340.v=30.k=32328.t==.r=55dox167gmdusgejbcu3p0kk"
diff --git a/libs/wire-api/test/golden/testObject_TurnUsername_user_9.json b/libs/wire-api/test/golden/testObject_TurnUsername_user_9.json
index 832b6590228..36181e06ff2 100644
--- a/libs/wire-api/test/golden/testObject_TurnUsername_user_9.json
+++ b/libs/wire-api/test/golden/testObject_TurnUsername_user_9.json
@@ -1 +1 @@
-"d=9116692.v=12.k=3780.t='.r=9xedqmed5p"
\ No newline at end of file
+"d=9116692.v=12.k=3780.t='.r=9xedqmed5p"
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_1.json b/libs/wire-api/test/golden/testObject_TypingData_user_1.json
index cde14fee968..3f621e699b6 100644
--- a/libs/wire-api/test/golden/testObject_TypingData_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TypingData_user_1.json
@@ -1,3 +1,3 @@
 {
     "status": "started"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_10.json b/libs/wire-api/test/golden/testObject_TypingData_user_10.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_10.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_11.json b/libs/wire-api/test/golden/testObject_TypingData_user_11.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_11.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_12.json b/libs/wire-api/test/golden/testObject_TypingData_user_12.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_12.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_13.json b/libs/wire-api/test/golden/testObject_TypingData_user_13.json
deleted file mode 100644
index f6bed934795..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_13.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "stopped"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_14.json b/libs/wire-api/test/golden/testObject_TypingData_user_14.json
deleted file mode 100644
index f6bed934795..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_14.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "stopped"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_15.json b/libs/wire-api/test/golden/testObject_TypingData_user_15.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_15.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_16.json b/libs/wire-api/test/golden/testObject_TypingData_user_16.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_16.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_17.json b/libs/wire-api/test/golden/testObject_TypingData_user_17.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_17.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_18.json b/libs/wire-api/test/golden/testObject_TypingData_user_18.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_18.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_19.json b/libs/wire-api/test/golden/testObject_TypingData_user_19.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_19.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_2.json b/libs/wire-api/test/golden/testObject_TypingData_user_2.json
deleted file mode 100644
index f6bed934795..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "stopped"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_20.json b/libs/wire-api/test/golden/testObject_TypingData_user_20.json
deleted file mode 100644
index f6bed934795..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_20.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "stopped"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_3.json b/libs/wire-api/test/golden/testObject_TypingData_user_3.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_3.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_4.json b/libs/wire-api/test/golden/testObject_TypingData_user_4.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_4.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_5.json b/libs/wire-api/test/golden/testObject_TypingData_user_5.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_5.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_6.json b/libs/wire-api/test/golden/testObject_TypingData_user_6.json
deleted file mode 100644
index f6bed934795..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_6.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "stopped"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_7.json b/libs/wire-api/test/golden/testObject_TypingData_user_7.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_7.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_8.json b/libs/wire-api/test/golden/testObject_TypingData_user_8.json
deleted file mode 100644
index f6bed934795..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_8.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "stopped"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingData_user_9.json b/libs/wire-api/test/golden/testObject_TypingData_user_9.json
deleted file mode 100644
index cde14fee968..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingData_user_9.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "status": "started"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_1.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_1.json
index e42d5fb1a4b..62344571fc5 100644
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_1.json
+++ b/libs/wire-api/test/golden/testObject_TypingStatus_user_1.json
@@ -1 +1 @@
-"stopped"
\ No newline at end of file
+"stopped"
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_10.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_10.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_10.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_11.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_11.json
deleted file mode 100644
index 9a281676819..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_11.json
+++ /dev/null
@@ -1 +0,0 @@
-"started"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_12.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_12.json
deleted file mode 100644
index 9a281676819..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_12.json
+++ /dev/null
@@ -1 +0,0 @@
-"started"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_13.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_13.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_13.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_14.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_14.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_14.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_15.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_15.json
deleted file mode 100644
index 9a281676819..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_15.json
+++ /dev/null
@@ -1 +0,0 @@
-"started"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_16.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_16.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_16.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_17.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_17.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_17.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_18.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_18.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_18.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_19.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_19.json
deleted file mode 100644
index 9a281676819..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_19.json
+++ /dev/null
@@ -1 +0,0 @@
-"started"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_2.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_2.json
index e42d5fb1a4b..8573354e077 100644
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_2.json
+++ b/libs/wire-api/test/golden/testObject_TypingStatus_user_2.json
@@ -1 +1 @@
-"stopped"
\ No newline at end of file
+"started"
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_20.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_20.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_20.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_3.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_3.json
deleted file mode 100644
index 9a281676819..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_3.json
+++ /dev/null
@@ -1 +0,0 @@
-"started"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_4.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_4.json
deleted file mode 100644
index 9a281676819..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_4.json
+++ /dev/null
@@ -1 +0,0 @@
-"started"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_5.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_5.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_5.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_6.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_6.json
deleted file mode 100644
index 9a281676819..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_6.json
+++ /dev/null
@@ -1 +0,0 @@
-"started"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_7.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_7.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_7.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_8.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_8.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_8.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_TypingStatus_user_9.json b/libs/wire-api/test/golden/testObject_TypingStatus_user_9.json
deleted file mode 100644
index e42d5fb1a4b..00000000000
--- a/libs/wire-api/test/golden/testObject_TypingStatus_user_9.json
+++ /dev/null
@@ -1 +0,0 @@
-"stopped"
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_1.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_1.json
index eaf8316b9e3..d446f5fd164 100644
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_1.json
@@ -1,104 +1,12 @@
 {
     "prekeys": [
         {
-            "key": "Ox\u0010*𝙧8m\u0014%J蛭\"/r",
-            "id": 81
+            "id": 81,
+            "key": "Ox\u0010*𝙧8m\u0014%J蛭\"/r"
         },
         {
-            "key": "r\u001d",
-            "id": 29
-        },
-        {
-            "key": "J\u0012z",
-            "id": 85
-        },
-        {
-            "key": "]\u001e횷􎥢\u00194󳈅9𤦷{􍶭d8",
-            "id": 7
-        },
-        {
-            "key": "\u0015]J4㹒\t06l\u0013",
-            "id": 86
-        },
-        {
-            "key": "0\u0000巚_6\u0016@MU􇕩",
-            "id": 70
-        },
-        {
-            "key": "\u0011E\u000fnw\u000e*x}􊍈Q\u0007\u0004󾥐\u001c",
-            "id": 70
-        },
-        {
-            "key": "􍃹9&$",
-            "id": 13
-        },
-        {
-            "key": "\u0016tGpIv\u0003⍛𦲤",
-            "id": 92
-        },
-        {
-            "key": "\u000c\\wy蠙5;",
-            "id": 33
-        },
-        {
-            "key": "\u001b?V",
-            "id": 13
-        },
-        {
-            "key": "$'\u0002U\u000c]b",
-            "id": 88
-        },
-        {
-            "key": "i<m",
-            "id": 6
-        },
-        {
-            "key": "}ru瑍\u0017믾gxGp",
-            "id": 83
-        },
-        {
-            "key": "𦣘sc|󸉇𥌹27󱹺m뉖\u001e<",
-            "id": 60
-        },
-        {
-            "key": "{\u0016[\u00104󽵓@󱹆𩒼𠰘\u0017󶋝\u0015{",
-            "id": 121
-        },
-        {
-            "key": "#CL3Q:3uzl@",
-            "id": 1
-        },
-        {
-            "key": "숱\u0008󷢎\u0016[,龐s\u0016贈@􌒆:",
-            "id": 53
-        },
-        {
-            "key": "3\t􌸹#{􇛧y&㼛𦺪􏱗A\u001e",
-            "id": 67
-        },
-        {
-            "key": "󲱨T[*O󶒇u󵈊\u0019􂀣Vᱫ!",
-            "id": 79
-        },
-        {
-            "key": "\u001c\u0001\u000f\t=Q𦓇𤔿_6x-",
-            "id": 6
-        },
-        {
-            "key": "\u0000",
-            "id": 120
-        },
-        {
-            "key": "vᝡ*\u0004\u0016\u001b\u000b\r󻐟𤡈b\"<󶓭􉭝",
-            "id": 102
-        },
-        {
-            "key": "&\u0017\u0006 ",
-            "id": 77
-        },
-        {
-            "key": "􍀲􏚝*\u0006\u0013+_v^t",
-            "id": 112
+            "id": 29,
+            "key": "r\u001d"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_10.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_10.json
deleted file mode 100644
index e26ab0a9f7f..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_10.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "X*\u0018D\u000bsaQ\u000c",
-            "id": 97
-        },
-        {
-            "key": "ᴞ\u0015暞E􈢐h+$",
-            "id": 53
-        },
-        {
-            "key": "pExkb{U\u001fZ󶬧X],2\u0011",
-            "id": 64
-        },
-        {
-            "key": "𑍧\tS",
-            "id": 117
-        },
-        {
-            "key": "\u0014C",
-            "id": 89
-        },
-        {
-            "key": "",
-            "id": 120
-        },
-        {
-            "key": "𨿆",
-            "id": 8
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_11.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_11.json
deleted file mode 100644
index 02570503f48..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_11.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "PZ𦮕W󵐏",
-            "id": 18
-        },
-        {
-            "key": "\u0016)",
-            "id": 107
-        },
-        {
-            "key": "/^a\u0012\u0005ﱧ",
-            "id": 24
-        },
-        {
-            "key": ".o𪇴1|",
-            "id": 25
-        },
-        {
-            "key": "-T\u0011\u0007T\\\u001bY󷲂ez>",
-            "id": 10
-        },
-        {
-            "key": "\u001d!xZJj",
-            "id": 10
-        },
-        {
-            "key": "\u000b󼉁\n􋛓󾘉",
-            "id": 65
-        },
-        {
-            "key": "9\u0017S\u000e=罗oa$g",
-            "id": 4
-        },
-        {
-            "key": "Qv4bD",
-            "id": 107
-        },
-        {
-            "key": "䊯Z;8𭕏𘈄paT",
-            "id": 46
-        },
-        {
-            "key": "1󵍪|\u0005DJ󲫊\u0003;|\u0006;",
-            "id": 118
-        },
-        {
-            "key": "\u001aF",
-            "id": 99
-        },
-        {
-            "key": "",
-            "id": 5
-        },
-        {
-            "key": "\u0012F3\u0006\u0001\u0011",
-            "id": 85
-        },
-        {
-            "key": "􀯚𤷟#\u0013􃥿4\u0012𑦥\u001a\\z",
-            "id": 35
-        },
-        {
-            "key": "o\u001c\n􎄆*\u0018",
-            "id": 4
-        },
-        {
-            "key": "􉵊󶺡",
-            "id": 17
-        },
-        {
-            "key": "썂\u0011󹁤L",
-            "id": 71
-        },
-        {
-            "key": "ꮴz𣙟󿁚􇯱",
-            "id": 80
-        },
-        {
-            "key": "3\u0014gx赁<",
-            "id": 109
-        },
-        {
-            "key": "􊔨\u0018󵇜,.\u0002#􃧫",
-            "id": 123
-        },
-        {
-            "key": "$E📏jຖ𩊅𑱚",
-            "id": 2
-        },
-        {
-            "key": "\u000c󰇧E\u0016\u0001Tsw{P􅆷󵐠D\u001b",
-            "id": 118
-        },
-        {
-            "key": "M>\u0008􆃇􇰿Z\u0019􇒎7\u0005",
-            "id": 18
-        },
-        {
-            "key": "O\rn,󴰕\u0017E𨮃F^-𩖩\u0013",
-            "id": 8
-        },
-        {
-            "key": "U\u0018\u0006@",
-            "id": 59
-        },
-        {
-            "key": "3p🎉􉏩C",
-            "id": 112
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_12.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_12.json
deleted file mode 100644
index 00295f410ed..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_12.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "𛃥󳺘@a",
-            "id": 35
-        },
-        {
-            "key": "􏻊\u0004𧭸^Ec\u001bH􋥔`",
-            "id": 78
-        },
-        {
-            "key": "gf2p",
-            "id": 101
-        },
-        {
-            "key": "􊻸8",
-            "id": 27
-        },
-        {
-            "key": "ꎭe\u00084?𨠘.\n𝓕5鵣𮚺赦[F",
-            "id": 19
-        },
-        {
-            "key": "h(󴰳𣮏{R\u0018i|E)\u0017!S",
-            "id": 0
-        },
-        {
-            "key": "TV\u0019-",
-            "id": 51
-        },
-        {
-            "key": "\u0018=ྨ}⨚z󳘶\u000fWf",
-            "id": 76
-        },
-        {
-            "key": "]",
-            "id": 51
-        },
-        {
-            "key": "S簀𬄦[EV\u0016\u0008/=\\\u0019\u000b",
-            "id": 107
-        },
-        {
-            "key": "w\\\u0005o/j9󺼄j楋rﳆ",
-            "id": 25
-        },
-        {
-            "key": "Mj󿶃(z\u001f󿲫\t",
-            "id": 46
-        },
-        {
-            "key": ",`\nw^",
-            "id": 101
-        },
-        {
-            "key": "hPs𓌆@󲆷Q𑠺\u0011𓂤\u0016􅎑$1",
-            "id": 105
-        },
-        {
-            "key": "󸿠",
-            "id": 51
-        },
-        {
-            "key": "\u0017",
-            "id": 14
-        },
-        {
-            "key": "&;\u0010\n=FOH󺀑鲦^D",
-            "id": 76
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_13.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_13.json
deleted file mode 100644
index dbb43e4d40d..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_13.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": ",WcO䴲",
-            "id": 87
-        },
-        {
-            "key": "/!>r𠪎jn꾖󴆈",
-            "id": 39
-        },
-        {
-            "key": ">^󻑤}\r\u0019\u001fOCm󽞦\u001249",
-            "id": 12
-        },
-        {
-            "key": "D",
-            "id": 5
-        },
-        {
-            "key": "@9N[𥠷𪮸\u0003yS琏U<;\u000b",
-            "id": 109
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_14.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_14.json
deleted file mode 100644
index 36eeffd1455..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_14.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "!$r7\u0012nS󼈚\u0016",
-            "id": 125
-        },
-        {
-            "key": "/$N\u0018,󹞲Y\u000640𠢷\r",
-            "id": 25
-        },
-        {
-            "key": "\u0019%k}\u001b󽾛",
-            "id": 62
-        },
-        {
-            "key": "𨕭q\r\u0006f󱖕~𠜺\u001e/🕔a K",
-            "id": 20
-        },
-        {
-            "key": "L\t]",
-            "id": 59
-        },
-        {
-            "key": "",
-            "id": 47
-        },
-        {
-            "key": "D泬󰈹O\u0014I󴾎n1\u0016\u0010",
-            "id": 13
-        },
-        {
-            "key": "􃖰\u001d𥠛󹵍\u001cl5{\u0015/󰰟鬴CX?",
-            "id": 50
-        },
-        {
-            "key": "z\u00166\u0018fQ-󻷕sD\u001a󸑕]\\",
-            "id": 94
-        },
-        {
-            "key": "4\u0013󼧕󶪶nvb<",
-            "id": 100
-        },
-        {
-            "key": "3শyi􏢉(\u001e",
-            "id": 10
-        },
-        {
-            "key": "8p",
-            "id": 66
-        },
-        {
-            "key": "\u001f44|􃔃i\u001f",
-            "id": 71
-        },
-        {
-            "key": "\u001aꍿ*ɪ",
-            "id": 49
-        },
-        {
-            "key": "W|R􍟨m.\u000e􍭁\u0006@\u000b\u0008𬨫 ",
-            "id": 93
-        },
-        {
-            "key": "\u001b1\u0008'\r#\u000ev\u0004",
-            "id": 80
-        },
-        {
-            "key": "\u0019B􅈑\u0015\u001bg:d7kU\u001c",
-            "id": 59
-        },
-        {
-            "key": "]\u0015󰮖]Qu_",
-            "id": 120
-        },
-        {
-            "key": "o",
-            "id": 53
-        },
-        {
-            "key": "",
-            "id": 27
-        },
-        {
-            "key": "Ⴙ\u0013𥑳",
-            "id": 103
-        },
-        {
-            "key": "y뗻\u001a\u0019U&0䌪",
-            "id": 62
-        },
-        {
-            "key": ")󿰊(",
-            "id": 75
-        },
-        {
-            "key": "\u00028Z󺾜",
-            "id": 10
-        },
-        {
-            "key": "\n12\u0018",
-            "id": 59
-        },
-        {
-            "key": "󴷋n󺋃%h︵􈢊{U0",
-            "id": 95
-        },
-        {
-            "key": "ာk𭟛齽\rZ)+",
-            "id": 67
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_15.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_15.json
deleted file mode 100644
index 3f771c4dd8d..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_15.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "&𗪚팠󼹦\u001a\u000e\u0004",
-            "id": 109
-        },
-        {
-            "key": "𞢋D𩶉p",
-            "id": 0
-        },
-        {
-            "key": "\rPt>\u0011딬",
-            "id": 84
-        },
-        {
-            "key": "㬱<i7\rA􃜀𬹀𪞄)g",
-            "id": 51
-        },
-        {
-            "key": "",
-            "id": 73
-        },
-        {
-            "key": "",
-            "id": 21
-        },
-        {
-            "key": "\u0017]",
-            "id": 4
-        },
-        {
-            "key": ":\u0003\u0019𭀀S\u0015𦴿\r\u0006躔𥽌\u0008Qdt",
-            "id": 33
-        },
-        {
-            "key": "f6\n󼤪",
-            "id": 63
-        },
-        {
-            "key": "\u000bꑽꦎpw",
-            "id": 10
-        },
-        {
-            "key": "\\hl\u0019𮬬?[\u001a7􄄠\u0010𪂗k",
-            "id": 31
-        },
-        {
-            "key": "(\u001blKoe",
-            "id": 39
-        },
-        {
-            "key": "\u0004􉎟0yq𢊥JoM\u0010",
-            "id": 112
-        },
-        {
-            "key": "\u001auX",
-            "id": 6
-        },
-        {
-            "key": "x⣰B󹝃I󽏁<𣕾跧\u0008",
-            "id": 25
-        },
-        {
-            "key": "s󲯿A7\u0019~\u00112^􏿗\u0018",
-            "id": 12
-        },
-        {
-            "key": "鳣0@",
-            "id": 42
-        },
-        {
-            "key": "󲶊m\u000c7d􊿘𬮗z\u001f",
-            "id": 26
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_16.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_16.json
deleted file mode 100644
index c06479c5e56..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_16.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "􆤼^􊡀\u0018*w󺶬",
-            "id": 40
-        },
-        {
-            "key": "X\u0013\u000cp\u0014󲮭'𢜬G捓𨃤󼵩Bp`",
-            "id": 65
-        },
-        {
-            "key": "\u000b\u0012\u0003󿝩",
-            "id": 55
-        },
-        {
-            "key": "h\u0000-􈘌",
-            "id": 91
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_17.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_17.json
deleted file mode 100644
index ee370173787..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_17.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "wJꃜ;\u000b",
-            "id": 29
-        },
-        {
-            "key": "𬯨\u0001E\u0000",
-            "id": 4
-        },
-        {
-            "key": "󽉪 w\u0015",
-            "id": 40
-        },
-        {
-            "key": "q\u0004\u001eW󵓗\u000f\u0019\r󵀻",
-            "id": 34
-        },
-        {
-            "key": "𘆿o-ꬰ\u0002\u0005𤐮󾒱w\u0006~􎼡x\u0000e",
-            "id": 39
-        },
-        {
-            "key": "",
-            "id": 82
-        },
-        {
-            "key": "\u000b]W\u0004􈷴湶􆳗<@u&⌠〤\u0001\u000e",
-            "id": 53
-        },
-        {
-            "key": "C",
-            "id": 122
-        },
-        {
-            "key": "~|\u001e0𠏝",
-            "id": 35
-        },
-        {
-            "key": "砟",
-            "id": 6
-        },
-        {
-            "key": "E",
-            "id": 100
-        },
-        {
-            "key": "R󶀰\u0014+`\u000cV",
-            "id": 86
-        },
-        {
-            "key": "K%",
-            "id": 100
-        },
-        {
-            "key": "\n\u0002+𮞄9磇󾂭&dꅢB󼨡\u0001",
-            "id": 116
-        },
-        {
-            "key": "𤌰8FI䏐ar=󴉲",
-            "id": 25
-        },
-        {
-            "key": "j􁔙ve8\u0010<y\u001b\u0002 \u0019g",
-            "id": 57
-        },
-        {
-            "key": "+<%Y\u0010KᴅX🎋\t%RTf",
-            "id": 71
-        },
-        {
-            "key": "\u001a\u0011",
-            "id": 82
-        },
-        {
-            "key": "󵛗􊒫/न",
-            "id": 20
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_18.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_18.json
deleted file mode 100644
index bc2dfce434f..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_18.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "𘏥i\u0005Q\u0002",
-            "id": 56
-        },
-        {
-            "key": "󴴧ੱ\u0019;\u0007譜R𛁋[𮣜=/h􄡄W",
-            "id": 49
-        },
-        {
-            "key": "􍻇_",
-            "id": 92
-        },
-        {
-            "key": "9X\u001ca🤊\u001b\u001eH",
-            "id": 8
-        },
-        {
-            "key": "\u0015r𦟀^}t羟",
-            "id": 67
-        },
-        {
-            "key": "pﱵ屫B`?\u0000圴緾\u000c",
-            "id": 84
-        },
-        {
-            "key": "8\u0006\u000bo󾘽􋰷\"\u0013􍦑",
-            "id": 16
-        },
-        {
-            "key": "驄\r𫃝\u000e\u0005M􉫷\u0002X",
-            "id": 77
-        },
-        {
-            "key": "\u0018㬁4X\\𐆚G#yg迁𥁁\u001c",
-            "id": 43
-        },
-        {
-            "key": "LBE\u001f\u000e",
-            "id": 75
-        },
-        {
-            "key": "%UL",
-            "id": 56
-        },
-        {
-            "key": "\u000b)􋋼벉\u0007뉚v\u0010.G\t",
-            "id": 70
-        },
-        {
-            "key": "\t4b2U",
-            "id": 32
-        },
-        {
-            "key": "\u000e|\u0008󸻲즹aQ􊑾l𧠮",
-            "id": 41
-        },
-        {
-            "key": "\u0011",
-            "id": 98
-        },
-        {
-            "key": "\r\u0000h\u000c2",
-            "id": 18
-        },
-        {
-            "key": "V#L𫹅i*\u000b<%\\jIr\u000c",
-            "id": 15
-        },
-        {
-            "key": "𣺂-Z\u0017tS",
-            "id": 67
-        },
-        {
-            "key": "䘘T",
-            "id": 61
-        },
-        {
-            "key": " ",
-            "id": 41
-        },
-        {
-            "key": "BV􎚼\u000b􍰆wT?󾮭\u000b𭫙󰝀G?",
-            "id": 106
-        },
-        {
-            "key": "툐?,q𓋂<𔕢𖠁",
-            "id": 75
-        },
-        {
-            "key": "\u0005",
-            "id": 51
-        },
-        {
-            "key": "D^",
-            "id": 14
-        },
-        {
-            "key": "pV+蛄F=􄦙<",
-            "id": 100
-        },
-        {
-            "key": "5fIV/ddv\u001fQO\u000c\u000e\r",
-            "id": 71
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_19.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_19.json
deleted file mode 100644
index c70611ebdb4..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_19.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "Y)w\t",
-            "id": 112
-        },
-        {
-            "key": "_𡇻s",
-            "id": 10
-        },
-        {
-            "key": "^^%\u0011\tCK􀗔x0⺋x",
-            "id": 97
-        },
-        {
-            "key": "\u001bj\u0003&@\u0013N𠎚)t\u0012E*3",
-            "id": 34
-        },
-        {
-            "key": "\u0013偭^\tW)",
-            "id": 63
-        },
-        {
-            "key": "/\u00011󴄨\u0003",
-            "id": 77
-        },
-        {
-            "key": "𤍡",
-            "id": 124
-        },
-        {
-            "key": "`",
-            "id": 28
-        },
-        {
-            "key": "Yb6",
-            "id": 107
-        },
-        {
-            "key": "\u0015G)󴩒󿚤틟𝢧\u001c",
-            "id": 104
-        },
-        {
-            "key": ")𒌧}y􀙘􋋶F􍣊i&=t󠄙b",
-            "id": 88
-        },
-        {
-            "key": "I媚\u0015C",
-            "id": 36
-        },
-        {
-            "key": "􎩾+󺵕\"\u0016uv_)2d\nh\u000f",
-            "id": 128
-        },
-        {
-            "key": "\u0005cG5OL\t􋐖-Lc𮀄",
-            "id": 24
-        },
-        {
-            "key": "ab\u0000甑L*$C",
-            "id": 84
-        },
-        {
-            "key": "\u0012Z",
-            "id": 21
-        },
-        {
-            "key": "󸰯bh􅫎1A\u001fV\\\u001e5",
-            "id": 63
-        },
-        {
-            "key": "\u0011𨄱C\u0006)|~󶤰D",
-            "id": 115
-        },
-        {
-            "key": ">$𧭉U􎘍",
-            "id": 16
-        },
-        {
-            "key": "\u0013g𓈺J萆\u001d>8_𠡑󲮘|",
-            "id": 47
-        },
-        {
-            "key": "-\u0016j`u4dy1󺷀㳐\u0010",
-            "id": 80
-        },
-        {
-            "key": "",
-            "id": 54
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_2.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_2.json
index f7d7b7745e5..cf10e4667cc 100644
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_2.json
@@ -1,120 +1,3 @@
 {
-    "prekeys": [
-        {
-            "key": "I􍼁CY<𤇏&\u0015⑀)HG",
-            "id": 12
-        },
-        {
-            "key": "M0\r>󱳳<)5",
-            "id": 56
-        },
-        {
-            "key": "",
-            "id": 43
-        },
-        {
-            "key": "x\\\u000c",
-            "id": 92
-        },
-        {
-            "key": "䍫q",
-            "id": 46
-        },
-        {
-            "key": "wap\u000e\r﮷\u001d0md\u0001󹍓",
-            "id": 3
-        },
-        {
-            "key": "q鮷墆\u0010&@^𮞟9|󽀍.𔑋b;",
-            "id": 80
-        },
-        {
-            "key": "p\u0003",
-            "id": 42
-        },
-        {
-            "key": "\t",
-            "id": 98
-        },
-        {
-            "key": "@(h",
-            "id": 95
-        },
-        {
-            "key": "􈻣󺈲󿙵O\u001eOmz\u0014🤔󵻦",
-            "id": 35
-        },
-        {
-            "key": "[",
-            "id": 62
-        },
-        {
-            "key": "",
-            "id": 87
-        },
-        {
-            "key": "R\u001e;g",
-            "id": 75
-        },
-        {
-            "key": "Nb􁣄9",
-            "id": 87
-        },
-        {
-            "key": "뛰\u0014,\u0014",
-            "id": 108
-        },
-        {
-            "key": ",_𭲗fU",
-            "id": 25
-        },
-        {
-            "key": "\u001e􅡗\\\u0000",
-            "id": 11
-        },
-        {
-            "key": "#Fr\u0003~yKNG",
-            "id": 110
-        },
-        {
-            "key": "4o%咵𮦧\u0002\u0003U",
-            "id": 120
-        },
-        {
-            "key": "\u0019G",
-            "id": 19
-        },
-        {
-            "key": "",
-            "id": 20
-        },
-        {
-            "key": "rXz{Al",
-            "id": 84
-        },
-        {
-            "key": "𣸋𘡣\u0011𥠱\u0003<\u0007Ft}\u0001􂰊/􍶙'",
-            "id": 118
-        },
-        {
-            "key": "\u0012X\u0016gJp\u000fX=z-􇡎/𫟭󻍖",
-            "id": 103
-        },
-        {
-            "key": "􀖐3]\tV𒈥\u0006L/𭀢\u00106",
-            "id": 2
-        },
-        {
-            "key": "p캐a𗝯0",
-            "id": 70
-        },
-        {
-            "key": "A;(hc\u0016\u0003𦙍(\\",
-            "id": 65
-        },
-        {
-            "key": "",
-            "id": 25
-        }
-    ]
-}
\ No newline at end of file
+    "prekeys": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_20.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_20.json
deleted file mode 100644
index 44724b33eb7..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_20.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "n󻿠炽bJ",
-            "id": 98
-        },
-        {
-            "key": "",
-            "id": 119
-        },
-        {
-            "key": ";n4𝤜󴧥𑊆oq&]W;􆝦",
-            "id": 101
-        },
-        {
-            "key": "\"%6=𞲖]9n ",
-            "id": 58
-        },
-        {
-            "key": "1\u0005\u001dQ􏴺C^M\u0008O;^",
-            "id": 88
-        },
-        {
-            "key": "\u0010􏂇\u001e\u0015󹓷X6\u0013\u0010",
-            "id": 83
-        },
-        {
-            "key": "N\u001f?hX𭩧静𘥨",
-            "id": 116
-        },
-        {
-            "key": "Q\u0018",
-            "id": 43
-        },
-        {
-            "key": "󳯨ZT-H\"\u0011\\B𮇱a꧔f`c",
-            "id": 60
-        },
-        {
-            "key": "\u001a",
-            "id": 28
-        },
-        {
-            "key": "*𝂩<3",
-            "id": 20
-        },
-        {
-            "key": "\u0005\u000f\u0008Ij\u000f1󸵄SB𤌓",
-            "id": 120
-        },
-        {
-            "key": "𗂘\u001b[",
-            "id": 24
-        },
-        {
-            "key": "𥵹𩶽",
-            "id": 117
-        },
-        {
-            "key": "AclL\u001c",
-            "id": 11
-        },
-        {
-            "key": "i/\u0011\u0005K\u0012q\u0007",
-            "id": 39
-        },
-        {
-            "key": "qᗴ\u0012ᐁ𭂞",
-            "id": 97
-        },
-        {
-            "key": "3\n\u0012\u000fYl@\u0016󰏡n",
-            "id": 41
-        },
-        {
-            "key": "*󶠖\u0003􀑳\u0001",
-            "id": 30
-        },
-        {
-            "key": "\u001fZ';􅄰v6\"\u000b𝐠",
-            "id": 35
-        },
-        {
-            "key": "ℰ{w\u000f􂯌󹜆{𡤇𔗫",
-            "id": 62
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_3.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_3.json
deleted file mode 100644
index 3a757c3a0e9..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_3.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "P`\u0003o`9Q4쇩\u0001a\u001bqY{",
-            "id": 120
-        },
-        {
-            "key": "t\u0015\u0012?O\u001bb5W",
-            "id": 35
-        },
-        {
-            "key": "$",
-            "id": 100
-        },
-        {
-            "key": "鹛]m)",
-            "id": 121
-        },
-        {
-            "key": "-5}]Q\u001a\u0008\u001dR/d",
-            "id": 33
-        },
-        {
-            "key": " Fq9?L\u0003",
-            "id": 107
-        },
-        {
-            "key": "e\r\u0013\u001f󽔇􈦤-W\u0002󷳮󱘇B󳸺",
-            "id": 84
-        },
-        {
-            "key": "\u001aY鄲􇘈T𤁦\u0016\r",
-            "id": 25
-        },
-        {
-            "key": "~폜2􍁜\u000f\u000bI:W𧓚r",
-            "id": 27
-        },
-        {
-            "key": "燲c𨸉\u0018𥄱ཐT㻼=MW\u0017\u001a",
-            "id": 76
-        },
-        {
-            "key": "􃽸􃜘\u0006.Z",
-            "id": 33
-        },
-        {
-            "key": "􍳸@e[𡮦4",
-            "id": 52
-        },
-        {
-            "key": "󼒏B\u001f!pV",
-            "id": 121
-        },
-        {
-            "key": "\u001f\u0013󴀆2ꮅ􁓸\u0016",
-            "id": 72
-        },
-        {
-            "key": "\u0006O",
-            "id": 69
-        },
-        {
-            "key": "kOyh􌹍\u000f􃁬g",
-            "id": 16
-        },
-        {
-            "key": "\u0017U:$",
-            "id": 110
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_4.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_4.json
deleted file mode 100644
index 4e771832687..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_4.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "j:c",
-            "id": 77
-        },
-        {
-            "key": "\u000c 7Dy'T\u001cm\u0007",
-            "id": 96
-        },
-        {
-            "key": "",
-            "id": 69
-        },
-        {
-            "key": "\u0006D󿙻F",
-            "id": 123
-        },
-        {
-            "key": "􆭝󰐻\n𢁍\u000bⓩ􀰮+伥'",
-            "id": 97
-        },
-        {
-            "key": "𨘣]\u000b=􎠓p\u0019B",
-            "id": 101
-        },
-        {
-            "key": "CG>@􅧈w+w\u001bᖭYC",
-            "id": 108
-        },
-        {
-            "key": "r蘺褱᠈\"1*:\u0000QR􂧖",
-            "id": 99
-        },
-        {
-            "key": "'>\u0010Yv鿔",
-            "id": 63
-        },
-        {
-            "key": "\u0017x􌠑󷟫",
-            "id": 75
-        },
-        {
-            "key": ",Jp",
-            "id": 51
-        },
-        {
-            "key": ";𧊂Kr𠹓'",
-            "id": 92
-        },
-        {
-            "key": "\u0004\n󽐭𠼸|MLd`\u001aek`",
-            "id": 110
-        },
-        {
-            "key": "rm{I\u0018G𐍣e῏𨇎􅏛𡃸",
-            "id": 121
-        },
-        {
-            "key": "nkP|󹃇\u0010^𤚆'ﴛ",
-            "id": 29
-        },
-        {
-            "key": "f\u0002􁁣r\u0013R?𫟐\u0001",
-            "id": 45
-        },
-        {
-            "key": "\u000c𥇾dL访󺘥G\"",
-            "id": 11
-        },
-        {
-            "key": "𤍕\n𣴂\n\u0010<\u001c>Qd@n|R",
-            "id": 51
-        },
-        {
-            "key": "w𬪄",
-            "id": 84
-        },
-        {
-            "key": ";",
-            "id": 50
-        },
-        {
-            "key": "󹆸5^r=@",
-            "id": 72
-        },
-        {
-            "key": "\u0015x􄴭\u001f",
-            "id": 66
-        },
-        {
-            "key": "gGk",
-            "id": 76
-        },
-        {
-            "key": "aKN\u0010o􈤐",
-            "id": 23
-        },
-        {
-            "key": "􄆍cT%?\t􅁅",
-            "id": 37
-        },
-        {
-            "key": "𗁖\"YE:Tmg",
-            "id": 38
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_5.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_5.json
deleted file mode 100644
index 1e6608fcc6a..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_5.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": ")tӎMf]ph\r􁥪䝓 t",
-            "id": 80
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_6.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_6.json
deleted file mode 100644
index 207699c8dc3..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_6.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "V!\u000fz",
-            "id": 86
-        },
-        {
-            "key": "󶸲󱴎󺉆$􉳄g𣭋pp\u0016j",
-            "id": 90
-        },
-        {
-            "key": "g㑘N\r\u000ec`_6\u001bꂵ1󿼵9",
-            "id": 14
-        },
-        {
-            "key": "U",
-            "id": 14
-        },
-        {
-            "key": "Y\u001ay􋸦险",
-            "id": 105
-        },
-        {
-            "key": "'㢏4v/h\u0006\u0001\u001f強🁡\u0012J\u000b",
-            "id": 63
-        },
-        {
-            "key": "D󴽱",
-            "id": 102
-        },
-        {
-            "key": "\u001ce28\u0005",
-            "id": 31
-        },
-        {
-            "key": "d뒌dy𠱷5𮩅Z1",
-            "id": 0
-        },
-        {
-            "key": "q7\u0006Ag=\".%G,􃨈●膕b",
-            "id": 63
-        },
-        {
-            "key": "㍛Af*\u0014𗷠R}",
-            "id": 54
-        },
-        {
-            "key": "\u0010􏃧뷢\u0007󺳋k[~Z?\u0016榘s'",
-            "id": 77
-        },
-        {
-            "key": "󰵛",
-            "id": 107
-        },
-        {
-            "key": "\u0006v",
-            "id": 89
-        },
-        {
-            "key": "",
-            "id": 112
-        },
-        {
-            "key": "#C\u0005󿵮􉘸ix\u001d?9j󱒀\u0014\u0012\u0017",
-            "id": 24
-        },
-        {
-            "key": "󷗗\u0018",
-            "id": 5
-        },
-        {
-            "key": "{Z`}\u0011ADO􇏄>#\r/琘",
-            "id": 22
-        },
-        {
-            "key": "L\u0010:",
-            "id": 50
-        },
-        {
-            "key": "\u0014%\u0018JNS\u000c",
-            "id": 17
-        },
-        {
-            "key": "^𑁬𮠖2㜇XhPur\"\u0004al",
-            "id": 71
-        },
-        {
-            "key": "oE\u0019󻕼jໂ\u0002#6󹆮+􂊴",
-            "id": 4
-        },
-        {
-            "key": "(\u001ba",
-            "id": 91
-        },
-        {
-            "key": "\u001fd䵤'0\u0017f\u0013Q(\u0008\u0011h",
-            "id": 120
-        },
-        {
-            "key": "M뇘􇰻c蒿0k󷚹",
-            "id": 51
-        },
-        {
-            "key": "7𣽌\u0012p􈡬6\u0013\u001eaJZ󺐽X",
-            "id": 55
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_7.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_7.json
deleted file mode 100644
index e25d742e7cf..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_7.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "󹎦N':`_j𩺚",
-            "id": 128
-        },
-        {
-            "key": "ឮ󼧰:)\u00142䢋]S\u0016\u000e󺆪𐠍",
-            "id": 17
-        },
-        {
-            "key": "㮔*?𧇏䪅6\u00041𫃜󴟐",
-            "id": 22
-        },
-        {
-            "key": "E",
-            "id": 27
-        },
-        {
-            "key": "",
-            "id": 5
-        },
-        {
-            "key": "#\u0015",
-            "id": 47
-        },
-        {
-            "key": "\u0019c*^r\r",
-            "id": 5
-        },
-        {
-            "key": "\r𤞖",
-            "id": 109
-        },
-        {
-            "key": "􄝫u\u001eY.K􅌇\r5\u0004#𑘭\u0014",
-            "id": 46
-        },
-        {
-            "key": "H\t$+\u001av\u001c\u0001i",
-            "id": 121
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_8.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_8.json
deleted file mode 100644
index 7ccc49f15e2..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_8.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "𨁭􄩱􁠱J󾈐",
-            "id": 76
-        },
-        {
-            "key": "o\u001fOO/4􈝳\u0002",
-            "id": 8
-        },
-        {
-            "key": "􀱎X􂅏\u0018𑿯u\u0015#󲢥j",
-            "id": 33
-        },
-        {
-            "key": "tX𠛧O\u0008쬕󾚐B^󺴠",
-            "id": 118
-        },
-        {
-            "key": "󰊑`",
-            "id": 41
-        },
-        {
-            "key": "t󰡣)䎰!c\u001eGp𭞁6\u000b𬺷",
-            "id": 7
-        },
-        {
-            "key": "𤉓eDC",
-            "id": 93
-        },
-        {
-            "key": "k+曷\u0001]󻥶\u0004󼼂䥚7!w",
-            "id": 61
-        },
-        {
-            "key": "\u001d\t䌁-󼍚𝡌L",
-            "id": 95
-        },
-        {
-            "key": "zHf󰚐,|!pL",
-            "id": 75
-        },
-        {
-            "key": "Z6\"|􌁟d𭌻m\u0015Z\u000eAZ",
-            "id": 12
-        },
-        {
-            "key": "\u0007𭎔(",
-            "id": 94
-        },
-        {
-            "key": "E󻦏q'\u0017ᤀ:$~",
-            "id": 32
-        },
-        {
-            "key": "@A*)\u001fBk\u001f\u001e\u0004\u0015\u0011􇍤",
-            "id": 119
-        },
-        {
-            "key": "}4𦸷7t/R",
-            "id": 106
-        },
-        {
-            "key": "􈛣'_􊐔\u000e.􌺷H\u0003Q\u0015BS𬟘?",
-            "id": 44
-        },
-        {
-            "key": "&3赾_",
-            "id": 126
-        },
-        {
-            "key": "􆖴\u0015Tl 𐲝kRq",
-            "id": 101
-        },
-        {
-            "key": "",
-            "id": 44
-        },
-        {
-            "key": "P𥷥಼𨱶軥",
-            "id": 42
-        },
-        {
-            "key": "\rya-d",
-            "id": 73
-        },
-        {
-            "key": "󺭉\u0002\u0011}",
-            "id": 73
-        },
-        {
-            "key": "",
-            "id": 24
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_9.json b/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_9.json
deleted file mode 100644
index 049159de6c5..00000000000
--- a/libs/wire-api/test/golden/testObject_UpdateBotPrekeys_user_9.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "prekeys": [
-        {
-            "key": "`",
-            "id": 85
-        },
-        {
-            "key": "f:\u0003}A\n📯9G^\u0014\u0008",
-            "id": 49
-        },
-        {
-            "key": " \u00027\u001b󹥍-𐅉+5\u001cg`u2𬃑",
-            "id": 74
-        },
-        {
-            "key": "𡋪\r\u001f?-'8C",
-            "id": 103
-        },
-        {
-            "key": "󷤖\u0012uPC𦥻\u001b셠1𪏊\u0002<Y",
-            "id": 80
-        },
-        {
-            "key": "􊤛􅄝𬏨",
-            "id": 48
-        },
-        {
-            "key": "B",
-            "id": 35
-        },
-        {
-            "key": "g$S􃧥G􍵭",
-            "id": 48
-        }
-    ]
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_1.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_1.json
index de558d16fd6..bd8d2ce2ec5 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_1.json
@@ -1,16 +1,16 @@
 {
     "lastkey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "prekeys": [
         {
-            "key": ",",
-            "id": 2
+            "id": 2,
+            "key": ","
         },
         {
-            "key": "G󽰔",
-            "id": 1
+            "id": 1,
+            "key": "G󽰔"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_10.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_10.json
index 0abc6803fb0..b65ab21495e 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_10.json
@@ -1,24 +1,24 @@
 {
     "lastkey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_11.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_11.json
index b2b0215d32b..a76feaa29b4 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_11.json
@@ -1,25 +1,25 @@
 {
+    "label": "`9q)巷",
     "prekeys": [
         {
-            "key": "(",
-            "id": 0
+            "id": 0,
+            "key": "("
         },
         {
-            "key": ":",
-            "id": 1
+            "id": 1,
+            "key": ":"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "d",
-            "id": 0
+            "id": 0,
+            "key": "d"
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
-    ],
-    "label": "`9q)巷"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_12.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_12.json
index 803fe44be4e..b1c08c1b190 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_12.json
@@ -1,9 +1,9 @@
 {
+    "label": "o\u001a",
     "prekeys": [
         {
-            "key": "W帟S",
-            "id": 3
+            "id": 3,
+            "key": "W帟S"
         }
-    ],
-    "label": "o\u001a"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_13.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_13.json
index 24f90631391..ca858396e70 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_13.json
@@ -1,13 +1,13 @@
 {
+    "label": "",
     "lastkey": {
-        "key": "/\u0018󻰔\u0010k",
-        "id": 65535
+        "id": 65535,
+        "key": "/\u0018󻰔\u0010k"
     },
     "prekeys": [
         {
-            "key": "z澐]",
-            "id": 0
+            "id": 0,
+            "key": "z澐]"
         }
-    ],
-    "label": ""
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_14.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_14.json
index 8b9a3069d8e..6f8e06f5d71 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_14.json
@@ -1,12 +1,12 @@
 {
     "lastkey": {
-        "key": "'S\u0007sm",
-        "id": 65535
+        "id": 65535,
+        "key": "'S\u0007sm"
     },
     "prekeys": [
         {
-            "key": "1h",
-            "id": 0
+            "id": 0,
+            "key": "1h"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_15.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_15.json
index dee86456330..cf10e4667cc 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_15.json
@@ -1,3 +1,3 @@
 {
     "prekeys": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_16.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_16.json
index 245debf13ff..776dfe1758b 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_16.json
@@ -1,13 +1,13 @@
 {
+    "label": "󲤝6",
     "lastkey": {
-        "key": "Ll\u000e󳘂k𪾴\u0004f\u0012",
-        "id": 65535
+        "id": 65535,
+        "key": "Ll\u000e󳘂k𪾴\u0004f\u0012"
     },
     "prekeys": [
         {
-            "key": "Q}",
-            "id": 2
+            "id": 2,
+            "key": "Q}"
         }
-    ],
-    "label": "󲤝6"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_17.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_17.json
index 1a7d94af924..7be5a4fd543 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_17.json
@@ -1,4 +1,4 @@
 {
-    "prekeys": [],
-    "label": "c󵀳S\u0015\u0010}0 6\u001e"
-}
\ No newline at end of file
+    "label": "c󵀳S\u0015\u0010}0 6\u001e",
+    "prekeys": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_18.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_18.json
index 9a9ed0f885c..412d1b07d41 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_18.json
@@ -1,17 +1,17 @@
 {
+    "label": "\u0001\n䆕?a󼟥\u0014O",
     "lastkey": {
-        "key": "󶨶󵧈4/",
-        "id": 65535
+        "id": 65535,
+        "key": "󶨶󵧈4/"
     },
     "prekeys": [
         {
-            "key": ">􄺟",
-            "id": 0
+            "id": 0,
+            "key": ">􄺟"
         },
         {
-            "key": "E",
-            "id": 2
+            "id": 2,
+            "key": "E"
         }
-    ],
-    "label": "\u0001\n䆕?a󼟥\u0014O"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_19.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_19.json
index 4e6252f10d5..9cad714d27d 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_19.json
@@ -1,29 +1,29 @@
 {
+    "label": "\u000c&QO\"u\t-\\",
     "lastkey": {
-        "key": "𮩲t𗥰𛱥i",
-        "id": 65535
+        "id": 65535,
+        "key": "𮩲t𗥰𛱥i"
     },
     "prekeys": [
         {
-            "key": "b",
-            "id": 1
+            "id": 1,
+            "key": "b"
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
-    ],
-    "label": "\u000c&QO\"u\t-\\"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_2.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_2.json
index 94cce1b34a0..47949668348 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_2.json
@@ -1,13 +1,13 @@
 {
+    "label": "㧉㌌\u0001𒇦\u001f",
     "prekeys": [
         {
-            "key": "~",
-            "id": 2
+            "id": 2,
+            "key": "~"
         },
         {
-            "key": "\u0002",
-            "id": 2
+            "id": 2,
+            "key": "\u0002"
         }
-    ],
-    "label": "㧉㌌\u0001𒇦\u001f"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_20.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_20.json
index 8a740c7b0a5..231a9d057a0 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_20.json
@@ -1,40 +1,40 @@
 {
+    "capabilities": [
+        "legalhold-implicit-consent"
+    ],
+    "label": "\u001b\u0004\u0001ccn\u001f{Y5",
     "lastkey": {
-        "key": "\u0014 }Kg\u000be3",
-        "id": 65535
+        "id": 65535,
+        "key": "\u0014 }Kg\u000be3"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
-    ],
-    "capabilities": [
-        "legalhold-implicit-consent"
-    ],
-    "label": "\u001b\u0004\u0001ccn\u001f{Y5"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_3.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_3.json
index 1e4f7ef9966..2035b2516b6 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_3.json
@@ -1,17 +1,17 @@
 {
+    "label": "\u0000⿕B\u0006",
     "lastkey": {
-        "key": "L𘚥",
-        "id": 65535
+        "id": 65535,
+        "key": "L𘚥"
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "vi",
-            "id": 0
+            "id": 0,
+            "key": "vi"
         }
-    ],
-    "label": "\u0000⿕B\u0006"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_4.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_4.json
index 0a1d8ac4e73..00efa2df959 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_4.json
@@ -1,25 +1,25 @@
 {
+    "label": "M􄕶^YH:l",
     "lastkey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "prekeys": [
         {
-            "key": "󳧤",
-            "id": 1
+            "id": 1,
+            "key": "󳧤"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "u",
-            "id": 0
+            "id": 0,
+            "key": "u"
         }
-    ],
-    "label": "M􄕶^YH:l"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_5.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_5.json
index 539038ebc93..90598aa4ca6 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_5.json
@@ -1,21 +1,21 @@
 {
+    "label": "I󽜻\tCzGW󼨽",
     "lastkey": {
-        "key": "Cs 𒌨=",
-        "id": 65535
+        "id": 65535,
+        "key": "Cs 𒌨="
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "󹤼",
-            "id": 0
+            "id": 0,
+            "key": "󹤼"
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
-    ],
-    "label": "I󽜻\tCzGW󼨽"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_6.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_6.json
index 9349b8e43ea..7de9dd38df2 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_6.json
@@ -1,20 +1,20 @@
 {
     "lastkey": {
-        "key": "",
-        "id": 65535
+        "id": 65535,
+        "key": ""
     },
     "prekeys": [
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "+",
-            "id": 0
+            "id": 0,
+            "key": "+"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_7.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_7.json
index 9fef158247b..838f4945b3e 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_7.json
@@ -1,37 +1,37 @@
 {
+    "label": "D9",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         }
-    ],
-    "label": "D9"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_8.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_8.json
index a4e7dc1d744..f8b30726dcc 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_8.json
@@ -1,9 +1,9 @@
 {
+    "label": "8\u0015D𛈘",
     "prekeys": [
         {
-            "key": "_Xx;",
-            "id": 4
+            "id": 4,
+            "key": "_Xx;"
         }
-    ],
-    "label": "8\u0015D𛈘"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateClient_user_9.json b/libs/wire-api/test/golden/testObject_UpdateClient_user_9.json
index 38259029dd5..c10f3c29eb5 100644
--- a/libs/wire-api/test/golden/testObject_UpdateClient_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UpdateClient_user_9.json
@@ -1,29 +1,29 @@
 {
+    "label": "a彟\\<c󿭞.􀗠",
     "prekeys": [
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 1
+            "id": 1,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         },
         {
-            "key": "",
-            "id": 0
+            "id": 0,
+            "key": ""
         }
-    ],
-    "label": "a彟\\<c󿭞.􀗠"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_1.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_1.json
index 416b99fe09d..f943eb3b895 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_1.json
@@ -1,4 +1,4 @@
 {
-    "url": "https://example.com",
-    "name": "\u0003\u001d\u00015\u000f礥ⰵ~D𪈡󷡄mxD_s"
-}
\ No newline at end of file
+    "name": "\u0003\u001d\u00015\u000f礥ⰵ~D𪈡󷡄mxD_s",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_10.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_10.json
index baeae4b1529..28530daa9e2 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_10.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "qV󵤔\u0012J",
     "name": ">5⏊8\t)𬺋􇦶\u0010Ql&z[\u0017\u001a\\\u0005z\u0011^\u0012N\u0007\u001al$y&5?7T\n󻿑𓁴𧞹\u0002찍Es󳅞*+&>􃵚@3T\u001a\u0001L󺎶\\l\u0011h\u0007oo<R􆄞\u001b\u0016\r􇅫󾢦\u0019\u0007^",
-    "description": "qV󵤔\u0012J"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_11.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_11.json
index a6e2352d467..4498a06b4da 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_11.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "\u0006lw\u001cfA􉾲u",
     "name": "󽮗\u0011\rVn\u000c𗜉􆿦e\u0010gb\u000fG哥2X\u0012\u0000\u00197O脕𬇊$K1O\u0002oᘷ^H>󴌋2\u0003:h:𦝲/󷻋󷬖1kS𭖀挽J>𤲾ff\u000e􊙉\n6︇󰽾:p^􉣣`S",
-    "description": "\u0006lw\u001cfA􉾲u"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_12.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_12.json
index 90a62ffadc5..e25ce582d04 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_12.json
@@ -1,3 +1,3 @@
 {
     "description": "w󶂦f􎮤\tEhk󴏘M"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_13.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_13.json
index 0ae69f98fea..2488750cea4 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_13.json
@@ -1,3 +1,3 @@
 {
     "name": "􈤝𡌈HEaL9>泹𬕪󶯦󾎚\u000e}􇔖K鵪=/𪎟\u000b𢁚퐓tNE秏𡄥>\u0006]􊢮􋣓h𧧭\u000clA󴛏9琸\u000fo5\u0002-z󲤄􆴏ho*^[BZ󰒀\u0005f\no@𓄧ug,rt\u000c`䊇\u001a􄠈\u0018rLtu⒀:*!mS\u000e0(Y_&p^>5(|󹮹\u0000\u0011\u0001V󵦳\u001a*]\u0012,s\rKr"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_14.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_14.json
index 69efbdeb877..f3b4e763e89 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_14.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "+$QN󳽡fh󷨄/",
     "name": "8f\u0011@𘍼FYᅭ\r&C1UFyu&*􈼳7󹦚y\u0016xe𨛾p\u0011'ϡw􉰅𮁟󺻻&t-𧰜𤠨\u0010􋕈c󳍇G󴋙$p𩍍콡5o\u0012]d\u0012㓓G􏤀4\u0015y:􃲄F\u0001j􌛥􆲹c!;E^親z!I\tjbe9>L,zB?jZ𥩍\u0019\u0019x\\󸱅;\u0018s\u001f\u000c\u0000^\u0010󻏼땹𧇭󱜣U",
-    "description": "+$QN󳽡fh󷨄/"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_15.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_15.json
index cf5c3bc45ac..aa2a7065049 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_15.json
@@ -1,4 +1,4 @@
 {
-    "url": "https://example.com",
-    "description": "󵄇\u001d󷟺\u0013\u0006"
-}
\ No newline at end of file
+    "description": "󵄇\u001d󷟺\u0013\u0006",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_16.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_16.json
index c70342d9951..9265d2a2c30 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_16.json
@@ -1,4 +1,4 @@
 {
-    "name": "55􌪨I󼤬O\u001e󹤻󽙨Z󵾜\u0010nO0w)+u15xE\r\u0000\u0007Ho󻹔c4􃔇\u0003󺶹VcK#\u0001\u001f\u001eb󶵇7\t7>_/K[,+𠥭􈔻.O&r\u0003-\u0013K{6l𒐗􎀥&􏿊,a\u0001-!䞗{o\tm󿥼{Fk>/\u0002􅗴\"􄨱ᤕ􆔒\u0017\u0003\u0005P.m𭡬`𤪈𮊮\u000f\u0019iF\u0016󰱖A𫗎{.\u001dw􋙣1[\u0005R=>C{\u0004",
-    "description": "B"
-}
\ No newline at end of file
+    "description": "B",
+    "name": "55􌪨I󼤬O\u001e󹤻󽙨Z󵾜\u0010nO0w)+u15xE\r\u0000\u0007Ho󻹔c4􃔇\u0003󺶹VcK#\u0001\u001f\u001eb󶵇7\t7>_/K[,+𠥭􈔻.O&r\u0003-\u0013K{6l𒐗􎀥&􏿊,a\u0001-!䞗{o\tm󿥼{Fk>/\u0002􅗴\"􄨱ᤕ􆔒\u0017\u0003\u0005P.m𭡬`𤪈𮊮\u000f\u0019iF\u0016󰱖A𫗎{.\u001dw􋙣1[\u0005R=>C{\u0004"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_17.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_17.json
index f51d53de94e..599e4de164a 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_17.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "\u001ca🎣\u0003𬟒G5􉧍_",
     "name": "󽲮s\t}",
-    "description": "\u001ca🎣\u0003𬟒G5􉧍_"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_18.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_18.json
index cc52c6513cc..3f042954c67 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_18.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "𫎯󽨘􇃅",
     "name": "!\u0006\u0019?JlD\u0006Z\u0014X(\u0018H01𣣥\u000c+\u0005\u000c\u0018􅹊𬑕\u001f􃽰J\u0015Y*\u0015\u000eA;𫢤3eY:#􁠓YN\u0001󺧳`􆈥}UAT>",
-    "description": "𫎯󽨘􇃅"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_19.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_19.json
index 00410ce24a1..409cc8d8828 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_19.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "&",
     "name": "\u001e\u0006f𣸎󺦳𮭭n􀭍\u0013S+b󺞦\u001b􄌱br𬃌K/'Jꨨ\u001fx`J\"煮U\u001f𡟜aD!\"\n𓐃\u000c\u0004MLm􄱱􈫰=C",
-    "description": "&"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_2.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_2.json
index bcf87f4a86e..7c833e8dd72 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_2.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "\u001f>",
     "name": "r󹾢w􇆧6m𨂲䢳]@\u001a0K\u0007Tl\u001e]6p󷁂|_.\u0019!E𦚼u\u0002/sN\u001f0.>GRo𫗀󻬫+bQ\u001b󸨥􊐈Nloe󼋙1_\u000f􎗚l􆞴\u0000R𣉜;tsQ_ |",
-    "description": "\u001f>"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_20.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_20.json
index 55c591e9177..5e8f67ee748 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_20.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "",
     "name": "󷜺",
-    "description": ""
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_3.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_3.json
index 553c14082a7..413fd5089f4 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_3.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "",
     "name": "H\u0012#%𧟏Zl}[玶>%朒j𤆍C󸶁=[Ghhh𘞦\u000e>\u0004SgmH*㓀m󳷚]\u001bᳪ(mj\u0010G(\u000b𢱈󸞾\tf\n\t\u0007\tF\u001a(\n\"󲮖TW􋄈&=\u001c𗺧\u0012?\u001e󾇬SMC@􄖢4􂒏V]\r\u0002t\u0004󵐖F\u001dkX\u0015\u0019\u0012󼔧6\u0002𩨁BtlzO\u000b\u0018G󽿧醴𦢩󶇹𪫹J\u0019*󹕻h\u0018m\u0008\u0019$k",
-    "description": ""
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_4.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_4.json
index 1206e59fca3..a93553eabba 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_4.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "n",
     "name": "𩙵\n\u001d2z~󺥁쓾nꖥ\u0007f&B󴡗^Z􋕎%𞲱󼠦v􊵣X%⼬<%lA􉲌\u0013Za)\u001a𓌹\u001c|u:]la<󷆅6Zc\u0017?3\u0014)𝄖젣r\u0013\u0006O󷱖`O􏣠\u0000\u0010v󵃦/槾E@\u0011A\u001c)S履\u0015-W2_q\rB\u0010>𗍳\u0005𮑒t-\u0000X𮙲\u0014I<󳨧mNVz𐧕𬇩U\u0001T\tVy砲%^\u0006\u001e)\u0008",
-    "description": "n"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_5.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_5.json
index cf987e2392a..0abe7726e95 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_5.json
@@ -1,4 +1,4 @@
 {
-    "url": "https://example.com",
-    "name": "󹸙tW}􍾳􌞐\r󷋇xL𝙫q𗦘󺉍𦫷MJS:󱓩/\u0007\tw𫴔􀞁됺}\u001br\u000eG􎤘Ndx&,\t#𘁹2󴬅\u0001緙TI`󳖸\u001e\u001c!\u001fIL\u0011v󼨴{􌙅K뛻\u0001􆄟󻽺#󾢢e4*𦝍iKfn61nJr\u0005\u0011lT4GᆨY\u000fl􂛥;lD`n\u0003M+\u001f\\\"􂚘ec\u001anC\u0008\tX"
-}
\ No newline at end of file
+    "name": "󹸙tW}􍾳􌞐\r󷋇xL𝙫q𗦘󺉍𦫷MJS:󱓩/\u0007\tw𫴔􀞁됺}\u001br\u000eG􎤘Ndx&,\t#𘁹2󴬅\u0001緙TI`󳖸\u001e\u001c!\u001fIL\u0011v󼨴{􌙅K뛻\u0001􆄟󻽺#󾢢e4*𦝍iKfn61nJr\u0005\u0011lT4GᆨY\u000fl􂛥;lD`n\u0003M+\u001f\\\"􂚘ec\u001anC\u0008\tX",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_6.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_6.json
index d40a367ac56..fbb6fef943a 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_6.json
@@ -1,4 +1,4 @@
 {
-    "name": "/>u\u0006:뻝*󲇅7I\u000co􋗉/𬃈#o^b?*bݶ;V8@\u0017\r\u0013`𢕲r\u001f𧀗\u0014hk5a\u0010L󿦺󷏣rx\te𡰱􃐎j{Q$T􅛻\n)KOuxE2\u001f4󻯞m\u001c\u001f}􈩲Q\u0017y^d隨\u001e𮍔Y%\u001c𥈜T􆽔i2S :󹷃\u001d?).󼎘\u0012D󾢭\ny\u0012&.yꩅ'$&]U#b\u0016J\u0011w5𮋥=9𐴹cj􅴫x",
-    "description": "𥴮#n\u0006N\u0014\u0006."
-}
\ No newline at end of file
+    "description": "𥴮#n\u0006N\u0014\u0006.",
+    "name": "/>u\u0006:뻝*󲇅7I\u000co􋗉/𬃈#o^b?*bݶ;V8@\u0017\r\u0013`𢕲r\u001f𧀗\u0014hk5a\u0010L󿦺󷏣rx\te𡰱􃐎j{Q$T􅛻\n)KOuxE2\u001f4󻯞m\u001c\u001f}􈩲Q\u0017y^d隨\u001e𮍔Y%\u001c𥈜T􆽔i2S :󹷃\u001d?).󼎘\u0012D󾢭\ny\u0012&.yꩅ'$&]U#b\u0016J\u0011w5𮋥=9𐴹cj􅴫x"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_7.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_7.json
index 4fb279bb6a2..980635a0132 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_7.json
@@ -1,4 +1,4 @@
 {
-    "url": "https://example.com",
-    "name": "𘊦<B\u0012^>Z#"
-}
\ No newline at end of file
+    "name": "𘊦<B\u0012^>Z#",
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_8.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_8.json
index 997f5165f00..f3703e7a1bd 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_8.json
@@ -1,5 +1,5 @@
 {
-    "url": "https://example.com",
+    "description": "<\".􁭃CP\u0015",
     "name": "𧯧&Rn=svﬓ5!(􉄕\u00005<\u0013=\u0017\r\tw\u000f􉰖􆓤",
-    "description": "<\".􁭃CP\u0015"
-}
\ No newline at end of file
+    "url": "https://example.com"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_9.json b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_9.json
index 400819dbad0..64e8acb2d0b 100644
--- a/libs/wire-api/test/golden/testObject_UpdateProvider_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_UpdateProvider_provider_9.json
@@ -1,4 +1,4 @@
 {
-    "name": "\n\u0003)\u0005Mx덺N|i02.m薸k=<*g#(BC*MC!\u001b}\u000e",
-    "description": "%"
-}
\ No newline at end of file
+    "description": "%",
+    "name": "\n\u0003)\u0005Mx덺N|i02.m薸k=<*g#(BC*MC!\u001b}\u000e"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_1.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_1.json
index 58c157c2a66..c84a4773f30 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_1.json
@@ -1,12 +1,12 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": true,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "QA=="
     ],
-    "password": "뮗\u001f\u0004-)]~AោX𦭍􈹮5쌯:=\u0018󾞇􏃒𘁔zHH𗁛[Bn⍹𤺧I87\u0010bJ\u0017]𦥱󾚭Xx𨸖5q朗WjV.𢥹xXኙA𠊀፟󾶑m沨􄙒tf𗿣Q]𧧆v[$󾌡&7\u001a+\u000e󹢲\u001e$~𫇍\u0001\u0007+\u001f뢞󳃡\u0005󰕊$1]𢅪󲽐\u001c_╗􏧔^M:\u0016nj\u0004􁅟ゃO3\u0016`j3\u0015=󺹬8\t󹶗橯\u001e9pY~+􂲫ྖ\u000b8vx'Sf{\u0004Uu󵄄\u0002oJ\"~E\u0019po\u001c=\u0002𥂖&U\u0002\u000ehM𡇻f\u001er`F/&WR-\u0003P~V:\u0000𥷯\u000cl.𡀈\u0012󹈍Y۳\u0008&Z<x\u0000w7􇈿~󿨂X\u0008H}󰔏;f𭶃rE챦gw\u0006\u0004\u0019꼍감\u0005o􋸪t𠕁Ty􀔫7𢠖1ᐮ@S\u0014\"Rm\u0015@|𠢦g\u0003Z󵴯\n/^\u00132\u0004𒎖Ojn_fiz0=\u001b\t\u0004󻩅f\u000b<p6.6\u00040􉿷zp󸌗\u0007m뙄x󳞈\u0019'RF|#C\u0017W췔^)(or.𝩤O]4x􅁂\u001e}󵗼󠁵y\u0013O ]瓺>X\u000b󷂉\u0012좸\t]󰈇\":ᵒ\u001d\"𬡴5$󴩰i𧊨􌼠&6🏨S癀\u0016\u001aC󷎷\u0019󲴿V뭆a󾕪]\r\u0004k/#\u000c{𧃮󹮡a𤮢8\u0012m󶻜\n,\u0017󽚗<9􀵵<L#𤇽\u0003_\n`󺰇yS蹋\u0002\t-󾁽󴿠d`𪪫5􈑴C\u001eP\u0011\"0𑲛𤜪/栉𝇧C\u0014\n\u0015H G􄥔&\u000f𪿃H\u0010U\u000bp󾧅\u0017\u001cyh\u001cl􎑊^􇓗\"􅝃y𧍃󹊸\u001c󻻞\u001c0r𖢠4v\u000747􋑁h\u0013p𒍰􏵜\u001b56\u001e-\u0007a撨6􃵹@Af륮󴓙\u0018𒅜@Z\u0002􀠳헹􋲽􂶠m􍭣𠸡󰅢簨쌦\u0001\u001c􆐿𡬾Yo\u0005􁣧:wF,I\u000e𬷝𠋅zE\u00038𘗙\u000b􄾼\u001aY\u0010𧨚}\u0003𠉬󵘊X\u001fn>𡹫􍠐\u0019l9iQ#y&󿈫+𧱀\u001a𦗦𭥂mtb\u001c\u0005F.󿅇\u0017\u001f/X{\u001d:^)_\u0019\"\u001a𬆴*u🂲qn\t7P\u0018|b綪⦱$\"SQ?E󲍇󱑚\u0000<\\𭽊5.0󾿆g6d\u0000A=n\tx-Hi3DU󾢻𫵮=Yo5,𧻅S𨾍$/>\u0016𪩑\u00088z􁕳􂊽6!IG\u0013\u0003_m𬟃Q𫧣\u0008m\u001dᘣl=0 쏕tA%𡽭[}P\u0016𧷕\u001db\"hw藶\u0006\u000bJ1}󽐴$%􉿜C𡰟?(\u000b\u000b𥴒􀁧\u000e)Bj\u001bi쭞i\u001e􏂿\u0019苬)󷠚V𝦣)BM\u0003痄3a𮨞2􀨮\u0010>l󷉙\u000b\u0014杄􎂔\u0017귇ᩁ!#\u000e󲍬𑆩鞐q\u0000X\u0011F8\u001e*7mPn\u0005W\u000eif,𣰛𐳁􈉯g\u0007tWo\u000f|𨯫􋡻W&/)\u0016b􈦿<\u0018C\u001eힽa#󺵇3󹽵󰉮wR\u0011 󻙐|/e󾐱􇗟\"&\u001bV⚨fA~刔\u001d𐕄@\u0017\u0012\u001b!\u000bTJt\u0000𡭢\u0015}s\u000e,\u001cy\u000fEnElBS[-𤟔lN𥒱o\u001d0jj?"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "enabled": true,
+    "password": "뮗\u001f\u0004-)]~AោX𦭍􈹮5쌯:=\u0018󾞇􏃒𘁔zHH𗁛[Bn⍹𤺧I87\u0010bJ\u0017]𦥱󾚭Xx𨸖5q朗WjV.𢥹xXኙA𠊀፟󾶑m沨􄙒tf𗿣Q]𧧆v[$󾌡&7\u001a+\u000e󹢲\u001e$~𫇍\u0001\u0007+\u001f뢞󳃡\u0005󰕊$1]𢅪󲽐\u001c_╗􏧔^M:\u0016nj\u0004􁅟ゃO3\u0016`j3\u0015=󺹬8\t󹶗橯\u001e9pY~+􂲫ྖ\u000b8vx'Sf{\u0004Uu󵄄\u0002oJ\"~E\u0019po\u001c=\u0002𥂖&U\u0002\u000ehM𡇻f\u001er`F/&WR-\u0003P~V:\u0000𥷯\u000cl.𡀈\u0012󹈍Y۳\u0008&Z<x\u0000w7􇈿~󿨂X\u0008H}󰔏;f𭶃rE챦gw\u0006\u0004\u0019꼍감\u0005o􋸪t𠕁Ty􀔫7𢠖1ᐮ@S\u0014\"Rm\u0015@|𠢦g\u0003Z󵴯\n/^\u00132\u0004𒎖Ojn_fiz0=\u001b\t\u0004󻩅f\u000b<p6.6\u00040􉿷zp󸌗\u0007m뙄x󳞈\u0019'RF|#C\u0017W췔^)(or.𝩤O]4x􅁂\u001e}󵗼󠁵y\u0013O ]瓺>X\u000b󷂉\u0012좸\t]󰈇\":ᵒ\u001d\"𬡴5$󴩰i𧊨􌼠&6🏨S癀\u0016\u001aC󷎷\u0019󲴿V뭆a󾕪]\r\u0004k/#\u000c{𧃮󹮡a𤮢8\u0012m󶻜\n,\u0017󽚗<9􀵵<L#𤇽\u0003_\n`󺰇yS蹋\u0002\t-󾁽󴿠d`𪪫5􈑴C\u001eP\u0011\"0𑲛𤜪/栉𝇧C\u0014\n\u0015H G􄥔&\u000f𪿃H\u0010U\u000bp󾧅\u0017\u001cyh\u001cl􎑊^􇓗\"􅝃y𧍃󹊸\u001c󻻞\u001c0r𖢠4v\u000747􋑁h\u0013p𒍰􏵜\u001b56\u001e-\u0007a撨6􃵹@Af륮󴓙\u0018𒅜@Z\u0002􀠳헹􋲽􂶠m􍭣𠸡󰅢簨쌦\u0001\u001c􆐿𡬾Yo\u0005􁣧:wF,I\u000e𬷝𠋅zE\u00038𘗙\u000b􄾼\u001aY\u0010𧨚}\u0003𠉬󵘊X\u001fn>𡹫􍠐\u0019l9iQ#y&󿈫+𧱀\u001a𦗦𭥂mtb\u001c\u0005F.󿅇\u0017\u001f/X{\u001d:^)_\u0019\"\u001a𬆴*u🂲qn\t7P\u0018|b綪⦱$\"SQ?E󲍇󱑚\u0000<\\𭽊5.0󾿆g6d\u0000A=n\tx-Hi3DU󾢻𫵮=Yo5,𧻅S𨾍$/>\u0016𪩑\u00088z􁕳􂊽6!IG\u0013\u0003_m𬟃Q𫧣\u0008m\u001dᘣl=0 쏕tA%𡽭[}P\u0016𧷕\u001db\"hw藶\u0006\u000bJ1}󽐴$%􉿜C𡰟?(\u000b\u000b𥴒􀁧\u000e)Bj\u001bi쭞i\u001e􏂿\u0019苬)󷠚V𝦣)BM\u0003痄3a𮨞2􀨮\u0010>l󷉙\u000b\u0014杄􎂔\u0017귇ᩁ!#\u000e󲍬𑆩鞐q\u0000X\u0011F8\u001e*7mPn\u0005W\u000eif,𣰛𐳁􈉯g\u0007tWo\u000f|𨯫􋡻W&/)\u0016b􈦿<\u0018C\u001eힽa#󺵇3󹽵󰉮wR\u0011 󻙐|/e󾐱􇗟\"&\u001bV⚨fA~刔\u001d𐕄@\u0017\u0012\u001b!\u000bTJt\u0000𡭢\u0015}s\u000e,\u001cy\u000fEnElBS[-𤟔lN𥒱o\u001d0jj?",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_10.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_10.json
index ae1b9ca1a04..4b07b715db8 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_10.json
@@ -1,7 +1,7 @@
 {
+    "password": "󳦉5y\u0001􇀅-\u0002v\u0005'󷘹𭫲𦠒S{\rL􈅚]\n/𦣘aHB廈WD𐐻7>&\u0008P\"󸜫\u0008􉿫q\u0007𬰴\r\u000eR󷬘𪿏\u0003\"*̼\u0012󾯤󴐴N_󵘊uF\u0000\"\u0010\tRIL􇑶􌑹[\u0019\u0017.u⥚󵵟\"UiJ;Kd8󽪠0癢&\u000c\u000f𧮸\u001aY󶒦LK\u0012\u0014z\u0001va\u0004㉔!pV#􍯯+=􌯨䚸\u0018m3\u0003⍪||<j􌰋\u0011u4Tp55`2\u001c)x\u0004h\u001f8𫳲cXCOj󵊁]H\"4)%몱g\\2󲲤𧩬\u000cj\u0007~:\u001czR{\u0013u𩚜jZ9\u0014瓡\\\u0007󻛛J𫅴(|)􀤼x㧀𫋪\u001e]u\u0004󸐇TE\u0013\\!%@-yd𫹏a :n\u000c>𩗨^𗧂k󹵢Z#la '9b􏹂7mX]2iWb\n𮨏􉕵*2%󹟶Rqs$z>J󸀦B􂣦󷫈5|\n\u0003􈢭Y𠦐𤷜f\u0019N󶇰`𤽁9CE󵍌\u0005iU$%􎫱<􀰅;􁂝󸩔!\u0007F\u000fv𪇂1fx􈯥pz\u0000\u00014m𦰯&m\u0001zU\u0002ai\r\u0004{L^􅄧I)\u00190^T'pV𮑵𢮋{莑?'\t1\u0008\u0017󵅆k2N\u0018]}\u0011\u0010,𨑪􅥋>⭿U𮧝u\u000bZ\th\u000eI@\u0017e\u000c)2mg6}:s0\u0000a𠗯m1\u0019[/-$𩞀\u0018/-6\u0000\\P\u000c\u000cq D~fp󷰩\u000fRz󺠊\u001b𩬔}c\u000bh\\\u0000󵡬:CY.+𤯪󸭾$\r𓀲뼼/\u0018i\u000f\"!m[\"M􏄳*.u⋚\u0000\u001b5C:𗥞j\u000e+6羽x:J\u001d𢯅\"P~\u000b􎋝󻰊 azK󿐵C9\u001aH\u0019𠙥􎄉\u0019D\u0017a\u0007\"w!\u000bO[󴲖 c\u0013𥒂8\u0011\u0006u𣻹\r\u001c{!\u001a껂\u0017mM􁘮o\u001b\u0014\u000cםE\u0016'N𡥍#􇪻󾈏\u0011\u0001𩛛1nizru_􇷱𪦋\u001661􆤶\u001a\u0010\u001axQ᠍-*zD𬳣\u001dӷ\u0006Ix\u0011Fꏖ󸐅~\u0008q^\u0011GE慕󸡿n$𩂻-j*𖨈h6%^F\u0018_u4Ef􏯗9\u0008V578苆𢲺F>侣y馋\u0016rW\u00136\n󲉋`BmCl\t􁥏1𭆁𠀚􁟡\u000c\u0011.N\u001dD\t𮜵",
     "public_keys": [
         "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
         "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "password": "󳦉5y\u0001􇀅-\u0002v\u0005'󷘹𭫲𦠒S{\rL􈅚]\n/𦣘aHB廈WD𐐻7>&\u0008P\"󸜫\u0008􉿫q\u0007𬰴\r\u000eR󷬘𪿏\u0003\"*̼\u0012󾯤󴐴N_󵘊uF\u0000\"\u0010\tRIL􇑶􌑹[\u0019\u0017.u⥚󵵟\"UiJ;Kd8󽪠0癢&\u000c\u000f𧮸\u001aY󶒦LK\u0012\u0014z\u0001va\u0004㉔!pV#􍯯+=􌯨䚸\u0018m3\u0003⍪||<j􌰋\u0011u4Tp55`2\u001c)x\u0004h\u001f8𫳲cXCOj󵊁]H\"4)%몱g\\2󲲤𧩬\u000cj\u0007~:\u001czR{\u0013u𩚜jZ9\u0014瓡\\\u0007󻛛J𫅴(|)􀤼x㧀𫋪\u001e]u\u0004󸐇TE\u0013\\!%@-yd𫹏a :n\u000c>𩗨^𗧂k󹵢Z#la '9b􏹂7mX]2iWb\n𮨏􉕵*2%󹟶Rqs$z>J󸀦B􂣦󷫈5|\n\u0003􈢭Y𠦐𤷜f\u0019N󶇰`𤽁9CE󵍌\u0005iU$%􎫱<􀰅;􁂝󸩔!\u0007F\u000fv𪇂1fx􈯥pz\u0000\u00014m𦰯&m\u0001zU\u0002ai\r\u0004{L^􅄧I)\u00190^T'pV𮑵𢮋{莑?'\t1\u0008\u0017󵅆k2N\u0018]}\u0011\u0010,𨑪􅥋>⭿U𮧝u\u000bZ\th\u000eI@\u0017e\u000c)2mg6}:s0\u0000a𠗯m1\u0019[/-$𩞀\u0018/-6\u0000\\P\u000c\u000cq D~fp󷰩\u000fRz󺠊\u001b𩬔}c\u000bh\\\u0000󵡬:CY.+𤯪󸭾$\r𓀲뼼/\u0018i\u000f\"!m[\"M􏄳*.u⋚\u0000\u001b5C:𗥞j\u000e+6羽x:J\u001d𢯅\"P~\u000b􎋝󻰊 azK󿐵C9\u001aH\u0019𠙥􎄉\u0019D\u0017a\u0007\"w!\u000bO[󴲖 c\u0013𥒂8\u0011\u0006u𣻹\r\u001c{!\u001a껂\u0017mM􁘮o\u001b\u0014\u000cםE\u0016'N𡥍#􇪻󾈏\u0011\u0001𩛛1nizru_􇷱𪦋\u001661􆤶\u001a\u0010\u001axQ᠍-*zD𬳣\u001dӷ\u0006Ix\u0011Fꏖ󸐅~\u0008q^\u0011GE慕󸡿n$𩂻-j*𖨈h6%^F\u0018_u4Ef􏯗9\u0008V578苆𢲺F>侣y馋\u0016rW\u00136\n󲉋`BmCl\t􁥏1𭆁𠀚􁟡\u000c\u0011.N\u001dD\t𮜵"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_11.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_11.json
index 30e7319df15..cbbbc2c23c4 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_11.json
@@ -1,4 +1,4 @@
 {
     "enabled": true,
     "password": "\u0000󽰲+􄰾\u000c綥=栥6𗪐uix\u000eFI􆛐;Oy5|*sB`\rz\u001a餜#il~3p\u000e𡔂\u0002R1󼲂1y!\n:\u001c󻥼%wbKet󰺷罵\u0003h饻}Y🆆\u0019,lSI󿶴$𩻪X𭈩X\u001d&\u000f\u0017\u000b󼩶󶒬cCR0i𧾹m\u0017󿊈wIC\u0016\n\u0014\u0006Y,S􌐢m䆞\u0007𭴑\u001fpF~\u0018#􍘰\u0008Ah󿥁\"𬓱\u0005\u0004~s\u0005\u0013\t󲍦I_xZ\u0003󱍢s(ꖜDA󵢨􋔮𠡁\u0010L糇(\u00086i\u0014j𧊈>\u0008􊨸8\u0003=3\rFz쓲{,g`\u0018.\u001dC>s$\u0011cV }@O󲿌🨏\tb𨃓\u0003􊍖𨢯6<OXW<#듰t\u0017w.Yb󺹀u\u0000\u0012𢇷*􅾉JB\u0012mbӏA>\u000f䑨8lR|\u001b9c\u0015􄡮[􈵂􈑻j󻀑\u0016\rSR􄍡\u001dg\u0004|\u001a\u0003𘓡󺕴R>\u001e𗍏b(󴢋zP􀆬{NF􏈷gq\u0000􃐗s<􌑐!?\r\u00185󿸜󵉃\u0014jW\u0002􃟁Ib\u0018𤠇ef\u0016&zᓏ𭨁l\u0018𪻇x\n\u0001iE􉑛𦞢zw\u0011􆋇|􁽭`*e\u000f\u0001\n􋕵9塧󸝵TgHL*4KU熼󽧆d{ᚊ󶌭aF}c獅lAV\u0016\u001ao\u001d\u000b \u0010NnJmzᱵ\u000b𘊘X\n􃚟/)\tV!𥆎#xH`qG\u001c+󹮮v􏨏A+}pK\u0000䜘\u0010󷦑駇@XB󹪹\u000cd`\r}HA􌏰O6F\u0008􎂮𪾰\u0012E$5\u0018\u000f\u0002\u0005I𛂸l𞡹󽣉-𬌝P󶓹\u0015\u0008<v*,OFw󹩯(𝁎󽦍\u001f󹫂9󶨜\u0002󳴋LI󸱩\u0010󱈽(黬\u0003\t_󺵋8e/NL\u0010\u001d|-𥹏󱂪췘\u000e\u001d\tMu8󶜨aD8\u00173>4&Y6k􀑎;􏹰l䤦󺷔[𢃴\"\u0018W𛀟P\u0002󷃼󱡣GMC𭩮#󸅞_DD\u0002\u0011\u0006󹑶𪳐䃘\u001a↉4\u0019I!1\u001c|\t\r\u0011)椿\u00110@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_12.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_12.json
index 662b6b215f5..390c27b43c0 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_12.json
@@ -1,13 +1,13 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": false,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "_b76",
         "uA=="
     ],
-    "password": "󲟄󽥄JXV''\u001d+-'\u001a𩩕\u001f-7ꭸXr&D𭊟\u0015!l\u0014𬆈37T2K\u00130𨝃󻁦\u001cf󼟴𓌳a0󾉍𨯢g\u00045Cꇓ䢕\u000f\u0010i𪈭|󹱻|j|Z󺽏Hc􊏖 􃟿q\\\u0006F\u001b捎\u0018\u000e c>𒊜ca𗣊1𢬺襥󵉕\u00123G\"v7\u0018\u0004􌘟g\u000c􎘞\u0006\u001aEhi\u001d\u00049\u0001v􇳧e\"7\u0014ꩍE𗽌\r)􍂹\rw/Iis󺘀\u0001𗺋4E^櫆m􀅭󶀿O'뼱A􇪜䷴\n~SSEJ𨟙\u0010\u0004cL󿊩c\u0013󸉶`8\u0014Es2\u001e(6lDMD~\u0000^𝥴󺓫􀙮\u001aw3x\u0005/g!}~\u000bR]𐦙量\u000e\u0003.X1󰅑z𡐽\u0018\u0018𣌨+􅣮V5𨘨􁗧𬫢XQ𭷨᷆􇃝I!kea􌂍4@\"\t􇏀􌖍ꩬM\u0016􄆄dp5󴡯Hz+󹢀𔔾8\u0002\u0005\u000f䵆Vw忍𩮲\u0000(𫀲$9\u0013g挲󿟩2S;\t\u0006\u0013\u0004\u000e\u0000j\u0018)z|\u0016/󾋣%\t𬎘𑫛^D`0\u0012􄦊􎑲󰛠󵤔𝡾𤠙􀊄󴰚\u0000fgh\u00164Td🨳J􎰼\u001c鎯caG,Si𢍄W􊙛E6􄛥\u001cC2∃+\n𣓵fn}􄲉䏃󷭘\u001aV1%\u0016𦝶R󱰽㨛+F󰓓?7𞴙a\")G/=\u000bRx􇺙㗢󷁰\u0000\u0019\u00127jQ1S*XcO䊛􎙥;)ls`6e\u000f󼖃U𛊝𗜈RMf~q𢕋`v<vg󸼻쥳󴜉j𭷌䃮\u000e󾒜<톙hD󰬙\u0017#𧍜R>\u0006􁅨0\u001d/y@oF󷣂\u001er􀳏\u0018A\u0006($'~􌥸x\u00194(\n~quJP􏀀󷮀^2D\tw\u0004󴃙t󵽈W󺿽\u001bSJ.\u0012}\u001e󼷡𗯳~\u00068M𣲳􀳪tz3[Yv歄~CC\u0003c清Of􏬤\u001dn􎿐TNm\u000fxU\u001b"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "enabled": false,
+    "password": "󲟄󽥄JXV''\u001d+-'\u001a𩩕\u001f-7ꭸXr&D𭊟\u0015!l\u0014𬆈37T2K\u00130𨝃󻁦\u001cf󼟴𓌳a0󾉍𨯢g\u00045Cꇓ䢕\u000f\u0010i𪈭|󹱻|j|Z󺽏Hc􊏖 􃟿q\\\u0006F\u001b捎\u0018\u000e c>𒊜ca𗣊1𢬺襥󵉕\u00123G\"v7\u0018\u0004􌘟g\u000c􎘞\u0006\u001aEhi\u001d\u00049\u0001v􇳧e\"7\u0014ꩍE𗽌\r)􍂹\rw/Iis󺘀\u0001𗺋4E^櫆m􀅭󶀿O'뼱A􇪜䷴\n~SSEJ𨟙\u0010\u0004cL󿊩c\u0013󸉶`8\u0014Es2\u001e(6lDMD~\u0000^𝥴󺓫􀙮\u001aw3x\u0005/g!}~\u000bR]𐦙量\u000e\u0003.X1󰅑z𡐽\u0018\u0018𣌨+􅣮V5𨘨􁗧𬫢XQ𭷨᷆􇃝I!kea􌂍4@\"\t􇏀􌖍ꩬM\u0016􄆄dp5󴡯Hz+󹢀𔔾8\u0002\u0005\u000f䵆Vw忍𩮲\u0000(𫀲$9\u0013g挲󿟩2S;\t\u0006\u0013\u0004\u000e\u0000j\u0018)z|\u0016/󾋣%\t𬎘𑫛^D`0\u0012􄦊􎑲󰛠󵤔𝡾𤠙􀊄󴰚\u0000fgh\u00164Td🨳J􎰼\u001c鎯caG,Si𢍄W􊙛E6􄛥\u001cC2∃+\n𣓵fn}􄲉䏃󷭘\u001aV1%\u0016𦝶R󱰽㨛+F󰓓?7𞴙a\")G/=\u000bRx􇺙㗢󷁰\u0000\u0019\u00127jQ1S*XcO䊛􎙥;)ls`6e\u000f󼖃U𛊝𗜈RMf~q𢕋`v<vg󸼻쥳󴜉j𭷌䃮\u000e󾒜<톙hD󰬙\u0017#𧍜R>\u0006􁅨0\u001d/y@oF󷣂\u001er􀳏\u0018A\u0006($'~􌥸x\u00194(\n~quJP􏀀󷮀^2D\tw\u0004󴃙t󵽈W󺿽\u001bSJ.\u0012}\u001e󼷡𗯳~\u00068M𣲳􀳪tz3[Yv歄~CC\u0003c清Of􏬤\u001dn􎿐TNm\u000fxU\u001b",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_13.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_13.json
index 35488207754..055244462ac 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_13.json
@@ -1,7 +1,7 @@
 {
-    "base_url": "https://example.com",
     "auth_tokens": [
         "afay7A=="
     ],
+    "base_url": "https://example.com",
     "password": "t\u001dC󴔱\u0008X𨄺kx?󷝽L軏7Is\u0010􋘣󰷝1潅Jd𗖲󲧡\n蹦&=\u0012𮏼\r,2\u0019\u0001pH\u00180C#\\/􁷷O\u0016dDG-E\u000e𢯃\u000e&\u0014(L\u000cZ8󵪤󴑾f𮜅􏭸@\u0001(&𭛛L篲f\u0012Pn𒂦h󴨤 vjw\u0016󶎑:znpI\u001auE􄐌𭫭𣯌f􄏟y:_􋍵d\u0019r@#穏06󽶨\u000faS<g𘆗pC3E/𭶐݀6d\u0002𦽈쩾1􌾸;H􁢯\u0004\t𤆊𑩔\r𧠠|\u0004,󻎉Pꋒ\u0004E􈘭􆞮,5\\f 󵨡稵􋬊\r.𢝏\u0013𥽠쬏s\u001a1Y_9y\u0010q@􀁫k\u001eQ𭒛I;Ww􏟨<􊜎~i1?mk\r1j󷟕🞾\u0010]8폵\n󴧰􁇕7\u0012^􊙌\u0002𠂀􃖬\u0005p)\u0013\u0012ꭏ$Fh\u0013Ndp􋟗􍻹F𓀒Zb󽴲`@_\u0006}reco\u0010鍲􌈪a󶸊G\u0001\n:𥴗\u0012!\u001a\u001c\u0006,c󹲪;晴Y\u00037v.age\u001d\u00168󼛃Sf7B{^􂙮|\"\u0017G􏶳y\u001eG𦔅mჵ\u0019C\nv\u0007r~󳈨g􂓞󳀔\u000fq󲗃E\u001fSIo󰧘3\u0012<yJf=rB5\re\t𭛠qu*\u0017?xfx󳣃\u0018M/\u001cnAf乐𨭬Hv(x~􌣝㭎?AyL|\u0008~d𥉦󽬎8=\npM\u0015r\u001d`F\u001b\u0005󼀜\u0013&ᰂB$𫲻asgsLz󶳶W6i𩭩\u0003n\u000f𐃗JQ\u001etXL✻)\u000b\u0008𦚸𪎅k[`𢘵`B󰓢\rv\u0003^{>q𩔥=jJ\u0005WTBꝏ<P𓅶{>\u0005\u0008\u0007{eヂѪ,𠢴􀍂􁢋\u001f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_14.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_14.json
index b240393f0dc..f33a9b81d6f 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_14.json
@@ -1,12 +1,12 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": true,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "67zOOg==",
         "dA=="
     ],
-    "password": "𮞺h\u001a􎼥\u0014*\u001e\u0019;\u0000\"0\u0019UoX󻛵\u00039L􀹐\u0006m磛𩗯7yc]l9N󶎡'􍌡oHl􍽛󸵼]xQR˃􌸬𣂀__@7茦묳m󰇚U9ꕪ-)\n/\u0019T-R.\u001cR\u001dhI,J𤥸\u0017o.啐\u0005􂡗YP􁶘X􌫳l뺃㙳T󷻴q\u0001?~_|𝤝驊􂒐\u0000𪼉2^=hBye$Gr4\u0004S\\R\u0011\u0012,\u0017]󿉋\u001e,]뗬{A\u0013]B[󴂘f8s\u001b+VGgmTkj\u001f\"I{W牍;/ 'N𩈼􊭐𑋜󾦹$L\u0019no-\u0001ᔊ󽐦􀸶\u0018O!OHH=7\u0011Kcj踍T5899\u0013+3𥐩PTHk/􀹾􎱖?@\\uDf0\u00119\u001c&N󾀮nkE\u0001E*樨󻓄󴴱󼝌d}󹨰FX`FD\u0013􋤽C5d:g𫓣􉈝\u0008y5{'\u0012\u000b8M:\u0014䯋𦜍6Js0!\u001bbT;g\u0008𢝌3^6\u0012U􅖂!z􁡑H􇝰Dr\u001bIV𨫄L\u0018lh6D-p9\u000f\u0003rvV\u0017\"\u000f\u0007\u0003󱠻l%{c􁗡󱁸󸢴􀝂R\\󽪝\u0002𧂖H1+㬸0\u000eXqM⟊1c\u001do{Q\u000f7{Zb𥀩3󹛖𬶿\t𡐸}\u0015\u001d𗚎􊨓󳜒0Nij\u0003\t𖥚󹖨C㖴覾[􀐼\u000f󴗩\u000e9󷘝\t󼅩\u0014Z(\u0006B🗵0d1梩2uhz}󱅩\u000e4,>L$􂹥aUv󾶔B7!𠑺u𫈗\u001fQM'\u001bFI|󲂴􃉄&A\u0002O\u0018%ga\u0000.h\u0003\u0016p󰿨󲩹u\u0017󰳮u󶀹y􇭉>󴼣a1%\u0008-E*𗶆uh-_!T龂𨫕*\u0017\u0011󹸇綢k𒅅D󰩚羂%J𗎵H16𝌬\\U𩫌󻥺l8M􉎄G睖]𣳸𩾰\u0008%S\u001e󽃐􃱁Q|BQ􅅸𖢎:KO9z97l\u001a𦭌\u000e􈒮]c\u0003𢗿o􈝛c2\n\u0010\u001eF󺴕b􀥄\u0001\u000bp]\\o-󹔌c\u00173]\u0014\u0016t\u001a4􀏭⧔Os|!fmz倫>ੈN>惇G􉍌𫬄#ⱫE#,🛤\u0000}𬄠M󻡂j󺑄\nV􉏁𗾯3D`7\u0019\u0015v9$8Y\u0012󲳡󼟩\u0017𤪰b^󰽗쾿Truf0b^x;:⸓􈱥馳枝\u000e C:i󹸐\u0008<}􁉠)B􀝻\u0010췀sD􃨔*+Gz>􀻈)4R\ti.\u001a\u001bp\u001b\u0014(I䅏󼠝W_󸞆􆠊Y\u000cg`P\u0013n𦠍w0m\u0013ec#<8)\u0014|#\u000en$闺\u0000|ejd\u0005􎬋EA\\Cz􍊨\u001d&G\u001d𩦗OwH쒳r󴿧𭼽G(\u0006uN\u001b􌃬k-􄃵\u0011Vz\u001f\u0006𥣃\u001b􇴀&󱯾D󸱐X\u0005w/sx픛P@EP􄿢c:\"𠰖N2|M\u001c\u0003-|驒})Htm}\u0015\u0016\u001b<󼃧􁨉\\󷋡𩁊0@7??AkY􋮦Z4􁊝&𐰋6\u000b|卿E\u000bDR󳴐5\u0010^\u0000𧺖L\n?0a]*mQBV󸝍\u00159\u0019\u001a\u00161JfI'\u0011}󼢩\u0004_D𩿔󾰁\u0014䥬\"hU)on5毷\u00010s<{`\u0015l\u000c9\\\u0015↦x\u0008N{󺺤󹷖\u001f\u001f𐒣#_"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "enabled": true,
+    "password": "𮞺h\u001a􎼥\u0014*\u001e\u0019;\u0000\"0\u0019UoX󻛵\u00039L􀹐\u0006m磛𩗯7yc]l9N󶎡'􍌡oHl􍽛󸵼]xQR˃􌸬𣂀__@7茦묳m󰇚U9ꕪ-)\n/\u0019T-R.\u001cR\u001dhI,J𤥸\u0017o.啐\u0005􂡗YP􁶘X􌫳l뺃㙳T󷻴q\u0001?~_|𝤝驊􂒐\u0000𪼉2^=hBye$Gr4\u0004S\\R\u0011\u0012,\u0017]󿉋\u001e,]뗬{A\u0013]B[󴂘f8s\u001b+VGgmTkj\u001f\"I{W牍;/ 'N𩈼􊭐𑋜󾦹$L\u0019no-\u0001ᔊ󽐦􀸶\u0018O!OHH=7\u0011Kcj踍T5899\u0013+3𥐩PTHk/􀹾􎱖?@\\uDf0\u00119\u001c&N󾀮nkE\u0001E*樨󻓄󴴱󼝌d}󹨰FX`FD\u0013􋤽C5d:g𫓣􉈝\u0008y5{'\u0012\u000b8M:\u0014䯋𦜍6Js0!\u001bbT;g\u0008𢝌3^6\u0012U􅖂!z􁡑H􇝰Dr\u001bIV𨫄L\u0018lh6D-p9\u000f\u0003rvV\u0017\"\u000f\u0007\u0003󱠻l%{c􁗡󱁸󸢴􀝂R\\󽪝\u0002𧂖H1+㬸0\u000eXqM⟊1c\u001do{Q\u000f7{Zb𥀩3󹛖𬶿\t𡐸}\u0015\u001d𗚎􊨓󳜒0Nij\u0003\t𖥚󹖨C㖴覾[􀐼\u000f󴗩\u000e9󷘝\t󼅩\u0014Z(\u0006B🗵0d1梩2uhz}󱅩\u000e4,>L$􂹥aUv󾶔B7!𠑺u𫈗\u001fQM'\u001bFI|󲂴􃉄&A\u0002O\u0018%ga\u0000.h\u0003\u0016p󰿨󲩹u\u0017󰳮u󶀹y􇭉>󴼣a1%\u0008-E*𗶆uh-_!T龂𨫕*\u0017\u0011󹸇綢k𒅅D󰩚羂%J𗎵H16𝌬\\U𩫌󻥺l8M􉎄G睖]𣳸𩾰\u0008%S\u001e󽃐􃱁Q|BQ􅅸𖢎:KO9z97l\u001a𦭌\u000e􈒮]c\u0003𢗿o􈝛c2\n\u0010\u001eF󺴕b􀥄\u0001\u000bp]\\o-󹔌c\u00173]\u0014\u0016t\u001a4􀏭⧔Os|!fmz倫>ੈN>惇G􉍌𫬄#ⱫE#,🛤\u0000}𬄠M󻡂j󺑄\nV􉏁𗾯3D`7\u0019\u0015v9$8Y\u0012󲳡󼟩\u0017𤪰b^󰽗쾿Truf0b^x;:⸓􈱥馳枝\u000e C:i󹸐\u0008<}􁉠)B􀝻\u0010췀sD􃨔*+Gz>􀻈)4R\ti.\u001a\u001bp\u001b\u0014(I䅏󼠝W_󸞆􆠊Y\u000cg`P\u0013n𦠍w0m\u0013ec#<8)\u0014|#\u000en$闺\u0000|ejd\u0005􎬋EA\\Cz􍊨\u001d&G\u001d𩦗OwH쒳r󴿧𭼽G(\u0006uN\u001b􌃬k-􄃵\u0011Vz\u001f\u0006𥣃\u001b􇴀&󱯾D󸱐X\u0005w/sx픛P@EP􄿢c:\"𠰖N2|M\u001c\u0003-|驒})Htm}\u0015\u0016\u001b<󼃧􁨉\\󷋡𩁊0@7??AkY􋮦Z4􁊝&𐰋6\u000b|卿E\u000bDR󳴐5\u0010^\u0000𧺖L\n?0a]*mQBV󸝍\u00159\u0019\u001a\u00161JfI'\u0011}󼢩\u0004_D𩿔󾰁\u0014䥬\"hU)on5毷\u00010s<{`\u0015l\u000c9\\\u0015↦x\u0008N{󺺤󹷖\u001f\u001f𐒣#_",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_15.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_15.json
index a64cba3490d..6574d9593d2 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_15.json
@@ -1,11 +1,11 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "base_url": "https://example.com",
     "auth_tokens": [
         "EvaJ",
         "BfDGJsM="
     ],
-    "password": "\u0001)1l󱈣𤊻[y6\\ht4;\u00137􁠖P󲑏GZ\u0001`-􈳚𩈪xF\u0005F\u0013􀐊iP*丠)5\u0015\u0013q#4t+$#j\u0014{1􌁾7𞴜\u001d{􁼤a􎝨􁗛\u0002{믏z􁗳/5O􈈱槷&(o騀~󰓤憛\u001bU&\u001b􉳴\u000b󳵬\u0006\t\u001egFXNig\u0011@8\u000e\u0003qp\u00042\r􇇇h􊊕󽕦y𐃁􋍎􇖁􁩒$N\u0013觑rȖ\u000b\u0001󵘉~J1a&𦋓Lz0Y-\u0007\u001b56骽󸯦{:0\tCG]68a\u001b􊻝𓀠\u001ch6\u001cM>rU󷼽s\u0013_3<𬗚𩯐E􍝊7|𧬴k\u000f*c6\u0010d󶡍s󵼟w꓁)\"􍜽,-k2꿝!`4l􍄽􈾠౬𧌸$s﹤l󸋓O-hb􏴟Wk`E赠𪓵Fzl\u0012􊤰\u000fj\u000f\u000f\u000eQk\tyb\u0003#B\u001a󼥚􆢎[􊐻b#\u001d􏓤芎􌊹0􈅅,Azi+$芤J\u001bUD𫁒Ml\u0001g)\u0019:\u001bL󰆶\u0015X\t\u0019A􃩡Q낕=Ol:𤷟r\u0017\u0013𛃅\u001f\n𩁪+F􀆪~\u0010p󵨧&X~딙󾻵\u0010\u001fa9<􅾬v*󺜰\tF󴍆c}􅎊o)\u0008𪄛鐎}<g;𓂓󺹒P佊\u0014􉓇Q:4𡙬祏cN\u000bk\u001016EG𪧝𗆍􀳎g^0𬡷H𪑈𣂧#s\u0007\u0015n𪔮W𣼪{퀤eU\u0015𢫮iC\u000fo\"-\u001apX)崼szx\u0014\u0007a3-l\u000cI\u0017B􂼅𨙆4t8-CJL帎p\u001b=\u0005熆􈠮]\u0002󵑿\u0012\r8)\n\n󸣦\u000cF\u0013_t𖧴A󿗸𤴘&🂬󶉭𗆌mR\u0005s'ꑕK𩽮s\u0000\u0013r\u0014󾲃kM􄫎oQ𥼽%黢\n󷡚e|v\u0011a􍲇fiiS.淹\u000e\r\u000cva6S2^􌁭f!#\u0012\u001e_(6􄄈\u000bW#t1#\u0018_w[M􇅌+𫦐C,`yLx󹬴\u0011]\u001b󵄇󹭾{[\u0007ꏇ\u0008\nC@7wwc\u0014󽾕'󲨳\u0013⒧\n摾鰖ma冀7<~􆍄]>D􄸂:3𨼰󶖊7 󿶢\u001a]8\u0008\\j\u0011󲟒𣴏)󸄭󺵾w𩵅\u0001"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "password": "\u0001)1l󱈣𤊻[y6\\ht4;\u00137􁠖P󲑏GZ\u0001`-􈳚𩈪xF\u0005F\u0013􀐊iP*丠)5\u0015\u0013q#4t+$#j\u0014{1􌁾7𞴜\u001d{􁼤a􎝨􁗛\u0002{믏z􁗳/5O􈈱槷&(o騀~󰓤憛\u001bU&\u001b􉳴\u000b󳵬\u0006\t\u001egFXNig\u0011@8\u000e\u0003qp\u00042\r􇇇h􊊕󽕦y𐃁􋍎􇖁􁩒$N\u0013觑rȖ\u000b\u0001󵘉~J1a&𦋓Lz0Y-\u0007\u001b56骽󸯦{:0\tCG]68a\u001b􊻝𓀠\u001ch6\u001cM>rU󷼽s\u0013_3<𬗚𩯐E􍝊7|𧬴k\u000f*c6\u0010d󶡍s󵼟w꓁)\"􍜽,-k2꿝!`4l􍄽􈾠౬𧌸$s﹤l󸋓O-hb􏴟Wk`E赠𪓵Fzl\u0012􊤰\u000fj\u000f\u000f\u000eQk\tyb\u0003#B\u001a󼥚􆢎[􊐻b#\u001d􏓤芎􌊹0􈅅,Azi+$芤J\u001bUD𫁒Ml\u0001g)\u0019:\u001bL󰆶\u0015X\t\u0019A􃩡Q낕=Ol:𤷟r\u0017\u0013𛃅\u001f\n𩁪+F􀆪~\u0010p󵨧&X~딙󾻵\u0010\u001fa9<􅾬v*󺜰\tF󴍆c}􅎊o)\u0008𪄛鐎}<g;𓂓󺹒P佊\u0014􉓇Q:4𡙬祏cN\u000bk\u001016EG𪧝𗆍􀳎g^0𬡷H𪑈𣂧#s\u0007\u0015n𪔮W𣼪{퀤eU\u0015𢫮iC\u000fo\"-\u001apX)崼szx\u0014\u0007a3-l\u000cI\u0017B􂼅𨙆4t8-CJL帎p\u001b=\u0005熆􈠮]\u0002󵑿\u0012\r8)\n\n󸣦\u000cF\u0013_t𖧴A󿗸𤴘&🂬󶉭𗆌mR\u0005s'ꑕK𩽮s\u0000\u0013r\u0014󾲃kM􄫎oQ𥼽%黢\n󷡚e|v\u0011a􍲇fiiS.淹\u000e\r\u000cva6S2^􌁭f!#\u0012\u001e_(6􄄈\u000bW#t1#\u0018_w[M􇅌+𫦐C,`yLx󹬴\u0011]\u001b󵄇󹭾{[\u0007ꏇ\u0008\nC@7wwc\u0014󽾕'󲨳\u0013⒧\n摾鰖ma冀7<~􆍄]>D􄸂:3𨼰󶖊7 󿶢\u001a]8\u0008\\j\u0011󲟒𣴏)󸄭󺵾w𩵅\u0001",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_16.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_16.json
index b19e46e7477..136b53474b1 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_16.json
@@ -1,12 +1,12 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": true,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "pnY="
     ],
-    "password": "ʄ'\n᯿q\u0019;󼈔BLAvpn\u000f󴵬󹸓<슾\u0002󷖡𡟹\u0004s\u0008\u0008%7\u0010#X1𧟑\u001bv\u001al!eh󹙁\u000b話󲝓o0I^:\u0010􉌾􅂤tn\u0011C󸻵jX\u0015m𭽭LTK\u000f'\u001bF3]nr<?y\u001eR󸆯He$𪻓\"q\u001c\u0011\u001a$H=\u0019'w\u001f\u0008h\u0004djU󷕋\u0017TK@Fj\u000eD􆷪:)q<𞄑\u0015P,}]tTH\u0001􎭿6\t\"\\@󳓰t<x󱇰q𠯃#q\u0015P>/𩈄\\􉫍bB\u001a'\u0008𦖬󷰆3\u0016g\n}{pq\u0015􏼲?󳅘𮥔\u0018:𪶺\\􅉖ZMs\t􄽊6S󺇓􊾫nO:Xy􃿝𪔓󿁽𨊉\"ry\u0012\u0000T#􇅵M3S[🂃뽍K􍥓WE<󸣶1Y\u0008큎􀨂Z󽥡\u001cU󲥝R𪻷\u0014FN%\u001bi\u0010\u0019y +m\u001ek*Txd䷬ji𮊜􆎎􇽱!6N\u0010!_!󺢧3a?s>\u0004\u0002󾕼籸@🡘6\u000c\u0013󳙹.\u0016z+8\u0000􇊲􅆥\u0004Q\u0003tV\\`;c\u000co욀𝠱0=􄊸\u0019[\u0005{􀸚B,鍀'븂𦟄𧰐𗼣𝓞PBx󳬜?6I]X`W𦭬\u0005쌫󰷗\u0010'\u0007\u0003􆗣7U𡁺󶐸⍺\u001b<^__𘥐B;􌚻%K𤩰𓈿E󱪁\u0011#柸_\u0014􃏺k􂨅]3.6𖢊㡳%\u001f2𣉵'p\u0013\u0004#j.禯@􁠦1𥸈0;NR'󿼕O󼈲􋉱\u0013\u0007bJ/\u000b󶩄V󿯼 \u0001o,2[\u001e]4\u000c\nGb𫰹|󿾵󿼧b\u00012C^x\u0010\u0017%L\u001cQEF.X%\u0016􆷔󸸛\\ze6\u0006"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "enabled": true,
+    "password": "ʄ'\n᯿q\u0019;󼈔BLAvpn\u000f󴵬󹸓<슾\u0002󷖡𡟹\u0004s\u0008\u0008%7\u0010#X1𧟑\u001bv\u001al!eh󹙁\u000b話󲝓o0I^:\u0010􉌾􅂤tn\u0011C󸻵jX\u0015m𭽭LTK\u000f'\u001bF3]nr<?y\u001eR󸆯He$𪻓\"q\u001c\u0011\u001a$H=\u0019'w\u001f\u0008h\u0004djU󷕋\u0017TK@Fj\u000eD􆷪:)q<𞄑\u0015P,}]tTH\u0001􎭿6\t\"\\@󳓰t<x󱇰q𠯃#q\u0015P>/𩈄\\􉫍bB\u001a'\u0008𦖬󷰆3\u0016g\n}{pq\u0015􏼲?󳅘𮥔\u0018:𪶺\\􅉖ZMs\t􄽊6S󺇓􊾫nO:Xy􃿝𪔓󿁽𨊉\"ry\u0012\u0000T#􇅵M3S[🂃뽍K􍥓WE<󸣶1Y\u0008큎􀨂Z󽥡\u001cU󲥝R𪻷\u0014FN%\u001bi\u0010\u0019y +m\u001ek*Txd䷬ji𮊜􆎎􇽱!6N\u0010!_!󺢧3a?s>\u0004\u0002󾕼籸@🡘6\u000c\u0013󳙹.\u0016z+8\u0000􇊲􅆥\u0004Q\u0003tV\\`;c\u000co욀𝠱0=􄊸\u0019[\u0005{􀸚B,鍀'븂𦟄𧰐𗼣𝓞PBx󳬜?6I]X`W𦭬\u0005쌫󰷗\u0010'\u0007\u0003􆗣7U𡁺󶐸⍺\u001b<^__𘥐B;􌚻%K𤩰𓈿E󱪁\u0011#柸_\u0014􃏺k􂨅]3.6𖢊㡳%\u001f2𣉵'p\u0013\u0004#j.禯@􁠦1𥸈0;NR'󿼕O󼈲􋉱\u0013\u0007bJ/\u000b󶩄V󿯼 \u0001o,2[\u001e]4\u000c\nGb𫰹|󿾵󿼧b\u00012C^x\u0010\u0017%L\u001cQEF.X%\u0016􆷔󸸛\\ze6\u0006",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_17.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_17.json
index 0f2e70b7e9a..cdd10c69616 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_17.json
@@ -1,11 +1,11 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
     "auth_tokens": [
         "AjoN",
         "c_WGcw=="
     ],
-    "password": "\u0004󿔮t𗫫\u001a8<\u0017)\u0019a2\u0015I\u0000c=􎥹(r\u000e/𤌱.&𤃹5\u0001fH󼺗𨂀['󱿺T󳨨2\u001e𔒋\u000by𤪦􋩱𣋁juC𗇖"
-}
\ No newline at end of file
+    "password": "\u0004󿔮t𗫫\u001a8<\u0017)\u0019a2\u0015I\u0000c=􎥹(r\u000e/𤌱.&𤃹5\u0001fH󼺗𨂀['󱿺T󳨨2\u001e𔒋\u000by𤪦􋩱𣋁juC𗇖",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_18.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_18.json
index 7baaf7dfd11..06482de5466 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_18.json
@@ -1,9 +1,9 @@
 {
-    "enabled": false,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "FX2Rjg==",
         ""
     ],
+    "base_url": "https://example.com",
+    "enabled": false,
     "password": "BK Q󷥭\u0008n0$T!r\u0018𤳅m\u001a\u0015$𢹗􊉬󽺗􏋴bn)􂄫E𗰶0)ZK$z?.\u0001𨹾[:􍻼rꮘ(H꤮\u0008U2𫭫3oS16<􎀱Z\u0018]묄7/𝗆JUI慦d􇹝󶣻\u001a䩙\u0011􃈐Z\u0004\u0004핯z\u000eR􉓶7\u0010s;m鉥滬>󳭒p)\\`15\u0013q􋚯l\u000e𥎞b\u000cy㤏􆠂$>D𥇻X|𬢓􏆾􊙫\u0005풯0Up2]j~St\u0004𧁐w.T\t􄺎\u000c\u0012𭢢𣞈&W(\u0005󺏇h\u000f 󱿾\u00174o\u000b\u001c􋨁\u0004B󹠈2!\u0010+𘁅\u000bpK\u0018𧺖b2]h@ei𣁴\u0013뢀vG+ytaV𘚠6󼏝\nE\n􀝛d@jI𩍃7䟨괕F&󽖂𠰼(?#P􍎺R󾅆<𗁞􁀏~c\u001d􇨗RC7f'\u0000f􃾬{_Z:Cl\u000e􍠧\u001d𒉎􃟣&𘪡鎕󵓦󸿍2ux\n MN𫀐`\u0016p\u0019\u0006麚􆤑􅣤󱼲bl\u0014\u0017_\u001f\u0003[U\u0001\u0000󳉐ᴞ\u001eZ-}e󱾸V:L둣 Xh󼅧io󽲺@𪼿\u0015\u0002F\u0001*/D𪄥6\u0011𘠿ㆺOjPQU1K􇫫\u0016󲱟O\u001e𒔣1􊯽ｷ/[𬢋-\u0007􏨍8\u0004\u0016cE𮢧󺱫󻉜􁤲u\u0019s󾧫tLzgD𭀸y]o𐡊\u0008v\u0019⯀󶡃nW􂔃[\u001d\n𘀡l*󹅴𤝲*ca󾬪&󱽉\u001d>\u0013)\u001b\r\u0017=Q𤞲\u0004\u001b􏂭𫣼vGL{􋪓+􄴑􋶔𬹎{+&󼌢咳(\u000f{',󱈘@𗼰\u0003T5𠆿𢙻󶡽J s[\\^2cSJ&g𦂤\u0018􏅱 6󳯨󽧑Q𧁯\u00177\\L󳄏n\u0012􍘚\u0007O􇌶󹽭󺰇X:8YA7`\r𖠐𫋓dX$Ճ\"𤕖YYU𣕍󱁔#i#`伤􈦻V\u001f)|㡅2\rN>􎠙𮒵M_&t𗠻p\n\u0012\u000c􍾶𫖔Vw󷹌\u0004􃡸2\u001e$𑁁SEF\u000eo톆\u0006귔󴚢qYL93:5{b𝜞3󲃐\u0010󱰄\u000eI\u0008RT:􄃖vM\u0007쮡'?\u0004􂸿^󷠫\u001e^\u0002fY𧿇Fꔉq\u0008\u000bh?􆶜^\u0011l9<^)pꚘtmQBN#3,\u0013𝒩\u0016𤍺_\u000evAB\u001042󵻶T!V\u001c|􁗻󲺠Y5gy\u0003=𠔃p%e뜚\u000b\u0014\u0012󸦯ms'a\u000e󱸗\u0010D\u001e𪶜󲣂[􌫐$y2+\"怈𢉋𥼊︹\u001ce5𘐴8iB*k;\u001a<䭨􏝽\t\u0002z\u0013s88((+E\r!O\u0005:\u0005𖾇\u0014T-CF􋀜KP憁[f𐐜fx􍱟$G􌟿쳁\r󱯙9󲆲𣪣e\u000cs2\u001f"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_19.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_19.json
index a76ad9024fc..fbd7fb060d3 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_19.json
@@ -1,11 +1,11 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": false,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "1LoyRg=="
     ],
-    "password": " &n𧍫蕪8ꮡU󽰥>*󲡹=谪𩵾3v􂥗Hs桐o}麪l󷬰\u001c𤍚m\u0015j8󱊕𨺧]/㜌K(:\u0014𐴆\u0002\u0001K\u0008翾J􄅘􉛝\\\u001e\u0015󶉻􇘉𦂱%\u0003d􇆉qS𠷛y*#𓁊\u000f\u000f\u0005꿝ꒂ𩵰:{\nP𣙥lC󿹯>z􆺑􆘜v􍿸󴠸1|gࡖ\u0010􂜔UT􊴼)vUVM\u0018S󷀬\n\u0011\u000cy\u0014􉛻c\u0002}Tll\u001d\"G9\u0004-􁼝􀄷\u000f2]𫠵\u000c𩳆|}g󿌵𧟟e𬧵\u0002𑻨dY󽓐F\t#{;mK𡨻轌熚\n\u000e𑘫󸴑󸫳\u000eRn\u0018\n(􊮲>FCD𥭁-􍤀n\u0003I𗂜𖹻\u0017N94𫣶?k\u0006?|,􋵛c󽿕Qkp\u0017m㌛湖\u0002和XpZ󻋫#~T\rB}@\u0019B\u001b%􁽀𭀋,𭏀m󴊖\n)HlK{PE𡲙_/[H=埜4\u001e\u0006쇨^+MX𘍃􋇟{D>􂘇V\u0014).HX󹎐x\u0019ጅE-i:,?{H\n󼇎^Xt􆩇\u0004\u001efC%󽀾X󲓉𝜊k_\rl8v􂪢O𠙫\u000c[CJD𤑥*꼺竖~0lSdA\u0010\u001a󱑥𐧊|#vCkB4\u0011zwqᕈK􎶐􅦽􋉏aU󿜮䝠F\u0000ED󸇹\u000b楠Su\u000bmB󸳰\u001f+󶻦􊑿\u0010\u000f􋹆>𝦅\u0018UQ𧣒p鄭󸾾(I􇁲\r\u0013𦜴𗞞􏉒>󹆉\u0018𩤇hF^<7\u0006In𥇌\u0016w𔓹H𥳗𮍉\u0008F𩤉8􃣃ⷳ𒂔dR􋃻>D􍂵D􇩩\u0004T\u001dP7nwꖨ\u0013𤅵m8*R\u0014\u0010\u0014a󳶉\u0008&𥣅\u0007􃱝\u0005\u0006栈\u0007\u0015heaM􍖺𨝻󲏤m5\ro𥧋\u0012𠙎9/~&$c\u0019ధ]0BuH\u0011𤻓Sᶧp溟𩗜䀶S PUYy\u000b-􆸆\u00116󳀋􍍶𤗶𡰅􍼀\u0011t9\u001c槼z-𢙭U\u001c^c𤃮!䊠x𘇻󸆧{6\r\rG\u000ce􃁊\r󹤂\u0017󱪜\u0008v2YN\u0014\u0017$-􈄞*𡦭4"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "enabled": false,
+    "password": " &n𧍫蕪8ꮡU󽰥>*󲡹=谪𩵾3v􂥗Hs桐o}麪l󷬰\u001c𤍚m\u0015j8󱊕𨺧]/㜌K(:\u0014𐴆\u0002\u0001K\u0008翾J􄅘􉛝\\\u001e\u0015󶉻􇘉𦂱%\u0003d􇆉qS𠷛y*#𓁊\u000f\u000f\u0005꿝ꒂ𩵰:{\nP𣙥lC󿹯>z􆺑􆘜v􍿸󴠸1|gࡖ\u0010􂜔UT􊴼)vUVM\u0018S󷀬\n\u0011\u000cy\u0014􉛻c\u0002}Tll\u001d\"G9\u0004-􁼝􀄷\u000f2]𫠵\u000c𩳆|}g󿌵𧟟e𬧵\u0002𑻨dY󽓐F\t#{;mK𡨻轌熚\n\u000e𑘫󸴑󸫳\u000eRn\u0018\n(􊮲>FCD𥭁-􍤀n\u0003I𗂜𖹻\u0017N94𫣶?k\u0006?|,􋵛c󽿕Qkp\u0017m㌛湖\u0002和XpZ󻋫#~T\rB}@\u0019B\u001b%􁽀𭀋,𭏀m󴊖\n)HlK{PE𡲙_/[H=埜4\u001e\u0006쇨^+MX𘍃􋇟{D>􂘇V\u0014).HX󹎐x\u0019ጅE-i:,?{H\n󼇎^Xt􆩇\u0004\u001efC%󽀾X󲓉𝜊k_\rl8v􂪢O𠙫\u000c[CJD𤑥*꼺竖~0lSdA\u0010\u001a󱑥𐧊|#vCkB4\u0011zwqᕈK􎶐􅦽􋉏aU󿜮䝠F\u0000ED󸇹\u000b楠Su\u000bmB󸳰\u001f+󶻦􊑿\u0010\u000f􋹆>𝦅\u0018UQ𧣒p鄭󸾾(I􇁲\r\u0013𦜴𗞞􏉒>󹆉\u0018𩤇hF^<7\u0006In𥇌\u0016w𔓹H𥳗𮍉\u0008F𩤉8􃣃ⷳ𒂔dR􋃻>D􍂵D􇩩\u0004T\u001dP7nwꖨ\u0013𤅵m8*R\u0014\u0010\u0014a󳶉\u0008&𥣅\u0007􃱝\u0005\u0006栈\u0007\u0015heaM􍖺𨝻󲏤m5\ro𥧋\u0012𠙎9/~&$c\u0019ధ]0BuH\u0011𤻓Sᶧp溟𩗜䀶S PUYy\u000b-􆸆\u00116󳀋􍍶𤗶𡰅􍼀\u0011t9\u001c槼z-𢙭U\u001c^c𤃮!䊠x𘇻󸆧{6\r\rG\u000ce􃁊\r󹤂\u0017󱪜\u0008v2YN\u0014\u0017$-􈄞*𡦭4",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_2.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_2.json
index db6d493ea02..65c0a91ff03 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_2.json
@@ -1,8 +1,8 @@
 {
-    "enabled": false,
     "auth_tokens": [
         "5KalsQ==",
         "el0K2cA="
     ],
+    "enabled": false,
     "password": "+)| \u0005u𠐙[|G`|󾆗㫇95GpkVm𫯍9'􋙻y\u0014N􊍛2;f%\u001b𧾹ᨔ9}\u001f峹)󵎃\u0012𪮓w\u000b82^􏻥jtZͱb\u0005𬕃T𨸥󲝬\u0019􂟛𐌔\u001b)\u001b\u001d𣠰D\u00012\"𓃦G󼝼󶁬p\u001aV 𦑼[𫀾9t\u0019_鰖􄐾\u0007*DVE𠂋'&Ls󱯠\tt|󲖨kk8\u001c𗵥e􈊸\u0007Ti𣢰q\u0014󷼠kR<f>4􀦦\u0011vZBp)%)7􀕌􄧐m\u0000I\u0003􂣈u󾥊\u0015i􎙄􇿭\u0006\u0018􋿖w,\u0014\"귯9y\u00052A\u0010@𬽘O~/rQ#\u0007𗕌䯁MZ?鴍𧛷\n􀼇𫆮dHa\u0008S[Pg𬧂}\t\n𨉻𮧲{톬,\u001f󵑂3=f]p􅦞&\u001e\u0002&ᾖ􁚅:,\u0010\u0017x􀌭2\\󲀜\u000f󾮅\u00158R,?6\u0014𐃡\u001a󱝞\u0011_HHSk\u001aopnH\tE􆮤ꪇ5/\u0002녡\u0007{\u0005\u0003􈥉M~Y𣍁􅽭𢷴1󱏙􀁎󲚁1|l<󻺟\rPi𠞾􌳷ABh7沦𗩞{N:uw3𥄮p(hwN\u000f\u0015Uf􍉿𤩗P\u0005􆛨q\u0015_HJ󼦢􌼛\u000b\u0019䇳|K|\u000e\u00066yS󸻮k僽\t+Nx;󸔡r\u0016Q/;s\u001d󿎬:*G𨂱C\u0003m\u0006#󴊲㉍V𩔺7,\"r;z\u001a7!YYIA-wC􉊱c󶦷浺&rKJ\r#7Nq4o󵧂\n􁰌}\u0004Q\u0007yIwA𛆺\u0016􆞒󴿨'Y뫘}\u0016Yc뤶#汷Y\u000f䅯𨎣t,Zc皹\u0017XP5-\u0015􊗀H\u001b2􍳸𭗎b+u.+󴶥,^s\u001b+\u000b󳸊MTe𢜀\u0011`􌨰~s4r^\u0004􊌂\rnEW󵽇X􋜨D􎥪 𢨇𧽥$\u0000𥉄BS􋏔n<\u001d!,fL\u0016󸴔􉼗𧣮𭅆xu\tVR⠘SvgXL_󵭉43𐲠$>\u0016\u0000\u001e:𩺵⌧􋯃\u001d\"U\"_홆:\u0006璕f\u0003)♘yBK[KJ\u0012􃀭\u0007ᱷl󺔦M[\u0014:EGBoflD4󶾽L\ranZiv&'- ]ࠖ\u000cB[\u000b󺾢􉷜d{(&6􊘤O\u000f\u0014􇯥\u0001􉸤`㇡􌿥롃Hhq𧈬H2r顲㱧\u001f\r8𖡒󴯛1\r0\u0005\u0007􇓖\u0016󳆤QQ\u0005dt􋀀􉈵#'\u0003K^􃺿(\u001a󱹔N)M⸜􊴢󴫓cB}ޜ􋡯\u0016󿟨JZt\u0000󸰕w\t=𨋺ya}(\u000e\u0008󳏧e𗉦\u0013~󿆲獘)9􇫉􌞪nI1尻#⚙1󵻧qFGᥤX9zM[t꺷ii\u001e\r6JQ\u000f3Q\u001c􃰷Nq暣\u0010𪊻𢢣[􏝷k𢯆\u0003+nbs\u001e0W3\u001f󸷧\u0000'\u0007l\u0007IbN\u0011\u0015\u001b9㸤𥼯?(󺲻oT[w𧿄𐓈.𫘷\u0005 IlW䉵H\n\r81\u000b\u0019AC􏙕oN挪Dtg𮬼3'󽘺S{\u0006􅫦l󳮖󹌲oi\u001b!,\u000c􆊼󼠨0𬽋{a􂷤𣚩#p-\u001dX\u0004\u0008Iq\u0010zo9U\u0014t\r"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_20.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_20.json
index 0f94a9e0505..221d0f04bb0 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_20.json
@@ -1,11 +1,11 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "base_url": "https://example.com",
     "auth_tokens": [
         "NA==",
         ""
     ],
-    "password": "4𑋟􅉧𢦞4\u001b𞹪\u001a\u001c#7e%Lj;\u0001e1𥎀󽤀\u0018<T_\u0015tn5\u0017M\u0004p龑󻷓wm#L𝄄wOL\u001f󿰿\u001fkj+tsh;\u0002譿,9鴎􉔡􎒢\"F󾚹\u001e~\u0015󷊤󶦥\u001d595MESht󹽑Y\u0014wNG(!\u0018@\rH󹻈􅒅\u000bYN􇂾d󺧂C/v\u0012󴴞x𦪻𥕍Z\u001a~(\t}\u0010𡁢𥵀Bj6HNOqk*|&F&A𐦦m\u001cq𒀙닭C\u0016𨫢D\u0004#~2i?\n󰷝\t₳,:(;\u0001炝+\u000fh􉍋\u0003'3᥊\u000f:冗\u000f\u000bu󱾩qZ􌘳[H'.\u0018a4󳔨𝟡@l0jG&ihNp?\u0012󶵚\u0016iB𐁈La󲉄\u000e􋍐w𧠢砙\u000c{KR춋󼊭𢵏d2\u0002 0`𣗚O)\u000f𪳊\u0010]󻨣\u0008󱱉􂩞Cw󺽺X.7􆃯AD􍌳&P<Sz4Tiz󱲺3}<R6􈾇!\u0012𠚪#晁p鎿usUI[z.8ff+66􏉂(:v\r\"KD&5󿞜ᾝaW^\u000c\u001a\u0014𨝧cE뜎𮎕J\u0000\u001d\u001a\u0013d}\u0001ጿ􍂡j\u0005𗤿b\u0017pCSul&~l9/0\u0010\\.3\u001bF賯G\u0000YR%-踐;\u0001툀/N:"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "password": "4𑋟􅉧𢦞4\u001b𞹪\u001a\u001c#7e%Lj;\u0001e1𥎀󽤀\u0018<T_\u0015tn5\u0017M\u0004p龑󻷓wm#L𝄄wOL\u001f󿰿\u001fkj+tsh;\u0002譿,9鴎􉔡􎒢\"F󾚹\u001e~\u0015󷊤󶦥\u001d595MESht󹽑Y\u0014wNG(!\u0018@\rH󹻈􅒅\u000bYN􇂾d󺧂C/v\u0012󴴞x𦪻𥕍Z\u001a~(\t}\u0010𡁢𥵀Bj6HNOqk*|&F&A𐦦m\u001cq𒀙닭C\u0016𨫢D\u0004#~2i?\n󰷝\t₳,:(;\u0001炝+\u000fh􉍋\u0003'3᥊\u000f:冗\u000f\u000bu󱾩qZ􌘳[H'.\u0018a4󳔨𝟡@l0jG&ihNp?\u0012󶵚\u0016iB𐁈La󲉄\u000e􋍐w𧠢砙\u000c{KR춋󼊭𢵏d2\u0002 0`𣗚O)\u000f𪳊\u0010]󻨣\u0008󱱉􂩞Cw󺽺X.7􆃯AD􍌳&P<Sz4Tiz󱲺3}<R6􈾇!\u0012𠚪#晁p鎿usUI[z.8ff+66􏉂(:v\r\"KD&5󿞜ᾝaW^\u000c\u001a\u0014𨝧cE뜎𮎕J\u0000\u001d\u001a\u0013d}\u0001ጿ􍂡j\u0005𗤿b\u0017pCSul&~l9/0\u0010\\.3\u001bF賯G\u0000YR%-踐;\u0001툀/N:",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_3.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_3.json
index 9ebbd2797ae..36ca710a5f3 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_3.json
@@ -1,4 +1,4 @@
 {
     "base_url": "https://example.com",
     "password": ",,\u001b\u0012iꀖF\u0014O8𨈈P􏂎`\u0019-{A}3𣌒\u0019KQK~+,X焳sTF\u001eCF.i#􏎏K󽚙Q𭘠~'b)k\u000bJp󷟄B\u0006𨎔󺥾"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_4.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_4.json
index fc887136071..2e29349867d 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_4.json
@@ -1,11 +1,11 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": false,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "yXM="
     ],
-    "password": "󳶧X죘x:L􎨗~􇻩𫺸^u𣺒`\u000b=\u0019䌫\u000f6􈬙􏆕󷦞Q\u0015p󵘼𮬂􅮲𭣣􏍩c🨼W􁓝g𪶂/\u0010c?㙝a󼘁%=0@\u001d?\u0003s'󸱗𩄡cQFfA󹌰\u0006`6Vyu􉢫\u0016\u000fQ𨓵􆊆o`􅹵\u001d\r\\}y;󰑡jCk\u000cg$\u0007}\u000f\u001fh5,\u0005c󿷲m⟓17@2\u000c,-U(Z􉕆&㾷𨅆\u0002R$\u001fcB?󺴯\u000bs\u000e&\t*;􌠭aj5󷁤澋𧩨\u000f\u0010I󰫭􂮘\u001d|𗓆5\u0012\u0007XO`𭋝):𩞌\u0000l\u0008􉙯9\u001azᏻ1\u0015C􅗈c\u0014$ZY𥀸:\u0007tq \u001b&>\u0004dlu~𢕖𘀹^-\n\u0007b\u001e儧g\u0000\u0005󴝃 qy;<惁\u000f\u0019\u0010?𞡢m54\u00002)y1\u000e\u0003􎇀􆷴\"V[󼹉\u0001]󱖎i𝤱O\u000b;ᚩ\u0018B𬋗\u0019􏇁\u0000􅙩P𛆕󳑯􌈠8L\nC􂡟D\u001f~\u0004)􎅗쇲a\u0005Wn⚵*𡞥􎟯\u0004{\u0018bCzzGW\u0010󵺲𠌞r(葌5T\u0001駫\u001f\u0000a󻢛DS}r\"yz\u0010s\u0017􋽶,dP𗠱􊒿\u0006[𫭝e􆲁mD!T󶏾\u000b^𑐓T\u0019>}A61\u0003m\u0010_7f\u0016\u0013a䅥\u0016]􌽮󸪯9s\u0012O~a*:O\u000e逩杠?\u0015󵦺Lp𝡨XI🄚o=e\u000cp\u001d-\"􇎌9h􉿣?|~\u000fa/FX\u001fl\u001f󷤛𮟠uX􂧶%]qlfXxxLP1g\u0012r(Jjm鄶𠼫_v󹫖j\u000e胰3컕SY\u001a\n뵸G\u0010\u0003n𣛙\u000c󴢑J\u0015D(ns.M󿦦A𗃂󲙻XI󳏿󱃉賟6m󲫷\u001cS􂒵+!𬴥𣔯\u0005\u0016Y\u000c-e\u0006\u0004\u0004W􋑏\u0011,?3\u0002+􍖮陬.𨾅2\"􀿢\u0006I\u0001\u001d#\u001etJ ⸡\u0014,}.wo󸊵"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "enabled": false,
+    "password": "󳶧X죘x:L􎨗~􇻩𫺸^u𣺒`\u000b=\u0019䌫\u000f6􈬙􏆕󷦞Q\u0015p󵘼𮬂􅮲𭣣􏍩c🨼W􁓝g𪶂/\u0010c?㙝a󼘁%=0@\u001d?\u0003s'󸱗𩄡cQFfA󹌰\u0006`6Vyu􉢫\u0016\u000fQ𨓵􆊆o`􅹵\u001d\r\\}y;󰑡jCk\u000cg$\u0007}\u000f\u001fh5,\u0005c󿷲m⟓17@2\u000c,-U(Z􉕆&㾷𨅆\u0002R$\u001fcB?󺴯\u000bs\u000e&\t*;􌠭aj5󷁤澋𧩨\u000f\u0010I󰫭􂮘\u001d|𗓆5\u0012\u0007XO`𭋝):𩞌\u0000l\u0008􉙯9\u001azᏻ1\u0015C􅗈c\u0014$ZY𥀸:\u0007tq \u001b&>\u0004dlu~𢕖𘀹^-\n\u0007b\u001e儧g\u0000\u0005󴝃 qy;<惁\u000f\u0019\u0010?𞡢m54\u00002)y1\u000e\u0003􎇀􆷴\"V[󼹉\u0001]󱖎i𝤱O\u000b;ᚩ\u0018B𬋗\u0019􏇁\u0000􅙩P𛆕󳑯􌈠8L\nC􂡟D\u001f~\u0004)􎅗쇲a\u0005Wn⚵*𡞥􎟯\u0004{\u0018bCzzGW\u0010󵺲𠌞r(葌5T\u0001駫\u001f\u0000a󻢛DS}r\"yz\u0010s\u0017􋽶,dP𗠱􊒿\u0006[𫭝e􆲁mD!T󶏾\u000b^𑐓T\u0019>}A61\u0003m\u0010_7f\u0016\u0013a䅥\u0016]􌽮󸪯9s\u0012O~a*:O\u000e逩杠?\u0015󵦺Lp𝡨XI🄚o=e\u000cp\u001d-\"􇎌9h􉿣?|~\u000fa/FX\u001fl\u001f󷤛𮟠uX􂧶%]qlfXxxLP1g\u0012r(Jjm鄶𠼫_v󹫖j\u000e胰3컕SY\u001a\n뵸G\u0010\u0003n𣛙\u000c󴢑J\u0015D(ns.M󿦦A𗃂󲙻XI󳏿󱃉賟6m󲫷\u001cS􂒵+!𬴥𣔯\u0005\u0016Y\u000c-e\u0006\u0004\u0004W􋑏\u0011,?3\u0002+􍖮陬.𨾅2\"􀿢\u0006I\u0001\u001d#\u001etJ ⸡\u0014,}.wo󸊵",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_5.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_5.json
index a9f9346a1ae..cbb724aae3f 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_5.json
@@ -1,12 +1,12 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": true,
     "auth_tokens": [
         "",
         "25QkmfM="
     ],
-    "password": "]\u0017N`w}I􆿩􃤧真\u001bb\u001ew󶜄놊󽔞\u001eTlqD쟖𧛑x\u0008􆅾󲋖\u001f\u00016BZ \u0012􏗑󾎼𒅩n]v|󴢝\u0005+\u0008􄵾K􋯃H\u000f\u001c-9Of꓃ST=\u0002𧎂%󺤝i\u0006􊯱𥿭,\u001a8;2\u0010F{𤇝/5g􃉓􎬃T\u00196{l,#\u000fVG\u0001󸸺e#u~#=𧕱]6􈇂t \u0012/q1\u0000!󷾊6]g@o/\u000cR\u0010󸄬櫓VY􊡩R^뼯豕Tqj(}𦓥\u0006em𘔭\u000f󸞓𡎸𝣐\\􊩘q\u001bbxFQY\u001f􎊒!C3V>|􋙠\u0015󿕤h\u001e𬧥wl'􄬽I󻉠\u0007<:𬛶(9E0j课~㤞f\\\u00138a1[N\u0006\u001e\u0008\u001dE\\^K\u0001(𨬚6\tf\u0003󴀘Y<噸Q\u0005Y(%$Iy\u000cE\u001d@G#𬋽𩺿\u0013󼜝󼬆僪\u000eK􋞙wS괆轖{\u0013Am濏C􈟕\ne𫲟p􄉪N⍾F\u001cxfT\n𪎦j󿘉\u0010Sk􏎮󻭾xar2𧊀1𪞦𢜉󽔉\u0001장Y>\u0001𥃻Sr\u000c󲴳󺚹f󷗞\u0011し𐘦<w\u001b$_$\u0004\\g8\u001dﻭE9\u0017\u0001󲫾.y𬆝ᥘ􉣶𪮊G뺖R\u001a28@e=Z_\u000c\rv\u0002\u000f\\k~t󴩍F𗰠􏉜\u000c𦯯V𮒵𩛯􋞷0\u0012{󺖖𘝣𝥆9\u0013}.b\u001c68$e\u001cWm\u0006@w\u000c*F󴌽N2𡻪聘P􋋭Kh~q\u00051s8畵􂗪ah𠲲𪑥\u00016ⓑK*v\u0005\u0016𐽎\u0017r_󿪁8\u00078_􏸼'#\"\u0003鑧\u0019󿙥󸗋ay6\u0001-&|\u0013PG4{=F󼆏(ln󱘎B%$l\u0011qI􂸽w𑑁c<\u0006\u001c[Wq\u0003\u001b\u001bf7\u0019.\r􋿶􃵶O𤗝jUp$䬉\rx󺞒z{􈿪GQH\u0005n4􋔒軅w\u000298*/\u0003@Fᒐ2c󲫂=𬛰8\u0018𘤜(\u000f\u000cK螺􆀴􁱐𮦾=J􏪟\u000f\n쵝g􌄜󴀾\u000c\u0000􁈥\n&A\u0016\u0003<%Jo\u000eQ^\u0013L\u0003\u0007\"🝨PgJ󵘩gkr6iI𣉷\u0000𝣩\u001e𡲤\u001afOᄞ􏑹r}󹻠􋨽􏔉\u0001-룩J🦘\u0011p`R\n𝅸\u0007\"\u0005{`\u0001𠇓궚􌥅𒄵x&\u0018\u0011\u0012qU\u0005l\u0006\u001bb,R𩑰\u0000V G.\u0006􋦮d8Y󶒻|眗􆓐\u0002\u0012{兵c\u000c-8=1\u0001\u0019\u0015Y󾸙\u0002~\u0013n'RI􈍝􇧱E/\u001f\u0017MS띳󸒊20󼭑\u000f𗈭&O𨋁#P\u001f4𣤯X𦨃􆁩􏭷U𭉐𬸒\u0015@-𣲻6齜􇈦SV[c:󾰍+󺳬\u0016W𪘯\u0018'L􎀪:\u0001XhW[5\u0006況𥠜󼪇🄼dj\u0011浂7<󸙛ZaDPP4P\u0016\u0018\n,\rI9n\u0015􄝅󹅱IP㢽y\nY\u000cp녯⢕\r\u0004Z󲏊AqW𢌵\u000b\u001a𘕕C+󼲙U3\"\u0008SE󼽌X𪥻\u0006\u0007&c}\u0008+􉒒\u001f\u001a&\r􀄾#?\r?􈍟􂠔\u0007餖b\u0001;S^4􏯓~𬂆\u001b𮁅N\u0000w𫙑􎥑󰌄F㏱껫;PY󼾣-塈\u0014𪌵c𓆲lNUlt9}L􀚖~\u0008\u0018:,\\V\u001d󺨐)AK\u001f\r\u0011i\u001cO)𮗘뱝󵪪\"\u000e\u000b􃎊g\u0001k:.􀕥T\u0002黢2𘄨7􉭮KQ\u001cH𩠅m\u0013D\u0007𡨎w`:r쵘\u0014:U\u000f㻔\u0006S\u00131\u0001\u00043罣'\u0005==\nyLW-|\u0007𞢗\u0018\u0019\u0014\rWux\u0008|\u0019𘤾\u0011\\@􆱳􏉎:󹈊O𓂲$`)v𝌄髤3壺\u001e<󽰠`􂄉`􆥖`\u0019<@\u0002g)\u000b<󽴡rov&𥙅􌕾TzVW[\u0016y\u001cF|􉇬2w1𢱽E;𑑒\u001c󼞞c󳝒X𪊄\u0004𨽶"
-}
\ No newline at end of file
+    "enabled": true,
+    "password": "]\u0017N`w}I􆿩􃤧真\u001bb\u001ew󶜄놊󽔞\u001eTlqD쟖𧛑x\u0008􆅾󲋖\u001f\u00016BZ \u0012􏗑󾎼𒅩n]v|󴢝\u0005+\u0008􄵾K􋯃H\u000f\u001c-9Of꓃ST=\u0002𧎂%󺤝i\u0006􊯱𥿭,\u001a8;2\u0010F{𤇝/5g􃉓􎬃T\u00196{l,#\u000fVG\u0001󸸺e#u~#=𧕱]6􈇂t \u0012/q1\u0000!󷾊6]g@o/\u000cR\u0010󸄬櫓VY􊡩R^뼯豕Tqj(}𦓥\u0006em𘔭\u000f󸞓𡎸𝣐\\􊩘q\u001bbxFQY\u001f􎊒!C3V>|􋙠\u0015󿕤h\u001e𬧥wl'􄬽I󻉠\u0007<:𬛶(9E0j课~㤞f\\\u00138a1[N\u0006\u001e\u0008\u001dE\\^K\u0001(𨬚6\tf\u0003󴀘Y<噸Q\u0005Y(%$Iy\u000cE\u001d@G#𬋽𩺿\u0013󼜝󼬆僪\u000eK􋞙wS괆轖{\u0013Am濏C􈟕\ne𫲟p􄉪N⍾F\u001cxfT\n𪎦j󿘉\u0010Sk􏎮󻭾xar2𧊀1𪞦𢜉󽔉\u0001장Y>\u0001𥃻Sr\u000c󲴳󺚹f󷗞\u0011し𐘦<w\u001b$_$\u0004\\g8\u001dﻭE9\u0017\u0001󲫾.y𬆝ᥘ􉣶𪮊G뺖R\u001a28@e=Z_\u000c\rv\u0002\u000f\\k~t󴩍F𗰠􏉜\u000c𦯯V𮒵𩛯􋞷0\u0012{󺖖𘝣𝥆9\u0013}.b\u001c68$e\u001cWm\u0006@w\u000c*F󴌽N2𡻪聘P􋋭Kh~q\u00051s8畵􂗪ah𠲲𪑥\u00016ⓑK*v\u0005\u0016𐽎\u0017r_󿪁8\u00078_􏸼'#\"\u0003鑧\u0019󿙥󸗋ay6\u0001-&|\u0013PG4{=F󼆏(ln󱘎B%$l\u0011qI􂸽w𑑁c<\u0006\u001c[Wq\u0003\u001b\u001bf7\u0019.\r􋿶􃵶O𤗝jUp$䬉\rx󺞒z{􈿪GQH\u0005n4􋔒軅w\u000298*/\u0003@Fᒐ2c󲫂=𬛰8\u0018𘤜(\u000f\u000cK螺􆀴􁱐𮦾=J􏪟\u000f\n쵝g􌄜󴀾\u000c\u0000􁈥\n&A\u0016\u0003<%Jo\u000eQ^\u0013L\u0003\u0007\"🝨PgJ󵘩gkr6iI𣉷\u0000𝣩\u001e𡲤\u001afOᄞ􏑹r}󹻠􋨽􏔉\u0001-룩J🦘\u0011p`R\n𝅸\u0007\"\u0005{`\u0001𠇓궚􌥅𒄵x&\u0018\u0011\u0012qU\u0005l\u0006\u001bb,R𩑰\u0000V G.\u0006􋦮d8Y󶒻|眗􆓐\u0002\u0012{兵c\u000c-8=1\u0001\u0019\u0015Y󾸙\u0002~\u0013n'RI􈍝􇧱E/\u001f\u0017MS띳󸒊20󼭑\u000f𗈭&O𨋁#P\u001f4𣤯X𦨃􆁩􏭷U𭉐𬸒\u0015@-𣲻6齜􇈦SV[c:󾰍+󺳬\u0016W𪘯\u0018'L􎀪:\u0001XhW[5\u0006況𥠜󼪇🄼dj\u0011浂7<󸙛ZaDPP4P\u0016\u0018\n,\rI9n\u0015􄝅󹅱IP㢽y\nY\u000cp녯⢕\r\u0004Z󲏊AqW𢌵\u000b\u001a𘕕C+󼲙U3\"\u0008SE󼽌X𪥻\u0006\u0007&c}\u0008+􉒒\u001f\u001a&\r􀄾#?\r?􈍟􂠔\u0007餖b\u0001;S^4􏯓~𬂆\u001b𮁅N\u0000w𫙑􎥑󰌄F㏱껫;PY󼾣-塈\u0014𪌵c𓆲lNUlt9}L􀚖~\u0008\u0018:,\\V\u001d󺨐)AK\u001f\r\u0011i\u001cO)𮗘뱝󵪪\"\u000e\u000b􃎊g\u0001k:.􀕥T\u0002黢2𘄨7􉭮KQ\u001cH𩠅m\u0013D\u0007𡨎w`:r쵘\u0014:U\u000f㻔\u0006S\u00131\u0001\u00043罣'\u0005==\nyLW-|\u0007𞢗\u0018\u0019\u0014\rWux\u0008|\u0019𘤾\u0011\\@􆱳􏉎:󹈊O𓂲$`)v𝌄髤3壺\u001e<󽰠`􂄉`􆥖`\u0019<@\u0002g)\u000b<󽴡rov&𥙅􌕾TzVW[\u0016y\u001cF|􉇬2w1𢱽E;𑑒\u001c󼞞c󳝒X𪊄\u0004𨽶",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_6.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_6.json
index 33ee3d2d319..936ec283616 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_6.json
@@ -1,8 +1,8 @@
 {
+    "base_url": "https://example.com",
+    "password": "n\u0019􋽪J𥧝𡐺S(G􌗫}\u0005a\u000e􀅕Cbmi",
     "public_keys": [
         "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
         "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "base_url": "https://example.com",
-    "password": "n\u0019􋽪J𥧝𡐺S(G􌗫}\u0005a\u000e􀅕Cbmi"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_7.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_7.json
index a67edc7d876..0c7dd8102bd 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_7.json
@@ -1,8 +1,8 @@
 {
+    "base_url": "https://example.com",
+    "password": "\u001f𘛥\u0014Q鲔Y:𩓼󹤤\u0017\u001aM\u001e\u0013t󳌓\u000f\u0019D\u0013\u0019긥쓡􍟖偡R,Ql𦔜6}\u00135Fg𐍴~𠋜}*G\u001c 0,E}w\u0015~숴柧\u0019\u0016nⱳ\u001bB𗘥𘄽4꩗:H\u0008󶉸zhyc",
     "public_keys": [
         "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
         "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "base_url": "https://example.com",
-    "password": "\u001f𘛥\u0014Q鲔Y:𩓼󹤤\u0017\u001aM\u001e\u0013t󳌓\u000f\u0019D\u0013\u0019긥쓡􍟖偡R,Ql𦔜6}\u00135Fg𐍴~𠋜}*G\u001c 0,E}w\u0015~숴柧\u0019\u0016nⱳ\u001bB𗘥𘄽4꩗:H\u0008󶉸zhyc"
-}
\ No newline at end of file
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_8.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_8.json
index 8e7a8aaeab2..776dd956b8a 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_8.json
@@ -1,11 +1,11 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": false,
-    "base_url": "https://example.com",
     "auth_tokens": [
         "IRIB"
     ],
-    "password": "Y\u000e󸓭36\u0004𛋷bOlW𨾿@\"l[9%⥅𐳿c;9\u0011\u001b\u001by\u001d􋟰Cp\u0002hYJ}\u0014\u0001􍀈􎲿45F4=6f+𠮻#𝚗㍾\u001e\u0002􍵊}\u0016='𡠐l(=\u001e3\u001eAK𡸌M\u000bT=􁷻Z&`ꀕ,|􁌾\u0007􍧠Z2\u0004 1cc􃋗\u0014舂C\u001f&U\u0010\u0013y󵲱ki\u0006\nw`E\u0018_\u0005R𩑲\u000fa󿚃\\P&捌L\t~|i3𫣣);e𠏑_𦨊\"5󴪋V3\u0013&6󸺄𮝡E􃆵𧱧𥃁4\u0000𧖁#Fb𗄭UD󵶕􁶛d*i\u000c*o+?\u0007\u00193􋳚\\}f\u0017󱻸󵴮Y\u000c5􀎖7]P󲣑\u0013&W(lZ7?\u000e빵❊)2x\u0015N$u𐓹y萚|\u0008\\K`"
-}
\ No newline at end of file
+    "base_url": "https://example.com",
+    "enabled": false,
+    "password": "Y\u000e󸓭36\u0004𛋷bOlW𨾿@\"l[9%⥅𐳿c;9\u0011\u001b\u001by\u001d􋟰Cp\u0002hYJ}\u0014\u0001􍀈􎲿45F4=6f+𠮻#𝚗㍾\u001e\u0002􍵊}\u0016='𡠐l(=\u001e3\u001eAK𡸌M\u000bT=􁷻Z&`ꀕ,|􁌾\u0007􍧠Z2\u0004 1cc􃋗\u0014舂C\u001f&U\u0010\u0013y󵲱ki\u0006\nw`E\u0018_\u0005R𩑲\u000fa󿚃\\P&捌L\t~|i3𫣣);e𠏑_𦨊\"5󴪋V3\u0013&6󸺄𮝡E􃆵𧱧𥃁4\u0000𧖁#Fb𗄭UD󵶕􁶛d*i\u000c*o+?\u0007\u00193􋳚\\}f\u0017󱻸󵴮Y\u000c5􀎖7]P󲣑\u0013&W(lZ7?\u000e빵❊)2x\u0015N$u𐓹y萚|\u0008\\K`",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_9.json b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_9.json
index a0c9a9dce26..1174d45bb8b 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceConn_provider_9.json
@@ -1,12 +1,12 @@
 {
-    "public_keys": [
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
-        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    ],
-    "enabled": false,
     "auth_tokens": [
         "UNqTIw==",
         "TcxpLPQ="
     ],
-    "password": "\t󵌇𧤇{\u0011Q\rU\u0003􊼵𢟬\u0000hij𣧡衔\u0018𢐩_\u001aE\u0015H&M*M\u0006𧼖Pc󵥚'Y5\u0010}1u𗂝=9󿾙\u0001p󻍜냂Yc>L\u0015S\u0014┖'aLM\u001dl\u00055Q\r\u0008{+󶫧햦\u0002ౢE/󽝙􌾤𧵺􅭈%O\t쑦E&􋽽aVEdM󻰺B#Sk􃦲,`=oU\u0016P%$\u001bq􎏮U\t🍮n<I\u000e,M𪫵 𦤖I\u0016\u0000qO\\V󲉽J\u001f兗𫳟@kcvt_2𖼫4叾;GN+􀐘lr}'+𥯛\u001bQ􈬳+햪𗀯󵩁38\u0011k\n𩽖.\u0006$5[#NyO􏼞n\nr]2IP\u0014m)𢰐𭽬\u001c~󷔂,N*G􊾔3\u000f\u001d@%qvt\u000c\u001a{8!d\r\u00139䡌𬑊\u000b_R\u0017:씤󲼶􎝰\u0005󺆵+\u000e\u0002K𡟿\u0016bz\u000e\"󺔁𭯲4􆍔\u0002Ib\u0003@\u00033𥠠樑􈇩􏂡\u00086:\u000f􁿓jYp\u0014C\u001fz􅴹$\t:􄳊vh󼩸𦴝\u0018\u0002\u0014욖\u0015R𭞚\u0017􉿕&^.,􁯐JO󴎽Wn\u000e\u0003(󸝄(g󿹭\"\rH𨽰\u0006bX􉴽V󺲧𪉍>\u0017\u0017WhVB\u000eb🂑[T𥼉𭷤𩙰+yf󵀎LJ\u001c\u0001nn%-\u000bM\u0015z𭢧𪨘jF􏬺-j\u001cy􂀶ee\u001e\u001e\u0013L*grCi'l#h|󵔬i0H?𨍞&5󴵋nlD拒󲧱Z`\u0001\u001e\u001aY{0􁔵\u001d-4[W~?\u00136󶶡9\u0003b!mB\u001b\\.P􉠣igO\u00149\u0016F𠋔󾄯}ဎq8\u0015YMS󴲣ੜp􄇚@f/􌘼\u0014𭭉􀯶x릶K\u0005󳬍t1`퓕󸞶9%&\u0001b\u0010]𬌝&搭u􀴝􃁴\u0019}繢smg?x􀂝馰o𥮭&􁈚1'\u0011\u0017O\u001av8𧕒󱅹Pe9mK茇B󶱇!j􄤏𭝻\u001e4c@M?\u0007\u0017c􌰃ᘑ#󲯲\u001b(􌗮󷒪\u0014𛇖@s"
-}
\ No newline at end of file
+    "enabled": false,
+    "password": "\t󵌇𧤇{\u0011Q\rU\u0003􊼵𢟬\u0000hij𣧡衔\u0018𢐩_\u001aE\u0015H&M*M\u0006𧼖Pc󵥚'Y5\u0010}1u𗂝=9󿾙\u0001p󻍜냂Yc>L\u0015S\u0014┖'aLM\u001dl\u00055Q\r\u0008{+󶫧햦\u0002ౢE/󽝙􌾤𧵺􅭈%O\t쑦E&􋽽aVEdM󻰺B#Sk􃦲,`=oU\u0016P%$\u001bq􎏮U\t🍮n<I\u000e,M𪫵 𦤖I\u0016\u0000qO\\V󲉽J\u001f兗𫳟@kcvt_2𖼫4叾;GN+􀐘lr}'+𥯛\u001bQ􈬳+햪𗀯󵩁38\u0011k\n𩽖.\u0006$5[#NyO􏼞n\nr]2IP\u0014m)𢰐𭽬\u001c~󷔂,N*G􊾔3\u000f\u001d@%qvt\u000c\u001a{8!d\r\u00139䡌𬑊\u000b_R\u0017:씤󲼶􎝰\u0005󺆵+\u000e\u0002K𡟿\u0016bz\u000e\"󺔁𭯲4􆍔\u0002Ib\u0003@\u00033𥠠樑􈇩􏂡\u00086:\u000f􁿓jYp\u0014C\u001fz􅴹$\t:􄳊vh󼩸𦴝\u0018\u0002\u0014욖\u0015R𭞚\u0017􉿕&^.,􁯐JO󴎽Wn\u000e\u0003(󸝄(g󿹭\"\rH𨽰\u0006bX􉴽V󺲧𪉍>\u0017\u0017WhVB\u000eb🂑[T𥼉𭷤𩙰+yf󵀎LJ\u001c\u0001nn%-\u000bM\u0015z𭢧𪨘jF􏬺-j\u001cy􂀶ee\u001e\u001e\u0013L*grCi'l#h|󵔬i0H?𨍞&5󴵋nlD拒󲧱Z`\u0001\u001e\u001aY{0􁔵\u001d-4[W~?\u00136󶶡9\u0003b!mB\u001b\\.P􉠣igO\u00149\u0016F𠋔󾄯}ဎq8\u0015YMS󴲣ੜp􄇚@f/􌘼\u0014𭭉􀯶x릶K\u0005󳬍t1`퓕󸞶9%&\u0001b\u0010]𬌝&搭u􀴝􃁴\u0019}繢smg?x􀂝馰o𥮭&􁈚1'\u0011\u0017O\u001av8𧕒󱅹Pe9mK茇B󶱇!j􄤏𭝻\u001e4c@M?\u0007\u0017c􌰃ᘑ#󲯲\u001b(􌗮󷒪\u0014𛇖@s",
+    "public_keys": [
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_1.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_1.json
index 96c8913f54b..274124501c2 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_1.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "0000001e-0000-000c-0000-00130000000f",
-    "provider": "00000003-0000-0019-0000-000600000011"
-}
\ No newline at end of file
+    "provider": "00000003-0000-0019-0000-000600000011",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_10.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_10.json
index 6fb8214248f..ac226011229 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_10.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000008-0000-0007-0000-00160000000c",
-    "provider": "00000001-0000-0007-0000-001b00000015"
-}
\ No newline at end of file
+    "provider": "00000001-0000-0007-0000-001b00000015",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_11.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_11.json
index 23a89b9de09..e8e77c46e46 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_11.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": false,
     "id": "00000015-0000-001c-0000-001200000020",
-    "provider": "00000011-0000-0002-0000-000500000000"
-}
\ No newline at end of file
+    "provider": "00000011-0000-0002-0000-000500000000",
+    "whitelisted": false
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_12.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_12.json
index 2cb864aeb41..e8e9e40eb8e 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_12.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": false,
     "id": "0000001c-0000-0010-0000-000a00000014",
-    "provider": "0000001c-0000-0009-0000-001300000004"
-}
\ No newline at end of file
+    "provider": "0000001c-0000-0009-0000-001300000004",
+    "whitelisted": false
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_13.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_13.json
index b7e5a8e1eb2..56eb395e79d 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_13.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": false,
     "id": "00000018-0000-0013-0000-00160000000a",
-    "provider": "00000019-0000-0004-0000-00200000000f"
-}
\ No newline at end of file
+    "provider": "00000019-0000-0004-0000-00200000000f",
+    "whitelisted": false
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_14.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_14.json
index 549cd90ca4b..b5387792fdf 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_14.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000004-0000-0002-0000-000100000017",
-    "provider": "0000000e-0000-000e-0000-000800000005"
-}
\ No newline at end of file
+    "provider": "0000000e-0000-000e-0000-000800000005",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_15.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_15.json
index cc4f2d43662..21e41ab71d5 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_15.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000012-0000-0010-0000-000c00000013",
-    "provider": "0000000e-0000-0006-0000-001e00000014"
-}
\ No newline at end of file
+    "provider": "0000000e-0000-0006-0000-001e00000014",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_16.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_16.json
index 5468ab1f638..6d10f035053 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_16.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000000-0000-001e-0000-00200000000c",
-    "provider": "00000019-0000-0007-0000-000e00000016"
-}
\ No newline at end of file
+    "provider": "00000019-0000-0007-0000-000e00000016",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_17.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_17.json
index 03308ebc08d..1f9748ee197 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_17.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": false,
     "id": "0000001d-0000-001e-0000-001b0000001e",
-    "provider": "0000000d-0000-001c-0000-001b0000000c"
-}
\ No newline at end of file
+    "provider": "0000000d-0000-001c-0000-001b0000000c",
+    "whitelisted": false
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_18.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_18.json
index e433eded0bc..9ec7431fa0b 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_18.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": false,
     "id": "00000015-0000-0015-0000-000d0000001c",
-    "provider": "0000000b-0000-000a-0000-001100000016"
-}
\ No newline at end of file
+    "provider": "0000000b-0000-000a-0000-001100000016",
+    "whitelisted": false
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_19.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_19.json
index db386e6cae9..b8ed2185c04 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_19.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "0000001b-0000-0007-0000-001700000017",
-    "provider": "00000017-0000-001c-0000-001300000011"
-}
\ No newline at end of file
+    "provider": "00000017-0000-001c-0000-001300000011",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_2.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_2.json
index cc7ec368149..c28bb4b7f71 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_2.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000014-0000-000b-0000-000a0000000f",
-    "provider": "00000017-0000-0009-0000-00090000000a"
-}
\ No newline at end of file
+    "provider": "00000017-0000-0009-0000-00090000000a",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_20.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_20.json
index 7f12ba10008..bcc646aea89 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_20.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000003-0000-0003-0000-000800000010",
-    "provider": "0000001b-0000-0012-0000-001500000000"
-}
\ No newline at end of file
+    "provider": "0000001b-0000-0012-0000-001500000000",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_3.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_3.json
index e05b2151bd0..5cac863f0d4 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_3.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "0000000d-0000-001a-0000-001700000005",
-    "provider": "0000001d-0000-0005-0000-001c0000001e"
-}
\ No newline at end of file
+    "provider": "0000001d-0000-0005-0000-001c0000001e",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_4.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_4.json
index 285dfdf6519..4541146d21e 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_4.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000013-0000-001b-0000-000300000015",
-    "provider": "00000011-0000-000a-0000-00150000001e"
-}
\ No newline at end of file
+    "provider": "00000011-0000-000a-0000-00150000001e",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_5.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_5.json
index d5077841f2d..0822fa506d3 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_5.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "0000001d-0000-000c-0000-00030000001e",
-    "provider": "0000001c-0000-0019-0000-000f00000011"
-}
\ No newline at end of file
+    "provider": "0000001c-0000-0019-0000-000f00000011",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_6.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_6.json
index 5d00a189c42..358c5ffa823 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_6.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "0000000e-0000-0004-0000-000c00000009",
-    "provider": "0000001c-0000-0006-0000-001a00000011"
-}
\ No newline at end of file
+    "provider": "0000001c-0000-0006-0000-001a00000011",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_7.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_7.json
index 7c9a8094ebb..ccfbaafbe28 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_7.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000003-0000-0001-0000-000b00000015",
-    "provider": "00000007-0000-0010-0000-001f00000009"
-}
\ No newline at end of file
+    "provider": "00000007-0000-0010-0000-001f00000009",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_8.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_8.json
index 1d14eefdd92..2952cd28bc1 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_8.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000013-0000-0000-0000-00190000001f",
-    "provider": "00000020-0000-000e-0000-001500000015"
-}
\ No newline at end of file
+    "provider": "00000020-0000-000e-0000-001500000015",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_9.json b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_9.json
index bfe15da9c76..c8062fc2b38 100644
--- a/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_UpdateServiceWhitelist_provider_9.json
@@ -1,5 +1,5 @@
 {
-    "whitelisted": true,
     "id": "00000019-0000-0007-0000-000a0000001b",
-    "provider": "0000000c-0000-000c-0000-001200000017"
-}
\ No newline at end of file
+    "provider": "0000000c-0000-000c-0000-001200000017",
+    "whitelisted": true
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_1.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_1.json
index 0cea6b016b7..65e1ab329e6 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_1.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_1.json
@@ -1,14 +1,14 @@
 {
-    "name": "􃮨􂛀N󷅚\u0002suu􊳶1𧱧YHuo틙􉑴7󸔇\r\u0007%OㆊJs􅡯\\\u0007-A책E\u0019Wz(]I🁝🕧t\u000exRk\u0017?pl􃋛\u0014𭇉z!Xre\u0007󳍏K\u0018G,D&F윦@P𗹼i\u00122~j)g尲I~",
     "assets": [
         {
-            "size": "complete",
             "key": "褩s􎀧",
+            "size": "complete",
             "type": "image"
         }
     ],
     "description": "\u0007+/z󰺋hI}/\u0010kB􂮰􃞚搈\u0016YC}𡉧\u0019\u000fa\rꧻ\u0003h\u001b䗑ྨ\u0001CUoR[𧉱c𓈪fbtV4\u0014<𦆧\u0006d}\u0013𨇏ȝ𭞥@\u00138|𪬄\u0005g\u0001#􂗌KO|𪬄󶔫𨢂\u001cm<o_\u000b\u001a𨣐𗟧􋯊))\u0019\u00134膹m\u001f󱼎D𝟥=qP\u000bh>\u0007􁊻󽂍􂁖傩;~k\u001dP\u0015\u0006𪮠s􀴎A𤬗\u001b\u0000pY􁗥棠\u0019􇍒T󷀇󲗬!W\u0004\u000e𥌟\u000b]\u000b\u0017𗻖N􌃌𢻽⍯\u000c8]J㩟\u000f\u0019Y璭p\u0015vk𘖠󸓐𫇧󳸹\u0002𤻆q󼶝\u001e\u000b󻡜6\u000c\u001a\u0014\\\u0001w\u0011w[\u0013􍗲r+󰀎/s⧔󳉾\u0018\u0013~/\u000e󽫌󹩔%F\u0014h󴔯𓎆z\u0004󷹜\u0003dt-b𦢲,DzM󶔂G󽳼䂚􆛖\u0012䜺㻗0-pE42\t:<𐌙}[\u0003~lac꘏/\u0007𤽔Z,(\\􇆢🏕GM𮢳#𮩲\u0001+%􈶢\u0002𪱀|󶁮\\烠\u0019짌􋔻\u0007[<P\u0007|vd􏾉󸺔!F>󹳬􁐲\u000c2@cczh3?`\n$\u0002􋑆\u0019\u000cN𬋁z/D𫺅.<Y􁬪(8A\u0000,$s󷄪󺖊\"j}\\󼸓\u0007Ec-z􆓬\u00046PEz󲊢𫼠\u0007H\u0010𬊤) \u0001b\u000eZ􊅼밈𭶃󺋢𪃘vᾺ􌋑>(]g9൲o\u0002%{w􆣥4m\u0002F\u0005쌖㺻\u0018m\u0011\u0005/\u001bꔘ󻃳QM󱼳𫃚'43跹~\t󼻺!\u000b㣝`qY􉪀zm\u0014fRZGvL\u0017(t󵸲\u0016swr𣢿%󾱺\u0015%􈋋Gڛl'\u0006󻏍𡤺𩢛𤣗 ⁩\u0015\u000c>@黙󻔬\u0018u\u0002𣆆Y\u001dVj\u0012\t@O𭈟꺥4\rf\u0008󴯬\r_F\u0013\u0000랙\u0003X$#\t􋄒\u001b7\u0004\u0008󰀻𣀉\u000e\u0017\u0004A𭎴𦺒󷷪/:N\u0013􄲪1D𗫓󾧘 V\u0010\u001a􉚽#僈󵙮8\u0017\u0007\u0010\u001e󳈚\u001fP\u0017\u00017\r|L𣛱R j\u001b\u00012F>dV=\u0019r?󿛓𝑋\"&\u0011OⱯ\u000eDuQL$󻾣d\u001f𦞀` <1\\Oƽ󲩻/H\u000c\r𣂬Ah󻽅\u0003𧧰uu.lf􂈈/1􎃈󺿮/ᳳ𡻨`9\u0008q\u001a[Z`𝂱eLNyTq􀆀k?{\nWg𑦰􌫇𝝢q𥅸u-\u0010󶇐(\u0010\u0011f🂢\u0017,\rP᮰4V黹𦿬(7)..𑊗$\n\u0001𓐰󱟮𖢼𠲗\u001cᓇ뭅/0𨬶:𗆁\u000f{]$&􆜣m􏿱0𣋍7)𬱨b5f\u0016GyYxU):󷵤L\u001fQd𝪫p\u001b?<7\u0014W\u001bN냮;\u0007󱄃\u0000m𣉞K\u0003𣬪젰\u0017䎚\"󱋎*S{Gŝr󶲏g\u0014>\u0000\u0001𗯺i\u0000\u0015k\u0005K儖r󺾃!rE\t^𓋁@|h'0F'󽎨𦞵󹿡9)\u0016^\u0006m^\u0002􇘃M]𬎛Rュ+󷴗^pꡎ2AzeS`𢩍\u0014󰧼𬨍e\u0005\u0018\u0017賜h=0&kp4\u0017󹳼c󳺔\u00058$\u0002\u0004k\t\u0018𪒬y]M\u0008Aﲕx(\u0002V\u000cT\u000bOO=􉈿`D󻻧i*c󶰌g3\u001e󳫓\u001c\u000cr᭹g𬔞MX㯥𡜀ꠇx􊀱Rz𥮰(P${𘅰\u0011*~e\n\t0]z\u0013\u0019Y𪏉􏡅g𥈂!𬞿@\u0006p𧭗󷵭=X󷡳r𐅢󺕡3u\t\u0002\u000e𡼝n\u0011`ꟷ;,\u0014𧙝D.:\u0001",
+    "name": "􃮨􂛀N󷅚\u0002suu􊳶1𧱧YHuo틙􉑴7󸔇\r\u0007%OㆊJs􅡯\\\u0007-A책E\u0019Wz(]I🁝🕧t\u000exRk\u0017?pl􃋛\u0014𭇉z!Xre\u0007󳍏K\u0018G,D&F윦@P𗹼i\u00122~j)g尲I~",
     "tags": [
         "weather"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_10.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_10.json
index b34a549e634..f317f8b6dec 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_10.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_10.json
@@ -1,9 +1,9 @@
 {
-    "summary": "\u000e􀰒-'Y[Pox𪗦6K'/b9%z䋯/$􍷋DY U\u0001x>;\u0019驣<{6\\\u001b'Xa𤤵M(+\u0002𣭱q_󻟖hrlyS󶆧󺮚C𤆥A\u0013b󸠹󼉴;\u0013𡇗🤾$?+",
-    "name": "U|2􁒨E\u0000!FB𐠍mX\u0000#=􍊊?\u0002P\u0006.\u001dJ4fN(}\u0019\u0014􇣖𦛣\\<𭌖\u0013\u001a:\u0016#Q$\u001f/\u000b\u001e\u00198ꀯ+\n",
     "description": "oop\\ ]􃨟Q󹪧A鶼Fk𝄙PP󻠜􀚱􁂏)@$󾛘\r\tc󻰱\u0008􎻞a𣾆.]t𥀷L𘩦󼈻\u0007\u0004𠖘r$TK~􄵈=\u0001\n.A쯦P:D윂CM\u0003c\u0016#􆜢\u001fV0\u001548𤩳\u001d􏮻󼿳8'\u0005􂽸N.󼗌B=m7⨋\u0000,\u0016m󽡉S󿔕5dd떞\u0008\u0004爫TZ\u0008ꈰj숝CBti\u001e\u0018\u001b𤙖T(Zh,􌯔\tO-Cc䳑\u000c;𢸤\u0019𨀵fvGA$󾘞+zH7>\u0008\u0008=(􁼔DT􏫧\u001f\u0003m=fA=󼢳pN= 𢇖\u0015@\u0014nJ\u0015z𨢣􎇆,Ih\u000b\n󻌁􆅒𘐝\\p,|}\u001b󵋧,,\u000f\u000fJC𢬟(M5v𦪸􃔵a鯻⾕𧗎4g髭nH.􍍦ﱈbNU)Bk\"\t2Gl:𬡘3Ip􅢂2#딹HX*\u0007󰉡8FUM\u0016\u0008󰖩Eg􋈷\u001d𨜕Uwq󿣇A娖x㽊𫋴Uz~𨑹Qe PB?Ogz\u0016\tP\u001b\u0010c 鱡\u001e𘆒!Wj\u0000\u000b󹏖6f~t\u000c𥰌yw$󸔿!𢔔\t\u0002\rZ𐛯􋙔XF𥳫\u0006v\u0014\t-1\u0018𡙏\u0003􁂉\u0011\u0012g􍹭kn).􎮚AN^f7!􎥂-󽹡\u0000󵚗\u0006󷒌󽃠T\u0016>孧汜Q쵼5󾧖o\u000b]lS\u0000􎮯n䝔%.F<-l\u0018ۘ\u0017B􄌢#\u0008qF\u0002 BE\u000e\u001d\u0002l#PHJ\u0008L\u000f􆩌\r𩋏玶W󱷥􃗮d\u001aJ\u000b􀁾N\u0001B?𩞎{􁅑:oR􎉬4wEi|F6Mqꛣ\u000c朄V>󴬻􄶼~~\u00060􈾟󱤪C𫔿\n5\"𭄻\u0019X!\u0000F䑥𭻮3#󳛗{\u0003𗳰_􊯓阤㶠\u0016\u001b\u0001+𦒬y\n2\u0017\\\u0007\u0018c? ;J􅃂\n𐡿􌏱Nu1󺜐d𧬂K\u00185k'7\u0007y_䥻:󾉳𗇨_/􆩻\n󰾒t|ef􇮀(4tkk\u0003􁿣o\r=\u0019𪷬5󸸚5$\u0014󿛮_r\u0015\u0019-H󿏩M`N0ѡ\r\u0013𣁸\u0001a𬛍𠃛2xL:𭄫󰺱j\u0001\u0003D\u000f\u0007iHTQnp]􀙞\u0010jta\u0002\u0017M4u􂋳v𥱸)ꭒk󶕟'􅐍𝗋܄󼤺\u0015dc󾠀􃃌t𫧫\u0000\\}+^\"~𑲫>\u001eঅGb擌o5\u001a).\u0012uY𥵍 \u001a?#\u0001\tMz>󹕌𧤓􇷀􀪇(}~󺧗%dz驙Cn\u0002􂴄;\u0011=伸ka\u0019G%\u0017~Qe pG􊂅\u001bk|線*\u0014Yᬭ!\u0013\t.F~\u0010\u0008(-P𡐚\u001e􎙲􁆎\u0006@\to8sB\"h\u0010𨯒\u0003. LK?𔘟悽,\u0016?𣻘_+m\u0019㈲\"P\u0015\u0014\u0005%g&\u0005􈮹g\u001d\u000b\u0016𧁣힂󳄆K\u0013𫋉\\@\u001a\\\u000ct􇃴M+D\u001a󶿋C𫝗,\u0010n𝒋X\u000b:l𣄽3se&z󲽀槢􍌱\u000cp􉃼𢧒D.\u0008\u0017@󺿗[󰉌𬿦X󲠮<C$nt\n\u0005@\u0017]c$p0|BC+𗱭\u0001f6xb-:@m<𫰉쐄󺧂鎭)\u000c[cCM 󸑢\u0014\"m􂪗2󲼫셹𗮛#\u001a􋕴\u0005􏴫\u000cEjz6󵄭=wHD𨧻󱨠􁤟鞒􌯯*\u0008脌𧈃24osq\u001ae󿙔Y:#\n\u001e\u0011\u0010,\u0019\u0018􂊇@\u000b󰘖𢶻󽖃\u00034󵌗\rU󳪲)t𝣱CF𬴝SnG𠓑BA󿭘𠆁z穊",
+    "name": "U|2􁒨E\u0000!FB𐠍mX\u0000#=􍊊?\u0002P\u0006.\u001dJ4fN(}\u0019\u0014􇣖𦛣\\<𭌖\u0013\u001a:\u0016#Q$\u001f/\u000b\u001e\u00198ꀯ+\n",
+    "summary": "\u000e􀰒-'Y[Pox𪗦6K'/b9%z䋯/$􍷋DY U\u0001x>;\u0019驣<{6\\\u001b'Xa𤤵M(+\u0002𣭱q_󻟖hrlyS󶆧󺮚C𤆥A\u0013b󸠹󼉴;\u0013𡇗🤾$?+",
     "tags": [
         "integration",
         "travel"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_11.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_11.json
index d015fe909d7..a88563d44e2 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_11.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_11.json
@@ -1,9 +1,8 @@
 {
-    "name": "\u0011\u001a/J>𡗶𤏡L\u001570뜯_?􍏧\"\u000e𤵪𗩪\u0005𖧊󹡲-􁺻趆h󻾜=H􉛣\u0006+;$􄡍x\"!n\u0010\u0019􀝍Jx",
     "assets": [
         {
-            "size": "complete",
             "key": "\u0003𗗇",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -11,14 +10,15 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
     "description": "%ℍ@j󵄛d\u000bI\u001b5\u0014\u000b[{􈰈 o鉵^[\r􄆑\u0005󱣃'\u000et􉹒󺠀o󱈶\u000cQ\u001f*x~𪶩\u001b+\u0012􄻊B/쯂\u000f^iD#푠3 𠨆𥰅\u0012?4󽭢O\u0002𗒷.\u001fK=#𬋶􀟭\"u1\u001aVM\u0015\\􎳉PUbp􃓙)􂥑G􋒽\u001c]H󱛙sj@-\u0001[{\u000cWgn\u0000D𧓬CK:N\u0014 􉘖vAU.q[r\u000fN\u0007K󲞡V䚎m;󳡾Ꞓ\u001dFwUnU\u0010,팲O~?􂱤坛􃩼􀚒\u000fO7𧆑e􎜳9%<􊟹󻏌\u0004;m􄩜i2KMR􄽤~􆜧y篍󳣻\u0015號㾲2󴑝􃁔qM\t/\u0015E𗃅\u001dg\u000eӮ􋶄 ]\u0015*\u001e\u001fn\u0010Z􈨔{N􋕇􈤢*󱬻b}d\u0014m\u0012􌙆_klW\u0007M]\u0005`𑃕:􆟌\u0006[\u0011\u0011閠\u0016ddj-5󽱰sy୲\u0007󼘈🙕I< Gn,r-𞋫/󸭝:\u0016󸈺󻤋\u0013𘐟*_\u00114h᭯ｱ9]\u0011p\u0010jD􄧪;󺞪庉dBX$\u0017⬭V[􏗅f𪒩𠴎퓄[A𠋅\u0004Z\u001d]󻷲\"\t􈍇\u000bwOh{m\u0018􌬉S4K[ >AT\u0013􈣁`8&=6]kr<\u0008ud󸳀L􌰡\u001e\u001eYS뤦5:fy𭹊𢑼X?𦸠􊾃󵈉🧱􃚸걿\u0018cA󿲒\t$\u0005GCG\nV끨󴿕:􀓰l󳄤m-\u0012j5(*Dx𗅀𥂘𨞮𗶊~M\u001ck1覅k4\u0019Fi\u0018B1糁𢟭&𦆐\u000c\u0005𤼀O\tN\u0016𘍄󳥛uV󶶣3MF௧\u00005􀍆󲦫xM𫬏𥑟魫𮤼]}W(!FU\u001e7(𠺟\"j🅛𨱡GLw:󷘌\u0016\u0004𘍔oBsEyz㍬𦓠9}𤆨󶼩\u001b{\u0002􁇇\u001e5O:im\u0010𢘫\u000b茬󶀞t-\u0016EP<󹛎\rH\u001a!XJ𭕋\u0016@-\u001b\u0014#\u0004\u0010\u0018\u001c\u0019M\u0016)𭞡|􉆤羳l-z􃁝\u0013J𧍽=|cSៜ⍔1ay\u0019q󵩢\u000bE^.7?󵔍@O>\u000f]\u0015=mc\u0003\u0004[F*Pw4󳰊\u001f󸓟\u001dS\u0011d\u0014_􈀉_b󹐾_WF穋\u001f𬜹Ip\td􀷩C\u00016\u0006䢀XML,;<\u001c<~\u0013`\u001b]G#s𗹌𑈡􂼘\u001b*\u000cov✱􁦔D\u00191\u0003󷻝2?󰆱\u000eDlvg7􌃾\u00119i\u000c\u0016J읽𬷨[엲\u0004)h󰥪$:დ\u001dA🜎}\u0015􈻣%󴰰𗺥\u0005\u001b\u0008=^eJ朏\t\u000ccJk{ᠻ\u0002\u001fĎ1{\u001d􏯶HO\u0000𛃅\u0006rW􎛱|si\u00006<璬\u000fa\u0008=(77\u0015FX?];t󾶉W\u0006󱨂涁􏡌;y3@Cg􉔂9\u0004^oN\u0017፼X\u000c-V%E􋢉zjmP􅏑𧍐\u0007#k𭦅*󷕓!\u0012+\r\n3}M\u0017*m𞡘\u0002𠼙&7$\u001b𣚖𫆢AC󽦲􅄂a\u00186Ij󷶬ZV/􊻀8rg􏴗gEw\u0017~l\u0002|_𠀪`'B7)F􅻉A𤺓𠄤)L}\u0018\u000eA(􇌤\u0012𢄵?\u0005\u0010𥿛/U𧎀K\"_𣔳𒂡$Z\\1P􊃩u􄻧e􁾃]z\u00002{晽Q'퍢Xp\u001fS\u000fGg🔥!!󿊩j\u0003HFMBzD㚲b6\u0014\u0004\u0007\u0000+_􆳛+\u0000`k􇙧🈠􏧮",
+    "name": "\u0011\u001a/J>𡗶𤏡L\u001570뜯_?􍏧\"\u000e𤵪𗩪\u0005𖧊󹡲-􁺻趆h󻾜=H􉛣\u0006+;$􄡍x\"!n\u0010\u0019􀝍Jx",
     "tags": [
         "quiz",
         "tutorial"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_12.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_12.json
index 4fcaa127d29..5a6989defa3 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_12.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_12.json
@@ -1,15 +1,15 @@
 {
-    "summary": "\u0018􊦃e\\c`_[𨩣@􈾏,z.!󺪵6鲔𧜊𪙓1B󱣽\u0016\u0010Eo\u0019隢3aC낔뻇m\u000c\u0019K((摂𢠪􈢥􆻤-\u0019\u0005x󽈠[\u001cbLpC\u001bấ\"DNR$\u000b\u0010t㐤f>믩𬻳\u001f&􂆠S\u000b-M\u0018\u001e\u001b5W􆛝;sH\u0005N\u0006$7W󲺀>\u00143v􁳻m?\u001a?P\u0006\n&<)L\"G󻨎]𧄦A\u0015𤧙\u001dgAfJ𠎵\u0010",
     "assets": [
         {
-            "size": "preview",
             "key": "e󱊉4",
+            "size": "preview",
             "type": "image"
         }
     ],
     "description": "\u001f\u001cX;,\u0013𤠻=VNF\u0015%;i\u0004󳗠$k\u0017c7\u0001𢿺|:d\u000e\u001d\u001eN⧼/\"V󹕮o\u00114󿰽풥\u001bj\u001a,􋜣<r󺰿\u000cL􇀰#\u001a{􎚣\u0006'\n󷉇 \u0014󷡆ﲝ􍁏 /􋔯Skn\u001c\u000e\u001cn4<;{\t@􃜨n\u0005-Jaq<:\u00184?q𭒛𧮍5j73#`R\u000f!\u0002<p!HNe\u0013澵4&靪8n)/GỦ\u0014Z)릪󲙤󸼛_dM7\u0018v𧂩-\u001d\u0008zD.O𧣠𧖑N:dDh7Q􈀥!\u001d-\u001eKq\u000eLi󼽡[צ룪)Y餠W􃓢\rAH9=p􍵴a?\t\u0003􌍌1N\u0002$\u0010n􈣃iN0𒑫\u0014R\u0013ZbO䎅\n\u0000\u000b󷩺u1PCꡗ\u001f\u001e\u0008}\u0004彲􏶴''\rz\r󼶆(󽹫􊗗?[BW|!^5𪭯􍡗𭛏lb\n_2\u000ec𫈂0\"5\u0014l]\u0011>}i0m\u0018稈x_ 􀏣𪳏Q󹢛JiC1p/[1\\A[o쩄\u001c\u0018\u0000\u0002+🃄𝚎w\u0019=𝩖dH󵖽Il(#\u001dvd+𑃴d\u0007nEh󴱹\nQD\\:@{\"\u0003Z󷩫i􁆚J`&;t}zQ\u0013.󹌩Co6\u0000^vvsh쪡\\a􀱈R<\u000f{\u0015;%f𣖑{\"壹2𢋥kp\u0005\t\u0017􏬈o𗯬|@.\u001eX􁄫\u0007>\u0003ek\u0010\u001c>",
+    "summary": "\u0018􊦃e\\c`_[𨩣@􈾏,z.!󺪵6鲔𧜊𪙓1B󱣽\u0016\u0010Eo\u0019隢3aC낔뻇m\u000c\u0019K((摂𢠪􈢥􆻤-\u0019\u0005x󽈠[\u001cbLpC\u001bấ\"DNR$\u000b\u0010t㐤f>믩𬻳\u001f&􂆠S\u000b-M\u0018\u001e\u001b5W􆛝;sH\u0005N\u0006$7W󲺀>\u00143v􁳻m?\u001a?P\u0006\n&<)L\"G󻨎]𧄦A\u0015𤧙\u001dgAfJ𠎵\u0010",
     "tags": [
         "integration",
         "productivity"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_13.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_13.json
index 2132533d96a..574b87fa897 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_13.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_13.json
@@ -1,8 +1,8 @@
 {
-    "name": "󲊡\u00132\\\u001f",
     "assets": [],
     "description": "2aX*󻶽𢰣o/WfZ(󵐂**@w􃿵䅫@<o!\u0019\u0007a𨅋\u001cx%󰋐!34T38􈮴b\u001d󰈽g,󸁫𤌸^5􍛊sH𤰯R;E'Eg榩u\u00155=U\u0005a/v\u001bT쾎qMj\u00158wz𧍅\u0019`􋤙?h8|#𤬵\u000b󹮧k\u001dK5󲥃\u001c㔋\u0019Q\u001e@6𖭶W\u001ew􌽹p9\u0019y$𫹩0\u0004싿KIUH\u00122쩞#8󻬾)Iz擺i\u001d\"􌽕}\u000b𥔢f;GE󹍟J\u0002T󳔢Z+󺧤𢧰鉅k+\u0015%J\\Myvv콀Nt,\u000e}\u0011`􀩀jT忲\u000eSⲳ|\u000fDU\u0010\u001c\"\u0010\u0019d?􊮡\u0001ߋ\n􏁢𝪈\u0008􎳩OE:U+o\u0014xNV􂑷F',𦿤&\u001e\u0008o/󶣎>B~I\t\u0018\u000flA?R䰻\\𭵵󿀉c\u001b6𣥪\u00071\u0008`:#\u0001\u0010\u0016㛛0&\u0018n9N\u0000u󽃶3}Pr|\u0007d𡋲LVno놎de2\u000f𫝿E2u\u0012\\)t􁵆S\u0013𩧩襒\u0007\u001d\u001ag\u0001\u000b!HGMt𥿭N]U\u0010hG2\u0016E\u001c􅸾?-?􏟭\u001e0⇓\u000bA'q%-(\n悟!dX\u0014N:^<KL𠢀_9%𘁶𢲛𦃵<l􌾗󴐷#󰦵iG􊁚뙮IGF+\\`𫐄󿝥􁨓语p𑇡幂WL􆢈\u0001\u0014imn\u0004J=T;0Lh󻂭E8*g@(D2􈾑'\u0007󾑎rm󸋘+Dd>\u0019t𗩗[􃌮[𐃜N*󶱑\u000f䒼\u001f\u00131@\t􄅓󳃷izL\rH􀩾􏠣\u0003-v篈󸷝!?\u000687󺼺\u0011/P^tQ?􃣯?H?>W}\u0017loc𐄩𨲟\u000f\u001f𭚤𢵗媪\u0012 󾡩-𩣅V'wY0GD8\u000f\u000b怉)󵬩\u0007%𢍊\u0005𑅥\\𪈢􉱇O\u001c1䏓󾙸󳫪\u0012{\u0001g􆞸dQUE󱾣\u0004X}-\u0004:<n|Wv늨\u000f~I𘍂𩾄u󸒋\u001a􆨴𤷑`m\u000f\u0001󵣮钚Xdr\u0019\u000ez𨸆_\u001c󲝇%>\u0010\u0008\\䠻\u000c*fH\u0006}@𬥂)⸉\u001f~𑌛YxႦ>x𣑎􄤤c􊚿:f𥬊󲺟\u0012\u0010z󹿾N𤃍\"8\u0010󴏄P%rOG\u001cR𥢂`F2󹱶+\"eQ`Gh骽DvPi5b\u001a!mm􉎢𣥇^􉽧9􋉦腪󵟦\u0000D\u000c\u001c1\u001c\"#q󱏕󽬖\u0003\u0015󳂶_QQ@􃴀f4󾕳v􄌰i𓁶}𪋿\u0007SqA\u001e2p-𢦅V\\🦕\u000c􎩌󳹹~CB􂭻\u0004􇟨+c􅟇왔g@\\_u\u001b)*1B󴈽𤂎:\u001a8􇐇􋏐s󱆦\u0006D\u001b_\u0010;\u001d_\u0012j\u001c𧐍Z|0𥤠\\녨M}\u000cp\u0019>\u001d𫁧^\\*\u0016k\u0006gP\u001ai\\V\u001ani􇈀􌺶𫓖\u001d\rP\u0014,4Q:G劉`qH \u001b𥞽𒌹eq\u001a<!Ao\u0005]\r􈼴󺺪󹤭\u001c𣟐􄁌rTH:;ps<\r𖹬􌌟F\u001c􌞋^)㴿(𮎋DTFbd󶛨D{_!7Lhk\u001dD𧙝1\u000b󴖙\u0010󳩤\u001d\u0012Mꐅ_{&󴝭\\\u0011q􏹤%7:𩳅\u0011󻠟3]\u0003]\u001f촥]㗭i\u0006􁷵\u000c8Em\u000c􍕭a| 􋨈 )X:%<\u0013󸑼፼/-𥟐V\u0001:*𬑕􄅾 HgZY𤩚\u0014󸰯^𪣼憛󰵬^DTXo\u001d\r@\u0001\u001ch'📔UY{r3[\n\u000c\u000cㅆG_z4\u0004h𡳰𣻑\u000f쁉󿼝iUr\\􈍺+𦷊|𫷴<bQ*3󱽟kS\u001e⋡62\u0013",
+    "name": "󲊡\u00132\\\u001f",
     "tags": [
         "books"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_14.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_14.json
index b702742595b..d6604b588a1 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_14.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_14.json
@@ -1,4 +1,4 @@
 {
-    "name": "r9@h𫌨􋂊2u􄷖 \u0017r\u00146k9􊼑\u0015ꮽ┩2􇅿uP'3\u0014:\u00064~𮔍걝4nJ)K揎\u001aQV\u0000󹞲ﴟ\u0002\u0015|􉴿#UHH\u0000b󱦳'􆨍J\u0003i􄚨)wꞐ􌐞QF&5Z\u001c0I8􌟺A\u00031󰘂%.^FvFt󹟉V􂯈t6?j\u0014\u0001\u0012b0Wv樆9𧓇",
-    "description": "𣝜꞊󷓬l?F𣺾>JT긴c𛱂\u0017\t𨑃\u000fIx;󸶼q\u0019𓁻𨟿\u0004\u0001hL𦍘^𑒜Y<)h\u001b23闋K󽴴􏁘tSWM\u0013^\u0014\u001fZr\u0013pഡ\u001b󾎻\u0010JT𖠶c𣯽m6>S]`󳯹\u001ao'y,󺾼𑖯gQ\u0001\u000bT\u000cA\u0001%\u0004Cs5rTy𨯻󵡸R w\u0014+er\u001bFႳ\u0013R벦\u0017sN\u00001󸸃 \u0005z4o\u0000󲅍\u0008\u0016𥂹\u001f-\r\u0003\u0001\u001d\u0011􅪎􀨒󾖆FU󰇊r􂊿𤶢𢯛+|𪔖𫳗䰾\"f-5 p}6;k\tA:𨙡\u0014=𨣐𡇴zB𫡀𣷑ThDyd阋,􍰡+\n\u0019:ⓨ\u0014$_QbSxz𪺮c󳳉󻲚q)O5qT􁳛M𑵾J𤤾g𡕗Y\u000f|󾎑\u001dp끴Sy󻰿=𦦮󸂧TI|f}𡓵\u000bEGNG0`\u001f+\u000b𦶰`􋺕\u000f;$v󺕥\\c\u000f𭋽H쵚\u000f􆞆Yl𭕚\u0015􊰘xCl\u000f􄬯{Q\u001bv𢥏I(󲍞󷛥<$1j􉌌I\u001ebG5j_\u0002󶎋q+\u0007󴏾Gj^\u001dE\u000cml#V歇\u0018I)󾓧/+\u0001󰉽 #􏞨祪v\u001cV\u001d􋦩􌂊erQm\u001c#\u0011\u0003𡴠/E\u000e\u0008+/)Q籎ꃮB`u%f;k􏝂􅉒겻h!V𧘖󳈝=:𖧭폻p=>^鱧𦆛ウN⢔^;{su?bR{}\u0003\u0017w熡tN%􄿼o*b3腇\"󲞉j\u000bsrY;_p`􉆿\n]󷜂6V\u0014Q𘤅/Fl􉇢|k$C\u0012s􀕘V圢\u0014'𢨅􂗘>X\u0011𣯐5j〰~􌺅䱧󵸬󶈷󰶱\u0018􈘙:v 磀󼱕&𫩂󼺪ᵂi\u0008􁌍\u0002𗟉o󻻚yQq,h(umvD.Z󲆦K[@3'$󼲖⎺𣼫,ffj\u00153\u0003Ud_\u001c𮢯]󿅋r\u001b􆥤\u0013􉚙T7o𡩃6_t\u0015T*q𝀐􎤘>ff\u0007𝅑c􃞫\u0003􂎂%dyZ\\\u001fs􏬱_󼤎1$\u001f0+\u0014Z\u0015b𢊓dT\u0010}\u0003D:\u0007󾸦,\u0011{9xᚖ蠮hg󴖍F6:􌹧{sWo󷘑\u0015-V𠓯\u0001\u0018q) 8@s\u0019􋟱\u0006!>I\t󿚏kc󺻐𮐨𠨗g7󼣱\u001b7󷯠s[L𑆌\u0007\u000e.pJ𬆼bBJ\u0001\u0011􆄥\u001c\u0006e\u000fRY\u001fy\u0014+.\u000b𡨷\u001dng\u000b𠇕RxQ\n_y𗘁𨑽\u000f𩺳f`宓鱓. N\\\u000b\u0015\u000b\u0019v}3.󱁑𣲩:y菚􋢄g{󱘏\u000bJ\u0006Ộ\u0012\u0010𭐓\u0006Y􇭚e\u0013\n\u0011􀱨l4\u0004^􍤤\u001e󵣢\u000fk5Q\u001f\"6橊𬓷pk\u001dG'@Bd.颒𭝜􂢲󴫃\r\u0018\u0012\u001a\u0011uXczm7?kb\u000fIBYtIGJw+􄃕cZ󺉬𥰏𭚀4P{h𪋌\\1\u0004h𬌭\u0017#𣠄{*􅓉󱾔A\t6^\u0004\u0003~|󷰋\u000fr\u0000\rdCLs#o剻󴁯D#1(\n􉓊'\u0005􍤷􍼖\u0001𢢐{󷕏;\u0011a}Y\u0005𞤕p\u0006y!𢋨}9𣦧=QiT&T\t󶪧󲌊_􂐮M􃛠𭬂\"0:7/􃮄k\u000e🅵:\u0013=Rc\u0017􇽢󷳿\u0015Mw;;+\u001d\u001fBJy󹍎/S@7􍛖\u0008􎀸^RJ*\u0012Q\u00044j󺤌w\u0007𣊲c`𢝍\u0005tDR"
-}
\ No newline at end of file
+    "description": "𣝜꞊󷓬l?F𣺾>JT긴c𛱂\u0017\t𨑃\u000fIx;󸶼q\u0019𓁻𨟿\u0004\u0001hL𦍘^𑒜Y<)h\u001b23闋K󽴴􏁘tSWM\u0013^\u0014\u001fZr\u0013pഡ\u001b󾎻\u0010JT𖠶c𣯽m6>S]`󳯹\u001ao'y,󺾼𑖯gQ\u0001\u000bT\u000cA\u0001%\u0004Cs5rTy𨯻󵡸R w\u0014+er\u001bFႳ\u0013R벦\u0017sN\u00001󸸃 \u0005z4o\u0000󲅍\u0008\u0016𥂹\u001f-\r\u0003\u0001\u001d\u0011􅪎􀨒󾖆FU󰇊r􂊿𤶢𢯛+|𪔖𫳗䰾\"f-5 p}6;k\tA:𨙡\u0014=𨣐𡇴zB𫡀𣷑ThDyd阋,􍰡+\n\u0019:ⓨ\u0014$_QbSxz𪺮c󳳉󻲚q)O5qT􁳛M𑵾J𤤾g𡕗Y\u000f|󾎑\u001dp끴Sy󻰿=𦦮󸂧TI|f}𡓵\u000bEGNG0`\u001f+\u000b𦶰`􋺕\u000f;$v󺕥\\c\u000f𭋽H쵚\u000f􆞆Yl𭕚\u0015􊰘xCl\u000f􄬯{Q\u001bv𢥏I(󲍞󷛥<$1j􉌌I\u001ebG5j_\u0002󶎋q+\u0007󴏾Gj^\u001dE\u000cml#V歇\u0018I)󾓧/+\u0001󰉽 #􏞨祪v\u001cV\u001d􋦩􌂊erQm\u001c#\u0011\u0003𡴠/E\u000e\u0008+/)Q籎ꃮB`u%f;k􏝂􅉒겻h!V𧘖󳈝=:𖧭폻p=>^鱧𦆛ウN⢔^;{su?bR{}\u0003\u0017w熡tN%􄿼o*b3腇\"󲞉j\u000bsrY;_p`􉆿\n]󷜂6V\u0014Q𘤅/Fl􉇢|k$C\u0012s􀕘V圢\u0014'𢨅􂗘>X\u0011𣯐5j〰~􌺅䱧󵸬󶈷󰶱\u0018􈘙:v 磀󼱕&𫩂󼺪ᵂi\u0008􁌍\u0002𗟉o󻻚yQq,h(umvD.Z󲆦K[@3'$󼲖⎺𣼫,ffj\u00153\u0003Ud_\u001c𮢯]󿅋r\u001b􆥤\u0013􉚙T7o𡩃6_t\u0015T*q𝀐􎤘>ff\u0007𝅑c􃞫\u0003􂎂%dyZ\\\u001fs􏬱_󼤎1$\u001f0+\u0014Z\u0015b𢊓dT\u0010}\u0003D:\u0007󾸦,\u0011{9xᚖ蠮hg󴖍F6:􌹧{sWo󷘑\u0015-V𠓯\u0001\u0018q) 8@s\u0019􋟱\u0006!>I\t󿚏kc󺻐𮐨𠨗g7󼣱\u001b7󷯠s[L𑆌\u0007\u000e.pJ𬆼bBJ\u0001\u0011􆄥\u001c\u0006e\u000fRY\u001fy\u0014+.\u000b𡨷\u001dng\u000b𠇕RxQ\n_y𗘁𨑽\u000f𩺳f`宓鱓. N\\\u000b\u0015\u000b\u0019v}3.󱁑𣲩:y菚􋢄g{󱘏\u000bJ\u0006Ộ\u0012\u0010𭐓\u0006Y􇭚e\u0013\n\u0011􀱨l4\u0004^􍤤\u001e󵣢\u000fk5Q\u001f\"6橊𬓷pk\u001dG'@Bd.颒𭝜􂢲󴫃\r\u0018\u0012\u001a\u0011uXczm7?kb\u000fIBYtIGJw+􄃕cZ󺉬𥰏𭚀4P{h𪋌\\1\u0004h𬌭\u0017#𣠄{*􅓉󱾔A\t6^\u0004\u0003~|󷰋\u000fr\u0000\rdCLs#o剻󴁯D#1(\n􉓊'\u0005􍤷􍼖\u0001𢢐{󷕏;\u0011a}Y\u0005𞤕p\u0006y!𢋨}9𣦧=QiT&T\t󶪧󲌊_􂐮M􃛠𭬂\"0:7/􃮄k\u000e🅵:\u0013=Rc\u0017􇽢󷳿\u0015Mw;;+\u001d\u001fBJy󹍎/S@7􍛖\u0008􎀸^RJ*\u0012Q\u00044j󺤌w\u0007𣊲c`𢝍\u0005tDR",
+    "name": "r9@h𫌨􋂊2u􄷖 \u0017r\u00146k9􊼑\u0015ꮽ┩2􇅿uP'3\u0014:\u00064~𮔍걝4nJ)K揎\u001aQV\u0000󹞲ﴟ\u0002\u0015|􉴿#UHH\u0000b󱦳'􆨍J\u0003i􄚨)wꞐ􌐞QF&5Z\u001c0I8􌟺A\u00031󰘂%.^FvFt󹟉V􂯈t6?j\u0014\u0001\u0012b0Wv樆9𧓇"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_15.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_15.json
index 6c105d416a8..35c19a29f64 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_15.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_15.json
@@ -1,6 +1,4 @@
 {
-    "summary": "f\u000c;\u000bNHu=6A;a㓘᱂\u001e8􊘪\u001c}􉲠k\u0014꩘\nd\u000eq╥3􉔾B\r\u0000\u001fTꠗ>^\u0015NdXh𢆑k𣽚o􏓰:t𡗮]W\u000fW\u000bVE%\u0016\ti{󿈘𨜑\u001d\u0008􌄀",
-    "name": "A-􁩿󴧶\u0000􈩁w\u0004?E󻂳\u001b􁉃\u0019sፕ𬇨>\u001b\u00075[󴇊𫺗=![C𗙥2^󿶧bZ0솕\nU􄑔+b1~\u0001\u0007𠥆Hs孅:-\u0011\u0004樋𗸔ꀥ\u0018\u000e珂u_m𓍨\u0006_r#𦌈I]􀁞浏\ru\u001b𢜛(B\u0006󱖾\r>\u0015*\t6<\u0007\u000f\u001f\"\u0007]󵽥r<D$\u0016(􏪄8\u0002\t\u000e\"𬅃n\u0011m",
     "assets": [
         {
             "key": "\u000eNG",
@@ -8,8 +6,10 @@
         }
     ],
     "description": "x\u0007𡐋\u001a^\u001b<4\n䗑\u000e>v𦛷|󹏺(𭙿{\u001f痨A\u0016/󼨩\u001c&恴w594<f,𦞏#\u0010🂐\u001a[b𗕓㽥\u0016E􆾩\u001dw𒃳􍡣\u0019􃞃+iMC𛱎#\u001eo\u001aZ\u000fB{)􍞏𧀮vX<\u001a𦆖􊲰􍵩~\u0006:r󴓿︢􉫊M󰩕!C{𢍐\ri\u0004`9\u000b􀗋ua\u0006`C\u0001|sya&󱩽8jKR\u0000Ig聢c4d􅇪\u001bu󼵡n\u0016[3吾\u0015`􁢟W\u000f\u0016V󻙖\u0019li\n󲵟\r(~z8BR􆍗𤥂B}\u0000W9\u0017\u0004딿;􍀧󿈟\u0017u(3G&3🞢@􍠔'cℾ\u0002\u0000𡡕V\u000f|즊s%转\u0019􏿒<V\u0003𡍠L𤇖\u0018󺙘LK$~a*F:E󴱆\u001fV􌾋\u000e𫹲Rl\u0018\u0002K먜혷tlb\u001eF󳱌,@\u0017yR\u0018>5i\n4\u0011+nk𝀲ZSV󶶎R󳙓\u001d\u0007\u0018\u001b;D_g7TNN.􇰭,󼴩\u000edPu\u001aF\"e􅠵V􅼃o󸻍\u0001\u0003\u001e􊇩J\u0008rXcs<ꄹeYl)'\u0013F{wjCio⢾\u0004𐎂=F\u0004󶼬\u001cAe𘔞瑖j󱈨\u001e𖭫_^7\u001czLW\u000b9Oy&󸶑𦨽=j:𧖧\u0004xXF\u000b!\u000f{𬨨\u0018(q#A\u000c#Y\u001dm󻘤\u0016苐􊤲Q名\u0014N㕪bj喬H;흞昉fz𬸣𡌋.p𣿳X\u000f+妽爩㡓\u0008\n诬􊪢\u00068󵅉𘓍dUVae|'3g\u0002\u0001𫙎xA𮧯T􉲬M𨷋7:\u0000𘨖\u0013\u001ds\u000fyw􃮫Q_u}\u0001>􅆭𠲽?\u001f\u001a􎋽᠎]5Z󼧟%𬵩_\u0014ꇘ^潼qaʼn􋶘/-\u0006\u0004넺􉼄~H$\u001c┶\u0008\u000eEVy2obJ𡸥FK(󲻵H[^􉮤敢n𧎙/\u001c\u001f#􄚋db󵱗5?\nM\u000e걳Xs𤴤􏮁\u000c]XR,\u001d8{A0.T\u001b4\u000fL\u0016\u0004󻊲\u001dkX\u001ba=6\"qA7\u001e\u0017G\u0003D􌲡d;𭚍\u0019\u00155􆶅Qj\u000c'D#\u000b􉝲gY𛂺\u0018≅4P2\u0003_󿸈P+V.F9\u0001𦍆-oK&\u0004o*\u0016@𪥽&w􈘵\n{\u0008/颞<'>𤉴GFoF搪\u0001\t]vwT{+󱉹\u0008(mO誉룦xR􌘏\u0001k𝢜#\u0010J\n􏐚/R|^\u0016Xj𫑈(Dc\u001eﱷ$jM􂛞\n|_󹵗s𬐈􇻁U􆼸'𣔶\u000c\u0000\u001d𫼆puJ㠍 1PH󰺻𤈝\u0013p0%!􋧕8Q3Hc\u0010b3􃯐^o~􁖪&u\u00071,mgg󿣞𢛟'J4\r[6뉋o\u001c9\u0016󹐤<\u001e秇\u000ca\u0012\u000b󿦧b^2\u0013*\u0012Y≣&p\u0017橼#*ꍔ\u000e~mcH#qFe󷷢\u0014Aq\u0014(\u001d[\u0018%%h3U󷘙U􌜣𠄻󹁖4𨧙Tt꧲d7Z􂱼~󰗻",
+    "name": "A-􁩿󴧶\u0000􈩁w\u0004?E󻂳\u001b􁉃\u0019sፕ𬇨>\u001b\u00075[󴇊𫺗=![C𗙥2^󿶧bZ0솕\nU􄑔+b1~\u0001\u0007𠥆Hs孅:-\u0011\u0004樋𗸔ꀥ\u0018\u000e珂u_m𓍨\u0006_r#𦌈I]􀁞浏\ru\u001b𢜛(B\u0006󱖾\r>\u0015*\t6<\u0007\u000f\u001f\"\u0007]󵽥r<D$\u0016(􏪄8\u0002\t\u000e\"𬅃n\u0011m",
+    "summary": "f\u000c;\u000bNHu=6A;a㓘᱂\u001e8􊘪\u001c}􉲠k\u0014꩘\nd\u000eq╥3􉔾B\r\u0000\u001fTꠗ>^\u0015NdXh𢆑k𣽚o􏓰:t𡗮]W\u000fW\u000bVE%\u0016\ti{󿈘𨜑\u001d\u0008􌄀",
     "tags": [
         "fitness",
         "tutorial"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_16.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_16.json
index 831d7262861..0278cb7c17e 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_16.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_16.json
@@ -1,5 +1,5 @@
 {
-    "summary": "灊=\u001e􈺃9y\\𤭐O1^熦\\%m󸦙謀饰󹇾O+aN.󿨍\u001b>'i\u0005󹃯f:[_Ux\tX`\u0003\u0013󴦅Tp\u0006󻊧f\u0012^\u000e:\u000f󶬑\u0012%D𡁕󺑞mz􀔄:<\u0014\u0015MC\n,\u0006\u001e\u001f*𢈚󳇼X4\u0011ꌼ􋳮\u0007󿖕.Fm𬝥󴅔醎𠨉䫔𨖠u􋃇翚hhQ􄾕\u0007\u0013\u0007@(\u0015]6 𥹦􎘲󼞲[oF>\u0013Z",
+    "description": "/\u0006fQ󻻟s㓂\u0013 \u000bl@:i⾄􆙖𢇭S=󱤁\u001b:UX𧷍}𔒲&)m)􇰭\u0007\u0005\u000c􂖎-B#$\"󰎙𑁝n\u001f\\\t𫶩Ma􌹃\u001f𥻀5xg⦂㸣F\u0013=D䯬rb<saSu@\u0015\u0004!;4𭑬a𭍘\r\r\u001a󷒲𦶄𫫿h:HZ󾲦􉚹𨕛􉰀\u0008Hh8j蚀y󴉖㒻\u0005𪪾|+@𬯦_\u000b􀹘X崅\n󰾿󴤡CU+d_~G\u001e#n@𑱖0Q\u001cz𬨅ⷨ\u001d>\u0012:󾎋@WB𣦬\n^􎭒8𣣩YC<#T%a\u0015yX쪧𖠺8􏣐\u000e0㸄\u0018𧚄곜8󾲻M뫋}󶸊;𐫦𤴀󸒂+\u0012\u000eX\u0008𩹃􈓰\u0003\u001a\u0000K𡞤􁾰75\u001f􇫈\u0017\u001d\u0001SjP𫍈`q\u0001$+#c𦖓=G\u001d\u0019P=\u001d\u0003G𑰿g\"𭲞𨹻B󻌪𧅔yO𧢢\u0005S»nw󻫛~q\u0011yZ)𡹰쪰=}\u0018j\n㹟j埡\u0016lPp䓕𪏟2\u000c\u00065?6h\u000e\u001e𠹖3,[pF󷠕\u00136]\u00074󽻭􄹤\u0010𭔨󹄭5at\u00188\u001b\u001a\u0013]𥪾h@󸕿ꔮN𩥪\u0002aS\u0008G\u001f2DF=󴽿\u0001ኙU \u0017n\u0018OI\u0002:\u0001%q𤡣\u001aP\nyIⳝ\u0017\u0006\u001bu􌷼\u0010.ᣮh𩵯cM#+\u0016𬸼mc&􍳈𪬡L󹀅xN\u0007𗝁􍉄`*o]Xl\u0011􅄋z?b)😼yI\u001d>(G\u0005\u0000\u0007f󲺄𬮨\u0004=2.~@$.I\u001c󼵂\u001fm𤮦y=ﲩN𧚎X屮65x챥q\u0016󾚣y\u0016烖􄱼⋲࿄􂾸TV𡗝R𫳶\u0001x:\u001d\u00077d=\u000e\u0016?<H󳤭?𨊿-e|틯*e*􅈹󳣩\u0001e#𘆠\\῎i󽛈j󰇤\"𤧏A􎳟U*y𦖎[at/q𩜟D\u0007#\u0000\r|-C=_􅌿n\u0017\n\t𤇍V𧀝t􄤐qV\u001d\u0007𥾪}Qq\u001a󺊭󸿒\t_\u0005UD󰢙Z.\u001ei\u0001{󷠹:@𦇇Q\\𫳘E௲CU|m}L\u0018:@%l|\u0000\u001e􏑙)\u0007zU𡐠",
     "name": "%U#󹹺ov",
-    "description": "/\u0006fQ󻻟s㓂\u0013 \u000bl@:i⾄􆙖𢇭S=󱤁\u001b:UX𧷍}𔒲&)m)􇰭\u0007\u0005\u000c􂖎-B#$\"󰎙𑁝n\u001f\\\t𫶩Ma􌹃\u001f𥻀5xg⦂㸣F\u0013=D䯬rb<saSu@\u0015\u0004!;4𭑬a𭍘\r\r\u001a󷒲𦶄𫫿h:HZ󾲦􉚹𨕛􉰀\u0008Hh8j蚀y󴉖㒻\u0005𪪾|+@𬯦_\u000b􀹘X崅\n󰾿󴤡CU+d_~G\u001e#n@𑱖0Q\u001cz𬨅ⷨ\u001d>\u0012:󾎋@WB𣦬\n^􎭒8𣣩YC<#T%a\u0015yX쪧𖠺8􏣐\u000e0㸄\u0018𧚄곜8󾲻M뫋}󶸊;𐫦𤴀󸒂+\u0012\u000eX\u0008𩹃􈓰\u0003\u001a\u0000K𡞤􁾰75\u001f􇫈\u0017\u001d\u0001SjP𫍈`q\u0001$+#c𦖓=G\u001d\u0019P=\u001d\u0003G𑰿g\"𭲞𨹻B󻌪𧅔yO𧢢\u0005S»nw󻫛~q\u0011yZ)𡹰쪰=}\u0018j\n㹟j埡\u0016lPp䓕𪏟2\u000c\u00065?6h\u000e\u001e𠹖3,[pF󷠕\u00136]\u00074󽻭􄹤\u0010𭔨󹄭5at\u00188\u001b\u001a\u0013]𥪾h@󸕿ꔮN𩥪\u0002aS\u0008G\u001f2DF=󴽿\u0001ኙU \u0017n\u0018OI\u0002:\u0001%q𤡣\u001aP\nyIⳝ\u0017\u0006\u001bu􌷼\u0010.ᣮh𩵯cM#+\u0016𬸼mc&􍳈𪬡L󹀅xN\u0007𗝁􍉄`*o]Xl\u0011􅄋z?b)😼yI\u001d>(G\u0005\u0000\u0007f󲺄𬮨\u0004=2.~@$.I\u001c󼵂\u001fm𤮦y=ﲩN𧚎X屮65x챥q\u0016󾚣y\u0016烖􄱼⋲࿄􂾸TV𡗝R𫳶\u0001x:\u001d\u00077d=\u000e\u0016?<H󳤭?𨊿-e|틯*e*􅈹󳣩\u0001e#𘆠\\῎i󽛈j󰇤\"𤧏A􎳟U*y𦖎[at/q𩜟D\u0007#\u0000\r|-C=_􅌿n\u0017\n\t𤇍V𧀝t􄤐qV\u001d\u0007𥾪}Qq\u001a󺊭󸿒\t_\u0005UD󰢙Z.\u001ei\u0001{󷠹:@𦇇Q\\𫳘E௲CU|m}L\u0018:@%l|\u0000\u001e􏑙)\u0007zU𡐠"
-}
\ No newline at end of file
+    "summary": "灊=\u001e􈺃9y\\𤭐O1^熦\\%m󸦙謀饰󹇾O+aN.󿨍\u001b>'i\u0005󹃯f:[_Ux\tX`\u0003\u0013󴦅Tp\u0006󻊧f\u0012^\u000e:\u000f󶬑\u0012%D𡁕󺑞mz􀔄:<\u0014\u0015MC\n,\u0006\u001e\u001f*𢈚󳇼X4\u0011ꌼ􋳮\u0007󿖕.Fm𬝥󴅔醎𠨉䫔𨖠u􋃇翚hhQ􄾕\u0007\u0013\u0007@(\u0015]6 𥹦􎘲󼞲[oF>\u0013Z"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_17.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_17.json
index 6783d84d3b5..5fa9959c912 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_17.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_17.json
@@ -1,11 +1,11 @@
 {
-    "summary": "Y鉑𩳯\u0000􍌍䯼;鲭l􊠻󽩱𨅳3􂻈/\u0000[\u0002\u0017\r􀙋9\u000e9\u001a\u0015?yC&􉡔K䯐X󶌳Z󾷛A\u001c\u0017\u0007\u001c􄽆2(\u001c􈆇Wh􍳨;疥\u0016𫖙𝩋F'\u0006,󶏀t\u0008𤉈𫩒]Ea.Sr\u0002󹓛/􊞗 O&𨳄P􀮏⼳ P\u000cvL􅯅xTw𩶾R\u0018",
-    "name": "\"UgHe\u0010\u001c\u001f\u0012󾸰\u000e\\GS\u0012?p􆕊\u001b𦝟>E=\u0004(BT\u0019􏐫hw/𦕛<^ S\u0003䦮U𭢰Ie􏼘㗐4쟋f;𥧡Z𞲧𪹔p\u000e\u001c[M󸙧N\u0017㍥F𠆄\u0010I~㡍\r\u0012\u0016m4𢮠㰒䨴󿭕􈒃=\u001ed粴$H𗣠M{0W_綈”瘃\u0008󹲕4(t;룊莋9e󼠳􆐂oL\u0003︅+^#TR,@\u001e",
     "assets": [
         {
-            "size": "preview",
             "key": "󼋠j𖥩",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "\"UgHe\u0010\u001c\u001f\u0012󾸰\u000e\\GS\u0012?p􆕊\u001b𦝟>E=\u0004(BT\u0019􏐫hw/𦕛<^ S\u0003䦮U𭢰Ie􏼘㗐4쟋f;𥧡Z𞲧𪹔p\u000e\u001c[M󸙧N\u0017㍥F𠆄\u0010I~㡍\r\u0012\u0016m4𢮠㰒䨴󿭕􈒃=\u001ed粴$H𗣠M{0W_綈”瘃\u0008󹲕4(t;룊莋9e󼠳􆐂oL\u0003︅+^#TR,@\u001e",
+    "summary": "Y鉑𩳯\u0000􍌍䯼;鲭l􊠻󽩱𨅳3􂻈/\u0000[\u0002\u0017\r􀙋9\u000e9\u001a\u0015?yC&􉡔K䯐X󶌳Z󾷛A\u001c\u0017\u0007\u001c􄽆2(\u001c􈆇Wh􍳨;疥\u0016𫖙𝩋F'\u0006,󶏀t\u0008𤉈𫩒]Ea.Sr\u0002󹓛/􊞗 O&𨳄P􀮏⼳ P\u000cvL􅯅xTw𩶾R\u0018"
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_18.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_18.json
index 26f738faf99..79134b0c607 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_18.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_18.json
@@ -1,9 +1,8 @@
 {
-    "summary": "x:׆%c`mAV5E劶t\u000b\u0012@􆟭#\u001e^\u000b2𨀼H>J\u001d\u000c\\󺌶f b}𘒙B\u0016𝢪i}􁎩v𠖷C㿓_RW󷡀\u001b𑲌@\u001c􀔳`\u0011󶿁\u0008倅3Y[\u0008\u001d\tQ\u0003iHR\t󼭍嚣R\r]gI-􌌃牂䘕Ui\u000f\u0007\u0017Y>59M󰚮{m\u0011\u0010\u001dbw\u0015\u0010:0Uz",
     "assets": [
         {
-            "size": "complete",
             "key": "󿔉w\u0015",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -12,8 +11,9 @@
         }
     ],
     "description": "\u000362P\u0001\u0014􎿧=\u00008}􍚳R󷨆Y𭪨\u0018z-욏t\u0015礏:􎨦\\q5!\u0018sz󰸦.]􊜃}\u0004\u0001k<􆵤jo\u0006*󵪾<􄰋\u000b𧣟'\\Ky\\d𐚘Ea𭛥ꗬ7𣧓@3.`[𔓲%󷘆􍜹৳^o'\u00153\u000c耢7𦅈\u001f𫝕𬝮⸜㓾\u0003<2鉏\\\u00197u􌾳󳘟󻧅`\u0007F\u0012󴶗􄇵G\u000fUMj??􈊶𧼙[q큲\u0002|\u0002\u000c鬀?\u001f\u00178\u0002\u0019􏰁󺂿\u0010Z\n#[ 󶭛\u001eh(󻮲3𢬬1\u0008C?2rx7\u0000jE\nU􁶾\n)4\u0004*䧸r\u0015\u0019\u000bA\u00142TSw,\u000f0􃆊𪾕6RX􍰛KEU𘋔as\u0013/\u00165`,d\"\u0013𬃙y\u0006e&|\u000e\u001fE󲂜\u0000蕲ಡ\u000e;\u0010h,|z0\u001dZPK#WSN<qk\u001a𮢜O!'c𑧑wILr\nnQ\u0002i\u0018㆕󲸕􏮫k𦊐@󳌐􌺫󶍎\u0004􆾆s\u0000󵀮􍃫\u0004󶑧a\rNB\t\u0007R\u0002{󷂼\u0000~qW!Q?\u0007\u000b-]Uo-􁗸􋆬mL󽢚\u0017𮌮LUᵴ𬼏b$󷡰@􄲪P\u0004XUzp\u0015\u000eFn\u0019,7mQ1YcVpHS v\u0002p\u000b\u000e}\u0016󸜭a颅e󸻂=𞅇󰸾󷎶2󺱫u𢁈􃽯R󾐰𡣿&\u0016\u000c",
+    "summary": "x:׆%c`mAV5E劶t\u000b\u0012@􆟭#\u001e^\u000b2𨀼H>J\u001d\u000c\\󺌶f b}𘒙B\u0016𝢪i}􁎩v𠖷C㿓_RW󷡀\u001b𑲌@\u001c􀔳`\u0011󶿁\u0008倅3Y[\u0008\u001d\tQ\u0003iHR\t󼭍嚣R\r]gI-􌌃牂䘕Ui\u000f\u0007\u0017Y>59M󰚮{m\u0011\u0010\u001dbw\u0015\u0010:0Uz",
     "tags": [
         "books",
         "games"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_19.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_19.json
index 4090710d153..1241cd1a8db 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_19.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_19.json
@@ -1,24 +1,23 @@
 {
-    "summary": "k풼vyꢓ/P􎗀\u0005䋺䚸玌v󷻄\u0006\u001c'\u001dT@'&]𝆛bGq𬹦\u0003棷\t\u0013jd\u0016󽈰弊\u0005j\u0005&1*\u0008󿾀`4mEa\u0001ᮐA\u0003󰎄 B\u001e;\u0004y󼻝B\u0011g1\"瘭nAX\u001f%🁶",
     "assets": [
         {
-            "size": "complete",
             "key": "q",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "]䊇",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u001b笜F",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -26,12 +25,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": ";K",
+            "size": "complete",
             "type": "image"
         }
     ],
+    "summary": "k풼vyꢓ/P􎗀\u0005䋺䚸玌v󷻄\u0006\u001c'\u001dT@'&]𝆛bGq𬹦\u0003棷\t\u0013jd\u0016󽈰弊\u0005j\u0005&1*\u0008󿾀`4mEa\u0001ᮐA\u0003󰎄 B\u001e;\u0004y󼻝B\u0011g1\"瘭nAX\u001f%🁶",
     "tags": [
         "medical"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_2.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_2.json
index 3fccbe0b74e..078f95b752c 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_2.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_2.json
@@ -1,31 +1,31 @@
 {
-    "summary": "jTPNu\u0015>𮛤s\u000c\u0001\\kh&A)'&\r1z贐V\u0018C􋜫O",
-    "name": "\u0002N\u0013\u001a0|`𡞚s\u0008Q`\u0017zT\rろw𢳫壣􌡔!qW\t\t#SL\u0007&󽌣\u000e􅋞e৬p􍙠𤂈\\􀥓􊇎󶰄\r%ꪸ\u0004t:󶇰\u0017痟󳔏\u000fLX%7\u0012蝱]\u0013􏑃\u0010􆎲C\u001c\u001a贐􁦧7+􈘆\u001a{tV󿵁U@󶭷^)e=\u000fr\u001es\u001eB3^缽FjKv.\u001a𩄣#",
     "assets": [
         {
             "key": "",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𬩌",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "#",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
     ],
     "description": "o刦\u0010\u0011KﲹIp􎢶Isa8/g5􁦐\u0004\u0015\u0016_\ni󴓤󶖛^\u0001\u0012󳤭𩗓r\u0016T?𢮄K_f􁉫\u0003\u0002*Z\u001d~J牜\u0019h\\\u0002\u0007ts\u0013K􁀐a'󰌁𒆄q@k^S\"\"䷾2|c+h\u0007Y趼U\u000cdl𥟸𠃯R\u0006d󷫒𮬪𤞔􋧍`z𝠮o𫭊鑋𨕨\u001c\\\u0007\u0019:p􋈑18􋭡/(e􊰬_𤑏󾪫􎗬aR𠤖+T\u0017𑂪\u0002a\u00147(溌pk󱹹9􏜦38󴯨󺠾|󽷱9󴁋𤲀\u0003Z_󻣁𘗏n𡌀c?L\"\u0015F0(0􈟬󷆈b𩱸E-t\u0006\\h󶶥𗉒\u0017\u000bAO|􌁾,s𐜀\u0004󴠹N\\\u0016\"\u001cJ\r\u001a\u0004\u001d&#󺹓w𤝧\u0008?V\u0004Y2𡹐\u0014𣁚\u0016\u0008c􀺄𬎓𝕔\u000f0딾Y,CUC@\terx+KV*K𣕠re􆈘V𣓃\u0011m#󵲴\u001d`~\u001c=.􅼳륁\u0004\u0002󻔮8tF}{ST\n\u0019R\u0019R\u000f$󷨨L^Q𑚘\u0008E\\𨛻~\u0002jf􋆛Qz5~\u0015&~󲿦\u001c󴯒\u001cq󵏊놭󳤍y`\u000c)#𣫺\u00068􀿻Q\u0011P?􈺮\u001e囶se8p\u0005\u000f\u0010󻳭𦸺!􍊳\u001a,\r\u001f!)𮤃膧}J􎀑\u0011t챕q1\u0012\u000e᮵\u0005E\u0019􂆼S;􍳛!xW􍐀짢9󺛍,\u0008/󱧏r2\t󾩫\n\u0001􄷬𧩛\u0011}-\u0016cb>6kgG_J\"a\u0012𣨥L.+Y\u0019󳔯?uM=B\u0002\u0007<\n󸧭x@K􍰂\n􌎼SI\u001a\u0005\u0014o􃐖\u0005w\u0008V1_K\u001e\u0011\u0013,&c\u0019:ﮡ𑣩3\u00115!gV􄲪1󼼦`\u0012DC󴃒\\ࣜ\u001e𦔞_풲Fr foM<\tJ2,6V󱘄􀪷􁌜)8󶁗𐃍[T\u0002\u0016𮡜􋀘\u0005斷,\u0005T󵫌RufnCntu􃉮𝋳f\u0005&+2\u0002☳c􎌢\u0007\u0000|1/󱡿1\u001cy]Z㷴}\u0015󼏌\\p\u001f󸇞7jl􋏽T𗮮\u000cY\u001e󴏏X𝌣`𫝩􄁅󳘹\u000f|𗚆\n荒E䬤\u0002Y\"0\u0014\u0003=𤜉𨘫D󲌛yfQF\u0008󿯑\u0015󲰼}𢚓snsB\u0012\tM􁭒\u001f􅼦\u0013\u0005\u0015+<(:P󲬉EQGZyHn󽫰\u001d\u001bu󷊋󿩱q萾󰽔|􈘆󹨨􊃂𤱄쮺)𭘋]KX\u0012\u0013H78\u0006XPM*z;\u0002f\u0015\u0008FGIY\u0006&?/\u000eS}鴚󵔥p\u000cqA)T\u0000𨔚&#A𫯿@]\u001f\u0014Ya,Bꀳ\t󹍨樈D0僣S\u0001+󸮂&PgJ\u0008𬑩𘫑Di\u001bU \u001f 𣣑\u0015𠊰𫺸kL\n\u0015.\u0012&􊙚\u001263RX跃𬯦%,\u0011󿇊\u000f햩\tc!?r􄺂\"#=p\reV垈\u001d󻦧U6j^4W𢙖\u0019\u0016\t㧘[;\u0005|P)\\\u001f󳚬]+&ߨ􂴽𧚛>f\u0013PB􊮐T錈\u0001\u0019Tn𖦣0𨭃^6.􃾽􁯢~\u0006Bﰃōu8ꚽ\u0014􌺉\u000f􇃔\rA\u0016􏎟8@&\u0018󴕇󱍒l\u0000􆼣UC𬼛􏴇󾨢p\u0018`\u001b\u001e:𘈭~\u0015󴇸X!]\u0010q󹘌.𦆢󽃣#A䌉`p@🨻઼\u0018sOS\u000c+<s\u0013<`0h\u001c󽡡󰰹\u000f󸵅􋞼\"Mr\u0011)m𛊌\u000e𩾩`B\u000c𥫂{𦮍\u0018:i*9\u0002􋨱k\u0008󱞤{􋮱`Tpp􍵜\u0012Q\u0006󻗒􌺡󹻴\u0017S􌸓!3􍨓lꉋu)\u000c.Y𧅞\u0015z𝚡𩮼5:I\r6,\u000e$狌󽍠{􈊒(爬𒅀\n(𐢊󵩍𘌎Qz,)󾁲􂴮o􇝴 󱲸\u0003𩢫*p\\?7y#𠅧􀀺㷵N\u000e󳲢\\\u0007",
+    "name": "\u0002N\u0013\u001a0|`𡞚s\u0008Q`\u0017zT\rろw𢳫壣􌡔!qW\t\t#SL\u0007&󽌣\u000e􅋞e৬p􍙠𤂈\\􀥓􊇎󶰄\r%ꪸ\u0004t:󶇰\u0017痟󳔏\u000fLX%7\u0012蝱]\u0013􏑃\u0010􆎲C\u001c\u001a贐􁦧7+􈘆\u001a{tV󿵁U@󶭷^)e=\u000fr\u001es\u001eB3^缽FjKv.\u001a𩄣#",
+    "summary": "jTPNu\u0015>𮛤s\u000c\u0001\\kh&A)'&\r1z贐V\u0018C􋜫O",
     "tags": [
         "audio",
         "education",
         "weather"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_20.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_20.json
index 86ae7828736..ccd58adb6f7 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_20.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_20.json
@@ -5,13 +5,13 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "𫸍",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "\u0019",
+            "size": "complete",
             "type": "image"
         }
     ],
@@ -20,4 +20,4 @@
         "education",
         "graphics"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_3.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_3.json
index 2ab21ef80ae..551074fd629 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_3.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_3.json
@@ -1,23 +1,23 @@
 {
-    "summary": "t𗚞j:;󵡳󸹧\n󳫏\u001e\u0013\u0004<\u0016􋍶xb䡶3𒑱u@G󳥻L􃡐ar𤎳󺑋⮱G L8U\rauh|J𠕐㰂",
     "assets": [
         {
-            "size": "preview",
             "key": "t𘠊",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000cu\u001f",
+            "size": "preview",
             "type": "image"
         }
     ],
+    "summary": "t𗚞j:;󵡳󸹧\n󳫏\u001e\u0013\u0004<\u0016􋍶xb䡶3𒑱u@G󳥻L􃡐ar𤎳󺑋⮱G L8U\rauh|J𠕐㰂",
     "tags": [
         "graphics"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_4.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_4.json
index eeaa7b61e81..b95439f7d39 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_4.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_4.json
@@ -1,10 +1,8 @@
 {
-    "summary": "s𮎕𬨌󵍹7(𧳁><sm𭕞\u0015vK`\u000c\u0010o@$>n\u001dFQ\u0015L\u0011Scj5yq9+\rj\u001b􃼤!_'9Q_}0WG.jJ%BrYQ󷋏T16{B𢺇𞡘d*V󺎒gYu𧤭4^b6x2y𤋐>[\u001e",
-    "name": "𗠥𥯙+\u0006𫷖d􇻰4𘟦N\u0007-P󶳐\u001b)\r~\u0015O\u0004\u001a.\u0013\n􁨔\r􍤳0&\u000b\u0002\u0007p7\u0003-\u0004~􉦷\u001e\u0000eB",
     "assets": [
         {
-            "size": "complete",
             "key": "h",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -13,9 +11,11 @@
         }
     ],
     "description": "<􊉌#FE􉊚s*!\u0014;簜^WMr􂿢8RB\u0015🞇󵾾$\t,C\u00030⬾󹶕檖j\\nF𪱹W􏱊7\u000e@𗅕w\u0005*g>=-m+📽󳡭JpQGB󾽕4􂹲\u0001!'w*M;c\u0005𘈔󴼖3)R璛sZVy\u0010V\u0003𣌉\u001f\u0019J08\u0012\\\u0005􈂖󴛣a󸣵$\u001at𬔻\u0013f=𢢙%:!\\6𪍫\u0007ES󸉶;|𐠯󿙫*統@1p*Y;uGE􅅶e􍍈\u000c5\u0001WA\u0005|\u0001\u001b󶡒4:*}$7]Z{/*\u0013`\u0002&𦃂P\t􁇳N\u0016RL&\u000f𩐨\u001fs𧧺c2t\u0000\u0001)构2/rm􀪁wkD>}􅓾\u0000\u0010👄𫨧1%󵢻\ra諅J㐄䳯,􁽮\nU\u0015Y󶶉􂠗-#!\u00163𮧩𔑲z\u001bl!`\u0013e􍉀\t}GW[P\u001b󵒄𮑝[􃈙\u001bJF哓9RA􄻔\"\t7[􏚼\n5\u0015~mEU<\nL|)&.Cu5T𝤶 y>⑆$^덬",
+    "name": "𗠥𥯙+\u0006𫷖d􇻰4𘟦N\u0007-P󶳐\u001b)\r~\u0015O\u0004\u001a.\u0013\n􁨔\r􍤳0&\u000b\u0002\u0007p7\u0003-\u0004~􉦷\u001e\u0000eB",
+    "summary": "s𮎕𬨌󵍹7(𧳁><sm𭕞\u0015vK`\u000c\u0010o@$>n\u001dFQ\u0015L\u0011Scj5yq9+\rj\u001b􃼤!_'9Q_}0WG.jJ%BrYQ󷋏T16{B𢺇𞡘d*V󺎒gYu𧤭4^b6x2y𤋐>[\u001e",
     "tags": [
         "books",
         "business",
         "social"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_5.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_5.json
index 14395b3b7ab..84e3f829c6c 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_5.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_5.json
@@ -1,10 +1,8 @@
 {
-    "summary": "䪯J?%􈶫M#pwC\u0005󺜙􋂗s0`H㿸󺟸P􇒯j\u0019)<\u0012;\u0008\u0014Ei􌟃\u001d\u0007􉑲m󻑞𤖙LZ㛘",
-    "name": "됛𗛾^Q\u000bLMRojx{\u0010\u0001)m茥o薃m",
     "assets": [
         {
-            "size": "complete",
             "key": "7_",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -12,8 +10,8 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "䭙u9",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -21,20 +19,22 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "󷤅\u0010",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "󵋬쭫󰩵",
+            "size": "preview",
             "type": "image"
         }
     ],
     "description": "\u0017I\\.z𗥢\u0018QaIC􄄵罱輁k􊙄J\u001a8/𛁻",
+    "name": "됛𗛾^Q\u000bLMRojx{\u0010\u0001)m茥o薃m",
+    "summary": "䪯J?%􈶫M#pwC\u0005󺜙􋂗s0`H㿸󺟸P􇒯j\u0019)<\u0012;\u0008\u0014Ei􌟃\u001d\u0007􉑲m󻑞𤖙LZ㛘",
     "tags": [
         "media",
         "shopping",
         "sports"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_6.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_6.json
index a4d893d4665..e453bc425b3 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_6.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_6.json
@@ -1,16 +1,16 @@
 {
-    "summary": "_􋏚U(\u000c\u0006\u0017mdi􀉝@󽫤`\u0012B\u0013NSo\u0002𧟣퇟fRY)􂃛\u001a\u0018:G,N.1*\u000c\u000e.\r\u0018􉖌𣽔𘊘郃􋽔䌞10lK󶂄9𧵋\n\u0006sm4\u00120\u0019GN\u00126rz榳dO\r\"􅪪{\u0017c",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
     ],
     "description": "f\u000f4 􃤂|󳇿;T𢃹E\u0015(Qp!X<#\u0017A\u0000uW곘cis\u000c<?鮀𭛽󰟨>=~Cۄ󺶝N𧠐S\u0001󱏃;\u00042\u000cA&𭴮@RHN󷃥𡣠\u001542!#qAM1I\tu𝗏\u0008\t䰠Q\u0006Di🌤tX󱷊􍛨EI\u000f\u001b\u0008K\u001d\u0000o󾺍k\u0010𭭩󵤙Z\u0018I⥢l󿆋𡧘jg]\u001a􌦒􇌇 +e'u1\u0007o𪸟e\u001f1\t☄⑤0-d-UJTP􊧄W~𭀭7􌅂tly􉞐똠Ozw\tH\nW􃠮d:E\u0015@\u0010􉗭f#=𗵉1g!]􀩕􁱧pz𓋾OA􂂚,\\xDL\u0018􅾳\u0016eF*s_/\u000c25 􉨷\u0019􁆼󰼂Aj5𒒺\u0010㋀eDbG\u001a`𐒧uW@ᩬ\u00132q-pq\u0012%j\u001b\u0019q󲣲𥢙v\u001b/􀗔|\u0011,w\u0003-掙K󿼼\u001f\n:𘈼􍈔\u001e𢪸􀡲 4𖭘MxyOMq9~c􈎽󺿺!\u001eQ疣ql ?>\u0017𤣂>(\u0004\t>侰A􇥡/c O]\u0003>}\u0015􅥒𒔓\u0003􀆊%g\u001bWc𥗄B𩱮\u001bc!Aq󿍐aᱵ𬈇𦂻𗩖𨵉𪺊떰\u0010as;㗫󺦍Z[Fs𬄡*m\u000f\n\u0011\t𥽂ML\nX\tTD+\u000e􎖏]a3􈗵&i󴍫:X\u0018󴝂s|\u0007z-􌄖\u0000𭸁\u0018\u0018/\u0006@v𤲂󶬗^o𮩲$+k\u0004)>\u001c",
+    "summary": "_􋏚U(\u000c\u0006\u0017mdi􀉝@󽫤`\u0012B\u0013NSo\u0002𧟣퇟fRY)􂃛\u001a\u0018:G,N.1*\u000c\u000e.\r\u0018􉖌𣽔𘊘郃􋽔䌞10lK󶂄9𧵋\n\u0006sm4\u00120\u0019GN\u00126rz榳dO\r\"􅪪{\u0017c",
     "tags": [
         "movies",
         "news",
         "video"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_7.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_7.json
index 33d9fab09ef..e7b1a0ace0d 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_7.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_7.json
@@ -1,8 +1,8 @@
 {
-    "summary": "-4𦸹yV<𘎥I\u001eO@\u0014\"I](\rb\\\u0011xⲱ<\u0010}3\u0018󹎦=㯯𨬂cG]󵘞T1,\u0018\u0017\u0003?Hzy'??\u0003𢽗󶓘I𗂾𨃗7𡴽7A䙴`D\u0011\u0016𭽉\u0016\"\u0013\u0005\u0002|'Jn夳q\u0005a\u0006xP-\u0005賓4\u0000\u00152爣j\u0012jet\u001c=鰣$\u0013\u0017\u0008\u000f-𭴊𡎔\u000f1L\t,Aᡟ㑒\u0012*mG턆jC\u000f{\u000bu\u0008𝐣",
-    "name": "璦{/\u000fW\u001b^ V`uC",
     "description": "\u0007昪;𐡳u𡲪\u001d~v\u000f􎿡\u000bm󶮽7Ff踊𝣈/:\u000f!K/K󶮙H\"C\u0018H\u0016u{貟,p!;y􁦏屌P\u000f􃕋\u001cC󿲖Hi>q􎧷v\u001d𧠳1i8\u000f𑲖Yqﰫu𐳕_􋄳9*\u000ea.b\u0014t\u0005􍢩\u000b6휤𤀆H6p%\u0015:yW9(bG㱺FZ2U';􎍋,\r~OSXi\\YulJl칿7𦃘\u001dUVU>󾹾\u0010􆨴􎱪􇫫􋣸486𞥅x;Q\u000f\u001d\u0019󺞎\u001d8\"𢀽\u0013\u000e!{\n􂼮\u001dS𩣬f%!?󱘦󽫼]\u0010􌉘􎀴D荸p\u000fM󸮿\u0004𗍍wQ1 􌨅fR\u0003延𪫐'-\u00162𦙻SY䴧|}􏷁O𧚌-CuT/໔􀓟M􁮸\u0003[禤𣳔H =\u001eM_􉟫b𦝬𤃹:쏇ả@|􍜕\u001f𨦀\u0006\u0001𗺖󻜀<2닙{v줧NPJG丆g\u0011r5{􇍺󷾏𦷰o>\u0008\u0004􍑠H􆯳W\u000c\u0004<\u00104W#RP\\4\u00154b\u0001\u0019%~t$􆆑􈹘TML)\"I􉠮ꘘeD^􆧭(󸸢𠱘\u0014\u0006􎱾\u000e\t\u0014=󻮍m8\u000cT󶲎B𪮟󻌤\u0006\u0016>5𣚑4)e+𣍟(󾩻Fr󻱌Jp(}TNLO4\u0000?cL\u0002e_㲵`~䑝s1R]x\u0002i\u0019\u0007\u0018\u001baz[*\u001dFd󻑭88󹭥]H\u0000󲵑𫆤$􄅞󲛚\u0004VO+􍌏璞􀖓2s󱖸+0𥳇\u001e\u001f󻾰𐧜폟&en㎈e𪆫w-X\u0015)🅄x(g󶓔\u001aGX\tOh2g'CYU&0W{47𤠨\u0016삫qOw\u001b\u0000󽼳=\u0015O窂_蓃35\u001f",
+    "name": "璦{/\u000fW\u001b^ V`uC",
+    "summary": "-4𦸹yV<𘎥I\u001eO@\u0014\"I](\rb\\\u0011xⲱ<\u0010}3\u0018󹎦=㯯𨬂cG]󵘞T1,\u0018\u0017\u0003?Hzy'??\u0003𢽗󶓘I𗂾𨃗7𡴽7A䙴`D\u0011\u0016𭽉\u0016\"\u0013\u0005\u0002|'Jn夳q\u0005a\u0006xP-\u0005賓4\u0000\u00152爣j\u0012jet\u001c=鰣$\u0013\u0017\u0008\u000f-𭴊𡎔\u000f1L\t,Aᡟ㑒\u0012*mG턆jC\u000f{\u000bu\u0008𝐣",
     "tags": [
         "weather"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_8.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_8.json
index f42ebc9db05..985e98ba599 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_8.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_8.json
@@ -1,9 +1,9 @@
 {
-    "summary": "$𧤣\u0017\u0006+먼k㉐O>Gk𫕄)􌢮iu􃽏U$󶝹0T:K",
     "name": "r󿍮x\u001b03\u0010=􅨸#𩕆\u0003~2v`󶼰\u0006%<8􉘩<\"󺛣:\t#5c󵜾굈1K\u0015󷬯IT􎯅G\n\u0016*m\u0015󽪲7󴘅s}^ﭝ8x\u000eL󾌟\u000ev􄒩[$Ṱ󳟔jC󴇥>Sk+𩉢,U􋸅o:?(\u0004󿡜I<𦌙달􉉟\u0019:𨙢QgrP\u0016>\u000e^,@DL󸷨e8􂺎3V􉈨i\u00134IjT􌔙T󺸮\u0003\u0010\u001e󻨹\u0014\r",
+    "summary": "$𧤣\u0017\u0006+먼k㉐O>Gk𫕄)􌢮iu􃽏U$󶝹0T:K",
     "tags": [
         "business",
         "photography",
         "tutorial"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UpdateService_provider_9.json b/libs/wire-api/test/golden/testObject_UpdateService_provider_9.json
index 052cc6007d7..3f5156f32de 100644
--- a/libs/wire-api/test/golden/testObject_UpdateService_provider_9.json
+++ b/libs/wire-api/test/golden/testObject_UpdateService_provider_9.json
@@ -1,30 +1,28 @@
 {
-    "summary": "なk鞉\u001e󶕩ww.\u001c􁊟V􇎊K?v\u000b凉&𤒉E]V𢈧𩴟剋\u0004]&f𩸰/􈿸`􁄔\u000cE(\u00119ṕ\u0000\u0018ufg󿎶攥풭𬰰(𥐊\\ᑊ#\u0004Q𬳸啰\\𨓭'K1\u0000>6T<0뚁󹳷Kl\u0015}p`􎚿g􇖋\t\tG𬅧󰩀􏶟b@4};𣢢u\u001d&E빜",
-    "name": "ur󲤠$[9\r88\u000c\u001cPI5\u0012󽐙3B\u0011~󼃇H(\u0016Zl𒅿T9*\n󿍘Y􀯍ua󿤹^qVb󰀶\u00152S=(Zdm<I🍜􈕿𒑚aiBT靹n\u0003\u001bTnq77%\u0015\u0007~5\u000c󿔅s",
     "assets": [
         {
-            "size": "preview",
             "key": "𒑢􋮶",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u000e",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "`",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "N红$",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -32,8 +30,10 @@
             "type": "image"
         }
     ],
+    "name": "ur󲤠$[9\r88\u000c\u001cPI5\u0012󽐙3B\u0011~󼃇H(\u0016Zl𒅿T9*\n󿍘Y􀯍ua󿤹^qVb󰀶\u00152S=(Zdm<I🍜􈕿𒑚aiBT靹n\u0003\u001bTnq77%\u0015\u0007~5\u000c󿔅s",
+    "summary": "なk鞉\u001e󶕩ww.\u001c􁊟V􇎊K?v\u000b凉&𤒉E]V𢈧𩴟剋\u0004]&f𩸰/􈿸`􁄔\u000cE(\u00119ṕ\u0000\u0018ufg󿎶攥풭𬰰(𥐊\\ᑊ#\u0004Q𬳸啰\\𨓭'K1\u0000>6T<0뚁󹳷Kl\u0015}p`􎚿g􇖋\t\tG𬅧󰩀􏶟b@4};𣢢u\u001d&E빜",
     "tags": [
         "audio",
         "shopping"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_1.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_1.json
index 386d07e4d6f..85f5d3ff902 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_1.json
@@ -2,7 +2,7 @@
     "00000552-0000-7ae9-0000-5c84000004dd": {
         "0": 0,
         "1": -1,
-        "4": 3,
-        "3": -3
+        "3": -3,
+        "4": 3
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_10.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_10.json
index 452e06b6973..9fa4b20818d 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_10.json
@@ -1,20 +1,20 @@
 {
-    "00000002-0000-0003-0000-000200000003": {
-        "0": 0,
-        "1": 0
+    "00000001-0000-0003-0000-000200000003": {
+        "b": -1
     },
+    "00000001-0000-0004-0000-000000000000": {},
     "00000001-0000-0004-0000-000400000000": {
         "0": 0,
         "1": -1
     },
-    "00000004-0000-0004-0000-000400000000": {
-        "1": 2
-    },
-    "00000001-0000-0004-0000-000000000000": {},
-    "00000001-0000-0003-0000-000200000003": {
-        "b": -1
+    "00000002-0000-0003-0000-000200000003": {
+        "0": 0,
+        "1": 0
     },
     "00000003-0000-0000-0000-000300000003": {
         "7": -5
+    },
+    "00000004-0000-0004-0000-000400000000": {
+        "1": 2
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_11.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_11.json
index d8dc00b3aaa..e48ebc6b0fd 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_11.json
@@ -2,13 +2,13 @@
     "00000001-0000-001b-0000-000200000004": {
         "38": -3
     },
-    "0000000e-0000-001b-0000-000800000011": {
-        "0": 0,
-        "1": -1
-    },
     "00000007-0000-001b-0000-000700000017": {
         "1": 0,
         "2": 2,
         "3": -3
+    },
+    "0000000e-0000-001b-0000-000800000011": {
+        "0": 0,
+        "1": -1
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_12.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_12.json
index 0c0f9802167..ef9209eae04 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_12.json
@@ -1,21 +1,21 @@
 {
-    "00000008-0000-0007-0000-000000000005": {
-        "0": 0,
-        "1": 0
+    "00000004-0000-0002-0000-000600000005": {
+        "1": -2,
+        "2": -1
     },
     "00000005-0000-0006-0000-000700000006": {
         "5": 6
     },
     "00000007-0000-0000-0000-000000000005": {
-        "4": -3,
-        "3": 3
-    },
-    "00000004-0000-0002-0000-000600000005": {
-        "1": -2,
-        "2": -1
+        "3": 3,
+        "4": -3
     },
     "00000007-0000-0000-0000-000100000005": {
         "0": 0,
         "1": 0
+    },
+    "00000008-0000-0007-0000-000000000005": {
+        "0": 0,
+        "1": 0
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_13.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_13.json
index 3be8bf75922..dbf912b533d 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_13.json
@@ -1,10 +1,10 @@
 {
+    "00000005-0000-0005-0000-000400000004": {},
     "00000008-0000-000d-0000-00040000000d": {
-        "d": -5,
-        "9": -3
+        "9": -3,
+        "d": -5
     },
-    "00000005-0000-0005-0000-000400000004": {},
     "00000008-0000-0011-0000-000b0000000f": {
         "98": 1
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_14.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_14.json
index 6e24c005984..2b4ca2e5c02 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_14.json
@@ -1,22 +1,22 @@
 {
-    "00000003-0000-0004-0000-000000000003": {
+    "00000000-0000-0003-0000-000400000001": {
+        "0": 0
+    },
+    "00000001-0000-0000-0000-000300000004": {
         "0": 0,
         "1": 0
     },
-    "00000002-0000-0004-0000-000100000004": {
-        "0": 1,
-        "1": -2
-    },
     "00000001-0000-0001-0000-000100000002": {},
-    "00000000-0000-0003-0000-000400000001": {
-        "0": 0
-    },
     "00000002-0000-0004-0000-000000000000": {
         "0": 1,
         "1": -1
     },
-    "00000001-0000-0000-0000-000300000004": {
+    "00000002-0000-0004-0000-000100000004": {
+        "0": 1,
+        "1": -2
+    },
+    "00000003-0000-0004-0000-000000000003": {
         "0": 0,
         "1": 0
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_15.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_15.json
index eacd83a24de..267957e536e 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_15.json
@@ -1,10 +1,10 @@
 {
-    "00000008-0000-0004-0000-000000000002": {},
-    "00000005-0000-0000-0000-000600000002": {
-        "1b": -7
-    },
+    "00000000-0000-0006-0000-000800000007": {},
     "00000003-0000-0003-0000-000500000000": {
         "c": -2
     },
-    "00000000-0000-0006-0000-000800000007": {}
-}
\ No newline at end of file
+    "00000005-0000-0000-0000-000600000002": {
+        "1b": -7
+    },
+    "00000008-0000-0004-0000-000000000002": {}
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_16.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_16.json
index a172afe514d..fd6257f94a8 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_16.json
@@ -1,25 +1,25 @@
 {
-    "00000001-0000-0001-0000-000200000002": {
-        "0": 0,
-        "1": 0
-    },
     "00000000-0000-0001-0000-000000000001": {},
-    "00000001-0000-0000-0000-000100000000": {},
     "00000000-0000-0001-0000-000100000000": {
         "0": -1,
         "1": -1
     },
-    "00000001-0000-0002-0000-000200000001": {
-        "0": -1
+    "00000000-0000-0001-0000-000200000001": {},
+    "00000000-0000-0002-0000-000100000001": {
+        "2": -3
     },
+    "00000001-0000-0000-0000-000100000000": {},
     "00000001-0000-0001-0000-000000000001": {
         "1": 2
     },
-    "00000002-0000-0001-0000-000200000000": {
-        "3": 1
+    "00000001-0000-0001-0000-000200000002": {
+        "0": 0,
+        "1": 0
     },
-    "00000000-0000-0002-0000-000100000001": {
-        "2": -3
+    "00000001-0000-0002-0000-000200000001": {
+        "0": -1
     },
-    "00000000-0000-0001-0000-000200000001": {}
-}
\ No newline at end of file
+    "00000002-0000-0001-0000-000200000000": {
+        "3": 1
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_17.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_17.json
index 1744df6fbec..37bf6a47250 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_17.json
@@ -1,8 +1,4 @@
 {
-    "00000014-0000-0018-0000-001f00000002": {
-        "0": 0,
-        "1": 0
-    },
     "00000000-0000-000f-0000-000400000014": {
         "0": 2,
         "1": 1
@@ -11,5 +7,9 @@
         "0": 2,
         "1": 0,
         "2": 0
+    },
+    "00000014-0000-0018-0000-001f00000002": {
+        "0": 0,
+        "1": 0
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_18.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_18.json
index 1d643279ad9..4ba21835b01 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_18.json
@@ -1,18 +1,18 @@
 {
+    "00000000-0000-0001-0000-000800000008": {},
+    "00000003-0000-0002-0000-000500000002": {
+        "0": 0,
+        "1": 0
+    },
     "00000006-0000-0001-0000-000100000001": {
-        "4": 3,
-        "2": -1
+        "2": -1,
+        "4": 3
     },
     "00000008-0000-0006-0000-000800000008": {
         "0": 1
     },
-    "00000000-0000-0001-0000-000800000008": {},
     "00000008-0000-0008-0000-000700000003": {
         "1": 2,
         "2": -2
-    },
-    "00000003-0000-0002-0000-000500000002": {
-        "0": 0,
-        "1": 0
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_19.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_19.json
index ca2ae51272e..71f4cd1a15f 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_19.json
@@ -1,8 +1,8 @@
 {
-    "00000002-0000-0008-0000-000300000008": {},
     "00000000-0000-0005-0000-000800000002": {},
+    "00000002-0000-0007-0000-000100000002": {},
     "00000002-0000-0008-0000-000300000006": {
         "12": 6
     },
-    "00000002-0000-0007-0000-000100000002": {}
-}
\ No newline at end of file
+    "00000002-0000-0008-0000-000300000008": {}
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_2.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_2.json
index bd221d18adc..020445e96e5 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_2.json
@@ -6,4 +6,4 @@
     "00000038-0000-004a-0000-007700000000": {
         "dfd": -8
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_20.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_20.json
index aaab0086544..9d869a5d915 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_20.json
@@ -1,17 +1,17 @@
 {
-    "00000001-0000-0001-0000-000000000000": {},
-    "00000001-0000-0000-0000-000000000001": {},
+    "00000000-0000-0000-0000-000000000001": {},
+    "00000000-0000-0000-0000-000100000000": {},
+    "00000000-0000-0000-0000-000100000001": {},
+    "00000000-0000-0001-0000-000000000000": {},
     "00000000-0000-0001-0000-000000000001": {},
-    "00000001-0000-0000-0000-000100000000": {},
     "00000000-0000-0001-0000-000100000000": {},
-    "00000000-0000-0000-0000-000100000001": {},
-    "00000001-0000-0001-0000-000100000001": {},
-    "00000000-0000-0000-0000-000100000000": {},
-    "00000001-0000-0001-0000-000100000000": {},
-    "00000000-0000-0000-0000-000000000001": {},
-    "00000001-0000-0001-0000-000000000001": {},
+    "00000000-0000-0001-0000-000100000001": {},
     "00000001-0000-0000-0000-000000000000": {},
-    "00000000-0000-0001-0000-000000000000": {},
+    "00000001-0000-0000-0000-000000000001": {},
+    "00000001-0000-0000-0000-000100000000": {},
     "00000001-0000-0000-0000-000100000001": {},
-    "00000000-0000-0001-0000-000100000001": {}
-}
\ No newline at end of file
+    "00000001-0000-0001-0000-000000000000": {},
+    "00000001-0000-0001-0000-000000000001": {},
+    "00000001-0000-0001-0000-000100000000": {},
+    "00000001-0000-0001-0000-000100000001": {}
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_3.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_3.json
index 8b88b75cac8..88a59b2a56e 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_3.json
@@ -1,5 +1,5 @@
 {
-    "00000018-0000-0020-0000-000e00000002": {
+    "0000000e-0000-001d-0000-00160000000b": {
         "0": 0,
         "1": 0
     },
@@ -7,8 +7,8 @@
         "4": -5,
         "9": 1
     },
-    "0000000e-0000-001d-0000-00160000000b": {
+    "00000018-0000-0020-0000-000e00000002": {
         "0": 0,
         "1": 0
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_4.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_4.json
index 32911771510..d6eb4e87aee 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_4.json
@@ -1,16 +1,16 @@
 {
-    "00000004-0000-0003-0000-000300000008": {},
+    "00000000-0000-0003-0000-000100000000": {},
+    "00000003-0000-0002-0000-000500000002": {
+        "0": 1,
+        "1": 1
+    },
     "00000003-0000-0005-0000-000800000001": {
         "0": 0,
         "1": 0
     },
-    "00000000-0000-0003-0000-000100000000": {},
+    "00000004-0000-0003-0000-000300000008": {},
     "00000007-0000-0008-0000-000100000006": {
         "0": -2,
         "3": 1
-    },
-    "00000003-0000-0002-0000-000500000002": {
-        "0": 1,
-        "1": 1
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_5.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_5.json
index ad1bb56b851..3c9c01f6ae0 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_5.json
@@ -1,13 +1,13 @@
 {
-    "00000006-0000-0008-0000-000600000003": {},
-    "00000008-0000-0008-0000-000300000008": {
-        "0": 0,
-        "1": 1
+    "00000000-0000-0004-0000-000400000005": {
+        "17": -7
     },
     "00000003-0000-0006-0000-000100000000": {
         "2": 4
     },
-    "00000000-0000-0004-0000-000400000005": {
-        "17": -7
+    "00000006-0000-0008-0000-000600000003": {},
+    "00000008-0000-0008-0000-000300000008": {
+        "0": 0,
+        "1": 1
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_6.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_6.json
index 4b392943b3d..3516a6015d2 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_6.json
@@ -1,12 +1,12 @@
 {
+    "0000004d-0000-001f-0000-006300000073": {
+        "1": 0,
+        "2": -3,
+        "4": -1
+    },
     "0000007c-0000-0075-0000-006000000025": {
         "8": 0,
         "c": 3,
         "f": 1
-    },
-    "0000004d-0000-001f-0000-006300000073": {
-        "1": 0,
-        "4": -1,
-        "2": -3
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_7.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_7.json
index c10655c35bf..0a86ef052c9 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_7.json
@@ -1,21 +1,21 @@
 {
+    "00000000-0000-0000-0000-000200000000": {
+        "0": 0
+    },
     "00000000-0000-0001-0000-000000000001": {},
-    "00000002-0000-0001-0000-000000000002": {},
+    "00000000-0000-0002-0000-000200000002": {
+        "0": -2
+    },
     "00000001-0000-0001-0000-000000000001": {
         "0": 0,
         "1": 0
     },
-    "00000000-0000-0002-0000-000200000002": {
-        "0": -2
-    },
-    "00000000-0000-0000-0000-000200000000": {
-        "0": 0
+    "00000001-0000-0002-0000-000100000001": {
+        "0": -1,
+        "1": 0
     },
     "00000002-0000-0000-0000-000000000001": {
         "2": 1
     },
-    "00000001-0000-0002-0000-000100000001": {
-        "0": -1,
-        "1": 0
-    }
-}
\ No newline at end of file
+    "00000002-0000-0001-0000-000000000002": {}
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_8.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_8.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_8.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_9.json b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_9.json
index 1dc6efedc5e..3891b596d11 100644
--- a/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UserClientMap_20Int_user_9.json
@@ -1,8 +1,8 @@
 {
+    "00000054-0000-003b-0000-00210000005f": {},
     "00000065-0000-0040-0000-005f00000064": {
         "0": 2,
         "1": -2,
         "2": -2
-    },
-    "00000054-0000-003b-0000-00210000005f": {}
-}
\ No newline at end of file
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_1.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_1.json
index 2125f5aaa9c..bf655f1ee47 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_1.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_1.json
@@ -1,17 +1,17 @@
 {
     "00000552-0000-7ae9-0000-5c84000004dd": {
         "0": {
-            "key": "M󻆳yx",
-            "id": 79
+            "id": 79,
+            "key": "M󻆳yx"
         },
         "1": {
-            "key": "\u0004h",
-            "id": 18
+            "id": 18,
+            "key": "\u0004h"
         },
+        "3": null,
         "4": {
-            "key": "\u001e\"􏱍o",
-            "id": 88
-        },
-        "3": null
+            "id": 88,
+            "key": "\u001e\"􏱍o"
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_2.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_2.json
index 915ef8485d0..b12ecc58460 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_2.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_2.json
@@ -1,18 +1,18 @@
 {
     "00000025-0000-0025-0000-00660000001d": {
         "3": {
-            "key": "\u0000\u0004Jn𧜘\u0006튺",
-            "id": 123
+            "id": 123,
+            "key": "\u0000\u0004Jn𧜘\u0006튺"
         },
         "9": {
-            "key": "9|j.Kp",
-            "id": 88
+            "id": 88,
+            "key": "9|j.Kp"
         }
     },
     "00000038-0000-004a-0000-007700000000": {
         "dfd": {
-            "key": "𮈉a\u0008ZS\u000e\",h󲩍j%",
-            "id": 23
+            "id": 23,
+            "key": "𮈉a\u0008ZS\u000e\",h󲩍j%"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_3.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_3.json
index 2e4170bc2fa..ef126e0fced 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_3.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_3.json
@@ -1,32 +1,32 @@
 {
-    "00000018-0000-0020-0000-000e00000002": {
+    "0000000e-0000-001d-0000-00160000000b": {
         "0": {
-            "key": "!@hb",
-            "id": 58
+            "id": 109,
+            "key": "\u0010Ba\u0002\u0000\u001f3"
         },
         "1": {
-            "key": "突?#\u0014k",
-            "id": 110
+            "id": 79,
+            "key": "M󻆳yx"
         }
     },
     "00000013-0000-000d-0000-000600000007": {
         "4": {
-            "key": "\u0007\u001a\tA𭦢5q􍄴7",
-            "id": 110
+            "id": 110,
+            "key": "\u0007\u001a\tA𭦢5q􍄴7"
         },
         "9": {
-            "key": "n2LjT􋩮)R\u0010",
-            "id": 12
+            "id": 12,
+            "key": "n2LjT􋩮)R\u0010"
         }
     },
-    "0000000e-0000-001d-0000-00160000000b": {
+    "00000018-0000-0020-0000-000e00000002": {
         "0": {
-            "key": "\u0010Ba\u0002\u0000\u001f3",
-            "id": 109
+            "id": 58,
+            "key": "!@hb"
         },
         "1": {
-            "key": "M󻆳yx",
-            "id": 79
+            "id": 110,
+            "key": "突?#\u0014k"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_4.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_4.json
index d1bcc97390a..afc4a5b364c 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_4.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_4.json
@@ -1,34 +1,34 @@
 {
-    "00000004-0000-0003-0000-000300000008": {},
-    "00000003-0000-0005-0000-000800000001": {
+    "00000000-0000-0003-0000-000100000000": {},
+    "00000003-0000-0002-0000-000500000002": {
         "0": {
-            "key": "\u0007\u001a\tA𭦢5q􍄴7",
-            "id": 110
+            "id": 79,
+            "key": "M󻆳yx"
         },
         "1": {
-            "key": "",
-            "id": 88
+            "id": 82,
+            "key": "<o􈀗(n󿀕\tj󸤦w􍬕`"
         }
     },
-    "00000000-0000-0003-0000-000100000000": {},
-    "00000007-0000-0008-0000-000100000006": {
+    "00000003-0000-0005-0000-000800000001": {
         "0": {
-            "key": "𧮘峰$<I|k\u0016\u000eZx\u0002應",
-            "id": 128
+            "id": 110,
+            "key": "\u0007\u001a\tA𭦢5q􍄴7"
         },
-        "3": {
-            "key": "9|j.Kp",
-            "id": 88
+        "1": {
+            "id": 88,
+            "key": ""
         }
     },
-    "00000003-0000-0002-0000-000500000002": {
+    "00000004-0000-0003-0000-000300000008": {},
+    "00000007-0000-0008-0000-000100000006": {
         "0": {
-            "key": "M󻆳yx",
-            "id": 79
+            "id": 128,
+            "key": "𧮘峰$<I|k\u0016\u000eZx\u0002應"
         },
-        "1": {
-            "key": "<o􈀗(n󿀕\tj󸤦w􍬕`",
-            "id": 82
+        "3": {
+            "id": 88,
+            "key": "9|j.Kp"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_5.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_5.json
index 2a32f2e075e..871faaceb0f 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_5.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_5.json
@@ -1,22 +1,22 @@
 {
+    "00000000-0000-0004-0000-000400000005": {
+        "17": null
+    },
+    "00000003-0000-0006-0000-000100000000": {
+        "2": {
+            "id": 110,
+            "key": "突?#\u0014k"
+        }
+    },
     "00000006-0000-0008-0000-000600000003": {},
     "00000008-0000-0008-0000-000300000008": {
         "0": {
-            "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-            "id": 52
+            "id": 52,
+            "key": "󷞱+@􏴇'\u0003\u000b\u0006"
         },
         "1": {
-            "key": "\u0001m)",
-            "id": 121
+            "id": 121,
+            "key": "\u0001m)"
         }
-    },
-    "00000003-0000-0006-0000-000100000000": {
-        "2": {
-            "key": "突?#\u0014k",
-            "id": 110
-        }
-    },
-    "00000000-0000-0004-0000-000400000005": {
-        "17": null
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_6.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_6.json
index 3646fc8d7f8..2921820b89d 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_6.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_6.json
@@ -1,27 +1,27 @@
 {
-    "0000007c-0000-0075-0000-006000000025": {
-        "8": {
-            "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-            "id": 52
-        },
-        "c": null,
-        "f": {
-            "key": "",
-            "id": 68
-        }
-    },
     "0000004d-0000-001f-0000-006300000073": {
         "1": {
-            "key": "\u0000\u0004Jn𧜘\u0006튺",
-            "id": 123
+            "id": 123,
+            "key": "\u0000\u0004Jn𧜘\u0006튺"
+        },
+        "2": {
+            "id": 12,
+            "key": "n2LjT􋩮)R\u0010"
         },
         "4": {
-            "key": "\u0004h",
-            "id": 18
+            "id": 18,
+            "key": "\u0004h"
+        }
+    },
+    "0000007c-0000-0075-0000-006000000025": {
+        "8": {
+            "id": 52,
+            "key": "󷞱+@􏴇'\u0003\u000b\u0006"
         },
-        "2": {
-            "key": "n2LjT􋩮)R\u0010",
-            "id": 12
+        "c": null,
+        "f": {
+            "id": 68,
+            "key": ""
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_7.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_7.json
index 49f5988b48e..83381003979 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_7.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_7.json
@@ -1,39 +1,39 @@
 {
-    "00000000-0000-0001-0000-000000000001": {},
-    "00000002-0000-0001-0000-000000000002": {},
-    "00000001-0000-0001-0000-000000000001": {
+    "00000000-0000-0000-0000-000200000000": {
         "0": {
-            "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-            "id": 52
-        },
-        "1": {
-            "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-            "id": 52
+            "id": 52,
+            "key": "󷞱+@􏴇'\u0003\u000b\u0006"
         }
     },
+    "00000000-0000-0001-0000-000000000001": {},
     "00000000-0000-0002-0000-000200000002": {
         "0": null
     },
-    "00000000-0000-0000-0000-000200000000": {
+    "00000001-0000-0001-0000-000000000001": {
         "0": {
-            "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-            "id": 52
-        }
-    },
-    "00000002-0000-0000-0000-000000000001": {
-        "2": {
-            "key": "\u0001m)",
-            "id": 121
+            "id": 52,
+            "key": "󷞱+@􏴇'\u0003\u000b\u0006"
+        },
+        "1": {
+            "id": 52,
+            "key": "󷞱+@􏴇'\u0003\u000b\u0006"
         }
     },
     "00000001-0000-0002-0000-000100000001": {
         "0": {
-            "key": "\u0004h",
-            "id": 18
+            "id": 18,
+            "key": "\u0004h"
         },
         "1": {
-            "key": "󷞱+@􏴇'\u0003\u000b\u0006",
-            "id": 52
+            "id": 52,
+            "key": "󷞱+@􏴇'\u0003\u000b\u0006"
         }
-    }
-}
\ No newline at end of file
+    },
+    "00000002-0000-0000-0000-000000000001": {
+        "2": {
+            "id": 121,
+            "key": "\u0001m)"
+        }
+    },
+    "00000002-0000-0001-0000-000000000002": {}
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_8.json b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_8.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_8.json
+++ b/libs/wire-api/test/golden/testObject_UserClientPrekeyMap_8.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_1.json b/libs/wire-api/test/golden/testObject_UserClients_user_1.json
index e1c14fc9474..e5a384dc1b3 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_1.json
@@ -1,23 +1,23 @@
 {
-    "00000001-0000-0001-0000-000000000000": [
-        "1"
-    ],
-    "00000001-0000-0000-0000-000000000001": [],
-    "00000000-0000-0001-0000-000100000000": [],
-    "00000000-0000-0000-0000-000100000001": [],
-    "00000001-0000-0001-0000-000100000001": [
-        "0"
-    ],
+    "00000000-0000-0000-0000-000000000001": [],
     "00000000-0000-0000-0000-000100000000": [
         "0",
         "1"
     ],
-    "00000000-0000-0000-0000-000000000001": [],
-    "00000001-0000-0000-0000-000000000000": [],
+    "00000000-0000-0000-0000-000100000001": [],
     "00000000-0000-0001-0000-000000000000": [
         "0",
         "1"
     ],
+    "00000000-0000-0001-0000-000100000000": [],
+    "00000000-0000-0001-0000-000100000001": [],
+    "00000001-0000-0000-0000-000000000000": [],
+    "00000001-0000-0000-0000-000000000001": [],
     "00000001-0000-0000-0000-000100000001": [],
-    "00000000-0000-0001-0000-000100000001": []
-}
\ No newline at end of file
+    "00000001-0000-0001-0000-000000000000": [
+        "1"
+    ],
+    "00000001-0000-0001-0000-000100000001": [
+        "0"
+    ]
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_10.json b/libs/wire-api/test/golden/testObject_UserClients_user_10.json
index 93a82371b0a..7b72f86c969 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_10.json
@@ -2,4 +2,4 @@
     "00007d35-0000-33bd-0000-377d000074fb": [
         "9824c7"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_11.json b/libs/wire-api/test/golden/testObject_UserClients_user_11.json
index c1e409e2fdb..ebc37ef1df1 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_11.json
@@ -1,31 +1,31 @@
 {
-    "00000001-0000-0001-0000-000000000000": [],
+    "00000000-0000-0000-0000-000000000002": [
+        "2"
+    ],
+    "00000000-0000-0000-0000-000100000000": [],
+    "00000000-0000-0000-0000-000200000001": [
+        "0"
+    ],
     "00000000-0000-0001-0000-000000000001": [
         "0"
     ],
-    "00000000-0000-0000-0000-000100000000": [],
-    "00000001-0000-0002-0000-000200000000": [
+    "00000000-0000-0002-0000-000000000001": [
         "0",
         "1"
     ],
     "00000001-0000-0000-0000-000100000001": [
         "2"
     ],
-    "00000000-0000-0000-0000-000000000002": [
-        "2"
-    ],
-    "00000002-0000-0001-0000-000100000001": [
-        "0",
-        "1"
-    ],
+    "00000001-0000-0001-0000-000000000000": [],
     "00000001-0000-0001-0000-000100000002": [
         "0"
     ],
-    "00000000-0000-0000-0000-000200000001": [
-        "0"
+    "00000001-0000-0002-0000-000200000000": [
+        "0",
+        "1"
     ],
-    "00000000-0000-0002-0000-000000000001": [
+    "00000002-0000-0001-0000-000100000001": [
         "0",
         "1"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_12.json b/libs/wire-api/test/golden/testObject_UserClients_user_12.json
index da8f854c0ac..cbe3f7cce50 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_12.json
@@ -6,4 +6,4 @@
         "b",
         "e"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_13.json b/libs/wire-api/test/golden/testObject_UserClients_user_13.json
index 07af331ca0e..a5fd02c6df8 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_13.json
@@ -5,4 +5,4 @@
         "1",
         "2"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_14.json b/libs/wire-api/test/golden/testObject_UserClients_user_14.json
index 426552b768b..1afefe4b4b8 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_14.json
@@ -4,4 +4,4 @@
         "1f",
         "a"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_15.json b/libs/wire-api/test/golden/testObject_UserClients_user_15.json
index 71d76c208ec..084198f8eca 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_15.json
@@ -3,4 +3,4 @@
         "6c",
         "946"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_16.json b/libs/wire-api/test/golden/testObject_UserClients_user_16.json
index 71ceaf76a44..4a5c3a6765b 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_16.json
@@ -1,5 +1,4 @@
 {
-    "00000005-0000-0002-0000-000100000006": [],
     "00000001-0000-0001-0000-000700000007": [],
     "00000002-0000-0005-0000-000600000007": [
         "0",
@@ -8,5 +7,6 @@
     "00000002-0000-0008-0000-000300000000": [
         "2",
         "4"
-    ]
-}
\ No newline at end of file
+    ],
+    "00000005-0000-0002-0000-000100000006": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_17.json b/libs/wire-api/test/golden/testObject_UserClients_user_17.json
index 60abf518783..126d5a9a410 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_17.json
@@ -9,4 +9,4 @@
         "3",
         "4"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_18.json b/libs/wire-api/test/golden/testObject_UserClients_user_18.json
index 7a3cc776189..aa449f09a4e 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_18.json
@@ -1,28 +1,28 @@
 {
-    "00000001-0000-0001-0000-000000000000": [],
-    "00000001-0000-0000-0000-000000000001": [
-        "0"
-    ],
-    "00000001-0000-0000-0000-000100000000": [
+    "00000000-0000-0000-0000-000000000000": [
         "1"
     ],
-    "00000000-0000-0001-0000-000100000000": [
-        "0"
+    "00000000-0000-0000-0000-000100000000": [
+        "1"
     ],
     "00000000-0000-0000-0000-000100000001": [
         "0",
         "1"
     ],
-    "00000001-0000-0001-0000-000100000001": [],
-    "00000000-0000-0000-0000-000000000000": [
-        "1"
+    "00000000-0000-0001-0000-000100000000": [
+        "0"
     ],
-    "00000000-0000-0000-0000-000100000000": [
+    "00000000-0000-0001-0000-000100000001": [],
+    "00000001-0000-0000-0000-000000000000": [],
+    "00000001-0000-0000-0000-000000000001": [
+        "0"
+    ],
+    "00000001-0000-0000-0000-000100000000": [
         "1"
     ],
-    "00000001-0000-0000-0000-000000000000": [],
     "00000001-0000-0000-0000-000100000001": [
         "1"
     ],
-    "00000000-0000-0001-0000-000100000001": []
-}
\ No newline at end of file
+    "00000001-0000-0001-0000-000000000000": [],
+    "00000001-0000-0001-0000-000100000001": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_19.json b/libs/wire-api/test/golden/testObject_UserClients_user_19.json
index eeba1d0221e..2eb554e2f65 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_19.json
@@ -1,3 +1,3 @@
 {
     "000025db-0000-66c4-0000-7f3f00001ba5": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_2.json b/libs/wire-api/test/golden/testObject_UserClients_user_2.json
index 8269fb21bf9..6aa3d281a1e 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_2.json
@@ -1,18 +1,18 @@
 {
-    "00000001-0000-0001-0000-000000000000": [],
-    "00000001-0000-0000-0000-000000000001": [],
-    "00000000-0000-0001-0000-000000000001": [],
-    "00000001-0000-0000-0000-000100000000": [],
-    "00000000-0000-0001-0000-000100000000": [],
-    "00000000-0000-0000-0000-000100000001": [],
-    "00000001-0000-0001-0000-000100000001": [],
     "00000000-0000-0000-0000-000000000000": [],
-    "00000000-0000-0000-0000-000100000000": [],
-    "00000001-0000-0001-0000-000100000000": [],
     "00000000-0000-0000-0000-000000000001": [],
-    "00000001-0000-0001-0000-000000000001": [],
-    "00000001-0000-0000-0000-000000000000": [],
+    "00000000-0000-0000-0000-000100000000": [],
+    "00000000-0000-0000-0000-000100000001": [],
     "00000000-0000-0001-0000-000000000000": [],
+    "00000000-0000-0001-0000-000000000001": [],
+    "00000000-0000-0001-0000-000100000000": [],
+    "00000000-0000-0001-0000-000100000001": [],
+    "00000001-0000-0000-0000-000000000000": [],
+    "00000001-0000-0000-0000-000000000001": [],
+    "00000001-0000-0000-0000-000100000000": [],
     "00000001-0000-0000-0000-000100000001": [],
-    "00000000-0000-0001-0000-000100000001": []
-}
\ No newline at end of file
+    "00000001-0000-0001-0000-000000000000": [],
+    "00000001-0000-0001-0000-000000000001": [],
+    "00000001-0000-0001-0000-000100000000": [],
+    "00000001-0000-0001-0000-000100000001": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_20.json b/libs/wire-api/test/golden/testObject_UserClients_user_20.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_20.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_3.json b/libs/wire-api/test/golden/testObject_UserClients_user_3.json
index 642d46d3e93..a336747c4eb 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_3.json
@@ -1,28 +1,28 @@
 {
-    "00000001-0000-0001-0000-000000000000": [
+    "00000000-0000-0000-0000-000000000000": [
+        "0"
+    ],
+    "00000000-0000-0000-0000-000000000001": [],
+    "00000000-0000-0000-0000-000100000000": [],
+    "00000000-0000-0000-0000-000100000001": [
+        "0"
+    ],
+    "00000000-0000-0001-0000-000000000000": [
         "1"
     ],
-    "00000001-0000-0000-0000-000000000001": [],
     "00000000-0000-0001-0000-000000000001": [
         "1"
     ],
+    "00000000-0000-0001-0000-000100000000": [],
+    "00000001-0000-0000-0000-000000000001": [],
     "00000001-0000-0000-0000-000100000000": [
         "0",
         "1"
     ],
-    "00000000-0000-0001-0000-000100000000": [],
-    "00000000-0000-0000-0000-000100000001": [
-        "0"
-    ],
-    "00000000-0000-0000-0000-000000000000": [
-        "0"
+    "00000001-0000-0001-0000-000000000000": [
+        "1"
     ],
-    "00000000-0000-0000-0000-000100000000": [],
     "00000001-0000-0001-0000-000100000000": [
         "0"
-    ],
-    "00000000-0000-0000-0000-000000000001": [],
-    "00000000-0000-0001-0000-000000000000": [
-        "1"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_4.json b/libs/wire-api/test/golden/testObject_UserClients_user_4.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_4.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_5.json b/libs/wire-api/test/golden/testObject_UserClients_user_5.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_5.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_6.json b/libs/wire-api/test/golden/testObject_UserClients_user_6.json
index 9e26dfeeb6e..0967ef424bc 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_6.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_7.json b/libs/wire-api/test/golden/testObject_UserClients_user_7.json
index a48cd2ce716..671bf0c9d33 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_7.json
@@ -1,28 +1,28 @@
 {
-    "00000001-0000-0000-0000-000000000001": [
-        "0",
-        "1"
-    ],
-    "00000000-0000-0001-0000-000000000001": [],
-    "00000001-0000-0002-0000-000100000002": [
-        "0",
-        "1"
-    ],
     "00000000-0000-0000-0000-000100000000": [],
+    "00000000-0000-0000-0000-000200000001": [],
     "00000000-0000-0001-0000-000000000000": [],
-    "00000001-0000-0001-0000-000200000000": [],
+    "00000000-0000-0001-0000-000000000001": [],
     "00000000-0000-0002-0000-000100000001": [
         "0"
     ],
+    "00000001-0000-0000-0000-000000000001": [
+        "0",
+        "1"
+    ],
+    "00000001-0000-0000-0000-000000000002": [
+        "2"
+    ],
     "00000001-0000-0000-0000-000100000002": [
         "2"
     ],
-    "00000002-0000-0001-0000-000100000001": [
+    "00000001-0000-0001-0000-000200000000": [],
+    "00000001-0000-0002-0000-000100000002": [
         "0",
         "1"
     ],
-    "00000000-0000-0000-0000-000200000001": [],
-    "00000001-0000-0000-0000-000000000002": [
-        "2"
+    "00000002-0000-0001-0000-000100000001": [
+        "0",
+        "1"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_8.json b/libs/wire-api/test/golden/testObject_UserClients_user_8.json
index f522f87166b..5090a539d69 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_8.json
@@ -1,24 +1,24 @@
 {
+    "00000000-0000-0000-0000-000100000000": [],
+    "00000000-0000-0000-0000-000200000000": [],
     "00000000-0000-0001-0000-000000000001": [
         "1"
     ],
     "00000000-0000-0001-0000-000100000000": [
         "3"
     ],
-    "00000002-0000-0001-0000-000200000001": [
-        "0",
-        "1"
-    ],
-    "00000000-0000-0000-0000-000100000000": [],
     "00000000-0000-0002-0000-000100000002": [
         "0",
         "1"
     ],
+    "00000002-0000-0001-0000-000000000000": [
+        "2"
+    ],
     "00000002-0000-0001-0000-000100000000": [
         "3"
     ],
-    "00000000-0000-0000-0000-000200000000": [],
-    "00000002-0000-0001-0000-000000000000": [
-        "2"
+    "00000002-0000-0001-0000-000200000001": [
+        "0",
+        "1"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserClients_user_9.json b/libs/wire-api/test/golden/testObject_UserClients_user_9.json
index 845a7c4e533..356b9b4d38f 100644
--- a/libs/wire-api/test/golden/testObject_UserClients_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UserClients_user_9.json
@@ -1,14 +1,14 @@
 {
-    "00000004-0000-0004-0000-000200000002": [],
     "00000000-0000-0000-0000-000200000002": [
         "0",
         "1"
     ],
-    "00000003-0000-0004-0000-000200000004": [
-        "2"
-    ],
     "00000000-0000-0004-0000-000300000003": [],
     "00000001-0000-0003-0000-000100000001": [
         "a"
-    ]
-}
\ No newline at end of file
+    ],
+    "00000003-0000-0004-0000-000200000004": [
+        "2"
+    ],
+    "00000004-0000-0004-0000-000200000002": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_1.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_1.json
index 58292c7463d..db9fd2888dd 100644
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserConnectionList_user_1.json
@@ -1,45 +1,21 @@
 {
     "connections": [
         {
-            "status": "pending",
             "conversation": null,
-            "to": "00000000-0000-0001-0000-000100000000",
             "from": "00000000-0000-0000-0000-000000000000",
             "last_update": "1864-05-09T06:44:37.367Z",
-            "message": "\u00188\u0002󼭔-󵈪z.a&Kho󴱐󺽾}9nF𪒲􁺜l\u0014q}\u001a\u0017󺋍m8#餑A􌡲􀲱}Z췅6r-/D*\u001fL󺄥􏻂D􆗉\u0019󹳬ꂛ%PZ5􅈬\\}퓞\u000fᖑ`󶡛'1xNcFhN|*󰵡\u0010\t瓏󺅎6\u0012/IK\u000e􁑑󸘟s𣽛\u0019BM*a󽈎~j\u000b#\u0011-D𭣺𘅁\u00057{𮓥N\u0017C!~😟EGS=\u0005󴋀\u000f󷙏ଡ଼b󸣚'K1\u0000E\u0002𧹴J1\u0000AI%툼QV&Z`O\u0019~Vu6t\"󸨦_I}a󻶚5󶡸Y#\u0017:U𢐵\u0007󼒭29^2t􆀜쥚dC𗏯\u0005\u0004\u001c,\"5.9;@\u0008`gl\u001dEp5\u0015\u0019.VYE_\u000c\u001a\u0004\u001c\u0005bRb;=􄷬󱰎a\u000en\u00151fF"
+            "message": "\u00188\u0002󼭔-󵈪z.a&Kho󴱐󺽾}9nF𪒲􁺜l\u0014q}\u001a\u0017󺋍m8#餑A􌡲􀲱}Z췅6r-/D*\u001fL󺄥􏻂D􆗉\u0019󹳬ꂛ%PZ5􅈬\\}퓞\u000fᖑ`󶡛'1xNcFhN|*󰵡\u0010\t瓏󺅎6\u0012/IK\u000e􁑑󸘟s𣽛\u0019BM*a󽈎~j\u000b#\u0011-D𭣺𘅁\u00057{𮓥N\u0017C!~😟EGS=\u0005󴋀\u000f󷙏ଡ଼b󸣚'K1\u0000E\u0002𧹴J1\u0000AI%툼QV&Z`O\u0019~Vu6t\"󸨦_I}a󻶚5󶡸Y#\u0017:U𢐵\u0007󼒭29^2t􆀜쥚dC𗏯\u0005\u0004\u001c,\"5.9;@\u0008`gl\u001dEp5\u0015\u0019.VYE_\u000c\u001a\u0004\u001c\u0005bRb;=􄷬󱰎a\u000en\u00151fF",
+            "status": "pending",
+            "to": "00000000-0000-0001-0000-000100000000"
         },
         {
-            "status": "accepted",
             "conversation": "00000000-0000-0000-0000-000100000000",
-            "to": "00000000-0000-0000-0000-000000000000",
             "from": "00000001-0000-0001-0000-000000000000",
             "last_update": "1864-05-09T00:43:52.049Z",
-            "message": "位\u0015O \u001ez𠥡\u001d󱼟𢎵\u00188:󺔂bQ(XKw}\u000c\t􏏙0䗼kx\u00070=󵥀;L\u000c*\u0010ko\u0019z^x2(󿛢\\ep뗂w𬸪71\n 3\u001d\u0004\u0004?z𥪟䏡->🛃a,𠟚j;-ﱻ\u0013󲨌(L\u0012󴃱\t{􋓊좙<P\u0019BᮄT$󺙓󹪽󿫑G󵤖)cᙋ􉫮a\"雴𤎇􋊕KS􊶞3㏧\u0019zO\u000f󹷕箱L@b𗀵\nW\u0003\u0001\u0015q󿓔𭕨􅂊AK."
-        },
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0000-0000-000000000001",
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T01:40:27.247Z",
-            "message": "f7T.󰂉mRM`F_\u000f.𣑑Z\u000f𢮕A~g}ໃc\"8𢷄\u0015K\u0007 z.6\u0013󸾬𥃯쒿\u0008_𬚮S%v{_"
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000001-0000-0000-0000-000100000000",
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T02:29:04.518Z",
-            "message": "Wz𮎋ONx\u000fB_𫃯t\u001fHu\r󿞗\u000cE愺[\u0017􎄲&󷚗-􊻒rCcyQ\u0011*􌫙\u001f􄶯\"\"^甬\u0017\u0010𭮣[j올ዿe$`5𘫟^\u0008􁯜\u0016捊)<\u001d􈼕䌫U􉴕d\u0017>Rϯ㛌Cf􌹾󲳨𬌸<\u0007\u001c𖨆𪐹ff..\u0015kY(𥓗t\u000ec.d\u00164a󳞩*􊠬*/􀼉<騭i\nC2vO\u0000_N#Ryra􊋃7+􅬩axE􌥕\u0012Ofu\u001dyt{󳟴q󼆇\u0010ၚ󲿽G0Jgf󷵜\u000f\u0008giBbI􌐃ꍇ\u0018𐴓Jdfge@柩\n1P󿘤a\u0004\u000c\u001e\u001af+xa&𪤓\u0016)\u001c􎿱z\u001c\u00164'𮌆p𗊿L\u001b􏴕WR"
-        },
-        {
-            "status": "pending",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T07:26:54.689Z",
-            "message": "𦹜(𢲢=q\u0008𢚞􂑒󱈣遊Gn\u0010473\u0002e􄔦󱲜\u000b𗊈󴀲*𫛩?\u0018𤘕1\"\u000cP끹on\u0007Y6?5k\u0001\u0008+𧫕𒀉5􅱵02g󼼓堔C6Nt=6𔘲=𤾑^#􉿫\u001f!\u000b\u001e3}T!𭐂󷆨\u0001\u000f\u0001󵲪𠄢#LIZ}H󰏎Cg3벥H.+}\u0011x:"
+            "message": "位\u0015O \u001ez𠥡\u001d󱼟𢎵\u00188:󺔂bQ(XKw}\u000c\t􏏙0䗼kx\u00070=󵥀;L\u000c*\u0010ko\u0019z^x2(󿛢\\ep뗂w𬸪71\n 3\u001d\u0004\u0004?z𥪟䏡->🛃a,𠟚j;-ﱻ\u0013󲨌(L\u0012󴃱\t{􋓊좙<P\u0019BᮄT$󺙓󹪽󿫑G󵤖)cᙋ􉫮a\"雴𤎇􋊕KS􊶞3㏧\u0019zO\u000f󹷕箱L@b𗀵\nW\u0003\u0001\u0015q󿓔𭕨􅂊AK.",
+            "status": "accepted",
+            "to": "00000000-0000-0000-0000-000000000000"
         }
     ],
     "has_more": false
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_10.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_10.json
deleted file mode 100644
index a87512f8de7..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_10.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "pending",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T21:59:02.193Z",
-            "message": "\u0019󷏐\u0010~𪗰:󲦕O;B\u0012􉮿얩g0J𑋃\u001b\u0001mxB\"\u0019\u0014G\u001b𠪕\u0008:􅉥~\u0016􈔤𥮟\u001a.oZmNI󵊆S\u0014t\u0017\u0018T\u001cP\u0017m{&𘋈僊\u0014S\u0008鞧\u000cWe󹸽fe𢐫D𤷜WCpp𑵥􎳡(mWጘdb/{\u0013≱\"6h𬇉GYik\u0013\u000c<A7qf􏀼􁸯𝧓𤤸(5E󶤂\u0000Eu\r\"%\u0018𗒠2􀕍.𥣚\u000c>Mn7L\r祲\" 7󴼞󿰼5l'\u000c鎳P\u0005'𨺴ꚯ􃓪N\u0017N\u000f^"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000000-0000-0000-0000-000000000000",
-            "to": "00000001-0000-0000-0000-000100000001",
-            "from": "00000000-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T20:29:57.465Z",
-            "message": "𠟓𤩶H|𦾉𘁶d𪇜F<eu仅𗹊XKc􌳯\u000b𭎲\"1𔖍>4u_H\u0014|𡛙m\u0002 鉲廧|Ų졕!^ \u0015"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000001-0000-0000-0000-000000000000",
-            "to": "00000001-0000-0000-0000-000100000001",
-            "from": "00000000-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T10:12:06.916Z",
-            "message": "ꬼ矒\u0018䮏!{i4&nd+\r\n\u0012s0.&ツk"
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_11.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_11.json
deleted file mode 100644
index a1ab070eccd..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_11.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "connections": [],
-    "has_more": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_12.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_12.json
deleted file mode 100644
index 983edfc8553..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_12.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "cancelled",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T21:34:11.432Z",
-            "message": "k􌎆H\u0011G􉽋(*4w𧄹B\u001f󳊊􆎑|0\u0000\u000cb\u00079󺗰R\u0002\u000biC􂓓hmX􆵷-컋=􇨈%<󱨱󷝞R󰡮𭱂A_5@vV𛇁\u001f\u0012'𧊇\u0011ꁫglKQ\u000b\"貺.>+\u000bs$\u001fC󹤌uX4Z9ᢼ&iS|􈍳$4FV:No髜\u0016􊰟\u001c󴥳R2yE6f󴹨j\t󻿔𠋼I\u0005\u000f{"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T10:36:09.883Z",
-            "message": "\u001cN𩞡!N\u0012肉d% X$d/>k\u001e\u000bnH\n𬔲j􉿒wj𗃍𫙿\u0005~𪏦󼲜 W󷸵#𥛭'\u000cs2\u001bi𬗒𣽭\u0006􆭜v*-努ⅥP𥦷5\u0002&Y預@찵\u0001&o󹸡(\u0019_:2-\u001eW\"cQ⮤󱉣\u001eg,\u0016pY\nY(Blથ#~k0􏴍𠨞\u0006v\t\u001f􉀌cr"
-        },
-        {
-            "status": "blocked",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000100000000",
-            "from": "00000001-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T00:37:23.018Z",
-            "message": null
-        }
-    ],
-    "has_more": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_13.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_13.json
deleted file mode 100644
index 209989fe6cd..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_13.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "accepted",
-            "conversation": "00000001-0000-0001-0000-000000000001",
-            "to": "00000001-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T12:28:33.117Z",
-            "message": "H􉆃L\u0011]\n}F\u0010\u00100󹸱\u0006􉵗\u0019󹉃adWNy?\u000el){R䈪\u00189`忮r󽇑SCMY=𢌱DA\u001aeg\u000f\u0019\u001b즭􂽧BN󹂞-\u001a𮢡>,4{[\u0002;DP\n\u0005d01# \u001b􈼴\u0011gF%\u001e􉚝=𫔰\u0012>lrO>\u0004trz~<\r}g-\u001a#8\u0015𬶼Q\u0006椕e^󵚡>􀹍7\u0012\u001d2=cB+j|L[E`ꑡ~vdxD\u001dl?;\u0004Fl\u000c􀩅*\u001e쩂 􉚼Q`ቧ\u0008}\u0017Mn.̽CVX(􄋓y\u0003􊱷`L#\u0012\u0000>(@3佭𤚳V\u0002𬋬'"
-        },
-        {
-            "status": "pending",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T00:04:09.041Z",
-            "message": "\u0010\u001b\u0018be脬􃔣暞A𝠖𫣍ZA\u0002⌻󰃭)\u000b0\u000bx뎟\u0010P⟁\u0003\u00105\r䅅\u0001Nq.𝋩Bdm\u000e,\u000bo𪊵󵉇g\u0008\u001d\\󿻁`[𡢝x􁂗L[埊E𢬰𦱬󽎘a󸗷?􁽾\u0010\u0004:[𤀔.la諤\u00109\u0011@󶮙憶\u0010𩱚\u00169>𣢶\u0005v\u0018bm7󶥓N.\u001a=蔱\u0016-\u0017􀷐󵷷':$P𮈻]c:3(R􏹃\u000e3h𗡒󰆵=Ċ*\u0000󹃅\u0017I\u001b*|}gD㓽w:\\\u0010{싮􆩵𗐓\u0007w|\u0006󻀾a}&q1)\u0007\u000cJ4\n\n\u0002􂦇󲼑󷑲\u001a箸츇{^𮢻piuXo{jHa㗬;!$0 \u001fi𤫋賕ሼ\"}.Q&􋍐+I|]h3Tt\u000eg\u001a\u0012\u000c+\u0019\u000c󶌨r}9uJ󺂎N(󼊡\u000bOz􅀺Y􄇫~/󻑷\u0008]"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T04:48:54.495Z",
-            "message": "=m󸼙D\\0𧿍\u0004J*@𡘏\u0012\u000cO$\u001a𐂻I8w}ӂ𒔛T𭾌!􇂦y\u001c􏡝)M4A\u0003\u0011⊩+Bb&𣎊.a𢝓*󵴸F&[d\u0000u쳼A3𤻋|$8쵁w9%l\u00183\t㠳z\"v\u000c9T\u001fqH]V󱯲OH\\㟳/𥞲bF𐁂+Q(@S\u001a?󰜱b\u0017M~%\n𠀼gG2\u0014 u􇀼\u0010X\\J󾠰;\rT-􃮶\u001e󵏾u\u0008𩂨y󺪵_󲲅\u001d𨈣O󿶳\u001c\u001a'/&𫧌x𐋵㊒𨄭0\n\nm\u000c\u0004\u0014d\u0002%\u0006\nl\u0013\u001cPIW\\\"{Y􈬱\u0013􃔘𫥹ᥭ󸸐=s+a\u0017?􊽆eh\u0000y􃢟\u0019l\n󻇄\u001dM\u0008𬛑#\u0017𢆻22\u000e􅴸\u001cK\r>𗿈]󻐱}v𥀙 3\r𢒎]󸾅,Ju'3Co𔓞󼃼2𗲎"
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_14.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_14.json
deleted file mode 100644
index 236d5d1e48c..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_14.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000001-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T06:40:39.351Z",
-            "message": null
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000001-0000-0000-0000-000000000001",
-            "to": "00000000-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T13:28:18.216Z",
-            "message": "󹡅N`CxL󼰇\u0002𩃀6}A𭺫Ib7x󼎿|+t7H󵱽*$J\u0012󸜶\u001c{ 9Q\u0014\u001c~\u000b\u0002?􍕜𘠟\u0011􋷑Y𬋝L1󱥳%T\u0014P\u0015屘o􂐵\u0010\u0008PB瞽|fy󻩟\u0017\u0018𗒺\"􊬭\u001aci\u001e󿱛󠁁󺛝^%Զ৮\u0006\u0014s1w4a!5🂷eYUCb\u0011🀡􂑪A\u0000-~󷤋*l\u0012\u000c9iy𛀞K1WG6\u000cV\nsg\u0006\u0000􏡇󸸰\u0010\n[𦲑􆁕vh󷫁qI\u0007/*+쏎蘆\u000e0􍸊}E\u0002II"
-        },
-        {
-            "status": "pending",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T03:34:36.808Z",
-            "message": ":0e󶿠\u0012t' 󸓐\u000b󱻩E3\u001bhHM欤\u0006w󱣉\u001ci􁕜:\u0014鰑,H\u0013󾠙𮟢𨁇\u0015\u0001􋉟b󳙩\u000b𔒬󰖁󽩡􏜨Y\n􊷄-\u0019\u0017U{ir+􅒕\u0018\u001b\u0008엤\u0004rac\u000b\u001bo\u0014𫐱󵈃I􎢯TI\u0013=H\u0012:q4NC󿇻9.Iy\r%󳇇)𑱤i\u0010v󱂻u|\u0007zQkm󸒕엢𧲃𠋦Qr\u001dnVd\u0002Esb4\u0002]􈠆k𗌵\u001a󼎱G􋎅{\u0006mG󲪫'g􁇏d\u001b9kᐅe\u0000dT3ڌ􄲚Q/\u0008yH𡂅\u0018tU󳍣;􈺨􁓃𗋽\u001a𓋲􋝎𗑍\"R\u0012󳳁􁓦S!d`!9𧆷lq\u0007\u0003XbL$?K󷬪U󸛕􎕖Lt\n奄^U/T\u001b51\\kwV_F1K \u0003p*1%)󳲃D𪊳m?󿉲󹡆u$|d7\u001a󸋎-\u0004u려"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000001-0000-0001-0000-000000000001",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T15:03:31.446Z",
-            "message": null
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000001-0000-0000-0000-000100000000",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T03:28:16.129Z",
-            "message": "foi\u0014\u001f𡖲=~𡷩<𤆀NLS@􋟦5\u000cP2ﴦ@􎥟p\u001a\u0015\u0016 \\X\u0019o⤼􂡉KR𓍏vi󾯐?𗣸"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T06:45:16.969Z",
-            "message": " Y󽁬\u0011\u000bo󶊟\u0002O🍮\u001cM󲺍둏,_𝖀ꅦ􉡴j􍺨V𦌿\u000b𣗼q\u0019-D\u0017Nk𮗬\tL􈢳􆺴\"FI𡢆BV)@o (zi1󾝬𡟪󿽔\u0018\u0015]􁀚;<wr.\u0002jC7\u0002\u0013󻄲𗅇{Z6g\u0015r3􅚅s]󾷳nDFv>3皻\u001fgKf\u000bU\u0019*\t࣭\u0011\r9\u0007󹎌\u0015LS\u0003􆑒&fUyB􋸁M󶲣q􆲻/-𭿒􈦮3+?8B􋍈\n󶊊󱍉\u0010>#a1𤀟9𑃙􎟝%@u5Z4MDCDzl􍁸\u000fk\u0006)|􈤻!󿡅b\u00084𣉋u\u000cl`Jg\n𣕫\u000fK\"|"
-        },
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T12:40:24.320Z",
-            "message": null
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000000000001",
-            "to": "00000000-0000-0001-0000-000100000000",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T13:26:50.261Z",
-            "message": "W\u0005{;I᯳N󵌔SC+𡊧c(\u0004A\u0018𧂗\u0007f*𮧧\u000c䈴󼬉/G_峠|A󷸩㏔\u000bVZ&㔺L\u0010T󴙀u􌈠5I\u000f[􎧦~􇻰\\𫐇𩼩Y痵\u0008󷜕cI􌒂\u0013􋂫"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000001-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T18:21:03.201Z",
-            "message": null
-        }
-    ],
-    "has_more": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_15.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_15.json
deleted file mode 100644
index 1436cc2a273..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_15.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "blocked",
-            "conversation": "00000001-0000-0001-0000-000100000001",
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T15:13:47.534Z",
-            "message": null
-        },
-        {
-            "status": "accepted",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T14:38:27.967Z",
-            "message": "Q\u0003\u0017Hy𢹹>\u001dZ{\u001f&9Z󾗝k\u001d2󵻱ﭼH\u0015󿭿/\u0016𪠥)󵂬{b􌬸QG𭖅c􃓦𢇦\u0013Q!\u0016\u0002\u00190\u0018\u000b!\u0017lTי05\u000bh􍷾􌝴\u000f󶶈呍wqo;\u0001>4rx둹L􃮰c>F):I<󼹫'MC \u001dX[􌄄\u001f𑴶|󼀓-BQ]8W\nWp\u0018𧸻Vg"
-        },
-        {
-            "status": "accepted",
-            "conversation": "00000001-0000-0000-0000-000000000000",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T19:11:48.008Z",
-            "message": "|z |\u0001^\\\"{\u001e*7󿥘敎:Y𠛊Eth􏤝%<!+!\u0019F󲙅󵖵\u0011􇪆󰞔\u0001实\n𠭵P{&D*$I𢔮!]𑄣􈧊\u001cFz\u0000󾝤\u0010wN\r*􉾱𝑳󶽻󾡡2&\u00022鈠\u0014#\u0005sw%\u0011\tHap9s\u0017𨥘\r[\n􇩵𑫏x\u0017f炛n𝍏Fd:􃿙8􊠷\u0010X0󸈶5𭙼Z𥿨\u0012T[Khk0\u0012\u0001{)󱶠hLA𪷘B\to\u0007󸩮\u0016HG0J+^\u001f\u0001\u0006U\u0006vR\u0010\u001eq\u0017C\u001f󴢖-\u000b󴻤r\u001e\"􍟩􎐯\u001dJ0J\u0019D\u0016{d't􂔙_􎠡\u0000󹌸}澆\u0015Hn􀋊󰬅𫉏􋗖RxP8"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0001-0000-000000000001",
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T05:37:11.962Z",
-            "message": "[󱟲(\u000br蔒O'6znFZ\u0003\u001aag𠸕G\u001b0𢆧󰚽C=Nn\u000bM\u000em󴌿A|\u0005\u0010!hhN𢐄g𤘼\u001f󵝵𐔣\u001f9𪪊i󶉷5􊿍𮓔7\u001c\u0012\u000c⼠wc:*2J𖼺.𫡝@g\u001b\u0018𧞚B湻\u001cI\u000b5A\u0008}e2|9\n#U.9\u000671\n\u0007iU\u001cE\u001ceU󽘖N;#Z*􂣎壋ꐩ>?󸘩e\u00112RPJ\u001b_y\u000b􂊲\u000f.\u0001\n\n󠀧_6|t\u0013🃛^욋𣬔𦀎Q=u𬒧\u001a%;L\u000c0M\u0014|W󸉶𮨩􃝪\u0008\u0005\u001a\u0017\u001f뚔t􀢔QJ\u0006\u001fi\u0011+𣿲#􋹻"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0000-0000-000000000001",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T11:33:27.281Z",
-            "message": "𡻭?@V4z𬣗󾝋󷎆\u0011y\u0018􁗕󶏸󶳕\u0015თ,\u001aqu6ຣ􂐛U𭡝惌*󸊳\"\u000b\u0019<fn\u0019\u001a󻎺􀁨w?}-8}lnHp3늩t_𥊒\u000cu\\O𑱫b࠱Y󾘁\u0002iJEz岅[q𩓗+#󼪳\u0014k#y𐭟^6𫛽6|߀8a0y]p#\n\u001aXoK;/󿛎zT􅥪󼙀w𨦙I􃃇|\u0008󷔖󱌦潽"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T21:19:42.145Z",
-            "message": "𪩮\u0010h𞋹\"BTT82\u0005\u0016潔3i\u000c𠯠w~<zY𢺺a󹁱󴥾𫌭=𬉁\u00184B|sz\u0013I%􏣵\u001f𩎝\tL\u0012'𒓝`_\u0019\u0000\\𩚫\u000eZb􋠑󼿈\u0001 \r𩗪8໑-(~\u0004􉗙 4\u00169🧘\u0001rx󱈝]蔽􎪖簕WUG8"
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000001-0000-0001-0000-000100000001",
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T14:39:36.233Z",
-            "message": "󺚰a󶭘󺾙lJ󲻫앸\u001c0XJl㘬-'BRU𝂅J-^􀌤\u0003󵃹8󱿸奯􎷻9>z5F:\u0005𘢂B|𭗡Tx\u0010]8=G(f䬰𧲄.d'M󻶉(U\u0002Lf󶢷\u0019Mtw\u0017wS1^wBj\u000386@\u0010~I􏘕砫j\u0012e?\\𩠪V{⺇P\u0006ᾷ󴣔􁺥36𮖝󸎫)󵖆ro𠅑\r-륕zX-\u0002𮏚8qM.33@vXTQ/7{􂌈e&φ`GN\u0017p9\u0010󹽢𭽰([wW󳨳𝡄\u0017\u001a\u00126ELt𩆦-󸀘|𮒻r\u0014-2H୭\u0011RK\u000c⨗\u001a󾧹/\u0004􆆌',S􉶸\u000c4~𥀗Hat[_o\u000f->DS150􏪘󵥺7\u001f陪4N\u0005XJc"
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000000-0000-0001-0000-000100000000",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T13:38:17.908Z",
-            "message": "\u001b4\u0006􀲴𗲵d.\t􆏰\u0008\u001b\u001e\u0007o􅪩#\rP㞷@o𤸻􀙑{RM􆇔𢩭\t8I\u0006Z􀼃j\\\u000cz\u001752뜞\u0011\n[K^\u001eQ𪇣&􏂠u|M\u001f𬊟2=2\u001az+􍛩\u001aR<Q_󸸔\u0019𧫁xdd𧺼𥅢f\u001e{􃼫𥑠󸣺􊍞\u0000<`6wA\n􄬄\u001d=a$󸖮\u0012\n\nz\u0007󱙜Z熧븛"
-        }
-    ],
-    "has_more": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_16.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_16.json
deleted file mode 100644
index b28e62cfa27..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_16.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0000-0000-000100000000",
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T05:58:16.368Z",
-            "message": "𑐈d󸌪8\r𮛟`N􀅃Y󷙑𗻵%\u0005\u0002\u00030ɧ<A^I7Zb?H?󴟹TU]􅱅𡺍𪾕:R\u0011p[\u001b⁊F\u0003297\u0005𖽕4*25\u0004\u000cEc\u0011YWR*\u001ap\u00167\u0006-𞀑MHh􍔀z􊿘p<"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000001-0000-0000-0000-000000000001",
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T11:05:42.209Z",
-            "message": "篚]/]|􀃘𧩺Y^󻰧x𤑿\u001fN봹􌗾𢟩\u0014R\nE\u0002𪹩+3+𣑁Ycd0b󺠐7dp_~U\u0011\u0014\u0002K?⣀𓎿f_\u0004_㬧Xrn\u0000\u000ej'\u0002r󾉦VOcq4\u0007􉮀𦚺􀭰𠿚s\u001b\u000be􋹃쇘\u000b􀝋􌿔󷎔WP\u001c𘊕h7zO첶\u000b城\rK􀪷1!\u0016q5􌞀􃅞𧛣\u0017t<\"KY=\nUL%;7厏K@ꐹd𞄎󰩾\\U􉔤W􊼐O\u0007\u0000#溁pI^B\\~\u0017\u0011|\u000e"
-        },
-        {
-            "status": "accepted",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000000-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T14:40:41.004Z",
-            "message": "N\\韊\u000f\u0015V\\$塌SLq\u001e𛲔1| 떼H*?C4𤇳J𝖝Q-𘀻\u0006󺏪J\u0008𣬈𨅭&y󶧊V:f\nA󻢔3󳋳|\u0011\u000fkm𭄗􍿝,甧\u0015cr\u000ez*\u000e󲧳\u0006"
-        }
-    ],
-    "has_more": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_17.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_17.json
deleted file mode 100644
index 0b37506ceae..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_17.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "cancelled",
-            "conversation": null,
-            "to": "00000001-0000-0000-0000-000100000001",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T13:02:33.244Z",
-            "message": "MQ\u0006\u0006!𘓪􅐢𑩘\u000bwRu\u0003纚r2\tuk𛁵f󼲀\u001b󿵕\u00047<t/]䄘Z\"Ye󺟮􍄣\"S.􎥐\u0002Y󷔍=nK.q󿚲ZsF􎢮/Wo\t\u0008\u0013\u0013C􍒔1ፊ8\u000e3\u0005RHN\u000b`N/辺Y.\u0003[o\u0001UVbQMH;󷱀 pU\u0011\u0004筭2𥐀\u0004􀀁h#侒$\u001b\u0013\u0019ih_阹z\u000fn𪜓8m\u0016𧄕p𧠒\r\u0002!f󺦿􅿷n(\r"
-        },
-        {
-            "status": "sent",
-            "conversation": "00000001-0000-0000-0000-000000000001",
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T16:56:20.205Z",
-            "message": " {眿r9C󾗈$\u0010𭪨<\t\u001bhR\u0011+𡨱?"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000000-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T01:20:04.372Z",
-            "message": "\u000b\u000cM􌍱\"R󳤏T>w:\"#sa5{Q\u000f_ৡ𩸯Y|⒣\t􃑪^\u001eR)q3V\u0005􉦑rw\u0007𗹆󻎙BU𥌲󷷧aLo!􂒩󸚶(\u001c䏺n􉡤摁󿮜꼑?\u001e􋥅{j𡨅f􈐻􆺛𝢇*𮚺\u001c^gfU\u001b:r"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000001-0000-0001-0000-000000000000",
-            "to": "00000001-0000-0000-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T09:59:13.470Z",
-            "message": "𭌽d\u001b󹌃Q\u001an\u0007𗦓wz\u00198Nb"
-        },
-        {
-            "status": "sent",
-            "conversation": "00000001-0000-0001-0000-000100000000",
-            "to": "00000000-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T14:52:36.952Z",
-            "message": "0<jv􀱌􅃡\u001e!\u0017x󳝽𩛡!HF􏜄󻚕\u001e⩨HUm􃋏Ѿ:e\u001d󷨠h釥V0\u000b􀥓;􍻭)􈍼(󴪇!Jy76n꺭H𡢒􍇀?aMjJ󻧖*\u0001熮h</\u0004l/􍁀\u0017j>i\u000f@vt}]S'8Bꆳ*\u0017>\rK\u00075$륮]\u0007N|\u00116g\u0019\u0005󻌠󹂹>@\t<-C󺨠\u0011::󻱟I३e\u001f<\u001eu􇀸tam\u000cy*j\u0013I𘚾"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T07:16:19.530Z",
-            "message": "?󻱸kn􂼢)󲓅FoZ<]\u0005\u0000\u0002Cn\u0008[eF✅Ar;\r\u0008O󱿩8􋢘\u0011\u0002).%𤷙r,\u000cpt\u0012x𡵠j\u0019c\u0011\u000b󴕃)s\u0006𤑟.a4S\u000c􁀞ڄ𪄂\u000ch&)MGv𞴇\u00029a\u0011h{QS4A`􃸏oBvmbrP\"/c􍃶󺴐}2󱤟B\t󸝵FzX\u000c𣀦󻹵,󳛣y,G𤚉s\u000cl\\\u0019&\u001c\n\u001c\u0014\u0011:븽\"􂈍ଗ\u0014\u0010\u0017󺈘A**\u0013XSy\u0011f\u001f#ီ\u000bF􋱧[􁲓걨\u001a󳓭"
-        },
-        {
-            "status": "cancelled",
-            "conversation": null,
-            "to": "00000000-0000-0000-0000-000100000001",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T16:26:01.827Z",
-            "message": "\u0008~|󷁃\u001dZ-aE\u0018c\u001fY>[4h{푄\u0019I󳧊2+;\t𩎉󲦛3𠯐\n\u000f\u0006𡍜6𓆣O8\\a\n󽓃󳸤􋊖칮=𖢠7m\u001bZt󱠋𑣨uj|\u0018v𒎌/eg󶳫奞*ﵢ@羈\n\u0011v𫙵\u001f"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000000000000",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T21:57:41.050Z",
-            "message": "=9Ŕ(D tF>Bm󽾉F\u000b𫬘m*d\u0015\u0014\u0008n\u0001\u001dU6m事􃇀&\u0001Q𫹍􃿒\u0000u9\u0004!󰮘i{󽬿b𥇡\u001c)NV傜g\u001a\u0019𗟚\u0010ፓ(X􏚏纎l䦶鱺\t6\u0015󲣥"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000000000001",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T02:41:56.943Z",
-            "message": "E\u0003wrEfC󾽀󴷸󽹋\u0012󰄳--󱐌!󴺢𧫝/􎸩\u0005\u000e􍺪󻪸{!}`𭬔c$y\u001cW[\u000b𢗫􊢈􅁐\u001a1xW󿷷'$2\"\u0016\u0006􎞯%􏗘_[􄺾uAhof𗇎)\u0016?󷾐벑\u0019\u0008P􏮮𧳭󵵲\n@􍎐󲎁m\n𦒓4댶𢊑􅩌o#\u0006𬇳1吆󴵞喜|𡔽\u00038󱗥\u0003\u0013\u001e\u0005t*𗢸\u0005G􆾊𣭲q\u0018&\u0014𨜊NZ4v\u001dEu}^~􍍇H\u0002\u0016\u000c0#f@\u000fX\u0019d}餯\u0006f\u0013Fy\u0015MC\u0004\u000e:/Y\u0000\\􃉹*\u0011*𛃜>G#O힁yGl8𦶨\u0000󽇹왠YﱑB\u001eb\u001a<fn\rvj􂬇󳘶􈩩\u001fI\"1􌮣,HW\u000e\u0019𝥠Y􀫳\u000c:\u0018𢇖c\\0C.\u000fi!𮉢􀅃𑈢翇*/\u0006𫻎Y&<k7,u\u001a󼴇ny[󵘦i"
-        },
-        {
-            "status": "blocked",
-            "conversation": null,
-            "to": "00000000-0000-0000-0000-000100000001",
-            "from": "00000000-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T04:01:44.990Z",
-            "message": null
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_18.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_18.json
deleted file mode 100644
index a1ab070eccd..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_18.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "connections": [],
-    "has_more": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_19.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_19.json
deleted file mode 100644
index 673a616872d..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_19.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "accepted",
-            "conversation": "00000000-0000-0000-0000-000100000001",
-            "to": "00000001-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T05:02:53.576Z",
-            "message": "󾻕󱖟}\u000c_𗾱rB_ibЛ+ꄍ\u001bWq靴+dS;\u001c窬.󿜷\u001d+󺓡𪕺\u0008b󽃩i\u001e&"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0000-0000-000100000000",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T07:27:07.932Z",
-            "message": "4%ofb?$M#8XH󿚪\u000e|9􈠙J\u0013󺺤􁠷颈c\u0005륥w鏽疑M쒾wR.\u0013\u0014~(p󵂟\u000b`􏬓\u000e!𡬚\u001d𓏃O/𬟧B\u001d\u0006<|v?c􅷌\u0015[D?\u000b𔙆t?\t~q_?\u0015\u0012zU[H􆓊>\u000f헹D󷡑\u0015\u000f72#􎝀\r3^**\u0005\u0019\u0007𧾇,7剋\r>\\\u0015Q+󽌮\r󶏤얯r\u0003𢡽^䁙𪻎\u000e𣇄\u0005]b􌁛CK\u0007\u000f󾐝󳭇[4k\u001bpibKR􋒮􌈛IO\u001d[\u0003ds􉵽\u0018N+@\\E5󾜵\u0005$\u0002􍻐#Z\u0002󲵒)􀈌E􏩷􍦀\u0006\u000eWN\u000eOT㐺󻈞G!<ᾚ𫃨$"
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000000-0000-0001-0000-000100000000",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T08:45:48.151Z",
-            "message": "C􍎤짹1\u0013(Iy,P뛄􍏸𧟿\u0018􅖗^,+󸠍O\u001fzxjLy67璣p􌼼\u0010v𖣰\u0016L𣬄'\u0004L𦼛b\u0014&S졋􂄋󶱯𦺬K<oOk󾉅ad&\u000c𨻅&?𬠴7\u001e<󰍪.󺒫⸞󼞃R,󷲡𣹖󸖊\u0004P?\u0000HY[󸫜󾛦󼬝󿖉x𤜁V,󹗉􆵐𫾨R\u000f0􈤹\u000fg󶬆𢋂:\u0016\u000b\u0013y,\u0011􉣥@󿫜K4,B\u000f,𨋸\u000c䩯E󾬟\u0010\u001dk\u0018\")/፭r󱨦/J\u0005􂹬O𥼁𘧸9UI\u0005L󴣇𣈙\u001fq󵬔\u0014V𪣱a𪊷\u00162F{C,Rh󹼸"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T08:33:46.140Z",
-            "message": "KI\u000fF]󷨎>H\u0004g~\u0015臛𭯋M\u001bD\u0015=B`\u00140􁫅J􋂟H5𠖘󲖦)瀲R易􄁷 P󹔗4\rk𪂽C7b\u0019㟋x榿M>\u0019a𨝀@􋼛𢐊@𨒶ZD􋄜YM𧞁(𦻬􋙳砨}2\u0011􋆏𠕎r⩫󹘃\u0004􅅴zn𬝳 4\u001fb:\u001a\u0011\u001e󹠼𦒕\u0006뽹<m\t󰒏8L𩵴\u0017\u0001\u001c􍰦\u001chx㎐\u001a\n2𗙃󳙃\u0011|@\u0001a9$K\u00012Y\t8}G􉋫5!󾶖P𐠯󵶝S\u0017CXc퇹󿻯1a惌'③WI\u001bQ$\u0012𠫖󰜣􉶺e􀟫􋲉􎦗\u0011󵍸@)⍮C\u0002\u0019\u0016(aH[ᘍ􇩫x\u0005~_󳛝8+)􊊴K\t:\u0002\u0013󾁕P\u0018\u0005咠l|y\u0019\u000b𡨦M\n)JK\u0011\u0014Z((\u0015􌐙7NYZa\u001cxS3\u00114W\u000b*~􅖲gf {!\\YJ\"x"
-        },
-        {
-            "status": "accepted",
-            "conversation": "00000000-0000-0000-0000-000000000000",
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T15:42:58.803Z",
-            "message": "\u0013󾗹䧍O6wKea𢢜󴇸L\u001a \"|^瑩uC􊋲/M-c{~𫻬𭶥Xt􇣐􄬵5\u0002󸭑󷜢)aGKe^X Fs\u0010\nP䉔Pi\\>\t󴫬\u0015\u001dQ&\u0005\u0003騃\u001e𡺳2(9\t~󾆿𡤸^\u001ec\u0000i𧃼|_\u0010AG􂱟L!zk@\u000f"
-        },
-        {
-            "status": "cancelled",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T07:44:32.326Z",
-            "message": "4\u0014灩<[~\u001c>]v-s\u001d>Mp𮢦@n\\8uUP\u0006Mb-%fX0%􄅗o1ᓨ\u0008𥍕i)\u0008r\u0016[0;\u0010\u0011Cv\u0015L\u0015󷱝h/a5趻N`d󴾀U{=$I𪦄4󸍯.\u0013\u0019󺞫N􊭦g𥢃𐨃󸅓"
-        },
-        {
-            "status": "sent",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T12:02:00.432Z",
-            "message": "\u0002,C\u001bS\u0018K'\u0017\u0018g(9<𠴵@􂶸l\u001f\u0004-A3󱌔燘Lh#􅻞ᆸ\u0011砱𡦩LO\t𠅉󾶜ty1󺱭𩄼ꑋ\u0014\u0003n1\\\u001b\u0000J㊕v\u0012M\u001d(􀲕r7𨠽𩖤萃𭠮󰳂eu*n󾴬EMMB9#e풠\u0005Zwr\u0017\u000c󱀔\u000etnE[I󶅎⁡@󱪏僂)_37S\u0018o '􈎓,J\u0007󸽩󽜾|o\u000c1?A,f\u0007eI\u0002𥥑f\\\u0007S\u0010bZKl䳐U𬑙1T\u0004\u0002[=ܷ󺷉\r)BO+=V3􆎯􈉐;*9󾾸kSJBHwH\\qzp\u000b𪋼M\u001c\u000f\u001c쯘\u001f𪒂mh?.\u000c%f􈨦V\u00046gQ\u000e􊔱g*7𢗌*𒋲\u001d:\""
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_2.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_2.json
index a1ab070eccd..980c3ced0cb 100644
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserConnectionList_user_2.json
@@ -1,4 +1,4 @@
 {
     "connections": [],
     "has_more": true
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_20.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_20.json
deleted file mode 100644
index 6efade15f28..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_20.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T23:43:50.202Z",
-            "message": "s\t􃡂g'"
-        },
-        {
-            "status": "blocked",
-            "conversation": null,
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000000-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T15:11:43.015Z",
-            "message": null
-        },
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000100000000",
-            "from": "00000000-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T15:40:02.929Z",
-            "message": "X'\u0019b)\\\u001b\u001b9􂎢`􏝱n#􉊇Ki"
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_3.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_3.json
deleted file mode 100644
index 4100f1a7fe0..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_3.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0001-0000-000000000000",
-            "last_update": "1864-05-08T02:11:50.603Z",
-            "message": "X\tS𐋐􎒆󶷴@𪱃겪]􅌸𭹏F𤤃+\u000e𓎖_uq`Y󷸶G\u0019'/󽭦!iE𦷹𪹑(􄰔𦼤)19\u0002\u00067ns\u0008HJ𗥑xM^󿋈󺅨oc𮭏󷍦\"\u0005 ju}:\u001d𪚉A𩞄\"\t󿥌󶞹1俘.@\u000b􈿥\u0004\u001c󿬜\u0008(X\u0015{\u0008󶙯:!󼡚\u000c|\u0016Jg9\u00036깳_F[옦<'\u001e`2y\u0016\u0011i㨱􂘾𥋬\u0008!Q\u0006󹥁餒\u0000󴺅􎱚􂖜󳜄/?r,|y\u0014\r𤟽sj=\u001an0ː\u0019b鐺\u0018PqrX𗿚?w\u0005꽲^O󻜬t?󸲔𥰷E`󱅜l&h+㘹eN\u0015寕󿇵3!UGK\u001a\u0011i\\O𪥵{󲞶`?WC㚚5)鼺_+o󰺜@R􆗘\u000cT%jp0e)􏘾x1枕"
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000000-0000-0000-0000-000100000001",
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-10T18:09:42.397Z",
-            "message": "&\u00010􅣮:0{􅇈$t꣨j𮇅𣡞[E^󶥷\u0004\nT@qo&`L(SP􄠱\u000fX\nA\t􅒯g e!h󳾦y\\pQ\u0012*)􆼯I\u001dF󱹹\u0000𖤞YA䛠=H󾔰A𗲶􆃩T%YYD\tj粸C~S󽥱\u0014X􈙎\n=𮆜"
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_4.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_4.json
deleted file mode 100644
index d95ceab6e92..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_4.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "blocked",
-            "conversation": "00000001-0000-0001-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-08T10:45:56.744Z",
-            "message": "󹌶7􋒺 쪣m~낭}\u0005 󺟷xo7{|􇾙\u0010Q^󲸍𬩅\u0006'r1-!j󳔜􏔾LU𨫌C󹪯9􎿦\u0006+@\u0013\u001a]𫌐􈲓Z)\u001f󶣰\u0010몮󶢌{𮊅󴑁h'\u0016𘏰U\u0005`𔑏,\u0010𝗬󷒷&샕\u001dO𮅼\u000c#\r!\u001d{\t\u0019󾈩l􏅿1[\u0013\u00040􀐘oBa󴪅+I\u0018$\u0008lL𮡓:ォ\u0016䀉\u0011nb0𒇴zq𦑪\u0016o4:\nA󲺩􂨃E𦦲띃\u0003\u0008󽟗𨒹𢀝zr60􇘙麢64d_\u0019<d􇤧XWtm𬕬{\u001fl$\u0001\u0004\u00079g󺨷\u0015u\u0012~2\u0016\u000eOWO􅏍|􍉮󶿯k_SyVR󶭤\u0012\u00064N|4+gﮰX􂿢A^⇋[\u000cT󾴗\u0000\u0013~D1U|m-\u0003Kd\u000b\u0008쥰%􆈛𣟒>𑫥􁟇\u00069LT<\u0014舣Z±㖉翡-􊮊i5ge\u00188\u0003􄿗𞴍q螖0\u000e\u0014T4+\u0013ሙ"
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000100000000",
-            "last_update": "1864-05-08T09:59:06.024Z",
-            "message": "E\u000fK󲮻𮈙l𗢑\u0007챦듗'𮬖fBm\u000cT\u000fL𤫟7𩞒󷈶𭄵lE\u001c讳b^\r𥇕)qs`R󠇘􆂫2]b5k }ས~𦇎j𘪢\u000emZ𦵷~5\u00002󲾹𭱻\u0015M\u00180󰺳/h\u0012.T9\u0011쒧[.i\u001d,PV<\u0006㳶\"\u0019=r𪲇􈒸7SA%직\u00112E탉yG\u00125Q\n졏吐VD<\u0002$\u0000l|\u000b􍙪!迸$쥲|T@n\u0019\"B\u0004\u0007\u0019I\u0004\u0003j􆹴m\u001b%y\u001de36󸷽\u000c󻃗fI|lt\u0001,囈a\u0004􈳖i"
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_5.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_5.json
deleted file mode 100644
index dd529573e54..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_5.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0000-0000-000000000000",
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T04:48:55.532Z",
-            "message": "󴊀so!\u0000-i𩴣W:/Q.&\n􋷎z\u000eS5\u0004p)?D#!\u0010隂\r󻤣􍘑􊉐󿰇"
-        },
-        {
-            "status": "ignored",
-            "conversation": null,
-            "to": "00000000-0000-0000-0000-000100000001",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T04:06:01.784Z",
-            "message": "0j\u001e[#󼰐C\u0019;}􏈦𓏘\r\u0008􌷊𧺉M󾉀%󴰂\u0000􋵥􉒤\u000cvi􅚯𞤹m\u001f\u00041YfdxIS\u0002P\u0006>\u0005|5c}n􍌔\u0015G𑀸jm󳉈&:xpJ]F{\u0019\u0002#\u001bp瓄v􈒜b\u0013~󲆣󰘠󽈾q􄪆4􈐗<𨬕\u0007\u0019􆇕n\u0013"
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000001-0000-0000-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T00:03:25.908Z",
-            "message": null
-        },
-        {
-            "status": "cancelled",
-            "conversation": null,
-            "to": "00000001-0000-0000-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T12:10:46.357Z",
-            "message": "𪼆𝂅钎B\u001fXtX\u0018pf󴢧QU@\u0004$𩤇LA幮N_x\"𫣇\u001d`\u0013\u0018]l􊹾c#w󹂼kTn㫂*W'7\u0015R\nX\u001f>Ewvz3<𗒵,A\u001f)󽯒}mL𫦱􏾸􆎁4P+𒒥j\u000b\u0007W0ﰓP횃\u001aS𢰦\u000c𫹢󶤦h󱻦?\u001eli7{󹍱𧯫j𥀜\u0014\r𒓤\u0005\u00139x-󲢆c\u0005𐱃\u0003SLNu󰃁,\u001dQc󰜓O7\u0014P\u001a\u000e<\n󶔦)\u00113𥶎d4T,#\u0014.\u0011@JF󱨀\u0005iW\r#\u0000\u0018􏳊k\u0010斗󴷏ajsL\"u꾺𘌻菌󷩟5v𤔷􋸕W􅦳󷍘|4&9⥘􃧤\u0006󸌗$󿝻1𫚅􍮃\u0010\u0011)^64𪏙yh_R􇓣\u0011G󶮀Z󼐸𑖺'󵬱􋃨\u0019\u001d\u001d\u0008\u0008#"
-        },
-        {
-            "status": "pending",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T08:25:25.817Z",
-            "message": null
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0000-0000-000000000000",
-            "to": "00000001-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T09:12:01.153Z",
-            "message": null
-        },
-        {
-            "status": "pending",
-            "conversation": "00000001-0000-0001-0000-000000000000",
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000000-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T16:01:44.742Z",
-            "message": null
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0000-0000-000000000001",
-            "to": "00000001-0000-0001-0000-000000000001",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T00:15:38.478Z",
-            "message": "07\u0011𨂧%g\u0018lWU􀷥/\u001c;l6薭!r逋󴫛􁦹𞴥𬸂Y%\u001c]q0fk􋅝\u0003𭀄\r𢘄pah\u0013蛰Z􈜑'\u001aQ𮣍\u0011\u0017\u0005𤍄+we窛\u0014_Z&z􅗣!I𫰙v􍱸儞󶐉\u000f>I[1􋞑y􅏎𧛗\t\u001aR\"󱦨𭿕􇈧\rW\u0010\u0015\t\u0014𫕻🟎\u0011 \u001655b󰖎\u0000\u0012`󾅋n𪘙\u0014\u0012o󶷇$/:󱴧:HzuX𭰢\u0002`4x\u0015U\u0004阯.\u0014Q\u0000k\u000f/m*/𢳩䘶􀣠)\u001dD{a󻭂a\u0012埨a􈽷r\u0000됿"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T07:21:07.732Z",
-            "message": "7㧾\u0014X𗓁􇢒\u0006\u001f󷽘AtX􊾉󴔉\u0019>\u0013\u0001xN=b\t>󶄂G􏛣E+Qhcc5\\=j𢯂l'#󿏠󺕗\u0008"
-        },
-        {
-            "status": "blocked",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T15:01:49.115Z",
-            "message": "𝓕H􏾺,;󳾾􀔾V8C[<\u000c󰳦\u0015K麖𗌺𬁽5N\u000bG􏧃#!\u000fFu%!󸖶􋜅R\u001c􌁁$)􂨨\u001d,\u0015Vꭢk\u0016\\}~"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T14:47:40.390Z",
-            "message": "b\u0013v\r?\u000bZ\u001aZ𓃤Y\u0010n4\u0011\u000f%vE𪒀p\ns\u0014\u001fq#\u0019a󳦀\u001fa-1 E􆘫󰀽𦏶𦐈=\u000b\r󰐥𠢅u舯F+⭅Gvⴀ\u0011l!s󲌼𮝩X:q\u001c\u0003\u001a\u0015(X\"y\u0005\nxq\u001f}\u001d𧁑j\u0010\u0014h\u0012𤧵\u001b8n}j-{eUY\u0017៰pG,x\u0014K9掦󽬥𤏚\u001a\u0002ꉯᭆ \u0000𭐥\u00137]ꠇ_\u0010\u001bṞ\u0017H\u001e3𨓄\r\u0007\tzu\\F/􌒬𗾹\t!􉦊G𭯍Lk>󶙊󵟓􎮙\u000b8o{t\u0003\u0012꼥㒗L\u001cTk_b󺅥\u0006P\u000b⽫/\u0001􅯗Z\t\n{@\u0019\u0012\u0019\u001fY󵌻L\u0000F}*?󰑫\u000cA􆐷E\u001e𪅭~V8TX.󰟷\u0006L<𒑡"
-        },
-        {
-            "status": "blocked",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T02:21:31.150Z",
-            "message": null
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000000-0000-0001-0000-000100000000",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T11:13:33.637Z",
-            "message": "\u000e_𤁢6I1x􆶒\u0012탁𣯵\u0013P7H􄈖𢩩u\u000f^DZ􀽾\u001cMMc󹔐Pi󵡃􃋖*D􉋰rRp󻻘[]#𪨻1#𝞤\u0015\u0003𩏚\u001dM\u0011/\tq󿻥M㋗/8󿢌\u000b<颞d9*􋧃vkjUr󼠟쟣ra\u000bCp"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000000-0000-0000-0000-000000000000",
-            "to": "00000000-0000-0000-0000-000100000000",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T05:43:15.087Z",
-            "message": null
-        },
-        {
-            "status": "cancelled",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T12:30:28.519Z",
-            "message": null
-        },
-        {
-            "status": "blocked",
-            "conversation": "00000001-0000-0001-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T10:24:31.073Z",
-            "message": "A\u0013'\u0002\\􈧥쵚\u0008\u0008\u0010l1mY.N\u0002*𫢒0E𠃿@ n|nm!E(\u001f\u0014.᮹\u0010K󳞭􍞦6i𪟨󿫞?p󽪿󲅪\u0018B\"󷕹\u0019E𫝄웳󿫯𩾓W\u000f\u001c쳕󱋃0𥣼鴊\t\u001e󸀗& i;HsO}I𣳦\u001ewbJdVAvRvQ\u000f󷩰|\u000f?`z\u0008}\u0006\u0003􉇐\u000b𡎄{\u0007B\t􋁰_?􄚙\t░F\u00025􊠝-XTXiuX:1𗵴#\u001at˓𗌂\u0007𠶭𦜧.󸒱\u0019\u0010󴉜S#iwv \u0001蜧L􍀋,𧘱\n􏯶aU𪴦^>\u0015U\u001f󸰒h􂽊o\u00022L􃍫[𡛞𘈇z󾵦皮h&\u001d"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000000-0000-0000-0000-000000000000",
-            "to": "00000000-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T17:15:55.011Z",
-            "message": "q\u0013紊C@󾥘q󽂱/[l\"wK7Q\u0002􎕻W= `sN􈼘zi𢴭p􊼗6~𣰢r/!\u001d#g\tⲞ!d\u0004󳎂\u0006\u0008iB>\u0006so\\o?`䴵\u001dD𓃙􁨙𠧘𨅄𧖭e\u0017-GG\u0012􎉈􆊋0) NodP뙴\u0012\u0015x🜎𩁁J𗪮5􊖁󾓶o#@Rou􉗇#M2\u0004a6𡣡\u0012\u0016S𫪮=\u00069􃎬𓁂q39~\u00187T8𨉺\"\u0010\u001fe􂆖q=_ *#􅔍$=Iu7O$3\u001b𬠲?yI󲃌88𨉱^󲠶$\n?P􍨚>:/,㏠q|T\u0019\n䭏*|ꕒB\u000c:\u001b*m3牱󿯾')𩹐a\u0013\u001d5坷`?ᑮ\u0012`b𘆴𧣫f<]焇U5}b낥􈉨v4󾳇Fs3𮅻\u0019lPoMU1<\u001dc~\u0017󷎣O󿁪k,\u0001*\u0015:t󽂑k𢱑hdn>C8"
-        },
-        {
-            "status": "sent",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000001-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T01:54:32.384Z",
-            "message": "C"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000001-0000-0000-0000-000000000001",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T14:12:52.624Z",
-            "message": "\n\u001eW*M\r\"𭖤\u0001𣟿-~#\u0007[_bN{r1\u0004餮\u000b𩯫jX폅D_\u0003|󹹅vh󷐋􄥲=𧏊q𫾬*h\u0003,g􁽱"
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_6.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_6.json
deleted file mode 100644
index 2cd9471f775..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_6.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000000000000",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T10:08:52.228Z",
-            "message": "C􎜏6\u0004x𮙢|\u0002󴮅𓎓,Y\u0019!\u0004C,i\u0007󽞴󠆕9􈽔\u0019#𣜹\u0005KD6zB\u0012𧖀󱣶\u0006\u0018.\u001d􂲒핡zᒶF陚%󸹱撧❳Z3]𧺏wv9􏤶\u0005\u000b𢑎z')5y躜/%P S󵇾\u0014㘷\\B\u0017t𖼒hጡ\u0003v㐥zQ𦴛[𣎶\\|bx􊳞\nr\\%\u001e􄇫\u0003q􄼘].􏷵d󾅴\u001b,WwI4>&q󱲭jR\u00122<=f"
-        },
-        {
-            "status": "ignored",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T09:47:23.081Z",
-            "message": "􋜉|\u000b􀷟2Q\u0010O\u0011rF􇼵^K\u0007U\u0013􋢂>B𤢿`)귇𖧽\t.􊶡87|w𨎫i\u000cY\u0011|(th#!w\u0017|J\u001eT]N1ᤴ3*C󹋶\u0012𢓌U#D\no\u0019󲿔I)\u001e𫣔@>x\u0007𦼰L𩻲RUys\u0011𞡮bF)\u0014󷛢\\i责󷦇\u0004󱁜󲺛Y5^􎮕C`\u000c\u0018^䆡\t*EL&bQjq􌶺c𩒔󹉝{3搤龜\u00152>2X~rw􁷥𨼿 Z􈪼|\u0006󽇱󵌃󾌡}\r󱖔_<kQ+쁪3_\u001f;􂊬\u0000V󶂇泷&6v躇\u0007/\u001b\u0008 T\u000c󳦞󴙜T.g𡣰ub􌑻K癗㦲l!Q瑝\"󷧱K􆛖𭕴p\u001bE\u0013󼁧I\u000c:󷳬𗴃v􁁜w\u0002\u001d#%s-𬎖1􁔇J𨝠W[¦~}\u0015󿚣\u000b\u0017%\u0004𥕻K鉕𐔷􂆋􅏜􏜃󰃦\u0011U%𣺩􉹫\u0014􀆄>e"
-        },
-        {
-            "status": "accepted",
-            "conversation": null,
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T13:20:55.672Z",
-            "message": "\\䂉>􍬦:w\u0001𣊯0􅫁\u0017{󺂪\u0017:w뛀\u0018𢇓L<\u001a𬨯Q5\u0014􍆊𪨸q\u0014𐇙I4@𨱺퐭F􋘦>'q􈧏v\u0012z\u0019F𪾽􈈅\u0013\u001d@\u000e𮇬H{0􂆋]y\u0003E\u00029X6gWL\u000e\"R/(`M[󽥅H󴕘~\u000e\n1JZSjw􍩨od𗃇u󸔡pEsXF:9𧬜I{쓁b:띙%󳅎\u000fM􀫒\u0017\u00139\u0018𫿞d\t.}𘍨_]=􏄁fEIaaKGI>􃹃󳲶\u0013𔔵\u001d\u000bII)~𪂑QJ|"
-        },
-        {
-            "status": "sent",
-            "conversation": null,
-            "to": "00000001-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T20:42:08.294Z",
-            "message": "-𠘫\u0011Wxe$?ရ\u0015}䂚.\u0019<v󴚄\u0017?\u001c/'𭪩C3󶓬󿛱\t\u0013𘡢b􃆔-\u000eoH㵱L􏑑s\u001czo@󼠳z}2󻶱𨜂󻖞:\u00100푓6=\tm-@\u0016\u0015􎛘\u0002\nT\u001d1r\u0013f%%),s83\u0014H𖼂:\"4􋽅᪇𩟿pŦ􋃍\u0007]g\u0014󿝞5{#,9󻼟7#\t𣅌r\u0008U\u0015fD\u0004B􄣎b\u0015e𨻾+de;>󻭄.l"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000000-0000-0000-0000-000100000000",
-            "to": "00000001-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T03:40:59.296Z",
-            "message": "G#tU拀󰒐\nl9T\"駌4n.㎴V\u0004𬷿\n/􏄊Y\u0019\u0008r821\u000eXK\u001bN13dY𦱂m\u0007(>6[󸥲!c*󶼊󲵋􏲏\u00005􊼼Z\u0008\u001bW𝤤,W󼡽\u0014%\u001eX\u0013㚕\u0006Z4B68󻭧􇹻􎔴􃨤i$\u0014𢉊\u0003𭻊K딣^:)⨠D\u0004W{|0\u0013g1􌠉cp󴍀u1q𝞉j\u0014*hs慢c8S􊝖yO1+\t\u000c󳺕􈳇()\u0005_$gJq\u0013\u0008𡌦eXF芓\u0000'B*󴕚:r\u00168㈿󸽉Q𝑽\u0011N􊖍T󱷜+\u001e\u000e䑬\u0016딄𪺒>G󼇦𐐖벱\t󽻂O󾆳(􄄮៱QvT*\u001e8𢖣_D{8\u001b'N(b射PaH𗄼#DY(/rV}\t<5𣷬􉗿Q^󱓢󳫸w󽮖.\u0016\u000bh@濮cHZ;\u000f\u0007𑘙O>~s⥝!\u001aa󴙺󳸗_7<󿢝F\u0001Vr"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000001-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T16:17:19.100Z",
-            "message": "􂧆J&􂜢[\u0006sk\u0007f\u0007\t2\u0013hUx딛􂻏ڥ𩘽8󾒵=􄱕畾ozgꊫo\u001f.攨\u001e삆{\u0000𨫞<\u0003@\\\"􇪙\u001f󱣬𧧙%榼^x􈌐#烟ꖉTQ\u001b1-3\u001b -\u0006;\u0016n쫡QS=\u001ed󻮰g`+?\u0015A\u0007\u000ev𬞦9p7_?\u001c'41K𦺒y\u000b󾵻Is5*􄜔GZ\u0011􀆄\u0017\u001e鲠)\u0010=\u0011ᨻW\u0000\u001e"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000000-0000-0000-0000-000100000000",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T19:50:29.653Z",
-            "message": null
-        },
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0000-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T20:32:08.864Z",
-            "message": "x􋪌e󶯓\u001aEz𝗵1$!㮳Yo󻧈J𐃝Bb9ᅱ@[I@\u001fe\u0000姬kksdr\u0019-P瞟墉j𨞗􄝖C\u0002\u001b𗡅[wri𥫗\"v'異xH􆖝 \u001d\u0015p\u0018m𢆼\u001b+%􈁓\u0000q#阏Zdd,\u0015uI\u0006s*𠸸[3z󼅡\u0006􏌣hO7i\u0019\u0012𨻀󳴄󿼘A1\u0019=􎱸_𤘐\t\u001fh􈞙#"
-        },
-        {
-            "status": "cancelled",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000001",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T08:00:02.922Z",
-            "message": "@𘉕\u0007ᐊu\n[v\u0015󴡗𮏲*l\u00186!r@sb\u0005쑲+㷗C6R􂽩\u001dq8\u001cA"
-        },
-        {
-            "status": "accepted",
-            "conversation": "00000001-0000-0001-0000-000100000000",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T14:34:54.989Z",
-            "message": "\u0019\tG󽯨~\u0005V/U/􆜌𤠵u\u0011J󻽁\"\u001ew@.􍿮􃝪\u0008bV𢰧􁚱\u0014X}se􄜳L󻶍\u0013\u001aK𥪹𫁔\u0016LG%\u0018/`#KD􃞛-􅓮m\u0012󰑱\u001ed𬂼!\u0000y􂒐BU𫍻1𐪔ꓒY󴽽u\u001d󺬰\u001a4􉜈䳓𬃖TaOS󷉂6㺚;\\脝FCd\u0018[\u0013(\u0004v𔒛%x6𨙶O=\tF*9%Bu@𢌩𖨤\u0000\n\u0012#\u0000b\u001c⁂D*⛦\u0016R/𛆏K󳣔𗉠r𧷶%[􅯘!\u0015`󷊋qsH𘀅\u000f偖#YgS#𓅧d-S󼱦鞏f\u0002x<Bs羋q𡲇4Q[cNs\u0010󲎒+ZK\u0004nLG.(LX 􋎎=}𗟬\u001at🧷Pz\u0006U\u001d\u0008\u0019#>􍱾\u0012|\u001a*󹣀E8\u0015𥐴i7藃{\u0006\u001e\u0000@ \u001f􆏷r0&rpQ^\\\u001d$+"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000001-0000-0001-0000-000000000001",
-            "to": "00000001-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T05:35:16.125Z",
-            "message": "&􀛬@2H􅘤F\u000e𝓶\u0017X󹟃-\u001f\u000f\u0017W@嚺𪆾?a*Al2􁦐4𣬓"
-        },
-        {
-            "status": "ignored",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T09:41:33.128Z",
-            "message": "k}\u0016􁰹F􋓵<wc𧂮\tb\u0007\u0002*:ょ\u000ftQ\u001eo$j'\u001d1󼓑꺹ꋞ􍒲^'A\"Cy\r䱄PN!J\u0015\u000b󹁲8(顎n\u001es\u0001[􋏨󻤺\u0017GW󷌥}𩹚󾐹􄌂.􋩊\u001bHSꔥ(𮊑&属?7}\u001aN𬠕󽺄􏮟RC쮦H[i\u001b*:\u0019?𣮚󲃺.𠧝羀sI_\u0002\u0001𬧉DUe7_􉒄*O\u0017\u0003󶑟^󻚲􈡅텶瓘4N}\u001e\u000bwbFT'F\\BaHM􃐂J\\(Rq𭏠𮓶2g|;\u0015𩼿_J;󴂯\u000ebw5uw\\^萼\rx\u001a{mk𘌟𣵪H𘨶4􁲈㆛\u000f;W􉷗䄄󸓵h~􎁦\u0012}􎀚􈮬j-l􈏤ꀽ\n􊱧u+\u0003󱕚U6\nA󹃦"
-        },
-        {
-            "status": "ignored",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000000000001",
-            "from": "00000000-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T22:36:15.880Z",
-            "message": "􁝻LUx\u0019VU>𤨩n󰭁|y𐰣𩘺􄱑g󰍑\u0010𖫔=\u0011G"
-        },
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0000-0000-000000000001",
-            "to": "00000001-0000-0001-0000-000100000000",
-            "from": "00000001-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T11:52:37.732Z",
-            "message": "I3𠾥e𦬧s3Od\u0006\u0004-\u0016g蘘󾋞[9s1􎌵\u0013HBGHymJ󸀘)f\u000bg!<da\u00125\u0001hv\u001ap𗘩y6\ratxy\\$.E:\u0018􄇚\u0007F󹦚;>\u0019󱵨%ah圬|\"\u0012g}\u001e􈠏;\u0006😹@faH􇯳󲛡~ᣔE\u0000[􄯚\u000e\u0004Z"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000001-0000-0000-0000-000100000000",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0000-0000-000100000001",
-            "last_update": "1864-05-09T23:11:11.073Z",
-            "message": "!|𩊗\u0017\u0019~󿲢\u00178鍲1[u󹔐\u0015\"@J굩G𢂷P.􄽐댯𗘬𨻪u􀦏2f𘦢=㈨\u0003]𑒂\u0015u\"𦷚S𭍂Q🗨\u0004v􉮠𧍂𪔹􋻐b\u0000N 𩶌􀷔􇽦w\u001d􉯘\u0014K\u0016(J󶖚􇅷y퐝\u000b+\u0002\u0010Zk\u0018􎼐e𘝓L𧂴T\u0002垥\u000b@k󺬇lV𧑏\u000b󳋃\u0016󾊉\u001e`𝄂𦦱_"
-        },
-        {
-            "status": "pending",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000000-0000-0001-0000-000000000001",
-            "last_update": "1864-05-09T21:23:28.620Z",
-            "message": null
-        },
-        {
-            "status": "sent",
-            "conversation": "00000000-0000-0000-0000-000000000000",
-            "to": "00000000-0000-0000-0000-000100000000",
-            "from": "00000001-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T03:02:21.118Z",
-            "message": null
-        },
-        {
-            "status": "sent",
-            "conversation": "00000001-0000-0001-0000-000000000000",
-            "to": "00000000-0000-0001-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T12:53:32.635Z",
-            "message": null
-        }
-    ],
-    "has_more": true
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_7.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_7.json
deleted file mode 100644
index 589e9a8361e..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_7.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "connections": [],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_8.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_8.json
deleted file mode 100644
index 685eb7e9ab9..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_8.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000100000001",
-            "to": "00000001-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0000-0000-000000000001",
-            "last_update": "1864-05-09T01:16:45.156Z",
-            "message": "PVR(Fb󵏓wp]𩮿\u0011🀔nz􀕙`=>􏌩N󶤰.&\u001eJ\u000e!j\u000e\\\u001a(q\u0014k:bP$a3멭韨􁦾𤌉Y􅘌[󻁉v?\u001c𭿭\"𐜭𑊜!)p\r󽹽𥊗􋟔*q|\u0005+yQt2𡈕𤼞\u0018󷤚s鳪􇫢\u0014𘁰0\u0016􂽩𩚝R􇠗=􅿌;𡿸6Fg~\u0016󴇣IG2ij􊤔x󷏱\u0014􏾶\"9ں𛄓e\u0012\u001a𩰷O'U#-E󳀔'㒥P@+\"聵\\󾶎\u000c󼭉Q󲧅O쾿順d\\,d#\u0008󿸦~6\u000fⰰ\u0019\u00089#􂃀\u001c}D\u001c􏊋"
-        },
-        {
-            "status": "cancelled",
-            "conversation": "00000001-0000-0001-0000-000000000001",
-            "to": "00000000-0000-0001-0000-000100000001",
-            "from": "00000001-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T09:34:26.091Z",
-            "message": "\u0016j+WQ\u0015􊌏Q+󴭧\u0014盛􃦔QOA^~SV𘙢k\u00110K𢦸b䂢<\u0003􊉀dU\n\u0012|x􇶵󳋠b󹦩H{\u0012\u000f\u001a𒉕3C𧽟u\u0007豼;e\u0005N\u0000JI\u0017%*mq\"z𖢰A󵨒em}􀜞_󽘨\u000fKjj􄄒}eAL1\u0008􂛗\u001f𤔻\u0005󲽊f𫼌\u0010F>\u0013Uﺡ;\u001f􈥔󲮾Ve1Nl\u0010?a󸼜􎵴@\u000b\u0019\u0018ngkMt솜]#4\u0006􌜦􍗕|_\u000f\u0019\u001dO8읂\u00003\\Z꾟𪷏e$hN\u0011]I\u0013\u000cIo\u001d􌫲c󾚦\u001e\t&pX𗢩aR􆒉쟂蠩LC"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000001-0000-0000-0000-000100000000",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000000-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T23:56:03.881Z",
-            "message": "o\u0003\trxo\u0019[+kw\u0011-􆑳~ZDT%\u0013Jﻈ9D~\u0014\u0016hC,𣤞`\\󺜸!i\u0005X*{\u0004ရ\u001d\tL\u001eၬ/\r🚬􀰶ji\u0010#𠛟=\r\u0011𬒼qH󰢝{󱪀2𤓅]R\u001b􃃟䈣eJ豭𗛼_齴a􆶢\u001d/1*5WF\u0017N'𝡙\\\u001c1h=\u0010X\u0018[NiP􄈐!c<[6!WU\u0002􋚡㢗웏a􆕮D󱌧􈲇zhcc_.c3\u000e󴄷\u0002z\u0012𗞪\"f\u0002\u001e閷𮃲61⊟W\\\u0007빏M剳sr<X&󹽻%\u0002\t􀋦N\u0001🄊iIwj\u0005|\u0004􉠥󰂩𘎵\u0019C~\\JT\u000bD𨟄􈰼}9;\u0011o\rp\u0014u^]?+>v?{3w\u0007\u0004I𮞧󴗹~lP砥\u001a􏓒\u000796駡\u0016g"
-        },
-        {
-            "status": "ignored",
-            "conversation": "00000001-0000-0000-0000-000100000001",
-            "to": "00000000-0000-0000-0000-000000000000",
-            "from": "00000001-0000-0000-0000-000100000000",
-            "last_update": "1864-05-09T06:03:58.277Z",
-            "message": null
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnectionList_user_9.json b/libs/wire-api/test/golden/testObject_UserConnectionList_user_9.json
deleted file mode 100644
index 609ad8e81d9..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnectionList_user_9.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "connections": [
-        {
-            "status": "blocked",
-            "conversation": "00000000-0000-0001-0000-000000000001",
-            "to": "00000000-0000-0001-0000-000000000000",
-            "from": "00000000-0000-0001-0000-000100000000",
-            "last_update": "1864-05-09T05:18:43.747Z",
-            "message": null
-        },
-        {
-            "status": "blocked",
-            "conversation": null,
-            "to": "00000000-0000-0001-0000-000000000000",
-            "from": "00000001-0000-0001-0000-000000000000",
-            "last_update": "1864-05-09T22:10:45.987Z",
-            "message": "\u000c\u000e9󱂞𡵘\r&\u0004T𬥼\"j]6@i䆽+bc\u000eY/\u0006􂙤BF@Q}'1\u0013YP#Z𑶑󰅰43𨈗]V󺕢s\u000e(宀zv6\u0012;𓁚1乧\\\u0015\u0014\\\u001b^ኁ􉤻P𮬰^~𣎚Y2b𫻆.\reg'y?󺌝󲰇&鰉𤛈\u001a鬲+*7*#\u001d􄈰濥6\u0015\u0004\u000eC􋄬􁹣󰰍\u0016ﭰ\u001f\u0004윧k\u000cM$T\tJAP K%E𭰓o1𘨖&\u0003􊃼\u00131\u0000𣵏𡹡_HBZDJdy\np|l9󶦬Ot\u0016[􌂽g󹿹A𥳷\u000e\u0016􉱳sP\u000ck󸐥bd\\\u0006B\u000c`㥗󲾆qN􆔗V\u0011 𬅀l괩XL\t\u0016󽨘𪕷KH􎞦l\u0005Pm\u001cQKVl롂􈌁r\u0011Eo𒍋i\u0015𬛤\u000eM9\u0006"
-        },
-        {
-            "status": "pending",
-            "conversation": null,
-            "to": "00000000-0000-0000-0000-000100000001",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T04:21:58.696Z",
-            "message": "\u000cQvQ U:%B=PF𪇲𪐋𫺠v\u000c􆆻M-I\u001c01􃂇I\\\u001d􄧄/Cz|l</􉁹\t\t\u0010Y<W\u0008\r󼿺􊦪p\"uꗃ󿠚o𭏻􌽕𗔌-􁸜3Vkx6𭎖i<\u000f󺨑濿p𡩽𘐶􍳾5mO􌶍%j\u0016𤇌.m􅁙d􏆿𫗗NUD5\u0015a\u0006\u001d#\u0010K⾙@C𩼽.P\u0007𗱘󽝺ql\u0000\u000bP𩼷􄏰{ႤPfJ,R󰭰9*h󽪍# ʆ4c𤂰􆟣\u0015{{L67,𬋥#-Ddhy=󹝿\rZ󶾰𐦴􊞘A\u0018\u0012𭪆D\u0017d𝡏4~M\\k5𡄞O\u0003ZSk~'\u0000$\u0019Et􏰱􄮴b໓𥭸"
-        },
-        {
-            "status": "pending",
-            "conversation": "00000000-0000-0001-0000-000000000001",
-            "to": "00000000-0000-0000-0000-000000000001",
-            "from": "00000001-0000-0001-0000-000100000001",
-            "last_update": "1864-05-09T15:26:16.369Z",
-            "message": null
-        },
-        {
-            "status": "sent",
-            "conversation": null,
-            "to": "00000001-0000-0001-0000-000000000001",
-            "from": "00000001-0000-0000-0000-000000000000",
-            "last_update": "1864-05-09T16:22:06.661Z",
-            "message": null
-        }
-    ],
-    "has_more": false
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_1.json b/libs/wire-api/test/golden/testObject_UserConnection_user_1.json
index df37cb1d637..db572ba9c11 100644
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserConnection_user_1.json
@@ -1,8 +1,8 @@
 {
-    "status": "pending",
     "conversation": null,
-    "to": "00000001-0000-0001-0000-000300000002",
     "from": "00000000-0000-0004-0000-000100000001",
     "last_update": "1864-05-07T21:52:21.955Z",
-    "message": null
-}
\ No newline at end of file
+    "message": null,
+    "status": "pending",
+    "to": "00000001-0000-0001-0000-000300000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_10.json b/libs/wire-api/test/golden/testObject_UserConnection_user_10.json
deleted file mode 100644
index 8c9dc182fd4..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_10.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "ignored",
-    "conversation": "00000002-0000-0004-0000-000100000002",
-    "to": "00000000-0000-0001-0000-000300000002",
-    "from": "00000003-0000-0004-0000-000400000001",
-    "last_update": "1864-05-09T23:20:11.508Z",
-    "message": "B{rg\u0008=_&󺁝\u0016n58䞲f`\u001ej􎼰ଁL\u001b\u001dN\u0015蝋G\u0011\u000f􀂓(\u001515My呐rN1<\u0004󽮭Ro5\u000bA\u0010K𝕋\u0019𤿴&󶇦쎈\u0000\u0005yf2p,󻱪􋆮]\u001fs'􆯪,\u0003G獼\u001a𤘸󾢠\nS􎲒U🁔m\u0015?vX󴇇@.\u0017fr𦺧h\u0001𫘆􃳰Hq󴈛&􊂡;?\u0019"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_11.json b/libs/wire-api/test/golden/testObject_UserConnection_user_11.json
deleted file mode 100644
index 5a054e0fd17..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_11.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "cancelled",
-    "conversation": null,
-    "to": "00000004-0000-0003-0000-000100000002",
-    "from": "00000003-0000-0003-0000-000200000002",
-    "last_update": "1864-05-06T01:03:59.594Z",
-    "message": "h􀲨\u0011𭋽HH\u001e\u0004󸶞o𤟟𐆑T\u0013WR\u0004f𫣌\u0015awJ#\u0000bRBN\u0003r:󱚚L\u001cmXu랁R\u0015E\u0010\u0001\u0013\u001d\u0003:A󻥺󼉶𭎄#Ki⼻𝍓\u000e􏃠#s!y\u0013B"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_12.json b/libs/wire-api/test/golden/testObject_UserConnection_user_12.json
deleted file mode 100644
index c25e0bf9d4a..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_12.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "sent",
-    "conversation": "00000002-0000-0003-0000-000200000003",
-    "to": "00000000-0000-0002-0000-000400000000",
-    "from": "00000000-0000-0003-0000-000400000000",
-    "last_update": "1864-05-11T04:35:47.647Z",
-    "message": "D\u001ej댨a􊰼F52t8 ;Jt􂝧\u0014\u000e\u0016se\u000fX󴩩Q3􀗕m\u0002w\u0016/e𗵪sG􆑃𒍪`諔\u0006󸇳L;􃿎􃐵@;誚ㅕ~𓈇M\\\u001fI\u0000󺫬{;=d\u001a\u0015Jw\u0011?𡫸\u00180Kl#D𪶫W\\^􀈲𥗃\u0001p󳤨\u001b!n\u000e<}₯`>(󴔭\u000c]􌩓\nl^\u001f๋\u0006\u0001𢭦8M\u0016\u0008\u001c \u0017󴹁-\"K:3\rE4`𝕱\u0017\u0019󰜟0!^a􋍓\u001f8􊰴n􇀟\u001e󷖢𨘌Q󱲝\u0004q𮁩As\u000f􍜦\u0012qJ$r]􍧔 \u000bk%*\t 􁩷s\u0006\\y)+$ 󵯩$?1\u001fQ􉜔\r􅼖M𤥊𧌰A`𗜏[)pJ/󷆖\u0008cI㔛)*𮪃𦘯~s\u0010;󿆋$:w\u0019􏍀\u0003𨿓󸃎\u0006z\u00004𞀂A72obm^X\u001c􈫁c"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_13.json b/libs/wire-api/test/golden/testObject_UserConnection_user_13.json
deleted file mode 100644
index 06c599cbc57..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_13.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "cancelled",
-    "conversation": "00000000-0000-0003-0000-000200000004",
-    "to": "00000002-0000-0004-0000-000000000001",
-    "from": "00000001-0000-0002-0000-000000000001",
-    "last_update": "1864-05-09T14:20:36.319Z",
-    "message": "{𩅡\u0004a\u0017裇􊳷%"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_14.json b/libs/wire-api/test/golden/testObject_UserConnection_user_14.json
deleted file mode 100644
index cb4e2c4d24e..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_14.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "ignored",
-    "conversation": "00000001-0000-0003-0000-000300000003",
-    "to": "00000004-0000-0003-0000-000100000002",
-    "from": "00000001-0000-0003-0000-000300000002",
-    "last_update": "1864-05-06T15:50:31.413Z",
-    "message": "YI97f𫖮􊌌P5ra;\u0012d𞣊󻱚\"cp\u0008lU􊉕􋙲+\u001aQ,tWuX􍁌𫇦􁔀u\u0003h\u0008`p"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_15.json b/libs/wire-api/test/golden/testObject_UserConnection_user_15.json
deleted file mode 100644
index e1e8d1bdbd4..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_15.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "ignored",
-    "conversation": null,
-    "to": "00000002-0000-0002-0000-000400000003",
-    "from": "00000000-0000-0000-0000-000000000001",
-    "last_update": "1864-05-08T01:23:07.786Z",
-    "message": "ABA`􍻰\u0014\u0007𧗿DUz1\u001bsztI𐮈𡧿%Y9s0a\u001c\u0016󼕤#\u0013󼴼􊈻?6󷞥G?4􅚟g:n\u0010\u0000󲚊𧫣-\u001e)0}w\u0010􃪯\u000cMQ\u0017\r􃢡𐡔\u0015B\u0000𧢔f>!P\u001et\u000f𒐅𡔷\u0001?v$j2\u000e\u001f𣕹@󲜀\u0008z佷\u000eD\u0002\u0014_?d𗷑딂>𣖐2+\u001dH\u001fiN2􅭨𒓊􇽘7\u0010;􂽔􊓘nJlO%\u001ea-𤿤\u000c+f𦲓\u0005\u000e\"회z\u000c𫁦w𭠾􁢏S#mH|􄯨C􇵜S!\u0002\no\u001e󼫪K\t\u0018\u0011h"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_16.json b/libs/wire-api/test/golden/testObject_UserConnection_user_16.json
deleted file mode 100644
index 50c6f7b0d52..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_16.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "cancelled",
-    "conversation": null,
-    "to": "00000000-0000-0004-0000-000200000000",
-    "from": "00000002-0000-0002-0000-000200000002",
-    "last_update": "1864-05-13T18:59:24.504Z",
-    "message": "gZ9\u0005s-\u0006Pu\u0013\u0017yt\nD~𗬰\u000f\u0007r􁎄𪍧q𨭓^n\u001b*!􈈳C􏟻-)tm>7\u001cc&\u0018)𭥭\u0003𫔪M󳥮3󵸸xS\u001aRks\u0018\u0019a\u000b𤼻g쇃\u0002:A󸜎S38f*󿐑􀻷􋇉􃼔_0w\"of;\u0003𐅜𥖎󶲄Yw𢭂\u001f𭰧\u001fYq\u000c\u001d58\tO"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_17.json b/libs/wire-api/test/golden/testObject_UserConnection_user_17.json
deleted file mode 100644
index 8a414307522..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_17.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "pending",
-    "conversation": "00000003-0000-0004-0000-000300000000",
-    "to": "00000002-0000-0002-0000-000100000000",
-    "from": "00000003-0000-0003-0000-000100000003",
-    "last_update": "1864-05-08T23:56:52.951Z",
-    "message": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_18.json b/libs/wire-api/test/golden/testObject_UserConnection_user_18.json
deleted file mode 100644
index 677cf8ddadf..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_18.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "cancelled",
-    "conversation": "00000001-0000-0001-0000-000400000000",
-    "to": "00000003-0000-0002-0000-000300000003",
-    "from": "00000000-0000-0003-0000-000100000001",
-    "last_update": "1864-05-11T22:44:27.192Z",
-    "message": "B\u0013:\"|𗬔m?\u0012GA\u0005/ n\u0016􅀩dz5𠏵$'[$un\u0008{\u000baK\u0008\u001d𩬮[\u0005󳋜𨞍󱤕\u001a\u0016\u00022_R𤦯𗥏􊵹P󻘶,\u0019􊿨\u001c!󳉐'G𬢕A 𢀬;p𝨸\t󰤃:\u0013j𫊿4+\u0012+\u0003碌wuBb􉞬*_ፐ_[y=\u0006󾥧ﰃ􉚧䙯ly𢾸ce=kaOy\u000c𨅕>\u001f𐔃|춳!n6H𦟔惽F{M𥬚i\\깬;9q>?[⯾\u0010\n\r\u000f\r|\"􄱠MxwjZ;^ؖA󽱧G;S\u0012uB\u0007(}_Z䟑𛃻V'\u0002#Aa\u001aM􇶖\u001d◷1_"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_19.json b/libs/wire-api/test/golden/testObject_UserConnection_user_19.json
deleted file mode 100644
index 4909c346813..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_19.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "accepted",
-    "conversation": "00000002-0000-0002-0000-000100000000",
-    "to": "00000003-0000-0002-0000-000000000002",
-    "from": "00000001-0000-0003-0000-000300000000",
-    "last_update": "1864-05-04T10:25:12.601Z",
-    "message": "g𬩅􎬘􁽉󲢘𥄩𠶙􇋜h\u0010󳮸\u001a𨮅􃵄I𤪚􈫐O􈋵栅L\u0017ZfM*\u001b\n󾀠Q\u0004f\u001fX􀬆m{cf\u000eZ󼸌󳞾}EJ\u000e/fi𧸐]𩾎W<L.pK9H𫛏\u000e4􉧦(􁹭7SO\r􍸕,N\u000cy􁆝\u0004\u0018𫲃\r󾜀q\u0007󾁫\u0004\u0016󰡱RPy5:I$d􂐳2w"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_2.json b/libs/wire-api/test/golden/testObject_UserConnection_user_2.json
index 460050e79f5..5324272d8b2 100644
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserConnection_user_2.json
@@ -1,8 +1,8 @@
 {
-    "status": "cancelled",
     "conversation": "00000002-0000-0001-0000-000000000004",
-    "to": "00000001-0000-0003-0000-000100000000",
     "from": "00000004-0000-0002-0000-000000000004",
     "last_update": "1864-05-11T10:43:38.227Z",
-    "message": " D\u0017*􏚴󿓚\u0006&*`\u0008Rㅬ𫔫\u001c𣆻戩\u0019\u0005\n-yc&t\t3E樲:𩤭t\u00111\u0002N\u0004\u0019$:\"\u0019\u0019\u001a𧥸됦y\u0001e|\u0010𦒘o[𓌵<56Tm𣶎&3씖!x<y\"𧙷|m88𦷐N{\u00029󽢨kK\u001ba\u0000r\u0019󵷚+h\u0004(L\u001d\u0008dD\u0006u󲎍\\吆𦌿K`9;\u001b\u0008x!/K,\u0001曶\u0013\n/􋥺uU\u0006{󲑫+qA􅯃z\u0006\u000ff|s(䝔~^𩳕P\u0002*U𐲟㫉J~\u001f􏚥i␄\u0019.\u0018󴦇􇰢Kl|B\u0003󸬸d\u001bg.6n 弗\u0015𛆷s=􄇈J`#􂻡𓊮{𦸌h`􅱍O\u0015􈾫~᳒𢁾t2t𓍨B2\t傳4"
-}
\ No newline at end of file
+    "message": " D\u0017*􏚴󿓚\u0006&*`\u0008Rㅬ𫔫\u001c𣆻戩\u0019\u0005\n-yc&t\t3E樲:𩤭t\u00111\u0002N\u0004\u0019$:\"\u0019\u0019\u001a𧥸됦y\u0001e|\u0010𦒘o[𓌵<56Tm𣶎&3씖!x<y\"𧙷|m88𦷐N{\u00029󽢨kK\u001ba\u0000r\u0019󵷚+h\u0004(L\u001d\u0008dD\u0006u󲎍\\吆𦌿K`9;\u001b\u0008x!/K,\u0001曶\u0013\n/􋥺uU\u0006{󲑫+qA􅯃z\u0006\u000ff|s(䝔~^𩳕P\u0002*U𐲟㫉J~\u001f􏚥i␄\u0019.\u0018󴦇􇰢Kl|B\u0003󸬸d\u001bg.6n 弗\u0015𛆷s=􄇈J`#􂻡𓊮{𦸌h`􅱍O\u0015􈾫~᳒𢁾t2t𓍨B2\t傳4",
+    "status": "cancelled",
+    "to": "00000001-0000-0003-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_20.json b/libs/wire-api/test/golden/testObject_UserConnection_user_20.json
deleted file mode 100644
index a66bbff84d7..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_20.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "cancelled",
-    "conversation": "00000000-0000-0002-0000-000000000004",
-    "to": "00000002-0000-0000-0000-000000000000",
-    "from": "00000003-0000-0003-0000-000200000004",
-    "last_update": "1864-05-12T04:26:30.406Z",
-    "message": "z@h󰾮>\u000f󳸘`\u001f\r\u000fB{sy􍋇\u0018𪗉%\u000e<󴲦)5SL􀟻\u001e1𐝉D􃥛\u0012dപ,󵶕\u0000SB6P􃪇Y뀝𥟞𘕌禁𤞝\u0013h\r@禩d\"{i\"@=_\u0002\n@\u0011L;oU~\u0002`\tf\u0001Np\u0002둝(\u0003_󿩷S\u0011{e􄹄[\n􊗈a.?sq\u001d𧶒⿕󽳁4av2=􀄞4즢\u0014%0󽭮ꄋ 9􋈲\u0012P󵝸􋷰\u00164S󳕕󺎼찉y\u00140D1􎨙=2d􅹛\u0011|k\u001f󱦟춅􀖒\u001e4󰎃w\u001ai.􃱄𒌎=Su󿿡}\u0018󵄴􂭙{kg3(􀃨矩"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_3.json b/libs/wire-api/test/golden/testObject_UserConnection_user_3.json
index e06283a770c..71ebed3d217 100644
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserConnection_user_3.json
@@ -1,8 +1,8 @@
 {
-    "status": "pending",
     "conversation": null,
-    "to": "00000002-0000-0001-0000-000000000001",
     "from": "00000004-0000-0002-0000-000200000003",
     "last_update": "1864-05-07T19:25:59.201Z",
-    "message": "=𤴀N5\r@NT1d􊨹𨷜𘒅􏔫🍵󲾶\u0000󿚵\n􀀲aSH\u0001B\u0017c\u001f앆[E𧒪뱦\n𫣁\r\u0005ꪏ愨H\u0000`󶥀┍𪚣_:\u000b}\\|ր瑅\u0018m\u0004\u0002𝛦\u0008\u00010箒p'ap\u000bwo9\"z|hVZ\rQBV\u0003@\u001cA+𬦽C󶸘T𑴰\u0004s\u0016P釿󰜑h󴄽@<5􁞄Ql𨃔𫼒\u0019邇\t\u000fV-\u0012@䏹\u001fwi櫰)\u0017􈌕\r\u000bYt􇉬OZ􃕵貯\u001cp\u0008PSly3X\u001b\u001eU𠌁(𘓶t讚\u0015⇶`"
-}
\ No newline at end of file
+    "message": "=𤴀N5\r@NT1d􊨹𨷜𘒅􏔫🍵󲾶\u0000󿚵\n􀀲aSH\u0001B\u0017c\u001f앆[E𧒪뱦\n𫣁\r\u0005ꪏ愨H\u0000`󶥀┍𪚣_:\u000b}\\|ր瑅\u0018m\u0004\u0002𝛦\u0008\u00010箒p'ap\u000bwo9\"z|hVZ\rQBV\u0003@\u001cA+𬦽C󶸘T𑴰\u0004s\u0016P釿󰜑h󴄽@<5􁞄Ql𨃔𫼒\u0019邇\t\u000fV-\u0012@䏹\u001fwi櫰)\u0017􈌕\r\u000bYt􇉬OZ􃕵貯\u001cp\u0008PSly3X\u001b\u001eU𠌁(𘓶t讚\u0015⇶`",
+    "status": "pending",
+    "to": "00000002-0000-0001-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_4.json b/libs/wire-api/test/golden/testObject_UserConnection_user_4.json
index 37377c50dd6..caa91b98b94 100644
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserConnection_user_4.json
@@ -1,8 +1,8 @@
 {
-    "status": "cancelled",
     "conversation": "00000000-0000-0003-0000-000200000000",
-    "to": "00000002-0000-0000-0000-000400000001",
     "from": "00000004-0000-0000-0000-000300000001",
     "last_update": "1864-05-08T14:39:50.322Z",
-    "message": null
-}
\ No newline at end of file
+    "message": null,
+    "status": "cancelled",
+    "to": "00000002-0000-0000-0000-000400000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_5.json b/libs/wire-api/test/golden/testObject_UserConnection_user_5.json
deleted file mode 100644
index 9f3249e86d6..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_5.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "blocked",
-    "conversation": "00000000-0000-0000-0000-000100000000",
-    "to": "00000002-0000-0003-0000-000200000000",
-    "from": "00000003-0000-0001-0000-000400000000",
-    "last_update": "1864-05-13T06:10:28.560Z",
-    "message": "A𮇘 \u0013$􁾧\u0000\u001e$7%\u0001;󺷫^O\u0006!𗐞𮓄8󱲯X㑟c+カ=:dct\u0006"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_6.json b/libs/wire-api/test/golden/testObject_UserConnection_user_6.json
deleted file mode 100644
index 7c7f4026d35..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_6.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "sent",
-    "conversation": "00000003-0000-0003-0000-000200000001",
-    "to": "00000002-0000-0001-0000-000200000001",
-    "from": "00000002-0000-0004-0000-000400000004",
-    "last_update": "1864-05-09T12:04:01.926Z",
-    "message": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_7.json b/libs/wire-api/test/golden/testObject_UserConnection_user_7.json
deleted file mode 100644
index a7bdf31f302..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_7.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "pending",
-    "conversation": null,
-    "to": "00000002-0000-0000-0000-000400000002",
-    "from": "00000001-0000-0000-0000-000100000003",
-    "last_update": "1864-05-06T17:21:11.586Z",
-    "message": null
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_8.json b/libs/wire-api/test/golden/testObject_UserConnection_user_8.json
deleted file mode 100644
index ca339179934..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_8.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "accepted",
-    "conversation": "00000000-0000-0003-0000-000300000003",
-    "to": "00000002-0000-0000-0000-000200000001",
-    "from": "00000000-0000-0003-0000-000000000003",
-    "last_update": "1864-05-07T21:27:56.433Z",
-    "message": "港󰸶\u0019𭕈|D8q(cueA󲈵g}U𒉄\\􊲛2\u0008tR\u0013󸡞.t賟>\u001d\u0001󾒍𝨾􊘏G\u0007z𭘛A󻊜\u0004􅗹􍬦@O<{兑XE\u001d?􌡩f𝘢𦀥𝚠􋹺\u0004\u0002M흭T􍎜'"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserConnection_user_9.json b/libs/wire-api/test/golden/testObject_UserConnection_user_9.json
deleted file mode 100644
index 009e135b14d..00000000000
--- a/libs/wire-api/test/golden/testObject_UserConnection_user_9.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "status": "accepted",
-    "conversation": null,
-    "to": "00000003-0000-0001-0000-000100000002",
-    "from": "00000000-0000-0000-0000-000000000002",
-    "last_update": "1864-05-11T01:59:33.405Z",
-    "message": "􆌚躤 􊁇< /󷒯f\u00164􎫰>􃗘\u001a!\u0000􉑖\u000f𬙜'󳗇g󾏡Ak\u0002HI󲕷\u00123EJ'>n\u000f\n\u000e\n\u0003ʙ􃦣nङ𝛝\u0019_\u0013d\u0004'C\u000bYF∇)\u0000\"[}u%瞸qc\u0001/#)󵴗󺷏I`\u001d𝌣2*%!u:\u001b󾖈\u0015\u001cH𡎽f9/􋮗🗁B󴚥J<􁵬`[u󸅵7𥕏N\u0007>ȉ𦩏iၘ\u000b\u001767\u00192r\u001e󳔮\u001e\u001f\u0007\u00008&Ae\u000fK􉅝􌼳󾕙𘓊\u0005\u0006>iTu𭨦𭾂LrY𪔸𥪤\u0004~=a3Q\u000eH􌢢5lN\u0000\u0004E\\\u0018ﵸ\u0008欝\u0006FuJ1𣜫󽝸I)L􁠘\r\u0014𤃈;g􊿙􉯼^7\u0016\u001c>(덂􈷛𣝩𦵹b,9\u0012𫒭+&4,\u0018&\u0007\u00156A𫝋jR0􁄼9M\u001a"
-}
\ No newline at end of file
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_1.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_1.json
index 943e9224515..15755d963a4 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_1.json
@@ -4,4 +4,4 @@
         "id": "00006bd9-0000-61c8-0000-35df0000024b"
     },
     "user": "00006bd9-0000-61c8-0000-35df0000024b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_10.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_10.json
index eb46d22c4c7..c70df821ccc 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_10.json
@@ -4,4 +4,4 @@
         "id": "00001ac9-0000-4979-0000-23bf00007d42"
     },
     "user": "00001ac9-0000-4979-0000-23bf00007d42"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_11.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_11.json
index da8339625c9..604197748bb 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_11.json
@@ -4,4 +4,4 @@
         "id": "00002afa-0000-5c37-0000-154b00003fb6"
     },
     "user": "00002afa-0000-5c37-0000-154b00003fb6"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_12.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_12.json
index c87e59a72e2..391d48ecb34 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_12.json
@@ -4,4 +4,4 @@
         "id": "0000247e-0000-06f0-0000-5c5800000177"
     },
     "user": "0000247e-0000-06f0-0000-5c5800000177"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_13.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_13.json
index 991b0b85d35..b4f5c54e18a 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_13.json
@@ -4,4 +4,4 @@
         "id": "00006ccd-0000-1a2e-0000-343d00004647"
     },
     "user": "00006ccd-0000-1a2e-0000-343d00004647"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_14.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_14.json
index 8d7296e75e1..1701c3f371a 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_14.json
@@ -4,4 +4,4 @@
         "id": "0000135c-0000-4c2e-0000-19f4000008f2"
     },
     "user": "0000135c-0000-4c2e-0000-19f4000008f2"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_15.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_15.json
index 5aa7642fdd5..1d09170bf86 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_15.json
@@ -4,4 +4,4 @@
         "id": "0000746b-0000-2892-0000-1fa70000195a"
     },
     "user": "0000746b-0000-2892-0000-1fa70000195a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_16.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_16.json
index ef82cd69525..e42681dd44f 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_16.json
@@ -4,4 +4,4 @@
         "id": "000069cf-0000-6ac1-0000-587100000e90"
     },
     "user": "000069cf-0000-6ac1-0000-587100000e90"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_17.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_17.json
index 04a20c569f7..d9bf8375a42 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_17.json
@@ -4,4 +4,4 @@
         "id": "00002713-0000-6fab-0000-684500003b9a"
     },
     "user": "00002713-0000-6fab-0000-684500003b9a"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_18.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_18.json
index cb6c852933e..be2fc1bc129 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_18.json
@@ -4,4 +4,4 @@
         "id": "0000146a-0000-6704-0000-552100002f68"
     },
     "user": "0000146a-0000-6704-0000-552100002f68"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_19.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_19.json
index d8f0c829a67..847b4d15682 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_19.json
@@ -4,4 +4,4 @@
         "id": "00005d29-0000-655d-0000-0cea00001b87"
     },
     "user": "00005d29-0000-655d-0000-0cea00001b87"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_2.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_2.json
index 02430b3d6c1..6595fa09f3d 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_2.json
@@ -4,4 +4,4 @@
         "id": "00007b9d-0000-35b1-0000-795e00002e78"
     },
     "user": "00007b9d-0000-35b1-0000-795e00002e78"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_20.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_20.json
index 89f595287ae..aa1d2a8b8fd 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_20.json
@@ -4,4 +4,4 @@
         "id": "000052c0-0000-0cc3-0000-4aac00007ccd"
     },
     "user": "000052c0-0000-0cc3-0000-4aac00007ccd"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_3.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_3.json
index 4dc9e3e22df..1d9e572286a 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_3.json
@@ -4,4 +4,4 @@
         "id": "0000292f-0000-6f63-0000-6052000045db"
     },
     "user": "0000292f-0000-6f63-0000-6052000045db"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_4.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_4.json
index b5b343becff..da19994d364 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_4.json
@@ -4,4 +4,4 @@
         "id": "00002211-0000-5060-0000-5c0600002885"
     },
     "user": "00002211-0000-5060-0000-5c0600002885"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_5.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_5.json
index 92adf33aa3b..bc6988247dd 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_5.json
@@ -4,4 +4,4 @@
         "id": "00005168-0000-1fc2-0000-2e8e00001b48"
     },
     "user": "00005168-0000-1fc2-0000-2e8e00001b48"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_6.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_6.json
index 622882727dd..309b4d1f184 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_6.json
@@ -4,4 +4,4 @@
         "id": "00001e1f-0000-5ed2-0000-276700007eb0"
     },
     "user": "00001e1f-0000-5ed2-0000-276700007eb0"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_7.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_7.json
index cf2ff11bb86..b704fc70e21 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_7.json
@@ -4,4 +4,4 @@
         "id": "00004c44-0000-084d-0000-700400006fbf"
     },
     "user": "00004c44-0000-084d-0000-700400006fbf"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_8.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_8.json
index 550a3f92352..22bd0d82d57 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_8.json
@@ -4,4 +4,4 @@
         "id": "00005af3-0000-7015-0000-0c6c00006a00"
     },
     "user": "00005af3-0000-7015-0000-0c6c00006a00"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_9.json b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_9.json
index 745ab6f55ba..34952a8d901 100644
--- a/libs/wire-api/test/golden/testObject_UserHandleInfo_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UserHandleInfo_user_9.json
@@ -4,4 +4,4 @@
         "id": "000034cd-0000-0a58-0000-48f90000595b"
     },
     "user": "000034cd-0000-0a58-0000-48f90000595b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdList_1.json b/libs/wire-api/test/golden/testObject_UserIdList_1.json
index 78028ebcaf2..b7e781b6e40 100644
--- a/libs/wire-api/test/golden/testObject_UserIdList_1.json
+++ b/libs/wire-api/test/golden/testObject_UserIdList_1.json
@@ -12,4 +12,4 @@
         "00001e50-0000-2dd8-0000-0c7a000053f0",
         "00003842-0000-2193-0000-275c00004421"
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdList_2.json b/libs/wire-api/test/golden/testObject_UserIdList_2.json
index 0c863a34364..24ef380de04 100644
--- a/libs/wire-api/test/golden/testObject_UserIdList_2.json
+++ b/libs/wire-api/test/golden/testObject_UserIdList_2.json
@@ -1,3 +1,3 @@
 {
     "user_ids": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_1.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_1.json
index 4e4f080e7b6..029c472a9d2 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_1.json
@@ -2,4 +2,4 @@
     "email": "S\u0005X􆷳$\u0002\"􏇫e󷾤惿󻼜L\u0017@P.b",
     "phone": null,
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_10.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_10.json
index 355d6d1b693..0142780ab74 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_10.json
@@ -2,4 +2,4 @@
     "email": "No\u0008󵳀b=`yl𠩆p.w󿷁𢬉\u0014𤣧lm𬺹&j9\u0007@􁘣.1󻻊\u0017_􁊈Q􉦻z.Ywe󸄠髊>",
     "phone": null,
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_11.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_11.json
index 8581902c147..bff65122616 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_11.json
@@ -2,4 +2,4 @@
     "email": null,
     "phone": "+755837448",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_12.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_12.json
index 3a9571a1b62..6d4144937f8 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_12.json
@@ -2,4 +2,4 @@
     "email": "K󷄻\u0012@\u0014N0Q፺rva\u00155􇹀+S􅏮;\u001c%\u0015",
     "phone": null,
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_13.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_13.json
index 69a7471de56..c4632b61e54 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_13.json
@@ -2,4 +2,4 @@
     "email": "e\u0006󽀫􃕲vN:%􂖵\u001aSi󼸨Qq@",
     "phone": "+387350906",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_14.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_14.json
index 176f5acfa13..5d2a9ce3924 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_14.json
@@ -2,4 +2,4 @@
     "email": "󵐟𬻾\u0018𖦁3\u001f<=gg@󼱩󹩋Nbo\tQ:􉇎f𡖦L󶟫",
     "phone": "+79378139213406",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_15.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_15.json
index 524675ce988..35fa355d0f6 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_15.json
@@ -2,4 +2,4 @@
     "email": null,
     "phone": "+092380942233194",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_16.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_16.json
index 6b71be3bc8d..56073c95ac1 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_16.json
@@ -5,4 +5,4 @@
         "subject": "\u0013\u001c",
         "tenant": "a\u001c"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_17.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_17.json
index 271d419f821..de51e106423 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_17.json
@@ -4,4 +4,4 @@
     "sso_id": {
         "scim_external_id": ""
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_18.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_18.json
index 18d28d559a2..4c7aa3559af 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_18.json
@@ -2,4 +2,4 @@
     "email": null,
     "phone": "+7322674905",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_19.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_19.json
index a21d6163e00..2d276e9f0aa 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_19.json
@@ -2,4 +2,4 @@
     "email": null,
     "phone": "+133514352685272",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_2.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_2.json
index 6adde4ab3e8..ed267903348 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_2.json
@@ -2,4 +2,4 @@
     "email": "􃂐􄲝󷘒\u0004\u000bE\u0005W\u0016O\u0013X_F⎵\u0002 $}𫵧\u001fJ3🗠S?@4WL;'\u0010l1]x𝄥",
     "phone": null,
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_20.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_20.json
index e9bbbec389d..c2b067e0ecd 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_20.json
@@ -2,4 +2,4 @@
     "email": "𠢬A@|􈧡󵤸N<\u0013z9\u0015V;^󷶾",
     "phone": "+926403020",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_3.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_3.json
index 42dcf7c63d2..12387a4c4ef 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_3.json
@@ -2,4 +2,4 @@
     "email": "⩅:\u0014Ei􆐰P􁕆󽓿6phe\u0013\u0003H,\u0018\u000b𣣄\u000b>@bwtC􏅶z2RT28\u0002􀓭<3Y",
     "phone": null,
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_4.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_4.json
index 57b6c887ed2..19e7f13385c 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_4.json
@@ -2,4 +2,4 @@
     "email": "\rH)𐂶@)􎞂\u001f槶\t\u0006􏚭_{𥲴7#",
     "phone": "+2559583362",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_5.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_5.json
index 28a7fce0e9d..68bd2291d27 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_5.json
@@ -5,4 +5,4 @@
         "subject": "󴤰",
         "tenant": ">􋲗􎚆󾪂"
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_6.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_6.json
index f3cf2dddcc7..c841bfca76f 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_6.json
@@ -2,4 +2,4 @@
     "email": null,
     "phone": "+03038459796465",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_7.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_7.json
index 81333fa33e6..5edc20024a5 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_7.json
@@ -2,4 +2,4 @@
     "email": null,
     "phone": "+805676294",
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_8.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_8.json
index 128938aa9c5..5e01fb0c2b1 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_8.json
@@ -5,4 +5,4 @@
         "subject": "",
         "tenant": ""
     }
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserIdentity_user_9.json b/libs/wire-api/test/golden/testObject_UserIdentity_user_9.json
index c576667087d..2500b91fd20 100644
--- a/libs/wire-api/test/golden/testObject_UserIdentity_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UserIdentity_user_9.json
@@ -2,4 +2,4 @@
     "email": "'\u0006B󴑞90\u0015KK\u0004in􋯽r\u0004@Jj\\𪄎>nY┲󱈆VO\u0012Q\r_:$᷂\u0004c~H8e}{g",
     "phone": null,
     "sso_id": null
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_1.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_1.json
index ad756f941c1..c4876360d5d 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_1.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_1.json
@@ -1,10 +1,10 @@
 {
-    "status": "disabled",
-    "last_prekey": {
-        "key": "髵9\u0005󸐶⯺\\3x承",
-        "id": 65535
-    },
     "client": {
         "id": "97"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": "髵9\u0005󸐶⯺\\3x承"
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_10.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_10.json
index 6e9bfa23167..39012f0cd8f 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_10.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_10.json
@@ -1,6 +1,6 @@
 {
-    "status": "pending",
     "client": {
         "id": "2e"
-    }
-}
\ No newline at end of file
+    },
+    "status": "pending"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_11.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_11.json
index a5352a86dc8..93dee5acdeb 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_11.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_11.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "last_prekey": {
-        "key": "",
-        "id": 65535
-    }
-}
\ No newline at end of file
+        "id": 65535,
+        "key": ""
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_12.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_12.json
index 274ae2d6b3f..fb16b194946 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_12.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_12.json
@@ -1,3 +1,3 @@
 {
     "status": "enabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_13.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_13.json
index 37a263d77e8..640a0a729f6 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_13.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_13.json
@@ -1,7 +1,7 @@
 {
-    "status": "pending",
     "last_prekey": {
-        "key": "=~\u0018㬗jSe\u0002",
-        "id": 65535
-    }
-}
\ No newline at end of file
+        "id": 65535,
+        "key": "=~\u0018㬗jSe\u0002"
+    },
+    "status": "pending"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_14.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_14.json
index fe3b62f338f..ba5a1633ba5 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_14.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_14.json
@@ -1,7 +1,7 @@
 {
-    "status": "disabled",
     "last_prekey": {
-        "key": "jO𨶜\rT󻁣",
-        "id": 65535
-    }
-}
\ No newline at end of file
+        "id": 65535,
+        "key": "jO𨶜\rT󻁣"
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_15.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_15.json
index d1f59d388e8..81b56a2ba0b 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_15.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_15.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "last_prekey": {
-        "key": "\u0010{\u0002",
-        "id": 65535
-    }
-}
\ No newline at end of file
+        "id": 65535,
+        "key": "\u0010{\u0002"
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_16.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_16.json
index 12ab9884996..4a9d3f085a2 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_16.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_16.json
@@ -1,7 +1,7 @@
 {
-    "status": "enabled",
     "last_prekey": {
-        "key": "}︨LE𫹙E",
-        "id": 65535
-    }
-}
\ No newline at end of file
+        "id": 65535,
+        "key": "}︨LE𫹙E"
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_17.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_17.json
index 96dbf576e65..d29aa252583 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_17.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_17.json
@@ -1,10 +1,10 @@
 {
-    "status": "disabled",
-    "last_prekey": {
-        "key": "\u0015 \u001d􇵖9,'<\u0007‴",
-        "id": 65535
-    },
     "client": {
         "id": "7a"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": "\u0015 \u001d􇵖9,'<\u0007‴"
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_18.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_18.json
index 6890236a688..77a20c0d87a 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_18.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_18.json
@@ -1,10 +1,10 @@
 {
-    "status": "pending",
-    "last_prekey": {
-        "key": "Z",
-        "id": 65535
-    },
     "client": {
         "id": "ba"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": "Z"
+    },
+    "status": "pending"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_19.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_19.json
index 0eaab310883..b6c2bd7f2fb 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_19.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_19.json
@@ -1,10 +1,10 @@
 {
-    "status": "enabled",
-    "last_prekey": {
-        "key": "",
-        "id": 65535
-    },
     "client": {
         "id": "88"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": ""
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_2.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_2.json
index e8085e06313..856896d59fc 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_2.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_2.json
@@ -1,10 +1,10 @@
 {
-    "status": "disabled",
-    "last_prekey": {
-        "key": "𛈥L,",
-        "id": 65535
-    },
     "client": {
         "id": "46"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": "𛈥L,"
+    },
+    "status": "disabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_20.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_20.json
index c353ff9bd0a..6689acd0340 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_20.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_20.json
@@ -1,3 +1,3 @@
 {
     "status": "pending"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_3.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_3.json
index a9b5cfcfd0b..a3868694a83 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_3.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_3.json
@@ -1,10 +1,10 @@
 {
-    "status": "enabled",
-    "last_prekey": {
-        "key": "W󾧥zރ\u001d",
-        "id": 65535
-    },
     "client": {
         "id": "6d"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": "W󾧥zރ\u001d"
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_4.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_4.json
index c353ff9bd0a..6689acd0340 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_4.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_4.json
@@ -1,3 +1,3 @@
 {
     "status": "pending"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_5.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_5.json
index 80531f32a5a..b86349b2d4a 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_5.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_5.json
@@ -1,10 +1,10 @@
 {
-    "status": "enabled",
-    "last_prekey": {
-        "key": "?\tvSq",
-        "id": 65535
-    },
     "client": {
         "id": "12"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": "?\tvSq"
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_6.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_6.json
index e635db229df..dd0973a3cc7 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_6.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_6.json
@@ -1,6 +1,6 @@
 {
-    "status": "enabled",
     "client": {
         "id": "50"
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_7.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_7.json
index 0d1ae475124..593520771fb 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_7.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_7.json
@@ -1,10 +1,10 @@
 {
-    "status": "enabled",
-    "last_prekey": {
-        "key": "",
-        "id": 65535
-    },
     "client": {
         "id": "63"
-    }
-}
\ No newline at end of file
+    },
+    "last_prekey": {
+        "id": 65535,
+        "key": ""
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_8.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_8.json
index c353ff9bd0a..6689acd0340 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_8.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_8.json
@@ -1,3 +1,3 @@
 {
     "status": "pending"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_9.json b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_9.json
index 025a9126740..c90f15f7317 100644
--- a/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_9.json
+++ b/libs/wire-api/test/golden/testObject_UserLegalHoldStatusResponse_team_9.json
@@ -1,6 +1,6 @@
 {
-    "status": "enabled",
     "client": {
         "id": "a9"
-    }
-}
\ No newline at end of file
+    },
+    "status": "enabled"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_1.json b/libs/wire-api/test/golden/testObject_UserProfile_user_1.json
index 34640966889..2fa10a67235 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_1.json
@@ -1,22 +1,22 @@
 {
+    "accent_id": 2,
+    "assets": [],
+    "deleted": true,
     "email": "4@",
+    "expires_at": "1864-05-10T06:42:08.436Z",
     "handle": "emsonpvo3-x_4ys4qjtjtkfgx.mag6pi2ldq.77m5vnsn_tte41r-0vwgklpeejr1t4se0bknu4tsuqs-njzh34-ba_mj8lm5x6aro4o.2wsqe0ldx",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000100000001"
-    },
+    "id": "00000002-0000-0001-0000-000000000000",
+    "legalhold_status": "no_consent",
     "locale": "ve-KE",
+    "name": "앦ച]$𩟒𬴴UV`\nF\u000c它ys'd\u0008Xy\u0005:\u001b𢀘\u001eD[<𠝶E",
+    "picture": [],
     "qualified_id": {
         "domain": "v.ay64d",
         "id": "00000002-0000-0001-0000-000000000000"
     },
-    "accent_id": 2,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "앦ച]$𩟒𬴴UV`\nF\u000c它ys'd\u0008Xy\u0005:\u001b𢀘\u001eD[<𠝶E",
-    "expires_at": "1864-05-10T06:42:08.436Z",
-    "team": "00000000-0000-0002-0000-000100000001",
-    "id": "00000002-0000-0001-0000-000000000000",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000000",
+        "provider": "00000000-0000-0000-0000-000100000001"
+    },
+    "team": "00000000-0000-0002-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_10.json b/libs/wire-api/test/golden/testObject_UserProfile_user_10.json
index 4f33938079d..e7818b19171 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_10.json
@@ -1,22 +1,22 @@
 {
-    "handle": "cxh8m",
-    "locale": "mr-CL",
-    "qualified_id": {
-        "domain": "yg0u9.w-7-l.x6",
-        "id": "00000002-0000-0000-0000-000000000001"
-    },
     "accent_id": 2,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "E8VP6\\\u0002\u0003􈵖𡔩䔌􍆝\u001a􂃗+D`󲅙󲽰GEl<\u001dU8y􃾙\u0000guH%XBf}\\\u0014􋠃𧹚\u0002H(\u001c􏖚𢒪)$.*(p~n𦠋j\u0005n\u0012\u001b]ﻇ𧟞=)𬀇󳸔Y\u0006󴭣𛋱\u0016E翻\t𛆕ᾔvLXFigV`Z\u0001wa𠬷}=\u000bS󵎿麚󼺳EA&r\u0019o6􌹳\u0010𭹨\u001d󴷔v󽧽🗃󳎺",
-    "expires_at": "1864-05-08T12:03:12.917Z",
-    "team": "00000001-0000-0000-0000-000000000001",
-    "id": "00000002-0000-0000-0000-000000000001",
     "assets": [
         {
-            "size": "complete",
             "key": "\u001f",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "expires_at": "1864-05-08T12:03:12.917Z",
+    "handle": "cxh8m",
+    "id": "00000002-0000-0000-0000-000000000001",
+    "legalhold_status": "no_consent",
+    "locale": "mr-CL",
+    "name": "E8VP6\\\u0002\u0003􈵖𡔩䔌􍆝\u001a􂃗+D`󲅙󲽰GEl<\u001dU8y􃾙\u0000guH%XBf}\\\u0014􋠃𧹚\u0002H(\u001c􏖚𢒪)$.*(p~n𦠋j\u0005n\u0012\u001b]ﻇ𧟞=)𬀇󳸔Y\u0006󴭣𛋱\u0016E翻\t𛆕ᾔvLXFigV`Z\u0001wa𠬷}=\u000bS󵎿麚󼺳EA&r\u0019o6􌹳\u0010𭹨\u001d󴷔v󽧽🗃󳎺",
+    "picture": [],
+    "qualified_id": {
+        "domain": "yg0u9.w-7-l.x6",
+        "id": "00000002-0000-0000-0000-000000000001"
+    },
+    "team": "00000001-0000-0000-0000-000000000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_11.json b/libs/wire-api/test/golden/testObject_UserProfile_user_11.json
index cdc7679645a..0d85b776628 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_11.json
@@ -1,23 +1,23 @@
 {
+    "accent_id": -2,
+    "assets": [
+        {
+            "key": "",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
     "email": "󳄸\u0019@+",
+    "expires_at": "1864-05-11T13:14:40.847Z",
     "handle": "nxd4m3jnqbghht70om5xn4bbnb_vres47msry0v.1so2.61d4_c01xrazl.bo3wdqz..z5ydp73gle3hshmd0u5ji8802q761ce87k_gkinka8q1vxkm9rht3i-k8qh49s46sg3hhmmhy6ucx0jb0xf9dci93r44g8y0m8mmyucamtw7et.eh8uca-2lig2ayy-747_i69-1m1txhz8dw-i02w0bhyz8sjbqlqu25e6n_2nmw00kp_ob",
+    "id": "00000000-0000-0001-0000-000200000002",
+    "legalhold_status": "no_consent",
     "locale": "tg-GL",
+    "name": "𥀵颯Z\n2\u0014y-\u000bcS\u001b\u000f^S:K\u000b{,}\u0000𧕡i𧤰\u0017𦍛t恾p};mY\u0011g&󸭹􈄝\u001fW􁻡䑝󽬸$\u001a6󸥢􌮂\tz𖧬+\u0012J󸚵􊖎􂜸뉦󴏀c넑B}𫂵E볩\u0003<D숕𫊤\t_i𐙟a(M#GgJ\u000f𫸭q2CB\u0005𮍰\u001fA*󼖳󽃢\n=\u0008",
+    "picture": [],
     "qualified_id": {
         "domain": "9p4.6cpl.p92",
         "id": "00000000-0000-0001-0000-000200000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "𥀵颯Z\n2\u0014y-\u000bcS\u001b\u000f^S:K\u000b{,}\u0000𧕡i𧤰\u0017𦍛t恾p};mY\u0011g&󸭹􈄝\u001fW􁻡䑝󽬸$\u001a6󸥢􌮂\tz𖧬+\u0012J󸚵􊖎􂜸뉦󴏀c넑B}𫂵E볩\u0003<D숕𫊤\t_i𐙟a(M#GgJ\u000f𫸭q2CB\u0005𮍰\u001fA*󼖳󽃢\n=\u0008",
-    "expires_at": "1864-05-11T13:14:40.847Z",
-    "team": "00000001-0000-0000-0000-000000000002",
-    "id": "00000000-0000-0001-0000-000200000002",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "team": "00000001-0000-0000-0000-000000000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_12.json b/libs/wire-api/test/golden/testObject_UserProfile_user_12.json
index 1454cf37090..716d76c5d05 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_12.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": 0,
+    "assets": [],
+    "deleted": true,
+    "expires_at": "1864-05-09T20:48:09.740Z",
     "handle": "ml",
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000000000001"
-    },
+    "id": "00000000-0000-0002-0000-000100000001",
+    "legalhold_status": "no_consent",
     "locale": "ks-AG",
+    "name": "\"EBhv#=𡉀qrx\u0002>XR􃩹B\u001fW哥d\u000e-\u000e\u0007",
+    "picture": [],
     "qualified_id": {
         "domain": "7.jw8.la-0.r",
         "id": "00000000-0000-0002-0000-000100000001"
     },
-    "accent_id": 0,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "\"EBhv#=𡉀qrx\u0002>XR􃩹B\u001fW哥d\u000e-\u000e\u0007",
-    "expires_at": "1864-05-09T20:48:09.740Z",
-    "team": "00000002-0000-0001-0000-000200000001",
-    "id": "00000000-0000-0002-0000-000100000001",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0000-0000-000000000000",
+        "provider": "00000000-0000-0000-0000-000000000001"
+    },
+    "team": "00000002-0000-0001-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_13.json b/libs/wire-api/test/golden/testObject_UserProfile_user_13.json
index d7e63cec440..b21ede36239 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_13.json
@@ -1,26 +1,26 @@
 {
-    "locale": "lu-VG",
-    "qualified_id": {
-        "domain": "1.z6lionkv7",
-        "id": "00000001-0000-0000-0000-000100000001"
-    },
     "accent_id": 1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "u\u0013蘇T\t\u001f;󱨲[\"n`\"\u0000D\r𧵣 Vj\u000ej>Pb􀡭]𣉾󳄵I\n\u0018􇎒6\u0001x\"p阞E\u0018@w􌹗𘢑R\u000bX𦕪𫁉􍻮@K|K󽮦4쬈𨦏\u0002o9",
-    "expires_at": "1864-05-07T18:04:28.203Z",
-    "id": "00000001-0000-0000-0000-000100000001",
-    "deleted": true,
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "expires_at": "1864-05-07T18:04:28.203Z",
+    "id": "00000001-0000-0000-0000-000100000001",
+    "legalhold_status": "no_consent",
+    "locale": "lu-VG",
+    "name": "u\u0013蘇T\t\u001f;󱨲[\"n`\"\u0000D\r𧵣 Vj\u000ej>Pb􀡭]𣉾󳄵I\n\u0018􇎒6\u0001x\"p阞E\u0018@w􌹗𘢑R\u000bX𦕪𫁉􍻮@K|K󽮦4쬈𨦏\u0002o9",
+    "picture": [],
+    "qualified_id": {
+        "domain": "1.z6lionkv7",
+        "id": "00000001-0000-0000-0000-000100000001"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_14.json b/libs/wire-api/test/golden/testObject_UserProfile_user_14.json
index c568a377e76..160e2991a5a 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_14.json
@@ -1,31 +1,31 @@
 {
-    "handle": ".0f-ea",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000001-0000-0001-0000-000100000001"
-    },
-    "locale": "oj",
-    "qualified_id": {
-        "domain": "9f97og.h2af889e64zw",
-        "id": "00000002-0000-0002-0000-000100000001"
-    },
     "accent_id": 2,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "𬜸d􃸶xuꇊ\u0019\u0002\u0007\u0017\u0013.\t.7k^!5*󴲎iT)\u0019􆹔󻰱흼\r\u001d𓏘~j\u001f\u0011X\u0001\u0010f􅔵Vo\u001c7]\u001b𩸅J𩿪􊢒,-K𫬃w`㕠憰\u0004^>A\n鄖C𝙗v􄅺R1Q󳷊\u0018U\u0005P\t\u001c8~\u0018𭏆\u0004𥔎𬪽𭓂\u0007_Kdj얒lN+L?󵡡-\u001f􁩀wGP.Zm",
-    "expires_at": "1864-05-08T01:21:51.302Z",
-    "team": "00000000-0000-0002-0000-000000000000",
-    "id": "00000002-0000-0002-0000-000100000001",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "expires_at": "1864-05-08T01:21:51.302Z",
+    "handle": ".0f-ea",
+    "id": "00000002-0000-0002-0000-000100000001",
+    "legalhold_status": "no_consent",
+    "locale": "oj",
+    "name": "𬜸d􃸶xuꇊ\u0019\u0002\u0007\u0017\u0013.\t.7k^!5*󴲎iT)\u0019􆹔󻰱흼\r\u001d𓏘~j\u001f\u0011X\u0001\u0010f􅔵Vo\u001c7]\u001b𩸅J𩿪􊢒,-K𫬃w`㕠憰\u0004^>A\n鄖C𝙗v􄅺R1Q󳷊\u0018U\u0005P\t\u001c8~\u0018𭏆\u0004𥔎𬪽𭓂\u0007_Kdj얒lN+L?󵡡-\u001f􁩀wGP.Zm",
+    "picture": [],
+    "qualified_id": {
+        "domain": "9f97og.h2af889e64zw",
+        "id": "00000002-0000-0002-0000-000100000001"
+    },
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "provider": "00000001-0000-0001-0000-000100000001"
+    },
+    "team": "00000000-0000-0002-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_15.json b/libs/wire-api/test/golden/testObject_UserProfile_user_15.json
index b854a7deee5..941aed90227 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_15.json
@@ -1,32 +1,32 @@
 {
-    "email": "F@\u0000",
-    "handle": "3ti0segu2s7u294jpsv5lixp_axfvix4h.a9phbpuprb5g1.g5a-5hh7ezf2ur8z.2pms57_cv2pupxv8xdgnvbqyx_eiyk3k0bsky53x1fzivty4j.c79jfo9zr9f8pru1j-ixl67d9cz23b1e-m603_iz8_2uf8neudzfq1vi1ec",
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000000",
-        "provider": "00000000-0000-0000-0000-000100000001"
-    },
-    "locale": "dv-MO",
-    "qualified_id": {
-        "domain": "q64o7.302d44.yvc0-7.61.v9mv",
-        "id": "00000002-0000-0002-0000-000000000001"
-    },
     "accent_id": 1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "󹚾-󷀧⤰\u0015S􅅐\u001aj𡄧tu\\󶜊𬁃\t\u001e𧿻𨑽󶌭\u001c\u0017\u0007d\u0017eT\u000e$􅿴YT_e𭻆!)\u000f\u0012S]􎖂SYm췈g\u0015pX,GQ\u0010F\u000fJ\u000e\u0008\u000bR\u001d\u0002挏􈍤y\u0018g轙J\u0015\"\u000cMX󲺆3g􊾈n4􁁀\u001f𝣩\u0010",
-    "team": "00000002-0000-0001-0000-000200000002",
-    "id": "00000002-0000-0002-0000-000000000001",
-    "deleted": true,
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "email": "F@\u0000",
+    "handle": "3ti0segu2s7u294jpsv5lixp_axfvix4h.a9phbpuprb5g1.g5a-5hh7ezf2ur8z.2pms57_cv2pupxv8xdgnvbqyx_eiyk3k0bsky53x1fzivty4j.c79jfo9zr9f8pru1j-ixl67d9cz23b1e-m603_iz8_2uf8neudzfq1vi1ec",
+    "id": "00000002-0000-0002-0000-000000000001",
+    "legalhold_status": "no_consent",
+    "locale": "dv-MO",
+    "name": "󹚾-󷀧⤰\u0015S􅅐\u001aj𡄧tu\\󶜊𬁃\t\u001e𧿻𨑽󶌭\u001c\u0017\u0007d\u0017eT\u000e$􅿴YT_e𭻆!)\u000f\u0012S]􎖂SYm췈g\u0015pX,GQ\u0010F\u000fJ\u000e\u0008\u000bR\u001d\u0002挏􈍤y\u0018g轙J\u0015\"\u000cMX󲺆3g􊾈n4􁁀\u001f𝣩\u0010",
+    "picture": [],
+    "qualified_id": {
+        "domain": "q64o7.302d44.yvc0-7.61.v9mv",
+        "id": "00000002-0000-0002-0000-000000000001"
+    },
+    "service": {
+        "id": "00000001-0000-0001-0000-000100000000",
+        "provider": "00000000-0000-0000-0000-000100000001"
+    },
+    "team": "00000002-0000-0001-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_16.json b/libs/wire-api/test/golden/testObject_UserProfile_user_16.json
index 6581efdea53..f6a13e110d7 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_16.json
@@ -1,31 +1,31 @@
 {
-    "email": "V@|",
-    "handle": "guo2m_9jgnm.snxp7uazht2j6je41-be6p5y9g-0afnnll.k5x0al45l948yuys97uy.7azgirru0r55.h-2ylot.j.y433-1jdw_ecazkzeqpa4lr.zt9.zjjaz7bzvxo4baqtod48_388s6-vxifhn9giwz6nc290fw2589psan",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000000",
-        "provider": "00000000-0000-0000-0000-000100000001"
-    },
-    "locale": "ja-BB",
-    "qualified_id": {
-        "domain": "19.i.mwv-7",
-        "id": "00000002-0000-0000-0000-000100000002"
-    },
     "accent_id": -1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "䰹뺎%P➪\u0007􊶙􀦨?.ő춷\u0001%ᗊ𢐑󶰧𢐰ꓸ󸪢⤻`)􊌊(&󽺅W活𨘁􉐟Sh\u0000𘦳󷜲\u0015\u0019\u0000󸈫󻚜\u0019*vUWp=/H:\u000fP𣍻K/Q}􁾋(󲮂Z𧢤)_󵕶O󼖞\u00180󿶓󳼰g>󺙵\u000e\u000fW󴰽h;𓇰\u000fyJt\u0016𑈽(q}鸶:b𠓔/\u001eGV􁇤{r㜛$oo1H󻀔n\u0008ꙛ􍧨hBiS􄈏6Az\u0010'􁆉=",
-    "expires_at": "1864-05-07T06:39:38.220Z",
-    "team": "00000002-0000-0000-0000-000100000001",
-    "id": "00000002-0000-0000-0000-000100000002",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
             "key": "",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "email": "V@|",
+    "expires_at": "1864-05-07T06:39:38.220Z",
+    "handle": "guo2m_9jgnm.snxp7uazht2j6je41-be6p5y9g-0afnnll.k5x0al45l948yuys97uy.7azgirru0r55.h-2ylot.j.y433-1jdw_ecazkzeqpa4lr.zt9.zjjaz7bzvxo4baqtod48_388s6-vxifhn9giwz6nc290fw2589psan",
+    "id": "00000002-0000-0000-0000-000100000002",
+    "legalhold_status": "no_consent",
+    "locale": "ja-BB",
+    "name": "䰹뺎%P➪\u0007􊶙􀦨?.ő춷\u0001%ᗊ𢐑󶰧𢐰ꓸ󸪢⤻`)􊌊(&󽺅W活𨘁􉐟Sh\u0000𘦳󷜲\u0015\u0019\u0000󸈫󻚜\u0019*vUWp=/H:\u000fP𣍻K/Q}􁾋(󲮂Z𧢤)_󵕶O󼖞\u00180󿶓󳼰g>󺙵\u000e\u000fW󴰽h;𓇰\u000fyJt\u0016𑈽(q}鸶:b𠓔/\u001eGV􁇤{r㜛$oo1H󻀔n\u0008ꙛ􍧨hBiS􄈏6Az\u0010'􁆉=",
+    "picture": [],
+    "qualified_id": {
+        "domain": "19.i.mwv-7",
+        "id": "00000002-0000-0000-0000-000100000002"
+    },
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000000",
+        "provider": "00000000-0000-0000-0000-000100000001"
+    },
+    "team": "00000002-0000-0000-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_17.json b/libs/wire-api/test/golden/testObject_UserProfile_user_17.json
index f721c90cdad..23791b7ef7b 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_17.json
@@ -1,26 +1,26 @@
 {
+    "accent_id": -2,
+    "assets": [
+        {
+            "key": "N",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "email": "I\t@%",
     "handle": "uva.d",
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000001",
-        "provider": "00000000-0000-0000-0000-000000000001"
-    },
+    "id": "00000000-0000-0001-0000-000000000002",
+    "legalhold_status": "no_consent",
     "locale": "gn-GA",
+    "name": "@@v𢇞}$2^]󰈯=\u00076𨅸\u0010*\u000c(\u0018(76kCs\u0006X[~痝\u0000\u0000􌫡􋏠o쬟a\u001f0E|\"d𥇪\u001a{!X\u0002\u0007F`\u0017\u0004*󰥚𒂇;#tOw\u0001D􉤮 􄲲E\n\u0018\u0013D`>\u0013\u0017965!CL􎖍󶿪B9\u001f\u0010[󾕮0􋃽%\u000c.y\u001e嵀\u0007\u0017莖\u001e[繜󶴎\u0006PuC",
+    "picture": [],
     "qualified_id": {
         "domain": "94nvo.97j.g83--2e.4-t1g.z",
         "id": "00000000-0000-0001-0000-000000000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "@@v𢇞}$2^]󰈯=\u00076𨅸\u0010*\u000c(\u0018(76kCs\u0006X[~痝\u0000\u0000􌫡􋏠o쬟a\u001f0E|\"d𥇪\u001a{!X\u0002\u0007F`\u0017\u0004*󰥚𒂇;#tOw\u0001D􉤮 􄲲E\n\u0018\u0013D`>\u0013\u0017965!CL􎖍󶿪B9\u001f\u0010[󾕮0􋃽%\u000c.y\u001e嵀\u0007\u0017莖\u001e[繜󶴎\u0006PuC",
-    "id": "00000000-0000-0001-0000-000000000002",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "preview",
-            "key": "N",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0001-0000-000100000001",
+        "provider": "00000000-0000-0000-0000-000000000001"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_18.json b/libs/wire-api/test/golden/testObject_UserProfile_user_18.json
index 8aa965c30e0..dcfb8279b93 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_18.json
@@ -1,32 +1,32 @@
 {
-    "handle": "50-a8ceq8yfwac.lp.",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000000",
-        "provider": "00000001-0000-0000-0000-000100000001"
-    },
-    "locale": "kr-MN",
-    "qualified_id": {
-        "domain": "r71-2.u",
-        "id": "00000001-0000-0000-0000-000000000001"
-    },
     "accent_id": 1,
-    "picture": [],
-    "legalhold_status": "enabled",
-    "name": "$󵧈\u0017q𪋑\u0015󴹰!􇑏\u0014󱯑\u0004+X𮢿󳜮n\u001c\u001ar0􉤷􃋱z5𮭮6󲎽mBxr\u0007-H𪘵≺\u0016f𧾹󶈂􄿽EMAQ𮒙hm\"t󵜏𩔄=\u0000h$:>󾤳E暦𝡗lz𭑜oY\te\u00117B􇁑Be\n\u000c􂓃/\u0017o\u001aw􉼻袼󱓬􃌍R𧜫\u0019𮐓풂\u0005饂v\u0017􊖓𫾻\u001f󲦞dj=\nZM",
-    "expires_at": "1864-05-08T13:37:48.974Z",
-    "team": "00000000-0000-0000-0000-000200000000",
-    "id": "00000001-0000-0000-0000-000000000001",
-    "deleted": true,
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "expires_at": "1864-05-08T13:37:48.974Z",
+    "handle": "50-a8ceq8yfwac.lp.",
+    "id": "00000001-0000-0000-0000-000000000001",
+    "legalhold_status": "enabled",
+    "locale": "kr-MN",
+    "name": "$󵧈\u0017q𪋑\u0015󴹰!􇑏\u0014󱯑\u0004+X𮢿󳜮n\u001c\u001ar0􉤷􃋱z5𮭮6󲎽mBxr\u0007-H𪘵≺\u0016f𧾹󶈂􄿽EMAQ𮒙hm\"t󵜏𩔄=\u0000h$:>󾤳E暦𝡗lz𭑜oY\te\u00117B􇁑Be\n\u000c􂓃/\u0017o\u001aw􉼻袼󱓬􃌍R𧜫\u0019𮐓풂\u0005饂v\u0017􊖓𫾻\u001f󲦞dj=\nZM",
+    "picture": [],
+    "qualified_id": {
+        "domain": "r71-2.u",
+        "id": "00000001-0000-0000-0000-000000000001"
+    },
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000000",
+        "provider": "00000001-0000-0000-0000-000100000001"
+    },
+    "team": "00000000-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_19.json b/libs/wire-api/test/golden/testObject_UserProfile_user_19.json
index 5f3a9d12882..641efd0ca5e 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_19.json
@@ -1,27 +1,27 @@
 {
+    "accent_id": -2,
+    "assets": [
+        {
+            "key": "",
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "email": "a@\u0008",
     "handle": "2g",
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000001",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
+    "id": "00000001-0000-0001-0000-000100000000",
+    "legalhold_status": "pending",
     "locale": "to-SH",
+    "name": "\u000b󾑁\u0006W\u000bKmM3,j󵆅uX𭈶\u001d\u0007\u000f:󽽨𤽤m\u0017@c􁯾ePd=Bhs:\u0015\u0015a(􀲺hyWvEO󹻥Q\u001f\n𮞆􃌎y)󼓬Y􆃑ف}\\\u000f\u0010\u001e𫜃mP!z󴒽c\u0007qMFa\u001b􄸘",
+    "picture": [],
     "qualified_id": {
         "domain": "00.252-t7.7l7.r478qz0a4.b",
         "id": "00000001-0000-0001-0000-000100000000"
     },
-    "accent_id": -2,
-    "picture": [],
-    "legalhold_status": "pending",
-    "name": "\u000b󾑁\u0006W\u000bKmM3,j󵆅uX𭈶\u001d\u0007\u000f:󽽨𤽤m\u0017@c􁯾ePd=Bhs:\u0015\u0015a(􀲺hyWvEO󹻥Q\u001f\n𮞆􃌎y)󼓬Y􆃑ف}\\\u000f\u0010\u001e𫜃mP!z󴒽c\u0007qMFa\u001b􄸘",
-    "team": "00000002-0000-0001-0000-000100000001",
-    "id": "00000001-0000-0001-0000-000100000000",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0001-0000-000100000001",
+        "provider": "00000000-0000-0000-0000-000000000000"
+    },
+    "team": "00000002-0000-0001-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_2.json b/libs/wire-api/test/golden/testObject_UserProfile_user_2.json
index 5eb1e149c6d..156136f5139 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_2.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": -1,
+    "assets": [],
+    "deleted": true,
     "email": "𪅁 @",
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000001",
-        "provider": "00000001-0000-0001-0000-000100000001"
-    },
+    "expires_at": "1864-05-09T01:42:22.437Z",
+    "id": "00000002-0000-0002-0000-000000000001",
+    "legalhold_status": "no_consent",
     "locale": "ny-MU",
+    "name": "si4v󴃿\u001b^'ゟk喁\u0015?􈒳\u0000Bw;\u00083*R/𨄵lrI",
+    "picture": [],
     "qualified_id": {
         "domain": "go.7.w-3r8iy2.a",
         "id": "00000002-0000-0002-0000-000000000001"
     },
-    "accent_id": -1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "si4v󴃿\u001b^'ゟk喁\u0015?􈒳\u0000Bw;\u00083*R/𨄵lrI",
-    "expires_at": "1864-05-09T01:42:22.437Z",
-    "team": "00000000-0000-0002-0000-000200000002",
-    "id": "00000002-0000-0002-0000-000000000001",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0000-0000-000000000001",
+        "provider": "00000001-0000-0001-0000-000100000001"
+    },
+    "team": "00000000-0000-0002-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_20.json b/libs/wire-api/test/golden/testObject_UserProfile_user_20.json
index 33c552aa926..66cbe20b8a0 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_20.json
@@ -1,40 +1,24 @@
 {
-    "email": "󴎚!@|D",
-    "handle": "zticd1l",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000000",
-        "provider": "00000001-0000-0001-0000-000000000001"
-    },
-    "locale": "rn-CI",
-    "qualified_id": {
-        "domain": "2.ei5-x3",
-        "id": "00000002-0000-0000-0000-000200000001"
-    },
     "accent_id": -1,
-    "picture": [],
-    "legalhold_status": "disabled",
-    "name": "fB\u0011􎖞𐇑Wg_!\u0017\u0014oZ𬊇t<\u001c\tI􅽨શr`\u0001O𠊄+n𝥷ኒ]`dR\u001a\u0011z2􈱼-.4H~資|𘁴<𘗻󱍒^~󴿟gR,\u000c\u0000 x)`D@,\u0017v𧊘􍴘1%@#R}(C2OCy\t2ẝ\u001a\u001dgs&d󰙩𪁔\u0001󷙎^",
-    "expires_at": "1864-05-07T10:18:53.031Z",
-    "id": "00000002-0000-0000-0000-000200000001",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -46,8 +30,8 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -55,28 +39,28 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -84,9 +68,25 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "email": "󴎚!@|D",
+    "expires_at": "1864-05-07T10:18:53.031Z",
+    "handle": "zticd1l",
+    "id": "00000002-0000-0000-0000-000200000001",
+    "legalhold_status": "disabled",
+    "locale": "rn-CI",
+    "name": "fB\u0011􎖞𐇑Wg_!\u0017\u0014oZ𬊇t<\u001c\tI􅽨શr`\u0001O𠊄+n𝥷ኒ]`dR\u001a\u0011z2􈱼-.4H~資|𘁴<𘗻󱍒^~󴿟gR,\u000c\u0000 x)`D@,\u0017v𧊘􍴘1%@#R}(C2OCy\t2ẝ\u001a\u001dgs&d󰙩𪁔\u0001󷙎^",
+    "picture": [],
+    "qualified_id": {
+        "domain": "2.ei5-x3",
+        "id": "00000002-0000-0000-0000-000200000001"
+    },
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000000",
+        "provider": "00000001-0000-0001-0000-000000000001"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_3.json b/libs/wire-api/test/golden/testObject_UserProfile_user_3.json
index 4a87aa201c8..a521291ff94 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_3.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": -1,
+    "assets": [],
     "email": "\u0019\u001b@",
+    "expires_at": "1864-05-08T21:15:22.178Z",
     "handle": "9w41opcty3",
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000001",
-        "provider": "00000000-0000-0001-0000-000100000000"
-    },
+    "id": "00000002-0000-0000-0000-000100000001",
+    "legalhold_status": "no_consent",
     "locale": "fj-US",
+    "name": "𡊥-􌼇B`Fdev9lK'=/㊢J~ZI󹊕^\u0017#\u0013x𦬺Ng\u001fC4􃈌d+\u0008\u001e*\u0010Aj\u000e𬝓ᥙ6􃔫<𡞪嘈#􇍄󺊯ẚ~쾺4􃲥",
+    "picture": [],
     "qualified_id": {
         "domain": "jn0602-8rda.0s.484f421.ee7",
         "id": "00000002-0000-0000-0000-000100000001"
     },
-    "accent_id": -1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "𡊥-􌼇B`Fdev9lK'=/㊢J~ZI󹊕^\u0017#\u0013x𦬺Ng\u001fC4􃈌d+\u0008\u001e*\u0010Aj\u000e𬝓ᥙ6􃔫<𡞪嘈#􇍄󺊯ẚ~쾺4􃲥",
-    "expires_at": "1864-05-08T21:15:22.178Z",
-    "team": "00000000-0000-0002-0000-000200000000",
-    "id": "00000002-0000-0000-0000-000100000001",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0000-0000-000000000001",
+        "provider": "00000000-0000-0001-0000-000100000000"
+    },
+    "team": "00000000-0000-0002-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_4.json b/libs/wire-api/test/golden/testObject_UserProfile_user_4.json
index 9d029f7be4b..2d2d4d0351c 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_4.json
@@ -1,22 +1,22 @@
 {
+    "accent_id": -1,
+    "assets": [],
+    "deleted": true,
     "email": "鴭@",
+    "expires_at": "1864-05-07T13:58:16.443Z",
     "handle": "dauxfkc4f7s4ut0xhxnq9l8zzpeuze998esch51.vh.t56sr1j8bavtco.40te65.sl3b9yzgwxdpxld4_mnoou.adu0lcwxf63lmt8ev8ug7dy39ft31vweb7684k",
-    "service": {
-        "id": "00000000-0000-0000-0000-000100000001",
-        "provider": "00000001-0000-0001-0000-000100000001"
-    },
+    "id": "00000002-0000-0000-0000-000100000001",
+    "legalhold_status": "no_consent",
     "locale": "oc-TC",
+    "name": "~􎚟n􊯨/Xo0/🄙Y݊!뗙|\u001dm3𬂎(󿵸g\u0007㫳f|t>3𩃒60偟􅖂𦸓-𢪀8\r𬕫<􍐆Gvz[\u0017􏪾x\u000b􎔽H6􄱞\u0001\u000c0-0dL󺫖E{5ᜡi󽶭󱔳1\\𡖨\u001a\u000e\u0007fW艵S􍣶\u0014\u0003\u0007u𭫌\u0002E\u0006𑄛𮛊죮⃓④\u001cv\u000c􃉥8E\tb5ꗣ8)\u000eS\u001fiy",
+    "picture": [],
     "qualified_id": {
         "domain": "6s4blca8bh.6u.59p4f.j18151",
         "id": "00000002-0000-0000-0000-000100000001"
     },
-    "accent_id": -1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "~􎚟n􊯨/Xo0/🄙Y݊!뗙|\u001dm3𬂎(󿵸g\u0007㫳f|t>3𩃒60偟􅖂𦸓-𢪀8\r𬕫<􍐆Gvz[\u0017􏪾x\u000b􎔽H6􄱞\u0001\u000c0-0dL󺫖E{5ᜡi󽶭󱔳1\\𡖨\u001a\u000e\u0007fW艵S􍣶\u0014\u0003\u0007u𭫌\u0002E\u0006𑄛𮛊죮⃓④\u001cv\u000c􃉥8E\tb5ꗣ8)\u000eS\u001fiy",
-    "expires_at": "1864-05-07T13:58:16.443Z",
-    "team": "00000000-0000-0000-0000-000200000002",
-    "id": "00000002-0000-0000-0000-000100000001",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0000-0000-000100000001",
+        "provider": "00000001-0000-0001-0000-000100000001"
+    },
+    "team": "00000000-0000-0000-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_5.json b/libs/wire-api/test/golden/testObject_UserProfile_user_5.json
index b23169cb8ed..aa396ea4aef 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_5.json
@@ -1,17 +1,17 @@
 {
+    "accent_id": -2,
+    "assets": [],
     "email": "/\u000b@𫊬",
+    "expires_at": "1864-05-07T03:37:18.107Z",
     "handle": "2k1t1hdfpvdkxij-0w735w5xniggherg.c8d_be21d3mrasu9bkz38dmbwhca3neuduc0oz8v3n1-bd81z6ocf5d1i",
+    "id": "00000000-0000-0002-0000-000100000001",
+    "legalhold_status": "no_consent",
     "locale": "pt-ES",
+    "name": "q0\u001fe𣽁\u0014e78h\u0011!E#}A\u001d𫘜b,조􆥤𫺥2\u0016P􆢑𨩢󶡠,(\u0013O0𖽊竌\nGXJ",
+    "picture": [],
     "qualified_id": {
         "domain": "awdt-0be-r.7hyxl8mkb.s.lp",
         "id": "00000000-0000-0002-0000-000100000001"
     },
-    "accent_id": -2,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "q0\u001fe𣽁\u0014e78h\u0011!E#}A\u001d𫘜b,조􆥤𫺥2\u0016P􆢑𨩢󶡠,(\u0013O0𖽊竌\nGXJ",
-    "expires_at": "1864-05-07T03:37:18.107Z",
-    "team": "00000001-0000-0001-0000-000000000000",
-    "id": "00000000-0000-0002-0000-000100000001",
-    "assets": []
-}
\ No newline at end of file
+    "team": "00000001-0000-0001-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_6.json b/libs/wire-api/test/golden/testObject_UserProfile_user_6.json
index 70871b67d29..e6a656400b4 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_6.json
@@ -1,26 +1,26 @@
 {
-    "email": "l@𒓧",
-    "handle": "frz05jdtt5.dacr3hd-hmayzm93q91g-qbd-4rm2hs2de4jx.80xj9y6k.c70.s_s_85ymq0w.lv_",
-    "qualified_id": {
-        "domain": "87k.iag53",
-        "id": "00000000-0000-0000-0000-000000000002"
-    },
     "accent_id": 0,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "L\"v\u001ck 2d$\u001fQm|𠿯r􀇄􁼚𡹲󹶢-󶆢\u0014+dC/n.\r\u001fAX\u001as$B\u0011绊G菸pTC𦽇Lgs\u0019秠,vz󹬔峄tYvC\u0013rA0{𘤳e!𮌔𠾷'r&X9k4Z𗿍\u0012YW*𫍮Wh#𪆿_􇶤􁤲r\u0015(􋏦𡱪􊉇\u001chF\u001bn^𭧷=!\u0002󵿎]`􃢒􎀣\u001c\u0017=9D.x$\u001bU/\u0002FJ",
-    "expires_at": "1864-05-11T16:24:39.844Z",
-    "id": "00000000-0000-0000-0000-000000000002",
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "email": "l@𒓧",
+    "expires_at": "1864-05-11T16:24:39.844Z",
+    "handle": "frz05jdtt5.dacr3hd-hmayzm93q91g-qbd-4rm2hs2de4jx.80xj9y6k.c70.s_s_85ymq0w.lv_",
+    "id": "00000000-0000-0000-0000-000000000002",
+    "legalhold_status": "no_consent",
+    "name": "L\"v\u001ck 2d$\u001fQm|𠿯r􀇄􁼚𡹲󹶢-󶆢\u0014+dC/n.\r\u001fAX\u001as$B\u0011绊G菸pTC𦽇Lgs\u0019秠,vz󹬔峄tYvC\u0013rA0{𘤳e!𮌔𠾷'r&X9k4Z𗿍\u0012YW*𫍮Wh#𪆿_􇶤􁤲r\u0015(􋏦𡱪􊉇\u001chF\u001bn^𭧷=!\u0002󵿎]`􃢒􎀣\u001c\u0017=9D.x$\u001bU/\u0002FJ",
+    "picture": [],
+    "qualified_id": {
+        "domain": "87k.iag53",
+        "id": "00000000-0000-0000-0000-000000000002"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_7.json b/libs/wire-api/test/golden/testObject_UserProfile_user_7.json
index a1b1ffd5b56..1ea0b1ecd20 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_7.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": 1,
+    "assets": [],
+    "deleted": true,
     "email": "@",
+    "expires_at": "1864-05-07T08:32:43.292Z",
     "handle": "67-9yy9qo2p25zhd58xripmrgouiuww98mk.m5xfnlvqmpz8wsgjuo7eo149d_0is6w26-2zo4z1kbf6zmkth4n3j139iok0s80ccdfxcb-jy3edziep9hpb2r.glfme2q09t..ehpdjc57dv-9_8nt0f",
-    "service": {
-        "id": "00000001-0000-0000-0000-000100000000",
-        "provider": "00000001-0000-0001-0000-000000000001"
-    },
+    "id": "00000001-0000-0000-0000-000200000000",
+    "legalhold_status": "no_consent",
+    "name": "0\\xꃪ󺟎\u001e\u0010ꄬ𫒪󱘾n󺒎𝔞(w祟J𦢣\u0018~W|#!􍀃𛄐􁕠\u001d􀰿7\u001a􎇢/􌰚𣼗6󵻭𮤬]\u000e\u0005IRy𭦘/H𡶉)𨨗󸮇jEO\u0011d`]A\u001d\"\u001f𡙐􎞑Irh;M󼑖兢LzCἩN_\u0012󳶳-q1z0嫭𡡞ꛖ);𪣽z\u001a5􌝖ZN􏨆\u000e5\u0016 햭",
+    "picture": [],
     "qualified_id": {
         "domain": "uy-m.eb-p-ehu.n.t5p-i84u",
         "id": "00000001-0000-0000-0000-000200000000"
     },
-    "accent_id": 1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "0\\xꃪ󺟎\u001e\u0010ꄬ𫒪󱘾n󺒎𝔞(w祟J𦢣\u0018~W|#!􍀃𛄐􁕠\u001d􀰿7\u001a􎇢/􌰚𣼗6󵻭𮤬]\u000e\u0005IRy𭦘/H𡶉)𨨗󸮇jEO\u0011d`]A\u001d\"\u001f𡙐􎞑Irh;M󼑖兢LzCἩN_\u0012󳶳-q1z0嫭𡡞ꛖ);𪣽z\u001a5􌝖ZN􏨆\u000e5\u0016 햭",
-    "expires_at": "1864-05-07T08:32:43.292Z",
-    "team": "00000001-0000-0001-0000-000100000000",
-    "id": "00000001-0000-0000-0000-000200000000",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0000-0000-000100000000",
+        "provider": "00000001-0000-0001-0000-000000000001"
+    },
+    "team": "00000001-0000-0001-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_8.json b/libs/wire-api/test/golden/testObject_UserProfile_user_8.json
index 18adbe89f44..aaf350585fb 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_8.json
@@ -1,21 +1,21 @@
 {
+    "accent_id": 1,
+    "assets": [],
+    "deleted": true,
     "email": "󰒭@\u0013F",
+    "expires_at": "1864-05-10T15:50:41.047Z",
     "handle": "dbiy",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
+    "id": "00000001-0000-0001-0000-000100000002",
+    "legalhold_status": "no_consent",
+    "name": ". 䚣󻹅󲍼\\􅠋\u0002'\u000fV􈭘􊚅)󰊺\u0000􂣇[EO𬅿M\u0012A𪳧󷩱O&\r􉋱𩷚",
+    "picture": [],
     "qualified_id": {
         "domain": "755m8o7.5-6tg.x48tvxc",
         "id": "00000001-0000-0001-0000-000100000002"
     },
-    "accent_id": 1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": ". 䚣󻹅󲍼\\􅠋\u0002'\u000fV􈭘􊚅)󰊺\u0000􂣇[EO𬅿M\u0012A𪳧󷩱O&\r􉋱𩷚",
-    "expires_at": "1864-05-10T15:50:41.047Z",
-    "team": "00000000-0000-0002-0000-000000000002",
-    "id": "00000001-0000-0001-0000-000100000002",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000000",
+        "provider": "00000000-0000-0000-0000-000000000000"
+    },
+    "team": "00000000-0000-0002-0000-000000000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserProfile_user_9.json b/libs/wire-api/test/golden/testObject_UserProfile_user_9.json
index 0fa377256eb..c6c5d84cd15 100644
--- a/libs/wire-api/test/golden/testObject_UserProfile_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UserProfile_user_9.json
@@ -1,22 +1,22 @@
 {
+    "accent_id": -1,
+    "assets": [],
+    "deleted": true,
     "email": "_@U\u0002",
+    "expires_at": "1864-05-07T20:54:55.730Z",
     "handle": "72nnsdja3n",
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000001",
-        "provider": "00000001-0000-0001-0000-000000000001"
-    },
+    "id": "00000001-0000-0000-0000-000000000000",
+    "legalhold_status": "no_consent",
     "locale": "sv-WF",
+    "name": "Xa\u0001tP\"𧚇)媥\u0012蔶y\\]E\u000b\\G",
+    "picture": [],
     "qualified_id": {
         "domain": "p.6u0.jym",
         "id": "00000001-0000-0000-0000-000000000000"
     },
-    "accent_id": -1,
-    "picture": [],
-    "legalhold_status": "no_consent",
-    "name": "Xa\u0001tP\"𧚇)媥\u0012蔶y\\]E\u000b\\G",
-    "expires_at": "1864-05-07T20:54:55.730Z",
-    "team": "00000000-0000-0001-0000-000200000000",
-    "id": "00000001-0000-0000-0000-000000000000",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0000-0000-000000000001",
+        "provider": "00000001-0000-0001-0000-000000000001"
+    },
+    "team": "00000000-0000-0001-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_1.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_1.json
index 1afc419fd8f..520bcfc7dad 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_1.json
@@ -1,4 +1,4 @@
 {
     "subject": "𝢱􁱝S\u0006\\\u0017\\",
     "tenant": "#ph􀽌"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_10.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_10.json
index 69e47c3400c..269300657d1 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_10.json
@@ -1,4 +1,4 @@
 {
     "subject": "􀞢^}Y7A\u0014󰐺\u001bF",
     "tenant": "oo\"u/]5"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_11.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_11.json
index 5a08dd63bfe..46b703e246b 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_11.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "U㞠\u00129[𮥂z􆔇ⵍ􎹘#~􀐽D\u0003[􏈫u𦷊h똶㕠2 c4􄯇\u000e"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_12.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_12.json
index c8611bb30c2..db68edf1a29 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_12.json
@@ -1,4 +1,4 @@
 {
     "subject": "􏺁\u001bg𑄉",
     "tenant": "\na,"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_13.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_13.json
index fb797262f5a..7e87f091eb1 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_13.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": ""
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_14.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_14.json
index b6de52a63c5..4d74fb56c90 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_14.json
@@ -1,4 +1,4 @@
 {
     "subject": "g\ta\u001d󳹝[a\u0013𢝝oA",
     "tenant": "g􉙇)By𡑗h.\u000c\u00179@"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_15.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_15.json
index 12ed5ed5cd4..69528cc5164 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_15.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "a9qᩤ󶴏nM]vM\u0012t풣_'\u0010t1MJb{󼥁\u001dZC\u0006"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_16.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_16.json
index 1e59621ca9c..9b9641de712 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_16.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "Ltepz\u0006\u001c\u001c\u0000􇀶󽍉}𡃭N뫴7GJ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_17.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_17.json
index 217632f65be..830c5048c44 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_17.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "qj𤂎.^"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_18.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_18.json
index 38a25b1a81a..764dfe765c5 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_18.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "𒍧"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_19.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_19.json
index 623dddc6cdc..f1874f30cf6 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_19.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "!𛉋mᅛ\u0018\u001dA\u0010󿃯𤧇x[h\n~􋁝"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_2.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_2.json
index ff5be37622e..6de12964221 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_2.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "퀶\u001a\u0002\u000bf\u0008-󿰣qA􄚨\u0005 >jJ"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_20.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_20.json
index ef5095b13c1..6476075a9dd 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_20.json
@@ -1,4 +1,4 @@
 {
     "subject": "\u0002b\u000e􇆽\u001b\u001d3,􅲈𠩀8𑿋",
     "tenant": "X#\u0004 "
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_3.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_3.json
index de8df521a3f..1db46e5e7f4 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_3.json
@@ -1,4 +1,4 @@
 {
     "subject": "𨊌4X\u0019",
     "tenant": "i\\\u0004\r𘑍\u0015󲛚줴Vi"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_4.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_4.json
index 298d0aa190d..eb3dcf271d5 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_4.json
@@ -1,4 +1,4 @@
 {
     "subject": "􉹡0\u001b𬴯<fymc5焗i\u0018@",
     "tenant": "0􇙊hK𤮼Rc;/[Q9s{"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_5.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_5.json
index 9dee2c3c279..962c32d873c 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_5.json
@@ -1,4 +1,4 @@
 {
     "subject": "NM&􀎴쫒",
     "tenant": "\u0010"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_6.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_6.json
index 428da06b8b2..dcfd6568924 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_6.json
@@ -1,4 +1,4 @@
 {
     "subject": "+vR=",
     "tenant": "􋞷빆􃚭ME+O#"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_7.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_7.json
index aa36b226d4b..586b97ec300 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_7.json
@@ -1,4 +1,4 @@
 {
     "subject": "󵿮v",
     "tenant": "#󱪥𪘙"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_8.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_8.json
index a9d39f2eb63..e7659cb800c 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_8.json
@@ -1,4 +1,4 @@
 {
     "subject": "C",
     "tenant": "粻􇧟\u0000'rGF\u001b\u0010f𥷱\u0005Q"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserSSOId_user_9.json b/libs/wire-api/test/golden/testObject_UserSSOId_user_9.json
index c4d668996d4..daab3d179ed 100644
--- a/libs/wire-api/test/golden/testObject_UserSSOId_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UserSSOId_user_9.json
@@ -1,3 +1,3 @@
 {
     "scim_external_id": "\r􆓈iua󶑠M𡺸\u000b"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_1.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_1.json
index aa3bae610eb..980143c2a79 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_1.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_1.json
@@ -1,6 +1,5 @@
 {
     "accent_id": 2,
-    "picture": [],
     "assets": [
         {
             "key": "",
@@ -10,5 +9,6 @@
             "key": "",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_10.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_10.json
index d95dd4657df..2decc485e7a 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_10.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_10.json
@@ -1,10 +1,9 @@
 {
     "accent_id": 2,
-    "picture": [],
     "assets": [
         {
-            "size": "complete",
             "key": "\u0001",
+            "size": "complete",
             "type": "image"
         },
         {
@@ -12,24 +11,25 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "㶼9",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "D",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "F",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_11.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_11.json
index 1936f649554..33e0198fb34 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_11.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_11.json
@@ -1,6 +1,4 @@
 {
-    "picture": [],
-    "name": "\u0019\u0016C𧏼75O𪯝a>􆱂HB+e<Y󶄤f􂳜\u00156Ծ\u0008\u0014Fk󿙴5m!BO󺰳o\r7\u0010]O%𭸊󰗲爚F醢+OᏩ%%\u001b𠑃#i􉈧𢸊\u0007􀍂\u001b>&%\r\u001f256𭝇HHa\"or!uV\u0015T飯<\u0019pH",
     "assets": [
         {
             "key": "v",
@@ -11,9 +9,11 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0018\u001d",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "\u0019\u0016C𧏼75O𪯝a>􆱂HB+e<Y󶄤f􂳜\u00156Ծ\u0008\u0014Fk󿙴5m!BO󺰳o\r7\u0010]O%𭸊󰗲爚F醢+OᏩ%%\u001b𠑃#i􉈧𢸊\u0007􀍂\u001b>&%\r\u001f256𭝇HHa\"or!uV\u0015T飯<\u0019pH",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_12.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_12.json
index b0cec2c460a..fdb1684bf7d 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_12.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_12.json
@@ -1,5 +1,5 @@
 {
     "accent_id": 6,
-    "picture": [],
-    "name": "\r󽱺Z\u0018&zv󷦇\u0006vz􌬚𦪟󱋶ex=3\u0002􊮖\n;@tᗇt,!Dx󺭸~\"iks\u0008!R𫚭MT𠺟\u001c%\u0018g內\u0008x\u001d􍻁𮃈4V\u0001􊏿\u001e\u0010旁.㪄a󲗃\u0004_+M\u00008GY%\n􋎣\u0000}!tIB"
-}
\ No newline at end of file
+    "name": "\r󽱺Z\u0018&zv󷦇\u0006vz􌬚𦪟󱋶ex=3\u0002􊮖\n;@tᗇt,!Dx󺭸~\"iks\u0008!R𫚭MT𠺟\u001c%\u0018g內\u0008x\u001d􍻁𮃈4V\u0001􊏿\u001e\u0010旁.㪄a󲗃\u0004_+M\u00008GY%\n􋎣\u0000}!tIB",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_13.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_13.json
index 54c90c73d45..749452cadb8 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_13.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_13.json
@@ -1,20 +1,19 @@
 {
     "accent_id": 2,
-    "name": "󿂿9k\u0008E\u0000\"9d\u0015􎻻8Z㭢.(+: _7As~𞤪\u0001𢘫󼅄D􈾭yC$󳒞Q\u0011\u0014󷣼6[󼤖𪹝?፼P蝔1!N\n􄼟4V\u001ck\u0000\u0001_-郸󹙛\n;&m\u0005\t𨢈D1V25^𡢈#s􄓛2l𪼃\u000f􃆴𭳒\u001d􃨏[ L𫩇V􌂍\u0012\u001f䭩\u0008𘢆󽈅K󷥤:UMM1H\tk",
     "assets": [
         {
-            "size": "complete",
             "key": "?w",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "􇉀1",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -26,9 +25,10 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "U􍜕,",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "󿂿9k\u0008E\u0000\"9d\u0015􎻻8Z㭢.(+: _7As~𞤪\u0001𢘫󼅄D􈾭yC$󳒞Q\u0011\u0014󷣼6[󼤖𪹝?፼P蝔1!N\n􄼟4V\u001ck\u0000\u0001_-郸󹙛\n;&m\u0005\t𨢈D1V25^𡢈#s􄓛2l𪼃\u000f􃆴𭳒\u001d􃨏[ L𫩇V􌂍\u0012\u001f䭩\u0008𘢆󽈅K󷥤:UMM1H\tk"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_14.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_14.json
index f9d5b77c83a..96bd98b307a 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_14.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_14.json
@@ -1,11 +1,11 @@
 {
-    "picture": [],
-    "name": "/H\u0011Toc\u0014\u0011퍣`{0𥦑[\u0001<𤫙􅷲\u0015m\u0003|Wd|󶈡\u0013\u001d󽸃\u0001n􌰱𢔬wuN􁙉tvB/En|2^n𩳸_K󶂡4\u0018\u0017󷠃􉤡D𨜛R'q6\u0014?\u0012\u0002AEO((W󵓺r'C󸯯\u001a\u0002+M\u000eE\u0013hi\u0018솎8𭪌\u0000#\u0018⚹Ex𢥉𠰨Av&=&%𠂌H}p嶹grJ𝘰d",
     "assets": [
         {
-            "size": "complete",
             "key": "﴿𝤂",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "/H\u0011Toc\u0014\u0011퍣`{0𥦑[\u0001<𤫙􅷲\u0015m\u0003|Wd|󶈡\u0013\u001d󽸃\u0001n􌰱𢔬wuN􁙉tvB/En|2^n𩳸_K󶂡4\u0018\u0017󷠃􉤡D𨜛R'q6\u0014?\u0012\u0002AEO((W󵓺r'C󸯯\u001a\u0002+M\u000eE\u0013hi\u0018솎8𭪌\u0000#\u0018⚹Ex𢥉𠰨Av&=&%𠂌H}p嶹grJ𝘰d",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_15.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_15.json
index 30cda0a4bfc..7a06aa6521b 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_15.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_15.json
@@ -1,22 +1,22 @@
 {
     "accent_id": -2,
-    "picture": [],
-    "name": "䆮e𥿌:󲙸\u0000z\u0012\u001amx𬁿󽍻\u000bꔜu􆊦J핡#ᅫ]|􏬜%𛊕~zM6*-𖭥~\u0018Xm𬊞R!v􅍱Nano􉐑uf7􅮽TP\u0017𥌴🃳𮪄!O\u0015ꔩ\u0006\u001b\u0014𐆓\u0004H|镐K\u001d1,RzU`(\u0000𦓁𫖦:4\\%𫮈dc〫w\u000bd\n󺩧𥒒􌑯\u000e󴞟d\u0004􉴭G\u00040􂓐\u001f\u0015tH\u0018N𤆟봃E\u001e󵶧",
     "assets": [
         {
-            "size": "preview",
             "key": "𨱔",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "%",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "䆮e𥿌:󲙸\u0000z\u0012\u001amx𬁿󽍻\u000bꔜu􆊦J핡#ᅫ]|􏬜%𛊕~zM6*-𖭥~\u0018Xm𬊞R!v􅍱Nano􉐑uf7􅮽TP\u0017𥌴🃳𮪄!O\u0015ꔩ\u0006\u001b\u0014𐆓\u0004H|镐K\u001d1,RzU`(\u0000𦓁𫖦:4\\%𫮈dc〫w\u000bd\n󺩧𥒒􌑯\u000e󴞟d\u0004􉴭G\u00040􂓐\u001f\u0015tH\u0018N𤆟봃E\u001e󵶧",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_16.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_16.json
index 12767cc447d..44c15822a80 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_16.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_16.json
@@ -1,5 +1,5 @@
 {
-    "picture": [],
+    "assets": [],
     "name": "\ncV~sD!􂐁螧sU\u0010\t>*\u0000,h<􋹌.l^X\u001f𭭩oc9;􇂍􁴳\u0015nofI~𡆍\u0012L􋈓􋥛\u001b\u0004󻷾;\\%󵠽$𨽊6e􊖩?0\u000fAk",
-    "assets": []
-}
\ No newline at end of file
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_17.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_17.json
index 1a814957a63..ff47a4bcff8 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_17.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_17.json
@@ -1,14 +1,13 @@
 {
     "accent_id": 6,
-    "picture": [],
     "assets": [
         {
             "key": ")E𘥋",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "c\u0012/",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -16,9 +15,10 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "B",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_18.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_18.json
index 6ad60148c16..eff43e55553 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_18.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_18.json
@@ -1,7 +1,5 @@
 {
     "accent_id": 7,
-    "picture": [],
-    "name": "\u0014}𮬚$.3Z\u0016X󹕵:\u000223𠤂􆽩v􉘠\u0018\u0013\u0017r2%sf\u0007\\󿜝\u0006畁{$,𝗆\u0019x\u000e-t눘󰳌y\u001e𬃇R\u0001G𧏺\"\u0018.𥽑𧩅`UJe\"\r\u0007=.2\u0015\u001d\u0003W\u000e􈤹n*2􅯒@VK\u0016@Q,@E_~\u0005i\u001b~􂇁;!II,k07􊛮2\u0003\u001b",
     "assets": [
         {
             "key": "r󶾐s",
@@ -12,13 +10,15 @@
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "H",
+            "size": "complete",
             "type": "image"
         },
         {
             "key": "",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "\u0014}𮬚$.3Z\u0016X󹕵:\u000223𠤂􆽩v􉘠\u0018\u0013\u0017r2%sf\u0007\\󿜝\u0006畁{$,𝗆\u0019x\u000e-t눘󰳌y\u001e𬃇R\u0001G𧏺\"\u0018.𥽑𧩅`UJe\"\r\u0007=.2\u0015\u001d\u0003W\u000e􈤹n*2􅯒@VK\u0016@Q,@E_~\u0005i\u001b~􂇁;!II,k07􊛮2\u0003\u001b",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_19.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_19.json
index 58fcd4083b0..2f222c3924b 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_19.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_19.json
@@ -1,4 +1,4 @@
 {
     "accent_id": 0,
     "picture": []
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_2.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_2.json
index 5eeddfa99e3..1db9d874fed 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_2.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_2.json
@@ -1,12 +1,12 @@
 {
     "accent_id": 3,
-    "picture": [],
-    "name": "~\u001eK󼛵w\u0019d𦏨g",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "~\u001eK󼛵w\u0019d𦏨g",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_20.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_20.json
index 2a6ac8341c9..cf120e43d8f 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_20.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_20.json
@@ -1,4 +1,4 @@
 {
     "accent_id": -1,
     "name": "D]980󰑉)e󲉋:?s$QP籜_\u0014qyj𥱤𡰮\u0014x\u001aq6uwz𬑬趕􀒆\u0014􄸥\u000e\u0001\u001az󿣬D\r\u0003􇡣6NK󸼓f/OK𗯜\u0005r\u0004y*\u0015\u001fA{\u0017}\u0015rr(X^`\t_W}L􁊀\u000cUy\u001a\r𡰧sMᆾ\u001d7\u000c󻫧:􃰂B\u001d􃴗\u0002)󴘫k\u001bj\u0011\u0015󳠩;f*"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_3.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_3.json
index bf6799221d7..10aaddd80f6 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_3.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_3.json
@@ -1,19 +1,18 @@
 {
     "accent_id": -5,
-    "picture": [],
     "assets": [
         {
             "key": "`蓒",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "4\u0006E",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -29,9 +28,10 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "\u0002f",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_4.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_4.json
index ecc007e5d48..edc4adc188a 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_4.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_4.json
@@ -1,11 +1,9 @@
 {
     "accent_id": 2,
-    "picture": [],
-    "name": "䚢\\5-`\u000c𥾪T\u001a|\rD𣿲GV􇍟떿nt@,5󶃑Ux0M􊹍\u0018rf돤+󴼷\u0018𥢽4L纍]+u\u0000󹰫\t6𨉊z\u000co匧\u0000𤸨d\u0000\u001a𗤍\u0007\u001d",
     "assets": [
         {
-            "size": "preview",
             "key": "W%",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -13,14 +11,16 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "e\u0016󷜨",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "䚢\\5-`\u000c𥾪T\u001a|\rD𣿲GV􇍟떿nt@,5󶃑Ux0M􊹍\u0018rf돤+󴼷\u0018𥢽4L纍]+u\u0000󹰫\t6𨉊z\u000co匧\u0000𤸨d\u0000\u001a𗤍\u0007\u001d",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_5.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_5.json
index 4ddd4a3982f..bae4da54f78 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_5.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_5.json
@@ -1,11 +1,11 @@
 {
     "accent_id": -8,
-    "name": "}C)BJ\u001aM1\u001c􁀀\u0010𭜉\u000cT\u001f}lG}B4D\u001c/Y􁲒\u0014g󼛅I󲌈\n%𪁺p",
     "assets": [
         {
-            "size": "complete",
             "key": "R󴕥",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "}C)BJ\u001aM1\u001c􁀀\u0010𭜉\u000cT\u001f}lG}B4D\u001c/Y􁲒\u0014g󼛅I󲌈\n%𪁺p"
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_6.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_6.json
index c2645ae62dd..0e152a804b2 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_6.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_6.json
@@ -1,6 +1,6 @@
 {
     "accent_id": -2,
-    "picture": [],
+    "assets": [],
     "name": "𫳳ᯩ6U5!E󺤔nyH􂳮𗉴B$\u0010\u0013-\u0011󳷥󾆊󻅻rO\u001b\u0007\u001c󺽡􍅖`i`𦲾m/YzFX:ZRzꀌ\u001c󲮨𧝰75",
-    "assets": []
-}
\ No newline at end of file
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_7.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_7.json
index 967518ac6ad..3aed506fac1 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_7.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_7.json
@@ -1,12 +1,12 @@
 {
     "accent_id": 6,
-    "picture": [],
-    "name": "\u000c/\r􅳽𧊏\u0000􆰡}A[D 𪏷\u0019]Q\u0006#:!q+$&\u0017𫹿#\u000f\u0008^2\u000b땃\u000csPB󷆺<?𫤡C(󿷀\u0007󲫝󽧺i%.\"y\u0011g\u0000Y渰B&𬓉nM涌a􁞬W󺗜{N6Q:槫d\u000crt&𤎽\u001eGj0\u0004As󴿯󷡽\u0001󱦭􊌝\n5}c\t\u0007J\u0019\rK",
     "assets": [
         {
-            "size": "preview",
             "key": "nC",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "\u000c/\r􅳽𧊏\u0000􆰡}A[D 𪏷\u0019]Q\u0006#:!q+$&\u0017𫹿#\u000f\u0008^2\u000b땃\u000csPB󷆺<?𫤡C(󿷀\u0007󲫝󽧺i%.\"y\u0011g\u0000Y渰B&𬓉nM涌a􁞬W󺗜{N6Q:槫d\u000crt&𤎽\u001eGj0\u0004As󴿯󷡽\u0001󱦭􊌝\n5}c\t\u0007J\u0019\rK",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_8.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_8.json
index 3d5c18ef30f..b16b9dcb57c 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_8.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_8.json
@@ -2,14 +2,14 @@
     "accent_id": 8,
     "assets": [
         {
-            "size": "complete",
             "key": "EGD",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "6􎙜\u0012",
+            "size": "preview",
             "type": "image"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_UserUpdate_user_9.json b/libs/wire-api/test/golden/testObject_UserUpdate_user_9.json
index c1d5d161e1f..e0c97526e57 100644
--- a/libs/wire-api/test/golden/testObject_UserUpdate_user_9.json
+++ b/libs/wire-api/test/golden/testObject_UserUpdate_user_9.json
@@ -1,21 +1,21 @@
 {
     "accent_id": -5,
-    "picture": [],
-    "name": "\tj?\u0012\u001ex{\u0008PL𠹙􃖭Iy\u0015X\"\u0015\u0003g|𪚡+Z𭉧3:\u000b5n渀\u000el\u0006(租\u0000󹣲􈇉󾅀#3𝂘󴈵B'F𫨳*\u000e\u001ee0SE\u0005!𦤐W\u0016􍑤./wvth\u0013I􏵅~Js\u0015b'(\u0016zi譸[\u000b",
     "assets": [
         {
             "key": "",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "𮀗\u0013/",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "k",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "name": "\tj?\u0012\u001ex{\u0008PL𠹙􃖭Iy\u0015X\"\u0015\u0003g|𪚡+Z𭉧3:\u000b5n渀\u000el\u0006(租\u0000󹣲􈇉󾅀#3𝂘󴈵B'F𫨳*\u000e\u001ee0SE\u0005!𦤐W\u0016􍑤./wvth\u0013I􏵅~Js\u0015b'(\u0016zi譸[\u000b",
+    "picture": []
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_1.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_1.json
index 1e16072ea04..125af7b7827 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_1.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_1.json
@@ -1,4 +1,4 @@
 {
     "key": "\u001d",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_10.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_10.json
index 6b1f080a9d9..bb06cdf13d7 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_10.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_10.json
@@ -1,5 +1,5 @@
 {
-    "size": "preview",
     "key": "'\u001c􊘾RoR\u001e4&e@`5",
+    "size": "preview",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_11.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_11.json
index 43dce071bd0..3e280ceaf9c 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_11.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_11.json
@@ -1,5 +1,5 @@
 {
-    "size": "preview",
     "key": "eUb􎃾",
+    "size": "preview",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_12.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_12.json
index 416ad53f012..21efd8ce27b 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_12.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_12.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "<Qk",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_13.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_13.json
index 207c504752c..9d8887207a8 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_13.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_13.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "􅐕多EeS𣨢eF1",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_14.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_14.json
index 86c0c1982cd..d8db6307ecc 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_14.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_14.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "R\r(\t󠇡\r⮎U󻶶𧐇儢-􉇈􀦖𧁖",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_15.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_15.json
index c334cb53df9..39505e8a9a6 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_15.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_15.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "􌤒𠅶􅨇r\u001c\u0005{",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_16.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_16.json
index 1e641029dae..29216881493 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_16.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_16.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "\u001f\n\u0011&󴉳s}",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_17.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_17.json
index 25a95ad8d5b..deccd8deb55 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_17.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_17.json
@@ -1,5 +1,5 @@
 {
-    "size": "preview",
     "key": "꒔",
+    "size": "preview",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_18.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_18.json
index 5b6f1edf3f3..aee835febd1 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_18.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_18.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "\r\u0017𝘩k𧃈va/󵾓\u0006w\u0019",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_19.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_19.json
index 01b6b470bfc..31aedb75be9 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_19.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_19.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "b􊨑/𫹗╵m.𓏝\u001c\u0012\u000fW􌬱",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_2.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_2.json
index aa65fba958d..031063a8d84 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_2.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_2.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "\u0003.𤺌\u0002􂷿aL뿬\u0001N􉡍B&q",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_20.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_20.json
index 8a49192e5b3..44c77067022 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_20.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_20.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "\u0016-􁩩1\u0012\u000e?_\u0007\u001f5",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_3.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_3.json
index 40ead83f755..e4f6f86df54 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_3.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_3.json
@@ -1,5 +1,5 @@
 {
-    "size": "preview",
     "key": "0􀠎&U|5c",
+    "size": "preview",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_4.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_4.json
index aeaf511ff59..9687935d52f 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_4.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_4.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "\u0012@",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_5.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_5.json
index 3f138e3516b..81e9b208d65 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_5.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_5.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": ":\u000e@\u001ead\u0000\u001ex\u0017󰥠\"",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_6.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_6.json
index b27f190f95b..179009d47ce 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_6.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_6.json
@@ -1,5 +1,5 @@
 {
-    "size": "preview",
     "key": "𢖲𣿖",
+    "size": "preview",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_7.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_7.json
index a5cf1c55e96..6332d18d3f1 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_7.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_7.json
@@ -1,5 +1,5 @@
 {
-    "size": "preview",
     "key": "6gh|\u0006􄟓\u000f􅑑9i􎗱𮔔%",
+    "size": "preview",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_8.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_8.json
index be85fb478d5..aa7904e16a8 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_8.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_8.json
@@ -1,4 +1,4 @@
 {
     "key": "*P\u0000D𫾵o󵗨.a\rU\u0003𬷿",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_9.json b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_9.json
index b4149463f1d..108d4cde6da 100644
--- a/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_9.json
+++ b/libs/wire-api/test/golden/testObject_User_2eProfile_2eAsset_user_9.json
@@ -1,5 +1,5 @@
 {
-    "size": "complete",
     "key": "mu",
+    "size": "complete",
     "type": "image"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_1.json b/libs/wire-api/test/golden/testObject_User_user_1.json
index e9315449df7..f24d340dfea 100644
--- a/libs/wire-api/test/golden/testObject_User_user_1.json
+++ b/libs/wire-api/test/golden/testObject_User_user_1.json
@@ -1,32 +1,32 @@
 {
-    "phone": "+340639706578",
-    "service": {
-        "id": "00000000-0000-0001-0000-000000000001",
-        "provider": "00000000-0000-0001-0000-000000000001"
-    },
-    "locale": "tn-SB",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "s-f4.s",
-        "id": "00000002-0000-0001-0000-000200000002"
-    },
     "accent_id": 1,
-    "picture": [],
-    "name": "\u0000uv󳊼su渱lRi",
-    "expires_at": "1864-05-08T06:39:23.932Z",
-    "team": "00000000-0000-0001-0000-000000000000",
-    "id": "00000000-0000-0001-0000-000100000000",
-    "deleted": true,
     "assets": [
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "expires_at": "1864-05-08T06:39:23.932Z",
+    "id": "00000000-0000-0001-0000-000100000000",
+    "locale": "tn-SB",
+    "managed_by": "wire",
+    "name": "\u0000uv󳊼su渱lRi",
+    "phone": "+340639706578",
+    "picture": [],
+    "qualified_id": {
+        "domain": "s-f4.s",
+        "id": "00000002-0000-0001-0000-000200000002"
+    },
+    "service": {
+        "id": "00000000-0000-0001-0000-000000000001",
+        "provider": "00000000-0000-0001-0000-000000000001"
+    },
+    "team": "00000000-0000-0001-0000-000000000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_10.json b/libs/wire-api/test/golden/testObject_User_user_10.json
index b89f54adeb4..24c1213ab80 100644
--- a/libs/wire-api/test/golden/testObject_User_user_10.json
+++ b/libs/wire-api/test/golden/testObject_User_user_10.json
@@ -1,26 +1,26 @@
 {
+    "accent_id": -2,
+    "assets": [],
+    "deleted": true,
     "email": "@",
+    "expires_at": "1864-05-07T20:52:50.974Z",
     "handle": "xyz9jol-j7bb9xtifngv1wejx-ekud7-c-koevsi-e.gcubdvvibrsjmz_1uzq8acxu62oqzn8v9nkz",
-    "service": {
-        "id": "00000000-0000-0000-0000-000100000001",
-        "provider": "00000001-0000-0000-0000-000000000000"
-    },
+    "id": "00000002-0000-0001-0000-000200000002",
     "locale": "pl-CN",
     "managed_by": "scim",
+    "name": "u[𐳋\"W𪅥􀰡\u0019S􀅉x\u0011J\u0013\u0015N􄤂I󼢺\u001c\"󿬵&\u001d\u000e𨗌\u00121r\u001b1S󸎎\u001e+V\u000b\u000ft%􉀦\u0006􅴈\u0005\tᢅQ󻇕v`􇣵q\u001d𗖷\u001eW𐤐I󻚤󾂲\u0007K/\u0010󽇺}􀟟싧A5*􀗴",
+    "picture": [],
     "qualified_id": {
         "domain": "j6-m-9-nc.b4k",
         "id": "00000002-0000-0002-0000-000100000000"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "u[𐳋\"W𪅥􀰡\u0019S􀅉x\u0011J\u0013\u0015N􄤂I󼢺\u001c\"󿬵&\u001d\u000e𨗌\u00121r\u001b1S󸎎\u001e+V\u000b\u000ft%􉀦\u0006􅴈\u0005\tᢅQ󻇕v`􇣵q\u001d𗖷\u001eW𐤐I󻚤󾂲\u0007K/\u0010󽇺}􀟟싧A5*􀗴",
-    "expires_at": "1864-05-07T20:52:50.974Z",
-    "team": "00000000-0000-0000-0000-000100000002",
+    "service": {
+        "id": "00000000-0000-0000-0000-000100000001",
+        "provider": "00000001-0000-0000-0000-000000000000"
+    },
     "sso_id": {
         "subject": "",
         "tenant": ""
     },
-    "id": "00000002-0000-0001-0000-000200000002",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000100000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_11.json b/libs/wire-api/test/golden/testObject_User_user_11.json
index 2e5b8c2351b..58c4e80e801 100644
--- a/libs/wire-api/test/golden/testObject_User_user_11.json
+++ b/libs/wire-api/test/golden/testObject_User_user_11.json
@@ -1,21 +1,21 @@
 {
-    "phone": "+9360086324",
+    "accent_id": 0,
+    "assets": [],
+    "expires_at": "1864-05-10T17:03:19.878Z",
     "handle": "qgfs79695bljg0-2gg7d7eigfry969_boy88f_pt2ecyxmaos66dluhp1r2zf1lzdbu8bksy6mq8zoxyh6lh5-nwligu0o-_4kt5zny65hsfa.ydan6c1kftchxh8jlzype-hbfz6821v.ow-ugddhvbz5cii8b23hhnrkz7xbphzz9st4nfft7",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000100000001"
-    },
+    "id": "00000001-0000-0001-0000-000200000001",
     "locale": "ee-PL",
     "managed_by": "scim",
+    "name": "\u0005*U>o:𩵡;󴫥+稦'm􄢾􉰓3X!ELsR\u001d%瓝\u0003摺\u0012d#Q\u0011(H􂈰Al+E[\u0001󾶺\u0014)𤢢𪠛󾃺\u0000󼻛\u001b\u001d\u001d\u0011q\u0007_󾺰.Cq;O􃍮\t\u001e\u001a肟仝𦚎",
+    "phone": "+9360086324",
+    "picture": [],
     "qualified_id": {
         "domain": "94.eg8.s1.u",
         "id": "00000002-0000-0001-0000-000000000000"
     },
-    "accent_id": 0,
-    "picture": [],
-    "name": "\u0005*U>o:𩵡;󴫥+稦'm􄢾􉰓3X!ELsR\u001d%瓝\u0003摺\u0012d#Q\u0011(H􂈰Al+E[\u0001󾶺\u0014)𤢢𪠛󾃺\u0000󼻛\u001b\u001d\u001d\u0011q\u0007_󾺰.Cq;O􃍮\t\u001e\u001a肟仝𦚎",
-    "expires_at": "1864-05-10T17:03:19.878Z",
-    "team": "00000001-0000-0000-0000-000200000000",
-    "id": "00000001-0000-0001-0000-000200000001",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000000",
+        "provider": "00000000-0000-0000-0000-000100000001"
+    },
+    "team": "00000001-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_12.json b/libs/wire-api/test/golden/testObject_User_user_12.json
index 9d7eac154ee..8947f401b37 100644
--- a/libs/wire-api/test/golden/testObject_User_user_12.json
+++ b/libs/wire-api/test/golden/testObject_User_user_12.json
@@ -1,25 +1,25 @@
 {
+    "accent_id": -2,
+    "assets": [
+        {
+            "key": "",
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "handle": "jor0tv5x7jcptbelj4lb8asjp6-1knhjb0y44uxc5m7apnyzwqg-v.cnnbpxmbr_7tcmygsn5wvnjtb8uzvprai6ayk4kp9gcwtkpsadfs7bqz9qk6.nyeone71vfmmfnvw0f6._4apxbqrpju3v-z-l0osvpfdaajsyyr2bvdq_sffgw12.9gr3zl_d43rrc5.zz0xhxqqvv12l85t2u31_c-gdbr",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000000",
-        "provider": "00000000-0000-0001-0000-000100000000"
-    },
+    "id": "00000000-0000-0000-0000-000200000001",
     "locale": "de-CY",
     "managed_by": "scim",
+    "name": "aM䄩\t_%\"z>3𣍧\u0013!yrxp䋃\u0007]0RQp5}v𬥊bn6󱔔󲼬g\u001cDC󽹘\rNl\u0016\\􋠰𘣀􀤪_𣭹$,_kk\t.C brXI􇹅\"+p􋒳H4'$\u0013\u001fv?rf0d5w􅰠0",
+    "picture": [],
     "qualified_id": {
         "domain": "36c48v3.j22",
         "id": "00000002-0000-0000-0000-000200000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "aM䄩\t_%\"z>3𣍧\u0013!yrxp䋃\u0007]0RQp5}v𬥊bn6󱔔󲼬g\u001cDC󽹘\rNl\u0016\\􋠰𘣀􀤪_𣭹$,_kk\t.C brXI􇹅\"+p􋒳H4'$\u0013\u001fv?rf0d5w􅰠0",
-    "id": "00000000-0000-0000-0000-000200000001",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "complete",
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000000",
+        "provider": "00000000-0000-0001-0000-000100000000"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_13.json b/libs/wire-api/test/golden/testObject_User_user_13.json
index d3727f58acb..354b1323bad 100644
--- a/libs/wire-api/test/golden/testObject_User_user_13.json
+++ b/libs/wire-api/test/golden/testObject_User_user_13.json
@@ -1,27 +1,27 @@
 {
-    "phone": "+525773726575872",
+    "accent_id": 1,
+    "assets": [
+        {
+            "key": "H",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "expires_at": "1864-05-10T06:01:03.394Z",
     "handle": "jq-b_m8hdt36tw9a4owiboeuv8rzxih0g",
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000001",
-        "provider": "00000001-0000-0000-0000-000000000000"
-    },
+    "id": "00000000-0000-0001-0000-000000000000",
     "locale": "ba-DM",
     "managed_by": "wire",
+    "name": "/씬e9s\u001f\u0006󼒍*􆄦!;$$rF4?㆖\u0008~{]\u0005~􃉝Ic&&𝐠S騊􃬮<cLⶠ{j󼪙􌭊=-\u0005󶇘Jm\\󺙇턡l)𧱙21d1\u000b\u0006P$\u001bW\u00125󼣼ᕰ",
+    "phone": "+525773726575872",
+    "picture": [],
     "qualified_id": {
         "domain": "x-90ql.5.8-he1.9t.04f-0v83.4p.nic71",
         "id": "00000002-0000-0001-0000-000100000002"
     },
-    "accent_id": 1,
-    "picture": [],
-    "name": "/씬e9s\u001f\u0006󼒍*􆄦!;$$rF4?㆖\u0008~{]\u0005~􃉝Ic&&𝐠S騊􃬮<cLⶠ{j󼪙􌭊=-\u0005󶇘Jm\\󺙇턡l)𧱙21d1\u000b\u0006P$\u001bW\u00125󼣼ᕰ",
-    "expires_at": "1864-05-10T06:01:03.394Z",
-    "team": "00000000-0000-0001-0000-000100000000",
-    "id": "00000000-0000-0001-0000-000000000000",
-    "assets": [
-        {
-            "size": "preview",
-            "key": "H",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0001-0000-000100000001",
+        "provider": "00000001-0000-0000-0000-000000000000"
+    },
+    "team": "00000000-0000-0001-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_14.json b/libs/wire-api/test/golden/testObject_User_user_14.json
index 38ab3d1a30c..67b1f1ea311 100644
--- a/libs/wire-api/test/golden/testObject_User_user_14.json
+++ b/libs/wire-api/test/golden/testObject_User_user_14.json
@@ -1,22 +1,22 @@
 {
+    "accent_id": -2,
+    "assets": [],
+    "deleted": true,
     "email": "@",
+    "expires_at": "1864-05-07T04:00:27.919Z",
     "handle": "mhgl9x16g1xz79.0nc_d8bwb2_pei918-60",
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000000",
-        "provider": "00000000-0000-0001-0000-000000000000"
-    },
+    "id": "00000000-0000-0002-0000-000100000001",
     "locale": "mi-ES",
     "managed_by": "wire",
+    "name": "ER𪿃:󻸌\u0007󽋱H󷡶,t[Q\u000fGU]?R7I\u00156",
+    "picture": [],
     "qualified_id": {
         "domain": "dj26-05k20.6o.u82981ti",
         "id": "00000002-0000-0000-0000-000200000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "ER𪿃:󻸌\u0007󽋱H󷡶,t[Q\u000fGU]?R7I\u00156",
-    "expires_at": "1864-05-07T04:00:27.919Z",
-    "team": "00000002-0000-0001-0000-000000000002",
-    "id": "00000000-0000-0002-0000-000100000001",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0001-0000-000100000000",
+        "provider": "00000000-0000-0001-0000-000000000000"
+    },
+    "team": "00000002-0000-0001-0000-000000000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_15.json b/libs/wire-api/test/golden/testObject_User_user_15.json
index f1dae421668..7bea86eda8d 100644
--- a/libs/wire-api/test/golden/testObject_User_user_15.json
+++ b/libs/wire-api/test/golden/testObject_User_user_15.json
@@ -1,47 +1,47 @@
 {
-    "handle": "wmsb2zu9clwp64c_.4ia1kskbmm4cydu1hasbtczyssh9xy5fw6ub0p41xjr9onur5.raa.",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000001",
-        "provider": "00000001-0000-0001-0000-000000000001"
-    },
-    "locale": "ne-BJ",
-    "managed_by": "scim",
-    "qualified_id": {
-        "domain": "u94.8-o.t278r",
-        "id": "00000001-0000-0002-0000-000200000000"
-    },
     "accent_id": -2,
-    "picture": [],
-    "name": "1Oz%kWYﾷ\\z3􂼏\u0015s󺜭-,\t䍈എ_[󲛛*",
-    "expires_at": "1864-05-10T23:08:57.869Z",
-    "team": "00000001-0000-0001-0000-000200000000",
-    "id": "00000000-0000-0000-0000-000000000002",
-    "deleted": true,
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "expires_at": "1864-05-10T23:08:57.869Z",
+    "handle": "wmsb2zu9clwp64c_.4ia1kskbmm4cydu1hasbtczyssh9xy5fw6ub0p41xjr9onur5.raa.",
+    "id": "00000000-0000-0000-0000-000000000002",
+    "locale": "ne-BJ",
+    "managed_by": "scim",
+    "name": "1Oz%kWYﾷ\\z3􂼏\u0015s󺜭-,\t䍈എ_[󲛛*",
+    "picture": [],
+    "qualified_id": {
+        "domain": "u94.8-o.t278r",
+        "id": "00000001-0000-0002-0000-000200000000"
+    },
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000001",
+        "provider": "00000001-0000-0001-0000-000000000001"
+    },
+    "team": "00000001-0000-0001-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_16.json b/libs/wire-api/test/golden/testObject_User_user_16.json
index c22cc4c30db..15be973f270 100644
--- a/libs/wire-api/test/golden/testObject_User_user_16.json
+++ b/libs/wire-api/test/golden/testObject_User_user_16.json
@@ -1,30 +1,30 @@
 {
-    "phone": "+204681013138537",
-    "handle": "heowgl9k2xx9s.141ch3ll39je4l4srhqmzi.vvev29yq7-fpgn2d6kim8",
-    "service": {
-        "id": "00000001-0000-0000-0000-000000000001",
-        "provider": "00000001-0000-0000-0000-000100000000"
-    },
-    "locale": "cy",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "7.o5m.o8x5t79t-vpy9",
-        "id": "00000001-0000-0001-0000-000100000001"
-    },
     "accent_id": -2,
-    "picture": [],
-    "name": "@!🠇U<iA\u001c󼏐\u0012\u00181\n\u0014󱈑[x𢀶o}󺆊P\u0013G\u0012m\u00078󺆘x?𦸃{\u0007𢝅|i\"~B𨳅x]E$k",
-    "expires_at": "1864-05-07T19:30:23.627Z",
-    "id": "00000002-0000-0000-0000-000200000001",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
             "key": "",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "expires_at": "1864-05-07T19:30:23.627Z",
+    "handle": "heowgl9k2xx9s.141ch3ll39je4l4srhqmzi.vvev29yq7-fpgn2d6kim8",
+    "id": "00000002-0000-0000-0000-000200000001",
+    "locale": "cy",
+    "managed_by": "wire",
+    "name": "@!🠇U<iA\u001c󼏐\u0012\u00181\n\u0014󱈑[x𢀶o}󺆊P\u0013G\u0012m\u00078󺆘x?𦸃{\u0007𢝅|i\"~B𨳅x]E$k",
+    "phone": "+204681013138537",
+    "picture": [],
+    "qualified_id": {
+        "domain": "7.o5m.o8x5t79t-vpy9",
+        "id": "00000001-0000-0001-0000-000100000001"
+    },
+    "service": {
+        "id": "00000001-0000-0000-0000-000000000001",
+        "provider": "00000001-0000-0000-0000-000100000000"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_17.json b/libs/wire-api/test/golden/testObject_User_user_17.json
index 693f39c01e7..8cf2223d79b 100644
--- a/libs/wire-api/test/golden/testObject_User_user_17.json
+++ b/libs/wire-api/test/golden/testObject_User_user_17.json
@@ -1,21 +1,5 @@
 {
-    "handle": "markynabp",
-    "service": {
-        "id": "00000001-0000-0000-0000-000100000000",
-        "provider": "00000000-0000-0001-0000-000000000000"
-    },
-    "locale": "la",
-    "managed_by": "scim",
-    "qualified_id": {
-        "domain": "iws.f6",
-        "id": "00000002-0000-0002-0000-000100000002"
-    },
     "accent_id": -2,
-    "picture": [],
-    "name": "_)l@^\u0002'=􆦚󾺧6f^𮫼<{G󶅏\tM󷆦W{H05𫱥\u001b&\u0003\u0011X栟<D󵫋ﴁw⨇7󱲞𨹪\u0007􇳹󾜧AtAQIM􂼕\u0013Vp􋯛6?g󲃂+\u001c\u0002|~a𢯆\u0002\u001c~\u00074)\u001e\t󿥹\u001aF\u001f:JFVN__\u001b<",
-    "expires_at": "1864-05-10T18:35:27.453Z",
-    "team": "00000002-0000-0001-0000-000200000001",
-    "id": "00000000-0000-0000-0000-000000000000",
     "assets": [
         {
             "key": "",
@@ -25,5 +9,21 @@
             "key": "",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "expires_at": "1864-05-10T18:35:27.453Z",
+    "handle": "markynabp",
+    "id": "00000000-0000-0000-0000-000000000000",
+    "locale": "la",
+    "managed_by": "scim",
+    "name": "_)l@^\u0002'=􆦚󾺧6f^𮫼<{G󶅏\tM󷆦W{H05𫱥\u001b&\u0003\u0011X栟<D󵫋ﴁw⨇7󱲞𨹪\u0007􇳹󾜧AtAQIM􂼕\u0013Vp􋯛6?g󲃂+\u001c\u0002|~a𢯆\u0002\u001c~\u00074)\u001e\t󿥹\u001aF\u001f:JFVN__\u001b<",
+    "picture": [],
+    "qualified_id": {
+        "domain": "iws.f6",
+        "id": "00000002-0000-0002-0000-000100000002"
+    },
+    "service": {
+        "id": "00000001-0000-0000-0000-000100000000",
+        "provider": "00000000-0000-0001-0000-000000000000"
+    },
+    "team": "00000002-0000-0001-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_18.json b/libs/wire-api/test/golden/testObject_User_user_18.json
index 8933c31fbd4..dabc86d65c6 100644
--- a/libs/wire-api/test/golden/testObject_User_user_18.json
+++ b/libs/wire-api/test/golden/testObject_User_user_18.json
@@ -1,42 +1,42 @@
 {
-    "email": "@",
-    "phone": "+0535364775",
-    "handle": "ip",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000100000000"
-    },
-    "locale": "li-TG",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "5rdu.v49c00u",
-        "id": "00000001-0000-0000-0000-000100000000"
-    },
     "accent_id": 1,
-    "picture": [],
-    "name": "\u0019[e#Du\u0017m魘􉖢󳑡6\ty􌊡",
-    "expires_at": "1864-05-09T22:44:19.375Z",
-    "team": "00000000-0000-0000-0000-000200000002",
-    "sso_id": {
-        "subject": "",
-        "tenant": ""
-    },
-    "id": "00000000-0000-0001-0000-000200000000",
-    "deleted": true,
     "assets": [
         {
             "key": "",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "email": "@",
+    "expires_at": "1864-05-09T22:44:19.375Z",
+    "handle": "ip",
+    "id": "00000000-0000-0001-0000-000200000000",
+    "locale": "li-TG",
+    "managed_by": "wire",
+    "name": "\u0019[e#Du\u0017m魘􉖢󳑡6\ty􌊡",
+    "phone": "+0535364775",
+    "picture": [],
+    "qualified_id": {
+        "domain": "5rdu.v49c00u",
+        "id": "00000001-0000-0000-0000-000100000000"
+    },
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000000",
+        "provider": "00000000-0000-0000-0000-000100000000"
+    },
+    "sso_id": {
+        "subject": "",
+        "tenant": ""
+    },
+    "team": "00000000-0000-0000-0000-000200000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_19.json b/libs/wire-api/test/golden/testObject_User_user_19.json
index d72dde6a41a..f42b0b2add1 100644
--- a/libs/wire-api/test/golden/testObject_User_user_19.json
+++ b/libs/wire-api/test/golden/testObject_User_user_19.json
@@ -1,23 +1,23 @@
 {
+    "accent_id": 0,
+    "assets": [
+        {
+            "key": "",
+            "type": "image"
+        }
+    ],
     "email": "@潍",
-    "phone": "+8377346869260",
+    "expires_at": "1864-05-11T17:37:12.497Z",
     "handle": "m4o",
+    "id": "00000000-0000-0000-0000-000200000001",
     "locale": "mr-HK",
     "managed_by": "wire",
+    "name": "[\u000esj촣qP𠔞1ZOl^\u0015=o瓫z\u0017\u000b\u001a}\u001d\u0007=橒𫓰𐊂*c9u\\)1l\u0002䓧䍢<ug杧\nu\u000cK1䝅nT\t𤛊D􃹉櫂\u000b\u0015􋡨𨠝Uz>{𗧟oW𤺳𠲂?󾒊&&,\r\u0007>9V5&e+O\u0004?m󿷕M𫊷V􅛗󾀌\u000b󼑐𣡯#jm@󼔩x􌚶\u0008Ḣ1gZ",
+    "phone": "+8377346869260",
+    "picture": [],
     "qualified_id": {
         "domain": "m.gs-h8m3",
         "id": "00000002-0000-0002-0000-000100000002"
     },
-    "accent_id": 0,
-    "picture": [],
-    "name": "[\u000esj촣qP𠔞1ZOl^\u0015=o瓫z\u0017\u000b\u001a}\u001d\u0007=橒𫓰𐊂*c9u\\)1l\u0002䓧䍢<ug杧\nu\u000cK1䝅nT\t𤛊D􃹉櫂\u000b\u0015􋡨𨠝Uz>{𗧟oW𤺳𠲂?󾒊&&,\r\u0007>9V5&e+O\u0004?m󿷕M𫊷V􅛗󾀌\u000b󼑐𣡯#jm@󼔩x􌚶\u0008Ḣ1gZ",
-    "expires_at": "1864-05-11T17:37:12.497Z",
-    "team": "00000001-0000-0002-0000-000100000000",
-    "id": "00000000-0000-0000-0000-000200000001",
-    "assets": [
-        {
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "team": "00000001-0000-0002-0000-000100000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_2.json b/libs/wire-api/test/golden/testObject_User_user_2.json
index f67fc4dfacb..93a131ce181 100644
--- a/libs/wire-api/test/golden/testObject_User_user_2.json
+++ b/libs/wire-api/test/golden/testObject_User_user_2.json
@@ -1,39 +1,23 @@
 {
-    "phone": "+837934954",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000001",
-        "provider": "00000000-0000-0000-0000-000100000000"
-    },
-    "locale": "da-TN",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "k.vbg.p",
-        "id": "00000000-0000-0001-0000-000200000001"
-    },
     "accent_id": -2,
-    "picture": [],
-    "name": "4􄢻7\u0006\u0012\u0012\u0017bp\u0001麙0Yr\\󰘣vKRg󿽓)󽼺S󰇌􂏦:3B\u0006\u0013\u0003T",
-    "expires_at": "1864-05-11T17:06:58.936Z",
-    "id": "00000000-0000-0000-0000-000100000001",
-    "deleted": true,
     "assets": [
         {
             "key": "",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         },
         {
@@ -41,9 +25,25 @@
             "type": "image"
         },
         {
-            "size": "preview",
             "key": "",
+            "size": "preview",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "deleted": true,
+    "expires_at": "1864-05-11T17:06:58.936Z",
+    "id": "00000000-0000-0000-0000-000100000001",
+    "locale": "da-TN",
+    "managed_by": "wire",
+    "name": "4􄢻7\u0006\u0012\u0012\u0017bp\u0001麙0Yr\\󰘣vKRg󿽓)󽼺S󰇌􂏦:3B\u0006\u0013\u0003T",
+    "phone": "+837934954",
+    "picture": [],
+    "qualified_id": {
+        "domain": "k.vbg.p",
+        "id": "00000000-0000-0001-0000-000200000001"
+    },
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000001",
+        "provider": "00000000-0000-0000-0000-000100000000"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_20.json b/libs/wire-api/test/golden/testObject_User_user_20.json
index 5064d4a82e3..dfe6441bbdd 100644
--- a/libs/wire-api/test/golden/testObject_User_user_20.json
+++ b/libs/wire-api/test/golden/testObject_User_user_20.json
@@ -1,21 +1,21 @@
 {
-    "phone": "+43245195312227",
+    "accent_id": 1,
+    "assets": [],
+    "expires_at": "1864-05-10T13:00:07.275Z",
     "handle": "apdh51n9mpxew4sose_n_mu",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000001",
-        "provider": "00000001-0000-0001-0000-000000000000"
-    },
+    "id": "00000001-0000-0000-0000-000100000001",
     "locale": "cu",
     "managed_by": "wire",
+    "name": "bW\\&𨢆𢡒\\k𥥗搑􆢭0\u0015i龍GRh\u0015h\u0018O\u0017J󶷜s_󱬘jV\u000f\u0011\u0002􎄣~N(\u0003rj1r^􈆸Zaw𤪸􉕟j𠍜󻆽𭕼𠶒N\u0001瞱ex8*飵A\u0012nkzr筧{j\u0001-g󷍆=d<\\Pc+K(vZ\u001c",
+    "phone": "+43245195312227",
+    "picture": [],
     "qualified_id": {
         "domain": "6mlxl.2v5.gd7",
         "id": "00000000-0000-0000-0000-000200000000"
     },
-    "accent_id": 1,
-    "picture": [],
-    "name": "bW\\&𨢆𢡒\\k𥥗搑􆢭0\u0015i龍GRh\u0015h\u0018O\u0017J󶷜s_󱬘jV\u000f\u0011\u0002􎄣~N(\u0003rj1r^􈆸Zaw𤪸􉕟j𠍜󻆽𭕼𠶒N\u0001瞱ex8*飵A\u0012nkzr筧{j\u0001-g󷍆=d<\\Pc+K(vZ\u001c",
-    "expires_at": "1864-05-10T13:00:07.275Z",
-    "team": "00000000-0000-0000-0000-000200000000",
-    "id": "00000001-0000-0000-0000-000100000001",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000001",
+        "provider": "00000001-0000-0001-0000-000000000000"
+    },
+    "team": "00000000-0000-0000-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_3.json b/libs/wire-api/test/golden/testObject_User_user_3.json
index 898e8f07d83..ccb088167c2 100644
--- a/libs/wire-api/test/golden/testObject_User_user_3.json
+++ b/libs/wire-api/test/golden/testObject_User_user_3.json
@@ -1,26 +1,26 @@
 {
-    "phone": "+025643547231991",
+    "accent_id": -2,
+    "assets": [],
+    "deleted": true,
+    "expires_at": "1864-05-09T20:12:05.821Z",
     "handle": "1c",
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000000",
-        "provider": "00000001-0000-0000-0000-000100000000"
-    },
+    "id": "00000002-0000-0000-0000-000100000000",
     "locale": "tg-UA",
     "managed_by": "wire",
+    "name": ",r\u0019XEg0$𗾋\u001e\u000f'uS\u0003/󶙆`äV.J{\u000cgE(\rK!\u000ep8s9gXO唲Xj\u0002\u001e\u0012",
+    "phone": "+025643547231991",
+    "picture": [],
     "qualified_id": {
         "domain": "dt.n",
         "id": "00000002-0000-0000-0000-000100000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": ",r\u0019XEg0$𗾋\u001e\u000f'uS\u0003/󶙆`äV.J{\u000cgE(\rK!\u000ep8s9gXO唲Xj\u0002\u001e\u0012",
-    "expires_at": "1864-05-09T20:12:05.821Z",
-    "team": "00000002-0000-0001-0000-000200000000",
+    "service": {
+        "id": "00000001-0000-0001-0000-000100000000",
+        "provider": "00000001-0000-0000-0000-000100000000"
+    },
     "sso_id": {
         "subject": "",
         "tenant": ""
     },
-    "id": "00000002-0000-0000-0000-000100000000",
-    "deleted": true,
-    "assets": []
-}
\ No newline at end of file
+    "team": "00000002-0000-0001-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_4.json b/libs/wire-api/test/golden/testObject_User_user_4.json
index 3fb25894f81..76d106c0a5c 100644
--- a/libs/wire-api/test/golden/testObject_User_user_4.json
+++ b/libs/wire-api/test/golden/testObject_User_user_4.json
@@ -1,24 +1,24 @@
 {
+    "accent_id": 0,
+    "assets": [],
     "email": "@",
+    "expires_at": "1864-05-09T14:25:26.089Z",
     "handle": "mzebw5l9p858om29lqwj5d08otrwzzickuh_s8dpookvkl_ryzbsvw-ogxrwyiw2-.udd2l7us58siy2rp024r9-ezsotchneqgalz1y1ltna7yg3dfg.wzn4vx3hjhch8.-pi3azd9u3l-5t6uyjqk93twvx_3gdh32e82fsrdpf8qfsi2ls-a2pce8p1xjh7387nztzu.q",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000000",
-        "provider": "00000000-0000-0000-0000-000000000000"
-    },
+    "id": "00000002-0000-0001-0000-000100000002",
     "locale": "bi-MQ",
     "managed_by": "scim",
+    "name": "^󺝨F􈝼=&o>f<7\u000eq|6\u0011\u0019󳟧􁗄\u001bf󷯶𩣇\u0013bnVAj`^L\u000c󿮁\u001fLI\u0005!􃈈\u0017`󾒁\u0003e曉\u001aK|",
+    "picture": [],
     "qualified_id": {
         "domain": "28b.cqb",
         "id": "00000000-0000-0002-0000-000200000002"
     },
-    "accent_id": 0,
-    "picture": [],
-    "name": "^󺝨F􈝼=&o>f<7\u000eq|6\u0011\u0019󳟧􁗄\u001bf󷯶𩣇\u0013bnVAj`^L\u000c󿮁\u001fLI\u0005!􃈈\u0017`󾒁\u0003e曉\u001aK|",
-    "expires_at": "1864-05-09T14:25:26.089Z",
-    "team": "00000000-0000-0000-0000-000100000002",
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000000",
+        "provider": "00000000-0000-0000-0000-000000000000"
+    },
     "sso_id": {
         "scim_external_id": ""
     },
-    "id": "00000002-0000-0001-0000-000100000002",
-    "assets": []
-}
\ No newline at end of file
+    "team": "00000000-0000-0000-0000-000100000002"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_5.json b/libs/wire-api/test/golden/testObject_User_user_5.json
index 042211be1da..cc5bda97636 100644
--- a/libs/wire-api/test/golden/testObject_User_user_5.json
+++ b/libs/wire-api/test/golden/testObject_User_user_5.json
@@ -1,28 +1,28 @@
 {
+    "accent_id": -2,
+    "assets": [
+        {
+            "key": "",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "email": "f@𔒫",
+    "expires_at": "1864-05-11T20:43:46.798Z",
     "handle": "hb",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000000",
-        "provider": "00000000-0000-0000-0000-000100000000"
-    },
+    "id": "00000002-0000-0002-0000-000100000002",
     "locale": "et-NF",
     "managed_by": "scim",
+    "name": "[|u\u0007FH􈨳\u0013𨍦𫯯k#􄧗fN4\u001a#G󵅱\u000ekK\u001d󿲷yP􄄪|H🧊\u000bi\rAcUp\u000e\u001f",
+    "picture": [],
     "qualified_id": {
         "domain": "k.ma656.845z--u9.34.4ot8v.p6-2o",
         "id": "00000002-0000-0000-0000-000200000002"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "[|u\u0007FH􈨳\u0013𨍦𫯯k#􄧗fN4\u001a#G󵅱\u000ekK\u001d󿲷yP􄄪|H🧊\u000bi\rAcUp\u000e\u001f",
-    "expires_at": "1864-05-11T20:43:46.798Z",
-    "team": "00000000-0000-0001-0000-000200000000",
-    "id": "00000002-0000-0002-0000-000100000002",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "preview",
-            "key": "",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000000",
+        "provider": "00000000-0000-0000-0000-000100000000"
+    },
+    "team": "00000000-0000-0001-0000-000200000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_6.json b/libs/wire-api/test/golden/testObject_User_user_6.json
index e95ae94546b..17d4a0112a9 100644
--- a/libs/wire-api/test/golden/testObject_User_user_6.json
+++ b/libs/wire-api/test/golden/testObject_User_user_6.json
@@ -1,30 +1,30 @@
 {
-    "phone": "+90270460",
+    "accent_id": -1,
+    "assets": [
+        {
+            "key": "􌡐",
+            "size": "complete",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "handle": "hp95jkglpreb88pm0w.35i6za1241dt2el.8s1msvq2u4aov_muws4n4xdvv-ocd95oqqbb7.eqdi1hmudsh_9h0nt0o0gtkpnm7xu494-nl6ljfoxsxlm.66l8ny3yejd2fqb5y.zpi2rgo-f8yhkwl0k7.a91kdxflxx4.am_ka62kebtexj97f07bko4t2.6tr1rx1cbabnk0w_dz714nmenx8bscvdw8_ay1o",
-    "service": {
-        "id": "00000000-0000-0000-0000-000000000001",
-        "provider": "00000001-0000-0001-0000-000100000001"
-    },
+    "id": "00000002-0000-0000-0000-000100000002",
     "locale": "tw-BD",
     "managed_by": "wire",
+    "name": "󲔐RiM2\u0013􍱅#5T-~=#\u000f􂰀rf󲯵}\u0001𪅎\\K𤓻\u0012I\n\u000ez'貎\u001a\u0016>p􎠘\u001c\\(𨵄󻿐󾦲j􀥳M|𨸴\u0014c𬒿`/\tpU]#\u000f􁷟(9\u0015V𤌛23i𢦏\u0019gs[\u001f:\\􅸋",
+    "phone": "+90270460",
+    "picture": [],
     "qualified_id": {
         "domain": "u8-9--eppc-k-02.l5-ci5zk",
         "id": "00000000-0000-0000-0000-000000000001"
     },
-    "accent_id": -1,
-    "picture": [],
-    "name": "󲔐RiM2\u0013􍱅#5T-~=#\u000f􂰀rf󲯵}\u0001𪅎\\K𤓻\u0012I\n\u000ez'貎\u001a\u0016>p􎠘\u001c\\(𨵄󻿐󾦲j􀥳M|𨸴\u0014c𬒿`/\tpU]#\u000f􁷟(9\u0015V𤌛23i𢦏\u0019gs[\u001f:\\􅸋",
+    "service": {
+        "id": "00000000-0000-0000-0000-000000000001",
+        "provider": "00000001-0000-0001-0000-000100000001"
+    },
     "sso_id": {
         "subject": "",
         "tenant": ""
-    },
-    "id": "00000002-0000-0000-0000-000100000002",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "complete",
-            "key": "􌡐",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_7.json b/libs/wire-api/test/golden/testObject_User_user_7.json
index bb95da27ed2..b3a95f938e4 100644
--- a/libs/wire-api/test/golden/testObject_User_user_7.json
+++ b/libs/wire-api/test/golden/testObject_User_user_7.json
@@ -1,28 +1,28 @@
 {
+    "accent_id": -1,
+    "assets": [
+        {
+            "key": ";",
+            "size": "preview",
+            "type": "image"
+        }
+    ],
+    "deleted": true,
     "email": "@o",
+    "expires_at": "1864-05-09T16:08:44.186Z",
     "handle": "t.w_8.",
-    "service": {
-        "id": "00000001-0000-0001-0000-000100000001",
-        "provider": "00000000-0000-0001-0000-000100000000"
-    },
+    "id": "00000002-0000-0001-0000-000200000002",
     "locale": "ve-BS",
     "managed_by": "scim",
+    "name": "$]\u0004e<&\u0007KfM",
+    "picture": [],
     "qualified_id": {
         "domain": "7sb.43o7z--k8.k-7",
         "id": "00000002-0000-0001-0000-000200000001"
     },
-    "accent_id": -1,
-    "picture": [],
-    "name": "$]\u0004e<&\u0007KfM",
-    "expires_at": "1864-05-09T16:08:44.186Z",
-    "team": "00000000-0000-0002-0000-000200000001",
-    "id": "00000002-0000-0001-0000-000200000002",
-    "deleted": true,
-    "assets": [
-        {
-            "size": "preview",
-            "key": ";",
-            "type": "image"
-        }
-    ]
-}
\ No newline at end of file
+    "service": {
+        "id": "00000001-0000-0001-0000-000100000001",
+        "provider": "00000000-0000-0001-0000-000100000000"
+    },
+    "team": "00000000-0000-0002-0000-000200000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_8.json b/libs/wire-api/test/golden/testObject_User_user_8.json
index 7f671f2dd19..5f3ddcbdd9c 100644
--- a/libs/wire-api/test/golden/testObject_User_user_8.json
+++ b/libs/wire-api/test/golden/testObject_User_user_8.json
@@ -1,20 +1,20 @@
 {
-    "email": "@",
-    "locale": "ka-AQ",
-    "managed_by": "wire",
-    "qualified_id": {
-        "domain": "2v.k55u",
-        "id": "00000002-0000-0000-0000-000100000002"
-    },
     "accent_id": -2,
-    "picture": [],
-    "name": "?𢴠𘪊w\nLi\u0008\u0011{[8\nd}甤.Wh^z𒌦రV}\u000bAPy\u0012sgvk󹃶 5􀓷(5\u000b\u001f_y곕dcfc즎ℛ)fK\u0012A󳑬􃊪zu􄨦GEk\u000bQ􂾔𣏈\u0000󳟁5雛\u000b",
-    "id": "00000002-0000-0000-0000-000100000000",
     "assets": [
         {
-            "size": "complete",
             "key": "",
+            "size": "complete",
             "type": "image"
         }
-    ]
-}
\ No newline at end of file
+    ],
+    "email": "@",
+    "id": "00000002-0000-0000-0000-000100000000",
+    "locale": "ka-AQ",
+    "managed_by": "wire",
+    "name": "?𢴠𘪊w\nLi\u0008\u0011{[8\nd}甤.Wh^z𒌦రV}\u000bAPy\u0012sgvk󹃶 5􀓷(5\u000b\u001f_y곕dcfc즎ℛ)fK\u0012A󳑬􃊪zu􄨦GEk\u000bQ􂾔𣏈\u0000󳟁5雛\u000b",
+    "picture": [],
+    "qualified_id": {
+        "domain": "2v.k55u",
+        "id": "00000002-0000-0000-0000-000100000002"
+    }
+}
diff --git a/libs/wire-api/test/golden/testObject_User_user_9.json b/libs/wire-api/test/golden/testObject_User_user_9.json
index 05e1867a95a..d908944e11e 100644
--- a/libs/wire-api/test/golden/testObject_User_user_9.json
+++ b/libs/wire-api/test/golden/testObject_User_user_9.json
@@ -1,22 +1,22 @@
 {
+    "accent_id": -2,
+    "assets": [],
     "email": "@\u001b",
-    "phone": "+783368053",
+    "expires_at": "1864-05-11T13:40:26.091Z",
     "handle": "qptpyy3",
-    "service": {
-        "id": "00000000-0000-0001-0000-000100000001",
-        "provider": "00000001-0000-0000-0000-000000000000"
-    },
+    "id": "00000002-0000-0002-0000-000100000001",
     "locale": "tl-MO",
     "managed_by": "scim",
+    "name": "P􂫝o1qr1(k󱆙-\u001fW\u0016𖢮TX9F@\u001d\u0019\u0018`傫\u00054\u0004@",
+    "phone": "+783368053",
+    "picture": [],
     "qualified_id": {
         "domain": "9.fs7-3.x-0",
         "id": "00000000-0000-0000-0000-000200000000"
     },
-    "accent_id": -2,
-    "picture": [],
-    "name": "P􂫝o1qr1(k󱆙-\u001fW\u0016𖢮TX9F@\u001d\u0019\u0018`傫\u00054\u0004@",
-    "expires_at": "1864-05-11T13:40:26.091Z",
-    "team": "00000000-0000-0002-0000-000100000001",
-    "id": "00000002-0000-0002-0000-000100000001",
-    "assets": []
-}
\ No newline at end of file
+    "service": {
+        "id": "00000000-0000-0001-0000-000100000001",
+        "provider": "00000001-0000-0000-0000-000000000000"
+    },
+    "team": "00000000-0000-0002-0000-000100000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_1.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_1.json
index af42f72b72c..485748d1a86 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_1.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_1.json
@@ -1,4 +1,4 @@
 {
-    "key": "Zd0E7PAbtX63Snj90YXv",
-    "code": "5rfJK3iplxf"
-}
\ No newline at end of file
+    "code": "5rfJK3iplxf",
+    "key": "Zd0E7PAbtX63Snj90YXv"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_10.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_10.json
index d5cd5d2e80f..3c103d54efc 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_10.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_10.json
@@ -1,4 +1,4 @@
 {
-    "key": "iOznLTQU0YCvP-PFJVnw",
-    "code": "5e6hcZ"
-}
\ No newline at end of file
+    "code": "5e6hcZ",
+    "key": "iOznLTQU0YCvP-PFJVnw"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_11.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_11.json
index 461a7d59d93..5f20e461c0f 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_11.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_11.json
@@ -1,4 +1,4 @@
 {
-    "key": "ITPDRKuIM0E9TCUWuMc4",
-    "code": "GnTV8MhtczPmB"
-}
\ No newline at end of file
+    "code": "GnTV8MhtczPmB",
+    "key": "ITPDRKuIM0E9TCUWuMc4"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_12.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_12.json
index f564977f612..f4a2c23e249 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_12.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_12.json
@@ -1,4 +1,4 @@
 {
-    "key": "JgyOMcGrMkAp=P6gCC42",
-    "code": "r1AjgtYIwq4bJede"
-}
\ No newline at end of file
+    "code": "r1AjgtYIwq4bJede",
+    "key": "JgyOMcGrMkAp=P6gCC42"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_13.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_13.json
index 4af29dcf7e2..50bb3256bd7 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_13.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_13.json
@@ -1,4 +1,4 @@
 {
-    "key": "H=577C1Rz4bi6FTP3Fsu",
-    "code": "NycA_22ZMY9yEpug7jrb"
-}
\ No newline at end of file
+    "code": "NycA_22ZMY9yEpug7jrb",
+    "key": "H=577C1Rz4bi6FTP3Fsu"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_14.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_14.json
index 917146a5a07..c840dc3ab2a 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_14.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_14.json
@@ -1,4 +1,4 @@
 {
-    "key": "WVR7aRLpUPokwVqUNvO=",
-    "code": "x1YQXKDCBOhXSIlv4TM"
-}
\ No newline at end of file
+    "code": "x1YQXKDCBOhXSIlv4TM",
+    "key": "WVR7aRLpUPokwVqUNvO="
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_15.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_15.json
index 75b5c4ed136..e90f279ddfa 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_15.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_15.json
@@ -1,4 +1,4 @@
 {
-    "key": "7NsqcSFb1haHGW3T6afk",
-    "code": "pNUQx7xtswWQZDKus3"
-}
\ No newline at end of file
+    "code": "pNUQx7xtswWQZDKus3",
+    "key": "7NsqcSFb1haHGW3T6afk"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_16.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_16.json
index 3f5915299d7..4a50e88ee45 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_16.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_16.json
@@ -1,4 +1,4 @@
 {
-    "key": "pIRiVnNmSyYIPoPWw-Ge",
-    "code": "mBaXfRCP5pcBl"
-}
\ No newline at end of file
+    "code": "mBaXfRCP5pcBl",
+    "key": "pIRiVnNmSyYIPoPWw-Ge"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_17.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_17.json
index 436c93b3f98..cfbaf7542b8 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_17.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_17.json
@@ -1,4 +1,4 @@
 {
-    "key": "-wW78mNmAvg=ObKVCxhP",
-    "code": "YkGMHpzkep3_VBz"
-}
\ No newline at end of file
+    "code": "YkGMHpzkep3_VBz",
+    "key": "-wW78mNmAvg=ObKVCxhP"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_18.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_18.json
index 631ecc822b8..5742b2f8dce 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_18.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_18.json
@@ -1,4 +1,4 @@
 {
-    "key": "V_w1B5J=5XdUk5d9nGYg",
-    "code": "WX-UIuIp17ybHeyx"
-}
\ No newline at end of file
+    "code": "WX-UIuIp17ybHeyx",
+    "key": "V_w1B5J=5XdUk5d9nGYg"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_19.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_19.json
index bbd01052d00..9d8145a0a8d 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_19.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_19.json
@@ -1,4 +1,4 @@
 {
-    "key": "EfdiPJ-CCnEoldV-yqdD",
-    "code": "op_PNw4M"
-}
\ No newline at end of file
+    "code": "op_PNw4M",
+    "key": "EfdiPJ-CCnEoldV-yqdD"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_2.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_2.json
index 08471526211..8a3c32bf1ee 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_2.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_2.json
@@ -1,4 +1,4 @@
 {
-    "key": "s48e7_P53jCRq78HcwiU",
-    "code": "e1l63AUTj8r9-V-UPzdg"
-}
\ No newline at end of file
+    "code": "e1l63AUTj8r9-V-UPzdg",
+    "key": "s48e7_P53jCRq78HcwiU"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_20.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_20.json
index 998ec264379..bf53fec3ec0 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_20.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_20.json
@@ -1,4 +1,4 @@
 {
-    "key": "KD9ei9WvBc9rlzpFS7If",
-    "code": "kdbu6kPH"
-}
\ No newline at end of file
+    "code": "kdbu6kPH",
+    "key": "KD9ei9WvBc9rlzpFS7If"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_3.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_3.json
index 545b28b396c..d5340c23115 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_3.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_3.json
@@ -1,4 +1,4 @@
 {
-    "key": "b0y=TFQAfoE_RZq574Z2",
-    "code": "ZsSbzICF1f6rqrpIt"
-}
\ No newline at end of file
+    "code": "ZsSbzICF1f6rqrpIt",
+    "key": "b0y=TFQAfoE_RZq574Z2"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_4.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_4.json
index f9b61a060ea..bd1d20a071c 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_4.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_4.json
@@ -1,4 +1,4 @@
 {
-    "key": "GoiC6j6NhdBWPKinvc6j",
-    "code": "Vg_NWfbdvJ8xl56YWAD"
-}
\ No newline at end of file
+    "code": "Vg_NWfbdvJ8xl56YWAD",
+    "key": "GoiC6j6NhdBWPKinvc6j"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_5.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_5.json
index 43b3993a7a8..de57f53f143 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_5.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_5.json
@@ -1,4 +1,4 @@
 {
-    "key": "VZleCLl8lhKpijYBZQxp",
-    "code": "eAGAd=kP"
-}
\ No newline at end of file
+    "code": "eAGAd=kP",
+    "key": "VZleCLl8lhKpijYBZQxp"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_6.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_6.json
index bd658f54cdd..1ecff4bf6bb 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_6.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_6.json
@@ -1,4 +1,4 @@
 {
-    "key": "1m6Idt-8Z5xWCZCUnI2H",
-    "code": "s8pkN3EAVU"
-}
\ No newline at end of file
+    "code": "s8pkN3EAVU",
+    "key": "1m6Idt-8Z5xWCZCUnI2H"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_7.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_7.json
index 2f7a7675706..98a02896ba6 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_7.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_7.json
@@ -1,4 +1,4 @@
 {
-    "key": "GUyhsrPHJX3kUsIRwl7o",
-    "code": "xbSGHeEI6Mlp"
-}
\ No newline at end of file
+    "code": "xbSGHeEI6Mlp",
+    "key": "GUyhsrPHJX3kUsIRwl7o"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_8.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_8.json
index a420d4e75ce..8b9ce92d9d7 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_8.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_8.json
@@ -1,4 +1,4 @@
 {
-    "key": "aREjT9kV_k3n28smib=q",
-    "code": "4XaaX1lunI0SVIdQF"
-}
\ No newline at end of file
+    "code": "4XaaX1lunI0SVIdQF",
+    "key": "aREjT9kV_k3n28smib=q"
+}
diff --git a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_9.json b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_9.json
index a60949e43ae..7baed2f8747 100644
--- a/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_9.json
+++ b/libs/wire-api/test/golden/testObject_VerifyDeleteUser_user_9.json
@@ -1,4 +1,4 @@
 {
-    "key": "ZTAxgwL1puDBVlJm7ISB",
-    "code": "_O8MZmb7koe=-HHfv"
-}
\ No newline at end of file
+    "code": "_O8MZmb7koe=-HHfv",
+    "key": "ZTAxgwL1puDBVlJm7ISB"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_1.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_1.json
index 856890110f6..4d229b44fcd 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_1.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_1.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "x_0ojQ==",
-    "team_id": "00000003-0000-0006-0000-000000000008",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000003-0000-0006-0000-000000000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_10.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_10.json
index 49a6a481b5c..5ed8a92ed8b 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_10.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_10.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "",
-    "team_id": "00000001-0000-0007-0000-000600000001",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000001-0000-0007-0000-000600000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_11.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_11.json
index 906b899a0b0..4962c0ff234 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_11.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_11.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "UQ==",
-    "team_id": "00000004-0000-0006-0000-000400000006",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000004-0000-0006-0000-000400000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_12.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_12.json
index c0861aff42d..db8b681448e 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_12.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_12.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "kNwhepU=",
-    "team_id": "00000008-0000-0006-0000-000300000008",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000008-0000-0006-0000-000300000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_13.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_13.json
index 3c77915f893..d9d0c16ba3f 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_13.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_13.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "",
-    "team_id": "00000004-0000-0005-0000-000400000001",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000004-0000-0005-0000-000400000001"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_14.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_14.json
index 5c0d55c401d..cb2d3a981e9 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_14.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_14.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "eGc=",
-    "team_id": "00000000-0000-0008-0000-000200000004",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000000-0000-0008-0000-000200000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_15.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_15.json
index 76490596611..843dc2706e4 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_15.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_15.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "jBY_",
-    "team_id": "00000006-0000-0000-0000-000200000006",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000006-0000-0000-0000-000200000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_16.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_16.json
index 20a7fb8d565..42a4061862b 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_16.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_16.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "ZmEN",
-    "team_id": "00000004-0000-0008-0000-000000000007",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000004-0000-0008-0000-000000000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_17.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_17.json
index a19c734e9b2..672310296d4 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_17.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_17.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "xRAJ",
-    "team_id": "00000002-0000-0004-0000-000000000005",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000002-0000-0004-0000-000000000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_18.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_18.json
index ec64009b287..9929473bff9 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_18.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_18.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "tIw=",
-    "team_id": "00000005-0000-0000-0000-000500000005",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000005-0000-0000-0000-000500000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_19.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_19.json
index 432422696c2..5635bd05a67 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_19.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_19.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "WCHG",
-    "team_id": "00000003-0000-0005-0000-000000000004",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000003-0000-0005-0000-000000000004"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_2.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_2.json
index 0b6237a845f..df5f3acd2e8 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_2.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_2.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "fA==",
-    "team_id": "00000000-0000-0006-0000-000400000005",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000000-0000-0006-0000-000400000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_20.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_20.json
index d189a39a168..6effaeabda7 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_20.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_20.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "cQ==",
-    "team_id": "00000007-0000-0002-0000-000600000000",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000007-0000-0002-0000-000600000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_3.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_3.json
index 71372a4bb8f..a6ffb46c486 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_3.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_3.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "5UE=",
-    "team_id": "00000003-0000-0002-0000-000500000007",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000003-0000-0002-0000-000500000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_4.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_4.json
index 508d4c23421..f873bf6a4cb 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_4.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_4.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "V7s=",
-    "team_id": "00000004-0000-0004-0000-000100000007",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000004-0000-0004-0000-000100000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_5.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_5.json
index dfd6863ecd6..82b62bbc410 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_5.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_5.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "4o2dEA==",
-    "team_id": "00000006-0000-0001-0000-000100000005",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000006-0000-0001-0000-000100000005"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_6.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_6.json
index 8a1749330c2..5628165754f 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_6.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_6.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "7CLO-g==",
-    "team_id": "00000006-0000-0000-0000-000600000000",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000006-0000-0000-0000-000600000000"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_7.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_7.json
index 2b9db3c468d..ae5011e0c64 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_7.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_7.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "TtbD",
-    "team_id": "00000003-0000-0005-0000-000400000006",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000003-0000-0005-0000-000400000006"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_8.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_8.json
index c2fc335271d..ca266f04c44 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_8.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_8.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "ev1dHck=",
-    "team_id": "00000005-0000-0001-0000-000200000007",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000005-0000-0001-0000-000200000007"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_9.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_9.json
index 0dad64cc4e6..3b0033e7826 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_9.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldServiceInfo_team_9.json
@@ -1,7 +1,7 @@
 {
     "auth_token": "ZZ-Xdg==",
-    "team_id": "00000004-0000-0004-0000-000000000008",
-    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
     "base_url": "https://example.com",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-}
\ No newline at end of file
+    "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+    "team_id": "00000004-0000-0004-0000-000000000008"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_1.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_1.json
index 254949cb736..3f724eda427 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_1.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_1.json
@@ -1,3 +1,3 @@
 {
     "status": "not_configured"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_10.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_10.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_10.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_10.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_11.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_11.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_11.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_11.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_12.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_12.json
index 33d85a0d4a1..c0afcef8326 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_12.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_12.json
@@ -1,10 +1,10 @@
 {
-    "status": "configured",
     "settings": {
         "auth_token": "L5xw",
-        "team_id": "00000000-0000-0003-0000-000200000001",
-        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
         "base_url": "https://example.com",
-        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    }
-}
\ No newline at end of file
+        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "team_id": "00000000-0000-0003-0000-000200000001"
+    },
+    "status": "configured"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_13.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_13.json
index ee3b22981e8..e6b922493d2 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_13.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_13.json
@@ -1,10 +1,10 @@
 {
-    "status": "configured",
     "settings": {
         "auth_token": "B-k=",
-        "team_id": "00000002-0000-0002-0000-000100000001",
-        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
         "base_url": "https://example.com",
-        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    }
-}
\ No newline at end of file
+        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "team_id": "00000002-0000-0002-0000-000100000001"
+    },
+    "status": "configured"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_14.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_14.json
index a87c8889404..6ab4d461b5b 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_14.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_14.json
@@ -1,10 +1,10 @@
 {
-    "status": "configured",
     "settings": {
         "auth_token": "SjY8Ng==",
-        "team_id": "00000003-0000-0000-0000-000000000000",
-        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
         "base_url": "https://example.com",
-        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    }
-}
\ No newline at end of file
+        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "team_id": "00000003-0000-0000-0000-000000000000"
+    },
+    "status": "configured"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_15.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_15.json
index 254949cb736..3f724eda427 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_15.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_15.json
@@ -1,3 +1,3 @@
 {
     "status": "not_configured"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_16.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_16.json
index 9675e20a48c..2775181b641 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_16.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_16.json
@@ -1,10 +1,10 @@
 {
-    "status": "configured",
     "settings": {
         "auth_token": "8A==",
-        "team_id": "00000001-0000-0004-0000-000100000003",
-        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
         "base_url": "https://example.com",
-        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    }
-}
\ No newline at end of file
+        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "team_id": "00000001-0000-0004-0000-000100000003"
+    },
+    "status": "configured"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_17.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_17.json
index 0a52cfa0047..049ac3d4b61 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_17.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_17.json
@@ -1,10 +1,10 @@
 {
-    "status": "configured",
     "settings": {
         "auth_token": "MdCZQA==",
-        "team_id": "00000004-0000-0002-0000-000200000004",
-        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
         "base_url": "https://example.com",
-        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    }
-}
\ No newline at end of file
+        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "team_id": "00000004-0000-0002-0000-000200000004"
+    },
+    "status": "configured"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_18.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_18.json
index 254949cb736..3f724eda427 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_18.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_18.json
@@ -1,3 +1,3 @@
 {
     "status": "not_configured"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_19.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_19.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_19.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_19.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_2.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_2.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_2.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_2.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_20.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_20.json
index 254949cb736..3f724eda427 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_20.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_20.json
@@ -1,3 +1,3 @@
 {
     "status": "not_configured"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_3.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_3.json
index 4ead5052daa..2f77117f2b9 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_3.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_3.json
@@ -1,10 +1,10 @@
 {
-    "status": "configured",
     "settings": {
         "auth_token": "",
-        "team_id": "00000003-0000-0000-0000-000000000004",
-        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
         "base_url": "https://example.com",
-        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    }
-}
\ No newline at end of file
+        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "team_id": "00000003-0000-0000-0000-000000000004"
+    },
+    "status": "configured"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_4.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_4.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_4.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_4.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_5.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_5.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_5.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_5.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_6.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_6.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_6.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_6.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_7.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_7.json
index 254949cb736..3f724eda427 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_7.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_7.json
@@ -1,3 +1,3 @@
 {
     "status": "not_configured"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_8.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_8.json
index 7f275310b21..e390965093b 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_8.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_8.json
@@ -1,10 +1,10 @@
 {
-    "status": "configured",
     "settings": {
         "auth_token": "aLE=",
-        "team_id": "00000001-0000-0001-0000-000300000000",
-        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
         "base_url": "https://example.com",
-        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
-    }
-}
\ No newline at end of file
+        "fingerprint": "ioy3GeIjgQRsobf2EKGO3O8mq/FofFxHRqy0T4ERIZ8=",
+        "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Kg/PHHU3atXrUbKnw0\nG06FliXcNt3lMwl2os5twEDcPPFw/feGiAKymxp+7JqZDrseS5D9THGrW+OQRIPH\nWvUBdiLfGrZqJO223DB6D8K2Su/odmnjZJ2z23rhXoEArTplu+Dg9K+c2LVeXTKV\nVPOaOzgtAB21XKRiQ4ermqgi3/njr03rXyq/qNkuNd6tNcg+HAfGxfGvvCSYBfiS\nbUKr/BeArYRcjzr/h5m1In6fG/if9GEI6m8dxHT9JbY53wiksowy6ajCuqskIFg8\n7X883H+LA/d6X5CTiPv1VMxXdBUiGPuC9IT/6CNQ1/LFt0P37ax58+LGYlaFo7la\nnQIDAQAB\n-----END PUBLIC KEY-----\n",
+        "team_id": "00000001-0000-0001-0000-000300000000"
+    },
+    "status": "configured"
+}
diff --git a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_9.json b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_9.json
index c39c93446a5..920ce18c589 100644
--- a/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_9.json
+++ b/libs/wire-api/test/golden/testObject_ViewLegalHoldService_team_9.json
@@ -1,3 +1,3 @@
 {
     "status": "disabled"
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_1.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_1.json
index 1b34bd9ecbc..f7c0cf55cbe 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_1.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_1.json
@@ -1,3 +1,3 @@
 {
     "some_int": 17
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_10.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_10.json
index 757351cdc8b..48690ec0a49 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_10.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_10.json
@@ -1,3 +1,3 @@
 {
     "some_int": -10
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_11.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_11.json
index 9bbc1df1a91..6260adc2bf3 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_11.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_11.json
@@ -1,3 +1,3 @@
 {
     "some_int": 5
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_12.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_12.json
index 60b7515b24b..f7b936146f8 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_12.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_12.json
@@ -1,3 +1,3 @@
 {
     "some_int": 2
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_13.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_13.json
index a40fa902f96..b180cfc9763 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_13.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_13.json
@@ -1,3 +1,3 @@
 {
     "some_int": 10
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_14.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_14.json
index 71f79f2a2c8..15febccc855 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_14.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_14.json
@@ -1,3 +1,3 @@
 {
     "some_int": -26
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_15.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_15.json
index a304410a3c8..834c2ff2935 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_15.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_15.json
@@ -1,3 +1,3 @@
 {
     "some_int": 15
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_16.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_16.json
index 656bbdc0267..0fa62c71a66 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_16.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_16.json
@@ -1,3 +1,3 @@
 {
     "some_int": -7
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_17.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_17.json
index 50053f00467..ff653c679a8 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_17.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_17.json
@@ -1,3 +1,3 @@
 {
     "some_int": 27
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_18.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_18.json
index 28301b6bc17..bd26cff1702 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_18.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_18.json
@@ -1,3 +1,3 @@
 {
     "some_int": -28
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_19.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_19.json
index a6edcecdb51..4e1ad76f8fc 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_19.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_19.json
@@ -1,3 +1,3 @@
 {
     "some_int": -18
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_2.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_2.json
index ea852cfcc6e..d6aa9cabd2d 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_2.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_2.json
@@ -1,3 +1,3 @@
 {
     "some_int": 26
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_20.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_20.json
index 757351cdc8b..48690ec0a49 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_20.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_20.json
@@ -1,3 +1,3 @@
 {
     "some_int": -10
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_3.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_3.json
index 23e36c765e3..87e52029ccd 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_3.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_3.json
@@ -1,3 +1,3 @@
 {
     "some_int": 6
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_4.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_4.json
index ceaae988813..eb25d921b21 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_4.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_4.json
@@ -1,3 +1,3 @@
 {
     "some_int": -1
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_5.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_5.json
index 028e2dd9bbd..d4be2cd3630 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_5.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_5.json
@@ -1,3 +1,3 @@
 {
     "some_int": 11
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_6.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_6.json
index 720c6a4bf01..e4a0e765755 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_6.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_6.json
@@ -1,3 +1,3 @@
 {
     "some_int": -22
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_7.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_7.json
index 720c6a4bf01..e4a0e765755 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_7.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_7.json
@@ -1,3 +1,3 @@
 {
     "some_int": -22
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_8.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_8.json
index 5c5d9c1e409..71a1e6dbbb1 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_8.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_8.json
@@ -1,3 +1,3 @@
 {
     "some_int": -11
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_9.json b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_9.json
index a2dff8ffee2..06ece8ddbb2 100644
--- a/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_9.json
+++ b/libs/wire-api/test/golden/testObject_Wrapped_20_22some_5fint_22_20Int_user_9.json
@@ -1,3 +1,3 @@
 {
     "some_int": -21
-}
\ No newline at end of file
+}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/FromJSON.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/FromJSON.hs
index c3ed87b42ba..8f6ceae80aa 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/FromJSON.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/FromJSON.hs
@@ -20,13 +20,13 @@ module Test.Wire.API.Golden.FromJSON where
 import Imports
 import Test.Tasty
 import Test.Tasty.HUnit
+import Test.Wire.API.Golden.Generated.Invite_user (testObject_Invite_user_2)
 import Test.Wire.API.Golden.Generated.NewConvUnmanaged_user
 import Test.Wire.API.Golden.Generated.NewOtrMessage_user
 import Test.Wire.API.Golden.Generated.RmClient_user
 import Test.Wire.API.Golden.Generated.SimpleMember_user
-import Test.Wire.API.Golden.Manual.ListConversations
 import Test.Wire.API.Golden.Runner
-import Wire.API.Conversation (Conversation)
+import Wire.API.Conversation (Conversation, MemberUpdate, NewConvManaged, NewConvUnmanaged, OtherMemberUpdate)
 import Wire.API.User.Client (RmClient)
 
 tests :: TestTree
@@ -38,20 +38,45 @@ tests =
           [(testObject_NewOtrMessage_user_1, "testObject_NewOtrMessage_user_1.json")],
       testCase "SimpleMember" $
         testFromJSONObjects
-          [(testObject_SimpleMember_user_1, "testObject_SimpleMember_user_1.json")],
-      testCase "NewConv" $
-        testFromJSONObjects
-          [ (testObject_NewConvUnmanaged_user_1, "testObject_NewConvUnmanaged_user_1.json"),
-            (testObject_NewConvUnmanaged_user_21, "testObject_NewConvUnmanaged_user_21.json")
+          [ (testObject_SimpleMember_user_2, "testObject_SimpleMember_user_2.json"),
+            (testObject_SimpleMember_user_2, "testObject_SimpleMember_user_2-2.json")
           ],
-      testCase "RmClient" $
-        testFromJSONObjects
+      testGroup
+        "NewConvUnmanaged"
+        [ testCase "success" $
+            testFromJSONObject
+              testObject_NewConvUnmanaged_user_1
+              "testObject_NewConvUnmanaged_user_1.json",
+          testCase
+            "failure"
+            $ testFromJSONFailureWithMsg
+              @NewConvUnmanaged
+              (Just "managed conversations have been deprecated")
+              "testObject_NewConvUnmanaged_user_2.json"
+        ],
+      testCase
+        "NewConvManaged failure"
+        $ testFromJSONFailureWithMsg
+          @NewConvManaged
+          (Just "only managed conversations are allowed here")
+          "testObject_NewConvManaged_user_2.json",
+      testCase
+        "RmClient"
+        $ testFromJSONObjects
           [(testObject_RmClient_user_4, "testObject_RmClient_user_4.json")],
       testCase "RmClient failure" $
         testFromJSONFailure @RmClient "testObject_RmClient_failure.json",
-      testCase "ListConversations" $
-        testFromJSONObjects
-          [(testObject_ListConversations_1, "testObject_ListConversations_1.json")],
       testCase "QualifiedConversationId" $
-        testFromJSONFailure @Conversation "testObject_Conversation_qualifiedId.json"
+        testFromJSONFailure @Conversation "testObject_Conversation_qualifiedId.json",
+      testCase "Invite" $
+        testFromJSONObject testObject_Invite_user_2 "testObject_Invite_user_2.json",
+      testCase "MemberUpdate" $
+        testFromJSONFailureWithMsg @MemberUpdate
+          ( Just $
+              "One of { \'otr_muted', 'otr_muted_ref', 'otr_archived', "
+                <> "'otr_archived_ref', 'hidden', 'hidden_ref', 'conversation_role'} required."
+          )
+          "testObject_MemberUpdate_user_3.json",
+      testCase "OtherMemberUpdate" $
+        testFromJSONFailure @OtherMemberUpdate "testObject_OtherMemberUpdate_user_2.json"
     ]
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated.hs
index bf496bf2b29..b29c11dedd7 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated.hs
@@ -249,450 +249,902 @@ tests :: TestTree
 tests =
   testGroup
     "Golden tests"
-    [ testCase ("Golden: AssetToken_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_1, "testObject_AssetToken_user_1.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_2, "testObject_AssetToken_user_2.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_3, "testObject_AssetToken_user_3.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_4, "testObject_AssetToken_user_4.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_5, "testObject_AssetToken_user_5.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_6, "testObject_AssetToken_user_6.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_7, "testObject_AssetToken_user_7.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_8, "testObject_AssetToken_user_8.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_9, "testObject_AssetToken_user_9.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_10, "testObject_AssetToken_user_10.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_11, "testObject_AssetToken_user_11.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_12, "testObject_AssetToken_user_12.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_13, "testObject_AssetToken_user_13.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_14, "testObject_AssetToken_user_14.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_15, "testObject_AssetToken_user_15.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_16, "testObject_AssetToken_user_16.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_17, "testObject_AssetToken_user_17.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_18, "testObject_AssetToken_user_18.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_19, "testObject_AssetToken_user_19.json"), (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_20, "testObject_AssetToken_user_20.json")],
-      testCase ("Golden: NewAssetToken_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_1, "testObject_NewAssetToken_user_1.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_2, "testObject_NewAssetToken_user_2.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_3, "testObject_NewAssetToken_user_3.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_4, "testObject_NewAssetToken_user_4.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_5, "testObject_NewAssetToken_user_5.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_6, "testObject_NewAssetToken_user_6.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_7, "testObject_NewAssetToken_user_7.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_8, "testObject_NewAssetToken_user_8.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_9, "testObject_NewAssetToken_user_9.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_10, "testObject_NewAssetToken_user_10.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_11, "testObject_NewAssetToken_user_11.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_12, "testObject_NewAssetToken_user_12.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_13, "testObject_NewAssetToken_user_13.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_14, "testObject_NewAssetToken_user_14.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_15, "testObject_NewAssetToken_user_15.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_16, "testObject_NewAssetToken_user_16.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_17, "testObject_NewAssetToken_user_17.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_18, "testObject_NewAssetToken_user_18.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_19, "testObject_NewAssetToken_user_19.json"), (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_20, "testObject_NewAssetToken_user_20.json")],
-      testCase ("Golden: AssetRetention_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_1, "testObject_AssetRetention_user_1.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_2, "testObject_AssetRetention_user_2.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_3, "testObject_AssetRetention_user_3.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_4, "testObject_AssetRetention_user_4.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_5, "testObject_AssetRetention_user_5.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_6, "testObject_AssetRetention_user_6.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_7, "testObject_AssetRetention_user_7.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_8, "testObject_AssetRetention_user_8.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_9, "testObject_AssetRetention_user_9.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_10, "testObject_AssetRetention_user_10.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_11, "testObject_AssetRetention_user_11.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_12, "testObject_AssetRetention_user_12.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_13, "testObject_AssetRetention_user_13.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_14, "testObject_AssetRetention_user_14.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_15, "testObject_AssetRetention_user_15.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_16, "testObject_AssetRetention_user_16.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_17, "testObject_AssetRetention_user_17.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_18, "testObject_AssetRetention_user_18.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_19, "testObject_AssetRetention_user_19.json"), (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_20, "testObject_AssetRetention_user_20.json")],
-      testCase ("Golden: AssetSettings_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_1, "testObject_AssetSettings_user_1.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_2, "testObject_AssetSettings_user_2.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_3, "testObject_AssetSettings_user_3.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_4, "testObject_AssetSettings_user_4.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_5, "testObject_AssetSettings_user_5.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_6, "testObject_AssetSettings_user_6.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_7, "testObject_AssetSettings_user_7.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_8, "testObject_AssetSettings_user_8.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_9, "testObject_AssetSettings_user_9.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_10, "testObject_AssetSettings_user_10.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_11, "testObject_AssetSettings_user_11.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_12, "testObject_AssetSettings_user_12.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_13, "testObject_AssetSettings_user_13.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_14, "testObject_AssetSettings_user_14.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_15, "testObject_AssetSettings_user_15.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_16, "testObject_AssetSettings_user_16.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_17, "testObject_AssetSettings_user_17.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_18, "testObject_AssetSettings_user_18.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_19, "testObject_AssetSettings_user_19.json"), (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_20, "testObject_AssetSettings_user_20.json")],
-      testCase ("Golden: AssetKey_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_1, "testObject_AssetKey_user_1.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_2, "testObject_AssetKey_user_2.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_3, "testObject_AssetKey_user_3.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_4, "testObject_AssetKey_user_4.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_5, "testObject_AssetKey_user_5.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_6, "testObject_AssetKey_user_6.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_7, "testObject_AssetKey_user_7.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_8, "testObject_AssetKey_user_8.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_9, "testObject_AssetKey_user_9.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_10, "testObject_AssetKey_user_10.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_11, "testObject_AssetKey_user_11.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_12, "testObject_AssetKey_user_12.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_13, "testObject_AssetKey_user_13.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_14, "testObject_AssetKey_user_14.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_15, "testObject_AssetKey_user_15.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_16, "testObject_AssetKey_user_16.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_17, "testObject_AssetKey_user_17.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_18, "testObject_AssetKey_user_18.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_19, "testObject_AssetKey_user_19.json"), (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_20, "testObject_AssetKey_user_20.json")],
-      testCase ("Golden: ResumableSettings_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_1, "testObject_ResumableSettings_user_1.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_2, "testObject_ResumableSettings_user_2.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_3, "testObject_ResumableSettings_user_3.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_4, "testObject_ResumableSettings_user_4.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_5, "testObject_ResumableSettings_user_5.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_6, "testObject_ResumableSettings_user_6.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_7, "testObject_ResumableSettings_user_7.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_8, "testObject_ResumableSettings_user_8.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_9, "testObject_ResumableSettings_user_9.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_10, "testObject_ResumableSettings_user_10.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_11, "testObject_ResumableSettings_user_11.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_12, "testObject_ResumableSettings_user_12.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_13, "testObject_ResumableSettings_user_13.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_14, "testObject_ResumableSettings_user_14.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_15, "testObject_ResumableSettings_user_15.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_16, "testObject_ResumableSettings_user_16.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_17, "testObject_ResumableSettings_user_17.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_18, "testObject_ResumableSettings_user_18.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_19, "testObject_ResumableSettings_user_19.json"), (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_20, "testObject_ResumableSettings_user_20.json")],
-      testCase ("Golden: TotalSize_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_1, "testObject_TotalSize_user_1.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_2, "testObject_TotalSize_user_2.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_3, "testObject_TotalSize_user_3.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_4, "testObject_TotalSize_user_4.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_5, "testObject_TotalSize_user_5.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_6, "testObject_TotalSize_user_6.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_7, "testObject_TotalSize_user_7.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_8, "testObject_TotalSize_user_8.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_9, "testObject_TotalSize_user_9.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_10, "testObject_TotalSize_user_10.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_11, "testObject_TotalSize_user_11.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_12, "testObject_TotalSize_user_12.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_13, "testObject_TotalSize_user_13.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_14, "testObject_TotalSize_user_14.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_15, "testObject_TotalSize_user_15.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_16, "testObject_TotalSize_user_16.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_17, "testObject_TotalSize_user_17.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_18, "testObject_TotalSize_user_18.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_19, "testObject_TotalSize_user_19.json"), (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_20, "testObject_TotalSize_user_20.json")],
-      testCase ("Golden: ChunkSize_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_1, "testObject_ChunkSize_user_1.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_2, "testObject_ChunkSize_user_2.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_3, "testObject_ChunkSize_user_3.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_4, "testObject_ChunkSize_user_4.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_5, "testObject_ChunkSize_user_5.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_6, "testObject_ChunkSize_user_6.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_7, "testObject_ChunkSize_user_7.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_8, "testObject_ChunkSize_user_8.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_9, "testObject_ChunkSize_user_9.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_10, "testObject_ChunkSize_user_10.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_11, "testObject_ChunkSize_user_11.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_12, "testObject_ChunkSize_user_12.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_13, "testObject_ChunkSize_user_13.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_14, "testObject_ChunkSize_user_14.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_15, "testObject_ChunkSize_user_15.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_16, "testObject_ChunkSize_user_16.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_17, "testObject_ChunkSize_user_17.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_18, "testObject_ChunkSize_user_18.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_19, "testObject_ChunkSize_user_19.json"), (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_20, "testObject_ChunkSize_user_20.json")],
-      testCase ("Golden: Offset_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_1, "testObject_Offset_user_1.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_2, "testObject_Offset_user_2.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_3, "testObject_Offset_user_3.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_4, "testObject_Offset_user_4.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_5, "testObject_Offset_user_5.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_6, "testObject_Offset_user_6.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_7, "testObject_Offset_user_7.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_8, "testObject_Offset_user_8.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_9, "testObject_Offset_user_9.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_10, "testObject_Offset_user_10.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_11, "testObject_Offset_user_11.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_12, "testObject_Offset_user_12.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_13, "testObject_Offset_user_13.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_14, "testObject_Offset_user_14.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_15, "testObject_Offset_user_15.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_16, "testObject_Offset_user_16.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_17, "testObject_Offset_user_17.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_18, "testObject_Offset_user_18.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_19, "testObject_Offset_user_19.json"), (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_20, "testObject_Offset_user_20.json")],
-      testCase ("Golden: ResumableAsset_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_1, "testObject_ResumableAsset_user_1.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_2, "testObject_ResumableAsset_user_2.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_3, "testObject_ResumableAsset_user_3.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_4, "testObject_ResumableAsset_user_4.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_5, "testObject_ResumableAsset_user_5.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_6, "testObject_ResumableAsset_user_6.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_7, "testObject_ResumableAsset_user_7.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_8, "testObject_ResumableAsset_user_8.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_9, "testObject_ResumableAsset_user_9.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_10, "testObject_ResumableAsset_user_10.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_11, "testObject_ResumableAsset_user_11.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_12, "testObject_ResumableAsset_user_12.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_13, "testObject_ResumableAsset_user_13.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_14, "testObject_ResumableAsset_user_14.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_15, "testObject_ResumableAsset_user_15.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_16, "testObject_ResumableAsset_user_16.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_17, "testObject_ResumableAsset_user_17.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_18, "testObject_ResumableAsset_user_18.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_19, "testObject_ResumableAsset_user_19.json"), (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_20, "testObject_ResumableAsset_user_20.json")],
-      testCase ("Golden: TurnHost_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_1, "testObject_TurnHost_user_1.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_2, "testObject_TurnHost_user_2.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_3, "testObject_TurnHost_user_3.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_4, "testObject_TurnHost_user_4.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_5, "testObject_TurnHost_user_5.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_6, "testObject_TurnHost_user_6.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_7, "testObject_TurnHost_user_7.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_8, "testObject_TurnHost_user_8.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_9, "testObject_TurnHost_user_9.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_10, "testObject_TurnHost_user_10.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_11, "testObject_TurnHost_user_11.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_12, "testObject_TurnHost_user_12.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_13, "testObject_TurnHost_user_13.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_14, "testObject_TurnHost_user_14.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_15, "testObject_TurnHost_user_15.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_16, "testObject_TurnHost_user_16.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_17, "testObject_TurnHost_user_17.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_18, "testObject_TurnHost_user_18.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_19, "testObject_TurnHost_user_19.json"), (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_20, "testObject_TurnHost_user_20.json")],
-      testCase ("Golden: Scheme_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_1, "testObject_Scheme_user_1.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_2, "testObject_Scheme_user_2.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_3, "testObject_Scheme_user_3.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_4, "testObject_Scheme_user_4.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_5, "testObject_Scheme_user_5.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_6, "testObject_Scheme_user_6.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_7, "testObject_Scheme_user_7.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_8, "testObject_Scheme_user_8.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_9, "testObject_Scheme_user_9.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_10, "testObject_Scheme_user_10.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_11, "testObject_Scheme_user_11.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_12, "testObject_Scheme_user_12.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_13, "testObject_Scheme_user_13.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_14, "testObject_Scheme_user_14.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_15, "testObject_Scheme_user_15.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_16, "testObject_Scheme_user_16.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_17, "testObject_Scheme_user_17.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_18, "testObject_Scheme_user_18.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_19, "testObject_Scheme_user_19.json"), (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_20, "testObject_Scheme_user_20.json")],
-      testCase ("Golden: Transport_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_1, "testObject_Transport_user_1.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_2, "testObject_Transport_user_2.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_3, "testObject_Transport_user_3.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_4, "testObject_Transport_user_4.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_5, "testObject_Transport_user_5.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_6, "testObject_Transport_user_6.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_7, "testObject_Transport_user_7.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_8, "testObject_Transport_user_8.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_9, "testObject_Transport_user_9.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_10, "testObject_Transport_user_10.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_11, "testObject_Transport_user_11.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_12, "testObject_Transport_user_12.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_13, "testObject_Transport_user_13.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_14, "testObject_Transport_user_14.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_15, "testObject_Transport_user_15.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_16, "testObject_Transport_user_16.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_17, "testObject_Transport_user_17.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_18, "testObject_Transport_user_18.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_19, "testObject_Transport_user_19.json"), (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_20, "testObject_Transport_user_20.json")],
-      testCase ("Golden: TurnURI_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_1, "testObject_TurnURI_user_1.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_2, "testObject_TurnURI_user_2.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_3, "testObject_TurnURI_user_3.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_4, "testObject_TurnURI_user_4.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_5, "testObject_TurnURI_user_5.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_6, "testObject_TurnURI_user_6.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_7, "testObject_TurnURI_user_7.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_8, "testObject_TurnURI_user_8.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_9, "testObject_TurnURI_user_9.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_10, "testObject_TurnURI_user_10.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_11, "testObject_TurnURI_user_11.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_12, "testObject_TurnURI_user_12.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_13, "testObject_TurnURI_user_13.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_14, "testObject_TurnURI_user_14.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_15, "testObject_TurnURI_user_15.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_16, "testObject_TurnURI_user_16.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_17, "testObject_TurnURI_user_17.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_18, "testObject_TurnURI_user_18.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_19, "testObject_TurnURI_user_19.json"), (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_20, "testObject_TurnURI_user_20.json")],
-      testCase ("Golden: TurnUsername_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_1, "testObject_TurnUsername_user_1.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_2, "testObject_TurnUsername_user_2.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_3, "testObject_TurnUsername_user_3.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_4, "testObject_TurnUsername_user_4.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_5, "testObject_TurnUsername_user_5.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_6, "testObject_TurnUsername_user_6.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_7, "testObject_TurnUsername_user_7.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_8, "testObject_TurnUsername_user_8.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_9, "testObject_TurnUsername_user_9.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_10, "testObject_TurnUsername_user_10.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_11, "testObject_TurnUsername_user_11.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_12, "testObject_TurnUsername_user_12.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_13, "testObject_TurnUsername_user_13.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_14, "testObject_TurnUsername_user_14.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_15, "testObject_TurnUsername_user_15.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_16, "testObject_TurnUsername_user_16.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_17, "testObject_TurnUsername_user_17.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_18, "testObject_TurnUsername_user_18.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_19, "testObject_TurnUsername_user_19.json"), (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_20, "testObject_TurnUsername_user_20.json")],
-      testCase ("Golden: RTCIceServer_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_1, "testObject_RTCIceServer_user_1.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_2, "testObject_RTCIceServer_user_2.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_3, "testObject_RTCIceServer_user_3.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_4, "testObject_RTCIceServer_user_4.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_5, "testObject_RTCIceServer_user_5.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_6, "testObject_RTCIceServer_user_6.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_7, "testObject_RTCIceServer_user_7.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_8, "testObject_RTCIceServer_user_8.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_9, "testObject_RTCIceServer_user_9.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_10, "testObject_RTCIceServer_user_10.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_11, "testObject_RTCIceServer_user_11.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_12, "testObject_RTCIceServer_user_12.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_13, "testObject_RTCIceServer_user_13.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_14, "testObject_RTCIceServer_user_14.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_15, "testObject_RTCIceServer_user_15.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_16, "testObject_RTCIceServer_user_16.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_17, "testObject_RTCIceServer_user_17.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_18, "testObject_RTCIceServer_user_18.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_19, "testObject_RTCIceServer_user_19.json"), (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_20, "testObject_RTCIceServer_user_20.json")],
-      testCase ("Golden: RTCConfiguration_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_1, "testObject_RTCConfiguration_user_1.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_2, "testObject_RTCConfiguration_user_2.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_3, "testObject_RTCConfiguration_user_3.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_4, "testObject_RTCConfiguration_user_4.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_5, "testObject_RTCConfiguration_user_5.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_6, "testObject_RTCConfiguration_user_6.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_7, "testObject_RTCConfiguration_user_7.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_8, "testObject_RTCConfiguration_user_8.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_9, "testObject_RTCConfiguration_user_9.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_10, "testObject_RTCConfiguration_user_10.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_11, "testObject_RTCConfiguration_user_11.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_12, "testObject_RTCConfiguration_user_12.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_13, "testObject_RTCConfiguration_user_13.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_14, "testObject_RTCConfiguration_user_14.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_15, "testObject_RTCConfiguration_user_15.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_16, "testObject_RTCConfiguration_user_16.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_17, "testObject_RTCConfiguration_user_17.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_18, "testObject_RTCConfiguration_user_18.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_19, "testObject_RTCConfiguration_user_19.json"), (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_20, "testObject_RTCConfiguration_user_20.json")],
-      testCase ("Golden: SFTServer_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_1, "testObject_SFTServer_user_1.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_2, "testObject_SFTServer_user_2.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_3, "testObject_SFTServer_user_3.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_4, "testObject_SFTServer_user_4.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_5, "testObject_SFTServer_user_5.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_6, "testObject_SFTServer_user_6.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_7, "testObject_SFTServer_user_7.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_8, "testObject_SFTServer_user_8.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_9, "testObject_SFTServer_user_9.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_10, "testObject_SFTServer_user_10.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_11, "testObject_SFTServer_user_11.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_12, "testObject_SFTServer_user_12.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_13, "testObject_SFTServer_user_13.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_14, "testObject_SFTServer_user_14.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_15, "testObject_SFTServer_user_15.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_16, "testObject_SFTServer_user_16.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_17, "testObject_SFTServer_user_17.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_18, "testObject_SFTServer_user_18.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_19, "testObject_SFTServer_user_19.json"), (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_20, "testObject_SFTServer_user_20.json")],
-      testCase ("Golden: ConnectionRequest_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_1, "testObject_ConnectionRequest_user_1.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_2, "testObject_ConnectionRequest_user_2.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_3, "testObject_ConnectionRequest_user_3.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_4, "testObject_ConnectionRequest_user_4.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_5, "testObject_ConnectionRequest_user_5.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_6, "testObject_ConnectionRequest_user_6.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_7, "testObject_ConnectionRequest_user_7.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_8, "testObject_ConnectionRequest_user_8.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_9, "testObject_ConnectionRequest_user_9.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_10, "testObject_ConnectionRequest_user_10.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_11, "testObject_ConnectionRequest_user_11.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_12, "testObject_ConnectionRequest_user_12.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_13, "testObject_ConnectionRequest_user_13.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_14, "testObject_ConnectionRequest_user_14.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_15, "testObject_ConnectionRequest_user_15.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_16, "testObject_ConnectionRequest_user_16.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_17, "testObject_ConnectionRequest_user_17.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_18, "testObject_ConnectionRequest_user_18.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_19, "testObject_ConnectionRequest_user_19.json"), (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_20, "testObject_ConnectionRequest_user_20.json")],
-      testCase ("Golden: Relation_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_1, "testObject_Relation_user_1.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_2, "testObject_Relation_user_2.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_3, "testObject_Relation_user_3.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_4, "testObject_Relation_user_4.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_5, "testObject_Relation_user_5.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_6, "testObject_Relation_user_6.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_7, "testObject_Relation_user_7.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_8, "testObject_Relation_user_8.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_9, "testObject_Relation_user_9.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_10, "testObject_Relation_user_10.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_11, "testObject_Relation_user_11.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_12, "testObject_Relation_user_12.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_13, "testObject_Relation_user_13.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_14, "testObject_Relation_user_14.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_15, "testObject_Relation_user_15.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_16, "testObject_Relation_user_16.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_17, "testObject_Relation_user_17.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_18, "testObject_Relation_user_18.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_19, "testObject_Relation_user_19.json"), (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_20, "testObject_Relation_user_20.json")],
-      testCase ("Golden: Message_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_1, "testObject_Message_user_1.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_2, "testObject_Message_user_2.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_3, "testObject_Message_user_3.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_4, "testObject_Message_user_4.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_5, "testObject_Message_user_5.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_6, "testObject_Message_user_6.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_7, "testObject_Message_user_7.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_8, "testObject_Message_user_8.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_9, "testObject_Message_user_9.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_10, "testObject_Message_user_10.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_11, "testObject_Message_user_11.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_12, "testObject_Message_user_12.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_13, "testObject_Message_user_13.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_14, "testObject_Message_user_14.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_15, "testObject_Message_user_15.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_16, "testObject_Message_user_16.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_17, "testObject_Message_user_17.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_18, "testObject_Message_user_18.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_19, "testObject_Message_user_19.json"), (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_20, "testObject_Message_user_20.json")],
-      testCase ("Golden: UserConnection_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_1, "testObject_UserConnection_user_1.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_2, "testObject_UserConnection_user_2.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_3, "testObject_UserConnection_user_3.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_4, "testObject_UserConnection_user_4.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_5, "testObject_UserConnection_user_5.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_6, "testObject_UserConnection_user_6.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_7, "testObject_UserConnection_user_7.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_8, "testObject_UserConnection_user_8.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_9, "testObject_UserConnection_user_9.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_10, "testObject_UserConnection_user_10.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_11, "testObject_UserConnection_user_11.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_12, "testObject_UserConnection_user_12.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_13, "testObject_UserConnection_user_13.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_14, "testObject_UserConnection_user_14.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_15, "testObject_UserConnection_user_15.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_16, "testObject_UserConnection_user_16.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_17, "testObject_UserConnection_user_17.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_18, "testObject_UserConnection_user_18.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_19, "testObject_UserConnection_user_19.json"), (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_20, "testObject_UserConnection_user_20.json")],
-      testCase ("Golden: UserConnectionList_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_1, "testObject_UserConnectionList_user_1.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_2, "testObject_UserConnectionList_user_2.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_3, "testObject_UserConnectionList_user_3.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_4, "testObject_UserConnectionList_user_4.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_5, "testObject_UserConnectionList_user_5.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_6, "testObject_UserConnectionList_user_6.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_7, "testObject_UserConnectionList_user_7.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_8, "testObject_UserConnectionList_user_8.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_9, "testObject_UserConnectionList_user_9.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_10, "testObject_UserConnectionList_user_10.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_11, "testObject_UserConnectionList_user_11.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_12, "testObject_UserConnectionList_user_12.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_13, "testObject_UserConnectionList_user_13.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_14, "testObject_UserConnectionList_user_14.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_15, "testObject_UserConnectionList_user_15.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_16, "testObject_UserConnectionList_user_16.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_17, "testObject_UserConnectionList_user_17.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_18, "testObject_UserConnectionList_user_18.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_19, "testObject_UserConnectionList_user_19.json"), (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_20, "testObject_UserConnectionList_user_20.json")],
-      testCase ("Golden: ConnectionUpdate_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_1, "testObject_ConnectionUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_2, "testObject_ConnectionUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_3, "testObject_ConnectionUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_4, "testObject_ConnectionUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_5, "testObject_ConnectionUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_6, "testObject_ConnectionUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_7, "testObject_ConnectionUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_8, "testObject_ConnectionUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_9, "testObject_ConnectionUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_10, "testObject_ConnectionUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_11, "testObject_ConnectionUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_12, "testObject_ConnectionUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_13, "testObject_ConnectionUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_14, "testObject_ConnectionUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_15, "testObject_ConnectionUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_16, "testObject_ConnectionUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_17, "testObject_ConnectionUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_18, "testObject_ConnectionUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_19, "testObject_ConnectionUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_20, "testObject_ConnectionUpdate_user_20.json")],
-      testCase ("Golden: Conversation_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_1, "testObject_Conversation_user_1.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_2, "testObject_Conversation_user_2.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_3, "testObject_Conversation_user_3.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_4, "testObject_Conversation_user_4.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_5, "testObject_Conversation_user_5.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_6, "testObject_Conversation_user_6.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_7, "testObject_Conversation_user_7.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_8, "testObject_Conversation_user_8.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_9, "testObject_Conversation_user_9.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_10, "testObject_Conversation_user_10.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_11, "testObject_Conversation_user_11.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_12, "testObject_Conversation_user_12.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_13, "testObject_Conversation_user_13.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_14, "testObject_Conversation_user_14.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_15, "testObject_Conversation_user_15.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_16, "testObject_Conversation_user_16.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_17, "testObject_Conversation_user_17.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_18, "testObject_Conversation_user_18.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_19, "testObject_Conversation_user_19.json"), (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_20, "testObject_Conversation_user_20.json")],
-      testCase ("Golden: NewConvUnmanaged_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_1, "testObject_NewConvUnmanaged_user_1.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_2, "testObject_NewConvUnmanaged_user_2.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_3, "testObject_NewConvUnmanaged_user_3.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_4, "testObject_NewConvUnmanaged_user_4.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_5, "testObject_NewConvUnmanaged_user_5.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_6, "testObject_NewConvUnmanaged_user_6.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_7, "testObject_NewConvUnmanaged_user_7.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_8, "testObject_NewConvUnmanaged_user_8.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_9, "testObject_NewConvUnmanaged_user_9.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_10, "testObject_NewConvUnmanaged_user_10.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_11, "testObject_NewConvUnmanaged_user_11.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_12, "testObject_NewConvUnmanaged_user_12.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_13, "testObject_NewConvUnmanaged_user_13.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_14, "testObject_NewConvUnmanaged_user_14.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_15, "testObject_NewConvUnmanaged_user_15.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_16, "testObject_NewConvUnmanaged_user_16.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_17, "testObject_NewConvUnmanaged_user_17.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_18, "testObject_NewConvUnmanaged_user_18.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_19, "testObject_NewConvUnmanaged_user_19.json"), (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_20, "testObject_NewConvUnmanaged_user_20.json")],
-      testCase ("Golden: NewConvManaged_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_1, "testObject_NewConvManaged_user_1.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_2, "testObject_NewConvManaged_user_2.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_3, "testObject_NewConvManaged_user_3.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_4, "testObject_NewConvManaged_user_4.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_5, "testObject_NewConvManaged_user_5.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_6, "testObject_NewConvManaged_user_6.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_7, "testObject_NewConvManaged_user_7.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_8, "testObject_NewConvManaged_user_8.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_9, "testObject_NewConvManaged_user_9.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_10, "testObject_NewConvManaged_user_10.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_11, "testObject_NewConvManaged_user_11.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_12, "testObject_NewConvManaged_user_12.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_13, "testObject_NewConvManaged_user_13.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_14, "testObject_NewConvManaged_user_14.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_15, "testObject_NewConvManaged_user_15.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_16, "testObject_NewConvManaged_user_16.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_17, "testObject_NewConvManaged_user_17.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_18, "testObject_NewConvManaged_user_18.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_19, "testObject_NewConvManaged_user_19.json"), (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_20, "testObject_NewConvManaged_user_20.json")],
-      testCase ("Golden: ConversationList_20_28Id_20_2a_20C_29_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_1, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_2, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_3, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_4, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_5, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_6, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_7, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_8, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_9, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_10, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_11, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_12, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_13, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_14, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_15, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_16, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_17, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_18, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_19, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_20, "testObject_ConversationList_20_28Id_20_2a_20C_29_user_20.json")],
-      testCase ("Golden: ConversationList_20Conversation_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_1, "testObject_ConversationList_20Conversation_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_2, "testObject_ConversationList_20Conversation_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_3, "testObject_ConversationList_20Conversation_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_4, "testObject_ConversationList_20Conversation_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_5, "testObject_ConversationList_20Conversation_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_6, "testObject_ConversationList_20Conversation_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_7, "testObject_ConversationList_20Conversation_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_8, "testObject_ConversationList_20Conversation_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_9, "testObject_ConversationList_20Conversation_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_10, "testObject_ConversationList_20Conversation_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_11, "testObject_ConversationList_20Conversation_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_12, "testObject_ConversationList_20Conversation_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_13, "testObject_ConversationList_20Conversation_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_14, "testObject_ConversationList_20Conversation_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_15, "testObject_ConversationList_20Conversation_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_16, "testObject_ConversationList_20Conversation_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_17, "testObject_ConversationList_20Conversation_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_18, "testObject_ConversationList_20Conversation_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_19, "testObject_ConversationList_20Conversation_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_20, "testObject_ConversationList_20Conversation_user_20.json")],
-      testCase ("Golden: Access_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_1, "testObject_Access_user_1.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_2, "testObject_Access_user_2.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_3, "testObject_Access_user_3.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_4, "testObject_Access_user_4.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_5, "testObject_Access_user_5.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_6, "testObject_Access_user_6.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_7, "testObject_Access_user_7.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_8, "testObject_Access_user_8.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_9, "testObject_Access_user_9.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_10, "testObject_Access_user_10.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_11, "testObject_Access_user_11.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_12, "testObject_Access_user_12.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_13, "testObject_Access_user_13.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_14, "testObject_Access_user_14.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_15, "testObject_Access_user_15.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_16, "testObject_Access_user_16.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_17, "testObject_Access_user_17.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_18, "testObject_Access_user_18.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_19, "testObject_Access_user_19.json"), (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_20, "testObject_Access_user_20.json")],
-      testCase ("Golden: AccessRole_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_1, "testObject_AccessRole_user_1.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_2, "testObject_AccessRole_user_2.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_3, "testObject_AccessRole_user_3.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_4, "testObject_AccessRole_user_4.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_5, "testObject_AccessRole_user_5.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_6, "testObject_AccessRole_user_6.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_7, "testObject_AccessRole_user_7.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_8, "testObject_AccessRole_user_8.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_9, "testObject_AccessRole_user_9.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_10, "testObject_AccessRole_user_10.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_11, "testObject_AccessRole_user_11.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_12, "testObject_AccessRole_user_12.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_13, "testObject_AccessRole_user_13.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_14, "testObject_AccessRole_user_14.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_15, "testObject_AccessRole_user_15.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_16, "testObject_AccessRole_user_16.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_17, "testObject_AccessRole_user_17.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_18, "testObject_AccessRole_user_18.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_19, "testObject_AccessRole_user_19.json"), (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_20, "testObject_AccessRole_user_20.json")],
-      testCase ("Golden: ConvType_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_1, "testObject_ConvType_user_1.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_2, "testObject_ConvType_user_2.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_3, "testObject_ConvType_user_3.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_4, "testObject_ConvType_user_4.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_5, "testObject_ConvType_user_5.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_6, "testObject_ConvType_user_6.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_7, "testObject_ConvType_user_7.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_8, "testObject_ConvType_user_8.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_9, "testObject_ConvType_user_9.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_10, "testObject_ConvType_user_10.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_11, "testObject_ConvType_user_11.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_12, "testObject_ConvType_user_12.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_13, "testObject_ConvType_user_13.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_14, "testObject_ConvType_user_14.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_15, "testObject_ConvType_user_15.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_16, "testObject_ConvType_user_16.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_17, "testObject_ConvType_user_17.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_18, "testObject_ConvType_user_18.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_19, "testObject_ConvType_user_19.json"), (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_20, "testObject_ConvType_user_20.json")],
-      testCase ("Golden: ReceiptMode_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_1, "testObject_ReceiptMode_user_1.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_2, "testObject_ReceiptMode_user_2.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_3, "testObject_ReceiptMode_user_3.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_4, "testObject_ReceiptMode_user_4.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_5, "testObject_ReceiptMode_user_5.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_6, "testObject_ReceiptMode_user_6.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_7, "testObject_ReceiptMode_user_7.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_8, "testObject_ReceiptMode_user_8.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_9, "testObject_ReceiptMode_user_9.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_10, "testObject_ReceiptMode_user_10.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_11, "testObject_ReceiptMode_user_11.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_12, "testObject_ReceiptMode_user_12.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_13, "testObject_ReceiptMode_user_13.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_14, "testObject_ReceiptMode_user_14.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_15, "testObject_ReceiptMode_user_15.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_16, "testObject_ReceiptMode_user_16.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_17, "testObject_ReceiptMode_user_17.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_18, "testObject_ReceiptMode_user_18.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_19, "testObject_ReceiptMode_user_19.json"), (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_20, "testObject_ReceiptMode_user_20.json")],
-      testCase ("Golden: ConvTeamInfo_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_1, "testObject_ConvTeamInfo_user_1.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_2, "testObject_ConvTeamInfo_user_2.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_3, "testObject_ConvTeamInfo_user_3.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_4, "testObject_ConvTeamInfo_user_4.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_5, "testObject_ConvTeamInfo_user_5.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_6, "testObject_ConvTeamInfo_user_6.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_7, "testObject_ConvTeamInfo_user_7.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_8, "testObject_ConvTeamInfo_user_8.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_9, "testObject_ConvTeamInfo_user_9.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_10, "testObject_ConvTeamInfo_user_10.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_11, "testObject_ConvTeamInfo_user_11.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_12, "testObject_ConvTeamInfo_user_12.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_13, "testObject_ConvTeamInfo_user_13.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_14, "testObject_ConvTeamInfo_user_14.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_15, "testObject_ConvTeamInfo_user_15.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_16, "testObject_ConvTeamInfo_user_16.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_17, "testObject_ConvTeamInfo_user_17.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_18, "testObject_ConvTeamInfo_user_18.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_19, "testObject_ConvTeamInfo_user_19.json"), (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_20, "testObject_ConvTeamInfo_user_20.json")],
-      testCase ("Golden: Invite_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_1, "testObject_Invite_user_1.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_2, "testObject_Invite_user_2.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_3, "testObject_Invite_user_3.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_4, "testObject_Invite_user_4.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_5, "testObject_Invite_user_5.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_6, "testObject_Invite_user_6.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_7, "testObject_Invite_user_7.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_8, "testObject_Invite_user_8.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_9, "testObject_Invite_user_9.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_10, "testObject_Invite_user_10.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_11, "testObject_Invite_user_11.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_12, "testObject_Invite_user_12.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_13, "testObject_Invite_user_13.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_14, "testObject_Invite_user_14.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_15, "testObject_Invite_user_15.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_16, "testObject_Invite_user_16.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_17, "testObject_Invite_user_17.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_18, "testObject_Invite_user_18.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_19, "testObject_Invite_user_19.json"), (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_20, "testObject_Invite_user_20.json")],
-      testCase ("Golden: ConversationRename_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_1, "testObject_ConversationRename_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_2, "testObject_ConversationRename_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_3, "testObject_ConversationRename_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_4, "testObject_ConversationRename_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_5, "testObject_ConversationRename_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_6, "testObject_ConversationRename_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_7, "testObject_ConversationRename_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_8, "testObject_ConversationRename_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_9, "testObject_ConversationRename_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_10, "testObject_ConversationRename_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_11, "testObject_ConversationRename_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_12, "testObject_ConversationRename_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_13, "testObject_ConversationRename_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_14, "testObject_ConversationRename_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_15, "testObject_ConversationRename_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_16, "testObject_ConversationRename_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_17, "testObject_ConversationRename_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_18, "testObject_ConversationRename_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_19, "testObject_ConversationRename_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_20, "testObject_ConversationRename_user_20.json")],
-      testCase ("Golden: ConversationAccessUpdate_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_1, "testObject_ConversationAccessUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_2, "testObject_ConversationAccessUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_3, "testObject_ConversationAccessUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_4, "testObject_ConversationAccessUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_5, "testObject_ConversationAccessUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_6, "testObject_ConversationAccessUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_7, "testObject_ConversationAccessUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_8, "testObject_ConversationAccessUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_9, "testObject_ConversationAccessUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_10, "testObject_ConversationAccessUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_11, "testObject_ConversationAccessUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_12, "testObject_ConversationAccessUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_13, "testObject_ConversationAccessUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_14, "testObject_ConversationAccessUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_15, "testObject_ConversationAccessUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_16, "testObject_ConversationAccessUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_17, "testObject_ConversationAccessUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_18, "testObject_ConversationAccessUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_19, "testObject_ConversationAccessUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_20, "testObject_ConversationAccessUpdate_user_20.json")],
-      testCase ("Golden: ConversationReceiptModeUpdate_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_1, "testObject_ConversationReceiptModeUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_2, "testObject_ConversationReceiptModeUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_3, "testObject_ConversationReceiptModeUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_4, "testObject_ConversationReceiptModeUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_5, "testObject_ConversationReceiptModeUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_6, "testObject_ConversationReceiptModeUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_7, "testObject_ConversationReceiptModeUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_8, "testObject_ConversationReceiptModeUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_9, "testObject_ConversationReceiptModeUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_10, "testObject_ConversationReceiptModeUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_11, "testObject_ConversationReceiptModeUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_12, "testObject_ConversationReceiptModeUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_13, "testObject_ConversationReceiptModeUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_14, "testObject_ConversationReceiptModeUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_15, "testObject_ConversationReceiptModeUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_16, "testObject_ConversationReceiptModeUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_17, "testObject_ConversationReceiptModeUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_18, "testObject_ConversationReceiptModeUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_19, "testObject_ConversationReceiptModeUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_20, "testObject_ConversationReceiptModeUpdate_user_20.json")],
-      testCase ("Golden: ConversationMessageTimerUpdate_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_1, "testObject_ConversationMessageTimerUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_2, "testObject_ConversationMessageTimerUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_3, "testObject_ConversationMessageTimerUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_4, "testObject_ConversationMessageTimerUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_5, "testObject_ConversationMessageTimerUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_6, "testObject_ConversationMessageTimerUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_7, "testObject_ConversationMessageTimerUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_8, "testObject_ConversationMessageTimerUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_9, "testObject_ConversationMessageTimerUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_10, "testObject_ConversationMessageTimerUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_11, "testObject_ConversationMessageTimerUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_12, "testObject_ConversationMessageTimerUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_13, "testObject_ConversationMessageTimerUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_14, "testObject_ConversationMessageTimerUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_15, "testObject_ConversationMessageTimerUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_16, "testObject_ConversationMessageTimerUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_17, "testObject_ConversationMessageTimerUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_18, "testObject_ConversationMessageTimerUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_19, "testObject_ConversationMessageTimerUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_20, "testObject_ConversationMessageTimerUpdate_user_20.json")],
-      testCase ("Golden: AddBot_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_1, "testObject_AddBot_user_1.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_2, "testObject_AddBot_user_2.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_3, "testObject_AddBot_user_3.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_4, "testObject_AddBot_user_4.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_5, "testObject_AddBot_user_5.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_6, "testObject_AddBot_user_6.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_7, "testObject_AddBot_user_7.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_8, "testObject_AddBot_user_8.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_9, "testObject_AddBot_user_9.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_10, "testObject_AddBot_user_10.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_11, "testObject_AddBot_user_11.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_12, "testObject_AddBot_user_12.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_13, "testObject_AddBot_user_13.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_14, "testObject_AddBot_user_14.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_15, "testObject_AddBot_user_15.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_16, "testObject_AddBot_user_16.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_17, "testObject_AddBot_user_17.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_18, "testObject_AddBot_user_18.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_19, "testObject_AddBot_user_19.json"), (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_20, "testObject_AddBot_user_20.json")],
-      testCase ("Golden: AddBotResponse_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_1, "testObject_AddBotResponse_user_1.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_2, "testObject_AddBotResponse_user_2.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_3, "testObject_AddBotResponse_user_3.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_4, "testObject_AddBotResponse_user_4.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_5, "testObject_AddBotResponse_user_5.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_6, "testObject_AddBotResponse_user_6.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_7, "testObject_AddBotResponse_user_7.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_8, "testObject_AddBotResponse_user_8.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_9, "testObject_AddBotResponse_user_9.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_10, "testObject_AddBotResponse_user_10.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_11, "testObject_AddBotResponse_user_11.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_12, "testObject_AddBotResponse_user_12.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_13, "testObject_AddBotResponse_user_13.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_14, "testObject_AddBotResponse_user_14.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_15, "testObject_AddBotResponse_user_15.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_16, "testObject_AddBotResponse_user_16.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_17, "testObject_AddBotResponse_user_17.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_18, "testObject_AddBotResponse_user_18.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_19, "testObject_AddBotResponse_user_19.json"), (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_20, "testObject_AddBotResponse_user_20.json")],
-      testCase ("Golden: RemoveBotResponse_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_1, "testObject_RemoveBotResponse_user_1.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_2, "testObject_RemoveBotResponse_user_2.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_3, "testObject_RemoveBotResponse_user_3.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_4, "testObject_RemoveBotResponse_user_4.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_5, "testObject_RemoveBotResponse_user_5.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_6, "testObject_RemoveBotResponse_user_6.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_7, "testObject_RemoveBotResponse_user_7.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_8, "testObject_RemoveBotResponse_user_8.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_9, "testObject_RemoveBotResponse_user_9.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_10, "testObject_RemoveBotResponse_user_10.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_11, "testObject_RemoveBotResponse_user_11.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_12, "testObject_RemoveBotResponse_user_12.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_13, "testObject_RemoveBotResponse_user_13.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_14, "testObject_RemoveBotResponse_user_14.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_15, "testObject_RemoveBotResponse_user_15.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_16, "testObject_RemoveBotResponse_user_16.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_17, "testObject_RemoveBotResponse_user_17.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_18, "testObject_RemoveBotResponse_user_18.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_19, "testObject_RemoveBotResponse_user_19.json"), (Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_20, "testObject_RemoveBotResponse_user_20.json")],
-      testCase ("Golden: UpdateBotPrekeys_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_1, "testObject_UpdateBotPrekeys_user_1.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_2, "testObject_UpdateBotPrekeys_user_2.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_3, "testObject_UpdateBotPrekeys_user_3.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_4, "testObject_UpdateBotPrekeys_user_4.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_5, "testObject_UpdateBotPrekeys_user_5.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_6, "testObject_UpdateBotPrekeys_user_6.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_7, "testObject_UpdateBotPrekeys_user_7.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_8, "testObject_UpdateBotPrekeys_user_8.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_9, "testObject_UpdateBotPrekeys_user_9.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_10, "testObject_UpdateBotPrekeys_user_10.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_11, "testObject_UpdateBotPrekeys_user_11.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_12, "testObject_UpdateBotPrekeys_user_12.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_13, "testObject_UpdateBotPrekeys_user_13.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_14, "testObject_UpdateBotPrekeys_user_14.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_15, "testObject_UpdateBotPrekeys_user_15.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_16, "testObject_UpdateBotPrekeys_user_16.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_17, "testObject_UpdateBotPrekeys_user_17.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_18, "testObject_UpdateBotPrekeys_user_18.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_19, "testObject_UpdateBotPrekeys_user_19.json"), (Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_20, "testObject_UpdateBotPrekeys_user_20.json")],
-      testCase ("Golden: ConversationCode_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_1, "testObject_ConversationCode_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_2, "testObject_ConversationCode_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_3, "testObject_ConversationCode_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_4, "testObject_ConversationCode_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_5, "testObject_ConversationCode_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_6, "testObject_ConversationCode_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_7, "testObject_ConversationCode_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_8, "testObject_ConversationCode_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_9, "testObject_ConversationCode_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_10, "testObject_ConversationCode_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_11, "testObject_ConversationCode_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_12, "testObject_ConversationCode_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_13, "testObject_ConversationCode_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_14, "testObject_ConversationCode_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_15, "testObject_ConversationCode_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_16, "testObject_ConversationCode_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_17, "testObject_ConversationCode_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_18, "testObject_ConversationCode_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_19, "testObject_ConversationCode_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_20, "testObject_ConversationCode_user_20.json")],
-      testCase ("Golden: MemberUpdate_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_1, "testObject_MemberUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_2, "testObject_MemberUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_3, "testObject_MemberUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_4, "testObject_MemberUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_5, "testObject_MemberUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_6, "testObject_MemberUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_7, "testObject_MemberUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_8, "testObject_MemberUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_9, "testObject_MemberUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_10, "testObject_MemberUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_11, "testObject_MemberUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_12, "testObject_MemberUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_13, "testObject_MemberUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_14, "testObject_MemberUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_15, "testObject_MemberUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_16, "testObject_MemberUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_17, "testObject_MemberUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_18, "testObject_MemberUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_19, "testObject_MemberUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_20, "testObject_MemberUpdate_user_20.json")],
-      testCase ("Golden: MutedStatus_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_1, "testObject_MutedStatus_user_1.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_2, "testObject_MutedStatus_user_2.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_3, "testObject_MutedStatus_user_3.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_4, "testObject_MutedStatus_user_4.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_5, "testObject_MutedStatus_user_5.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_6, "testObject_MutedStatus_user_6.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_7, "testObject_MutedStatus_user_7.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_8, "testObject_MutedStatus_user_8.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_9, "testObject_MutedStatus_user_9.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_10, "testObject_MutedStatus_user_10.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_11, "testObject_MutedStatus_user_11.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_12, "testObject_MutedStatus_user_12.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_13, "testObject_MutedStatus_user_13.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_14, "testObject_MutedStatus_user_14.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_15, "testObject_MutedStatus_user_15.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_16, "testObject_MutedStatus_user_16.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_17, "testObject_MutedStatus_user_17.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_18, "testObject_MutedStatus_user_18.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_19, "testObject_MutedStatus_user_19.json"), (Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_20, "testObject_MutedStatus_user_20.json")],
-      testCase ("Golden: Member_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_1, "testObject_Member_user_1.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_2, "testObject_Member_user_2.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_3, "testObject_Member_user_3.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_4, "testObject_Member_user_4.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_5, "testObject_Member_user_5.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_6, "testObject_Member_user_6.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_7, "testObject_Member_user_7.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_8, "testObject_Member_user_8.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_9, "testObject_Member_user_9.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_10, "testObject_Member_user_10.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_11, "testObject_Member_user_11.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_12, "testObject_Member_user_12.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_13, "testObject_Member_user_13.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_14, "testObject_Member_user_14.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_15, "testObject_Member_user_15.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_16, "testObject_Member_user_16.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_17, "testObject_Member_user_17.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_18, "testObject_Member_user_18.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_19, "testObject_Member_user_19.json"), (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_20, "testObject_Member_user_20.json")],
-      testCase ("Golden: OtherMember_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_1, "testObject_OtherMember_user_1.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_2, "testObject_OtherMember_user_2.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_3, "testObject_OtherMember_user_3.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_4, "testObject_OtherMember_user_4.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_5, "testObject_OtherMember_user_5.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_6, "testObject_OtherMember_user_6.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_7, "testObject_OtherMember_user_7.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_8, "testObject_OtherMember_user_8.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_9, "testObject_OtherMember_user_9.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_10, "testObject_OtherMember_user_10.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_11, "testObject_OtherMember_user_11.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_12, "testObject_OtherMember_user_12.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_13, "testObject_OtherMember_user_13.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_14, "testObject_OtherMember_user_14.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_15, "testObject_OtherMember_user_15.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_16, "testObject_OtherMember_user_16.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_17, "testObject_OtherMember_user_17.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_18, "testObject_OtherMember_user_18.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_19, "testObject_OtherMember_user_19.json"), (Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_20, "testObject_OtherMember_user_20.json")],
-      testCase ("Golden: ConvMembers_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_1, "testObject_ConvMembers_user_1.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_2, "testObject_ConvMembers_user_2.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_3, "testObject_ConvMembers_user_3.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_4, "testObject_ConvMembers_user_4.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_5, "testObject_ConvMembers_user_5.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_6, "testObject_ConvMembers_user_6.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_7, "testObject_ConvMembers_user_7.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_8, "testObject_ConvMembers_user_8.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_9, "testObject_ConvMembers_user_9.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_10, "testObject_ConvMembers_user_10.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_11, "testObject_ConvMembers_user_11.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_12, "testObject_ConvMembers_user_12.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_13, "testObject_ConvMembers_user_13.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_14, "testObject_ConvMembers_user_14.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_15, "testObject_ConvMembers_user_15.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_16, "testObject_ConvMembers_user_16.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_17, "testObject_ConvMembers_user_17.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_18, "testObject_ConvMembers_user_18.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_19, "testObject_ConvMembers_user_19.json"), (Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_20, "testObject_ConvMembers_user_20.json")],
-      testCase ("Golden: OtherMemberUpdate_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_1, "testObject_OtherMemberUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_2, "testObject_OtherMemberUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_3, "testObject_OtherMemberUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_4, "testObject_OtherMemberUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_5, "testObject_OtherMemberUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_6, "testObject_OtherMemberUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_7, "testObject_OtherMemberUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_8, "testObject_OtherMemberUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_9, "testObject_OtherMemberUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_10, "testObject_OtherMemberUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_11, "testObject_OtherMemberUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_12, "testObject_OtherMemberUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_13, "testObject_OtherMemberUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_14, "testObject_OtherMemberUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_15, "testObject_OtherMemberUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_16, "testObject_OtherMemberUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_17, "testObject_OtherMemberUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_18, "testObject_OtherMemberUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_19, "testObject_OtherMemberUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_20, "testObject_OtherMemberUpdate_user_20.json")],
-      testCase ("Golden: RoleName_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_1, "testObject_RoleName_user_1.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_2, "testObject_RoleName_user_2.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_3, "testObject_RoleName_user_3.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_4, "testObject_RoleName_user_4.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_5, "testObject_RoleName_user_5.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_6, "testObject_RoleName_user_6.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_7, "testObject_RoleName_user_7.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_8, "testObject_RoleName_user_8.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_9, "testObject_RoleName_user_9.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_10, "testObject_RoleName_user_10.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_11, "testObject_RoleName_user_11.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_12, "testObject_RoleName_user_12.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_13, "testObject_RoleName_user_13.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_14, "testObject_RoleName_user_14.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_15, "testObject_RoleName_user_15.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_16, "testObject_RoleName_user_16.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_17, "testObject_RoleName_user_17.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_18, "testObject_RoleName_user_18.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_19, "testObject_RoleName_user_19.json"), (Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_20, "testObject_RoleName_user_20.json")],
-      testCase ("Golden: Action_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_1, "testObject_Action_user_1.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_2, "testObject_Action_user_2.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_3, "testObject_Action_user_3.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_4, "testObject_Action_user_4.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_5, "testObject_Action_user_5.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_6, "testObject_Action_user_6.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_7, "testObject_Action_user_7.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_8, "testObject_Action_user_8.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_9, "testObject_Action_user_9.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_10, "testObject_Action_user_10.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_11, "testObject_Action_user_11.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_12, "testObject_Action_user_12.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_13, "testObject_Action_user_13.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_14, "testObject_Action_user_14.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_15, "testObject_Action_user_15.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_16, "testObject_Action_user_16.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_17, "testObject_Action_user_17.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_18, "testObject_Action_user_18.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_19, "testObject_Action_user_19.json"), (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_20, "testObject_Action_user_20.json")],
-      testCase ("Golden: ConversationRole_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_1, "testObject_ConversationRole_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_2, "testObject_ConversationRole_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_3, "testObject_ConversationRole_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_4, "testObject_ConversationRole_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_5, "testObject_ConversationRole_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_6, "testObject_ConversationRole_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_7, "testObject_ConversationRole_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_8, "testObject_ConversationRole_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_9, "testObject_ConversationRole_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_10, "testObject_ConversationRole_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_11, "testObject_ConversationRole_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_12, "testObject_ConversationRole_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_13, "testObject_ConversationRole_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_14, "testObject_ConversationRole_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_15, "testObject_ConversationRole_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_16, "testObject_ConversationRole_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_17, "testObject_ConversationRole_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_18, "testObject_ConversationRole_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_19, "testObject_ConversationRole_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_20, "testObject_ConversationRole_user_20.json")],
-      testCase ("Golden: ConversationRolesList_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_1, "testObject_ConversationRolesList_user_1.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_2, "testObject_ConversationRolesList_user_2.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_3, "testObject_ConversationRolesList_user_3.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_4, "testObject_ConversationRolesList_user_4.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_5, "testObject_ConversationRolesList_user_5.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_6, "testObject_ConversationRolesList_user_6.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_7, "testObject_ConversationRolesList_user_7.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_8, "testObject_ConversationRolesList_user_8.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_9, "testObject_ConversationRolesList_user_9.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_10, "testObject_ConversationRolesList_user_10.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_11, "testObject_ConversationRolesList_user_11.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_12, "testObject_ConversationRolesList_user_12.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_13, "testObject_ConversationRolesList_user_13.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_14, "testObject_ConversationRolesList_user_14.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_15, "testObject_ConversationRolesList_user_15.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_16, "testObject_ConversationRolesList_user_16.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_17, "testObject_ConversationRolesList_user_17.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_18, "testObject_ConversationRolesList_user_18.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_19, "testObject_ConversationRolesList_user_19.json"), (Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_20, "testObject_ConversationRolesList_user_20.json")],
-      testCase ("Golden: TypingStatus_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_1, "testObject_TypingStatus_user_1.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_2, "testObject_TypingStatus_user_2.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_3, "testObject_TypingStatus_user_3.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_4, "testObject_TypingStatus_user_4.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_5, "testObject_TypingStatus_user_5.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_6, "testObject_TypingStatus_user_6.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_7, "testObject_TypingStatus_user_7.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_8, "testObject_TypingStatus_user_8.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_9, "testObject_TypingStatus_user_9.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_10, "testObject_TypingStatus_user_10.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_11, "testObject_TypingStatus_user_11.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_12, "testObject_TypingStatus_user_12.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_13, "testObject_TypingStatus_user_13.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_14, "testObject_TypingStatus_user_14.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_15, "testObject_TypingStatus_user_15.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_16, "testObject_TypingStatus_user_16.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_17, "testObject_TypingStatus_user_17.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_18, "testObject_TypingStatus_user_18.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_19, "testObject_TypingStatus_user_19.json"), (Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_20, "testObject_TypingStatus_user_20.json")],
-      testCase ("Golden: TypingData_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_1, "testObject_TypingData_user_1.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_2, "testObject_TypingData_user_2.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_3, "testObject_TypingData_user_3.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_4, "testObject_TypingData_user_4.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_5, "testObject_TypingData_user_5.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_6, "testObject_TypingData_user_6.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_7, "testObject_TypingData_user_7.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_8, "testObject_TypingData_user_8.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_9, "testObject_TypingData_user_9.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_10, "testObject_TypingData_user_10.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_11, "testObject_TypingData_user_11.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_12, "testObject_TypingData_user_12.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_13, "testObject_TypingData_user_13.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_14, "testObject_TypingData_user_14.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_15, "testObject_TypingData_user_15.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_16, "testObject_TypingData_user_16.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_17, "testObject_TypingData_user_17.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_18, "testObject_TypingData_user_18.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_19, "testObject_TypingData_user_19.json"), (Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_20, "testObject_TypingData_user_20.json")],
-      testCase ("Golden: CustomBackend_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_1, "testObject_CustomBackend_user_1.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_2, "testObject_CustomBackend_user_2.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_3, "testObject_CustomBackend_user_3.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_4, "testObject_CustomBackend_user_4.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_5, "testObject_CustomBackend_user_5.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_6, "testObject_CustomBackend_user_6.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_7, "testObject_CustomBackend_user_7.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_8, "testObject_CustomBackend_user_8.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_9, "testObject_CustomBackend_user_9.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_10, "testObject_CustomBackend_user_10.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_11, "testObject_CustomBackend_user_11.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_12, "testObject_CustomBackend_user_12.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_13, "testObject_CustomBackend_user_13.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_14, "testObject_CustomBackend_user_14.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_15, "testObject_CustomBackend_user_15.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_16, "testObject_CustomBackend_user_16.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_17, "testObject_CustomBackend_user_17.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_18, "testObject_CustomBackend_user_18.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_19, "testObject_CustomBackend_user_19.json"), (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_20, "testObject_CustomBackend_user_20.json")],
-      testCase ("Golden: Event_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_1, "testObject_Event_user_1.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_2, "testObject_Event_user_2.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_3, "testObject_Event_user_3.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_4, "testObject_Event_user_4.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_5, "testObject_Event_user_5.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_6, "testObject_Event_user_6.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_7, "testObject_Event_user_7.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_8, "testObject_Event_user_8.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_9, "testObject_Event_user_9.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_10, "testObject_Event_user_10.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_11, "testObject_Event_user_11.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_12, "testObject_Event_user_12.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_13, "testObject_Event_user_13.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_14, "testObject_Event_user_14.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_15, "testObject_Event_user_15.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_16, "testObject_Event_user_16.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_17, "testObject_Event_user_17.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_18, "testObject_Event_user_18.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_19, "testObject_Event_user_19.json"), (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_20, "testObject_Event_user_20.json")],
-      testCase ("Golden: EventType_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_1, "testObject_EventType_user_1.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_2, "testObject_EventType_user_2.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_3, "testObject_EventType_user_3.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_4, "testObject_EventType_user_4.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_5, "testObject_EventType_user_5.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_6, "testObject_EventType_user_6.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_7, "testObject_EventType_user_7.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_8, "testObject_EventType_user_8.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_9, "testObject_EventType_user_9.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_10, "testObject_EventType_user_10.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_11, "testObject_EventType_user_11.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_12, "testObject_EventType_user_12.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_13, "testObject_EventType_user_13.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_14, "testObject_EventType_user_14.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_15, "testObject_EventType_user_15.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_16, "testObject_EventType_user_16.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_17, "testObject_EventType_user_17.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_18, "testObject_EventType_user_18.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_19, "testObject_EventType_user_19.json"), (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_20, "testObject_EventType_user_20.json")],
-      testCase ("Golden: SimpleMember_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_1, "testObject_SimpleMember_user_1.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_2, "testObject_SimpleMember_user_2.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_3, "testObject_SimpleMember_user_3.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_4, "testObject_SimpleMember_user_4.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_5, "testObject_SimpleMember_user_5.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_6, "testObject_SimpleMember_user_6.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_7, "testObject_SimpleMember_user_7.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_8, "testObject_SimpleMember_user_8.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_9, "testObject_SimpleMember_user_9.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_10, "testObject_SimpleMember_user_10.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_11, "testObject_SimpleMember_user_11.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_12, "testObject_SimpleMember_user_12.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_13, "testObject_SimpleMember_user_13.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_14, "testObject_SimpleMember_user_14.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_15, "testObject_SimpleMember_user_15.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_16, "testObject_SimpleMember_user_16.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_17, "testObject_SimpleMember_user_17.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_18, "testObject_SimpleMember_user_18.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_19, "testObject_SimpleMember_user_19.json"), (Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_20, "testObject_SimpleMember_user_20.json")],
-      testCase ("Golden: SimpleMembers_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_1, "testObject_SimpleMembers_user_1.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_2, "testObject_SimpleMembers_user_2.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_3, "testObject_SimpleMembers_user_3.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_4, "testObject_SimpleMembers_user_4.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_5, "testObject_SimpleMembers_user_5.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_6, "testObject_SimpleMembers_user_6.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_7, "testObject_SimpleMembers_user_7.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_8, "testObject_SimpleMembers_user_8.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_9, "testObject_SimpleMembers_user_9.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_10, "testObject_SimpleMembers_user_10.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_11, "testObject_SimpleMembers_user_11.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_12, "testObject_SimpleMembers_user_12.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_13, "testObject_SimpleMembers_user_13.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_14, "testObject_SimpleMembers_user_14.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_15, "testObject_SimpleMembers_user_15.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_16, "testObject_SimpleMembers_user_16.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_17, "testObject_SimpleMembers_user_17.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_18, "testObject_SimpleMembers_user_18.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_19, "testObject_SimpleMembers_user_19.json"), (Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_20, "testObject_SimpleMembers_user_20.json")],
-      testCase ("Golden: Connect_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_1, "testObject_Connect_user_1.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_2, "testObject_Connect_user_2.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_3, "testObject_Connect_user_3.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_4, "testObject_Connect_user_4.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_5, "testObject_Connect_user_5.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_6, "testObject_Connect_user_6.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_7, "testObject_Connect_user_7.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_8, "testObject_Connect_user_8.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_9, "testObject_Connect_user_9.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_10, "testObject_Connect_user_10.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_11, "testObject_Connect_user_11.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_12, "testObject_Connect_user_12.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_13, "testObject_Connect_user_13.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_14, "testObject_Connect_user_14.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_15, "testObject_Connect_user_15.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_16, "testObject_Connect_user_16.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_17, "testObject_Connect_user_17.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_18, "testObject_Connect_user_18.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_19, "testObject_Connect_user_19.json"), (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_20, "testObject_Connect_user_20.json")],
-      testCase ("Golden: MemberUpdateData_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_1, "testObject_MemberUpdateData_user_1.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_2, "testObject_MemberUpdateData_user_2.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_3, "testObject_MemberUpdateData_user_3.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_4, "testObject_MemberUpdateData_user_4.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_5, "testObject_MemberUpdateData_user_5.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_6, "testObject_MemberUpdateData_user_6.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_7, "testObject_MemberUpdateData_user_7.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_8, "testObject_MemberUpdateData_user_8.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_9, "testObject_MemberUpdateData_user_9.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_10, "testObject_MemberUpdateData_user_10.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_11, "testObject_MemberUpdateData_user_11.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_12, "testObject_MemberUpdateData_user_12.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_13, "testObject_MemberUpdateData_user_13.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_14, "testObject_MemberUpdateData_user_14.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_15, "testObject_MemberUpdateData_user_15.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_16, "testObject_MemberUpdateData_user_16.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_17, "testObject_MemberUpdateData_user_17.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_18, "testObject_MemberUpdateData_user_18.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_19, "testObject_MemberUpdateData_user_19.json"), (Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_20, "testObject_MemberUpdateData_user_20.json")],
-      testCase ("Golden: OtrMessage_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_1, "testObject_OtrMessage_user_1.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_2, "testObject_OtrMessage_user_2.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_3, "testObject_OtrMessage_user_3.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_4, "testObject_OtrMessage_user_4.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_5, "testObject_OtrMessage_user_5.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_6, "testObject_OtrMessage_user_6.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_7, "testObject_OtrMessage_user_7.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_8, "testObject_OtrMessage_user_8.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_9, "testObject_OtrMessage_user_9.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_10, "testObject_OtrMessage_user_10.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_11, "testObject_OtrMessage_user_11.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_12, "testObject_OtrMessage_user_12.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_13, "testObject_OtrMessage_user_13.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_14, "testObject_OtrMessage_user_14.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_15, "testObject_OtrMessage_user_15.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_16, "testObject_OtrMessage_user_16.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_17, "testObject_OtrMessage_user_17.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_18, "testObject_OtrMessage_user_18.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_19, "testObject_OtrMessage_user_19.json"), (Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_20, "testObject_OtrMessage_user_20.json")],
-      testCase ("Golden: Priority_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_1, "testObject_Priority_user_1.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_2, "testObject_Priority_user_2.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_3, "testObject_Priority_user_3.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_4, "testObject_Priority_user_4.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_5, "testObject_Priority_user_5.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_6, "testObject_Priority_user_6.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_7, "testObject_Priority_user_7.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_8, "testObject_Priority_user_8.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_9, "testObject_Priority_user_9.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_10, "testObject_Priority_user_10.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_11, "testObject_Priority_user_11.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_12, "testObject_Priority_user_12.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_13, "testObject_Priority_user_13.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_14, "testObject_Priority_user_14.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_15, "testObject_Priority_user_15.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_16, "testObject_Priority_user_16.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_17, "testObject_Priority_user_17.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_18, "testObject_Priority_user_18.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_19, "testObject_Priority_user_19.json"), (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_20, "testObject_Priority_user_20.json")],
-      testCase ("Golden: OtrRecipients_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_1, "testObject_OtrRecipients_user_1.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_2, "testObject_OtrRecipients_user_2.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_3, "testObject_OtrRecipients_user_3.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_4, "testObject_OtrRecipients_user_4.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_5, "testObject_OtrRecipients_user_5.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_6, "testObject_OtrRecipients_user_6.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_7, "testObject_OtrRecipients_user_7.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_8, "testObject_OtrRecipients_user_8.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_9, "testObject_OtrRecipients_user_9.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_10, "testObject_OtrRecipients_user_10.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_11, "testObject_OtrRecipients_user_11.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_12, "testObject_OtrRecipients_user_12.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_13, "testObject_OtrRecipients_user_13.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_14, "testObject_OtrRecipients_user_14.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_15, "testObject_OtrRecipients_user_15.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_16, "testObject_OtrRecipients_user_16.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_17, "testObject_OtrRecipients_user_17.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_18, "testObject_OtrRecipients_user_18.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_19, "testObject_OtrRecipients_user_19.json"), (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_20, "testObject_OtrRecipients_user_20.json")],
-      testCase ("Golden: NewOtrMessage_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_1, "testObject_NewOtrMessage_user_1.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_2, "testObject_NewOtrMessage_user_2.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_3, "testObject_NewOtrMessage_user_3.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_4, "testObject_NewOtrMessage_user_4.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_5, "testObject_NewOtrMessage_user_5.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_6, "testObject_NewOtrMessage_user_6.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_7, "testObject_NewOtrMessage_user_7.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_8, "testObject_NewOtrMessage_user_8.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_9, "testObject_NewOtrMessage_user_9.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_10, "testObject_NewOtrMessage_user_10.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_11, "testObject_NewOtrMessage_user_11.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_12, "testObject_NewOtrMessage_user_12.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_13, "testObject_NewOtrMessage_user_13.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_14, "testObject_NewOtrMessage_user_14.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_15, "testObject_NewOtrMessage_user_15.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_16, "testObject_NewOtrMessage_user_16.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_17, "testObject_NewOtrMessage_user_17.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_18, "testObject_NewOtrMessage_user_18.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_19, "testObject_NewOtrMessage_user_19.json"), (Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_20, "testObject_NewOtrMessage_user_20.json")],
-      testCase ("Golden: ClientMismatch_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_1, "testObject_ClientMismatch_user_1.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_2, "testObject_ClientMismatch_user_2.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_3, "testObject_ClientMismatch_user_3.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_4, "testObject_ClientMismatch_user_4.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_5, "testObject_ClientMismatch_user_5.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_6, "testObject_ClientMismatch_user_6.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_7, "testObject_ClientMismatch_user_7.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_8, "testObject_ClientMismatch_user_8.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_9, "testObject_ClientMismatch_user_9.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_10, "testObject_ClientMismatch_user_10.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_11, "testObject_ClientMismatch_user_11.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_12, "testObject_ClientMismatch_user_12.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_13, "testObject_ClientMismatch_user_13.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_14, "testObject_ClientMismatch_user_14.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_15, "testObject_ClientMismatch_user_15.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_16, "testObject_ClientMismatch_user_16.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_17, "testObject_ClientMismatch_user_17.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_18, "testObject_ClientMismatch_user_18.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_19, "testObject_ClientMismatch_user_19.json"), (Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_20, "testObject_ClientMismatch_user_20.json")],
-      testCase ("Golden: QueuedNotification_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_1, "testObject_QueuedNotification_user_1.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_2, "testObject_QueuedNotification_user_2.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_3, "testObject_QueuedNotification_user_3.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_4, "testObject_QueuedNotification_user_4.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_5, "testObject_QueuedNotification_user_5.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_6, "testObject_QueuedNotification_user_6.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_7, "testObject_QueuedNotification_user_7.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_8, "testObject_QueuedNotification_user_8.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_9, "testObject_QueuedNotification_user_9.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_10, "testObject_QueuedNotification_user_10.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_11, "testObject_QueuedNotification_user_11.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_12, "testObject_QueuedNotification_user_12.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_13, "testObject_QueuedNotification_user_13.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_14, "testObject_QueuedNotification_user_14.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_15, "testObject_QueuedNotification_user_15.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_16, "testObject_QueuedNotification_user_16.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_17, "testObject_QueuedNotification_user_17.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_18, "testObject_QueuedNotification_user_18.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_19, "testObject_QueuedNotification_user_19.json"), (Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_20, "testObject_QueuedNotification_user_20.json")],
-      testCase ("Golden: QueuedNotificationList_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_1, "testObject_QueuedNotificationList_user_1.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_2, "testObject_QueuedNotificationList_user_2.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_3, "testObject_QueuedNotificationList_user_3.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_4, "testObject_QueuedNotificationList_user_4.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_5, "testObject_QueuedNotificationList_user_5.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_6, "testObject_QueuedNotificationList_user_6.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_7, "testObject_QueuedNotificationList_user_7.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_8, "testObject_QueuedNotificationList_user_8.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_9, "testObject_QueuedNotificationList_user_9.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_10, "testObject_QueuedNotificationList_user_10.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_11, "testObject_QueuedNotificationList_user_11.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_12, "testObject_QueuedNotificationList_user_12.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_13, "testObject_QueuedNotificationList_user_13.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_14, "testObject_QueuedNotificationList_user_14.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_15, "testObject_QueuedNotificationList_user_15.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_16, "testObject_QueuedNotificationList_user_16.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_17, "testObject_QueuedNotificationList_user_17.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_18, "testObject_QueuedNotificationList_user_18.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_19, "testObject_QueuedNotificationList_user_19.json"), (Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_20, "testObject_QueuedNotificationList_user_20.json")],
-      testCase ("Golden: PropertyKey_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_1, "testObject_PropertyKey_user_1.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_2, "testObject_PropertyKey_user_2.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_3, "testObject_PropertyKey_user_3.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_4, "testObject_PropertyKey_user_4.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_5, "testObject_PropertyKey_user_5.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_6, "testObject_PropertyKey_user_6.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_7, "testObject_PropertyKey_user_7.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_8, "testObject_PropertyKey_user_8.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_9, "testObject_PropertyKey_user_9.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_10, "testObject_PropertyKey_user_10.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_11, "testObject_PropertyKey_user_11.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_12, "testObject_PropertyKey_user_12.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_13, "testObject_PropertyKey_user_13.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_14, "testObject_PropertyKey_user_14.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_15, "testObject_PropertyKey_user_15.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_16, "testObject_PropertyKey_user_16.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_17, "testObject_PropertyKey_user_17.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_18, "testObject_PropertyKey_user_18.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_19, "testObject_PropertyKey_user_19.json"), (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_20, "testObject_PropertyKey_user_20.json")],
-      testCase ("Golden: PropertyValue_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_1, "testObject_PropertyValue_user_1.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_2, "testObject_PropertyValue_user_2.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_3, "testObject_PropertyValue_user_3.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_4, "testObject_PropertyValue_user_4.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_5, "testObject_PropertyValue_user_5.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_6, "testObject_PropertyValue_user_6.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_7, "testObject_PropertyValue_user_7.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_8, "testObject_PropertyValue_user_8.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_9, "testObject_PropertyValue_user_9.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_10, "testObject_PropertyValue_user_10.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_11, "testObject_PropertyValue_user_11.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_12, "testObject_PropertyValue_user_12.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_13, "testObject_PropertyValue_user_13.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_14, "testObject_PropertyValue_user_14.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_15, "testObject_PropertyValue_user_15.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_16, "testObject_PropertyValue_user_16.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_17, "testObject_PropertyValue_user_17.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_18, "testObject_PropertyValue_user_18.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_19, "testObject_PropertyValue_user_19.json"), (Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_20, "testObject_PropertyValue_user_20.json")],
-      testCase ("Golden: Push_2eToken_2eTransport_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_1, "testObject_Push_2eToken_2eTransport_user_1.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_2, "testObject_Push_2eToken_2eTransport_user_2.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_3, "testObject_Push_2eToken_2eTransport_user_3.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_4, "testObject_Push_2eToken_2eTransport_user_4.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_5, "testObject_Push_2eToken_2eTransport_user_5.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_6, "testObject_Push_2eToken_2eTransport_user_6.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_7, "testObject_Push_2eToken_2eTransport_user_7.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_8, "testObject_Push_2eToken_2eTransport_user_8.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_9, "testObject_Push_2eToken_2eTransport_user_9.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_10, "testObject_Push_2eToken_2eTransport_user_10.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_11, "testObject_Push_2eToken_2eTransport_user_11.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_12, "testObject_Push_2eToken_2eTransport_user_12.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_13, "testObject_Push_2eToken_2eTransport_user_13.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_14, "testObject_Push_2eToken_2eTransport_user_14.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_15, "testObject_Push_2eToken_2eTransport_user_15.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_16, "testObject_Push_2eToken_2eTransport_user_16.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_17, "testObject_Push_2eToken_2eTransport_user_17.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_18, "testObject_Push_2eToken_2eTransport_user_18.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_19, "testObject_Push_2eToken_2eTransport_user_19.json"), (Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_20, "testObject_Push_2eToken_2eTransport_user_20.json")],
-      testCase ("Golden: Token_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_1, "testObject_Token_user_1.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_2, "testObject_Token_user_2.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_3, "testObject_Token_user_3.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_4, "testObject_Token_user_4.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_5, "testObject_Token_user_5.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_6, "testObject_Token_user_6.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_7, "testObject_Token_user_7.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_8, "testObject_Token_user_8.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_9, "testObject_Token_user_9.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_10, "testObject_Token_user_10.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_11, "testObject_Token_user_11.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_12, "testObject_Token_user_12.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_13, "testObject_Token_user_13.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_14, "testObject_Token_user_14.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_15, "testObject_Token_user_15.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_16, "testObject_Token_user_16.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_17, "testObject_Token_user_17.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_18, "testObject_Token_user_18.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_19, "testObject_Token_user_19.json"), (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_20, "testObject_Token_user_20.json")],
-      testCase ("Golden: AppName_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_1, "testObject_AppName_user_1.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_2, "testObject_AppName_user_2.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_3, "testObject_AppName_user_3.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_4, "testObject_AppName_user_4.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_5, "testObject_AppName_user_5.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_6, "testObject_AppName_user_6.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_7, "testObject_AppName_user_7.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_8, "testObject_AppName_user_8.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_9, "testObject_AppName_user_9.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_10, "testObject_AppName_user_10.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_11, "testObject_AppName_user_11.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_12, "testObject_AppName_user_12.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_13, "testObject_AppName_user_13.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_14, "testObject_AppName_user_14.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_15, "testObject_AppName_user_15.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_16, "testObject_AppName_user_16.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_17, "testObject_AppName_user_17.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_18, "testObject_AppName_user_18.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_19, "testObject_AppName_user_19.json"), (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_20, "testObject_AppName_user_20.json")],
-      testCase ("Golden: PushToken_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_1, "testObject_PushToken_user_1.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_2, "testObject_PushToken_user_2.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_3, "testObject_PushToken_user_3.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_4, "testObject_PushToken_user_4.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_5, "testObject_PushToken_user_5.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_6, "testObject_PushToken_user_6.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_7, "testObject_PushToken_user_7.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_8, "testObject_PushToken_user_8.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_9, "testObject_PushToken_user_9.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_10, "testObject_PushToken_user_10.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_11, "testObject_PushToken_user_11.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_12, "testObject_PushToken_user_12.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_13, "testObject_PushToken_user_13.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_14, "testObject_PushToken_user_14.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_15, "testObject_PushToken_user_15.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_16, "testObject_PushToken_user_16.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_17, "testObject_PushToken_user_17.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_18, "testObject_PushToken_user_18.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_19, "testObject_PushToken_user_19.json"), (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_20, "testObject_PushToken_user_20.json")],
-      testCase ("Golden: PushTokenList_user") $
-        testObjects [(Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_1, "testObject_PushTokenList_user_1.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_2, "testObject_PushTokenList_user_2.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_3, "testObject_PushTokenList_user_3.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_4, "testObject_PushTokenList_user_4.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_5, "testObject_PushTokenList_user_5.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_6, "testObject_PushTokenList_user_6.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_7, "testObject_PushTokenList_user_7.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_8, "testObject_PushTokenList_user_8.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_9, "testObject_PushTokenList_user_9.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_10, "testObject_PushTokenList_user_10.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_11, "testObject_PushTokenList_user_11.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_12, "testObject_PushTokenList_user_12.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_13, "testObject_PushTokenList_user_13.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_14, "testObject_PushTokenList_user_14.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_15, "testObject_PushTokenList_user_15.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_16, "testObject_PushTokenList_user_16.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_17, "testObject_PushTokenList_user_17.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_18, "testObject_PushTokenList_user_18.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_19, "testObject_PushTokenList_user_19.json"), (Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_20, "testObject_PushTokenList_user_20.json")],
-      testCase ("Golden: NameUpdate_user") $
+    [ testCase "Golden: AssetToken_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_1, "testObject_AssetToken_user_1.json"),
+            (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_4, "testObject_AssetToken_user_4.json"),
+            (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_5, "testObject_AssetToken_user_5.json"),
+            (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_7, "testObject_AssetToken_user_7.json"),
+            (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_12, "testObject_AssetToken_user_12.json"),
+            (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_15, "testObject_AssetToken_user_15.json"),
+            (Test.Wire.API.Golden.Generated.AssetToken_user.testObject_AssetToken_user_20, "testObject_AssetToken_user_20.json")
+          ],
+      testCase "Golden: NewAssetToken_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_3, "testObject_NewAssetToken_user_3.json"),
+            (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_6, "testObject_NewAssetToken_user_6.json"),
+            (Test.Wire.API.Golden.Generated.NewAssetToken_user.testObject_NewAssetToken_user_9, "testObject_NewAssetToken_user_9.json")
+          ],
+      testCase "Golden: AssetRetention_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_1, "testObject_AssetRetention_user_1.json"),
+            (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_2, "testObject_AssetRetention_user_2.json"),
+            (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_3, "testObject_AssetRetention_user_3.json"),
+            (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_8, "testObject_AssetRetention_user_8.json"),
+            (Test.Wire.API.Golden.Generated.AssetRetention_user.testObject_AssetRetention_user_13, "testObject_AssetRetention_user_13.json")
+          ],
+      testCase "Golden: AssetSettings_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_1, "testObject_AssetSettings_user_1.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_2, "testObject_AssetSettings_user_2.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_3, "testObject_AssetSettings_user_3.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_5, "testObject_AssetSettings_user_5.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_6, "testObject_AssetSettings_user_6.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_10, "testObject_AssetSettings_user_10.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_14, "testObject_AssetSettings_user_14.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_15, "testObject_AssetSettings_user_15.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_16, "testObject_AssetSettings_user_16.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_19, "testObject_AssetSettings_user_19.json"),
+            (Test.Wire.API.Golden.Generated.AssetSettings_user.testObject_AssetSettings_user_20, "testObject_AssetSettings_user_20.json")
+          ],
+      testCase "Golden: AssetKey_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_1, "testObject_AssetKey_user_1.json"),
+            (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_2, "testObject_AssetKey_user_2.json"),
+            (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_3, "testObject_AssetKey_user_3.json"),
+            (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_4, "testObject_AssetKey_user_4.json"),
+            (Test.Wire.API.Golden.Generated.AssetKey_user.testObject_AssetKey_user_5, "testObject_AssetKey_user_5.json")
+          ],
+      testCase "Golden: ResumableSettings_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_1, "testObject_ResumableSettings_user_1.json"),
+            (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_2, "testObject_ResumableSettings_user_2.json"),
+            (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_4, "testObject_ResumableSettings_user_4.json"),
+            (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_5, "testObject_ResumableSettings_user_5.json"),
+            (Test.Wire.API.Golden.Generated.ResumableSettings_user.testObject_ResumableSettings_user_17, "testObject_ResumableSettings_user_17.json")
+          ],
+      testCase "Golden: TotalSize_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.TotalSize_user.testObject_TotalSize_user_1, "testObject_TotalSize_user_1.json")
+          ],
+      testCase "Golden: ChunkSize_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ChunkSize_user.testObject_ChunkSize_user_1, "testObject_ChunkSize_user_1.json")
+          ],
+      testCase "Golden: Offset_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Offset_user.testObject_Offset_user_1, "testObject_Offset_user_1.json")
+          ],
+      testCase "Golden: ResumableAsset_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ResumableAsset_user.testObject_ResumableAsset_user_1, "testObject_ResumableAsset_user_1.json")
+          ],
+      testCase "Golden: TurnHost_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_1, "testObject_TurnHost_user_1.json"),
+            (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_2, "testObject_TurnHost_user_2.json"),
+            (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_8, "testObject_TurnHost_user_8.json"),
+            (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_9, "testObject_TurnHost_user_9.json"),
+            (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_12, "testObject_TurnHost_user_12.json"),
+            (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_14, "testObject_TurnHost_user_14.json"),
+            (Test.Wire.API.Golden.Generated.TurnHost_user.testObject_TurnHost_user_20, "testObject_TurnHost_user_20.json")
+          ],
+      testCase "Golden: Scheme_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_1, "testObject_Scheme_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Scheme_user.testObject_Scheme_user_2, "testObject_Scheme_user_2.json")
+          ],
+      testCase "Golden: Transport_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_1, "testObject_Transport_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Transport_user.testObject_Transport_user_2, "testObject_Transport_user_2.json")
+          ],
+      testCase "Golden: TurnURI_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_1, "testObject_TurnURI_user_1.json"),
+            (Test.Wire.API.Golden.Generated.TurnURI_user.testObject_TurnURI_user_9, "testObject_TurnURI_user_9.json")
+          ],
+      testCase "Golden: TurnUsername_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_1, "testObject_TurnUsername_user_1.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_2, "testObject_TurnUsername_user_2.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_3, "testObject_TurnUsername_user_3.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_4, "testObject_TurnUsername_user_4.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_5, "testObject_TurnUsername_user_5.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_6, "testObject_TurnUsername_user_6.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_7, "testObject_TurnUsername_user_7.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_8, "testObject_TurnUsername_user_8.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_9, "testObject_TurnUsername_user_9.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_10, "testObject_TurnUsername_user_10.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_11, "testObject_TurnUsername_user_11.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_12, "testObject_TurnUsername_user_12.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_13, "testObject_TurnUsername_user_13.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_14, "testObject_TurnUsername_user_14.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_15, "testObject_TurnUsername_user_15.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_16, "testObject_TurnUsername_user_16.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_17, "testObject_TurnUsername_user_17.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_18, "testObject_TurnUsername_user_18.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_19, "testObject_TurnUsername_user_19.json"),
+            (Test.Wire.API.Golden.Generated.TurnUsername_user.testObject_TurnUsername_user_20, "testObject_TurnUsername_user_20.json")
+          ],
+      testCase "Golden: RTCIceServer_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_1, "testObject_RTCIceServer_user_1.json"),
+            (Test.Wire.API.Golden.Generated.RTCIceServer_user.testObject_RTCIceServer_user_2, "testObject_RTCIceServer_user_2.json")
+          ],
+      testCase "Golden: RTCConfiguration_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_1, "testObject_RTCConfiguration_user_1.json"),
+            (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_2, "testObject_RTCConfiguration_user_2.json"),
+            (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_3, "testObject_RTCConfiguration_user_3.json"),
+            (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_4, "testObject_RTCConfiguration_user_4.json"),
+            (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_5, "testObject_RTCConfiguration_user_5.json"),
+            (Test.Wire.API.Golden.Generated.RTCConfiguration_user.testObject_RTCConfiguration_user_6, "testObject_RTCConfiguration_user_6.json")
+          ],
+      testCase "Golden: SFTServer_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.SFTServer_user.testObject_SFTServer_user_1, "testObject_SFTServer_user_1.json")
+          ],
+      testCase "Golden: ConnectionRequest_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_1, "testObject_ConnectionRequest_user_1.json"),
+            (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_2, "testObject_ConnectionRequest_user_2.json"),
+            (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_3, "testObject_ConnectionRequest_user_3.json"),
+            (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_4, "testObject_ConnectionRequest_user_4.json"),
+            (Test.Wire.API.Golden.Generated.ConnectionRequest_user.testObject_ConnectionRequest_user_8, "testObject_ConnectionRequest_user_8.json")
+          ],
+      testCase "Golden: Relation_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_1, "testObject_Relation_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_2, "testObject_Relation_user_2.json"),
+            (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_3, "testObject_Relation_user_3.json"),
+            (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_4, "testObject_Relation_user_4.json"),
+            (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_5, "testObject_Relation_user_5.json"),
+            (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_6, "testObject_Relation_user_6.json"),
+            (Test.Wire.API.Golden.Generated.Relation_user.testObject_Relation_user_7, "testObject_Relation_user_7.json")
+          ],
+      testCase "Golden: Message_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_1, "testObject_Message_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_2, "testObject_Message_user_2.json"),
+            (Test.Wire.API.Golden.Generated.Message_user.testObject_Message_user_3, "testObject_Message_user_3.json")
+          ],
+      testCase "Golden: UserConnection_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_1, "testObject_UserConnection_user_1.json"),
+            (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_2, "testObject_UserConnection_user_2.json"),
+            (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_3, "testObject_UserConnection_user_3.json"),
+            (Test.Wire.API.Golden.Generated.UserConnection_user.testObject_UserConnection_user_4, "testObject_UserConnection_user_4.json")
+          ],
+      testCase "Golden: UserConnectionList_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_1, "testObject_UserConnectionList_user_1.json"),
+            (Test.Wire.API.Golden.Generated.UserConnectionList_user.testObject_UserConnectionList_user_2, "testObject_UserConnectionList_user_2.json")
+          ],
+      testCase "Golden: ConnectionUpdate_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ConnectionUpdate_user.testObject_ConnectionUpdate_user_1, "testObject_ConnectionUpdate_user_1.json")
+          ],
+      testCase "Golden: Conversation_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_1, "testObject_Conversation_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Conversation_user.testObject_Conversation_user_2, "testObject_Conversation_user_2.json")
+          ],
+      testCase "Golden: NewConvUnmanaged_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_1, "testObject_NewConvUnmanaged_user_1.json"),
+            (Test.Wire.API.Golden.Generated.NewConvUnmanaged_user.testObject_NewConvUnmanaged_user_3, "testObject_NewConvUnmanaged_user_3.json")
+          ],
+      testCase "Golden: NewConvManaged_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.NewConvManaged_user.testObject_NewConvManaged_user_1, "testObject_NewConvManaged_user_1.json")
+          ],
+      testCase "Golden: ConversationList_20_28Id_20_2a_20C_29_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_1,
+              "testObject_ConversationList_20_28Id_20_2a_20C_29_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user.testObject_ConversationList_20_28Id_20_2a_20C_29_user_2,
+              "testObject_ConversationList_20_28Id_20_2a_20C_29_user_2.json"
+            )
+          ],
+      testCase "Golden: ConversationList_20Conversation_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_1,
+              "testObject_ConversationList_20Conversation_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationList_20Conversation_user.testObject_ConversationList_20Conversation_user_2,
+              "testObject_ConversationList_20Conversation_user_2.json"
+            )
+          ],
+      testCase "Golden: Access_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_1, "testObject_Access_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_2, "testObject_Access_user_2.json"),
+            (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_3, "testObject_Access_user_3.json"),
+            (Test.Wire.API.Golden.Generated.Access_user.testObject_Access_user_4, "testObject_Access_user_4.json")
+          ],
+      testCase "Golden: AccessRole_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_1, "testObject_AccessRole_user_1.json"),
+            (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_2, "testObject_AccessRole_user_2.json"),
+            (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_3, "testObject_AccessRole_user_3.json"),
+            (Test.Wire.API.Golden.Generated.AccessRole_user.testObject_AccessRole_user_4, "testObject_AccessRole_user_4.json")
+          ],
+      testCase "Golden: ConvType_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_1, "testObject_ConvType_user_1.json"),
+            (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_2, "testObject_ConvType_user_2.json"),
+            (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_3, "testObject_ConvType_user_3.json"),
+            (Test.Wire.API.Golden.Generated.ConvType_user.testObject_ConvType_user_4, "testObject_ConvType_user_4.json")
+          ],
+      testCase "Golden: ReceiptMode_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_1, "testObject_ReceiptMode_user_1.json"),
+            (Test.Wire.API.Golden.Generated.ReceiptMode_user.testObject_ReceiptMode_user_2, "testObject_ReceiptMode_user_2.json")
+          ],
+      testCase "Golden: ConvTeamInfo_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.ConvTeamInfo_user.testObject_ConvTeamInfo_user_1, "testObject_ConvTeamInfo_user_1.json")
+          ],
+      testCase "Golden: Invite_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Invite_user.testObject_Invite_user_1, "testObject_Invite_user_1.json")
+          ],
+      testCase "Golden: ConversationRename_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationRename_user.testObject_ConversationRename_user_1,
+              "testObject_ConversationRename_user_1.json"
+            )
+          ],
+      testCase "Golden: ConversationAccessUpdate_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_1,
+              "testObject_ConversationAccessUpdate_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user.testObject_ConversationAccessUpdate_user_2,
+              "testObject_ConversationAccessUpdate_user_2.json"
+            )
+          ],
+      testCase "Golden: ConversationReceiptModeUpdate_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationReceiptModeUpdate_user.testObject_ConversationReceiptModeUpdate_user_1,
+              "testObject_ConversationReceiptModeUpdate_user_1.json"
+            )
+          ],
+      testCase "Golden: ConversationMessageTimerUpdate_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_1,
+              "testObject_ConversationMessageTimerUpdate_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationMessageTimerUpdate_user.testObject_ConversationMessageTimerUpdate_user_2,
+              "testObject_ConversationMessageTimerUpdate_user_2.json"
+            )
+          ],
+      testCase "Golden: AddBot_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_1, "testObject_AddBot_user_1.json"),
+            (Test.Wire.API.Golden.Generated.AddBot_user.testObject_AddBot_user_2, "testObject_AddBot_user_2.json")
+          ],
+      testCase "Golden: AddBotResponse_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_1, "testObject_AddBotResponse_user_1.json"),
+            (Test.Wire.API.Golden.Generated.AddBotResponse_user.testObject_AddBotResponse_user_2, "testObject_AddBotResponse_user_2.json")
+          ],
+      testCase "Golden: RemoveBotResponse_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.RemoveBotResponse_user.testObject_RemoveBotResponse_user_1,
+              "testObject_RemoveBotResponse_user_1.json"
+            )
+          ],
+      testCase "Golden: UpdateBotPrekeys_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_1,
+              "testObject_UpdateBotPrekeys_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.UpdateBotPrekeys_user.testObject_UpdateBotPrekeys_user_2,
+              "testObject_UpdateBotPrekeys_user_2.json"
+            )
+          ],
+      testCase "Golden: ConversationCode_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_1,
+              "testObject_ConversationCode_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationCode_user.testObject_ConversationCode_user_2,
+              "testObject_ConversationCode_user_2.json"
+            )
+          ],
+      testCase "Golden: MemberUpdate_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_1,
+              "testObject_MemberUpdate_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.MemberUpdate_user.testObject_MemberUpdate_user_2,
+              "testObject_MemberUpdate_user_2.json"
+            )
+          ],
+      testCase "Golden: MutedStatus_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.MutedStatus_user.testObject_MutedStatus_user_1,
+              "testObject_MutedStatus_user_1.json"
+            )
+          ],
+      testCase "Golden: Member_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_1, "testObject_Member_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Member_user.testObject_Member_user_2, "testObject_Member_user_2.json")
+          ],
+      testCase "Golden: OtherMember_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_1,
+              "testObject_OtherMember_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.OtherMember_user.testObject_OtherMember_user_2,
+              "testObject_OtherMember_user_2.json"
+            )
+          ],
+      testCase "Golden: ConvMembers_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_1,
+              "testObject_ConvMembers_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConvMembers_user.testObject_ConvMembers_user_2,
+              "testObject_ConvMembers_user_2.json"
+            )
+          ],
+      testCase "Golden: OtherMemberUpdate_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.OtherMemberUpdate_user.testObject_OtherMemberUpdate_user_1,
+              "testObject_OtherMemberUpdate_user_1.json"
+            )
+          ],
+      testCase "Golden: RoleName_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.RoleName_user.testObject_RoleName_user_1,
+              "testObject_RoleName_user_1.json"
+            )
+          ],
+      testCase "Golden: Action_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_1, "testObject_Action_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_2, "testObject_Action_user_2.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_3, "testObject_Action_user_3.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_4, "testObject_Action_user_4.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_5, "testObject_Action_user_5.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_6, "testObject_Action_user_6.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_7, "testObject_Action_user_7.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_8, "testObject_Action_user_8.json"),
+            (Test.Wire.API.Golden.Generated.Action_user.testObject_Action_user_9, "testObject_Action_user_9.json")
+          ],
+      testCase "Golden: ConversationRole_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_1,
+              "testObject_ConversationRole_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_2,
+              "testObject_ConversationRole_user_2.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationRole_user.testObject_ConversationRole_user_3,
+              "testObject_ConversationRole_user_3.json"
+            )
+          ],
+      testCase "Golden: ConversationRolesList_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_1,
+              "testObject_ConversationRolesList_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.ConversationRolesList_user.testObject_ConversationRolesList_user_2,
+              "testObject_ConversationRolesList_user_2.json"
+            )
+          ],
+      testCase "Golden: TypingStatus_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_1,
+              "testObject_TypingStatus_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.TypingStatus_user.testObject_TypingStatus_user_2,
+              "testObject_TypingStatus_user_2.json"
+            )
+          ],
+      testCase "Golden: TypingData_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.TypingData_user.testObject_TypingData_user_1,
+              "testObject_TypingData_user_1.json"
+            )
+          ],
+      testCase "Golden: CustomBackend_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_1, "testObject_CustomBackend_user_1.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_2, "testObject_CustomBackend_user_2.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_3, "testObject_CustomBackend_user_3.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_4, "testObject_CustomBackend_user_4.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_5, "testObject_CustomBackend_user_5.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_6, "testObject_CustomBackend_user_6.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_7, "testObject_CustomBackend_user_7.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_8, "testObject_CustomBackend_user_8.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_9, "testObject_CustomBackend_user_9.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_10, "testObject_CustomBackend_user_10.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_11, "testObject_CustomBackend_user_11.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_12, "testObject_CustomBackend_user_12.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_13, "testObject_CustomBackend_user_13.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_14, "testObject_CustomBackend_user_14.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_15, "testObject_CustomBackend_user_15.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_16, "testObject_CustomBackend_user_16.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_17, "testObject_CustomBackend_user_17.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_18, "testObject_CustomBackend_user_18.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_19, "testObject_CustomBackend_user_19.json"),
+            (Test.Wire.API.Golden.Generated.CustomBackend_user.testObject_CustomBackend_user_20, "testObject_CustomBackend_user_20.json")
+          ],
+      testCase "Golden: Event_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_1, "testObject_Event_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_2, "testObject_Event_user_2.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_3, "testObject_Event_user_3.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_4, "testObject_Event_user_4.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_5, "testObject_Event_user_5.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_6, "testObject_Event_user_6.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_7, "testObject_Event_user_7.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_8, "testObject_Event_user_8.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_9, "testObject_Event_user_9.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_10, "testObject_Event_user_10.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_11, "testObject_Event_user_11.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_12, "testObject_Event_user_12.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_13, "testObject_Event_user_13.json"),
+            (Test.Wire.API.Golden.Generated.Event_user.testObject_Event_user_14, "testObject_Event_user_14.json")
+          ],
+      testCase "Golden: EventType_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_1, "testObject_EventType_user_1.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_2, "testObject_EventType_user_2.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_3, "testObject_EventType_user_3.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_4, "testObject_EventType_user_4.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_5, "testObject_EventType_user_5.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_6, "testObject_EventType_user_6.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_7, "testObject_EventType_user_7.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_8, "testObject_EventType_user_8.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_9, "testObject_EventType_user_9.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_10, "testObject_EventType_user_10.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_11, "testObject_EventType_user_11.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_12, "testObject_EventType_user_12.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_13, "testObject_EventType_user_13.json"),
+            (Test.Wire.API.Golden.Generated.EventType_user.testObject_EventType_user_14, "testObject_EventType_user_14.json")
+          ],
+      testCase "Golden: SimpleMember_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.SimpleMember_user.testObject_SimpleMember_user_1,
+              "testObject_SimpleMember_user_1.json"
+            )
+          ],
+      testCase "Golden: SimpleMembers_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_1,
+              "testObject_SimpleMembers_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.SimpleMembers_user.testObject_SimpleMembers_user_2,
+              "testObject_SimpleMembers_user_2.json"
+            )
+          ],
+      testCase "Golden: Connect_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_1, "testObject_Connect_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Connect_user.testObject_Connect_user_2, "testObject_Connect_user_2.json")
+          ],
+      testCase "Golden: MemberUpdateData_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_1,
+              "testObject_MemberUpdateData_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.MemberUpdateData_user.testObject_MemberUpdateData_user_2,
+              "testObject_MemberUpdateData_user_2.json"
+            )
+          ],
+      testCase "Golden: OtrMessage_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_1,
+              "testObject_OtrMessage_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.OtrMessage_user.testObject_OtrMessage_user_2,
+              "testObject_OtrMessage_user_2.json"
+            )
+          ],
+      testCase "Golden: Priority_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_1, "testObject_Priority_user_1.json"),
+            (Test.Wire.API.Golden.Generated.Priority_user.testObject_Priority_user_2, "testObject_Priority_user_2.json")
+          ],
+      testCase "Golden: OtrRecipients_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.OtrRecipients_user.testObject_OtrRecipients_user_1, "testObject_OtrRecipients_user_1.json")
+          ],
+      testCase "Golden: NewOtrMessage_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_1,
+              "testObject_NewOtrMessage_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.NewOtrMessage_user.testObject_NewOtrMessage_user_2,
+              "testObject_NewOtrMessage_user_2.json"
+            )
+          ],
+      testCase "Golden: ClientMismatch_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.ClientMismatch_user.testObject_ClientMismatch_user_1,
+              "testObject_ClientMismatch_user_1.json"
+            )
+          ],
+      testCase "Golden: QueuedNotification_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.QueuedNotification_user.testObject_QueuedNotification_user_1,
+              "testObject_QueuedNotification_user_1.json"
+            )
+          ],
+      testCase "Golden: QueuedNotificationList_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_1,
+              "testObject_QueuedNotificationList_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.QueuedNotificationList_user.testObject_QueuedNotificationList_user_2,
+              "testObject_QueuedNotificationList_user_2.json"
+            )
+          ],
+      testCase "Golden: PropertyKey_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_1, "testObject_PropertyKey_user_1.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_2, "testObject_PropertyKey_user_2.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_3, "testObject_PropertyKey_user_3.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_4, "testObject_PropertyKey_user_4.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_5, "testObject_PropertyKey_user_5.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_6, "testObject_PropertyKey_user_6.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_7, "testObject_PropertyKey_user_7.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_8, "testObject_PropertyKey_user_8.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_9, "testObject_PropertyKey_user_9.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_10, "testObject_PropertyKey_user_10.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_11, "testObject_PropertyKey_user_11.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_12, "testObject_PropertyKey_user_12.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_13, "testObject_PropertyKey_user_13.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_14, "testObject_PropertyKey_user_14.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_15, "testObject_PropertyKey_user_15.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_16, "testObject_PropertyKey_user_16.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_17, "testObject_PropertyKey_user_17.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_18, "testObject_PropertyKey_user_18.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_19, "testObject_PropertyKey_user_19.json"),
+            (Test.Wire.API.Golden.Generated.PropertyKey_user.testObject_PropertyKey_user_20, "testObject_PropertyKey_user_20.json")
+          ],
+      testCase "Golden: PropertyValue_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.PropertyValue_user.testObject_PropertyValue_user_1,
+              "testObject_PropertyValue_user_1.json"
+            )
+          ],
+      testCase "Golden: Push_2eToken_2eTransport_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_1,
+              "testObject_Push_2eToken_2eTransport_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_2,
+              "testObject_Push_2eToken_2eTransport_user_2.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_3,
+              "testObject_Push_2eToken_2eTransport_user_3.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_4,
+              "testObject_Push_2eToken_2eTransport_user_4.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.Push_2eToken_2eTransport_user.testObject_Push_2eToken_2eTransport_user_5,
+              "testObject_Push_2eToken_2eTransport_user_5.json"
+            )
+          ],
+      testCase "Golden: Token_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.Token_user.testObject_Token_user_1, "testObject_Token_user_1.json")
+          ],
+      testCase "Golden: AppName_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.AppName_user.testObject_AppName_user_1, "testObject_AppName_user_1.json")
+          ],
+      testCase "Golden: PushToken_user" $
+        testObjects
+          [ (Test.Wire.API.Golden.Generated.PushToken_user.testObject_PushToken_user_1, "testObject_PushToken_user_1.json")
+          ],
+      testCase "Golden: PushTokenList_user" $
+        testObjects
+          [ ( Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_1,
+              "testObject_PushTokenList_user_1.json"
+            ),
+            ( Test.Wire.API.Golden.Generated.PushTokenList_user.testObject_PushTokenList_user_2,
+              "testObject_PushTokenList_user_2.json"
+            )
+          ],
+      testCase "Golden: NameUpdate_user" $
         testObjects [(Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_1, "testObject_NameUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_2, "testObject_NameUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_3, "testObject_NameUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_4, "testObject_NameUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_5, "testObject_NameUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_6, "testObject_NameUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_7, "testObject_NameUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_8, "testObject_NameUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_9, "testObject_NameUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_10, "testObject_NameUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_11, "testObject_NameUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_12, "testObject_NameUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_13, "testObject_NameUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_14, "testObject_NameUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_15, "testObject_NameUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_16, "testObject_NameUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_17, "testObject_NameUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_18, "testObject_NameUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_19, "testObject_NameUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.NameUpdate_user.testObject_NameUpdate_user_20, "testObject_NameUpdate_user_20.json")],
-      testCase ("Golden: NewUser_user") $
+      testCase "Golden: NewUser_user" $
         testObjects [(Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_1, "testObject_NewUser_user_1.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_2, "testObject_NewUser_user_2.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_3, "testObject_NewUser_user_3.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_4, "testObject_NewUser_user_4.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_5, "testObject_NewUser_user_5.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_6, "testObject_NewUser_user_6.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_7, "testObject_NewUser_user_7.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_8, "testObject_NewUser_user_8.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_9, "testObject_NewUser_user_9.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_10, "testObject_NewUser_user_10.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_11, "testObject_NewUser_user_11.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_12, "testObject_NewUser_user_12.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_13, "testObject_NewUser_user_13.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_14, "testObject_NewUser_user_14.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_15, "testObject_NewUser_user_15.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_16, "testObject_NewUser_user_16.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_17, "testObject_NewUser_user_17.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_18, "testObject_NewUser_user_18.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_19, "testObject_NewUser_user_19.json"), (Test.Wire.API.Golden.Generated.NewUser_user.testObject_NewUser_user_20, "testObject_NewUser_user_20.json")],
-      testCase ("Golden: NewUserPublic_user") $
+      testCase "Golden: NewUserPublic_user" $
         testObjects [(Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_1, "testObject_NewUserPublic_user_1.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_2, "testObject_NewUserPublic_user_2.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_3, "testObject_NewUserPublic_user_3.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_4, "testObject_NewUserPublic_user_4.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_5, "testObject_NewUserPublic_user_5.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_6, "testObject_NewUserPublic_user_6.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_7, "testObject_NewUserPublic_user_7.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_8, "testObject_NewUserPublic_user_8.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_9, "testObject_NewUserPublic_user_9.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_10, "testObject_NewUserPublic_user_10.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_11, "testObject_NewUserPublic_user_11.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_12, "testObject_NewUserPublic_user_12.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_13, "testObject_NewUserPublic_user_13.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_14, "testObject_NewUserPublic_user_14.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_15, "testObject_NewUserPublic_user_15.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_16, "testObject_NewUserPublic_user_16.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_17, "testObject_NewUserPublic_user_17.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_18, "testObject_NewUserPublic_user_18.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_19, "testObject_NewUserPublic_user_19.json"), (Test.Wire.API.Golden.Generated.NewUserPublic_user.testObject_NewUserPublic_user_20, "testObject_NewUserPublic_user_20.json")],
-      testCase ("Golden: LimitedQualifiedUserIdList_2020_user") $
+      testCase "Golden: LimitedQualifiedUserIdList_2020_user" $
         testObjects [(Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_1, "testObject_LimitedQualifiedUserIdList_2020_user_1.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_2, "testObject_LimitedQualifiedUserIdList_2020_user_2.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_3, "testObject_LimitedQualifiedUserIdList_2020_user_3.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_4, "testObject_LimitedQualifiedUserIdList_2020_user_4.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_5, "testObject_LimitedQualifiedUserIdList_2020_user_5.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_6, "testObject_LimitedQualifiedUserIdList_2020_user_6.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_7, "testObject_LimitedQualifiedUserIdList_2020_user_7.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_8, "testObject_LimitedQualifiedUserIdList_2020_user_8.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_9, "testObject_LimitedQualifiedUserIdList_2020_user_9.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_10, "testObject_LimitedQualifiedUserIdList_2020_user_10.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_11, "testObject_LimitedQualifiedUserIdList_2020_user_11.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_12, "testObject_LimitedQualifiedUserIdList_2020_user_12.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_13, "testObject_LimitedQualifiedUserIdList_2020_user_13.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_14, "testObject_LimitedQualifiedUserIdList_2020_user_14.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_15, "testObject_LimitedQualifiedUserIdList_2020_user_15.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_16, "testObject_LimitedQualifiedUserIdList_2020_user_16.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_17, "testObject_LimitedQualifiedUserIdList_2020_user_17.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_18, "testObject_LimitedQualifiedUserIdList_2020_user_18.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_19, "testObject_LimitedQualifiedUserIdList_2020_user_19.json"), (Test.Wire.API.Golden.Generated.LimitedQualifiedUserIdList_2020_user.testObject_LimitedQualifiedUserIdList_2020_user_20, "testObject_LimitedQualifiedUserIdList_2020_user_20.json")],
-      testCase ("Golden: UserProfile_user") $
+      testCase "Golden: UserProfile_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_1, "testObject_UserProfile_user_1.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_2, "testObject_UserProfile_user_2.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_3, "testObject_UserProfile_user_3.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_4, "testObject_UserProfile_user_4.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_5, "testObject_UserProfile_user_5.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_6, "testObject_UserProfile_user_6.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_7, "testObject_UserProfile_user_7.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_8, "testObject_UserProfile_user_8.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_9, "testObject_UserProfile_user_9.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_10, "testObject_UserProfile_user_10.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_11, "testObject_UserProfile_user_11.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_12, "testObject_UserProfile_user_12.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_13, "testObject_UserProfile_user_13.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_14, "testObject_UserProfile_user_14.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_15, "testObject_UserProfile_user_15.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_16, "testObject_UserProfile_user_16.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_17, "testObject_UserProfile_user_17.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_18, "testObject_UserProfile_user_18.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_19, "testObject_UserProfile_user_19.json"), (Test.Wire.API.Golden.Generated.UserProfile_user.testObject_UserProfile_user_20, "testObject_UserProfile_user_20.json")],
-      testCase ("Golden: User_user") $
+      testCase "Golden: User_user" $
         testObjects [(Test.Wire.API.Golden.Generated.User_user.testObject_User_user_1, "testObject_User_user_1.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_2, "testObject_User_user_2.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_3, "testObject_User_user_3.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_4, "testObject_User_user_4.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_5, "testObject_User_user_5.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_6, "testObject_User_user_6.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_7, "testObject_User_user_7.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_8, "testObject_User_user_8.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_9, "testObject_User_user_9.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_10, "testObject_User_user_10.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_11, "testObject_User_user_11.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_12, "testObject_User_user_12.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_13, "testObject_User_user_13.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_14, "testObject_User_user_14.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_15, "testObject_User_user_15.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_16, "testObject_User_user_16.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_17, "testObject_User_user_17.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_18, "testObject_User_user_18.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_19, "testObject_User_user_19.json"), (Test.Wire.API.Golden.Generated.User_user.testObject_User_user_20, "testObject_User_user_20.json")],
-      testCase ("Golden: SelfProfile_user") $
+      testCase "Golden: SelfProfile_user" $
         testObjects [(Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_1, "testObject_SelfProfile_user_1.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_2, "testObject_SelfProfile_user_2.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_3, "testObject_SelfProfile_user_3.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_4, "testObject_SelfProfile_user_4.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_5, "testObject_SelfProfile_user_5.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_6, "testObject_SelfProfile_user_6.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_7, "testObject_SelfProfile_user_7.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_8, "testObject_SelfProfile_user_8.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_9, "testObject_SelfProfile_user_9.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_10, "testObject_SelfProfile_user_10.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_11, "testObject_SelfProfile_user_11.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_12, "testObject_SelfProfile_user_12.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_13, "testObject_SelfProfile_user_13.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_14, "testObject_SelfProfile_user_14.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_15, "testObject_SelfProfile_user_15.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_16, "testObject_SelfProfile_user_16.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_17, "testObject_SelfProfile_user_17.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_18, "testObject_SelfProfile_user_18.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_19, "testObject_SelfProfile_user_19.json"), (Test.Wire.API.Golden.Generated.SelfProfile_user.testObject_SelfProfile_user_20, "testObject_SelfProfile_user_20.json")],
-      testCase ("Golden: InvitationCode_user") $
+      testCase "Golden: InvitationCode_user" $
         testObjects [(Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_1, "testObject_InvitationCode_user_1.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_2, "testObject_InvitationCode_user_2.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_3, "testObject_InvitationCode_user_3.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_4, "testObject_InvitationCode_user_4.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_5, "testObject_InvitationCode_user_5.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_6, "testObject_InvitationCode_user_6.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_7, "testObject_InvitationCode_user_7.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_8, "testObject_InvitationCode_user_8.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_9, "testObject_InvitationCode_user_9.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_10, "testObject_InvitationCode_user_10.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_11, "testObject_InvitationCode_user_11.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_12, "testObject_InvitationCode_user_12.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_13, "testObject_InvitationCode_user_13.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_14, "testObject_InvitationCode_user_14.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_15, "testObject_InvitationCode_user_15.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_16, "testObject_InvitationCode_user_16.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_17, "testObject_InvitationCode_user_17.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_18, "testObject_InvitationCode_user_18.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_19, "testObject_InvitationCode_user_19.json"), (Test.Wire.API.Golden.Generated.InvitationCode_user.testObject_InvitationCode_user_20, "testObject_InvitationCode_user_20.json")],
-      testCase ("Golden: BindingNewTeamUser_user") $
+      testCase "Golden: BindingNewTeamUser_user" $
         testObjects [(Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_1, "testObject_BindingNewTeamUser_user_1.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_2, "testObject_BindingNewTeamUser_user_2.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_3, "testObject_BindingNewTeamUser_user_3.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_4, "testObject_BindingNewTeamUser_user_4.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_5, "testObject_BindingNewTeamUser_user_5.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_6, "testObject_BindingNewTeamUser_user_6.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_7, "testObject_BindingNewTeamUser_user_7.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_8, "testObject_BindingNewTeamUser_user_8.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_9, "testObject_BindingNewTeamUser_user_9.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_10, "testObject_BindingNewTeamUser_user_10.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_11, "testObject_BindingNewTeamUser_user_11.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_12, "testObject_BindingNewTeamUser_user_12.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_13, "testObject_BindingNewTeamUser_user_13.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_14, "testObject_BindingNewTeamUser_user_14.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_15, "testObject_BindingNewTeamUser_user_15.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_16, "testObject_BindingNewTeamUser_user_16.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_17, "testObject_BindingNewTeamUser_user_17.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_18, "testObject_BindingNewTeamUser_user_18.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_19, "testObject_BindingNewTeamUser_user_19.json"), (Test.Wire.API.Golden.Generated.BindingNewTeamUser_user.testObject_BindingNewTeamUser_user_20, "testObject_BindingNewTeamUser_user_20.json")],
-      testCase ("Golden: UserUpdate_user") $
+      testCase "Golden: UserUpdate_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_1, "testObject_UserUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_2, "testObject_UserUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_3, "testObject_UserUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_4, "testObject_UserUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_5, "testObject_UserUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_6, "testObject_UserUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_7, "testObject_UserUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_8, "testObject_UserUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_9, "testObject_UserUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_10, "testObject_UserUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_11, "testObject_UserUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_12, "testObject_UserUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_13, "testObject_UserUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_14, "testObject_UserUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_15, "testObject_UserUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_16, "testObject_UserUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_17, "testObject_UserUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_18, "testObject_UserUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_19, "testObject_UserUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.UserUpdate_user.testObject_UserUpdate_user_20, "testObject_UserUpdate_user_20.json")],
-      testCase ("Golden: PasswordChange_user") $
+      testCase "Golden: PasswordChange_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_1, "testObject_PasswordChange_user_1.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_2, "testObject_PasswordChange_user_2.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_3, "testObject_PasswordChange_user_3.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_4, "testObject_PasswordChange_user_4.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_5, "testObject_PasswordChange_user_5.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_6, "testObject_PasswordChange_user_6.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_7, "testObject_PasswordChange_user_7.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_8, "testObject_PasswordChange_user_8.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_9, "testObject_PasswordChange_user_9.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_10, "testObject_PasswordChange_user_10.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_11, "testObject_PasswordChange_user_11.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_12, "testObject_PasswordChange_user_12.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_13, "testObject_PasswordChange_user_13.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_14, "testObject_PasswordChange_user_14.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_15, "testObject_PasswordChange_user_15.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_16, "testObject_PasswordChange_user_16.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_17, "testObject_PasswordChange_user_17.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_18, "testObject_PasswordChange_user_18.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_19, "testObject_PasswordChange_user_19.json"), (Test.Wire.API.Golden.Generated.PasswordChange_user.testObject_PasswordChange_user_20, "testObject_PasswordChange_user_20.json")],
-      testCase ("Golden: LocaleUpdate_user") $
+      testCase "Golden: LocaleUpdate_user" $
         testObjects [(Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_1, "testObject_LocaleUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_2, "testObject_LocaleUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_3, "testObject_LocaleUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_4, "testObject_LocaleUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_5, "testObject_LocaleUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_6, "testObject_LocaleUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_7, "testObject_LocaleUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_8, "testObject_LocaleUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_9, "testObject_LocaleUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_10, "testObject_LocaleUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_11, "testObject_LocaleUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_12, "testObject_LocaleUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_13, "testObject_LocaleUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_14, "testObject_LocaleUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_15, "testObject_LocaleUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_16, "testObject_LocaleUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_17, "testObject_LocaleUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_18, "testObject_LocaleUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_19, "testObject_LocaleUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.LocaleUpdate_user.testObject_LocaleUpdate_user_20, "testObject_LocaleUpdate_user_20.json")],
-      testCase ("Golden: EmailUpdate_user") $
+      testCase "Golden: EmailUpdate_user" $
         testObjects [(Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_1, "testObject_EmailUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_2, "testObject_EmailUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_3, "testObject_EmailUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_4, "testObject_EmailUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_5, "testObject_EmailUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_6, "testObject_EmailUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_7, "testObject_EmailUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_8, "testObject_EmailUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_9, "testObject_EmailUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_10, "testObject_EmailUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_11, "testObject_EmailUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_12, "testObject_EmailUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_13, "testObject_EmailUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_14, "testObject_EmailUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_15, "testObject_EmailUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_16, "testObject_EmailUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_17, "testObject_EmailUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_18, "testObject_EmailUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_19, "testObject_EmailUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_user.testObject_EmailUpdate_user_20, "testObject_EmailUpdate_user_20.json")],
-      testCase ("Golden: PhoneUpdate_user") $
+      testCase "Golden: PhoneUpdate_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_1, "testObject_PhoneUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_2, "testObject_PhoneUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_3, "testObject_PhoneUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_4, "testObject_PhoneUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_5, "testObject_PhoneUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_6, "testObject_PhoneUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_7, "testObject_PhoneUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_8, "testObject_PhoneUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_9, "testObject_PhoneUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_10, "testObject_PhoneUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_11, "testObject_PhoneUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_12, "testObject_PhoneUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_13, "testObject_PhoneUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_14, "testObject_PhoneUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_15, "testObject_PhoneUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_16, "testObject_PhoneUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_17, "testObject_PhoneUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_18, "testObject_PhoneUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_19, "testObject_PhoneUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.PhoneUpdate_user.testObject_PhoneUpdate_user_20, "testObject_PhoneUpdate_user_20.json")],
-      testCase ("Golden: HandleUpdate_user") $
+      testCase "Golden: HandleUpdate_user" $
         testObjects [(Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_1, "testObject_HandleUpdate_user_1.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_2, "testObject_HandleUpdate_user_2.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_3, "testObject_HandleUpdate_user_3.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_4, "testObject_HandleUpdate_user_4.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_5, "testObject_HandleUpdate_user_5.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_6, "testObject_HandleUpdate_user_6.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_7, "testObject_HandleUpdate_user_7.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_8, "testObject_HandleUpdate_user_8.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_9, "testObject_HandleUpdate_user_9.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_10, "testObject_HandleUpdate_user_10.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_11, "testObject_HandleUpdate_user_11.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_12, "testObject_HandleUpdate_user_12.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_13, "testObject_HandleUpdate_user_13.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_14, "testObject_HandleUpdate_user_14.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_15, "testObject_HandleUpdate_user_15.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_16, "testObject_HandleUpdate_user_16.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_17, "testObject_HandleUpdate_user_17.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_18, "testObject_HandleUpdate_user_18.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_19, "testObject_HandleUpdate_user_19.json"), (Test.Wire.API.Golden.Generated.HandleUpdate_user.testObject_HandleUpdate_user_20, "testObject_HandleUpdate_user_20.json")],
-      testCase ("Golden: DeleteUser_user") $
+      testCase "Golden: DeleteUser_user" $
         testObjects [(Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_1, "testObject_DeleteUser_user_1.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_2, "testObject_DeleteUser_user_2.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_3, "testObject_DeleteUser_user_3.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_4, "testObject_DeleteUser_user_4.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_5, "testObject_DeleteUser_user_5.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_6, "testObject_DeleteUser_user_6.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_7, "testObject_DeleteUser_user_7.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_8, "testObject_DeleteUser_user_8.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_9, "testObject_DeleteUser_user_9.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_10, "testObject_DeleteUser_user_10.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_11, "testObject_DeleteUser_user_11.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_12, "testObject_DeleteUser_user_12.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_13, "testObject_DeleteUser_user_13.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_14, "testObject_DeleteUser_user_14.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_15, "testObject_DeleteUser_user_15.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_16, "testObject_DeleteUser_user_16.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_17, "testObject_DeleteUser_user_17.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_18, "testObject_DeleteUser_user_18.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_19, "testObject_DeleteUser_user_19.json"), (Test.Wire.API.Golden.Generated.DeleteUser_user.testObject_DeleteUser_user_20, "testObject_DeleteUser_user_20.json")],
-      testCase ("Golden: VerifyDeleteUser_user") $
+      testCase "Golden: VerifyDeleteUser_user" $
         testObjects [(Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_1, "testObject_VerifyDeleteUser_user_1.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_2, "testObject_VerifyDeleteUser_user_2.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_3, "testObject_VerifyDeleteUser_user_3.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_4, "testObject_VerifyDeleteUser_user_4.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_5, "testObject_VerifyDeleteUser_user_5.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_6, "testObject_VerifyDeleteUser_user_6.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_7, "testObject_VerifyDeleteUser_user_7.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_8, "testObject_VerifyDeleteUser_user_8.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_9, "testObject_VerifyDeleteUser_user_9.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_10, "testObject_VerifyDeleteUser_user_10.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_11, "testObject_VerifyDeleteUser_user_11.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_12, "testObject_VerifyDeleteUser_user_12.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_13, "testObject_VerifyDeleteUser_user_13.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_14, "testObject_VerifyDeleteUser_user_14.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_15, "testObject_VerifyDeleteUser_user_15.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_16, "testObject_VerifyDeleteUser_user_16.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_17, "testObject_VerifyDeleteUser_user_17.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_18, "testObject_VerifyDeleteUser_user_18.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_19, "testObject_VerifyDeleteUser_user_19.json"), (Test.Wire.API.Golden.Generated.VerifyDeleteUser_user.testObject_VerifyDeleteUser_user_20, "testObject_VerifyDeleteUser_user_20.json")],
-      testCase ("Golden: DeletionCodeTimeout_user") $
+      testCase "Golden: DeletionCodeTimeout_user" $
         testObjects [(Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_1, "testObject_DeletionCodeTimeout_user_1.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_2, "testObject_DeletionCodeTimeout_user_2.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_3, "testObject_DeletionCodeTimeout_user_3.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_4, "testObject_DeletionCodeTimeout_user_4.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_5, "testObject_DeletionCodeTimeout_user_5.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_6, "testObject_DeletionCodeTimeout_user_6.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_7, "testObject_DeletionCodeTimeout_user_7.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_8, "testObject_DeletionCodeTimeout_user_8.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_9, "testObject_DeletionCodeTimeout_user_9.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_10, "testObject_DeletionCodeTimeout_user_10.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_11, "testObject_DeletionCodeTimeout_user_11.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_12, "testObject_DeletionCodeTimeout_user_12.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_13, "testObject_DeletionCodeTimeout_user_13.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_14, "testObject_DeletionCodeTimeout_user_14.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_15, "testObject_DeletionCodeTimeout_user_15.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_16, "testObject_DeletionCodeTimeout_user_16.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_17, "testObject_DeletionCodeTimeout_user_17.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_18, "testObject_DeletionCodeTimeout_user_18.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_19, "testObject_DeletionCodeTimeout_user_19.json"), (Test.Wire.API.Golden.Generated.DeletionCodeTimeout_user.testObject_DeletionCodeTimeout_user_20, "testObject_DeletionCodeTimeout_user_20.json")],
-      testCase ("Golden: ActivationKey_user") $
+      testCase "Golden: ActivationKey_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_1, "testObject_ActivationKey_user_1.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_2, "testObject_ActivationKey_user_2.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_3, "testObject_ActivationKey_user_3.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_4, "testObject_ActivationKey_user_4.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_5, "testObject_ActivationKey_user_5.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_6, "testObject_ActivationKey_user_6.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_7, "testObject_ActivationKey_user_7.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_8, "testObject_ActivationKey_user_8.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_9, "testObject_ActivationKey_user_9.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_10, "testObject_ActivationKey_user_10.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_11, "testObject_ActivationKey_user_11.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_12, "testObject_ActivationKey_user_12.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_13, "testObject_ActivationKey_user_13.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_14, "testObject_ActivationKey_user_14.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_15, "testObject_ActivationKey_user_15.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_16, "testObject_ActivationKey_user_16.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_17, "testObject_ActivationKey_user_17.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_18, "testObject_ActivationKey_user_18.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_19, "testObject_ActivationKey_user_19.json"), (Test.Wire.API.Golden.Generated.ActivationKey_user.testObject_ActivationKey_user_20, "testObject_ActivationKey_user_20.json")],
-      testCase ("Golden: ActivationCode_user") $
+      testCase "Golden: ActivationCode_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_1, "testObject_ActivationCode_user_1.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_2, "testObject_ActivationCode_user_2.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_3, "testObject_ActivationCode_user_3.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_4, "testObject_ActivationCode_user_4.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_5, "testObject_ActivationCode_user_5.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_6, "testObject_ActivationCode_user_6.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_7, "testObject_ActivationCode_user_7.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_8, "testObject_ActivationCode_user_8.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_9, "testObject_ActivationCode_user_9.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_10, "testObject_ActivationCode_user_10.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_11, "testObject_ActivationCode_user_11.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_12, "testObject_ActivationCode_user_12.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_13, "testObject_ActivationCode_user_13.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_14, "testObject_ActivationCode_user_14.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_15, "testObject_ActivationCode_user_15.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_16, "testObject_ActivationCode_user_16.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_17, "testObject_ActivationCode_user_17.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_18, "testObject_ActivationCode_user_18.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_19, "testObject_ActivationCode_user_19.json"), (Test.Wire.API.Golden.Generated.ActivationCode_user.testObject_ActivationCode_user_20, "testObject_ActivationCode_user_20.json")],
-      testCase ("Golden: Activate_user") $
+      testCase "Golden: Activate_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_1, "testObject_Activate_user_1.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_2, "testObject_Activate_user_2.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_3, "testObject_Activate_user_3.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_4, "testObject_Activate_user_4.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_5, "testObject_Activate_user_5.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_6, "testObject_Activate_user_6.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_7, "testObject_Activate_user_7.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_8, "testObject_Activate_user_8.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_9, "testObject_Activate_user_9.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_10, "testObject_Activate_user_10.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_11, "testObject_Activate_user_11.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_12, "testObject_Activate_user_12.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_13, "testObject_Activate_user_13.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_14, "testObject_Activate_user_14.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_15, "testObject_Activate_user_15.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_16, "testObject_Activate_user_16.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_17, "testObject_Activate_user_17.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_18, "testObject_Activate_user_18.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_19, "testObject_Activate_user_19.json"), (Test.Wire.API.Golden.Generated.Activate_user.testObject_Activate_user_20, "testObject_Activate_user_20.json")],
-      testCase ("Golden: ActivationResponse_user") $
+      testCase "Golden: ActivationResponse_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_1, "testObject_ActivationResponse_user_1.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_2, "testObject_ActivationResponse_user_2.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_3, "testObject_ActivationResponse_user_3.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_4, "testObject_ActivationResponse_user_4.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_5, "testObject_ActivationResponse_user_5.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_6, "testObject_ActivationResponse_user_6.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_7, "testObject_ActivationResponse_user_7.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_8, "testObject_ActivationResponse_user_8.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_9, "testObject_ActivationResponse_user_9.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_10, "testObject_ActivationResponse_user_10.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_11, "testObject_ActivationResponse_user_11.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_12, "testObject_ActivationResponse_user_12.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_13, "testObject_ActivationResponse_user_13.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_14, "testObject_ActivationResponse_user_14.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_15, "testObject_ActivationResponse_user_15.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_16, "testObject_ActivationResponse_user_16.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_17, "testObject_ActivationResponse_user_17.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_18, "testObject_ActivationResponse_user_18.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_19, "testObject_ActivationResponse_user_19.json"), (Test.Wire.API.Golden.Generated.ActivationResponse_user.testObject_ActivationResponse_user_20, "testObject_ActivationResponse_user_20.json")],
-      testCase ("Golden: SendActivationCode_user") $
+      testCase "Golden: SendActivationCode_user" $
         testObjects [(Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_1, "testObject_SendActivationCode_user_1.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_2, "testObject_SendActivationCode_user_2.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_3, "testObject_SendActivationCode_user_3.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_4, "testObject_SendActivationCode_user_4.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_5, "testObject_SendActivationCode_user_5.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_6, "testObject_SendActivationCode_user_6.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_7, "testObject_SendActivationCode_user_7.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_8, "testObject_SendActivationCode_user_8.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_9, "testObject_SendActivationCode_user_9.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_10, "testObject_SendActivationCode_user_10.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_11, "testObject_SendActivationCode_user_11.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_12, "testObject_SendActivationCode_user_12.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_13, "testObject_SendActivationCode_user_13.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_14, "testObject_SendActivationCode_user_14.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_15, "testObject_SendActivationCode_user_15.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_16, "testObject_SendActivationCode_user_16.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_17, "testObject_SendActivationCode_user_17.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_18, "testObject_SendActivationCode_user_18.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_19, "testObject_SendActivationCode_user_19.json"), (Test.Wire.API.Golden.Generated.SendActivationCode_user.testObject_SendActivationCode_user_20, "testObject_SendActivationCode_user_20.json")],
-      testCase ("Golden: LoginId_user") $
+      testCase "Golden: LoginId_user" $
         testObjects [(Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_1, "testObject_LoginId_user_1.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_2, "testObject_LoginId_user_2.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_3, "testObject_LoginId_user_3.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_4, "testObject_LoginId_user_4.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_5, "testObject_LoginId_user_5.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_6, "testObject_LoginId_user_6.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_7, "testObject_LoginId_user_7.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_8, "testObject_LoginId_user_8.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_9, "testObject_LoginId_user_9.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_10, "testObject_LoginId_user_10.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_11, "testObject_LoginId_user_11.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_12, "testObject_LoginId_user_12.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_13, "testObject_LoginId_user_13.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_14, "testObject_LoginId_user_14.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_15, "testObject_LoginId_user_15.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_16, "testObject_LoginId_user_16.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_17, "testObject_LoginId_user_17.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_18, "testObject_LoginId_user_18.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_19, "testObject_LoginId_user_19.json"), (Test.Wire.API.Golden.Generated.LoginId_user.testObject_LoginId_user_20, "testObject_LoginId_user_20.json")],
-      testCase ("Golden: LoginCode_user") $
+      testCase "Golden: LoginCode_user" $
         testObjects [(Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_1, "testObject_LoginCode_user_1.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_2, "testObject_LoginCode_user_2.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_3, "testObject_LoginCode_user_3.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_4, "testObject_LoginCode_user_4.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_5, "testObject_LoginCode_user_5.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_6, "testObject_LoginCode_user_6.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_7, "testObject_LoginCode_user_7.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_8, "testObject_LoginCode_user_8.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_9, "testObject_LoginCode_user_9.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_10, "testObject_LoginCode_user_10.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_11, "testObject_LoginCode_user_11.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_12, "testObject_LoginCode_user_12.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_13, "testObject_LoginCode_user_13.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_14, "testObject_LoginCode_user_14.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_15, "testObject_LoginCode_user_15.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_16, "testObject_LoginCode_user_16.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_17, "testObject_LoginCode_user_17.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_18, "testObject_LoginCode_user_18.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_19, "testObject_LoginCode_user_19.json"), (Test.Wire.API.Golden.Generated.LoginCode_user.testObject_LoginCode_user_20, "testObject_LoginCode_user_20.json")],
-      testCase ("Golden: PendingLoginCode_user") $
+      testCase "Golden: PendingLoginCode_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_1, "testObject_PendingLoginCode_user_1.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_2, "testObject_PendingLoginCode_user_2.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_3, "testObject_PendingLoginCode_user_3.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_4, "testObject_PendingLoginCode_user_4.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_5, "testObject_PendingLoginCode_user_5.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_6, "testObject_PendingLoginCode_user_6.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_7, "testObject_PendingLoginCode_user_7.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_8, "testObject_PendingLoginCode_user_8.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_9, "testObject_PendingLoginCode_user_9.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_10, "testObject_PendingLoginCode_user_10.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_11, "testObject_PendingLoginCode_user_11.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_12, "testObject_PendingLoginCode_user_12.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_13, "testObject_PendingLoginCode_user_13.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_14, "testObject_PendingLoginCode_user_14.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_15, "testObject_PendingLoginCode_user_15.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_16, "testObject_PendingLoginCode_user_16.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_17, "testObject_PendingLoginCode_user_17.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_18, "testObject_PendingLoginCode_user_18.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_19, "testObject_PendingLoginCode_user_19.json"), (Test.Wire.API.Golden.Generated.PendingLoginCode_user.testObject_PendingLoginCode_user_20, "testObject_PendingLoginCode_user_20.json")],
-      testCase ("Golden: SendLoginCode_user") $
+      testCase "Golden: SendLoginCode_user" $
         testObjects [(Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_1, "testObject_SendLoginCode_user_1.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_2, "testObject_SendLoginCode_user_2.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_3, "testObject_SendLoginCode_user_3.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_4, "testObject_SendLoginCode_user_4.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_5, "testObject_SendLoginCode_user_5.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_6, "testObject_SendLoginCode_user_6.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_7, "testObject_SendLoginCode_user_7.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_8, "testObject_SendLoginCode_user_8.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_9, "testObject_SendLoginCode_user_9.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_10, "testObject_SendLoginCode_user_10.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_11, "testObject_SendLoginCode_user_11.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_12, "testObject_SendLoginCode_user_12.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_13, "testObject_SendLoginCode_user_13.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_14, "testObject_SendLoginCode_user_14.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_15, "testObject_SendLoginCode_user_15.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_16, "testObject_SendLoginCode_user_16.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_17, "testObject_SendLoginCode_user_17.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_18, "testObject_SendLoginCode_user_18.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_19, "testObject_SendLoginCode_user_19.json"), (Test.Wire.API.Golden.Generated.SendLoginCode_user.testObject_SendLoginCode_user_20, "testObject_SendLoginCode_user_20.json")],
-      testCase ("Golden: LoginCodeTimeout_user") $
+      testCase "Golden: LoginCodeTimeout_user" $
         testObjects [(Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_1, "testObject_LoginCodeTimeout_user_1.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_2, "testObject_LoginCodeTimeout_user_2.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_3, "testObject_LoginCodeTimeout_user_3.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_4, "testObject_LoginCodeTimeout_user_4.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_5, "testObject_LoginCodeTimeout_user_5.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_6, "testObject_LoginCodeTimeout_user_6.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_7, "testObject_LoginCodeTimeout_user_7.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_8, "testObject_LoginCodeTimeout_user_8.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_9, "testObject_LoginCodeTimeout_user_9.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_10, "testObject_LoginCodeTimeout_user_10.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_11, "testObject_LoginCodeTimeout_user_11.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_12, "testObject_LoginCodeTimeout_user_12.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_13, "testObject_LoginCodeTimeout_user_13.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_14, "testObject_LoginCodeTimeout_user_14.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_15, "testObject_LoginCodeTimeout_user_15.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_16, "testObject_LoginCodeTimeout_user_16.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_17, "testObject_LoginCodeTimeout_user_17.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_18, "testObject_LoginCodeTimeout_user_18.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_19, "testObject_LoginCodeTimeout_user_19.json"), (Test.Wire.API.Golden.Generated.LoginCodeTimeout_user.testObject_LoginCodeTimeout_user_20, "testObject_LoginCodeTimeout_user_20.json")],
-      testCase ("Golden: CookieLabel_user") $
+      testCase "Golden: CookieLabel_user" $
         testObjects [(Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_1, "testObject_CookieLabel_user_1.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_2, "testObject_CookieLabel_user_2.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_3, "testObject_CookieLabel_user_3.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_4, "testObject_CookieLabel_user_4.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_5, "testObject_CookieLabel_user_5.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_6, "testObject_CookieLabel_user_6.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_7, "testObject_CookieLabel_user_7.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_8, "testObject_CookieLabel_user_8.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_9, "testObject_CookieLabel_user_9.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_10, "testObject_CookieLabel_user_10.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_11, "testObject_CookieLabel_user_11.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_12, "testObject_CookieLabel_user_12.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_13, "testObject_CookieLabel_user_13.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_14, "testObject_CookieLabel_user_14.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_15, "testObject_CookieLabel_user_15.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_16, "testObject_CookieLabel_user_16.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_17, "testObject_CookieLabel_user_17.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_18, "testObject_CookieLabel_user_18.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_19, "testObject_CookieLabel_user_19.json"), (Test.Wire.API.Golden.Generated.CookieLabel_user.testObject_CookieLabel_user_20, "testObject_CookieLabel_user_20.json")],
-      testCase ("Golden: Login_user") $
+      testCase "Golden: Login_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_1, "testObject_Login_user_1.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_2, "testObject_Login_user_2.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_3, "testObject_Login_user_3.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_4, "testObject_Login_user_4.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_5, "testObject_Login_user_5.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_6, "testObject_Login_user_6.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_7, "testObject_Login_user_7.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_8, "testObject_Login_user_8.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_9, "testObject_Login_user_9.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_10, "testObject_Login_user_10.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_11, "testObject_Login_user_11.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_12, "testObject_Login_user_12.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_13, "testObject_Login_user_13.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_14, "testObject_Login_user_14.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_15, "testObject_Login_user_15.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_16, "testObject_Login_user_16.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_17, "testObject_Login_user_17.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_18, "testObject_Login_user_18.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_19, "testObject_Login_user_19.json"), (Test.Wire.API.Golden.Generated.Login_user.testObject_Login_user_20, "testObject_Login_user_20.json")],
-      testCase ("Golden: CookieId_user") $
+      testCase "Golden: CookieId_user" $
         testObjects [(Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_1, "testObject_CookieId_user_1.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_2, "testObject_CookieId_user_2.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_3, "testObject_CookieId_user_3.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_4, "testObject_CookieId_user_4.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_5, "testObject_CookieId_user_5.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_6, "testObject_CookieId_user_6.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_7, "testObject_CookieId_user_7.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_8, "testObject_CookieId_user_8.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_9, "testObject_CookieId_user_9.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_10, "testObject_CookieId_user_10.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_11, "testObject_CookieId_user_11.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_12, "testObject_CookieId_user_12.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_13, "testObject_CookieId_user_13.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_14, "testObject_CookieId_user_14.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_15, "testObject_CookieId_user_15.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_16, "testObject_CookieId_user_16.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_17, "testObject_CookieId_user_17.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_18, "testObject_CookieId_user_18.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_19, "testObject_CookieId_user_19.json"), (Test.Wire.API.Golden.Generated.CookieId_user.testObject_CookieId_user_20, "testObject_CookieId_user_20.json")],
-      testCase ("Golden: CookieType_user") $
+      testCase "Golden: CookieType_user" $
         testObjects [(Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_1, "testObject_CookieType_user_1.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_2, "testObject_CookieType_user_2.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_3, "testObject_CookieType_user_3.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_4, "testObject_CookieType_user_4.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_5, "testObject_CookieType_user_5.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_6, "testObject_CookieType_user_6.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_7, "testObject_CookieType_user_7.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_8, "testObject_CookieType_user_8.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_9, "testObject_CookieType_user_9.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_10, "testObject_CookieType_user_10.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_11, "testObject_CookieType_user_11.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_12, "testObject_CookieType_user_12.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_13, "testObject_CookieType_user_13.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_14, "testObject_CookieType_user_14.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_15, "testObject_CookieType_user_15.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_16, "testObject_CookieType_user_16.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_17, "testObject_CookieType_user_17.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_18, "testObject_CookieType_user_18.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_19, "testObject_CookieType_user_19.json"), (Test.Wire.API.Golden.Generated.CookieType_user.testObject_CookieType_user_20, "testObject_CookieType_user_20.json")],
-      testCase ("Golden: Cookie_20_28_29_user") $
+      testCase "Golden: Cookie_20_28_29_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_1, "testObject_Cookie_20_28_29_user_1.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_2, "testObject_Cookie_20_28_29_user_2.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_3, "testObject_Cookie_20_28_29_user_3.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_4, "testObject_Cookie_20_28_29_user_4.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_5, "testObject_Cookie_20_28_29_user_5.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_6, "testObject_Cookie_20_28_29_user_6.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_7, "testObject_Cookie_20_28_29_user_7.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_8, "testObject_Cookie_20_28_29_user_8.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_9, "testObject_Cookie_20_28_29_user_9.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_10, "testObject_Cookie_20_28_29_user_10.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_11, "testObject_Cookie_20_28_29_user_11.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_12, "testObject_Cookie_20_28_29_user_12.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_13, "testObject_Cookie_20_28_29_user_13.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_14, "testObject_Cookie_20_28_29_user_14.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_15, "testObject_Cookie_20_28_29_user_15.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_16, "testObject_Cookie_20_28_29_user_16.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_17, "testObject_Cookie_20_28_29_user_17.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_18, "testObject_Cookie_20_28_29_user_18.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_19, "testObject_Cookie_20_28_29_user_19.json"), (Test.Wire.API.Golden.Generated.Cookie_20_28_29_user.testObject_Cookie_20_28_29_user_20, "testObject_Cookie_20_28_29_user_20.json")],
-      testCase ("Golden: CookieList_user") $
+      testCase "Golden: CookieList_user" $
         testObjects [(Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_1, "testObject_CookieList_user_1.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_2, "testObject_CookieList_user_2.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_3, "testObject_CookieList_user_3.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_4, "testObject_CookieList_user_4.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_5, "testObject_CookieList_user_5.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_6, "testObject_CookieList_user_6.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_7, "testObject_CookieList_user_7.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_8, "testObject_CookieList_user_8.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_9, "testObject_CookieList_user_9.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_10, "testObject_CookieList_user_10.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_11, "testObject_CookieList_user_11.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_12, "testObject_CookieList_user_12.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_13, "testObject_CookieList_user_13.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_14, "testObject_CookieList_user_14.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_15, "testObject_CookieList_user_15.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_16, "testObject_CookieList_user_16.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_17, "testObject_CookieList_user_17.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_18, "testObject_CookieList_user_18.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_19, "testObject_CookieList_user_19.json"), (Test.Wire.API.Golden.Generated.CookieList_user.testObject_CookieList_user_20, "testObject_CookieList_user_20.json")],
-      testCase ("Golden: RemoveCookies_user") $
+      testCase "Golden: RemoveCookies_user" $
         testObjects [(Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_1, "testObject_RemoveCookies_user_1.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_2, "testObject_RemoveCookies_user_2.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_3, "testObject_RemoveCookies_user_3.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_4, "testObject_RemoveCookies_user_4.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_5, "testObject_RemoveCookies_user_5.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_6, "testObject_RemoveCookies_user_6.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_7, "testObject_RemoveCookies_user_7.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_8, "testObject_RemoveCookies_user_8.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_9, "testObject_RemoveCookies_user_9.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_10, "testObject_RemoveCookies_user_10.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_11, "testObject_RemoveCookies_user_11.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_12, "testObject_RemoveCookies_user_12.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_13, "testObject_RemoveCookies_user_13.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_14, "testObject_RemoveCookies_user_14.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_15, "testObject_RemoveCookies_user_15.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_16, "testObject_RemoveCookies_user_16.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_17, "testObject_RemoveCookies_user_17.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_18, "testObject_RemoveCookies_user_18.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_19, "testObject_RemoveCookies_user_19.json"), (Test.Wire.API.Golden.Generated.RemoveCookies_user.testObject_RemoveCookies_user_20, "testObject_RemoveCookies_user_20.json")],
-      testCase ("Golden: TokenType_user") $
+      testCase "Golden: TokenType_user" $
         testObjects [(Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_1, "testObject_TokenType_user_1.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_2, "testObject_TokenType_user_2.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_3, "testObject_TokenType_user_3.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_4, "testObject_TokenType_user_4.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_5, "testObject_TokenType_user_5.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_6, "testObject_TokenType_user_6.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_7, "testObject_TokenType_user_7.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_8, "testObject_TokenType_user_8.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_9, "testObject_TokenType_user_9.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_10, "testObject_TokenType_user_10.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_11, "testObject_TokenType_user_11.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_12, "testObject_TokenType_user_12.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_13, "testObject_TokenType_user_13.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_14, "testObject_TokenType_user_14.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_15, "testObject_TokenType_user_15.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_16, "testObject_TokenType_user_16.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_17, "testObject_TokenType_user_17.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_18, "testObject_TokenType_user_18.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_19, "testObject_TokenType_user_19.json"), (Test.Wire.API.Golden.Generated.TokenType_user.testObject_TokenType_user_20, "testObject_TokenType_user_20.json")],
-      testCase ("Golden: AccessToken_user") $
+      testCase "Golden: AccessToken_user" $
         testObjects [(Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_1, "testObject_AccessToken_user_1.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_2, "testObject_AccessToken_user_2.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_3, "testObject_AccessToken_user_3.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_4, "testObject_AccessToken_user_4.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_5, "testObject_AccessToken_user_5.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_6, "testObject_AccessToken_user_6.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_7, "testObject_AccessToken_user_7.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_8, "testObject_AccessToken_user_8.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_9, "testObject_AccessToken_user_9.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_10, "testObject_AccessToken_user_10.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_11, "testObject_AccessToken_user_11.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_12, "testObject_AccessToken_user_12.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_13, "testObject_AccessToken_user_13.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_14, "testObject_AccessToken_user_14.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_15, "testObject_AccessToken_user_15.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_16, "testObject_AccessToken_user_16.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_17, "testObject_AccessToken_user_17.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_18, "testObject_AccessToken_user_18.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_19, "testObject_AccessToken_user_19.json"), (Test.Wire.API.Golden.Generated.AccessToken_user.testObject_AccessToken_user_20, "testObject_AccessToken_user_20.json")],
-      testCase ("Golden: UserClientMap_20Int_user") $
+      testCase "Golden: UserClientMap_20Int_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_1, "testObject_UserClientMap_20Int_user_1.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_2, "testObject_UserClientMap_20Int_user_2.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_3, "testObject_UserClientMap_20Int_user_3.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_4, "testObject_UserClientMap_20Int_user_4.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_5, "testObject_UserClientMap_20Int_user_5.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_6, "testObject_UserClientMap_20Int_user_6.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_7, "testObject_UserClientMap_20Int_user_7.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_8, "testObject_UserClientMap_20Int_user_8.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_9, "testObject_UserClientMap_20Int_user_9.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_10, "testObject_UserClientMap_20Int_user_10.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_11, "testObject_UserClientMap_20Int_user_11.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_12, "testObject_UserClientMap_20Int_user_12.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_13, "testObject_UserClientMap_20Int_user_13.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_14, "testObject_UserClientMap_20Int_user_14.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_15, "testObject_UserClientMap_20Int_user_15.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_16, "testObject_UserClientMap_20Int_user_16.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_17, "testObject_UserClientMap_20Int_user_17.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_18, "testObject_UserClientMap_20Int_user_18.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_19, "testObject_UserClientMap_20Int_user_19.json"), (Test.Wire.API.Golden.Generated.UserClientMap_20Int_user.testObject_UserClientMap_20Int_user_20, "testObject_UserClientMap_20Int_user_20.json")],
-      testCase ("Golden: UserClients_user") $
+      testCase "Golden: UserClients_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_1, "testObject_UserClients_user_1.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_2, "testObject_UserClients_user_2.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_3, "testObject_UserClients_user_3.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_4, "testObject_UserClients_user_4.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_5, "testObject_UserClients_user_5.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_6, "testObject_UserClients_user_6.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_7, "testObject_UserClients_user_7.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_8, "testObject_UserClients_user_8.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_9, "testObject_UserClients_user_9.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_10, "testObject_UserClients_user_10.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_11, "testObject_UserClients_user_11.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_12, "testObject_UserClients_user_12.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_13, "testObject_UserClients_user_13.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_14, "testObject_UserClients_user_14.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_15, "testObject_UserClients_user_15.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_16, "testObject_UserClients_user_16.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_17, "testObject_UserClients_user_17.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_18, "testObject_UserClients_user_18.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_19, "testObject_UserClients_user_19.json"), (Test.Wire.API.Golden.Generated.UserClients_user.testObject_UserClients_user_20, "testObject_UserClients_user_20.json")],
-      testCase ("Golden: ClientType_user") $
+      testCase "Golden: ClientType_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_1, "testObject_ClientType_user_1.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_2, "testObject_ClientType_user_2.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_3, "testObject_ClientType_user_3.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_4, "testObject_ClientType_user_4.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_5, "testObject_ClientType_user_5.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_6, "testObject_ClientType_user_6.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_7, "testObject_ClientType_user_7.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_8, "testObject_ClientType_user_8.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_9, "testObject_ClientType_user_9.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_10, "testObject_ClientType_user_10.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_11, "testObject_ClientType_user_11.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_12, "testObject_ClientType_user_12.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_13, "testObject_ClientType_user_13.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_14, "testObject_ClientType_user_14.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_15, "testObject_ClientType_user_15.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_16, "testObject_ClientType_user_16.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_17, "testObject_ClientType_user_17.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_18, "testObject_ClientType_user_18.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_19, "testObject_ClientType_user_19.json"), (Test.Wire.API.Golden.Generated.ClientType_user.testObject_ClientType_user_20, "testObject_ClientType_user_20.json")],
-      testCase ("Golden: ClientClass_user") $
+      testCase "Golden: ClientClass_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_1, "testObject_ClientClass_user_1.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_2, "testObject_ClientClass_user_2.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_3, "testObject_ClientClass_user_3.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_4, "testObject_ClientClass_user_4.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_5, "testObject_ClientClass_user_5.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_6, "testObject_ClientClass_user_6.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_7, "testObject_ClientClass_user_7.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_8, "testObject_ClientClass_user_8.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_9, "testObject_ClientClass_user_9.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_10, "testObject_ClientClass_user_10.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_11, "testObject_ClientClass_user_11.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_12, "testObject_ClientClass_user_12.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_13, "testObject_ClientClass_user_13.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_14, "testObject_ClientClass_user_14.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_15, "testObject_ClientClass_user_15.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_16, "testObject_ClientClass_user_16.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_17, "testObject_ClientClass_user_17.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_18, "testObject_ClientClass_user_18.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_19, "testObject_ClientClass_user_19.json"), (Test.Wire.API.Golden.Generated.ClientClass_user.testObject_ClientClass_user_20, "testObject_ClientClass_user_20.json")],
-      testCase ("Golden: PubClient_user") $
+      testCase "Golden: PubClient_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_1, "testObject_PubClient_user_1.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_2, "testObject_PubClient_user_2.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_3, "testObject_PubClient_user_3.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_4, "testObject_PubClient_user_4.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_5, "testObject_PubClient_user_5.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_6, "testObject_PubClient_user_6.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_7, "testObject_PubClient_user_7.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_8, "testObject_PubClient_user_8.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_9, "testObject_PubClient_user_9.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_10, "testObject_PubClient_user_10.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_11, "testObject_PubClient_user_11.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_12, "testObject_PubClient_user_12.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_13, "testObject_PubClient_user_13.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_14, "testObject_PubClient_user_14.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_15, "testObject_PubClient_user_15.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_16, "testObject_PubClient_user_16.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_17, "testObject_PubClient_user_17.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_18, "testObject_PubClient_user_18.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_19, "testObject_PubClient_user_19.json"), (Test.Wire.API.Golden.Generated.PubClient_user.testObject_PubClient_user_20, "testObject_PubClient_user_20.json")],
-      testCase ("Golden: Client_user") $
+      testCase "Golden: Client_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_1, "testObject_Client_user_1.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_2, "testObject_Client_user_2.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_3, "testObject_Client_user_3.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_4, "testObject_Client_user_4.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_5, "testObject_Client_user_5.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_6, "testObject_Client_user_6.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_7, "testObject_Client_user_7.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_8, "testObject_Client_user_8.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_9, "testObject_Client_user_9.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_10, "testObject_Client_user_10.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_11, "testObject_Client_user_11.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_12, "testObject_Client_user_12.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_13, "testObject_Client_user_13.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_14, "testObject_Client_user_14.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_15, "testObject_Client_user_15.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_16, "testObject_Client_user_16.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_17, "testObject_Client_user_17.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_18, "testObject_Client_user_18.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_19, "testObject_Client_user_19.json"), (Test.Wire.API.Golden.Generated.Client_user.testObject_Client_user_20, "testObject_Client_user_20.json")],
-      testCase ("Golden: NewClient_user") $
+      testCase "Golden: NewClient_user" $
         testObjects [(Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_1, "testObject_NewClient_user_1.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_2, "testObject_NewClient_user_2.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_3, "testObject_NewClient_user_3.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_4, "testObject_NewClient_user_4.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_5, "testObject_NewClient_user_5.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_6, "testObject_NewClient_user_6.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_7, "testObject_NewClient_user_7.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_8, "testObject_NewClient_user_8.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_9, "testObject_NewClient_user_9.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_10, "testObject_NewClient_user_10.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_11, "testObject_NewClient_user_11.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_12, "testObject_NewClient_user_12.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_13, "testObject_NewClient_user_13.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_14, "testObject_NewClient_user_14.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_15, "testObject_NewClient_user_15.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_16, "testObject_NewClient_user_16.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_17, "testObject_NewClient_user_17.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_18, "testObject_NewClient_user_18.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_19, "testObject_NewClient_user_19.json"), (Test.Wire.API.Golden.Generated.NewClient_user.testObject_NewClient_user_20, "testObject_NewClient_user_20.json")],
-      testCase ("Golden: UpdateClient_user") $
+      testCase "Golden: UpdateClient_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_1, "testObject_UpdateClient_user_1.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_2, "testObject_UpdateClient_user_2.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_3, "testObject_UpdateClient_user_3.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_4, "testObject_UpdateClient_user_4.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_5, "testObject_UpdateClient_user_5.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_6, "testObject_UpdateClient_user_6.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_7, "testObject_UpdateClient_user_7.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_8, "testObject_UpdateClient_user_8.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_9, "testObject_UpdateClient_user_9.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_10, "testObject_UpdateClient_user_10.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_11, "testObject_UpdateClient_user_11.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_12, "testObject_UpdateClient_user_12.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_13, "testObject_UpdateClient_user_13.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_14, "testObject_UpdateClient_user_14.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_15, "testObject_UpdateClient_user_15.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_16, "testObject_UpdateClient_user_16.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_17, "testObject_UpdateClient_user_17.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_18, "testObject_UpdateClient_user_18.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_19, "testObject_UpdateClient_user_19.json"), (Test.Wire.API.Golden.Generated.UpdateClient_user.testObject_UpdateClient_user_20, "testObject_UpdateClient_user_20.json")],
-      testCase ("Golden: RmClient_user") $
+      testCase "Golden: RmClient_user" $
         testObjects [(Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_1, "testObject_RmClient_user_1.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_2, "testObject_RmClient_user_2.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_3, "testObject_RmClient_user_3.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_4, "testObject_RmClient_user_4.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_5, "testObject_RmClient_user_5.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_6, "testObject_RmClient_user_6.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_7, "testObject_RmClient_user_7.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_8, "testObject_RmClient_user_8.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_9, "testObject_RmClient_user_9.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_10, "testObject_RmClient_user_10.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_11, "testObject_RmClient_user_11.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_12, "testObject_RmClient_user_12.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_13, "testObject_RmClient_user_13.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_14, "testObject_RmClient_user_14.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_15, "testObject_RmClient_user_15.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_16, "testObject_RmClient_user_16.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_17, "testObject_RmClient_user_17.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_18, "testObject_RmClient_user_18.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_19, "testObject_RmClient_user_19.json"), (Test.Wire.API.Golden.Generated.RmClient_user.testObject_RmClient_user_20, "testObject_RmClient_user_20.json")],
-      testCase ("Golden: LastPrekey_user") $
+      testCase "Golden: LastPrekey_user" $
         testObjects [(Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_1, "testObject_LastPrekey_user_1.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_2, "testObject_LastPrekey_user_2.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_3, "testObject_LastPrekey_user_3.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_4, "testObject_LastPrekey_user_4.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_5, "testObject_LastPrekey_user_5.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_6, "testObject_LastPrekey_user_6.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_7, "testObject_LastPrekey_user_7.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_8, "testObject_LastPrekey_user_8.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_9, "testObject_LastPrekey_user_9.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_10, "testObject_LastPrekey_user_10.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_11, "testObject_LastPrekey_user_11.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_12, "testObject_LastPrekey_user_12.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_13, "testObject_LastPrekey_user_13.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_14, "testObject_LastPrekey_user_14.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_15, "testObject_LastPrekey_user_15.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_16, "testObject_LastPrekey_user_16.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_17, "testObject_LastPrekey_user_17.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_18, "testObject_LastPrekey_user_18.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_19, "testObject_LastPrekey_user_19.json"), (Test.Wire.API.Golden.Generated.LastPrekey_user.testObject_LastPrekey_user_20, "testObject_LastPrekey_user_20.json")],
-      testCase ("Golden: PrekeyId_user") $
+      testCase "Golden: PrekeyId_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_1, "testObject_PrekeyId_user_1.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_2, "testObject_PrekeyId_user_2.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_3, "testObject_PrekeyId_user_3.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_4, "testObject_PrekeyId_user_4.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_5, "testObject_PrekeyId_user_5.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_6, "testObject_PrekeyId_user_6.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_7, "testObject_PrekeyId_user_7.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_8, "testObject_PrekeyId_user_8.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_9, "testObject_PrekeyId_user_9.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_10, "testObject_PrekeyId_user_10.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_11, "testObject_PrekeyId_user_11.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_12, "testObject_PrekeyId_user_12.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_13, "testObject_PrekeyId_user_13.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_14, "testObject_PrekeyId_user_14.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_15, "testObject_PrekeyId_user_15.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_16, "testObject_PrekeyId_user_16.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_17, "testObject_PrekeyId_user_17.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_18, "testObject_PrekeyId_user_18.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_19, "testObject_PrekeyId_user_19.json"), (Test.Wire.API.Golden.Generated.PrekeyId_user.testObject_PrekeyId_user_20, "testObject_PrekeyId_user_20.json")],
-      testCase ("Golden: Prekey_user") $
+      testCase "Golden: Prekey_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_1, "testObject_Prekey_user_1.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_2, "testObject_Prekey_user_2.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_3, "testObject_Prekey_user_3.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_4, "testObject_Prekey_user_4.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_5, "testObject_Prekey_user_5.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_6, "testObject_Prekey_user_6.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_7, "testObject_Prekey_user_7.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_8, "testObject_Prekey_user_8.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_9, "testObject_Prekey_user_9.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_10, "testObject_Prekey_user_10.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_11, "testObject_Prekey_user_11.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_12, "testObject_Prekey_user_12.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_13, "testObject_Prekey_user_13.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_14, "testObject_Prekey_user_14.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_15, "testObject_Prekey_user_15.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_16, "testObject_Prekey_user_16.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_17, "testObject_Prekey_user_17.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_18, "testObject_Prekey_user_18.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_19, "testObject_Prekey_user_19.json"), (Test.Wire.API.Golden.Generated.Prekey_user.testObject_Prekey_user_20, "testObject_Prekey_user_20.json")],
-      testCase ("Golden: ClientPrekey_user") $
+      testCase "Golden: ClientPrekey_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_1, "testObject_ClientPrekey_user_1.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_2, "testObject_ClientPrekey_user_2.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_3, "testObject_ClientPrekey_user_3.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_4, "testObject_ClientPrekey_user_4.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_5, "testObject_ClientPrekey_user_5.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_6, "testObject_ClientPrekey_user_6.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_7, "testObject_ClientPrekey_user_7.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_8, "testObject_ClientPrekey_user_8.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_9, "testObject_ClientPrekey_user_9.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_10, "testObject_ClientPrekey_user_10.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_11, "testObject_ClientPrekey_user_11.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_12, "testObject_ClientPrekey_user_12.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_13, "testObject_ClientPrekey_user_13.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_14, "testObject_ClientPrekey_user_14.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_15, "testObject_ClientPrekey_user_15.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_16, "testObject_ClientPrekey_user_16.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_17, "testObject_ClientPrekey_user_17.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_18, "testObject_ClientPrekey_user_18.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_19, "testObject_ClientPrekey_user_19.json"), (Test.Wire.API.Golden.Generated.ClientPrekey_user.testObject_ClientPrekey_user_20, "testObject_ClientPrekey_user_20.json")],
-      testCase ("Golden: PrekeyBundle_user") $
+      testCase "Golden: PrekeyBundle_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_1, "testObject_PrekeyBundle_user_1.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_2, "testObject_PrekeyBundle_user_2.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_3, "testObject_PrekeyBundle_user_3.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_4, "testObject_PrekeyBundle_user_4.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_5, "testObject_PrekeyBundle_user_5.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_6, "testObject_PrekeyBundle_user_6.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_7, "testObject_PrekeyBundle_user_7.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_8, "testObject_PrekeyBundle_user_8.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_9, "testObject_PrekeyBundle_user_9.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_10, "testObject_PrekeyBundle_user_10.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_11, "testObject_PrekeyBundle_user_11.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_12, "testObject_PrekeyBundle_user_12.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_13, "testObject_PrekeyBundle_user_13.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_14, "testObject_PrekeyBundle_user_14.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_15, "testObject_PrekeyBundle_user_15.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_16, "testObject_PrekeyBundle_user_16.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_17, "testObject_PrekeyBundle_user_17.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_18, "testObject_PrekeyBundle_user_18.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_19, "testObject_PrekeyBundle_user_19.json"), (Test.Wire.API.Golden.Generated.PrekeyBundle_user.testObject_PrekeyBundle_user_20, "testObject_PrekeyBundle_user_20.json")],
-      testCase ("Golden: UserHandleInfo_user") $
+      testCase "Golden: UserHandleInfo_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_1, "testObject_UserHandleInfo_user_1.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_2, "testObject_UserHandleInfo_user_2.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_3, "testObject_UserHandleInfo_user_3.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_4, "testObject_UserHandleInfo_user_4.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_5, "testObject_UserHandleInfo_user_5.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_6, "testObject_UserHandleInfo_user_6.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_7, "testObject_UserHandleInfo_user_7.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_8, "testObject_UserHandleInfo_user_8.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_9, "testObject_UserHandleInfo_user_9.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_10, "testObject_UserHandleInfo_user_10.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_11, "testObject_UserHandleInfo_user_11.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_12, "testObject_UserHandleInfo_user_12.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_13, "testObject_UserHandleInfo_user_13.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_14, "testObject_UserHandleInfo_user_14.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_15, "testObject_UserHandleInfo_user_15.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_16, "testObject_UserHandleInfo_user_16.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_17, "testObject_UserHandleInfo_user_17.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_18, "testObject_UserHandleInfo_user_18.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_19, "testObject_UserHandleInfo_user_19.json"), (Test.Wire.API.Golden.Generated.UserHandleInfo_user.testObject_UserHandleInfo_user_20, "testObject_UserHandleInfo_user_20.json")],
-      testCase ("Golden: CheckHandles_user") $
+      testCase "Golden: CheckHandles_user" $
         testObjects [(Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_1, "testObject_CheckHandles_user_1.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_2, "testObject_CheckHandles_user_2.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_3, "testObject_CheckHandles_user_3.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_4, "testObject_CheckHandles_user_4.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_5, "testObject_CheckHandles_user_5.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_6, "testObject_CheckHandles_user_6.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_7, "testObject_CheckHandles_user_7.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_8, "testObject_CheckHandles_user_8.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_9, "testObject_CheckHandles_user_9.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_10, "testObject_CheckHandles_user_10.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_11, "testObject_CheckHandles_user_11.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_12, "testObject_CheckHandles_user_12.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_13, "testObject_CheckHandles_user_13.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_14, "testObject_CheckHandles_user_14.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_15, "testObject_CheckHandles_user_15.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_16, "testObject_CheckHandles_user_16.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_17, "testObject_CheckHandles_user_17.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_18, "testObject_CheckHandles_user_18.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_19, "testObject_CheckHandles_user_19.json"), (Test.Wire.API.Golden.Generated.CheckHandles_user.testObject_CheckHandles_user_20, "testObject_CheckHandles_user_20.json")],
-      testCase ("Golden: Email_user") $
+      testCase "Golden: Email_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_1, "testObject_Email_user_1.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_2, "testObject_Email_user_2.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_3, "testObject_Email_user_3.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_4, "testObject_Email_user_4.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_5, "testObject_Email_user_5.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_6, "testObject_Email_user_6.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_7, "testObject_Email_user_7.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_8, "testObject_Email_user_8.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_9, "testObject_Email_user_9.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_10, "testObject_Email_user_10.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_11, "testObject_Email_user_11.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_12, "testObject_Email_user_12.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_13, "testObject_Email_user_13.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_14, "testObject_Email_user_14.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_15, "testObject_Email_user_15.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_16, "testObject_Email_user_16.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_17, "testObject_Email_user_17.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_18, "testObject_Email_user_18.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_19, "testObject_Email_user_19.json"), (Test.Wire.API.Golden.Generated.Email_user.testObject_Email_user_20, "testObject_Email_user_20.json")],
-      testCase ("Golden: Phone_user") $
+      testCase "Golden: Phone_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_1, "testObject_Phone_user_1.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_2, "testObject_Phone_user_2.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_3, "testObject_Phone_user_3.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_4, "testObject_Phone_user_4.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_5, "testObject_Phone_user_5.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_6, "testObject_Phone_user_6.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_7, "testObject_Phone_user_7.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_8, "testObject_Phone_user_8.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_9, "testObject_Phone_user_9.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_10, "testObject_Phone_user_10.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_11, "testObject_Phone_user_11.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_12, "testObject_Phone_user_12.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_13, "testObject_Phone_user_13.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_14, "testObject_Phone_user_14.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_15, "testObject_Phone_user_15.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_16, "testObject_Phone_user_16.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_17, "testObject_Phone_user_17.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_18, "testObject_Phone_user_18.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_19, "testObject_Phone_user_19.json"), (Test.Wire.API.Golden.Generated.Phone_user.testObject_Phone_user_20, "testObject_Phone_user_20.json")],
-      testCase ("Golden: UserSSOId_user") $
+      testCase "Golden: UserSSOId_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_1, "testObject_UserSSOId_user_1.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_2, "testObject_UserSSOId_user_2.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_3, "testObject_UserSSOId_user_3.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_4, "testObject_UserSSOId_user_4.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_5, "testObject_UserSSOId_user_5.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_6, "testObject_UserSSOId_user_6.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_7, "testObject_UserSSOId_user_7.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_8, "testObject_UserSSOId_user_8.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_9, "testObject_UserSSOId_user_9.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_10, "testObject_UserSSOId_user_10.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_11, "testObject_UserSSOId_user_11.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_12, "testObject_UserSSOId_user_12.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_13, "testObject_UserSSOId_user_13.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_14, "testObject_UserSSOId_user_14.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_15, "testObject_UserSSOId_user_15.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_16, "testObject_UserSSOId_user_16.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_17, "testObject_UserSSOId_user_17.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_18, "testObject_UserSSOId_user_18.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_19, "testObject_UserSSOId_user_19.json"), (Test.Wire.API.Golden.Generated.UserSSOId_user.testObject_UserSSOId_user_20, "testObject_UserSSOId_user_20.json")],
-      testCase ("Golden: UserIdentity_user") $
+      testCase "Golden: UserIdentity_user" $
         testObjects [(Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_1, "testObject_UserIdentity_user_1.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_2, "testObject_UserIdentity_user_2.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_3, "testObject_UserIdentity_user_3.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_4, "testObject_UserIdentity_user_4.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_5, "testObject_UserIdentity_user_5.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_6, "testObject_UserIdentity_user_6.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_7, "testObject_UserIdentity_user_7.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_8, "testObject_UserIdentity_user_8.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_9, "testObject_UserIdentity_user_9.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_10, "testObject_UserIdentity_user_10.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_11, "testObject_UserIdentity_user_11.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_12, "testObject_UserIdentity_user_12.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_13, "testObject_UserIdentity_user_13.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_14, "testObject_UserIdentity_user_14.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_15, "testObject_UserIdentity_user_15.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_16, "testObject_UserIdentity_user_16.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_17, "testObject_UserIdentity_user_17.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_18, "testObject_UserIdentity_user_18.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_19, "testObject_UserIdentity_user_19.json"), (Test.Wire.API.Golden.Generated.UserIdentity_user.testObject_UserIdentity_user_20, "testObject_UserIdentity_user_20.json")],
-      testCase ("Golden: NewPasswordReset_user") $
+      testCase "Golden: NewPasswordReset_user" $
         testObjects [(Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_1, "testObject_NewPasswordReset_user_1.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_2, "testObject_NewPasswordReset_user_2.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_3, "testObject_NewPasswordReset_user_3.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_4, "testObject_NewPasswordReset_user_4.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_5, "testObject_NewPasswordReset_user_5.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_6, "testObject_NewPasswordReset_user_6.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_7, "testObject_NewPasswordReset_user_7.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_8, "testObject_NewPasswordReset_user_8.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_9, "testObject_NewPasswordReset_user_9.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_10, "testObject_NewPasswordReset_user_10.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_11, "testObject_NewPasswordReset_user_11.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_12, "testObject_NewPasswordReset_user_12.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_13, "testObject_NewPasswordReset_user_13.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_14, "testObject_NewPasswordReset_user_14.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_15, "testObject_NewPasswordReset_user_15.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_16, "testObject_NewPasswordReset_user_16.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_17, "testObject_NewPasswordReset_user_17.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_18, "testObject_NewPasswordReset_user_18.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_19, "testObject_NewPasswordReset_user_19.json"), (Test.Wire.API.Golden.Generated.NewPasswordReset_user.testObject_NewPasswordReset_user_20, "testObject_NewPasswordReset_user_20.json")],
-      testCase ("Golden: PasswordResetKey_user") $
+      testCase "Golden: PasswordResetKey_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_1, "testObject_PasswordResetKey_user_1.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_2, "testObject_PasswordResetKey_user_2.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_3, "testObject_PasswordResetKey_user_3.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_4, "testObject_PasswordResetKey_user_4.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_5, "testObject_PasswordResetKey_user_5.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_6, "testObject_PasswordResetKey_user_6.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_7, "testObject_PasswordResetKey_user_7.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_8, "testObject_PasswordResetKey_user_8.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_9, "testObject_PasswordResetKey_user_9.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_10, "testObject_PasswordResetKey_user_10.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_11, "testObject_PasswordResetKey_user_11.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_12, "testObject_PasswordResetKey_user_12.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_13, "testObject_PasswordResetKey_user_13.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_14, "testObject_PasswordResetKey_user_14.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_15, "testObject_PasswordResetKey_user_15.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_16, "testObject_PasswordResetKey_user_16.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_17, "testObject_PasswordResetKey_user_17.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_18, "testObject_PasswordResetKey_user_18.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_19, "testObject_PasswordResetKey_user_19.json"), (Test.Wire.API.Golden.Generated.PasswordResetKey_user.testObject_PasswordResetKey_user_20, "testObject_PasswordResetKey_user_20.json")],
-      testCase ("Golden: PasswordResetCode_user") $
+      testCase "Golden: PasswordResetCode_user" $
         testObjects [(Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_1, "testObject_PasswordResetCode_user_1.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_2, "testObject_PasswordResetCode_user_2.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_3, "testObject_PasswordResetCode_user_3.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_4, "testObject_PasswordResetCode_user_4.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_5, "testObject_PasswordResetCode_user_5.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_6, "testObject_PasswordResetCode_user_6.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_7, "testObject_PasswordResetCode_user_7.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_8, "testObject_PasswordResetCode_user_8.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_9, "testObject_PasswordResetCode_user_9.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_10, "testObject_PasswordResetCode_user_10.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_11, "testObject_PasswordResetCode_user_11.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_12, "testObject_PasswordResetCode_user_12.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_13, "testObject_PasswordResetCode_user_13.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_14, "testObject_PasswordResetCode_user_14.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_15, "testObject_PasswordResetCode_user_15.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_16, "testObject_PasswordResetCode_user_16.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_17, "testObject_PasswordResetCode_user_17.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_18, "testObject_PasswordResetCode_user_18.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_19, "testObject_PasswordResetCode_user_19.json"), (Test.Wire.API.Golden.Generated.PasswordResetCode_user.testObject_PasswordResetCode_user_20, "testObject_PasswordResetCode_user_20.json")],
-      testCase ("Golden: CompletePasswordReset_user") $
+      testCase "Golden: CompletePasswordReset_user" $
         testObjects [(Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_1, "testObject_CompletePasswordReset_user_1.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_2, "testObject_CompletePasswordReset_user_2.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_3, "testObject_CompletePasswordReset_user_3.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_4, "testObject_CompletePasswordReset_user_4.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_5, "testObject_CompletePasswordReset_user_5.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_6, "testObject_CompletePasswordReset_user_6.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_7, "testObject_CompletePasswordReset_user_7.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_8, "testObject_CompletePasswordReset_user_8.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_9, "testObject_CompletePasswordReset_user_9.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_10, "testObject_CompletePasswordReset_user_10.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_11, "testObject_CompletePasswordReset_user_11.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_12, "testObject_CompletePasswordReset_user_12.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_13, "testObject_CompletePasswordReset_user_13.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_14, "testObject_CompletePasswordReset_user_14.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_15, "testObject_CompletePasswordReset_user_15.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_16, "testObject_CompletePasswordReset_user_16.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_17, "testObject_CompletePasswordReset_user_17.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_18, "testObject_CompletePasswordReset_user_18.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_19, "testObject_CompletePasswordReset_user_19.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_user.testObject_CompletePasswordReset_user_20, "testObject_CompletePasswordReset_user_20.json")],
-      testCase ("Golden: Pict_user") $
+      testCase "Golden: Pict_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_1, "testObject_Pict_user_1.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_2, "testObject_Pict_user_2.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_3, "testObject_Pict_user_3.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_4, "testObject_Pict_user_4.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_5, "testObject_Pict_user_5.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_6, "testObject_Pict_user_6.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_7, "testObject_Pict_user_7.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_8, "testObject_Pict_user_8.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_9, "testObject_Pict_user_9.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_10, "testObject_Pict_user_10.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_11, "testObject_Pict_user_11.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_12, "testObject_Pict_user_12.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_13, "testObject_Pict_user_13.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_14, "testObject_Pict_user_14.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_15, "testObject_Pict_user_15.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_16, "testObject_Pict_user_16.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_17, "testObject_Pict_user_17.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_18, "testObject_Pict_user_18.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_19, "testObject_Pict_user_19.json"), (Test.Wire.API.Golden.Generated.Pict_user.testObject_Pict_user_20, "testObject_Pict_user_20.json")],
-      testCase ("Golden: Name_user") $
+      testCase "Golden: Name_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_1, "testObject_Name_user_1.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_2, "testObject_Name_user_2.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_3, "testObject_Name_user_3.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_4, "testObject_Name_user_4.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_5, "testObject_Name_user_5.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_6, "testObject_Name_user_6.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_7, "testObject_Name_user_7.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_8, "testObject_Name_user_8.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_9, "testObject_Name_user_9.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_10, "testObject_Name_user_10.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_11, "testObject_Name_user_11.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_12, "testObject_Name_user_12.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_13, "testObject_Name_user_13.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_14, "testObject_Name_user_14.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_15, "testObject_Name_user_15.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_16, "testObject_Name_user_16.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_17, "testObject_Name_user_17.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_18, "testObject_Name_user_18.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_19, "testObject_Name_user_19.json"), (Test.Wire.API.Golden.Generated.Name_user.testObject_Name_user_20, "testObject_Name_user_20.json")],
-      testCase ("Golden: ColourId_user") $
+      testCase "Golden: ColourId_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_1, "testObject_ColourId_user_1.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_2, "testObject_ColourId_user_2.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_3, "testObject_ColourId_user_3.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_4, "testObject_ColourId_user_4.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_5, "testObject_ColourId_user_5.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_6, "testObject_ColourId_user_6.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_7, "testObject_ColourId_user_7.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_8, "testObject_ColourId_user_8.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_9, "testObject_ColourId_user_9.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_10, "testObject_ColourId_user_10.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_11, "testObject_ColourId_user_11.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_12, "testObject_ColourId_user_12.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_13, "testObject_ColourId_user_13.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_14, "testObject_ColourId_user_14.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_15, "testObject_ColourId_user_15.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_16, "testObject_ColourId_user_16.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_17, "testObject_ColourId_user_17.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_18, "testObject_ColourId_user_18.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_19, "testObject_ColourId_user_19.json"), (Test.Wire.API.Golden.Generated.ColourId_user.testObject_ColourId_user_20, "testObject_ColourId_user_20.json")],
-      testCase ("Golden: AssetSize_user") $
+      testCase "Golden: AssetSize_user" $
         testObjects [(Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_1, "testObject_AssetSize_user_1.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_2, "testObject_AssetSize_user_2.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_3, "testObject_AssetSize_user_3.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_4, "testObject_AssetSize_user_4.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_5, "testObject_AssetSize_user_5.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_6, "testObject_AssetSize_user_6.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_7, "testObject_AssetSize_user_7.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_8, "testObject_AssetSize_user_8.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_9, "testObject_AssetSize_user_9.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_10, "testObject_AssetSize_user_10.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_11, "testObject_AssetSize_user_11.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_12, "testObject_AssetSize_user_12.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_13, "testObject_AssetSize_user_13.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_14, "testObject_AssetSize_user_14.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_15, "testObject_AssetSize_user_15.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_16, "testObject_AssetSize_user_16.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_17, "testObject_AssetSize_user_17.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_18, "testObject_AssetSize_user_18.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_19, "testObject_AssetSize_user_19.json"), (Test.Wire.API.Golden.Generated.AssetSize_user.testObject_AssetSize_user_20, "testObject_AssetSize_user_20.json")],
-      testCase ("Golden: User_2eProfile_2eAsset_user") $
+      testCase "Golden: User_2eProfile_2eAsset_user" $
         testObjects [(Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_1, "testObject_User_2eProfile_2eAsset_user_1.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_2, "testObject_User_2eProfile_2eAsset_user_2.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_3, "testObject_User_2eProfile_2eAsset_user_3.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_4, "testObject_User_2eProfile_2eAsset_user_4.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_5, "testObject_User_2eProfile_2eAsset_user_5.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_6, "testObject_User_2eProfile_2eAsset_user_6.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_7, "testObject_User_2eProfile_2eAsset_user_7.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_8, "testObject_User_2eProfile_2eAsset_user_8.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_9, "testObject_User_2eProfile_2eAsset_user_9.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_10, "testObject_User_2eProfile_2eAsset_user_10.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_11, "testObject_User_2eProfile_2eAsset_user_11.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_12, "testObject_User_2eProfile_2eAsset_user_12.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_13, "testObject_User_2eProfile_2eAsset_user_13.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_14, "testObject_User_2eProfile_2eAsset_user_14.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_15, "testObject_User_2eProfile_2eAsset_user_15.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_16, "testObject_User_2eProfile_2eAsset_user_16.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_17, "testObject_User_2eProfile_2eAsset_user_17.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_18, "testObject_User_2eProfile_2eAsset_user_18.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_19, "testObject_User_2eProfile_2eAsset_user_19.json"), (Test.Wire.API.Golden.Generated.User_2eProfile_2eAsset_user.testObject_User_2eProfile_2eAsset_user_20, "testObject_User_2eProfile_2eAsset_user_20.json")],
-      testCase ("Golden: Locale_user") $
+      testCase "Golden: Locale_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_1, "testObject_Locale_user_1.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_2, "testObject_Locale_user_2.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_3, "testObject_Locale_user_3.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_4, "testObject_Locale_user_4.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_5, "testObject_Locale_user_5.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_6, "testObject_Locale_user_6.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_7, "testObject_Locale_user_7.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_8, "testObject_Locale_user_8.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_9, "testObject_Locale_user_9.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_10, "testObject_Locale_user_10.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_11, "testObject_Locale_user_11.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_12, "testObject_Locale_user_12.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_13, "testObject_Locale_user_13.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_14, "testObject_Locale_user_14.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_15, "testObject_Locale_user_15.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_16, "testObject_Locale_user_16.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_17, "testObject_Locale_user_17.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_18, "testObject_Locale_user_18.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_19, "testObject_Locale_user_19.json"), (Test.Wire.API.Golden.Generated.Locale_user.testObject_Locale_user_20, "testObject_Locale_user_20.json")],
-      testCase ("Golden: ManagedBy_user") $
+      testCase "Golden: ManagedBy_user" $
         testObjects [(Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_1, "testObject_ManagedBy_user_1.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_2, "testObject_ManagedBy_user_2.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_3, "testObject_ManagedBy_user_3.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_4, "testObject_ManagedBy_user_4.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_5, "testObject_ManagedBy_user_5.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_6, "testObject_ManagedBy_user_6.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_7, "testObject_ManagedBy_user_7.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_8, "testObject_ManagedBy_user_8.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_9, "testObject_ManagedBy_user_9.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_10, "testObject_ManagedBy_user_10.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_11, "testObject_ManagedBy_user_11.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_12, "testObject_ManagedBy_user_12.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_13, "testObject_ManagedBy_user_13.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_14, "testObject_ManagedBy_user_14.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_15, "testObject_ManagedBy_user_15.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_16, "testObject_ManagedBy_user_16.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_17, "testObject_ManagedBy_user_17.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_18, "testObject_ManagedBy_user_18.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_19, "testObject_ManagedBy_user_19.json"), (Test.Wire.API.Golden.Generated.ManagedBy_user.testObject_ManagedBy_user_20, "testObject_ManagedBy_user_20.json")],
-      testCase ("Golden: RichField_user") $
+      testCase "Golden: RichField_user" $
         testObjects [(Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_1, "testObject_RichField_user_1.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_2, "testObject_RichField_user_2.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_3, "testObject_RichField_user_3.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_4, "testObject_RichField_user_4.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_5, "testObject_RichField_user_5.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_6, "testObject_RichField_user_6.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_7, "testObject_RichField_user_7.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_8, "testObject_RichField_user_8.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_9, "testObject_RichField_user_9.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_10, "testObject_RichField_user_10.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_11, "testObject_RichField_user_11.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_12, "testObject_RichField_user_12.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_13, "testObject_RichField_user_13.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_14, "testObject_RichField_user_14.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_15, "testObject_RichField_user_15.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_16, "testObject_RichField_user_16.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_17, "testObject_RichField_user_17.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_18, "testObject_RichField_user_18.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_19, "testObject_RichField_user_19.json"), (Test.Wire.API.Golden.Generated.RichField_user.testObject_RichField_user_20, "testObject_RichField_user_20.json")],
-      testCase ("Golden: RichInfoAssocList_user") $
+      testCase "Golden: RichInfoAssocList_user" $
         testObjects [(Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_1, "testObject_RichInfoAssocList_user_1.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_2, "testObject_RichInfoAssocList_user_2.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_3, "testObject_RichInfoAssocList_user_3.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_4, "testObject_RichInfoAssocList_user_4.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_5, "testObject_RichInfoAssocList_user_5.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_6, "testObject_RichInfoAssocList_user_6.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_7, "testObject_RichInfoAssocList_user_7.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_8, "testObject_RichInfoAssocList_user_8.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_9, "testObject_RichInfoAssocList_user_9.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_10, "testObject_RichInfoAssocList_user_10.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_11, "testObject_RichInfoAssocList_user_11.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_12, "testObject_RichInfoAssocList_user_12.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_13, "testObject_RichInfoAssocList_user_13.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_14, "testObject_RichInfoAssocList_user_14.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_15, "testObject_RichInfoAssocList_user_15.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_16, "testObject_RichInfoAssocList_user_16.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_17, "testObject_RichInfoAssocList_user_17.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_18, "testObject_RichInfoAssocList_user_18.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_19, "testObject_RichInfoAssocList_user_19.json"), (Test.Wire.API.Golden.Generated.RichInfoAssocList_user.testObject_RichInfoAssocList_user_20, "testObject_RichInfoAssocList_user_20.json")],
-      testCase ("Golden: RichInfoMapAndList_user") $
+      testCase "Golden: RichInfoMapAndList_user" $
         testObjects [(Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_1, "testObject_RichInfoMapAndList_user_1.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_2, "testObject_RichInfoMapAndList_user_2.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_3, "testObject_RichInfoMapAndList_user_3.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_4, "testObject_RichInfoMapAndList_user_4.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_5, "testObject_RichInfoMapAndList_user_5.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_6, "testObject_RichInfoMapAndList_user_6.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_7, "testObject_RichInfoMapAndList_user_7.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_8, "testObject_RichInfoMapAndList_user_8.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_9, "testObject_RichInfoMapAndList_user_9.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_10, "testObject_RichInfoMapAndList_user_10.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_11, "testObject_RichInfoMapAndList_user_11.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_12, "testObject_RichInfoMapAndList_user_12.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_13, "testObject_RichInfoMapAndList_user_13.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_14, "testObject_RichInfoMapAndList_user_14.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_15, "testObject_RichInfoMapAndList_user_15.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_16, "testObject_RichInfoMapAndList_user_16.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_17, "testObject_RichInfoMapAndList_user_17.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_18, "testObject_RichInfoMapAndList_user_18.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_19, "testObject_RichInfoMapAndList_user_19.json"), (Test.Wire.API.Golden.Generated.RichInfoMapAndList_user.testObject_RichInfoMapAndList_user_20, "testObject_RichInfoMapAndList_user_20.json")],
-      testCase ("Golden: RichInfo_user") $
+      testCase "Golden: RichInfo_user" $
         testObjects [(Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_1, "testObject_RichInfo_user_1.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_2, "testObject_RichInfo_user_2.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_3, "testObject_RichInfo_user_3.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_4, "testObject_RichInfo_user_4.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_5, "testObject_RichInfo_user_5.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_6, "testObject_RichInfo_user_6.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_7, "testObject_RichInfo_user_7.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_8, "testObject_RichInfo_user_8.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_9, "testObject_RichInfo_user_9.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_10, "testObject_RichInfo_user_10.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_11, "testObject_RichInfo_user_11.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_12, "testObject_RichInfo_user_12.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_13, "testObject_RichInfo_user_13.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_14, "testObject_RichInfo_user_14.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_15, "testObject_RichInfo_user_15.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_16, "testObject_RichInfo_user_16.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_17, "testObject_RichInfo_user_17.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_18, "testObject_RichInfo_user_18.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_19, "testObject_RichInfo_user_19.json"), (Test.Wire.API.Golden.Generated.RichInfo_user.testObject_RichInfo_user_20, "testObject_RichInfo_user_20.json")],
-      testCase ("Golden: SearchResult_20Contact_user") $
+      testCase "Golden: SearchResult_20Contact_user" $
         testObjects [(Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_1, "testObject_SearchResult_20Contact_user_1.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_2, "testObject_SearchResult_20Contact_user_2.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_3, "testObject_SearchResult_20Contact_user_3.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_4, "testObject_SearchResult_20Contact_user_4.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_5, "testObject_SearchResult_20Contact_user_5.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_6, "testObject_SearchResult_20Contact_user_6.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_7, "testObject_SearchResult_20Contact_user_7.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_8, "testObject_SearchResult_20Contact_user_8.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_9, "testObject_SearchResult_20Contact_user_9.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_10, "testObject_SearchResult_20Contact_user_10.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_11, "testObject_SearchResult_20Contact_user_11.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_12, "testObject_SearchResult_20Contact_user_12.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_13, "testObject_SearchResult_20Contact_user_13.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_14, "testObject_SearchResult_20Contact_user_14.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_15, "testObject_SearchResult_20Contact_user_15.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_16, "testObject_SearchResult_20Contact_user_16.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_17, "testObject_SearchResult_20Contact_user_17.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_18, "testObject_SearchResult_20Contact_user_18.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_19, "testObject_SearchResult_20Contact_user_19.json"), (Test.Wire.API.Golden.Generated.SearchResult_20Contact_user.testObject_SearchResult_20Contact_user_20, "testObject_SearchResult_20Contact_user_20.json")],
-      testCase ("Golden: Contact_user") $
+      testCase "Golden: Contact_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_1, "testObject_Contact_user_1.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_2, "testObject_Contact_user_2.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_3, "testObject_Contact_user_3.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_4, "testObject_Contact_user_4.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_5, "testObject_Contact_user_5.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_6, "testObject_Contact_user_6.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_7, "testObject_Contact_user_7.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_8, "testObject_Contact_user_8.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_9, "testObject_Contact_user_9.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_10, "testObject_Contact_user_10.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_11, "testObject_Contact_user_11.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_12, "testObject_Contact_user_12.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_13, "testObject_Contact_user_13.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_14, "testObject_Contact_user_14.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_15, "testObject_Contact_user_15.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_16, "testObject_Contact_user_16.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_17, "testObject_Contact_user_17.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_18, "testObject_Contact_user_18.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_19, "testObject_Contact_user_19.json"), (Test.Wire.API.Golden.Generated.Contact_user.testObject_Contact_user_20, "testObject_Contact_user_20.json")],
-      testCase ("Golden: SearchResult_20TeamContact_user") $
+      testCase "Golden: SearchResult_20TeamContact_user" $
         testObjects [(Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_1, "testObject_SearchResult_20TeamContact_user_1.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_2, "testObject_SearchResult_20TeamContact_user_2.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_3, "testObject_SearchResult_20TeamContact_user_3.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_4, "testObject_SearchResult_20TeamContact_user_4.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_5, "testObject_SearchResult_20TeamContact_user_5.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_6, "testObject_SearchResult_20TeamContact_user_6.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_7, "testObject_SearchResult_20TeamContact_user_7.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_8, "testObject_SearchResult_20TeamContact_user_8.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_9, "testObject_SearchResult_20TeamContact_user_9.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_10, "testObject_SearchResult_20TeamContact_user_10.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_11, "testObject_SearchResult_20TeamContact_user_11.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_12, "testObject_SearchResult_20TeamContact_user_12.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_13, "testObject_SearchResult_20TeamContact_user_13.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_14, "testObject_SearchResult_20TeamContact_user_14.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_15, "testObject_SearchResult_20TeamContact_user_15.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_16, "testObject_SearchResult_20TeamContact_user_16.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_17, "testObject_SearchResult_20TeamContact_user_17.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_18, "testObject_SearchResult_20TeamContact_user_18.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_19, "testObject_SearchResult_20TeamContact_user_19.json"), (Test.Wire.API.Golden.Generated.SearchResult_20TeamContact_user.testObject_SearchResult_20TeamContact_user_20, "testObject_SearchResult_20TeamContact_user_20.json")],
-      testCase ("Golden: TeamContact_user") $
+      testCase "Golden: TeamContact_user" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_1, "testObject_TeamContact_user_1.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_2, "testObject_TeamContact_user_2.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_3, "testObject_TeamContact_user_3.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_4, "testObject_TeamContact_user_4.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_5, "testObject_TeamContact_user_5.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_6, "testObject_TeamContact_user_6.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_7, "testObject_TeamContact_user_7.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_8, "testObject_TeamContact_user_8.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_9, "testObject_TeamContact_user_9.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_10, "testObject_TeamContact_user_10.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_11, "testObject_TeamContact_user_11.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_12, "testObject_TeamContact_user_12.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_13, "testObject_TeamContact_user_13.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_14, "testObject_TeamContact_user_14.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_15, "testObject_TeamContact_user_15.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_16, "testObject_TeamContact_user_16.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_17, "testObject_TeamContact_user_17.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_18, "testObject_TeamContact_user_18.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_19, "testObject_TeamContact_user_19.json"), (Test.Wire.API.Golden.Generated.TeamContact_user.testObject_TeamContact_user_20, "testObject_TeamContact_user_20.json")],
-      testCase ("Golden: Wrapped_20_22some_5fint_22_20Int_user") $
+      testCase "Golden: Wrapped_20_22some_5fint_22_20Int_user" $
         testObjects [(Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_1, "testObject_Wrapped_20_22some_5fint_22_20Int_user_1.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_2, "testObject_Wrapped_20_22some_5fint_22_20Int_user_2.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_3, "testObject_Wrapped_20_22some_5fint_22_20Int_user_3.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_4, "testObject_Wrapped_20_22some_5fint_22_20Int_user_4.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_5, "testObject_Wrapped_20_22some_5fint_22_20Int_user_5.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_6, "testObject_Wrapped_20_22some_5fint_22_20Int_user_6.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_7, "testObject_Wrapped_20_22some_5fint_22_20Int_user_7.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_8, "testObject_Wrapped_20_22some_5fint_22_20Int_user_8.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_9, "testObject_Wrapped_20_22some_5fint_22_20Int_user_9.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_10, "testObject_Wrapped_20_22some_5fint_22_20Int_user_10.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_11, "testObject_Wrapped_20_22some_5fint_22_20Int_user_11.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_12, "testObject_Wrapped_20_22some_5fint_22_20Int_user_12.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_13, "testObject_Wrapped_20_22some_5fint_22_20Int_user_13.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_14, "testObject_Wrapped_20_22some_5fint_22_20Int_user_14.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_15, "testObject_Wrapped_20_22some_5fint_22_20Int_user_15.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_16, "testObject_Wrapped_20_22some_5fint_22_20Int_user_16.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_17, "testObject_Wrapped_20_22some_5fint_22_20Int_user_17.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_18, "testObject_Wrapped_20_22some_5fint_22_20Int_user_18.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_19, "testObject_Wrapped_20_22some_5fint_22_20Int_user_19.json"), (Test.Wire.API.Golden.Generated.Wrapped_20_22some_5fint_22_20Int_user.testObject_Wrapped_20_22some_5fint_22_20Int_user_20, "testObject_Wrapped_20_22some_5fint_22_20Int_user_20.json")],
-      testCase ("Golden: Asset_asset") $
+      testCase "Golden: Asset_asset" $
         testObjects [(Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_1, "testObject_Asset_asset_1.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_2, "testObject_Asset_asset_2.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_3, "testObject_Asset_asset_3.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_4, "testObject_Asset_asset_4.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_5, "testObject_Asset_asset_5.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_6, "testObject_Asset_asset_6.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_7, "testObject_Asset_asset_7.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_8, "testObject_Asset_asset_8.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_9, "testObject_Asset_asset_9.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_10, "testObject_Asset_asset_10.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_11, "testObject_Asset_asset_11.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_12, "testObject_Asset_asset_12.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_13, "testObject_Asset_asset_13.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_14, "testObject_Asset_asset_14.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_15, "testObject_Asset_asset_15.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_16, "testObject_Asset_asset_16.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_17, "testObject_Asset_asset_17.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_18, "testObject_Asset_asset_18.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_19, "testObject_Asset_asset_19.json"), (Test.Wire.API.Golden.Generated.Asset_asset.testObject_Asset_asset_20, "testObject_Asset_asset_20.json")],
-      testCase ("Golden: Event_team") $
+      testCase "Golden: Event_team" $
         testObjects [(Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_1, "testObject_Event_team_1.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_2, "testObject_Event_team_2.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_3, "testObject_Event_team_3.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_4, "testObject_Event_team_4.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_5, "testObject_Event_team_5.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_6, "testObject_Event_team_6.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_7, "testObject_Event_team_7.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_8, "testObject_Event_team_8.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_9, "testObject_Event_team_9.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_10, "testObject_Event_team_10.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_11, "testObject_Event_team_11.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_12, "testObject_Event_team_12.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_13, "testObject_Event_team_13.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_14, "testObject_Event_team_14.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_15, "testObject_Event_team_15.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_16, "testObject_Event_team_16.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_17, "testObject_Event_team_17.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_18, "testObject_Event_team_18.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_19, "testObject_Event_team_19.json"), (Test.Wire.API.Golden.Generated.Event_team.testObject_Event_team_20, "testObject_Event_team_20.json")],
-      testCase ("Golden: EventType_team") $
+      testCase "Golden: EventType_team" $
         testObjects [(Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_1, "testObject_EventType_team_1.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_2, "testObject_EventType_team_2.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_3, "testObject_EventType_team_3.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_4, "testObject_EventType_team_4.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_5, "testObject_EventType_team_5.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_6, "testObject_EventType_team_6.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_7, "testObject_EventType_team_7.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_8, "testObject_EventType_team_8.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_9, "testObject_EventType_team_9.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_10, "testObject_EventType_team_10.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_11, "testObject_EventType_team_11.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_12, "testObject_EventType_team_12.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_13, "testObject_EventType_team_13.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_14, "testObject_EventType_team_14.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_15, "testObject_EventType_team_15.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_16, "testObject_EventType_team_16.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_17, "testObject_EventType_team_17.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_18, "testObject_EventType_team_18.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_19, "testObject_EventType_team_19.json"), (Test.Wire.API.Golden.Generated.EventType_team.testObject_EventType_team_20, "testObject_EventType_team_20.json")],
-      testCase ("Golden: Provider_provider") $
+      testCase "Golden: Provider_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_1, "testObject_Provider_provider_1.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_2, "testObject_Provider_provider_2.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_3, "testObject_Provider_provider_3.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_4, "testObject_Provider_provider_4.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_5, "testObject_Provider_provider_5.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_6, "testObject_Provider_provider_6.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_7, "testObject_Provider_provider_7.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_8, "testObject_Provider_provider_8.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_9, "testObject_Provider_provider_9.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_10, "testObject_Provider_provider_10.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_11, "testObject_Provider_provider_11.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_12, "testObject_Provider_provider_12.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_13, "testObject_Provider_provider_13.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_14, "testObject_Provider_provider_14.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_15, "testObject_Provider_provider_15.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_16, "testObject_Provider_provider_16.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_17, "testObject_Provider_provider_17.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_18, "testObject_Provider_provider_18.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_19, "testObject_Provider_provider_19.json"), (Test.Wire.API.Golden.Generated.Provider_provider.testObject_Provider_provider_20, "testObject_Provider_provider_20.json")],
-      testCase ("Golden: ProviderProfile_provider") $
+      testCase "Golden: ProviderProfile_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_1, "testObject_ProviderProfile_provider_1.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_2, "testObject_ProviderProfile_provider_2.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_3, "testObject_ProviderProfile_provider_3.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_4, "testObject_ProviderProfile_provider_4.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_5, "testObject_ProviderProfile_provider_5.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_6, "testObject_ProviderProfile_provider_6.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_7, "testObject_ProviderProfile_provider_7.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_8, "testObject_ProviderProfile_provider_8.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_9, "testObject_ProviderProfile_provider_9.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_10, "testObject_ProviderProfile_provider_10.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_11, "testObject_ProviderProfile_provider_11.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_12, "testObject_ProviderProfile_provider_12.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_13, "testObject_ProviderProfile_provider_13.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_14, "testObject_ProviderProfile_provider_14.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_15, "testObject_ProviderProfile_provider_15.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_16, "testObject_ProviderProfile_provider_16.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_17, "testObject_ProviderProfile_provider_17.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_18, "testObject_ProviderProfile_provider_18.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_19, "testObject_ProviderProfile_provider_19.json"), (Test.Wire.API.Golden.Generated.ProviderProfile_provider.testObject_ProviderProfile_provider_20, "testObject_ProviderProfile_provider_20.json")],
-      testCase ("Golden: NewProvider_provider") $
+      testCase "Golden: NewProvider_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_1, "testObject_NewProvider_provider_1.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_2, "testObject_NewProvider_provider_2.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_3, "testObject_NewProvider_provider_3.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_4, "testObject_NewProvider_provider_4.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_5, "testObject_NewProvider_provider_5.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_6, "testObject_NewProvider_provider_6.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_7, "testObject_NewProvider_provider_7.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_8, "testObject_NewProvider_provider_8.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_9, "testObject_NewProvider_provider_9.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_10, "testObject_NewProvider_provider_10.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_11, "testObject_NewProvider_provider_11.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_12, "testObject_NewProvider_provider_12.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_13, "testObject_NewProvider_provider_13.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_14, "testObject_NewProvider_provider_14.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_15, "testObject_NewProvider_provider_15.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_16, "testObject_NewProvider_provider_16.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_17, "testObject_NewProvider_provider_17.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_18, "testObject_NewProvider_provider_18.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_19, "testObject_NewProvider_provider_19.json"), (Test.Wire.API.Golden.Generated.NewProvider_provider.testObject_NewProvider_provider_20, "testObject_NewProvider_provider_20.json")],
-      testCase ("Golden: NewProviderResponse_provider") $
+      testCase "Golden: NewProviderResponse_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_1, "testObject_NewProviderResponse_provider_1.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_2, "testObject_NewProviderResponse_provider_2.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_3, "testObject_NewProviderResponse_provider_3.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_4, "testObject_NewProviderResponse_provider_4.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_5, "testObject_NewProviderResponse_provider_5.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_6, "testObject_NewProviderResponse_provider_6.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_7, "testObject_NewProviderResponse_provider_7.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_8, "testObject_NewProviderResponse_provider_8.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_9, "testObject_NewProviderResponse_provider_9.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_10, "testObject_NewProviderResponse_provider_10.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_11, "testObject_NewProviderResponse_provider_11.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_12, "testObject_NewProviderResponse_provider_12.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_13, "testObject_NewProviderResponse_provider_13.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_14, "testObject_NewProviderResponse_provider_14.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_15, "testObject_NewProviderResponse_provider_15.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_16, "testObject_NewProviderResponse_provider_16.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_17, "testObject_NewProviderResponse_provider_17.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_18, "testObject_NewProviderResponse_provider_18.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_19, "testObject_NewProviderResponse_provider_19.json"), (Test.Wire.API.Golden.Generated.NewProviderResponse_provider.testObject_NewProviderResponse_provider_20, "testObject_NewProviderResponse_provider_20.json")],
-      testCase ("Golden: UpdateProvider_provider") $
+      testCase "Golden: UpdateProvider_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_1, "testObject_UpdateProvider_provider_1.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_2, "testObject_UpdateProvider_provider_2.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_3, "testObject_UpdateProvider_provider_3.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_4, "testObject_UpdateProvider_provider_4.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_5, "testObject_UpdateProvider_provider_5.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_6, "testObject_UpdateProvider_provider_6.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_7, "testObject_UpdateProvider_provider_7.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_8, "testObject_UpdateProvider_provider_8.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_9, "testObject_UpdateProvider_provider_9.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_10, "testObject_UpdateProvider_provider_10.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_11, "testObject_UpdateProvider_provider_11.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_12, "testObject_UpdateProvider_provider_12.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_13, "testObject_UpdateProvider_provider_13.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_14, "testObject_UpdateProvider_provider_14.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_15, "testObject_UpdateProvider_provider_15.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_16, "testObject_UpdateProvider_provider_16.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_17, "testObject_UpdateProvider_provider_17.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_18, "testObject_UpdateProvider_provider_18.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_19, "testObject_UpdateProvider_provider_19.json"), (Test.Wire.API.Golden.Generated.UpdateProvider_provider.testObject_UpdateProvider_provider_20, "testObject_UpdateProvider_provider_20.json")],
-      testCase ("Golden: ProviderActivationResponse_provider") $
+      testCase "Golden: ProviderActivationResponse_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_1, "testObject_ProviderActivationResponse_provider_1.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_2, "testObject_ProviderActivationResponse_provider_2.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_3, "testObject_ProviderActivationResponse_provider_3.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_4, "testObject_ProviderActivationResponse_provider_4.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_5, "testObject_ProviderActivationResponse_provider_5.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_6, "testObject_ProviderActivationResponse_provider_6.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_7, "testObject_ProviderActivationResponse_provider_7.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_8, "testObject_ProviderActivationResponse_provider_8.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_9, "testObject_ProviderActivationResponse_provider_9.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_10, "testObject_ProviderActivationResponse_provider_10.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_11, "testObject_ProviderActivationResponse_provider_11.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_12, "testObject_ProviderActivationResponse_provider_12.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_13, "testObject_ProviderActivationResponse_provider_13.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_14, "testObject_ProviderActivationResponse_provider_14.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_15, "testObject_ProviderActivationResponse_provider_15.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_16, "testObject_ProviderActivationResponse_provider_16.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_17, "testObject_ProviderActivationResponse_provider_17.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_18, "testObject_ProviderActivationResponse_provider_18.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_19, "testObject_ProviderActivationResponse_provider_19.json"), (Test.Wire.API.Golden.Generated.ProviderActivationResponse_provider.testObject_ProviderActivationResponse_provider_20, "testObject_ProviderActivationResponse_provider_20.json")],
-      testCase ("Golden: ProviderLogin_provider") $
+      testCase "Golden: ProviderLogin_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_1, "testObject_ProviderLogin_provider_1.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_2, "testObject_ProviderLogin_provider_2.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_3, "testObject_ProviderLogin_provider_3.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_4, "testObject_ProviderLogin_provider_4.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_5, "testObject_ProviderLogin_provider_5.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_6, "testObject_ProviderLogin_provider_6.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_7, "testObject_ProviderLogin_provider_7.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_8, "testObject_ProviderLogin_provider_8.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_9, "testObject_ProviderLogin_provider_9.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_10, "testObject_ProviderLogin_provider_10.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_11, "testObject_ProviderLogin_provider_11.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_12, "testObject_ProviderLogin_provider_12.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_13, "testObject_ProviderLogin_provider_13.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_14, "testObject_ProviderLogin_provider_14.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_15, "testObject_ProviderLogin_provider_15.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_16, "testObject_ProviderLogin_provider_16.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_17, "testObject_ProviderLogin_provider_17.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_18, "testObject_ProviderLogin_provider_18.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_19, "testObject_ProviderLogin_provider_19.json"), (Test.Wire.API.Golden.Generated.ProviderLogin_provider.testObject_ProviderLogin_provider_20, "testObject_ProviderLogin_provider_20.json")],
-      testCase ("Golden: DeleteProvider_provider") $
+      testCase "Golden: DeleteProvider_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_1, "testObject_DeleteProvider_provider_1.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_2, "testObject_DeleteProvider_provider_2.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_3, "testObject_DeleteProvider_provider_3.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_4, "testObject_DeleteProvider_provider_4.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_5, "testObject_DeleteProvider_provider_5.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_6, "testObject_DeleteProvider_provider_6.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_7, "testObject_DeleteProvider_provider_7.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_8, "testObject_DeleteProvider_provider_8.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_9, "testObject_DeleteProvider_provider_9.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_10, "testObject_DeleteProvider_provider_10.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_11, "testObject_DeleteProvider_provider_11.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_12, "testObject_DeleteProvider_provider_12.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_13, "testObject_DeleteProvider_provider_13.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_14, "testObject_DeleteProvider_provider_14.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_15, "testObject_DeleteProvider_provider_15.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_16, "testObject_DeleteProvider_provider_16.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_17, "testObject_DeleteProvider_provider_17.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_18, "testObject_DeleteProvider_provider_18.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_19, "testObject_DeleteProvider_provider_19.json"), (Test.Wire.API.Golden.Generated.DeleteProvider_provider.testObject_DeleteProvider_provider_20, "testObject_DeleteProvider_provider_20.json")],
-      testCase ("Golden: PasswordReset_provider") $
+      testCase "Golden: PasswordReset_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_1, "testObject_PasswordReset_provider_1.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_2, "testObject_PasswordReset_provider_2.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_3, "testObject_PasswordReset_provider_3.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_4, "testObject_PasswordReset_provider_4.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_5, "testObject_PasswordReset_provider_5.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_6, "testObject_PasswordReset_provider_6.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_7, "testObject_PasswordReset_provider_7.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_8, "testObject_PasswordReset_provider_8.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_9, "testObject_PasswordReset_provider_9.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_10, "testObject_PasswordReset_provider_10.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_11, "testObject_PasswordReset_provider_11.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_12, "testObject_PasswordReset_provider_12.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_13, "testObject_PasswordReset_provider_13.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_14, "testObject_PasswordReset_provider_14.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_15, "testObject_PasswordReset_provider_15.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_16, "testObject_PasswordReset_provider_16.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_17, "testObject_PasswordReset_provider_17.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_18, "testObject_PasswordReset_provider_18.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_19, "testObject_PasswordReset_provider_19.json"), (Test.Wire.API.Golden.Generated.PasswordReset_provider.testObject_PasswordReset_provider_20, "testObject_PasswordReset_provider_20.json")],
-      testCase ("Golden: CompletePasswordReset_provider") $
+      testCase "Golden: CompletePasswordReset_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_1, "testObject_CompletePasswordReset_provider_1.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_2, "testObject_CompletePasswordReset_provider_2.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_3, "testObject_CompletePasswordReset_provider_3.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_4, "testObject_CompletePasswordReset_provider_4.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_5, "testObject_CompletePasswordReset_provider_5.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_6, "testObject_CompletePasswordReset_provider_6.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_7, "testObject_CompletePasswordReset_provider_7.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_8, "testObject_CompletePasswordReset_provider_8.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_9, "testObject_CompletePasswordReset_provider_9.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_10, "testObject_CompletePasswordReset_provider_10.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_11, "testObject_CompletePasswordReset_provider_11.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_12, "testObject_CompletePasswordReset_provider_12.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_13, "testObject_CompletePasswordReset_provider_13.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_14, "testObject_CompletePasswordReset_provider_14.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_15, "testObject_CompletePasswordReset_provider_15.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_16, "testObject_CompletePasswordReset_provider_16.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_17, "testObject_CompletePasswordReset_provider_17.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_18, "testObject_CompletePasswordReset_provider_18.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_19, "testObject_CompletePasswordReset_provider_19.json"), (Test.Wire.API.Golden.Generated.CompletePasswordReset_provider.testObject_CompletePasswordReset_provider_20, "testObject_CompletePasswordReset_provider_20.json")],
-      testCase ("Golden: PasswordChange_provider") $
+      testCase "Golden: PasswordChange_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_1, "testObject_PasswordChange_provider_1.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_2, "testObject_PasswordChange_provider_2.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_3, "testObject_PasswordChange_provider_3.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_4, "testObject_PasswordChange_provider_4.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_5, "testObject_PasswordChange_provider_5.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_6, "testObject_PasswordChange_provider_6.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_7, "testObject_PasswordChange_provider_7.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_8, "testObject_PasswordChange_provider_8.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_9, "testObject_PasswordChange_provider_9.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_10, "testObject_PasswordChange_provider_10.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_11, "testObject_PasswordChange_provider_11.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_12, "testObject_PasswordChange_provider_12.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_13, "testObject_PasswordChange_provider_13.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_14, "testObject_PasswordChange_provider_14.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_15, "testObject_PasswordChange_provider_15.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_16, "testObject_PasswordChange_provider_16.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_17, "testObject_PasswordChange_provider_17.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_18, "testObject_PasswordChange_provider_18.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_19, "testObject_PasswordChange_provider_19.json"), (Test.Wire.API.Golden.Generated.PasswordChange_provider.testObject_PasswordChange_provider_20, "testObject_PasswordChange_provider_20.json")],
-      testCase ("Golden: EmailUpdate_provider") $
+      testCase "Golden: EmailUpdate_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_1, "testObject_EmailUpdate_provider_1.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_2, "testObject_EmailUpdate_provider_2.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_3, "testObject_EmailUpdate_provider_3.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_4, "testObject_EmailUpdate_provider_4.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_5, "testObject_EmailUpdate_provider_5.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_6, "testObject_EmailUpdate_provider_6.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_7, "testObject_EmailUpdate_provider_7.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_8, "testObject_EmailUpdate_provider_8.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_9, "testObject_EmailUpdate_provider_9.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_10, "testObject_EmailUpdate_provider_10.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_11, "testObject_EmailUpdate_provider_11.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_12, "testObject_EmailUpdate_provider_12.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_13, "testObject_EmailUpdate_provider_13.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_14, "testObject_EmailUpdate_provider_14.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_15, "testObject_EmailUpdate_provider_15.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_16, "testObject_EmailUpdate_provider_16.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_17, "testObject_EmailUpdate_provider_17.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_18, "testObject_EmailUpdate_provider_18.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_19, "testObject_EmailUpdate_provider_19.json"), (Test.Wire.API.Golden.Generated.EmailUpdate_provider.testObject_EmailUpdate_provider_20, "testObject_EmailUpdate_provider_20.json")],
-      testCase ("Golden: BotConvView_provider") $
+      testCase "Golden: BotConvView_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_1, "testObject_BotConvView_provider_1.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_2, "testObject_BotConvView_provider_2.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_3, "testObject_BotConvView_provider_3.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_4, "testObject_BotConvView_provider_4.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_5, "testObject_BotConvView_provider_5.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_6, "testObject_BotConvView_provider_6.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_7, "testObject_BotConvView_provider_7.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_8, "testObject_BotConvView_provider_8.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_9, "testObject_BotConvView_provider_9.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_10, "testObject_BotConvView_provider_10.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_11, "testObject_BotConvView_provider_11.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_12, "testObject_BotConvView_provider_12.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_13, "testObject_BotConvView_provider_13.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_14, "testObject_BotConvView_provider_14.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_15, "testObject_BotConvView_provider_15.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_16, "testObject_BotConvView_provider_16.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_17, "testObject_BotConvView_provider_17.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_18, "testObject_BotConvView_provider_18.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_19, "testObject_BotConvView_provider_19.json"), (Test.Wire.API.Golden.Generated.BotConvView_provider.testObject_BotConvView_provider_20, "testObject_BotConvView_provider_20.json")],
-      testCase ("Golden: BotUserView_provider") $
+      testCase "Golden: BotUserView_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_1, "testObject_BotUserView_provider_1.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_2, "testObject_BotUserView_provider_2.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_3, "testObject_BotUserView_provider_3.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_4, "testObject_BotUserView_provider_4.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_5, "testObject_BotUserView_provider_5.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_6, "testObject_BotUserView_provider_6.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_7, "testObject_BotUserView_provider_7.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_8, "testObject_BotUserView_provider_8.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_9, "testObject_BotUserView_provider_9.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_10, "testObject_BotUserView_provider_10.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_11, "testObject_BotUserView_provider_11.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_12, "testObject_BotUserView_provider_12.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_13, "testObject_BotUserView_provider_13.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_14, "testObject_BotUserView_provider_14.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_15, "testObject_BotUserView_provider_15.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_16, "testObject_BotUserView_provider_16.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_17, "testObject_BotUserView_provider_17.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_18, "testObject_BotUserView_provider_18.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_19, "testObject_BotUserView_provider_19.json"), (Test.Wire.API.Golden.Generated.BotUserView_provider.testObject_BotUserView_provider_20, "testObject_BotUserView_provider_20.json")],
-      testCase ("Golden: NewBotRequest_provider") $
+      testCase "Golden: NewBotRequest_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_1, "testObject_NewBotRequest_provider_1.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_2, "testObject_NewBotRequest_provider_2.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_3, "testObject_NewBotRequest_provider_3.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_4, "testObject_NewBotRequest_provider_4.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_5, "testObject_NewBotRequest_provider_5.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_6, "testObject_NewBotRequest_provider_6.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_7, "testObject_NewBotRequest_provider_7.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_8, "testObject_NewBotRequest_provider_8.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_9, "testObject_NewBotRequest_provider_9.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_10, "testObject_NewBotRequest_provider_10.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_11, "testObject_NewBotRequest_provider_11.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_12, "testObject_NewBotRequest_provider_12.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_13, "testObject_NewBotRequest_provider_13.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_14, "testObject_NewBotRequest_provider_14.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_15, "testObject_NewBotRequest_provider_15.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_16, "testObject_NewBotRequest_provider_16.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_17, "testObject_NewBotRequest_provider_17.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_18, "testObject_NewBotRequest_provider_18.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_19, "testObject_NewBotRequest_provider_19.json"), (Test.Wire.API.Golden.Generated.NewBotRequest_provider.testObject_NewBotRequest_provider_20, "testObject_NewBotRequest_provider_20.json")],
-      testCase ("Golden: NewBotResponse_provider") $
+      testCase "Golden: NewBotResponse_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_1, "testObject_NewBotResponse_provider_1.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_2, "testObject_NewBotResponse_provider_2.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_3, "testObject_NewBotResponse_provider_3.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_4, "testObject_NewBotResponse_provider_4.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_5, "testObject_NewBotResponse_provider_5.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_6, "testObject_NewBotResponse_provider_6.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_7, "testObject_NewBotResponse_provider_7.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_8, "testObject_NewBotResponse_provider_8.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_9, "testObject_NewBotResponse_provider_9.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_10, "testObject_NewBotResponse_provider_10.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_11, "testObject_NewBotResponse_provider_11.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_12, "testObject_NewBotResponse_provider_12.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_13, "testObject_NewBotResponse_provider_13.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_14, "testObject_NewBotResponse_provider_14.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_15, "testObject_NewBotResponse_provider_15.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_16, "testObject_NewBotResponse_provider_16.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_17, "testObject_NewBotResponse_provider_17.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_18, "testObject_NewBotResponse_provider_18.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_19, "testObject_NewBotResponse_provider_19.json"), (Test.Wire.API.Golden.Generated.NewBotResponse_provider.testObject_NewBotResponse_provider_20, "testObject_NewBotResponse_provider_20.json")],
-      testCase ("Golden: ServiceRef_provider") $
+      testCase "Golden: ServiceRef_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_1, "testObject_ServiceRef_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_2, "testObject_ServiceRef_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_3, "testObject_ServiceRef_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_4, "testObject_ServiceRef_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_5, "testObject_ServiceRef_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_6, "testObject_ServiceRef_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_7, "testObject_ServiceRef_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_8, "testObject_ServiceRef_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_9, "testObject_ServiceRef_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_10, "testObject_ServiceRef_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_11, "testObject_ServiceRef_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_12, "testObject_ServiceRef_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_13, "testObject_ServiceRef_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_14, "testObject_ServiceRef_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_15, "testObject_ServiceRef_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_16, "testObject_ServiceRef_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_17, "testObject_ServiceRef_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_18, "testObject_ServiceRef_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_19, "testObject_ServiceRef_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceRef_provider.testObject_ServiceRef_provider_20, "testObject_ServiceRef_provider_20.json")],
-      testCase ("Golden: ServiceKeyPEM_provider") $
+      testCase "Golden: ServiceKeyPEM_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_1, "testObject_ServiceKeyPEM_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_2, "testObject_ServiceKeyPEM_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_3, "testObject_ServiceKeyPEM_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_4, "testObject_ServiceKeyPEM_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_5, "testObject_ServiceKeyPEM_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_6, "testObject_ServiceKeyPEM_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_7, "testObject_ServiceKeyPEM_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_8, "testObject_ServiceKeyPEM_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_9, "testObject_ServiceKeyPEM_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_10, "testObject_ServiceKeyPEM_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_11, "testObject_ServiceKeyPEM_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_12, "testObject_ServiceKeyPEM_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_13, "testObject_ServiceKeyPEM_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_14, "testObject_ServiceKeyPEM_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_15, "testObject_ServiceKeyPEM_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_16, "testObject_ServiceKeyPEM_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_17, "testObject_ServiceKeyPEM_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_18, "testObject_ServiceKeyPEM_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_19, "testObject_ServiceKeyPEM_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceKeyPEM_provider.testObject_ServiceKeyPEM_provider_20, "testObject_ServiceKeyPEM_provider_20.json")],
-      testCase ("Golden: ServiceKeyType_provider") $
+      testCase "Golden: ServiceKeyType_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_1, "testObject_ServiceKeyType_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_2, "testObject_ServiceKeyType_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_3, "testObject_ServiceKeyType_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_4, "testObject_ServiceKeyType_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_5, "testObject_ServiceKeyType_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_6, "testObject_ServiceKeyType_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_7, "testObject_ServiceKeyType_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_8, "testObject_ServiceKeyType_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_9, "testObject_ServiceKeyType_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_10, "testObject_ServiceKeyType_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_11, "testObject_ServiceKeyType_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_12, "testObject_ServiceKeyType_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_13, "testObject_ServiceKeyType_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_14, "testObject_ServiceKeyType_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_15, "testObject_ServiceKeyType_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_16, "testObject_ServiceKeyType_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_17, "testObject_ServiceKeyType_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_18, "testObject_ServiceKeyType_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_19, "testObject_ServiceKeyType_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceKeyType_provider.testObject_ServiceKeyType_provider_20, "testObject_ServiceKeyType_provider_20.json")],
-      testCase ("Golden: ServiceKey_provider") $
+      testCase "Golden: ServiceKey_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_1, "testObject_ServiceKey_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_2, "testObject_ServiceKey_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_3, "testObject_ServiceKey_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_4, "testObject_ServiceKey_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_5, "testObject_ServiceKey_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_6, "testObject_ServiceKey_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_7, "testObject_ServiceKey_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_8, "testObject_ServiceKey_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_9, "testObject_ServiceKey_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_10, "testObject_ServiceKey_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_11, "testObject_ServiceKey_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_12, "testObject_ServiceKey_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_13, "testObject_ServiceKey_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_14, "testObject_ServiceKey_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_15, "testObject_ServiceKey_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_16, "testObject_ServiceKey_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_17, "testObject_ServiceKey_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_18, "testObject_ServiceKey_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_19, "testObject_ServiceKey_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceKey_provider.testObject_ServiceKey_provider_20, "testObject_ServiceKey_provider_20.json")],
-      testCase ("Golden: ServiceToken_provider") $
+      testCase "Golden: ServiceToken_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_1, "testObject_ServiceToken_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_2, "testObject_ServiceToken_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_3, "testObject_ServiceToken_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_4, "testObject_ServiceToken_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_5, "testObject_ServiceToken_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_6, "testObject_ServiceToken_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_7, "testObject_ServiceToken_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_8, "testObject_ServiceToken_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_9, "testObject_ServiceToken_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_10, "testObject_ServiceToken_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_11, "testObject_ServiceToken_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_12, "testObject_ServiceToken_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_13, "testObject_ServiceToken_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_14, "testObject_ServiceToken_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_15, "testObject_ServiceToken_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_16, "testObject_ServiceToken_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_17, "testObject_ServiceToken_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_18, "testObject_ServiceToken_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_19, "testObject_ServiceToken_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceToken_provider.testObject_ServiceToken_provider_20, "testObject_ServiceToken_provider_20.json")],
-      testCase ("Golden: Service_provider") $
+      testCase "Golden: Service_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_1, "testObject_Service_provider_1.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_2, "testObject_Service_provider_2.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_3, "testObject_Service_provider_3.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_4, "testObject_Service_provider_4.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_5, "testObject_Service_provider_5.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_6, "testObject_Service_provider_6.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_7, "testObject_Service_provider_7.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_8, "testObject_Service_provider_8.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_9, "testObject_Service_provider_9.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_10, "testObject_Service_provider_10.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_11, "testObject_Service_provider_11.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_12, "testObject_Service_provider_12.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_13, "testObject_Service_provider_13.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_14, "testObject_Service_provider_14.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_15, "testObject_Service_provider_15.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_16, "testObject_Service_provider_16.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_17, "testObject_Service_provider_17.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_18, "testObject_Service_provider_18.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_19, "testObject_Service_provider_19.json"), (Test.Wire.API.Golden.Generated.Service_provider.testObject_Service_provider_20, "testObject_Service_provider_20.json")],
-      testCase ("Golden: ServiceProfile_provider") $
+      testCase "Golden: ServiceProfile_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_1, "testObject_ServiceProfile_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_2, "testObject_ServiceProfile_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_3, "testObject_ServiceProfile_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_4, "testObject_ServiceProfile_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_5, "testObject_ServiceProfile_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_6, "testObject_ServiceProfile_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_7, "testObject_ServiceProfile_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_8, "testObject_ServiceProfile_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_9, "testObject_ServiceProfile_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_10, "testObject_ServiceProfile_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_11, "testObject_ServiceProfile_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_12, "testObject_ServiceProfile_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_13, "testObject_ServiceProfile_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_14, "testObject_ServiceProfile_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_15, "testObject_ServiceProfile_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_16, "testObject_ServiceProfile_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_17, "testObject_ServiceProfile_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_18, "testObject_ServiceProfile_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_19, "testObject_ServiceProfile_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceProfile_provider.testObject_ServiceProfile_provider_20, "testObject_ServiceProfile_provider_20.json")],
-      testCase ("Golden: ServiceProfilePage_provider") $
+      testCase "Golden: ServiceProfilePage_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_1, "testObject_ServiceProfilePage_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_2, "testObject_ServiceProfilePage_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_3, "testObject_ServiceProfilePage_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_4, "testObject_ServiceProfilePage_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_5, "testObject_ServiceProfilePage_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_6, "testObject_ServiceProfilePage_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_7, "testObject_ServiceProfilePage_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_8, "testObject_ServiceProfilePage_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_9, "testObject_ServiceProfilePage_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_10, "testObject_ServiceProfilePage_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_11, "testObject_ServiceProfilePage_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_12, "testObject_ServiceProfilePage_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_13, "testObject_ServiceProfilePage_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_14, "testObject_ServiceProfilePage_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_15, "testObject_ServiceProfilePage_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_16, "testObject_ServiceProfilePage_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_17, "testObject_ServiceProfilePage_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_18, "testObject_ServiceProfilePage_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_19, "testObject_ServiceProfilePage_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceProfilePage_provider.testObject_ServiceProfilePage_provider_20, "testObject_ServiceProfilePage_provider_20.json")],
-      testCase ("Golden: NewService_provider") $
+      testCase "Golden: NewService_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_1, "testObject_NewService_provider_1.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_2, "testObject_NewService_provider_2.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_3, "testObject_NewService_provider_3.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_4, "testObject_NewService_provider_4.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_5, "testObject_NewService_provider_5.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_6, "testObject_NewService_provider_6.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_7, "testObject_NewService_provider_7.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_8, "testObject_NewService_provider_8.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_9, "testObject_NewService_provider_9.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_10, "testObject_NewService_provider_10.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_11, "testObject_NewService_provider_11.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_12, "testObject_NewService_provider_12.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_13, "testObject_NewService_provider_13.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_14, "testObject_NewService_provider_14.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_15, "testObject_NewService_provider_15.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_16, "testObject_NewService_provider_16.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_17, "testObject_NewService_provider_17.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_18, "testObject_NewService_provider_18.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_19, "testObject_NewService_provider_19.json"), (Test.Wire.API.Golden.Generated.NewService_provider.testObject_NewService_provider_20, "testObject_NewService_provider_20.json")],
-      testCase ("Golden: NewServiceResponse_provider") $
+      testCase "Golden: NewServiceResponse_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_1, "testObject_NewServiceResponse_provider_1.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_2, "testObject_NewServiceResponse_provider_2.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_3, "testObject_NewServiceResponse_provider_3.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_4, "testObject_NewServiceResponse_provider_4.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_5, "testObject_NewServiceResponse_provider_5.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_6, "testObject_NewServiceResponse_provider_6.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_7, "testObject_NewServiceResponse_provider_7.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_8, "testObject_NewServiceResponse_provider_8.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_9, "testObject_NewServiceResponse_provider_9.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_10, "testObject_NewServiceResponse_provider_10.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_11, "testObject_NewServiceResponse_provider_11.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_12, "testObject_NewServiceResponse_provider_12.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_13, "testObject_NewServiceResponse_provider_13.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_14, "testObject_NewServiceResponse_provider_14.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_15, "testObject_NewServiceResponse_provider_15.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_16, "testObject_NewServiceResponse_provider_16.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_17, "testObject_NewServiceResponse_provider_17.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_18, "testObject_NewServiceResponse_provider_18.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_19, "testObject_NewServiceResponse_provider_19.json"), (Test.Wire.API.Golden.Generated.NewServiceResponse_provider.testObject_NewServiceResponse_provider_20, "testObject_NewServiceResponse_provider_20.json")],
-      testCase ("Golden: UpdateService_provider") $
+      testCase "Golden: UpdateService_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_1, "testObject_UpdateService_provider_1.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_2, "testObject_UpdateService_provider_2.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_3, "testObject_UpdateService_provider_3.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_4, "testObject_UpdateService_provider_4.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_5, "testObject_UpdateService_provider_5.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_6, "testObject_UpdateService_provider_6.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_7, "testObject_UpdateService_provider_7.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_8, "testObject_UpdateService_provider_8.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_9, "testObject_UpdateService_provider_9.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_10, "testObject_UpdateService_provider_10.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_11, "testObject_UpdateService_provider_11.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_12, "testObject_UpdateService_provider_12.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_13, "testObject_UpdateService_provider_13.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_14, "testObject_UpdateService_provider_14.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_15, "testObject_UpdateService_provider_15.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_16, "testObject_UpdateService_provider_16.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_17, "testObject_UpdateService_provider_17.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_18, "testObject_UpdateService_provider_18.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_19, "testObject_UpdateService_provider_19.json"), (Test.Wire.API.Golden.Generated.UpdateService_provider.testObject_UpdateService_provider_20, "testObject_UpdateService_provider_20.json")],
-      testCase ("Golden: UpdateServiceConn_provider") $
+      testCase "Golden: UpdateServiceConn_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_1, "testObject_UpdateServiceConn_provider_1.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_2, "testObject_UpdateServiceConn_provider_2.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_3, "testObject_UpdateServiceConn_provider_3.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_4, "testObject_UpdateServiceConn_provider_4.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_5, "testObject_UpdateServiceConn_provider_5.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_6, "testObject_UpdateServiceConn_provider_6.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_7, "testObject_UpdateServiceConn_provider_7.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_8, "testObject_UpdateServiceConn_provider_8.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_9, "testObject_UpdateServiceConn_provider_9.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_10, "testObject_UpdateServiceConn_provider_10.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_11, "testObject_UpdateServiceConn_provider_11.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_12, "testObject_UpdateServiceConn_provider_12.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_13, "testObject_UpdateServiceConn_provider_13.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_14, "testObject_UpdateServiceConn_provider_14.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_15, "testObject_UpdateServiceConn_provider_15.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_16, "testObject_UpdateServiceConn_provider_16.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_17, "testObject_UpdateServiceConn_provider_17.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_18, "testObject_UpdateServiceConn_provider_18.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_19, "testObject_UpdateServiceConn_provider_19.json"), (Test.Wire.API.Golden.Generated.UpdateServiceConn_provider.testObject_UpdateServiceConn_provider_20, "testObject_UpdateServiceConn_provider_20.json")],
-      testCase ("Golden: DeleteService_provider") $
+      testCase "Golden: DeleteService_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_1, "testObject_DeleteService_provider_1.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_2, "testObject_DeleteService_provider_2.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_3, "testObject_DeleteService_provider_3.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_4, "testObject_DeleteService_provider_4.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_5, "testObject_DeleteService_provider_5.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_6, "testObject_DeleteService_provider_6.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_7, "testObject_DeleteService_provider_7.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_8, "testObject_DeleteService_provider_8.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_9, "testObject_DeleteService_provider_9.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_10, "testObject_DeleteService_provider_10.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_11, "testObject_DeleteService_provider_11.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_12, "testObject_DeleteService_provider_12.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_13, "testObject_DeleteService_provider_13.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_14, "testObject_DeleteService_provider_14.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_15, "testObject_DeleteService_provider_15.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_16, "testObject_DeleteService_provider_16.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_17, "testObject_DeleteService_provider_17.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_18, "testObject_DeleteService_provider_18.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_19, "testObject_DeleteService_provider_19.json"), (Test.Wire.API.Golden.Generated.DeleteService_provider.testObject_DeleteService_provider_20, "testObject_DeleteService_provider_20.json")],
-      testCase ("Golden: UpdateServiceWhitelist_provider") $
+      testCase "Golden: UpdateServiceWhitelist_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_1, "testObject_UpdateServiceWhitelist_provider_1.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_2, "testObject_UpdateServiceWhitelist_provider_2.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_3, "testObject_UpdateServiceWhitelist_provider_3.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_4, "testObject_UpdateServiceWhitelist_provider_4.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_5, "testObject_UpdateServiceWhitelist_provider_5.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_6, "testObject_UpdateServiceWhitelist_provider_6.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_7, "testObject_UpdateServiceWhitelist_provider_7.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_8, "testObject_UpdateServiceWhitelist_provider_8.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_9, "testObject_UpdateServiceWhitelist_provider_9.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_10, "testObject_UpdateServiceWhitelist_provider_10.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_11, "testObject_UpdateServiceWhitelist_provider_11.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_12, "testObject_UpdateServiceWhitelist_provider_12.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_13, "testObject_UpdateServiceWhitelist_provider_13.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_14, "testObject_UpdateServiceWhitelist_provider_14.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_15, "testObject_UpdateServiceWhitelist_provider_15.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_16, "testObject_UpdateServiceWhitelist_provider_16.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_17, "testObject_UpdateServiceWhitelist_provider_17.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_18, "testObject_UpdateServiceWhitelist_provider_18.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_19, "testObject_UpdateServiceWhitelist_provider_19.json"), (Test.Wire.API.Golden.Generated.UpdateServiceWhitelist_provider.testObject_UpdateServiceWhitelist_provider_20, "testObject_UpdateServiceWhitelist_provider_20.json")],
-      testCase ("Golden: ServiceTag_provider") $
+      testCase "Golden: ServiceTag_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_1, "testObject_ServiceTag_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_2, "testObject_ServiceTag_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_3, "testObject_ServiceTag_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_4, "testObject_ServiceTag_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_5, "testObject_ServiceTag_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_6, "testObject_ServiceTag_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_7, "testObject_ServiceTag_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_8, "testObject_ServiceTag_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_9, "testObject_ServiceTag_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_10, "testObject_ServiceTag_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_11, "testObject_ServiceTag_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_12, "testObject_ServiceTag_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_13, "testObject_ServiceTag_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_14, "testObject_ServiceTag_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_15, "testObject_ServiceTag_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_16, "testObject_ServiceTag_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_17, "testObject_ServiceTag_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_18, "testObject_ServiceTag_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_19, "testObject_ServiceTag_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceTag_provider.testObject_ServiceTag_provider_20, "testObject_ServiceTag_provider_20.json")],
-      testCase ("Golden: ServiceTagList_provider") $
+      testCase "Golden: ServiceTagList_provider" $
         testObjects [(Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_1, "testObject_ServiceTagList_provider_1.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_2, "testObject_ServiceTagList_provider_2.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_3, "testObject_ServiceTagList_provider_3.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_4, "testObject_ServiceTagList_provider_4.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_5, "testObject_ServiceTagList_provider_5.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_6, "testObject_ServiceTagList_provider_6.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_7, "testObject_ServiceTagList_provider_7.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_8, "testObject_ServiceTagList_provider_8.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_9, "testObject_ServiceTagList_provider_9.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_10, "testObject_ServiceTagList_provider_10.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_11, "testObject_ServiceTagList_provider_11.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_12, "testObject_ServiceTagList_provider_12.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_13, "testObject_ServiceTagList_provider_13.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_14, "testObject_ServiceTagList_provider_14.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_15, "testObject_ServiceTagList_provider_15.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_16, "testObject_ServiceTagList_provider_16.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_17, "testObject_ServiceTagList_provider_17.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_18, "testObject_ServiceTagList_provider_18.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_19, "testObject_ServiceTagList_provider_19.json"), (Test.Wire.API.Golden.Generated.ServiceTagList_provider.testObject_ServiceTagList_provider_20, "testObject_ServiceTagList_provider_20.json")],
-      testCase ("Golden: BindingNewTeam_team") $
+      testCase "Golden: BindingNewTeam_team" $
         testObjects [(Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_1, "testObject_BindingNewTeam_team_1.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_2, "testObject_BindingNewTeam_team_2.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_3, "testObject_BindingNewTeam_team_3.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_4, "testObject_BindingNewTeam_team_4.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_5, "testObject_BindingNewTeam_team_5.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_6, "testObject_BindingNewTeam_team_6.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_7, "testObject_BindingNewTeam_team_7.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_8, "testObject_BindingNewTeam_team_8.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_9, "testObject_BindingNewTeam_team_9.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_10, "testObject_BindingNewTeam_team_10.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_11, "testObject_BindingNewTeam_team_11.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_12, "testObject_BindingNewTeam_team_12.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_13, "testObject_BindingNewTeam_team_13.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_14, "testObject_BindingNewTeam_team_14.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_15, "testObject_BindingNewTeam_team_15.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_16, "testObject_BindingNewTeam_team_16.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_17, "testObject_BindingNewTeam_team_17.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_18, "testObject_BindingNewTeam_team_18.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_19, "testObject_BindingNewTeam_team_19.json"), (Test.Wire.API.Golden.Generated.BindingNewTeam_team.testObject_BindingNewTeam_team_20, "testObject_BindingNewTeam_team_20.json")],
-      testCase ("Golden: TeamBinding_team") $
+      testCase "Golden: TeamBinding_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_1, "testObject_TeamBinding_team_1.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_2, "testObject_TeamBinding_team_2.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_3, "testObject_TeamBinding_team_3.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_4, "testObject_TeamBinding_team_4.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_5, "testObject_TeamBinding_team_5.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_6, "testObject_TeamBinding_team_6.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_7, "testObject_TeamBinding_team_7.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_8, "testObject_TeamBinding_team_8.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_9, "testObject_TeamBinding_team_9.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_10, "testObject_TeamBinding_team_10.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_11, "testObject_TeamBinding_team_11.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_12, "testObject_TeamBinding_team_12.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_13, "testObject_TeamBinding_team_13.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_14, "testObject_TeamBinding_team_14.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_15, "testObject_TeamBinding_team_15.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_16, "testObject_TeamBinding_team_16.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_17, "testObject_TeamBinding_team_17.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_18, "testObject_TeamBinding_team_18.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_19, "testObject_TeamBinding_team_19.json"), (Test.Wire.API.Golden.Generated.TeamBinding_team.testObject_TeamBinding_team_20, "testObject_TeamBinding_team_20.json")],
-      testCase ("Golden: Team_team") $
+      testCase "Golden: Team_team" $
         testObjects [(Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_1, "testObject_Team_team_1.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_2, "testObject_Team_team_2.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_3, "testObject_Team_team_3.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_4, "testObject_Team_team_4.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_5, "testObject_Team_team_5.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_6, "testObject_Team_team_6.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_7, "testObject_Team_team_7.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_8, "testObject_Team_team_8.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_9, "testObject_Team_team_9.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_10, "testObject_Team_team_10.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_11, "testObject_Team_team_11.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_12, "testObject_Team_team_12.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_13, "testObject_Team_team_13.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_14, "testObject_Team_team_14.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_15, "testObject_Team_team_15.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_16, "testObject_Team_team_16.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_17, "testObject_Team_team_17.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_18, "testObject_Team_team_18.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_19, "testObject_Team_team_19.json"), (Test.Wire.API.Golden.Generated.Team_team.testObject_Team_team_20, "testObject_Team_team_20.json")],
-      testCase ("Golden: TeamList_team") $
+      testCase "Golden: TeamList_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_1, "testObject_TeamList_team_1.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_2, "testObject_TeamList_team_2.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_3, "testObject_TeamList_team_3.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_4, "testObject_TeamList_team_4.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_5, "testObject_TeamList_team_5.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_6, "testObject_TeamList_team_6.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_7, "testObject_TeamList_team_7.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_8, "testObject_TeamList_team_8.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_9, "testObject_TeamList_team_9.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_10, "testObject_TeamList_team_10.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_11, "testObject_TeamList_team_11.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_12, "testObject_TeamList_team_12.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_13, "testObject_TeamList_team_13.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_14, "testObject_TeamList_team_14.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_15, "testObject_TeamList_team_15.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_16, "testObject_TeamList_team_16.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_17, "testObject_TeamList_team_17.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_18, "testObject_TeamList_team_18.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_19, "testObject_TeamList_team_19.json"), (Test.Wire.API.Golden.Generated.TeamList_team.testObject_TeamList_team_20, "testObject_TeamList_team_20.json")],
-      testCase ("Golden: TeamUpdateData_team") $
+      testCase "Golden: TeamUpdateData_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_1, "testObject_TeamUpdateData_team_1.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_2, "testObject_TeamUpdateData_team_2.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_3, "testObject_TeamUpdateData_team_3.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_4, "testObject_TeamUpdateData_team_4.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_5, "testObject_TeamUpdateData_team_5.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_6, "testObject_TeamUpdateData_team_6.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_7, "testObject_TeamUpdateData_team_7.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_8, "testObject_TeamUpdateData_team_8.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_9, "testObject_TeamUpdateData_team_9.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_10, "testObject_TeamUpdateData_team_10.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_11, "testObject_TeamUpdateData_team_11.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_12, "testObject_TeamUpdateData_team_12.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_13, "testObject_TeamUpdateData_team_13.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_14, "testObject_TeamUpdateData_team_14.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_15, "testObject_TeamUpdateData_team_15.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_16, "testObject_TeamUpdateData_team_16.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_17, "testObject_TeamUpdateData_team_17.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_18, "testObject_TeamUpdateData_team_18.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_19, "testObject_TeamUpdateData_team_19.json"), (Test.Wire.API.Golden.Generated.TeamUpdateData_team.testObject_TeamUpdateData_team_20, "testObject_TeamUpdateData_team_20.json")],
-      testCase ("Golden: TeamDeleteData_team") $
+      testCase "Golden: TeamDeleteData_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_1, "testObject_TeamDeleteData_team_1.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_2, "testObject_TeamDeleteData_team_2.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_3, "testObject_TeamDeleteData_team_3.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_4, "testObject_TeamDeleteData_team_4.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_5, "testObject_TeamDeleteData_team_5.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_6, "testObject_TeamDeleteData_team_6.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_7, "testObject_TeamDeleteData_team_7.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_8, "testObject_TeamDeleteData_team_8.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_9, "testObject_TeamDeleteData_team_9.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_10, "testObject_TeamDeleteData_team_10.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_11, "testObject_TeamDeleteData_team_11.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_12, "testObject_TeamDeleteData_team_12.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_13, "testObject_TeamDeleteData_team_13.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_14, "testObject_TeamDeleteData_team_14.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_15, "testObject_TeamDeleteData_team_15.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_16, "testObject_TeamDeleteData_team_16.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_17, "testObject_TeamDeleteData_team_17.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_18, "testObject_TeamDeleteData_team_18.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_19, "testObject_TeamDeleteData_team_19.json"), (Test.Wire.API.Golden.Generated.TeamDeleteData_team.testObject_TeamDeleteData_team_20, "testObject_TeamDeleteData_team_20.json")],
-      testCase ("Golden: TeamConversation_team") $
+      testCase "Golden: TeamConversation_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_1, "testObject_TeamConversation_team_1.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_2, "testObject_TeamConversation_team_2.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_3, "testObject_TeamConversation_team_3.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_4, "testObject_TeamConversation_team_4.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_5, "testObject_TeamConversation_team_5.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_6, "testObject_TeamConversation_team_6.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_7, "testObject_TeamConversation_team_7.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_8, "testObject_TeamConversation_team_8.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_9, "testObject_TeamConversation_team_9.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_10, "testObject_TeamConversation_team_10.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_11, "testObject_TeamConversation_team_11.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_12, "testObject_TeamConversation_team_12.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_13, "testObject_TeamConversation_team_13.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_14, "testObject_TeamConversation_team_14.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_15, "testObject_TeamConversation_team_15.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_16, "testObject_TeamConversation_team_16.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_17, "testObject_TeamConversation_team_17.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_18, "testObject_TeamConversation_team_18.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_19, "testObject_TeamConversation_team_19.json"), (Test.Wire.API.Golden.Generated.TeamConversation_team.testObject_TeamConversation_team_20, "testObject_TeamConversation_team_20.json")],
-      testCase ("Golden: TeamConversationList_team") $
+      testCase "Golden: TeamConversationList_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_1, "testObject_TeamConversationList_team_1.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_2, "testObject_TeamConversationList_team_2.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_3, "testObject_TeamConversationList_team_3.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_4, "testObject_TeamConversationList_team_4.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_5, "testObject_TeamConversationList_team_5.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_6, "testObject_TeamConversationList_team_6.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_7, "testObject_TeamConversationList_team_7.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_8, "testObject_TeamConversationList_team_8.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_9, "testObject_TeamConversationList_team_9.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_10, "testObject_TeamConversationList_team_10.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_11, "testObject_TeamConversationList_team_11.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_12, "testObject_TeamConversationList_team_12.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_13, "testObject_TeamConversationList_team_13.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_14, "testObject_TeamConversationList_team_14.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_15, "testObject_TeamConversationList_team_15.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_16, "testObject_TeamConversationList_team_16.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_17, "testObject_TeamConversationList_team_17.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_18, "testObject_TeamConversationList_team_18.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_19, "testObject_TeamConversationList_team_19.json"), (Test.Wire.API.Golden.Generated.TeamConversationList_team.testObject_TeamConversationList_team_20, "testObject_TeamConversationList_team_20.json")],
-      testCase ("Golden: TeamFeatureStatusNoConfig_team") $
+      testCase "Golden: TeamFeatureStatusNoConfig_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_1, "testObject_TeamFeatureStatusNoConfig_team_1.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_2, "testObject_TeamFeatureStatusNoConfig_team_2.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_3, "testObject_TeamFeatureStatusNoConfig_team_3.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_4, "testObject_TeamFeatureStatusNoConfig_team_4.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_5, "testObject_TeamFeatureStatusNoConfig_team_5.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_6, "testObject_TeamFeatureStatusNoConfig_team_6.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_7, "testObject_TeamFeatureStatusNoConfig_team_7.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_8, "testObject_TeamFeatureStatusNoConfig_team_8.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_9, "testObject_TeamFeatureStatusNoConfig_team_9.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_10, "testObject_TeamFeatureStatusNoConfig_team_10.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_11, "testObject_TeamFeatureStatusNoConfig_team_11.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_12, "testObject_TeamFeatureStatusNoConfig_team_12.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_13, "testObject_TeamFeatureStatusNoConfig_team_13.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_14, "testObject_TeamFeatureStatusNoConfig_team_14.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_15, "testObject_TeamFeatureStatusNoConfig_team_15.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_16, "testObject_TeamFeatureStatusNoConfig_team_16.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_17, "testObject_TeamFeatureStatusNoConfig_team_17.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_18, "testObject_TeamFeatureStatusNoConfig_team_18.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_19, "testObject_TeamFeatureStatusNoConfig_team_19.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusNoConfig_team.testObject_TeamFeatureStatusNoConfig_team_20, "testObject_TeamFeatureStatusNoConfig_team_20.json")],
-      testCase ("Golden: TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team") $
+      testCase "Golden: TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_1, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_1.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_2, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_2.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_3, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_3.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_4, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_4.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_5, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_5.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_6, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_6.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_7, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_7.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_8, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_8.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_9, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_9.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_10, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_10.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_11, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_11.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_12, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_12.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_13, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_13.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_14, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_14.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_15, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_15.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_16, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_16.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_17, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_17.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_18, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_18.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_19, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_19.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team.testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_20, "testObject_TeamFeatureStatusWithConfig_20TeamFeatureAppLockConfig_team_20.json")],
-      testCase ("Golden: TeamFeatureStatusValue_team") $
+      testCase "Golden: TeamFeatureStatusValue_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_1, "testObject_TeamFeatureStatusValue_team_1.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_2, "testObject_TeamFeatureStatusValue_team_2.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_3, "testObject_TeamFeatureStatusValue_team_3.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_4, "testObject_TeamFeatureStatusValue_team_4.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_5, "testObject_TeamFeatureStatusValue_team_5.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_6, "testObject_TeamFeatureStatusValue_team_6.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_7, "testObject_TeamFeatureStatusValue_team_7.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_8, "testObject_TeamFeatureStatusValue_team_8.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_9, "testObject_TeamFeatureStatusValue_team_9.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_10, "testObject_TeamFeatureStatusValue_team_10.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_11, "testObject_TeamFeatureStatusValue_team_11.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_12, "testObject_TeamFeatureStatusValue_team_12.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_13, "testObject_TeamFeatureStatusValue_team_13.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_14, "testObject_TeamFeatureStatusValue_team_14.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_15, "testObject_TeamFeatureStatusValue_team_15.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_16, "testObject_TeamFeatureStatusValue_team_16.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_17, "testObject_TeamFeatureStatusValue_team_17.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_18, "testObject_TeamFeatureStatusValue_team_18.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_19, "testObject_TeamFeatureStatusValue_team_19.json"), (Test.Wire.API.Golden.Generated.TeamFeatureStatusValue_team.testObject_TeamFeatureStatusValue_team_20, "testObject_TeamFeatureStatusValue_team_20.json")],
-      testCase ("Golden: InvitationRequest_team") $
+      testCase "Golden: InvitationRequest_team" $
         testObjects [(Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_1, "testObject_InvitationRequest_team_1.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_2, "testObject_InvitationRequest_team_2.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_3, "testObject_InvitationRequest_team_3.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_4, "testObject_InvitationRequest_team_4.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_5, "testObject_InvitationRequest_team_5.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_6, "testObject_InvitationRequest_team_6.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_7, "testObject_InvitationRequest_team_7.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_8, "testObject_InvitationRequest_team_8.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_9, "testObject_InvitationRequest_team_9.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_10, "testObject_InvitationRequest_team_10.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_11, "testObject_InvitationRequest_team_11.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_12, "testObject_InvitationRequest_team_12.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_13, "testObject_InvitationRequest_team_13.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_14, "testObject_InvitationRequest_team_14.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_15, "testObject_InvitationRequest_team_15.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_16, "testObject_InvitationRequest_team_16.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_17, "testObject_InvitationRequest_team_17.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_18, "testObject_InvitationRequest_team_18.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_19, "testObject_InvitationRequest_team_19.json"), (Test.Wire.API.Golden.Generated.InvitationRequest_team.testObject_InvitationRequest_team_20, "testObject_InvitationRequest_team_20.json")],
-      testCase ("Golden: Invitation_team") $
+      testCase "Golden: Invitation_team" $
         testObjects [(Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_1, "testObject_Invitation_team_1.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_2, "testObject_Invitation_team_2.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_3, "testObject_Invitation_team_3.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_4, "testObject_Invitation_team_4.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_5, "testObject_Invitation_team_5.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_6, "testObject_Invitation_team_6.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_7, "testObject_Invitation_team_7.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_8, "testObject_Invitation_team_8.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_9, "testObject_Invitation_team_9.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_10, "testObject_Invitation_team_10.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_11, "testObject_Invitation_team_11.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_12, "testObject_Invitation_team_12.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_13, "testObject_Invitation_team_13.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_14, "testObject_Invitation_team_14.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_15, "testObject_Invitation_team_15.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_16, "testObject_Invitation_team_16.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_17, "testObject_Invitation_team_17.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_18, "testObject_Invitation_team_18.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_19, "testObject_Invitation_team_19.json"), (Test.Wire.API.Golden.Generated.Invitation_team.testObject_Invitation_team_20, "testObject_Invitation_team_20.json")],
-      testCase ("Golden: InvitationList_team") $
+      testCase "Golden: InvitationList_team" $
         testObjects [(Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_1, "testObject_InvitationList_team_1.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_2, "testObject_InvitationList_team_2.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_3, "testObject_InvitationList_team_3.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_4, "testObject_InvitationList_team_4.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_5, "testObject_InvitationList_team_5.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_6, "testObject_InvitationList_team_6.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_7, "testObject_InvitationList_team_7.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_8, "testObject_InvitationList_team_8.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_9, "testObject_InvitationList_team_9.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_10, "testObject_InvitationList_team_10.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_11, "testObject_InvitationList_team_11.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_12, "testObject_InvitationList_team_12.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_13, "testObject_InvitationList_team_13.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_14, "testObject_InvitationList_team_14.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_15, "testObject_InvitationList_team_15.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_16, "testObject_InvitationList_team_16.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_17, "testObject_InvitationList_team_17.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_18, "testObject_InvitationList_team_18.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_19, "testObject_InvitationList_team_19.json"), (Test.Wire.API.Golden.Generated.InvitationList_team.testObject_InvitationList_team_20, "testObject_InvitationList_team_20.json")],
-      testCase ("Golden: NewLegalHoldService_team") $
+      testCase "Golden: NewLegalHoldService_team" $
         testObjects [(Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_1, "testObject_NewLegalHoldService_team_1.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_2, "testObject_NewLegalHoldService_team_2.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_3, "testObject_NewLegalHoldService_team_3.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_4, "testObject_NewLegalHoldService_team_4.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_5, "testObject_NewLegalHoldService_team_5.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_6, "testObject_NewLegalHoldService_team_6.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_7, "testObject_NewLegalHoldService_team_7.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_8, "testObject_NewLegalHoldService_team_8.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_9, "testObject_NewLegalHoldService_team_9.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_10, "testObject_NewLegalHoldService_team_10.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_11, "testObject_NewLegalHoldService_team_11.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_12, "testObject_NewLegalHoldService_team_12.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_13, "testObject_NewLegalHoldService_team_13.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_14, "testObject_NewLegalHoldService_team_14.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_15, "testObject_NewLegalHoldService_team_15.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_16, "testObject_NewLegalHoldService_team_16.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_17, "testObject_NewLegalHoldService_team_17.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_18, "testObject_NewLegalHoldService_team_18.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_19, "testObject_NewLegalHoldService_team_19.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldService_team.testObject_NewLegalHoldService_team_20, "testObject_NewLegalHoldService_team_20.json")],
-      testCase ("Golden: ViewLegalHoldServiceInfo_team") $
+      testCase "Golden: ViewLegalHoldServiceInfo_team" $
         testObjects [(Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_1, "testObject_ViewLegalHoldServiceInfo_team_1.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_2, "testObject_ViewLegalHoldServiceInfo_team_2.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_3, "testObject_ViewLegalHoldServiceInfo_team_3.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_4, "testObject_ViewLegalHoldServiceInfo_team_4.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_5, "testObject_ViewLegalHoldServiceInfo_team_5.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_6, "testObject_ViewLegalHoldServiceInfo_team_6.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_7, "testObject_ViewLegalHoldServiceInfo_team_7.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_8, "testObject_ViewLegalHoldServiceInfo_team_8.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_9, "testObject_ViewLegalHoldServiceInfo_team_9.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_10, "testObject_ViewLegalHoldServiceInfo_team_10.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_11, "testObject_ViewLegalHoldServiceInfo_team_11.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_12, "testObject_ViewLegalHoldServiceInfo_team_12.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_13, "testObject_ViewLegalHoldServiceInfo_team_13.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_14, "testObject_ViewLegalHoldServiceInfo_team_14.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_15, "testObject_ViewLegalHoldServiceInfo_team_15.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_16, "testObject_ViewLegalHoldServiceInfo_team_16.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_17, "testObject_ViewLegalHoldServiceInfo_team_17.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_18, "testObject_ViewLegalHoldServiceInfo_team_18.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_19, "testObject_ViewLegalHoldServiceInfo_team_19.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldServiceInfo_team.testObject_ViewLegalHoldServiceInfo_team_20, "testObject_ViewLegalHoldServiceInfo_team_20.json")],
-      testCase ("Golden: ViewLegalHoldService_team") $
+      testCase "Golden: ViewLegalHoldService_team" $
         testObjects [(Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_1, "testObject_ViewLegalHoldService_team_1.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_2, "testObject_ViewLegalHoldService_team_2.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_3, "testObject_ViewLegalHoldService_team_3.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_4, "testObject_ViewLegalHoldService_team_4.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_5, "testObject_ViewLegalHoldService_team_5.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_6, "testObject_ViewLegalHoldService_team_6.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_7, "testObject_ViewLegalHoldService_team_7.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_8, "testObject_ViewLegalHoldService_team_8.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_9, "testObject_ViewLegalHoldService_team_9.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_10, "testObject_ViewLegalHoldService_team_10.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_11, "testObject_ViewLegalHoldService_team_11.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_12, "testObject_ViewLegalHoldService_team_12.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_13, "testObject_ViewLegalHoldService_team_13.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_14, "testObject_ViewLegalHoldService_team_14.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_15, "testObject_ViewLegalHoldService_team_15.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_16, "testObject_ViewLegalHoldService_team_16.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_17, "testObject_ViewLegalHoldService_team_17.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_18, "testObject_ViewLegalHoldService_team_18.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_19, "testObject_ViewLegalHoldService_team_19.json"), (Test.Wire.API.Golden.Generated.ViewLegalHoldService_team.testObject_ViewLegalHoldService_team_20, "testObject_ViewLegalHoldService_team_20.json")],
-      testCase ("Golden: UserLegalHoldStatusResponse_team") $
+      testCase "Golden: UserLegalHoldStatusResponse_team" $
         testObjects [(Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_1, "testObject_UserLegalHoldStatusResponse_team_1.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_2, "testObject_UserLegalHoldStatusResponse_team_2.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_3, "testObject_UserLegalHoldStatusResponse_team_3.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_4, "testObject_UserLegalHoldStatusResponse_team_4.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_5, "testObject_UserLegalHoldStatusResponse_team_5.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_6, "testObject_UserLegalHoldStatusResponse_team_6.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_7, "testObject_UserLegalHoldStatusResponse_team_7.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_8, "testObject_UserLegalHoldStatusResponse_team_8.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_9, "testObject_UserLegalHoldStatusResponse_team_9.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_10, "testObject_UserLegalHoldStatusResponse_team_10.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_11, "testObject_UserLegalHoldStatusResponse_team_11.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_12, "testObject_UserLegalHoldStatusResponse_team_12.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_13, "testObject_UserLegalHoldStatusResponse_team_13.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_14, "testObject_UserLegalHoldStatusResponse_team_14.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_15, "testObject_UserLegalHoldStatusResponse_team_15.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_16, "testObject_UserLegalHoldStatusResponse_team_16.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_17, "testObject_UserLegalHoldStatusResponse_team_17.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_18, "testObject_UserLegalHoldStatusResponse_team_18.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_19, "testObject_UserLegalHoldStatusResponse_team_19.json"), (Test.Wire.API.Golden.Generated.UserLegalHoldStatusResponse_team.testObject_UserLegalHoldStatusResponse_team_20, "testObject_UserLegalHoldStatusResponse_team_20.json")],
-      testCase ("Golden: RemoveLegalHoldSettingsRequest_team") $
+      testCase "Golden: RemoveLegalHoldSettingsRequest_team" $
         testObjects [(Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_1, "testObject_RemoveLegalHoldSettingsRequest_team_1.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_2, "testObject_RemoveLegalHoldSettingsRequest_team_2.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_3, "testObject_RemoveLegalHoldSettingsRequest_team_3.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_4, "testObject_RemoveLegalHoldSettingsRequest_team_4.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_5, "testObject_RemoveLegalHoldSettingsRequest_team_5.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_6, "testObject_RemoveLegalHoldSettingsRequest_team_6.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_7, "testObject_RemoveLegalHoldSettingsRequest_team_7.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_8, "testObject_RemoveLegalHoldSettingsRequest_team_8.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_9, "testObject_RemoveLegalHoldSettingsRequest_team_9.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_10, "testObject_RemoveLegalHoldSettingsRequest_team_10.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_11, "testObject_RemoveLegalHoldSettingsRequest_team_11.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_12, "testObject_RemoveLegalHoldSettingsRequest_team_12.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_13, "testObject_RemoveLegalHoldSettingsRequest_team_13.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_14, "testObject_RemoveLegalHoldSettingsRequest_team_14.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_15, "testObject_RemoveLegalHoldSettingsRequest_team_15.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_16, "testObject_RemoveLegalHoldSettingsRequest_team_16.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_17, "testObject_RemoveLegalHoldSettingsRequest_team_17.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_18, "testObject_RemoveLegalHoldSettingsRequest_team_18.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_19, "testObject_RemoveLegalHoldSettingsRequest_team_19.json"), (Test.Wire.API.Golden.Generated.RemoveLegalHoldSettingsRequest_team.testObject_RemoveLegalHoldSettingsRequest_team_20, "testObject_RemoveLegalHoldSettingsRequest_team_20.json")],
-      testCase ("Golden: DisableLegalHoldForUserRequest_team") $
+      testCase "Golden: DisableLegalHoldForUserRequest_team" $
         testObjects [(Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_1, "testObject_DisableLegalHoldForUserRequest_team_1.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_2, "testObject_DisableLegalHoldForUserRequest_team_2.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_3, "testObject_DisableLegalHoldForUserRequest_team_3.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_4, "testObject_DisableLegalHoldForUserRequest_team_4.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_5, "testObject_DisableLegalHoldForUserRequest_team_5.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_6, "testObject_DisableLegalHoldForUserRequest_team_6.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_7, "testObject_DisableLegalHoldForUserRequest_team_7.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_8, "testObject_DisableLegalHoldForUserRequest_team_8.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_9, "testObject_DisableLegalHoldForUserRequest_team_9.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_10, "testObject_DisableLegalHoldForUserRequest_team_10.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_11, "testObject_DisableLegalHoldForUserRequest_team_11.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_12, "testObject_DisableLegalHoldForUserRequest_team_12.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_13, "testObject_DisableLegalHoldForUserRequest_team_13.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_14, "testObject_DisableLegalHoldForUserRequest_team_14.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_15, "testObject_DisableLegalHoldForUserRequest_team_15.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_16, "testObject_DisableLegalHoldForUserRequest_team_16.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_17, "testObject_DisableLegalHoldForUserRequest_team_17.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_18, "testObject_DisableLegalHoldForUserRequest_team_18.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_19, "testObject_DisableLegalHoldForUserRequest_team_19.json"), (Test.Wire.API.Golden.Generated.DisableLegalHoldForUserRequest_team.testObject_DisableLegalHoldForUserRequest_team_20, "testObject_DisableLegalHoldForUserRequest_team_20.json")],
-      testCase ("Golden: ApproveLegalHoldForUserRequest_team") $
+      testCase "Golden: ApproveLegalHoldForUserRequest_team" $
         testObjects [(Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_1, "testObject_ApproveLegalHoldForUserRequest_team_1.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_2, "testObject_ApproveLegalHoldForUserRequest_team_2.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_3, "testObject_ApproveLegalHoldForUserRequest_team_3.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_4, "testObject_ApproveLegalHoldForUserRequest_team_4.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_5, "testObject_ApproveLegalHoldForUserRequest_team_5.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_6, "testObject_ApproveLegalHoldForUserRequest_team_6.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_7, "testObject_ApproveLegalHoldForUserRequest_team_7.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_8, "testObject_ApproveLegalHoldForUserRequest_team_8.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_9, "testObject_ApproveLegalHoldForUserRequest_team_9.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_10, "testObject_ApproveLegalHoldForUserRequest_team_10.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_11, "testObject_ApproveLegalHoldForUserRequest_team_11.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_12, "testObject_ApproveLegalHoldForUserRequest_team_12.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_13, "testObject_ApproveLegalHoldForUserRequest_team_13.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_14, "testObject_ApproveLegalHoldForUserRequest_team_14.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_15, "testObject_ApproveLegalHoldForUserRequest_team_15.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_16, "testObject_ApproveLegalHoldForUserRequest_team_16.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_17, "testObject_ApproveLegalHoldForUserRequest_team_17.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_18, "testObject_ApproveLegalHoldForUserRequest_team_18.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_19, "testObject_ApproveLegalHoldForUserRequest_team_19.json"), (Test.Wire.API.Golden.Generated.ApproveLegalHoldForUserRequest_team.testObject_ApproveLegalHoldForUserRequest_team_20, "testObject_ApproveLegalHoldForUserRequest_team_20.json")],
-      testCase ("Golden: RequestNewLegalHoldClient_team") $
+      testCase "Golden: RequestNewLegalHoldClient_team" $
         testObjects [(Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_1, "testObject_RequestNewLegalHoldClient_team_1.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_2, "testObject_RequestNewLegalHoldClient_team_2.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_3, "testObject_RequestNewLegalHoldClient_team_3.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_4, "testObject_RequestNewLegalHoldClient_team_4.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_5, "testObject_RequestNewLegalHoldClient_team_5.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_6, "testObject_RequestNewLegalHoldClient_team_6.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_7, "testObject_RequestNewLegalHoldClient_team_7.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_8, "testObject_RequestNewLegalHoldClient_team_8.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_9, "testObject_RequestNewLegalHoldClient_team_9.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_10, "testObject_RequestNewLegalHoldClient_team_10.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_11, "testObject_RequestNewLegalHoldClient_team_11.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_12, "testObject_RequestNewLegalHoldClient_team_12.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_13, "testObject_RequestNewLegalHoldClient_team_13.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_14, "testObject_RequestNewLegalHoldClient_team_14.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_15, "testObject_RequestNewLegalHoldClient_team_15.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_16, "testObject_RequestNewLegalHoldClient_team_16.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_17, "testObject_RequestNewLegalHoldClient_team_17.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_18, "testObject_RequestNewLegalHoldClient_team_18.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_19, "testObject_RequestNewLegalHoldClient_team_19.json"), (Test.Wire.API.Golden.Generated.RequestNewLegalHoldClient_team.testObject_RequestNewLegalHoldClient_team_20, "testObject_RequestNewLegalHoldClient_team_20.json")],
-      testCase ("Golden: NewLegalHoldClient_team") $
+      testCase "Golden: NewLegalHoldClient_team" $
         testObjects [(Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_1, "testObject_NewLegalHoldClient_team_1.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_2, "testObject_NewLegalHoldClient_team_2.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_3, "testObject_NewLegalHoldClient_team_3.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_4, "testObject_NewLegalHoldClient_team_4.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_5, "testObject_NewLegalHoldClient_team_5.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_6, "testObject_NewLegalHoldClient_team_6.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_7, "testObject_NewLegalHoldClient_team_7.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_8, "testObject_NewLegalHoldClient_team_8.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_9, "testObject_NewLegalHoldClient_team_9.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_10, "testObject_NewLegalHoldClient_team_10.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_11, "testObject_NewLegalHoldClient_team_11.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_12, "testObject_NewLegalHoldClient_team_12.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_13, "testObject_NewLegalHoldClient_team_13.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_14, "testObject_NewLegalHoldClient_team_14.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_15, "testObject_NewLegalHoldClient_team_15.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_16, "testObject_NewLegalHoldClient_team_16.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_17, "testObject_NewLegalHoldClient_team_17.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_18, "testObject_NewLegalHoldClient_team_18.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_19, "testObject_NewLegalHoldClient_team_19.json"), (Test.Wire.API.Golden.Generated.NewLegalHoldClient_team.testObject_NewLegalHoldClient_team_20, "testObject_NewLegalHoldClient_team_20.json")],
-      testCase ("Golden: LegalHoldServiceConfirm_team") $
+      testCase "Golden: LegalHoldServiceConfirm_team" $
         testObjects [(Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_1, "testObject_LegalHoldServiceConfirm_team_1.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_2, "testObject_LegalHoldServiceConfirm_team_2.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_3, "testObject_LegalHoldServiceConfirm_team_3.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_4, "testObject_LegalHoldServiceConfirm_team_4.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_5, "testObject_LegalHoldServiceConfirm_team_5.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_6, "testObject_LegalHoldServiceConfirm_team_6.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_7, "testObject_LegalHoldServiceConfirm_team_7.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_8, "testObject_LegalHoldServiceConfirm_team_8.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_9, "testObject_LegalHoldServiceConfirm_team_9.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_10, "testObject_LegalHoldServiceConfirm_team_10.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_11, "testObject_LegalHoldServiceConfirm_team_11.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_12, "testObject_LegalHoldServiceConfirm_team_12.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_13, "testObject_LegalHoldServiceConfirm_team_13.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_14, "testObject_LegalHoldServiceConfirm_team_14.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_15, "testObject_LegalHoldServiceConfirm_team_15.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_16, "testObject_LegalHoldServiceConfirm_team_16.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_17, "testObject_LegalHoldServiceConfirm_team_17.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_18, "testObject_LegalHoldServiceConfirm_team_18.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_19, "testObject_LegalHoldServiceConfirm_team_19.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceConfirm_team.testObject_LegalHoldServiceConfirm_team_20, "testObject_LegalHoldServiceConfirm_team_20.json")],
-      testCase ("Golden: LegalHoldServiceRemove_team") $
+      testCase "Golden: LegalHoldServiceRemove_team" $
         testObjects [(Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_1, "testObject_LegalHoldServiceRemove_team_1.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_2, "testObject_LegalHoldServiceRemove_team_2.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_3, "testObject_LegalHoldServiceRemove_team_3.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_4, "testObject_LegalHoldServiceRemove_team_4.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_5, "testObject_LegalHoldServiceRemove_team_5.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_6, "testObject_LegalHoldServiceRemove_team_6.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_7, "testObject_LegalHoldServiceRemove_team_7.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_8, "testObject_LegalHoldServiceRemove_team_8.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_9, "testObject_LegalHoldServiceRemove_team_9.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_10, "testObject_LegalHoldServiceRemove_team_10.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_11, "testObject_LegalHoldServiceRemove_team_11.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_12, "testObject_LegalHoldServiceRemove_team_12.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_13, "testObject_LegalHoldServiceRemove_team_13.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_14, "testObject_LegalHoldServiceRemove_team_14.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_15, "testObject_LegalHoldServiceRemove_team_15.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_16, "testObject_LegalHoldServiceRemove_team_16.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_17, "testObject_LegalHoldServiceRemove_team_17.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_18, "testObject_LegalHoldServiceRemove_team_18.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_19, "testObject_LegalHoldServiceRemove_team_19.json"), (Test.Wire.API.Golden.Generated.LegalHoldServiceRemove_team.testObject_LegalHoldServiceRemove_team_20, "testObject_LegalHoldServiceRemove_team_20.json")],
-      testCase ("Golden: TeamMember_team") $
+      testCase "Golden: TeamMember_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_1, "testObject_TeamMember_team_1.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_2, "testObject_TeamMember_team_2.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_3, "testObject_TeamMember_team_3.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_4, "testObject_TeamMember_team_4.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_5, "testObject_TeamMember_team_5.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_6, "testObject_TeamMember_team_6.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_7, "testObject_TeamMember_team_7.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_8, "testObject_TeamMember_team_8.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_9, "testObject_TeamMember_team_9.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_10, "testObject_TeamMember_team_10.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_11, "testObject_TeamMember_team_11.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_12, "testObject_TeamMember_team_12.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_13, "testObject_TeamMember_team_13.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_14, "testObject_TeamMember_team_14.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_15, "testObject_TeamMember_team_15.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_16, "testObject_TeamMember_team_16.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_17, "testObject_TeamMember_team_17.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_18, "testObject_TeamMember_team_18.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_19, "testObject_TeamMember_team_19.json"), (Test.Wire.API.Golden.Generated.TeamMember_team.testObject_TeamMember_team_20, "testObject_TeamMember_team_20.json")],
-      testCase ("Golden: ListType_team") $
+      testCase "Golden: ListType_team" $
         testObjects [(Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_1, "testObject_ListType_team_1.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_2, "testObject_ListType_team_2.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_3, "testObject_ListType_team_3.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_4, "testObject_ListType_team_4.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_5, "testObject_ListType_team_5.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_6, "testObject_ListType_team_6.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_7, "testObject_ListType_team_7.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_8, "testObject_ListType_team_8.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_9, "testObject_ListType_team_9.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_10, "testObject_ListType_team_10.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_11, "testObject_ListType_team_11.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_12, "testObject_ListType_team_12.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_13, "testObject_ListType_team_13.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_14, "testObject_ListType_team_14.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_15, "testObject_ListType_team_15.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_16, "testObject_ListType_team_16.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_17, "testObject_ListType_team_17.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_18, "testObject_ListType_team_18.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_19, "testObject_ListType_team_19.json"), (Test.Wire.API.Golden.Generated.ListType_team.testObject_ListType_team_20, "testObject_ListType_team_20.json")],
-      testCase ("Golden: TeamMemberList_team") $
+      testCase "Golden: TeamMemberList_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_1, "testObject_TeamMemberList_team_1.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_2, "testObject_TeamMemberList_team_2.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_3, "testObject_TeamMemberList_team_3.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_4, "testObject_TeamMemberList_team_4.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_5, "testObject_TeamMemberList_team_5.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_6, "testObject_TeamMemberList_team_6.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_7, "testObject_TeamMemberList_team_7.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_8, "testObject_TeamMemberList_team_8.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_9, "testObject_TeamMemberList_team_9.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_10, "testObject_TeamMemberList_team_10.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_11, "testObject_TeamMemberList_team_11.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_12, "testObject_TeamMemberList_team_12.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_13, "testObject_TeamMemberList_team_13.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_14, "testObject_TeamMemberList_team_14.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_15, "testObject_TeamMemberList_team_15.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_16, "testObject_TeamMemberList_team_16.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_17, "testObject_TeamMemberList_team_17.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_18, "testObject_TeamMemberList_team_18.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_19, "testObject_TeamMemberList_team_19.json"), (Test.Wire.API.Golden.Generated.TeamMemberList_team.testObject_TeamMemberList_team_20, "testObject_TeamMemberList_team_20.json")],
-      testCase ("Golden: NewTeamMember_team") $
+      testCase "Golden: NewTeamMember_team" $
         testObjects [(Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_1, "testObject_NewTeamMember_team_1.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_2, "testObject_NewTeamMember_team_2.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_3, "testObject_NewTeamMember_team_3.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_4, "testObject_NewTeamMember_team_4.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_5, "testObject_NewTeamMember_team_5.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_6, "testObject_NewTeamMember_team_6.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_7, "testObject_NewTeamMember_team_7.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_8, "testObject_NewTeamMember_team_8.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_9, "testObject_NewTeamMember_team_9.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_10, "testObject_NewTeamMember_team_10.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_11, "testObject_NewTeamMember_team_11.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_12, "testObject_NewTeamMember_team_12.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_13, "testObject_NewTeamMember_team_13.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_14, "testObject_NewTeamMember_team_14.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_15, "testObject_NewTeamMember_team_15.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_16, "testObject_NewTeamMember_team_16.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_17, "testObject_NewTeamMember_team_17.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_18, "testObject_NewTeamMember_team_18.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_19, "testObject_NewTeamMember_team_19.json"), (Test.Wire.API.Golden.Generated.NewTeamMember_team.testObject_NewTeamMember_team_20, "testObject_NewTeamMember_team_20.json")],
-      testCase ("Golden: TeamMemberDeleteData_team") $
+      testCase "Golden: TeamMemberDeleteData_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_1, "testObject_TeamMemberDeleteData_team_1.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_2, "testObject_TeamMemberDeleteData_team_2.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_3, "testObject_TeamMemberDeleteData_team_3.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_4, "testObject_TeamMemberDeleteData_team_4.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_5, "testObject_TeamMemberDeleteData_team_5.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_6, "testObject_TeamMemberDeleteData_team_6.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_7, "testObject_TeamMemberDeleteData_team_7.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_8, "testObject_TeamMemberDeleteData_team_8.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_9, "testObject_TeamMemberDeleteData_team_9.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_10, "testObject_TeamMemberDeleteData_team_10.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_11, "testObject_TeamMemberDeleteData_team_11.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_12, "testObject_TeamMemberDeleteData_team_12.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_13, "testObject_TeamMemberDeleteData_team_13.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_14, "testObject_TeamMemberDeleteData_team_14.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_15, "testObject_TeamMemberDeleteData_team_15.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_16, "testObject_TeamMemberDeleteData_team_16.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_17, "testObject_TeamMemberDeleteData_team_17.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_18, "testObject_TeamMemberDeleteData_team_18.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_19, "testObject_TeamMemberDeleteData_team_19.json"), (Test.Wire.API.Golden.Generated.TeamMemberDeleteData_team.testObject_TeamMemberDeleteData_team_20, "testObject_TeamMemberDeleteData_team_20.json")],
-      testCase ("Golden: Permissions_team") $
+      testCase "Golden: Permissions_team" $
         testObjects [(Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_1, "testObject_Permissions_team_1.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_2, "testObject_Permissions_team_2.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_3, "testObject_Permissions_team_3.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_4, "testObject_Permissions_team_4.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_5, "testObject_Permissions_team_5.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_6, "testObject_Permissions_team_6.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_7, "testObject_Permissions_team_7.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_8, "testObject_Permissions_team_8.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_9, "testObject_Permissions_team_9.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_10, "testObject_Permissions_team_10.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_11, "testObject_Permissions_team_11.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_12, "testObject_Permissions_team_12.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_13, "testObject_Permissions_team_13.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_14, "testObject_Permissions_team_14.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_15, "testObject_Permissions_team_15.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_16, "testObject_Permissions_team_16.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_17, "testObject_Permissions_team_17.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_18, "testObject_Permissions_team_18.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_19, "testObject_Permissions_team_19.json"), (Test.Wire.API.Golden.Generated.Permissions_team.testObject_Permissions_team_20, "testObject_Permissions_team_20.json")],
-      testCase ("Golden: Role_team") $
+      testCase "Golden: Role_team" $
         testObjects [(Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_1, "testObject_Role_team_1.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_2, "testObject_Role_team_2.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_3, "testObject_Role_team_3.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_4, "testObject_Role_team_4.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_5, "testObject_Role_team_5.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_6, "testObject_Role_team_6.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_7, "testObject_Role_team_7.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_8, "testObject_Role_team_8.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_9, "testObject_Role_team_9.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_10, "testObject_Role_team_10.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_11, "testObject_Role_team_11.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_12, "testObject_Role_team_12.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_13, "testObject_Role_team_13.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_14, "testObject_Role_team_14.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_15, "testObject_Role_team_15.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_16, "testObject_Role_team_16.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_17, "testObject_Role_team_17.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_18, "testObject_Role_team_18.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_19, "testObject_Role_team_19.json"), (Test.Wire.API.Golden.Generated.Role_team.testObject_Role_team_20, "testObject_Role_team_20.json")],
-      testCase ("Golden: TeamSearchVisibility_team") $
+      testCase "Golden: TeamSearchVisibility_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_1, "testObject_TeamSearchVisibility_team_1.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_2, "testObject_TeamSearchVisibility_team_2.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_3, "testObject_TeamSearchVisibility_team_3.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_4, "testObject_TeamSearchVisibility_team_4.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_5, "testObject_TeamSearchVisibility_team_5.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_6, "testObject_TeamSearchVisibility_team_6.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_7, "testObject_TeamSearchVisibility_team_7.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_8, "testObject_TeamSearchVisibility_team_8.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_9, "testObject_TeamSearchVisibility_team_9.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_10, "testObject_TeamSearchVisibility_team_10.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_11, "testObject_TeamSearchVisibility_team_11.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_12, "testObject_TeamSearchVisibility_team_12.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_13, "testObject_TeamSearchVisibility_team_13.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_14, "testObject_TeamSearchVisibility_team_14.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_15, "testObject_TeamSearchVisibility_team_15.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_16, "testObject_TeamSearchVisibility_team_16.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_17, "testObject_TeamSearchVisibility_team_17.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_18, "testObject_TeamSearchVisibility_team_18.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_19, "testObject_TeamSearchVisibility_team_19.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibility_team.testObject_TeamSearchVisibility_team_20, "testObject_TeamSearchVisibility_team_20.json")],
-      testCase ("Golden: TeamSearchVisibilityView_team") $
+      testCase "Golden: TeamSearchVisibilityView_team" $
         testObjects [(Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_1, "testObject_TeamSearchVisibilityView_team_1.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_2, "testObject_TeamSearchVisibilityView_team_2.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_3, "testObject_TeamSearchVisibilityView_team_3.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_4, "testObject_TeamSearchVisibilityView_team_4.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_5, "testObject_TeamSearchVisibilityView_team_5.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_6, "testObject_TeamSearchVisibilityView_team_6.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_7, "testObject_TeamSearchVisibilityView_team_7.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_8, "testObject_TeamSearchVisibilityView_team_8.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_9, "testObject_TeamSearchVisibilityView_team_9.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_10, "testObject_TeamSearchVisibilityView_team_10.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_11, "testObject_TeamSearchVisibilityView_team_11.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_12, "testObject_TeamSearchVisibilityView_team_12.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_13, "testObject_TeamSearchVisibilityView_team_13.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_14, "testObject_TeamSearchVisibilityView_team_14.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_15, "testObject_TeamSearchVisibilityView_team_15.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_16, "testObject_TeamSearchVisibilityView_team_16.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_17, "testObject_TeamSearchVisibilityView_team_17.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_18, "testObject_TeamSearchVisibilityView_team_18.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_19, "testObject_TeamSearchVisibilityView_team_19.json"), (Test.Wire.API.Golden.Generated.TeamSearchVisibilityView_team.testObject_TeamSearchVisibilityView_team_20, "testObject_TeamSearchVisibilityView_team_20.json")]
     ]
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AccessRole_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AccessRole_user.hs
index 0be25d021f0..c38f30d2964 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AccessRole_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AccessRole_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -31,51 +29,3 @@ testObject_AccessRole_user_3 = ActivatedAccessRole
 
 testObject_AccessRole_user_4 :: AccessRole
 testObject_AccessRole_user_4 = TeamAccessRole
-
-testObject_AccessRole_user_5 :: AccessRole
-testObject_AccessRole_user_5 = PrivateAccessRole
-
-testObject_AccessRole_user_6 :: AccessRole
-testObject_AccessRole_user_6 = NonActivatedAccessRole
-
-testObject_AccessRole_user_7 :: AccessRole
-testObject_AccessRole_user_7 = NonActivatedAccessRole
-
-testObject_AccessRole_user_8 :: AccessRole
-testObject_AccessRole_user_8 = PrivateAccessRole
-
-testObject_AccessRole_user_9 :: AccessRole
-testObject_AccessRole_user_9 = NonActivatedAccessRole
-
-testObject_AccessRole_user_10 :: AccessRole
-testObject_AccessRole_user_10 = PrivateAccessRole
-
-testObject_AccessRole_user_11 :: AccessRole
-testObject_AccessRole_user_11 = NonActivatedAccessRole
-
-testObject_AccessRole_user_12 :: AccessRole
-testObject_AccessRole_user_12 = ActivatedAccessRole
-
-testObject_AccessRole_user_13 :: AccessRole
-testObject_AccessRole_user_13 = PrivateAccessRole
-
-testObject_AccessRole_user_14 :: AccessRole
-testObject_AccessRole_user_14 = PrivateAccessRole
-
-testObject_AccessRole_user_15 :: AccessRole
-testObject_AccessRole_user_15 = TeamAccessRole
-
-testObject_AccessRole_user_16 :: AccessRole
-testObject_AccessRole_user_16 = ActivatedAccessRole
-
-testObject_AccessRole_user_17 :: AccessRole
-testObject_AccessRole_user_17 = TeamAccessRole
-
-testObject_AccessRole_user_18 :: AccessRole
-testObject_AccessRole_user_18 = PrivateAccessRole
-
-testObject_AccessRole_user_19 :: AccessRole
-testObject_AccessRole_user_19 = NonActivatedAccessRole
-
-testObject_AccessRole_user_20 :: AccessRole
-testObject_AccessRole_user_20 = TeamAccessRole
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Access_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Access_user.hs
index d38f9e920eb..a83850f1e73 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Access_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Access_user.hs
@@ -30,52 +30,4 @@ testObject_Access_user_3 :: Access
 testObject_Access_user_3 = PrivateAccess
 
 testObject_Access_user_4 :: Access
-testObject_Access_user_4 = CodeAccess
-
-testObject_Access_user_5 :: Access
-testObject_Access_user_5 = InviteAccess
-
-testObject_Access_user_6 :: Access
-testObject_Access_user_6 = PrivateAccess
-
-testObject_Access_user_7 :: Access
-testObject_Access_user_7 = InviteAccess
-
-testObject_Access_user_8 :: Access
-testObject_Access_user_8 = CodeAccess
-
-testObject_Access_user_9 :: Access
-testObject_Access_user_9 = InviteAccess
-
-testObject_Access_user_10 :: Access
-testObject_Access_user_10 = LinkAccess
-
-testObject_Access_user_11 :: Access
-testObject_Access_user_11 = CodeAccess
-
-testObject_Access_user_12 :: Access
-testObject_Access_user_12 = LinkAccess
-
-testObject_Access_user_13 :: Access
-testObject_Access_user_13 = LinkAccess
-
-testObject_Access_user_14 :: Access
-testObject_Access_user_14 = CodeAccess
-
-testObject_Access_user_15 :: Access
-testObject_Access_user_15 = CodeAccess
-
-testObject_Access_user_16 :: Access
-testObject_Access_user_16 = PrivateAccess
-
-testObject_Access_user_17 :: Access
-testObject_Access_user_17 = InviteAccess
-
-testObject_Access_user_18 :: Access
-testObject_Access_user_18 = PrivateAccess
-
-testObject_Access_user_19 :: Access
-testObject_Access_user_19 = PrivateAccess
-
-testObject_Access_user_20 :: Access
-testObject_Access_user_20 = LinkAccess
+testObject_Access_user_4 = InviteAccess
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Action_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Action_user.hs
index f97c9990c83..32ba59d1f34 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Action_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Action_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -24,58 +22,25 @@ testObject_Action_user_1 :: Action
 testObject_Action_user_1 = AddConversationMember
 
 testObject_Action_user_2 :: Action
-testObject_Action_user_2 = ModifyConversationReceiptMode
+testObject_Action_user_2 = RemoveConversationMember
 
 testObject_Action_user_3 :: Action
-testObject_Action_user_3 = AddConversationMember
+testObject_Action_user_3 = ModifyConversationName
 
 testObject_Action_user_4 :: Action
-testObject_Action_user_4 = ModifyConversationName
+testObject_Action_user_4 = ModifyConversationMessageTimer
 
 testObject_Action_user_5 :: Action
-testObject_Action_user_5 = ModifyConversationAccess
+testObject_Action_user_5 = ModifyConversationReceiptMode
 
 testObject_Action_user_6 :: Action
-testObject_Action_user_6 = LeaveConversation
+testObject_Action_user_6 = ModifyConversationAccess
 
 testObject_Action_user_7 :: Action
-testObject_Action_user_7 = ModifyConversationAccess
+testObject_Action_user_7 = ModifyOtherConversationMember
 
 testObject_Action_user_8 :: Action
-testObject_Action_user_8 = ModifyConversationAccess
+testObject_Action_user_8 = LeaveConversation
 
 testObject_Action_user_9 :: Action
-testObject_Action_user_9 = LeaveConversation
-
-testObject_Action_user_10 :: Action
-testObject_Action_user_10 = ModifyConversationMessageTimer
-
-testObject_Action_user_11 :: Action
-testObject_Action_user_11 = DeleteConversation
-
-testObject_Action_user_12 :: Action
-testObject_Action_user_12 = ModifyConversationMessageTimer
-
-testObject_Action_user_13 :: Action
-testObject_Action_user_13 = LeaveConversation
-
-testObject_Action_user_14 :: Action
-testObject_Action_user_14 = RemoveConversationMember
-
-testObject_Action_user_15 :: Action
-testObject_Action_user_15 = ModifyConversationReceiptMode
-
-testObject_Action_user_16 :: Action
-testObject_Action_user_16 = LeaveConversation
-
-testObject_Action_user_17 :: Action
-testObject_Action_user_17 = ModifyConversationMessageTimer
-
-testObject_Action_user_18 :: Action
-testObject_Action_user_18 = LeaveConversation
-
-testObject_Action_user_19 :: Action
-testObject_Action_user_19 = DeleteConversation
-
-testObject_Action_user_20 :: Action
-testObject_Action_user_20 = ModifyOtherConversationMember
+testObject_Action_user_9 = DeleteConversation
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBotResponse_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBotResponse_user.hs
index f13a8fdacb9..ba92bf01810 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBotResponse_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBotResponse_user.hs
@@ -18,133 +18,27 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.AddBotResponse_user where
 
-import Data.Code (Key (Key, asciiKey), Value (Value, asciiValue))
-import Data.Coerce (coerce)
 import Data.Domain
 import Data.Id (BotId (BotId), ClientId (ClientId, client), Id (Id))
-import Data.Misc (HttpsUrl (HttpsUrl), Milliseconds (Ms, ms))
 import Data.Qualified
-import Data.Range (unsafeRange)
-import Data.Text.Ascii (AsciiChars (validate))
 import qualified Data.UUID as UUID (fromString)
-import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust, fromRight, read, undefined, (.))
-import URI.ByteString
-  ( Authority
-      ( Authority,
-        authorityHost,
-        authorityPort,
-        authorityUserInfo
-      ),
-    Host (Host, hostBS),
-    Query (Query, queryPairs),
-    Scheme (Scheme, schemeBS),
-    URIRef
-      ( URI,
-        uriAuthority,
-        uriFragment,
-        uriPath,
-        uriQuery,
-        uriScheme
-      ),
-  )
+import Imports (Maybe (Just, Nothing), fromJust, read, (.))
 import Wire.API.Conversation
-  ( Access (CodeAccess, LinkAccess, PrivateAccess),
-    AccessRole (ActivatedAccessRole, NonActivatedAccessRole),
-    ConvMembers (ConvMembers, cmOthers, cmSelf),
-    ConvType (RegularConv),
-    Conversation
-      ( Conversation,
-        cnvAccess,
-        cnvAccessRole,
-        cnvCreator,
-        cnvMembers,
-        cnvMessageTimer,
-        cnvName,
-        cnvQualifiedId,
-        cnvReceiptMode,
-        cnvTeam,
-        cnvType
-      ),
-    ConversationAccessUpdate
-      ( ConversationAccessUpdate,
-        cupAccess,
-        cupAccessRole
-      ),
-    ConversationMessageTimerUpdate
-      ( ConversationMessageTimerUpdate,
-        cupMessageTimer
-      ),
-    ConversationReceiptModeUpdate
-      ( ConversationReceiptModeUpdate,
-        cruReceiptMode
-      ),
-    ConversationRename (ConversationRename, cupName),
-    Member
-      ( Member,
-        memConvRoleName,
-        memHidden,
-        memHiddenRef,
-        memId,
-        memOtrArchived,
-        memOtrArchivedRef,
-        memOtrMuted,
-        memOtrMutedRef,
-        memOtrMutedStatus,
-        memService
-      ),
-    MutedStatus (MutedStatus, fromMutedStatus),
-    ReceiptMode (ReceiptMode, unReceiptMode),
+  ( ConversationRename (ConversationRename, cupName),
   )
 import Wire.API.Conversation.Bot (AddBotResponse (..))
-import Wire.API.Conversation.Code
-  ( ConversationCode
-      ( ConversationCode,
-        conversationCode,
-        conversationKey,
-        conversationUri
-      ),
-  )
-import Wire.API.Conversation.Role (parseRoleName)
 import Wire.API.Conversation.Typing (TypingData (TypingData, tdStatus), TypingStatus (StartedTyping))
 import Wire.API.Event.Conversation
-  ( Connect (Connect, cEmail, cMessage, cName, cRecipient),
-    Event (Event),
+  ( Event (Event),
     EventData (..),
     EventType
-      ( ConvAccessUpdate,
-        ConvCodeDelete,
-        ConvCodeUpdate,
-        ConvConnect,
-        ConvCreate,
-        ConvDelete,
-        ConvMessageTimerUpdate,
-        ConvReceiptModeUpdate,
-        ConvRename,
-        MemberJoin,
-        MemberLeave,
-        MemberStateUpdate,
+      ( ConvRename,
         Typing
       ),
-    MemberUpdateData
-      ( MemberUpdateData,
-        misConvRoleName,
-        misHidden,
-        misHiddenRef,
-        misOtrArchived,
-        misOtrArchivedRef,
-        misOtrMuted,
-        misOtrMutedRef,
-        misOtrMutedStatus,
-        misTarget
-      ),
-    QualifiedUserIdList (QualifiedUserIdList, qualifiedUserIdList),
-    SimpleMember (..),
-    SimpleMembers (SimpleMembers, mMembers),
   )
-import Wire.API.Provider.Service (ServiceRef (ServiceRef, _serviceRefId, _serviceRefProvider))
 import Wire.API.User
   ( Asset (ImageAsset),
-    AssetSize (AssetComplete, AssetPreview),
+    AssetSize (AssetPreview),
     ColourId (ColourId, fromColourId),
     Name (Name, fromName),
   )
@@ -152,7 +46,7 @@ import Wire.API.User
 testObject_AddBotResponse_user_1 :: AddBotResponse
 testObject_AddBotResponse_user_1 =
   AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000003-0000-0004-0000-000300000001"))),
+    { rsAddBotId = (BotId . Id) (fromJust (UUID.fromString "00000003-0000-0004-0000-000300000001")),
       rsAddBotClient = ClientId {client = "e"},
       rsAddBotName =
         Name
@@ -160,21 +54,20 @@ testObject_AddBotResponse_user_1 =
               "\77844\129468A\1061088\30365\142096\40918\USc\DC3~0g\ENQr\v\29872\f\154305\1077132u\175940.\1018427v\v-/\bi\bJ\ETXE3\ESC8\53613\1073036\&0@\14466\51733;\27113\SYN\153289\b&\ae]\1042471H\1024555k7\EMJ\1083646[;\140668;J^`0,B\STX\95353N.@Z\v\ENQ\r\19858|'w-\b\157432V\STX \GSW|N\1072850\&3=\22550K245\DC1\142803\168718\7168\147365\ETX"
           },
       rsAddBotColour = ColourId {fromColourId = -3},
-      rsAddBotAssets = [(ImageAsset "7" (Nothing)), (ImageAsset "" (Just AssetPreview))],
+      rsAddBotAssets = [ImageAsset "7" Nothing, ImageAsset "" (Just AssetPreview)],
       rsAddBotEvent =
-        ( Event
-            (ConvRename)
-            (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000003"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000400000004"))) (Domain "faraway.example.com"))
-            (read "1864-05-12 19:20:22.286 UTC")
-            ((EdConvRename (ConversationRename {cupName = "6"})))
-        )
+        Event
+          ConvRename
+          (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000003"))) (Domain "faraway.example.com"))
+          (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000400000004"))) (Domain "faraway.example.com"))
+          (read "1864-05-12 19:20:22.286 UTC")
+          (EdConvRename (ConversationRename {cupName = "6"}))
     }
 
 testObject_AddBotResponse_user_2 :: AddBotResponse
 testObject_AddBotResponse_user_2 =
   AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000001-0000-0003-0000-000200000004"))),
+    { rsAddBotId = (BotId . Id) (fromJust (UUID.fromString "00000001-0000-0003-0000-000200000004")),
       rsAddBotClient = ClientId {client = "e"},
       rsAddBotName =
         Name
@@ -184,616 +77,10 @@ testObject_AddBotResponse_user_2 =
       rsAddBotColour = ColourId {fromColourId = 3},
       rsAddBotAssets = [],
       rsAddBotEvent =
-        ( Event
-            (Typing)
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000300000001"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000300000001"))) (Domain "faraway.example.com"))
-            (read "1864-05-08 19:02:58.6 UTC")
-            ((EdTyping (TypingData {tdStatus = StartedTyping})))
-        )
-    }
-
-testObject_AddBotResponse_user_3 :: AddBotResponse
-testObject_AddBotResponse_user_3 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000003-0000-0001-0000-000400000002"))),
-      rsAddBotClient = ClientId {client = "d"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "%}\SI\188248U?;4a\986786\166069u\ETBy@\b?\".\SOH\"[\144254\154061\&1o)q\SUB<S\DC1\1017804\ETX\DC4\144917VV/D9ec\SOH*\169139oTf&(Q"
-          },
-      rsAddBotColour = ColourId {fromColourId = 0},
-      rsAddBotAssets =
-        [ (ImageAsset "" (Just AssetPreview)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Nothing))
-        ],
-      rsAddBotEvent =
-        ( Event
-            (ConvCreate)
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000003"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000400000004"))) (Domain "faraway.example.com"))
-            (read "1864-05-10 11:22:13.523 UTC")
-            ( ( EdConversation
-                  ( Conversation
-                      { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-                        cnvType = RegularConv,
-                        cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                        cnvAccess = [],
-                        cnvAccessRole = ActivatedAccessRole,
-                        cnvName = Nothing,
-                        cnvMembers =
-                          ConvMembers
-                            { cmSelf =
-                                Member
-                                  { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                                    memService = Nothing,
-                                    memOtrMuted = True,
-                                    memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                                    memOtrMutedRef = Just "",
-                                    memOtrArchived = True,
-                                    memOtrArchivedRef = Nothing,
-                                    memHidden = False,
-                                    memHiddenRef = Just "",
-                                    memConvRoleName = (fromJust (parseRoleName "fcwhpxsjc"))
-                                  },
-                              cmOthers = []
-                            },
-                        cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                        cnvMessageTimer = Just (Ms {ms = 2172415561652216}),
-                        cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_4 :: AddBotResponse
-testObject_AddBotResponse_user_4 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000003"))),
-      rsAddBotClient = ClientId {client = "9"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "M\185247\1113359K2(\DC2\EOT7>\143187\170327\r5w\1041114\RScH\1071165\142028D\ESC\EOT\1090183\1099007PE!\1037076c\153563~"
-          },
-      rsAddBotColour = ColourId {fromColourId = -4},
-      rsAddBotAssets = [],
-      rsAddBotEvent =
-        ( Event
-            (ConvDelete)
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0002-0000-000300000003"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000300000001"))) (Domain "faraway.example.com"))
-            (read "1864-05-06 03:03:10.788 UTC")
-            (EdConvDelete)
-        )
-    }
-
-testObject_AddBotResponse_user_5 :: AddBotResponse
-testObject_AddBotResponse_user_5 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000003-0000-0003-0000-000100000000"))),
-      rsAddBotClient = ClientId {client = "e"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "\1068088\1098987x\1059059\111046\1017502\\MpIc\1083784\1072885y\1088651w\181697\1025970\917804\DLEES5\ENQ\1109557\ACKP\tAx\SYN*k\1034159\1012266M\179955f\ETBMF\135162q\SUB\186144Zf\78416\32790\CAN\37672DB\1085248\171865\DC3[\46265!\1078020V(\FSp\1068585F4Xwp#\1085281TJ2\DC3\12434\1072939\1024286U&\rG\1111811h$R\rsL\998143\nz\1008788\DEL\ETXB"
-          },
-      rsAddBotColour = ColourId {fromColourId = -4},
-      rsAddBotAssets =
-        [ (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Just AssetPreview))
-        ],
-      rsAddBotEvent =
-        ( Event
-            (ConvCreate)
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000000000002"))) (Domain "faraway.example.com"))
-            (read "1864-05-13 21:19:26.488 UTC")
-            ( ( EdConversation
-                  ( Conversation
-                      { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-                        cnvType = RegularConv,
-                        cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                        cnvAccess = [],
-                        cnvAccessRole = NonActivatedAccessRole,
-                        cnvName = Just "",
-                        cnvMembers =
-                          ConvMembers
-                            { cmSelf =
-                                Member
-                                  { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                                    memService =
-                                      Just
-                                        ( ServiceRef
-                                            { _serviceRefId =
-                                                (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                                              _serviceRefProvider =
-                                                (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-                                            }
-                                        ),
-                                    memOtrMuted = True,
-                                    memOtrMutedStatus = Nothing,
-                                    memOtrMutedRef = Nothing,
-                                    memOtrArchived = True,
-                                    memOtrArchivedRef = Nothing,
-                                    memHidden = False,
-                                    memHiddenRef = Just "",
-                                    memConvRoleName =
-                                      ( fromJust
-                                          ( parseRoleName
-                                              "hnsnsqy4arvtd_u4_4_ewxmjtsbbrjsrhg1h2hy2uzwj8552_ql7ds_vo67fqw3wxue4_8ixydv3ao5w91_6_"
-                                          )
-                                      )
-                                  },
-                              cmOthers = []
-                            },
-                        cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                        cnvMessageTimer = Just (Ms {ms = 7052633912967928}),
-                        cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_6 :: AddBotResponse
-testObject_AddBotResponse_user_6 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000001-0000-0000-0000-000300000004"))),
-      rsAddBotClient = ClientId {client = "d"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "\999775.\NUL\FS{\ENQ\1072079f\40418.u\SUB\DC4-0BK\SI\ETB1k\150963\1074939\27325l13As\35452NY\1068437\SOD\138418A6qS\ETB6\186510\ETB\140762P\SOH=qz:\194647|H\SO+B\1101376\1088189\1107156\1006880\1031768\1005888\a\162351QA\142205&\1058662)\US7\DC3>'Sl.=\1080370\ACK\1021321\fO\993441oI\1001729\tb\1089639Zg\RS\179868\1061825YX\1052945.\1064688Q\181260\1000944-\190613"
-          },
-      rsAddBotColour = ColourId {fromColourId = -1},
-      rsAddBotAssets = [(ImageAsset "i" (Just AssetComplete)), (ImageAsset "" (Just AssetPreview))],
-      rsAddBotEvent =
-        ( Event
-            (ConvCodeUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000000000003"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000300000001"))) (Domain "faraway.example.com"))
-            (read "1864-05-14 23:40:44.551 UTC")
-            ( ( EdConvCodeUpdate
-                  ( ConversationCode
-                      { conversationKey =
-                          Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("ljLPNBdwXBNph6csPBYc")))))},
-                        conversationCode =
-                          Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("3A16c3OyeYqqLqhHKwZ")))))},
-                        conversationUri =
-                          Just
-                            ( coerce
-                                URI
-                                  { uriScheme = Scheme {schemeBS = "https"},
-                                    uriAuthority =
-                                      Just
-                                        ( Authority
-                                            { authorityUserInfo = Nothing,
-                                              authorityHost = Host {hostBS = "example.com"},
-                                              authorityPort = Nothing
-                                            }
-                                        ),
-                                    uriPath = "",
-                                    uriQuery = Query {queryPairs = []},
-                                    uriFragment = Nothing
-                                  }
-                            )
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_7 :: AddBotResponse
-testObject_AddBotResponse_user_7 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000000-0000-0003-0000-000300000000"))),
-      rsAddBotClient = ClientId {client = "c"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "q\NUL+\1023082{-\1050727h\994893\&3\1090806\151704&@jZqjW\27599\DLE\SI\997397\38806\rZ\1089468\n\CAN\1104095\DC1l\1030879\153742\1062975<`N nX?\987303+h.\SOH\1030244OhO9qy\1105414@\174579\14702\1101980\ftrG\1074806?]\1064538\RS\NULu.AA =9H5H2YJ\136205a"
-          },
-      rsAddBotColour = ColourId {fromColourId = -4},
-      rsAddBotAssets = [],
-      rsAddBotEvent =
-        ( Event
-            (ConvReceiptModeUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000300000004"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000400000001"))) (Domain "faraway.example.com"))
-            (read "1864-05-07 22:30:05.775 UTC")
-            ((EdConvReceiptModeUpdate (ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -4}})))
-        )
-    }
-
-testObject_AddBotResponse_user_8 :: AddBotResponse
-testObject_AddBotResponse_user_8 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000000-0000-0002-0000-000400000003"))),
-      rsAddBotClient = ClientId {client = "f"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "as\96525F\t\ETX\SIrPx7\am\SI;\984876\"\142529\&5\SI \DC2=\SO\1096241\179031\92226C\ESC\a4I\STX\166191Kw\SOH*\153298\158630\167768\GS\1019412\&5X\1028292`"
-          },
-      rsAddBotColour = ColourId {fromColourId = 0},
-      rsAddBotAssets = [],
-      rsAddBotEvent =
-        ( Event
-            (ConvAccessUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000003"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000400000000"))) (Domain "faraway.example.com"))
-            (read "1864-05-05 09:04:05.078 UTC")
-            ( ( EdConvAccessUpdate
-                  (ConversationAccessUpdate {cupAccess = [LinkAccess, PrivateAccess], cupAccessRole = ActivatedAccessRole})
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_9 :: AddBotResponse
-testObject_AddBotResponse_user_9 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000000-0000-0003-0000-000200000000"))),
-      rsAddBotClient = ClientId {client = "8"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "1\NAK5\2678\"9Vz\1016163^\188742^\1047071Q.lx\100386\1020807O\a+d=-}j3\1077280\32613w[\137747\178437p\1105250~5\ETX\1010116)\40699T$N\154953v\v{?\NAK\1061899\100656\33764mm\1093194Z\53192\1011057:\987661\&78S\DC4'\SYN\STXg\r}\a\64467q%"
-          },
-      rsAddBotColour = ColourId {fromColourId = 2},
-      rsAddBotAssets =
-        [(ImageAsset "" (Just AssetPreview)), (ImageAsset "" (Just AssetPreview)), (ImageAsset "" (Just AssetComplete))],
-      rsAddBotEvent =
-        ( Event
-            (MemberStateUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000000000004"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000002"))) (Domain "faraway.example.com"))
-            (read "1864-05-07 17:13:06.966 UTC")
-            ( ( EdMemberUpdate
-                  ( MemberUpdateData
-                      { misTarget = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                        misOtrMuted = Just False,
-                        misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                        misOtrMutedRef = Just "",
-                        misOtrArchived = Just False,
-                        misOtrArchivedRef = Just "",
-                        misHidden = Just True,
-                        misHiddenRef = Just "",
-                        misConvRoleName = Just (fromJust (parseRoleName "eivv0nnmraefi0496_5lyptwgu4jl"))
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_10 :: AddBotResponse
-testObject_AddBotResponse_user_10 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000000-0000-0003-0000-000400000000"))),
-      rsAddBotClient = ClientId {client = "10"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "e1\DLE\153961\&3\163202\&2\1103669h!1Tr\96993\f;\DC4\ETBv\v\1029060\bi\155875<j\983215\62340\DC3\1015139\SUB{\1022362\SOH\173354\143782h\32052@8|:#\DLE0\128761P.zl\b@\149099(Z\v\7261\30294\156404\SOI/LLn|\24048\&6X\bfjL\DC3\NUL\97693\1043236G\CAN\94340\DLE\SUB\1031646\1027553\DC4.\1020310\RSUZ\1089060\1073793Nh\ETB\1032954y)\1073938 !\ax\1070491\DC3x\1021222cF#\EM\ETB\f\31882"
-          },
-      rsAddBotColour = ColourId {fromColourId = 3},
-      rsAddBotAssets = [(ImageAsset "^\10571" (Just AssetPreview))],
-      rsAddBotEvent =
-        ( Event
-            (MemberLeave)
-            (Qualified (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000400000001"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000000"))) (Domain "faraway.example.com"))
-            (read "1864-05-04 10:22:33.842 UTC")
-            ((EdMembersLeave (QualifiedUserIdList {qualifiedUserIdList = []})))
-        )
-    }
-
-testObject_AddBotResponse_user_11 :: AddBotResponse
-testObject_AddBotResponse_user_11 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000003-0000-0000-0000-000200000001"))),
-      rsAddBotClient = ClientId {client = "c"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "+H$M\DC4'K03\\w\97649\1031181\1084666\48358(e\1046706\n\1080595\SO\NAK-9\63441fu\62634~\DC1\FS\160021\1112396\th^\EOTv\50306#9b\GS\"u\1070054\DLE\1032511y\119655Qn8\169751\1039556\&5Q\1020388\168750\24449\\\1036423\&3l\119314`\DC1@+\RSd!\1035629\DELaxx\155717\1018607\5272\GSo\1066879f\GS\ETXjrC\DC2Pk"
-          },
-      rsAddBotColour = ColourId {fromColourId = 0},
-      rsAddBotAssets = [],
-      rsAddBotEvent =
-        ( Event
-            (ConvAccessUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000300000004"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0003-0000-000100000000"))) (Domain "faraway.example.com"))
-            (read "1864-05-04 14:10:34.032 UTC")
-            ( ( EdConvAccessUpdate
-                  (ConversationAccessUpdate {cupAccess = [CodeAccess], cupAccessRole = ActivatedAccessRole})
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_12 :: AddBotResponse
-testObject_AddBotResponse_user_12 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000000-0000-0004-0000-000200000003"))),
-      rsAddBotClient = ClientId {client = "5"},
-      rsAddBotName = Name {fromName = "\32648Q2\r.+\144332\NUL'Wm)U|X.\183698\EMm\STXu\NAK\168000\&4G3>k"},
-      rsAddBotColour = ColourId {fromColourId = -4},
-      rsAddBotAssets = [(ImageAsset "\DC1" (Just AssetComplete))],
-      rsAddBotEvent =
-        ( Event
-            (ConvConnect)
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000200000000"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))) (Domain "faraway.example.com"))
-            (read "1864-05-05 01:06:47.245 UTC")
-            ( ( EdConnect
-                  ( Connect
-                      { cRecipient = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                        cMessage = Just "",
-                        cName = Nothing,
-                        cEmail = Just "\ETX"
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_13 :: AddBotResponse
-testObject_AddBotResponse_user_13 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000004-0000-0002-0000-000100000003"))),
-      rsAddBotClient = ClientId {client = "9"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "k\54132\14593u<svb\GS\FS\1110603aA>\1087127.\ESCOR&@i>\5779\&2\16904F=\DC4N\1085511!8\DC2\27584\EM\GS\SOH\1063251\166794JuD\ACK\SIg]\SYNZ\FS\DC3\1032653\&4&\185903F7f\1106747n\n~X\NUL^A\DLE\\\1044227=\CAN.<\EMzR\n\GSK\1085670\GS\185700\999363\f\STX!\94324^\bh\1092202?\4754\141305\GSF\1012463\1085638{\ESC>$\26360\SOHR\1110563-#U\131789\1068409\&9"
-          },
-      rsAddBotColour = ColourId {fromColourId = -1},
-      rsAddBotAssets =
-        [ (ImageAsset "" (Just AssetPreview)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Just AssetPreview)),
-          (ImageAsset "" (Just AssetPreview))
-        ],
-      rsAddBotEvent =
-        ( Event
-            (ConvReceiptModeUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000100000001"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0001-0000-000400000002"))) (Domain "faraway.example.com"))
-            (read "1864-05-13 05:09:37.371 UTC")
-            ((EdConvReceiptModeUpdate (ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 3}})))
-        )
-    }
-
-testObject_AddBotResponse_user_14 :: AddBotResponse
-testObject_AddBotResponse_user_14 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000004-0000-0004-0000-000000000004"))),
-      rsAddBotClient = ClientId {client = "8"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "\DLEf\35790\&6b\1667\1059776i\59844\ETX\"\r\1071318 \1051731\r\1090000R\29687v\140936fh^'\1105777\RS\ENQ\1088038[e\nG\1002512\1079413\1038391{\ACK^\1063969Gt\150750DUFa\1007520\fn6xm7T\ETB`{ 2\rN0F\1042124y\996716!+\DLE\STX\EM!f~\tu\SYN\1090525i\1075169\DC2k\129582\NULP\63700\n1k\53262\&0HS s}\DC1pG\RS\DC2<\1106323n,\ESC_\15853ta\178665"
-          },
-      rsAddBotColour = ColourId {fromColourId = 4},
-      rsAddBotAssets = [],
-      rsAddBotEvent =
-        ( Event
-            (MemberStateUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000000000004"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))) (Domain "faraway.example.com"))
-            (read "1864-05-13 06:48:06.601 UTC")
-            ( ( EdMemberUpdate
-                  ( MemberUpdateData
-                      { misTarget = Nothing,
-                        misOtrMuted = Just True,
-                        misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                        misOtrMutedRef = Nothing,
-                        misOtrArchived = Just True,
-                        misOtrArchivedRef = Just "",
-                        misHidden = Just True,
-                        misHiddenRef = Just "",
-                        misConvRoleName = Just (fromJust (parseRoleName "xlbj5ajmu4ece6fb70ff1wioos7qm8rgg5aenk8eer"))
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_15 :: AddBotResponse
-testObject_AddBotResponse_user_15 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000002-0000-0004-0000-000100000003"))),
-      rsAddBotClient = ClientId {client = "d"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "Y\1061604(\DLE<|O\179000ZM0$t~\DC4\986728\1003601Z*A/iOYx\1036037MhVOS\189640\&1>%!\CANnE4\170465@o/\98343\1043770\128919a\1013091.7\1086427\32740\1048482< '!\1056452Z \NULY\fUp\132104\&0\1001544r\157627\1021353<?E0@\9634U-\12295\NAK\EM\127773C#-q>I\1063205"
-          },
-      rsAddBotColour = ColourId {fromColourId = -4},
-      rsAddBotAssets =
-        [ (ImageAsset "" (Nothing)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Just AssetPreview))
-        ],
-      rsAddBotEvent =
-        ( Event
-            (MemberJoin)
-            (Qualified (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000200000003"))) (Domain "faraway.example.com"))
-            (read "1864-05-11 04:21:51.377 UTC")
-            ( ( EdMembersJoin
-                  ( SimpleMembers
-                      { mMembers =
-                          [ SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000001"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "uk7gwif0crc3wgiak6qae948ny57lwbwbtgbhran16vnewvp10eqialhaq9m38bqbczm_17nl46lhxs3h2cf448_7zcazh1f4ao8gnrzutbhd29j_lvsz"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "il2dfqczvqqvs3vcob7t6t7zi61y4hxgxmmpp19ueznkasq5q1cssn72l5df92b64yuqsizc6up2p1270hu18t97oifzl"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000002"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  (fromJust (parseRoleName "jf7f75hkum6_zxqiabxu8zix2_1kutsjijedcjckapwmymcxx11"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000002"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "i700417q9qqygs5k5a0zvvnpkvg2jimgi_stuyzfxgokyvy05n3_vgikqr0t5ldsb5fvltb8pylb"
-                                      )
-                                  )
-                              }
-                          ]
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_16 :: AddBotResponse
-testObject_AddBotResponse_user_16 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000000-0000-0002-0000-000300000000"))),
-      rsAddBotClient = ClientId {client = "10"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "x[rw<J&rN?\3913\33850:\134766\1089867P\183077\FSu\"v\1028695\1085626yh\93054\&1\1089002pt>\71735\SUB\1043617\989645\&9InR <!\US\ENQ\SOnlp\SOH\996730\1069502\4190''\999323wN\a\GS\1034051\\\184462\51800\&0\GS"
-          },
-      rsAddBotColour = ColourId {fromColourId = 1},
-      rsAddBotAssets = [(ImageAsset "" (Just AssetComplete))],
-      rsAddBotEvent =
-        ( Event
-            (ConvRename)
-            (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000200000000"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))) (Domain "faraway.example.com"))
-            (read "1864-05-07 11:54:38.133 UTC")
-            ((EdConvRename (ConversationRename {cupName = "\72291)@\16969"})))
-        )
-    }
-
-testObject_AddBotResponse_user_17 :: AddBotResponse
-testObject_AddBotResponse_user_17 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000000"))),
-      rsAddBotClient = ClientId {client = "5"},
-      rsAddBotName = Name {fromName = "5\1088094\1082372\v\ACKh\49710TMp\141571Q\DLE\r7\SYN\FS\1073186\1011197."},
-      rsAddBotColour = ColourId {fromColourId = -2},
-      rsAddBotAssets = [],
-      rsAddBotEvent =
-        ( Event
-            (ConvAccessUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0002-0000-000100000002"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000400000001"))) (Domain "faraway.example.com"))
-            (read "1864-05-09 16:18:32.395 UTC")
-            ( ( EdConvAccessUpdate
-                  ( ConversationAccessUpdate
-                      { cupAccess = [PrivateAccess, LinkAccess, CodeAccess, LinkAccess],
-                        cupAccessRole = NonActivatedAccessRole
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_AddBotResponse_user_18 :: AddBotResponse
-testObject_AddBotResponse_user_18 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000004-0000-0003-0000-000300000003"))),
-      rsAddBotClient = ClientId {client = "5"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "w\ACK\1102507l\SOHyL1\ACK/\NULJ&\rdp\1056119\6750D[\58993\&2\"\\,{\ESC\1088106\SO\1023674\v0\36489\NULL\1056420u\NAKY\ETX\15250\SI46\151359#\GSl\100201\DC3'v\317\95322\aP`"
-          },
-      rsAddBotColour = ColourId {fromColourId = 1},
-      rsAddBotAssets =
-        [ (ImageAsset "" (Nothing)),
-          (ImageAsset "" (Just AssetComplete)),
-          (ImageAsset "" (Nothing)),
-          (ImageAsset "" (Just AssetPreview)),
-          (ImageAsset "" (Just AssetComplete))
-        ],
-      rsAddBotEvent =
-        ( Event
-            (ConvRename)
-            (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000003"))) (Domain "faraway.example.com"))
-            (read "1864-05-13 04:14:10.186 UTC")
-            ((EdConvRename (ConversationRename {cupName = "+S\994417x1"})))
-        )
-    }
-
-testObject_AddBotResponse_user_19 :: AddBotResponse
-testObject_AddBotResponse_user_19 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000004-0000-0001-0000-000400000002"))),
-      rsAddBotClient = ClientId {client = "d"},
-      rsAddBotName = Name {fromName = "4\a\FStZ7UW57\50835\&5\b\27742\ETBJ\GSE~>~\FS%^\133042\38979u\EM\US"},
-      rsAddBotColour = ColourId {fromColourId = 3},
-      rsAddBotAssets = [(ImageAsset "\1082326" (Just AssetComplete)), (ImageAsset "" (Just AssetComplete))],
-      rsAddBotEvent =
-        ( Event
-            (ConvCodeDelete)
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0003-0000-000000000000"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000400000002"))) (Domain "faraway.example.com"))
-            (read "1864-05-14 03:03:50.569 UTC")
-            (EdConvCodeDelete)
-        )
-    }
-
-testObject_AddBotResponse_user_20 :: AddBotResponse
-testObject_AddBotResponse_user_20 =
-  AddBotResponse
-    { rsAddBotId = ((BotId . Id) (fromJust (UUID.fromString "00000004-0000-0004-0000-000000000001"))),
-      rsAddBotClient = ClientId {client = "b"},
-      rsAddBotName =
-        Name
-          { fromName =
-              "hn<t\ESCF\1049708\&1\8640\1013871\rHo\42150\&2il+\154829%E\1023597\30168q\70313\&6\DC4-x\ESC\f\rf\63824\38026e6=\1026969x\20152\18285\1014019\1110690\"\51817\DLE\48592\29710Uty+?[#R\1010159<<\23046\&9\983087\STXP\SUBh\DC3\t\a\SI\SI[@\\\".\ESC\153070;\1098598\156987\1063103^D3!dVo:\"wM\ETB"
-          },
-      rsAddBotColour = ColourId {fromColourId = -1},
-      rsAddBotAssets = [(ImageAsset "\12303" (Just AssetComplete))],
-      rsAddBotEvent =
-        ( Event
-            (ConvMessageTimerUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00000003-0000-0002-0000-000200000004"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000200000004"))) (Domain "faraway.example.com"))
-            (read "1864-05-08 05:48:34.348 UTC")
-            ( ( EdConvMessageTimerUpdate
-                  (ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 3346692440762670})})
-              )
-            )
-        )
+        Event
+          Typing
+          (Qualified (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000300000001"))) (Domain "faraway.example.com"))
+          (Qualified (Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000300000001"))) (Domain "faraway.example.com"))
+          (read "1864-05-08 19:02:58.6 UTC")
+          (EdTyping (TypingData {tdStatus = StartedTyping}))
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBot_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBot_user.hs
index b63654ee512..8cf34d7a49a 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBot_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AddBot_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -18,47 +16,9 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.AddBot_user where
 
-import Data.ISO3166_CountryCodes
-  ( CountryCode
-      ( BN,
-        BV,
-        DJ,
-        DK,
-        EC,
-        GR,
-        GU,
-        IQ,
-        LI,
-        LR,
-        MK,
-        MR,
-        MU,
-        PW,
-        TD,
-        TR
-      ),
-  )
+import Data.ISO3166_CountryCodes (CountryCode (GR))
 import Data.Id (Id (Id))
-import qualified Data.LanguageCodes
-  ( ISO639_1
-      ( AA,
-        AZ,
-        BA,
-        BS,
-        EU,
-        KI,
-        KV,
-        MN,
-        NB,
-        PT,
-        SD,
-        SM,
-        SO,
-        TK,
-        UG,
-        UZ
-      ),
-  )
+import qualified Data.LanguageCodes (ISO639_1 (UZ))
 import qualified Data.UUID as UUID (fromString)
 import Imports (Maybe (Just, Nothing), fromJust)
 import Wire.API.Conversation.Bot (AddBot (..))
@@ -67,175 +27,16 @@ import Wire.API.User (Country (Country, fromCountry), Language (Language), Local
 testObject_AddBot_user_1 :: AddBot
 testObject_AddBot_user_1 =
   AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000015-0000-0010-0000-00110000000d"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000010-0000-000c-0000-001800000010"))),
+    { addBotProvider = Id (fromJust (UUID.fromString "00000015-0000-0010-0000-00110000000d")),
+      addBotService = Id (fromJust (UUID.fromString "00000010-0000-000c-0000-001800000010")),
       addBotLocale = Nothing
     }
 
 testObject_AddBot_user_2 :: AddBot
 testObject_AddBot_user_2 =
   AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000000-0000-0014-0000-00060000001e"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000005-0000-0018-0000-000600000005"))),
+    { addBotProvider = Id (fromJust (UUID.fromString "00000000-0000-0014-0000-00060000001e")),
+      addBotService = Id (fromJust (UUID.fromString "00000005-0000-0018-0000-000600000005")),
       addBotLocale =
         Just (Locale {lLanguage = Language Data.LanguageCodes.UZ, lCountry = Just (Country {fromCountry = GR})})
     }
-
-testObject_AddBot_user_3 :: AddBot
-testObject_AddBot_user_3 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000001d-0000-0009-0000-001f0000000f"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000000-0000-000b-0000-000000000017"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.AZ, lCountry = Just (Country {fromCountry = LI})})
-    }
-
-testObject_AddBot_user_4 :: AddBot
-testObject_AddBot_user_4 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000012-0000-001a-0000-000d0000001c"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000001d-0000-0005-0000-001500000019"))),
-      addBotLocale = Nothing
-    }
-
-testObject_AddBot_user_5 :: AddBot
-testObject_AddBot_user_5 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000001-0000-0013-0000-001500000020"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000000b-0000-0005-0000-00060000001a"))),
-      addBotLocale = Just (Locale {lLanguage = Language Data.LanguageCodes.KV, lCountry = Nothing})
-    }
-
-testObject_AddBot_user_6 :: AddBot
-testObject_AddBot_user_6 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000000d-0000-001e-0000-000b00000003"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000001d-0000-0002-0000-000e00000001"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.BA, lCountry = Just (Country {fromCountry = PW})})
-    }
-
-testObject_AddBot_user_7 :: AddBot
-testObject_AddBot_user_7 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000001c-0000-000e-0000-001700000018"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000a00000011"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.TK, lCountry = Just (Country {fromCountry = GU})})
-    }
-
-testObject_AddBot_user_8 :: AddBot
-testObject_AddBot_user_8 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000020-0000-0018-0000-00180000000c"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000001a-0000-0009-0000-001200000019"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.SM, lCountry = Just (Country {fromCountry = MK})})
-    }
-
-testObject_AddBot_user_9 :: AddBot
-testObject_AddBot_user_9 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000000-0000-0019-0000-000f00000012"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000001b-0000-000b-0000-000500000007"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.UG, lCountry = Just (Country {fromCountry = LR})})
-    }
-
-testObject_AddBot_user_10 :: AddBot
-testObject_AddBot_user_10 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000000f-0000-0016-0000-002000000010"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000000-0000-000e-0000-00000000001d"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.PT, lCountry = Just (Country {fromCountry = MR})})
-    }
-
-testObject_AddBot_user_11 :: AddBot
-testObject_AddBot_user_11 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000000a-0000-0015-0000-00030000000c"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000001e-0000-0004-0000-00080000000e"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.SO, lCountry = Just (Country {fromCountry = DK})})
-    }
-
-testObject_AddBot_user_12 :: AddBot
-testObject_AddBot_user_12 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000001-0000-0011-0000-001500000015"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000011-0000-000a-0000-000d0000001d"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.SD, lCountry = Just (Country {fromCountry = BV})})
-    }
-
-testObject_AddBot_user_13 :: AddBot
-testObject_AddBot_user_13 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000019-0000-001a-0000-001800000009"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000016-0000-001e-0000-001d00000019"))),
-      addBotLocale = Just (Locale {lLanguage = Language Data.LanguageCodes.EU, lCountry = Nothing})
-    }
-
-testObject_AddBot_user_14 :: AddBot
-testObject_AddBot_user_14 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000001e-0000-0008-0000-001b00000014"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000016-0000-000d-0000-000800000003"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.AA, lCountry = Just (Country {fromCountry = IQ})})
-    }
-
-testObject_AddBot_user_15 :: AddBot
-testObject_AddBot_user_15 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000006-0000-000c-0000-00180000000a"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000017-0000-001e-0000-00020000001d"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.NB, lCountry = Just (Country {fromCountry = TR})})
-    }
-
-testObject_AddBot_user_16 :: AddBot
-testObject_AddBot_user_16 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000001f-0000-001b-0000-000c00000008"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000000d-0000-001e-0000-001000000007"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.BS, lCountry = Just (Country {fromCountry = MU})})
-    }
-
-testObject_AddBot_user_17 :: AddBot
-testObject_AddBot_user_17 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000020-0000-001a-0000-001600000004"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000001a-0000-0013-0000-001600000014"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.MN, lCountry = Just (Country {fromCountry = EC})})
-    }
-
-testObject_AddBot_user_18 :: AddBot
-testObject_AddBot_user_18 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000001e-0000-0005-0000-00010000001e"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000001a-0000-0003-0000-00020000001e"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.KI, lCountry = Just (Country {fromCountry = TD})})
-    }
-
-testObject_AddBot_user_19 :: AddBot
-testObject_AddBot_user_19 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "00000019-0000-0014-0000-000c0000000f"))),
-      addBotService = (Id (fromJust (UUID.fromString "0000000f-0000-0005-0000-001d00000007"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.AZ, lCountry = Just (Country {fromCountry = DJ})})
-    }
-
-testObject_AddBot_user_20 :: AddBot
-testObject_AddBot_user_20 =
-  AddBot
-    { addBotProvider = (Id (fromJust (UUID.fromString "0000000f-0000-0003-0000-001400000006"))),
-      addBotService = (Id (fromJust (UUID.fromString "00000010-0000-0014-0000-000600000016"))),
-      addBotLocale =
-        Just (Locale {lLanguage = Language Data.LanguageCodes.KV, lCountry = Just (Country {fromCountry = BN})})
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AppName_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AppName_user.hs
index 2610bd1f087..deebb3d8e91 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AppName_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AppName_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,65 +20,3 @@ import Wire.API.Push.Token (AppName (..))
 
 testObject_AppName_user_1 :: AppName
 testObject_AppName_user_1 = AppName {appNameText = "\23200t\185607p+`\n\1087056KZ^Mn\DEL\851\997322Cb\ENQ\CAN\149470m"}
-
-testObject_AppName_user_2 :: AppName
-testObject_AppName_user_2 = AppName {appNameText = ""}
-
-testObject_AppName_user_3 :: AppName
-testObject_AppName_user_3 = AppName {appNameText = "{\50842B$1)<"}
-
-testObject_AppName_user_4 :: AppName
-testObject_AppName_user_4 = AppName {appNameText = "\188871\&2H\\\22947LOV/\SI"}
-
-testObject_AppName_user_5 :: AppName
-testObject_AppName_user_5 =
-  AppName {appNameText = "(=}\175931\DC1\ETXfl*\188796T\51297\140578>N;\1040046{m+}C%\1758\STX\EM\fAX\ACK"}
-
-testObject_AppName_user_6 :: AppName
-testObject_AppName_user_6 = AppName {appNameText = "O\189148 4\1003568L8w\97377\STX0g."}
-
-testObject_AppName_user_7 :: AppName
-testObject_AppName_user_7 = AppName {appNameText = "ms\DLE"}
-
-testObject_AppName_user_8 :: AppName
-testObject_AppName_user_8 =
-  AppName
-    { appNameText =
-        "\"\1074817h\1081406\1105238e\1016334Y<3;w\989636\1091634/u9\146693\7249\SOH\59959>\157130\DC3\140560\1032908w"
-    }
-
-testObject_AppName_user_9 :: AppName
-testObject_AppName_user_9 = AppName {appNameText = ""}
-
-testObject_AppName_user_10 :: AppName
-testObject_AppName_user_10 = AppName {appNameText = "R\EOT\\N\25910t\8276u\1062418"}
-
-testObject_AppName_user_11 :: AppName
-testObject_AppName_user_11 = AppName {appNameText = "!i3dW\137892%\1021761\138481.\DC3;\DC3\54358I\EMcP\fD"}
-
-testObject_AppName_user_12 :: AppName
-testObject_AppName_user_12 = AppName {appNameText = "6>"}
-
-testObject_AppName_user_13 :: AppName
-testObject_AppName_user_13 = AppName {appNameText = "\61031dL\42117BbAr6H_\t"}
-
-testObject_AppName_user_14 :: AppName
-testObject_AppName_user_14 = AppName {appNameText = "R%\131728\188416(J\1109526\"M\988420\58503Ls\ETBK\\\ACK"}
-
-testObject_AppName_user_15 :: AppName
-testObject_AppName_user_15 = AppName {appNameText = "Ih\SIDA'J'q\1058059"}
-
-testObject_AppName_user_16 :: AppName
-testObject_AppName_user_16 = AppName {appNameText = ""}
-
-testObject_AppName_user_17 :: AppName
-testObject_AppName_user_17 = AppName {appNameText = "~s\NAK\31310=YN\149332?P\1045957\1077920\1009639\157478\1038631S"}
-
-testObject_AppName_user_18 :: AppName
-testObject_AppName_user_18 = AppName {appNameText = "j\b\a@,\1073951\"b\169984g\nL\172263Y\DLE\fp\24314Z]"}
-
-testObject_AppName_user_19 :: AppName
-testObject_AppName_user_19 = AppName {appNameText = "vv\162788qO\DLE,l\182576a\35157BF)>"}
-
-testObject_AppName_user_20 :: AppName
-testObject_AppName_user_20 = AppName {appNameText = "\DELnD8"}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetKey_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetKey_user.hs
index 6b5db997bf8..1838bd39b36 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetKey_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetKey_user.hs
@@ -51,63 +51,3 @@ testObject_AssetKey_user_4 =
 testObject_AssetKey_user_5 :: AssetKey
 testObject_AssetKey_user_5 =
   AssetKeyV3 (Id (fromJust (UUID.fromString "00000066-0000-0009-0000-00410000003a"))) AssetPersistent
-
-testObject_AssetKey_user_6 :: AssetKey
-testObject_AssetKey_user_6 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000006-0000-0057-0000-005b00000042"))) AssetVolatile
-
-testObject_AssetKey_user_7 :: AssetKey
-testObject_AssetKey_user_7 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "0000002e-0000-0075-0000-00500000003e"))) AssetVolatile
-
-testObject_AssetKey_user_8 :: AssetKey
-testObject_AssetKey_user_8 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000048-0000-006d-0000-00420000002c"))) AssetExpiring
-
-testObject_AssetKey_user_9 :: AssetKey
-testObject_AssetKey_user_9 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "0000006d-0000-006f-0000-000d0000003f"))) AssetEternalInfrequentAccess
-
-testObject_AssetKey_user_10 :: AssetKey
-testObject_AssetKey_user_10 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000011-0000-0001-0000-00210000000a"))) AssetEternalInfrequentAccess
-
-testObject_AssetKey_user_11 :: AssetKey
-testObject_AssetKey_user_11 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000076-0000-0017-0000-00740000004c"))) AssetPersistent
-
-testObject_AssetKey_user_12 :: AssetKey
-testObject_AssetKey_user_12 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000069-0000-0025-0000-000300000003"))) AssetEternalInfrequentAccess
-
-testObject_AssetKey_user_13 :: AssetKey
-testObject_AssetKey_user_13 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "0000004e-0000-005a-0000-007e00000054"))) AssetPersistent
-
-testObject_AssetKey_user_14 :: AssetKey
-testObject_AssetKey_user_14 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "0000001e-0000-001e-0000-000200000012"))) AssetExpiring
-
-testObject_AssetKey_user_15 :: AssetKey
-testObject_AssetKey_user_15 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "0000007e-0000-005a-0000-00270000005b"))) AssetVolatile
-
-testObject_AssetKey_user_16 :: AssetKey
-testObject_AssetKey_user_16 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "0000003a-0000-0063-0000-00640000004b"))) AssetEternal
-
-testObject_AssetKey_user_17 :: AssetKey
-testObject_AssetKey_user_17 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000056-0000-0020-0000-001b0000002e"))) AssetEternal
-
-testObject_AssetKey_user_18 :: AssetKey
-testObject_AssetKey_user_18 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000060-0000-001b-0000-000800000022"))) AssetEternal
-
-testObject_AssetKey_user_19 :: AssetKey
-testObject_AssetKey_user_19 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "0000000c-0000-0040-0000-004000000058"))) AssetEternalInfrequentAccess
-
-testObject_AssetKey_user_20 :: AssetKey
-testObject_AssetKey_user_20 =
-  AssetKeyV3 (Id (fromJust (UUID.fromString "00000036-0000-0045-0000-00610000002a"))) AssetExpiring
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetRetention_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetRetention_user.hs
index 086864c39b4..d903bdba6d0 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetRetention_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetRetention_user.hs
@@ -29,53 +29,8 @@ testObject_AssetRetention_user_2 = AssetEternal
 testObject_AssetRetention_user_3 :: AssetRetention
 testObject_AssetRetention_user_3 = AssetEternalInfrequentAccess
 
-testObject_AssetRetention_user_4 :: AssetRetention
-testObject_AssetRetention_user_4 = AssetPersistent
-
-testObject_AssetRetention_user_5 :: AssetRetention
-testObject_AssetRetention_user_5 = AssetEternal
-
-testObject_AssetRetention_user_6 :: AssetRetention
-testObject_AssetRetention_user_6 = AssetPersistent
-
-testObject_AssetRetention_user_7 :: AssetRetention
-testObject_AssetRetention_user_7 = AssetEternalInfrequentAccess
-
 testObject_AssetRetention_user_8 :: AssetRetention
 testObject_AssetRetention_user_8 = AssetVolatile
 
-testObject_AssetRetention_user_9 :: AssetRetention
-testObject_AssetRetention_user_9 = AssetEternalInfrequentAccess
-
-testObject_AssetRetention_user_10 :: AssetRetention
-testObject_AssetRetention_user_10 = AssetEternal
-
-testObject_AssetRetention_user_11 :: AssetRetention
-testObject_AssetRetention_user_11 = AssetEternal
-
-testObject_AssetRetention_user_12 :: AssetRetention
-testObject_AssetRetention_user_12 = AssetVolatile
-
 testObject_AssetRetention_user_13 :: AssetRetention
 testObject_AssetRetention_user_13 = AssetExpiring
-
-testObject_AssetRetention_user_14 :: AssetRetention
-testObject_AssetRetention_user_14 = AssetEternal
-
-testObject_AssetRetention_user_15 :: AssetRetention
-testObject_AssetRetention_user_15 = AssetEternal
-
-testObject_AssetRetention_user_16 :: AssetRetention
-testObject_AssetRetention_user_16 = AssetEternal
-
-testObject_AssetRetention_user_17 :: AssetRetention
-testObject_AssetRetention_user_17 = AssetPersistent
-
-testObject_AssetRetention_user_18 :: AssetRetention
-testObject_AssetRetention_user_18 = AssetEternal
-
-testObject_AssetRetention_user_19 :: AssetRetention
-testObject_AssetRetention_user_19 = AssetPersistent
-
-testObject_AssetRetention_user_20 :: AssetRetention
-testObject_AssetRetention_user_20 = AssetEternal
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetSettings_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetSettings_user.hs
index c7b3322ed35..aac0733ba54 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetSettings_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetSettings_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -36,75 +34,42 @@ import Wire.API.Asset
 
 testObject_AssetSettings_user_1 :: AssetSettings
 testObject_AssetSettings_user_1 =
-  (defAssetSettings & setAssetPublic .~ (True) & setAssetRetention .~ (Just AssetExpiring))
+  defAssetSettings & setAssetPublic .~ True & setAssetRetention .~ Just AssetExpiring
 
 testObject_AssetSettings_user_2 :: AssetSettings
 testObject_AssetSettings_user_2 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetExpiring))
+  defAssetSettings & setAssetPublic .~ False & setAssetRetention .~ Just AssetExpiring
 
 testObject_AssetSettings_user_3 :: AssetSettings
-testObject_AssetSettings_user_3 = (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Nothing))
-
-testObject_AssetSettings_user_4 :: AssetSettings
-testObject_AssetSettings_user_4 = (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Nothing))
+testObject_AssetSettings_user_3 = defAssetSettings & setAssetPublic .~ False & setAssetRetention .~ Nothing
 
 testObject_AssetSettings_user_5 :: AssetSettings
-testObject_AssetSettings_user_5 = (defAssetSettings & setAssetPublic .~ (True) & setAssetRetention .~ (Nothing))
+testObject_AssetSettings_user_5 = defAssetSettings & setAssetPublic .~ True & setAssetRetention .~ Nothing
 
 testObject_AssetSettings_user_6 :: AssetSettings
 testObject_AssetSettings_user_6 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetEternalInfrequentAccess))
-
-testObject_AssetSettings_user_7 :: AssetSettings
-testObject_AssetSettings_user_7 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetPersistent))
-
-testObject_AssetSettings_user_8 :: AssetSettings
-testObject_AssetSettings_user_8 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetPersistent))
-
-testObject_AssetSettings_user_9 :: AssetSettings
-testObject_AssetSettings_user_9 = (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Nothing))
+  defAssetSettings & setAssetPublic .~ False & setAssetRetention .~ (Just AssetEternalInfrequentAccess)
 
 testObject_AssetSettings_user_10 :: AssetSettings
 testObject_AssetSettings_user_10 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetPersistent))
-
-testObject_AssetSettings_user_11 :: AssetSettings
-testObject_AssetSettings_user_11 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetEternalInfrequentAccess))
-
-testObject_AssetSettings_user_12 :: AssetSettings
-testObject_AssetSettings_user_12 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetPersistent))
-
-testObject_AssetSettings_user_13 :: AssetSettings
-testObject_AssetSettings_user_13 = (defAssetSettings & setAssetPublic .~ (True) & setAssetRetention .~ (Nothing))
+  defAssetSettings & setAssetPublic .~ False & setAssetRetention .~ Just AssetPersistent
 
 testObject_AssetSettings_user_14 :: AssetSettings
 testObject_AssetSettings_user_14 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetEternal))
+  defAssetSettings & setAssetPublic .~ False & setAssetRetention .~ (Just AssetEternal)
 
 testObject_AssetSettings_user_15 :: AssetSettings
 testObject_AssetSettings_user_15 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetVolatile))
+  defAssetSettings & setAssetPublic .~ False & setAssetRetention .~ (Just AssetVolatile)
 
 testObject_AssetSettings_user_16 :: AssetSettings
 testObject_AssetSettings_user_16 =
-  (defAssetSettings & setAssetPublic .~ (True) & setAssetRetention .~ (Just AssetPersistent))
-
-testObject_AssetSettings_user_17 :: AssetSettings
-testObject_AssetSettings_user_17 =
-  (defAssetSettings & setAssetPublic .~ (True) & setAssetRetention .~ (Just AssetExpiring))
-
-testObject_AssetSettings_user_18 :: AssetSettings
-testObject_AssetSettings_user_18 =
-  (defAssetSettings & setAssetPublic .~ (False) & setAssetRetention .~ (Just AssetEternalInfrequentAccess))
+  defAssetSettings & setAssetPublic .~ True & setAssetRetention .~ (Just AssetPersistent)
 
 testObject_AssetSettings_user_19 :: AssetSettings
 testObject_AssetSettings_user_19 =
-  (defAssetSettings & setAssetPublic .~ (True) & setAssetRetention .~ (Just AssetEternalInfrequentAccess))
+  defAssetSettings & setAssetPublic .~ True & setAssetRetention .~ (Just AssetEternalInfrequentAccess)
 
 testObject_AssetSettings_user_20 :: AssetSettings
 testObject_AssetSettings_user_20 =
-  (defAssetSettings & setAssetPublic .~ (True) & setAssetRetention .~ (Just AssetEternal))
+  defAssetSettings & setAssetPublic .~ True & setAssetRetention .~ (Just AssetEternal)
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetToken_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetToken_user.hs
index 7676a1f2849..6854768adb0 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetToken_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/AssetToken_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -23,69 +21,27 @@ import Imports (fromRight, undefined)
 import Wire.API.Asset (AssetToken (..))
 
 testObject_AssetToken_user_1 :: AssetToken
-testObject_AssetToken_user_1 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("19gg")))}
-
-testObject_AssetToken_user_2 :: AssetToken
-testObject_AssetToken_user_2 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("b_ZA1Q==")))}
-
-testObject_AssetToken_user_3 :: AssetToken
-testObject_AssetToken_user_3 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("mRsBYG9VkQ==")))}
+testObject_AssetToken_user_1 = AssetToken {assetTokenAscii = fromRight undefined (validate "19gg")}
 
 testObject_AssetToken_user_4 :: AssetToken
 testObject_AssetToken_user_4 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("NMWuAr4DWSWYN1yQACS39YW-")))}
+  AssetToken {assetTokenAscii = fromRight undefined (validate "NMWuAr4DWSWYN1yQACS39YW-")}
 
 testObject_AssetToken_user_5 :: AssetToken
-testObject_AssetToken_user_5 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("1M4G-RUbZgqvkfQ=")))}
-
-testObject_AssetToken_user_6 :: AssetToken
-testObject_AssetToken_user_6 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("RHHXsYEBcMg8s7Vf7z7qqE4=")))}
+testObject_AssetToken_user_5 = AssetToken {assetTokenAscii = fromRight undefined (validate "1M4G-RUbZgqvkfQ=")}
 
 testObject_AssetToken_user_7 :: AssetToken
 testObject_AssetToken_user_7 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("3Z8JnP8YkWspJHvxbfa3fd2VyR9S_PMcVtN-HA==")))}
-
-testObject_AssetToken_user_8 :: AssetToken
-testObject_AssetToken_user_8 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("Fw==")))}
-
-testObject_AssetToken_user_9 :: AssetToken
-testObject_AssetToken_user_9 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("bKnnzlrUIHS3jjo=")))}
-
-testObject_AssetToken_user_10 :: AssetToken
-testObject_AssetToken_user_10 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("9hOt6KC9zw==")))}
-
-testObject_AssetToken_user_11 :: AssetToken
-testObject_AssetToken_user_11 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("ig==")))}
+  AssetToken {assetTokenAscii = fromRight undefined (validate "3Z8JnP8YkWspJHvxbfa3fd2VyR9S_PMcVtN-HA==")}
 
 testObject_AssetToken_user_12 :: AssetToken
 testObject_AssetToken_user_12 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("CD3Zk7PTkfn816hCz42NE41KpPd4")))}
-
-testObject_AssetToken_user_13 :: AssetToken
-testObject_AssetToken_user_13 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("KA==")))}
-
-testObject_AssetToken_user_14 :: AssetToken
-testObject_AssetToken_user_14 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("AjiBLIWgKwB59OX1S7LHoq46NIn8")))}
+  AssetToken {assetTokenAscii = fromRight undefined (validate "CD3Zk7PTkfn816hCz42NE41KpPd4")}
 
 testObject_AssetToken_user_15 :: AssetToken
 testObject_AssetToken_user_15 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("G7HpRJ4qnEkkbbswnSW9SAEZtXI9vI9MgQ==")))}
-
-testObject_AssetToken_user_16 :: AssetToken
-testObject_AssetToken_user_16 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("uiNx")))}
-
-testObject_AssetToken_user_17 :: AssetToken
-testObject_AssetToken_user_17 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("gt6pOuuPgK_aR8yhdeT0")))}
-
-testObject_AssetToken_user_18 :: AssetToken
-testObject_AssetToken_user_18 = AssetToken {assetTokenAscii = (fromRight undefined (validate ("Utst")))}
-
-testObject_AssetToken_user_19 :: AssetToken
-testObject_AssetToken_user_19 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("EGqzOUnKZMcstcko_IWm4NSQdxHkO5n-LY0=")))}
+  AssetToken {assetTokenAscii = fromRight undefined (validate "G7HpRJ4qnEkkbbswnSW9SAEZtXI9vI9MgQ==")}
 
 testObject_AssetToken_user_20 :: AssetToken
 testObject_AssetToken_user_20 =
-  AssetToken {assetTokenAscii = (fromRight undefined (validate ("W2jwr0ImzE7IaMvETUb5Bt1rn3E=")))}
+  AssetToken {assetTokenAscii = fromRight undefined (validate "W2jwr0ImzE7IaMvETUb5Bt1rn3E=")}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ChunkSize_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ChunkSize_user.hs
index 218d7f1ce91..c12c6163d29 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ChunkSize_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ChunkSize_user.hs
@@ -22,60 +22,3 @@ import Wire.API.Asset (ChunkSize (..))
 
 testObject_ChunkSize_user_1 :: ChunkSize
 testObject_ChunkSize_user_1 = ChunkSize {chunkSizeBytes = 17}
-
-testObject_ChunkSize_user_2 :: ChunkSize
-testObject_ChunkSize_user_2 = ChunkSize {chunkSizeBytes = 30}
-
-testObject_ChunkSize_user_3 :: ChunkSize
-testObject_ChunkSize_user_3 = ChunkSize {chunkSizeBytes = 2}
-
-testObject_ChunkSize_user_4 :: ChunkSize
-testObject_ChunkSize_user_4 = ChunkSize {chunkSizeBytes = 26}
-
-testObject_ChunkSize_user_5 :: ChunkSize
-testObject_ChunkSize_user_5 = ChunkSize {chunkSizeBytes = 14}
-
-testObject_ChunkSize_user_6 :: ChunkSize
-testObject_ChunkSize_user_6 = ChunkSize {chunkSizeBytes = 13}
-
-testObject_ChunkSize_user_7 :: ChunkSize
-testObject_ChunkSize_user_7 = ChunkSize {chunkSizeBytes = 24}
-
-testObject_ChunkSize_user_8 :: ChunkSize
-testObject_ChunkSize_user_8 = ChunkSize {chunkSizeBytes = 25}
-
-testObject_ChunkSize_user_9 :: ChunkSize
-testObject_ChunkSize_user_9 = ChunkSize {chunkSizeBytes = 14}
-
-testObject_ChunkSize_user_10 :: ChunkSize
-testObject_ChunkSize_user_10 = ChunkSize {chunkSizeBytes = 16}
-
-testObject_ChunkSize_user_11 :: ChunkSize
-testObject_ChunkSize_user_11 = ChunkSize {chunkSizeBytes = 28}
-
-testObject_ChunkSize_user_12 :: ChunkSize
-testObject_ChunkSize_user_12 = ChunkSize {chunkSizeBytes = 1}
-
-testObject_ChunkSize_user_13 :: ChunkSize
-testObject_ChunkSize_user_13 = ChunkSize {chunkSizeBytes = 4}
-
-testObject_ChunkSize_user_14 :: ChunkSize
-testObject_ChunkSize_user_14 = ChunkSize {chunkSizeBytes = 10}
-
-testObject_ChunkSize_user_15 :: ChunkSize
-testObject_ChunkSize_user_15 = ChunkSize {chunkSizeBytes = 14}
-
-testObject_ChunkSize_user_16 :: ChunkSize
-testObject_ChunkSize_user_16 = ChunkSize {chunkSizeBytes = 14}
-
-testObject_ChunkSize_user_17 :: ChunkSize
-testObject_ChunkSize_user_17 = ChunkSize {chunkSizeBytes = 29}
-
-testObject_ChunkSize_user_18 :: ChunkSize
-testObject_ChunkSize_user_18 = ChunkSize {chunkSizeBytes = 15}
-
-testObject_ChunkSize_user_19 :: ChunkSize
-testObject_ChunkSize_user_19 = ChunkSize {chunkSizeBytes = 18}
-
-testObject_ChunkSize_user_20 :: ChunkSize
-testObject_ChunkSize_user_20 = ChunkSize {chunkSizeBytes = 20}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ClientMismatch_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ClientMismatch_user.hs
index 8e6c984842e..2371f701f21 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ClientMismatch_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ClientMismatch_user.hs
@@ -27,1151 +27,30 @@ import Wire.API.Message (ClientMismatch (ClientMismatch), UserClients (UserClien
 
 testObject_ClientMismatch_user_1 :: ClientMismatch
 testObject_ClientMismatch_user_1 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-12 12:22:43.673 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000001"))),
-                    fromList [ClientId {client = "2"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000002"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000009-0000-005e-0000-002e00000012"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000072-0000-0051-0000-000500000007"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000700000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000005-0000-0000-0000-000600000008"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000005-0000-0002-0000-000800000001"))),
-                    fromList [ClientId {client = "3"}, ClientId {client = "4"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000005-0000-0006-0000-000400000001"))), fromList [])
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_2 :: ClientMismatch
-testObject_ClientMismatch_user_2 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-19 08:06:54.492 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "0000000d-0000-000e-0000-00170000001c"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "2"}, ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000000e-0000-001d-0000-00160000001c"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000016-0000-0005-0000-001b0000001e"))),
-                    fromList [ClientId {client = "50"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000001"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000001-0000-0006-0000-000800000004"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000005-0000-0000-0000-000100000002"))),
-                    fromList [ClientId {client = "2"}, ClientId {client = "4"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000005-0000-0000-0000-000600000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000007-0000-0004-0000-000800000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_3 :: ClientMismatch
-testObject_ClientMismatch_user_3 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-18 16:25:29.722 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000002-0000-0006-0000-000700000013"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000019-0000-001e-0000-000e0000001e"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "e"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000001e-0000-000b-0000-000600000018"))),
-                    fromList [ClientId {client = "b"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000300000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000300000002"))),
-                    fromList [ClientId {client = "8"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000003"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0001-0000-000000000000"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000300000002"))),
-                    fromList [ClientId {client = "e"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_4 :: ClientMismatch
-testObject_ClientMismatch_user_4 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-20 07:47:05.133 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000800000002"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0005-0000-000300000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000200000005"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000005-0000-0006-0000-000500000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000006-0000-0001-0000-000100000006"))), fromList [])
-                ]
-          }
-      )
-      (UserClients {userClients = fromList []})
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0007-0000-000700000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000200000003"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}, ClientId {client = "2"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0001-0000-000800000005"))),
-                    fromList [ClientId {client = "b"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000005-0000-0008-0000-000000000001"))), fromList [])
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_5 :: ClientMismatch
-testObject_ClientMismatch_user_5 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-26 19:31:21.478 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000001"))),
-                    fromList [ClientId {client = "2"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000002"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000002"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000000"))),
-                    fromList [ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_6 :: ClientMismatch
-testObject_ClientMismatch_user_6 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-28 18:24:35.996 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000001-0000-0006-0000-000300000003"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000300000005"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "2"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0005-0000-000100000006"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000007-0000-0001-0000-000500000008"))),
-                    fromList [ClientId {client = "1a"}]
-                  )
-                ]
-          }
-      )
-      (UserClients {userClients = fromList []})
-      (UserClients {userClients = fromList []})
-  )
-
-testObject_ClientMismatch_user_7 :: ClientMismatch
-testObject_ClientMismatch_user_7 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-26 02:38:01.741 UTC"))
-      (UserClients {userClients = fromList []})
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000002"))),
-                    fromList [ClientId {client = "2"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))), fromList [])
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_8 :: ClientMismatch
-testObject_ClientMismatch_user_8 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-11 13:11:44.951 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000013-0000-0067-0000-00540000000f"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "0000001f-0000-0001-0000-007600000041"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}, ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000400000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000400000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000300000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000004"))),
-                    fromList [ClientId {client = "b"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "0000003a-0000-0008-0000-00740000006a"))),
-                    fromList [ClientId {client = "52f"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000003d-0000-0037-0000-005900000042"))),
-                    fromList [ClientId {client = "2"}, ClientId {client = "3"}, ClientId {client = "4"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_9 :: ClientMismatch
-testObject_ClientMismatch_user_9 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-20 09:37:09.767 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00003597-0000-21f9-0000-74b8000066b6"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}, ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000019-0000-004b-0000-00300000007e"))),
-                    fromList [ClientId {client = "1b"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000057-0000-0020-0000-006600000037"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}, ClientId {client = "4"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000029-0000-004d-0000-006d0000000a"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "0000006c-0000-002c-0000-006600000027"))), fromList [])
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_10 :: ClientMismatch
-testObject_ClientMismatch_user_10 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-06-08 05:23:30.672 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000031-0000-0056-0000-007600000063"))),
-                    fromList [ClientId {client = "20"}, ClientId {client = "f"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000051-0000-007d-0000-004600000046"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "8"}, ClientId {client = "e"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000007-0000-0008-0000-001a00000011"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "3"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000016-0000-0013-0000-000a00000009"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "0000001c-0000-0003-0000-001300000012"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "0000004c-0000-006b-0000-000d00000009"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000006b-0000-0079-0000-007e00000028"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}, ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_11 :: ClientMismatch
-testObject_ClientMismatch_user_11 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-14 22:55:33.894 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000015-0000-0004-0000-000300000006"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000015-0000-000f-0000-00040000000f"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "0000001b-0000-0005-0000-001800000000"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000002-0000-0016-0000-000d00000017"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "2"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000008-0000-000c-0000-00090000001a"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "b"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000001d-0000-001a-0000-00080000000d"))),
-                    fromList [ClientId {client = "1e"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000000"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))), fromList [])
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_12 :: ClientMismatch
-testObject_ClientMismatch_user_12 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-08 01:07:14.883 UTC"))
-      (UserClients {userClients = fromList []})
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000068-0000-0004-0000-004800000071"))),
-                    fromList [ClientId {client = "dab"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "0000007b-0000-003e-0000-002a00000078"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000002"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000002"))),
-                    fromList [ClientId {client = "2"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000001"))),
-                    fromList [ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_13 :: ClientMismatch
-testObject_ClientMismatch_user_13 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-09 16:28:56.647 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000300000002"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000300000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000400000001"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000400000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000200000004"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000000000003"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                    fromList [ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_14 :: ClientMismatch
-testObject_ClientMismatch_user_14 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-08 01:02:42.968 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000002"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000002"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000002"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000017-0000-0001-0000-005b00000037"))),
-                    fromList [ClientId {client = "8a6"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000080-0000-003c-0000-00680000001d"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "2"}, ClientId {client = "4"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00004cd5-0000-31af-0000-638a000043c3"))),
-                    fromList [ClientId {client = "2a5"}, ClientId {client = "3d0"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_15 :: ClientMismatch
-testObject_ClientMismatch_user_15 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-06-02 22:04:34.496 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000005"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000500000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000003-0000-0008-0000-000600000008"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000007-0000-0003-0000-000600000006"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00002695-0000-0695-0000-494f00003295"))),
-                    fromList [ClientId {client = "13"}, ClientId {client = "15"}, ClientId {client = "6"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_16 :: ClientMismatch
-testObject_ClientMismatch_user_16 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-06-01 16:55:21.151 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                    fromList [ClientId {client = "2"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000002"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000a6b-0000-5bd1-0000-7ab500002215"))),
-                    fromList [ClientId {client = "55"}, ClientId {client = "76"}, ClientId {client = "c0"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-001f-0000-000b0000001c"))),
-                    fromList [ClientId {client = "8"}, ClientId {client = "e"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000013-0000-0015-0000-001f0000000a"))),
-                    fromList [ClientId {client = "41"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000018-0000-0020-0000-002000000000"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "3"}, ClientId {client = "4"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_17 :: ClientMismatch
-testObject_ClientMismatch_user_17 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-04-23 21:23:53.493 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "0000451d-0000-7508-0000-317f0000186b"))),
-                    fromList [ClientId {client = "e730"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000025-0000-0012-0000-002500000033"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "0000003b-0000-005f-0000-00330000007f"))), fromList [])
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_18 :: ClientMismatch
-testObject_ClientMismatch_user_18 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-14 18:56:29.815 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000400000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "2"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000300000004"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000400000004"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000003-0000-0002-0000-000100000004"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000400000004"))),
-                    fromList [ClientId {client = "5"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000300000002"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000008"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000007"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000800000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "4"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000800000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_19 :: ClientMismatch
-testObject_ClientMismatch_user_19 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-06-06 11:59:12.981 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000002"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000001"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000002"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000002"))),
-                    fromList [ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000002"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000001"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                    fromList [ClientId {client = "0"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))),
-                    fromList [ClientId {client = "3"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000002"))), fromList [])
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000013-0000-0002-0000-003500000013"))),
-                    fromList [ClientId {client = "11"}, ClientId {client = "9"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000003c-0000-000f-0000-003e00000013"))),
-                    fromList [ClientId {client = "1"}, ClientId {client = "8"}]
-                  )
-                ]
-          }
-      )
-  )
-
-testObject_ClientMismatch_user_20 :: ClientMismatch
-testObject_ClientMismatch_user_20 =
-  ( ClientMismatch
-      (toUTCTimeMillis (read "1864-05-20 02:14:30.091 UTC"))
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000000"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0003-0000-000300000004"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000300000002"))),
-                    fromList [ClientId {client = "e"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000300000003"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000300000003"))),
-                    fromList [ClientId {client = "6"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000400000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000200000004"))),
-                    fromList [ClientId {client = "f"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000300000003"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000100000003"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0001-0000-000100000002"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "1"}]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000300000003"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000000000001"))),
-                    fromList [ClientId {client = "0"}, ClientId {client = "2"}]
-                  )
-                ]
-          }
-      )
-      ( UserClients
-          { userClients =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000008-0000-0018-0000-00080000000a"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000018-0000-0017-0000-00110000000a"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "0000001a-0000-0020-0000-000400000016"))), fromList [])
-                ]
-          }
-      )
-  )
+  ClientMismatch
+    (toUTCTimeMillis (read "1864-04-12 12:22:43.673 UTC"))
+    ( UserClients
+        { userClients =
+            fromList
+              [ ( Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000002")),
+                  fromList [ClientId {client = "0"}, ClientId {client = "1"}]
+                ),
+                ( Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000")),
+                  fromList []
+                )
+              ]
+        }
+    )
+    (UserClients {userClients = fromList []})
+    ( UserClients
+        { userClients =
+            fromList
+              [ ( Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000700000000")),
+                  fromList [ClientId {client = "0"}, ClientId {client = "1"}]
+                ),
+                ( Id (fromJust (UUID.fromString "00000005-0000-0000-0000-000600000008")),
+                  fromList [ClientId {client = "0"}, ClientId {client = "1"}]
+                )
+              ]
+        }
+    )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Connect_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Connect_user.hs
index 46603299349..ad3dcd121da 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Connect_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Connect_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -26,179 +24,17 @@ import Wire.API.Event.Conversation (Connect (..))
 testObject_Connect_user_1 :: Connect
 testObject_Connect_user_1 =
   Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000400000004"))),
+    { cRecipient = Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000400000004")),
       cMessage = Just "E",
       cName = Just ".\128842]G",
-      cEmail = Nothing
+      cEmail = Just "test email"
     }
 
 testObject_Connect_user_2 :: Connect
 testObject_Connect_user_2 =
   Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000005-0000-0007-0000-000200000008"))),
-      cMessage = Nothing,
-      cName = Just "",
-      cEmail = Just "\170074\1031073p"
-    }
-
-testObject_Connect_user_3 :: Connect
-testObject_Connect_user_3 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000007-0000-0004-0000-000700000001"))),
-      cMessage = Nothing,
-      cName = Just "6\18535c",
-      cEmail = Nothing
-    }
-
-testObject_Connect_user_4 :: Connect
-testObject_Connect_user_4 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000007-0000-0004-0000-000400000003"))),
+    { cRecipient = Id (fromJust (UUID.fromString "00000005-0000-0007-0000-000200000008")),
       cMessage = Nothing,
-      cName = Just "\v\GS(V\SYN",
-      cEmail = Just "\1101959'\1022663"
-    }
-
-testObject_Connect_user_5 :: Connect
-testObject_Connect_user_5 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000100000004"))),
-      cMessage = Just "\188427&\SYNO<F\DEL",
-      cName = Just "",
-      cEmail = Just "\1010294&\ETX\61784\a"
-    }
-
-testObject_Connect_user_6 :: Connect
-testObject_Connect_user_6 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000000-0000-0005-0000-000000000004"))),
-      cMessage = Just "\1090378\96539z]",
-      cName = Just "{C\RS~L\11570",
-      cEmail = Just "t\r[\SOH"
-    }
-
-testObject_Connect_user_7 :: Connect
-testObject_Connect_user_7 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000007-0000-0006-0000-000500000002"))),
-      cMessage = Just "\96929\ENQd\8636_T",
       cName = Nothing,
-      cEmail = Just "`\EOT"
-    }
-
-testObject_Connect_user_8 :: Connect
-testObject_Connect_user_8 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000400000006"))),
-      cMessage = Just "\43794\NAK\STX\49626q\18943",
-      cName = Just "o\1082400\v",
       cEmail = Nothing
     }
-
-testObject_Connect_user_9 :: Connect
-testObject_Connect_user_9 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000008-0000-0006-0000-000200000001"))),
-      cMessage = Nothing,
-      cName = Just "\CANXT\DC3^{",
-      cEmail = Just "b"
-    }
-
-testObject_Connect_user_10 :: Connect
-testObject_Connect_user_10 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000006-0000-0008-0000-000700000005"))),
-      cMessage = Just "",
-      cName = Nothing,
-      cEmail = Nothing
-    }
-
-testObject_Connect_user_11 :: Connect
-testObject_Connect_user_11 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000007-0000-0008-0000-000100000007"))),
-      cMessage = Just "XiM",
-      cName = Nothing,
-      cEmail = Just ""
-    }
-
-testObject_Connect_user_12 :: Connect
-testObject_Connect_user_12 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000008-0000-0000-0000-000500000005"))),
-      cMessage = Nothing,
-      cName = Just "w\1113735ay",
-      cEmail = Just "XZ\ETX"
-    }
-
-testObject_Connect_user_13 :: Connect
-testObject_Connect_user_13 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000003"))),
-      cMessage = Just "\f.\ETX",
-      cName = Just "\CAN",
-      cEmail = Just "J{"
-    }
-
-testObject_Connect_user_14 :: Connect
-testObject_Connect_user_14 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000003-0000-0006-0000-000000000000"))),
-      cMessage = Nothing,
-      cName = Just "",
-      cEmail = Just "\16924tFqj\SYN"
-    }
-
-testObject_Connect_user_15 :: Connect
-testObject_Connect_user_15 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000005-0000-0006-0000-000500000008"))),
-      cMessage = Just "\SI!xG\63193",
-      cName = Nothing,
-      cEmail = Just "F|,rJR"
-    }
-
-testObject_Connect_user_16 :: Connect
-testObject_Connect_user_16 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000000-0000-0008-0000-000600000006"))),
-      cMessage = Nothing,
-      cName = Just "",
-      cEmail = Just "\15649i\DC4gW\141342"
-    }
-
-testObject_Connect_user_17 :: Connect
-testObject_Connect_user_17 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000800000006"))),
-      cMessage = Nothing,
-      cName = Just "\DC2X",
-      cEmail = Just "\SO"
-    }
-
-testObject_Connect_user_18 :: Connect
-testObject_Connect_user_18 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000006-0000-0002-0000-000200000008"))),
-      cMessage = Just "A",
-      cName = Just "\ENQ(`\SO",
-      cEmail = Just ""
-    }
-
-testObject_Connect_user_19 :: Connect
-testObject_Connect_user_19 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000005-0000-0007-0000-000500000007"))),
-      cMessage = Just "|:\NAK",
-      cName = Just "\SOHj(\1087037",
-      cEmail = Nothing
-    }
-
-testObject_Connect_user_20 :: Connect
-testObject_Connect_user_20 =
-  Connect
-    { cRecipient = (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000700000008"))),
-      cMessage = Just "\38625",
-      cName = Just "*\1085975\SUBj|\\h",
-      cEmail = Just ":m\EM\"'\101058\1064307"
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionRequest_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionRequest_user.hs
index 6ce901ea4a4..5958a0f8c9b 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionRequest_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionRequest_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -26,7 +24,7 @@ import Wire.API.Connection (ConnectionRequest (..), Message (Message, messageTex
 testObject_ConnectionRequest_user_1 :: ConnectionRequest
 testObject_ConnectionRequest_user_1 =
   ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00005686-0000-796a-0000-712b00006414"))),
+    { crUser = Id (fromJust (UUID.fromString "00005686-0000-796a-0000-712b00006414")),
       crName =
         "$Sz%e\27856\&9\28268NfG a\SUB\1104240\22763\NULkF\SOq\99222W\DC4K\DLE\EOTF1e\v\EOTQ1D\1011215\169864R\983712\b\DLEQNvP!i\1045156A\63817\DC1f\63319E\1055845\96023\1087467+g~r%'J\990559s\DC39/'\1032622\993992\78178w\GS\ACK\12632\1079109<(o\1051052",
       crMessage =
@@ -39,7 +37,7 @@ testObject_ConnectionRequest_user_1 =
 testObject_ConnectionRequest_user_2 :: ConnectionRequest
 testObject_ConnectionRequest_user_2 =
   ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00003697-0000-346d-0000-6baf00003034"))),
+    { crUser = Id (fromJust (UUID.fromString "00003697-0000-346d-0000-6baf00003034")),
       crName = "\22415\1044771a\166586\SI$\ESC2&\DC2S<\DC1\1090585o\997147\70692U",
       crMessage =
         Message
@@ -51,7 +49,7 @@ testObject_ConnectionRequest_user_2 =
 testObject_ConnectionRequest_user_3 :: ConnectionRequest
 testObject_ConnectionRequest_user_3 =
   ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "0000302a-0000-1612-0000-459400001b2a"))),
+    { crUser = Id (fromJust (UUID.fromString "0000302a-0000-1612-0000-459400001b2a")),
       crName =
         "e\FSx\33154IBV 5\1107015hWeYpU\1063136(\n\46398\tn\164922\994685\149253\999956\aMNk 3V\f~\187305XltD'\CAN\149622\1082776g\NAKL3S\CAN\143538\1084558\29034\33703Y\ENQ\1035414T\988547I\175375E [\t\1099620!\1083340\DC4\DC1\1078602\8426jn'(cw\STX\DC3\1041716\n\DLET%\CAN\169172`\1041948\15880\58820|iGOZ\SOHR8FC\b7\40700\GSN*dT#\185689\\<\DLE?\144579%\tZC+Ht\3064;\SI\1064341(\147456H\158474=P\SO\160381\ESCuO*\\QM\f{r)~E\v!k\1105195W}1\ETB[\159713a\1046543\&7/LM9\174953\38557pk\SOH>m\1060065\&1z\1087338\\\66012\149111\FS5\1082403\97471\&0\a\t\994669a\SUB\1001725`XY\GS^\66729!\4184\ESC\45288Z\48957\US\SUB[R>\SUB*\DC2=X\1000477/UE\SYN\1070679\165502>\1089933>\NAK\",\DC4",
       crMessage = Message {messageText = "\1085988\992933\STX\DC2\SUBj\171033X\RSz[r\DLE\44803L]zl\145794\NAK"}
@@ -60,7 +58,7 @@ testObject_ConnectionRequest_user_3 =
 testObject_ConnectionRequest_user_4 :: ConnectionRequest
 testObject_ConnectionRequest_user_4 =
   ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00005bd6-0000-77a4-0000-2a3600001251"))),
+    { crUser = Id (fromJust (UUID.fromString "00005bd6-0000-77a4-0000-2a3600001251")),
       crName =
         ".#Y\1028598\EOTD|<.\9581\a@v\1022767Nn\1058280k\1031857f=M\NUL\49215\24440Pd\CAN&s\1046128\1074702b\ESC\996772G}\1046407\NAKiE\f\n|\DC3\t\1073406\GS\39427\STXR&>\8734\n\ENQ\1096231\&8$\993594G\b\RSYA8.\DEL}!k*\1098560\183150X\59315\994452^\99557\177310\996299Z\1104748\&7X\STX\1007267\"=&Sr^o\1078473`\40748/\n'\78719\&8f\n\135538{",
       crMessage =
@@ -70,48 +68,10 @@ testObject_ConnectionRequest_user_4 =
           }
     }
 
-testObject_ConnectionRequest_user_5 :: ConnectionRequest
-testObject_ConnectionRequest_user_5 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00001274-0000-57b7-0000-64890000603a"))),
-      crName =
-        "\139834\ACK\35953?\35146J]\1005232\GS\1070087n5\52726\&7\145154Ld\SI@\142578%*\SYN\28036t0o\DC3\1048562\1059106lO'aU\RS\1101365j\DC3\131152\1017773\"\110856gb\SIo\t@\134013\US#sLWTzX1\157466Pr\ETXj1\990344\1105746H\150815\&8~?\1000098\1030206\1050175fn}\CANdy\ETBC\1750*p^=\NUL\t\174778\SI'\1160\t\DC3)\147215\6292\DC1\1023579CNNrR\ACK\GS\t``~\40211Cz=\8643*(J\1097378\vw-\n82\1026639",
-      crMessage =
-        Message
-          { messageText =
-              "GE\53171\"\71052\1050770\t\ESC>K_;VUgy\DC2\997687;\100042Y\173220.;\14471:];&\184891G\r\1037825\DELLV\98228b\153347\&9I-\v\ACK\FS%?6Jz\NAK\v6\37412\RSM.5^\150038f\fZS\58443R~\1036003\1008957\DC2\CANT\fJ\1064504\1018211\EOT\1089094+z\vuw\22977[\983818UdG\1046149\110835\ESCZ4 \1040317t\RS7\GS!\1050025\1088924I\FSv\SYN}XW\1065401~y\SYN5tQ+W\1003574\"\SOHr8\1050751Gt(\37098zdyG\1095842\EM\ESCo\23140:E\nHr.\ETXlX4rj'G\GS3}\tTA[]\CAN"
-          }
-    }
-
-testObject_ConnectionRequest_user_6 :: ConnectionRequest
-testObject_ConnectionRequest_user_6 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "0000200a-0000-7079-0000-227700005bf2"))),
-      crName = "t\NAK|(Y\73129\&2\9210\1081212|@\1040716Ii\190",
-      crMessage =
-        Message
-          { messageText =
-              "\STXIN(D=E\1084300<{XlM|F\aP\162172\97701\1013427\\@\r\t\1024878o~\1039551{\tZ\DC3\1007170\RSwZR\49727\&2 \ETXs\1079512&q!$\NAK\1022098V\GS\136925\1008810W\DC4\988977Q\ETB\10250\134578<d\bI8\67315\10941xS\RSN^\139410XN\DC2-\tz\1085746\CAN=\vG\CAN \120854\1040124a\146354T\989484\n;R:%?'\986311\STX\1028059\DC2r\23353\&6?Ql\EMp1\4293\1080337;,j\DC2I\42685q4prR\1077178T\133857\"Id\SI\NAKRN)Yr];ec;\45107X YR<\NULE<m\r#\DEL\987187\1058299WN\1033507bL\b\1070610aO'\1094129;\99565K\RS\USx>\RS"
-          }
-    }
-
-testObject_ConnectionRequest_user_7 :: ConnectionRequest
-testObject_ConnectionRequest_user_7 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00002c2c-0000-63f7-0000-542100007c8e"))),
-      crName =
-        "5\amXn\GS\1071528X\19498#/MM\FS[\1073827Wd8\1036607\178943PM\rz`N}d\1093586.\1068094\1028858\1101854\&6\DLE~F\nRj%\SO5T\157283\STX\141434e]\NAKj_\1055069?\a\RSf\176149\37235`CSX\182089\&4zW\1109725\&2\RS\120128\149693\1043289jU\127968\987869\ETX\CAN\10872\157464\EM\983398\189134\ESC*X\1003378w\165320\"\SYN\1070860~\GS;\NUL<\128535",
-      crMessage =
-        Message
-          { messageText =
-              "/\1107790}+v\vF>v\9716a\1070377\v\ACK0\1026776>j\b|B\a+49w|$rj\v!\1081103\1031352\990473\DC1\1061921x\v\1106282\DC4Q\1107085\1082522\&7\EOT6\136319\177279\1107684\&6\1093750\1048183\v$\ETX?e\NAKx\CAN\1102958\DC3.\SOH\1010348W\165971U\120675*c<\1073719\RS\1042196O\1055074\1079874Dh\139528]\992000I\ENQq\189737J\SI$\144425\&9\SIaD\1041605HR7Jl_\DC3(\29100\ACK\181323zM\142652\GS\1094242\1042166#(\163742q:\1046568\fH|5\ETX/\1011565/5c_vY\ETB\1110617\149188\1098945[\NAK\63673\175741\ETBI5\"\1025568W\RS/\CAN\EOT;62{"
-          }
-    }
-
 testObject_ConnectionRequest_user_8 :: ConnectionRequest
 testObject_ConnectionRequest_user_8 =
   ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00001ab1-0000-6eb7-0000-71e900007867"))),
+    { crUser = Id (fromJust (UUID.fromString "00001ab1-0000-6eb7-0000-71e900007867")),
       crName =
         "\1027921;\146849W\33697%vJ\DC1\39350/#\r\1006557mUO\131673\&5\SOH\200\11101\140328u\b\ACKK4\DC1\EOT`%)3\EM\SYN\DLE\DELuUqQP-\b\NAK\9555\ETB\GS*,1\ETXj\999600h\171884:\12799\157760t\a\fH\1093754\v\19852TDxd\DC3\NUL<\128197\162600M7\DC1|C\ttLD\1090636\1086481[\az\1062634y\151830\DEL\52921V8\1039556\985050rRD \STX\165530\1111646F\DLEG\US{%;\vuaJ\"\DLE!=D\47905\ESC;~w>\SUB_\CAN'\121206]~\1059419\&0\SI\1041317\"\SYN'>\SI4\NAK\15228\ETB[e\DELFL\SO%W$\166547_\1063454\59649]\DC35*>$u\143749\SOH\1009357\GS\1020051\DC34\b\v",
       crMessage =
@@ -120,151 +80,3 @@ testObject_ConnectionRequest_user_8 =
               "u\96310:@o\ENQW&\EOT_\US{\95721L\1041277E\STX\19049&\DLE\EOT\1018164\DEL\DC1[\aKU_\tC\50779G8$do\2825\1007169ZU6\NUL\RST{4;mq\983244\62749\1028056\SUB\74313\DC2\b\1051996|fs7\1091735\DC4\CAN\8650>^,K1l\EOT{t\1042368\170635W\STX5\124976r\DELS\DC1i\GS<CfWmI\SYN\1034464\DC33YDuPj\ACK}B\a.\44535\35441\179439\1084453\f\RSGv^\148284x\SI\SOHE6WS\vT:H\1042252-s\73958\SYNFl'zxE\100994\GS\181832D\RS:\1055150\163211Q\ENQ!\ESChu}a\1070389k\\|\18381 I7\DC3\DLE\139657\128700\21382\13054{Cv>\a\EOTK6\157012f69lZdw\f\n\DC3T\120941#j\RSy\155238\&7\994408un\185455\1083057xa#5\63326D\\\DC14\DC1\190559\1051573?\a0>Z\163411v\v"
           }
     }
-
-testObject_ConnectionRequest_user_9 :: ConnectionRequest
-testObject_ConnectionRequest_user_9 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00006ce0-0000-7032-0000-655d0000553a"))),
-      crName =
-        "\USibm\b\DC3n\ACKW\v;M\1004992\&4\DC4K\CAN\DEL\132828\1846r\38726\54647+e\1048447@\ETX\1032565\140924F\1088121\STX\SOH\SYN<\FS\63432qV\49612\999198r\STX\DC2CeG{~\1009273\1045551\45308U\29836ZOTFfn\1064371)cr\1112489\r=\r]V\EM\20100.su]\989893\140706\42634u9\1079383\ETX\32754p)\EOT\139861\1010384\NULg\170194K\100788Fcx\STX\1089443\ETBPe-JA\168431\v\992368\1071405\&5$w\1020433\129174\&13P 7yBHLx$G+5d\1044639,!\38410!2zz\1078665\1085967\&0jz\1013239\159139j\DC3B\SI.nE\1028713M\SYN\46199\1018809B)\DELD|KRBa\SYN\21603\RSi\120018zn\DEL\ESC\f\92160Q:\DEL\1112608'\1029698i},J\awn\SI5O=X~\EM0\92578@k\995158k\DC4\1045360j\DEL\31022Ez\SI\164494\tebq&\1113544\1007866M\77928r\170693\58812\1088661\&8a,\f",
-      crMessage =
-        Message
-          { messageText =
-              "\bg\11611\NAK\153440\r\ENQ~\184509\1024099\16435C5jnvRJ\94741\144401aF\DC1\1098018\1035585\1030879c\178908\SUB\RSuG$=8I\1015829\t\SIAg%\DC1v\DC2\172099\NAK\DLE\NUL\ESC\f2\NAKv\1111093`\SI<\SYN\DC3}T\1083918(\NUL>!\SOH\DC3\1035099n\SUB\170012m@h\r\142472k\1001788\&7+^4\"\48990\1059061,r\151459\1108932$\31755\&0+Q\SO\1027647M1\1011331\1021306v\171727\SO\US\DC2-6\96089\31443\np\1064523\&6\1104498[\a\t\FSr\DC2s\ETB\ACK\SI;c]Y]\b\1102787y/\135016\RS\ESC^0:\EM-\RSR\fjSA9~\995185Z\DLEy-~H+\DC4:\SI\SOHh\136969\167157\vu\EOT\nm'#ke,\110691l\1045216\187626\18864\DC2\1061045\74776\191133@\94501(p-p&1\1088867\&9\DLE\166844\&3K\1081614O\US\n.E\"A(\6494#i\46898d\SUB\FS'\ESC[\26660S$}\bH\1061233\DC4\1109477\FS/\b\1038557"
-          }
-    }
-
-testObject_ConnectionRequest_user_10 :: ConnectionRequest
-testObject_ConnectionRequest_user_10 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "000072f7-0000-560e-0000-69940000570b"))),
-      crName =
-        "3\997164c7+\65139\1002182^rxc\1085323\150097$c#S\"\ETB\58903z\140335\&1%\1029964\&5a,K\SO`=\53973C\SYN,,\997504O\40635\nBT\141538`\180735aAd",
-      crMessage =
-        Message
-          { messageText =
-              "\110600cm\tL\DC4J\ENQ1\NULA\CAN\a\98196\NULI#\SI\998250,\188452\SOH\STX\NUL57k\167275\100132d\1015719t\187063r0u\DC4pg3\STXEXE\ACK\157955lmI3E\1045144\STXC\1066299\STXX\1020653\"o\SUB\1028401kY\147006(\DC2w\1056009\40241b&7\100411ZFi#\trz\1014960\1097215\DLE<zc\1036231,\1098925S@\DEL\142468tT#\US\DC1\DC4"
-          }
-    }
-
-testObject_ConnectionRequest_user_11 :: ConnectionRequest
-testObject_ConnectionRequest_user_11 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "000027fd-0000-298b-0000-789300000666"))),
-      crName =
-        "?\54660\t\11694k3\DC3fz\169390FJ\DELQ/\989447\74921\&82S/\131981\184968i\1065149v8\180793\NUL}OBj8imW\1049923\169018D/G\EOTG\1195\ETBuY\ACK\1031810\DC3g\DLEz\181932KA\EM-\EOTi\USt#w&U'pd\1065030\1099138\ENQ\1029388?\1094149~S\142992\73684",
-      crMessage =
-        Message
-          { messageText =
-              "\vW\992610\185034p}\136829+\SO\ETB\169312\&6z\45236\1067833;.\1062023\&8\FS\DLE\31036\148553d/\SUB\1084153MZ \1105424\&7\171677EUx\1017419L(\12319^w\1057076P\SI\36005iov\1074533\158274Ru\SUB6\1028700\ACK\39777)h\12942\148719\52479u1==LB#\40316T\1088731\1059798\DC2b\984342\999114Mp\1072064\166991nM\134220Sx 9c-\187616"
-          }
-    }
-
-testObject_ConnectionRequest_user_12 :: ConnectionRequest
-testObject_ConnectionRequest_user_12 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00000833-0000-6086-0000-3aa800000600"))),
-      crName =
-        "-\991813\1062842P\174512\149364t\985446\DC1r\1069179\19742\1048351$\140910\1082125\ESC!oa\48450J\NUL\FS2q|L\20831\FS\a'\183334Pe|\f\1029764(S\\-}\158947\187092[\DC1\1052925(Kn\20024\ESC\78021O\19987\&3Q\1106398_MY\1035965\1006767Ak_\52920\b<\58243o_\176505\48487\1085930m\1073333\SUB\FSN\DC1c]\DEL\134385p\98104_t\ETX\US\917890\1051691\NAK\b\ETB\SOH\991866\RS_76+\1078180\39437Y\t*`Kk\135431E\SI \14975\\4",
-      crMessage =
-        Message
-          { messageText =
-              "\182570V\ACK\ESCPgdON !Cpk`\DC4\1051306\52515h\1053073\139639\&2m[\177802\SYN5 \48382\1055612 $\180335o\SUB\DC2\157008K\151432\1030818\1048949\DC1P \1048252'y\30391\985951\f\1111224\EOTv\nAyi\28770\STX\1068629c?B\DELLMJ\992694\DC3v\RS2\EM\\\990027\ETB%Nr\STX\13274}q}\993767\164687\&3\155733X\NULW]\NAK\f/tE\1001177s/U<6ITb\1080930\ETBE\SOHes"
-          }
-    }
-
-testObject_ConnectionRequest_user_13 :: ConnectionRequest
-testObject_ConnectionRequest_user_13 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00002d2a-0000-6ef0-0000-663d00007aa4"))),
-      crName =
-        "\DLEAI\41124*\b\DC1.^^90\1023781T[\vpq\1001335\DC1:\ETXx\94014\"mC3\DC4 \1093410\f_\5793*\1107546\SYN>\n\1069161\12702\1008239\45310\NAKh\DC1\157306V\FS\ACK\"rU\50211\1102676\&7?6]):\nr6\191141T\96989\72845 \1102751m(e0\1093679MY\1049360",
-      crMessage =
-        Message
-          { messageText =
-              "o(\999433)\998170\1108440\98714\&1D.\175382\160214\DC3^\996921\998269c\SO\1046552T&\b\NUL\SO\"(#f\168005\1097128\179245\177145na\NUL\1044123\SUB\SOH\42774\DELR\ETB\1032438\1088989[7[\149564`\1050395\bR^\SO6F\ENQpW<\1081397~\999115o\1023652\EM\nr}@ \n\169956l\ETX\STX\1090341\1097731vh2\195051stx\134751X\tuw0\68214\63446U\1022273Z\SYNw\143026I7Kn\1094910\GS\GSI\1000494\NULPW\vaD\17294Z'\158053\DLE\16127\&6&4q\SYNoT\23376RZmQ !\147608\&7~S+l0{\1002284\&0v\1004472z\SI\119867s\1096922?gd\FS2$\126632\83494`u\1071991\&5)`JZrK"
-          }
-    }
-
-testObject_ConnectionRequest_user_14 :: ConnectionRequest
-testObject_ConnectionRequest_user_14 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00004b71-0000-7031-0000-222700006fb6"))),
-      crName =
-        "\DC4?WI(f\984222T\STXF$(\DC2w\1106535\33288o\47792\58265\159545|\nb\183678\1031413L\ESC\ENQP,\14551\36155Y(7\139916\186635\157862\1104942\1033415[\167312\th\1075836A\NAK\CAN\1056019\1112674K\vm\ETB\1079090x\1073621m8\1107608d&}X\156916\1106103&\RS\EM\183361\b\13512\1101913\&1k\1063519\181006\"q+Ap|\151888%\SYN\164471=}\DEL\1095610X\SO",
-      crMessage =
-        Message
-          { messageText =
-              "\1068286c/\1037847EOc\1064666\bB\1012286\136398UrR\1052666dO,\SI\ETX\SOH3\1751S[/\CAN\1095637\&6 ,\1027685:\ETXz*\66876&5\186334\92438\1104149i8\NUL#R_\1033381\1075939O0*=E\v+\FS\131336\SUB \1090331fnI^J\175041Y~\a\100877?\rv\ENQ\128398\ESCvy]\169589\NAK[\1065514\1087985)6TE\1024646\ETXx\1083137\DLE\1090067\&2\n)h\US]\NAK\38813Bu\992016/\GS\a\SOH\aM+O\ETX\148206\25269Y7jBix\1077304\fO\1090554S0O+)F\39715\DC3EE\1103601\NAKu\1057974o\83154\1037492\5132\20032\DLEv_[\1054103F\ACKG\1003971\SOH2\988437@U\DLE+"
-          }
-    }
-
-testObject_ConnectionRequest_user_15 :: ConnectionRequest
-testObject_ConnectionRequest_user_15 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00000837-0000-4ace-0000-1ac300001b43"))),
-      crName =
-        "o#)z\1102545\989515>p\"ie\1046878-+\18793\&6c^ \DLEQ\1009467)\73826C\173332\&8VYnJ\60579\72240\132971O\FS\t\NAKXQ\1078815\"0wS-\191083 b;\ETXh\184897\1043000\175183B\ETB\1100054\1102914\63646\1051651Y\NUL\1058777?\ENQ!*;@\ACKa\157717\SYNO\ETBp9\988647\39475CW\29077/x\137264u\DLE@\DELt$r\aZ\1017915X8'!\SI;6 O\DELg\GS\STX\1015929^\EM)\1059296l\146552\&7G\1001920\10812j\158382\&1\"\1110381\171159c\DLE\DC2`\NUL1w\986703\1111438\66650\FS\r\141495)KO\STXd\NULUQX\FS\169617zg\1086322Er\1091659\ESCdQB\USY\DC2M\DLEi\1006238\DC4B\1020994\1081785)5\NUL\t !?\65596\&3\1009872",
-      crMessage = Message {messageText = "PB\16078\&1\68635\fY\SI\188267\SYN$\26255\&6\166190"}
-    }
-
-testObject_ConnectionRequest_user_16 :: ConnectionRequest
-testObject_ConnectionRequest_user_16 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00006f84-0000-3c4b-0000-2d2f00001f49"))),
-      crName =
-        "\1099661\1000992\1009506p\DC2IO2\1091719\45622H!\ESC\7483\175838\ENQGf\CANZ\DC3\1108041H\1104285`0gt\1076067\&9$i\f\190389r\34782\SUB\ETB\STX>\92591\CAN;/x\ACKVr\174831J\RSP>\41770\998906V\992395+S\1094621\1079057\&3$\161843\135632_\DLEl\147163\ACK\185075\128464\62978T#H\127869\CAN6\988067dQ\175209\15814\ESCE\DLEE\DLE5\1078664\STXj\985752G`U_5f4H\US\vI&-\1094613\1028101$A\25086\EOT\43527k\1097204\&2@l$S\993676\1058198?uV=:\SYNwG\1055832$%\1092445\&6~\ETXE\n8c\SI\RS\FS\FSDa\991818Ik\DC1\1102718\1082487|c\ACKW]g\ESC9\DC3(\1093648\&4qk\DC2\190859\48665\1007939-\1088169_\RSO\ENQmIg\190852))\1002094@\SYN\CAN\127763T'she?\1107059\136819z9xS\1101281N\ETX\50682&\1005383\1015019\DC1M\DLE\138073`b+",
-      crMessage =
-        Message
-          { messageText =
-              "K\78316\&0(\183858\1038411H[_MMT\1038827F*g&\18530\1078389\NAK\154044\149219F\22517\\\1105721w\a*-\nu_\SUBB[%{ \45165[\EM\SOH&\996819\&9K\EM$\DC2\989115'\1106575\&8#\83145FO/\v\100091oPf)\a\65100pb\GSG=HZ?]:g8eHF\SUBW\1041254<\1012428#\138035`\1031409\1072871\RSn]\EM\ag'\DC47\SOH X\1000182PQ\12796yb\SOHKX\58300s\1107009\181324\1054378H\39887\DC3\1090717b\1060350r\SO\ETB_\ACKsgr:\1111080\DC4\DC3?\b[qgE\137250\165970\&6YXVp2l\ACK\186085\fC\EM\SYN\ENQEU\ESC*\SYN}\983538O?Z\27301Z\DC1H\STXcaW.\SOHN\1095518w$+\GSJ\989441Myt\135550tTRC1`\1075866\2317\DLE\1068115\159649\SITl\6934\b\1025753'\rB\1086591\167831\b#.H\34704J\9336\1017247ey\173008x3\b\1032844"
-          }
-    }
-
-testObject_ConnectionRequest_user_17 :: ConnectionRequest
-testObject_ConnectionRequest_user_17 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00003719-0000-6c7b-0000-4b5f00002419"))),
-      crName =
-        "\118986{\95580f\SYN#\150020dCp\DC4F(H\EM\a\ETB\t*\1082514\ACKC?\GS\1111172G\68612:\1082172\1026014\NAK49A\GSt%c:\SOH\DLE''\"TX2\FS\133427\50253A\SYN\166445\182526\174750\DC4ld\993299#<\171430\DC1#\1031493\SUB\182963\DC1p\2089]OZR9\v\995402o\168814@a\1000497q\94408\70415\1029371/b\1022528v`aGk4\29533\1108357\1096436\1021616\1064829`iu\1004792mxw$",
-      crMessage =
-        Message
-          { messageText =
-              "/\52018\EOT\SOH\SI5\59974k\DC3(,\1096092\CAN\1015526\ACKe\1086383\1079641\ESC=\ACK\1035769_\r\144045iO\57912\159779a\DC3\3734\\@?k\aU.?\ACKYEu5\ESCn@omOE\13401\1024364\1060934f6\1104279}M\67668\1061382\987269\EMI\ETBw\EOT{'\997289\SO\100859\1067125P\47469\48067\1073626\19858!\52378\EOT\DC2*\34977z\188346\154344l^d\tQ\FSZI\1062279\f#\SUB\b\"|v)\144252\181333^NV\EM\US"
-          }
-    }
-
-testObject_ConnectionRequest_user_18 :: ConnectionRequest
-testObject_ConnectionRequest_user_18 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "0000085b-0000-3152-0000-694d0000363f"))),
-      crName = "~\EOT4\167100HEA",
-      crMessage =
-        Message
-          { messageText =
-              "~C\DC2\1002051$\150681#?]Y\1026954\466\&3\1047910\53363\EM\n\195101I\1061582Mc\186653\26145jBb{\1102116i\CAN\a\1078901<C(\142546\1032176 O\USo\996587a\1104395!b\12966~\11112\153670`\t~r\999264\NUL\"#Yk\DEL\14801~P3DEef\US+\74224\\\"0Ae\DC4gi6\vj7{\39095\"~\1068222\DC1<qc\ar\1028862\1041405\\&)\175651\DLEAyl\ETB\v}\5410\SYN\987120y\ETB\996870^\170230\GS0\1093815k|\1045040@h\61288pG\CAN\b$s\1092111\DC3J\r\164814\t\37223\153208\1043628P\CAN\\6+.\1005218Ah88\DELk\"\1100052U\156436[uy\ESC#u\1101542\riKR\1029573\CAN?\168292+\129471:\1080618\131666\EMQ\1000005\a\1002227\131975W\CANIrLk5k\SI qZF\r\t\1016286lnH\"\SI\1044060\1051756\USNfw\DC2\r;$\t~!hV\t\17067\1102580\1074739j\51196\NAK4mI\131738\ESC\986235\74755u\183873\&0\174498b\159469W\1084778K)"
-          }
-    }
-
-testObject_ConnectionRequest_user_19 :: ConnectionRequest
-testObject_ConnectionRequest_user_19 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "000038c8-0000-3e70-0000-4bde00001bd1"))),
-      crName =
-        "+\1036811.\ETBw\30726v]\1106145\EM\99793-\60517\ACK\999234\153925Y.\DC4>&\f#:\153646a\v\164064\134442x\1011355\SYN E\tj\134568\174176H\1002846\EM(Y@\1093084\18406\1084436<~\DLE?_\133184rn\GS3\"E4%<L\NULb[\SOH^\161192&\ACKN\DLEn\51561|\163536\&9\f7\183928\1726\1004196%)FUov\1090474l@)\DC2u\US-\NUL>V\NAKL\ETBp\77996&\166703\&4\146531\&3\26959\EM-\SI\a\59041\ETXh\20545s~\v\1017780\EOT\30400\63390ED\ACK\STX*\1034616z*\ACK-e\159628HA\STXQ4",
-      crMessage =
-        Message
-          { messageText =
-              "}Vr6f\n\NAKm\1068449\1032597\DC1y\1034128\ETX\STX\1043357o\95013V\v1-/\45857.M+\455q\1070336f^o\1075065\CANK\25528\FS\166886wh\SUB\f=6t(L\984153g\EM\EOT\995709:}\ESC\SUB\1095478}q\1075966\tJ\1092483\STX?\1045856\23092\1039266\ESC@x:2\991430&h"
-          }
-    }
-
-testObject_ConnectionRequest_user_20 :: ConnectionRequest
-testObject_ConnectionRequest_user_20 =
-  ConnectionRequest
-    { crUser = (Id (fromJust (UUID.fromString "00003c50-0000-35a1-0000-2a52000060b5"))),
-      crName =
-        "H\98387upBf\1032240z\188972\SUBR\ETXS[\ETB\NAKH9GdJ!\ESCRj\1038248)\STXc6\1100822|\GSn\SUB`F.\SO\169866y\182067\50904X<egN\ESCTb\78455\NUL\183917j$<J)\DC2\NUL\CAN1tb\64469bA\172607CN\v-\30258\1065018<\SOH\169005_\DC2MOh\ENQ(1\188232\1093362\&8\68842\1072253w\n\EOT\DC41;\1024605\1036477GlM\1028981[\60287\29631\40987u+\ETX_h|\ETBa\ENQ\r{r\178667\&94?\986919\&77z\ENQ\RS[y\STXNh(Nz{\DLEh\1101854\&4\n\SI\CAN\NUL5i8\54326\62547i7\1051600KGD\1000249RY\183426!a7~\ETX\FSkq54\DC3)n\a\DC3\FS4b]\1023297\144169_Pz!\1031847\1077221\61231(\v=qjhQ\1031897\RS\1062111\36047\1107081\DC4\1028598\ETB!ZW~vm\SUBb$\SUB\998039\DC3I%:}\13245\52687\1060646S\142295\1078894\984437\&3\ae\STXD<?(\1667v8\162785\1052320\100123]\41800\FS\1113307\158317w\988694{\147725q\SYN",
-      crMessage =
-        Message {messageText = "\135477\1037796\ETXP\74912M{\1089002\1040999\30627an\STX^X\RSW~\65412\ACKgF\992307"}
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionUpdate_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionUpdate_user.hs
index 8b34c08a047..6eb9a79a59a 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionUpdate_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConnectionUpdate_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -18,64 +16,7 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.ConnectionUpdate_user where
 
-import Wire.API.Connection (ConnectionUpdate (..), Relation (Accepted, Blocked, Cancelled, Ignored, Pending, Sent))
+import Wire.API.Connection (ConnectionUpdate (..), Relation (Cancelled))
 
 testObject_ConnectionUpdate_user_1 :: ConnectionUpdate
 testObject_ConnectionUpdate_user_1 = ConnectionUpdate {cuStatus = Cancelled}
-
-testObject_ConnectionUpdate_user_2 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_2 = ConnectionUpdate {cuStatus = Blocked}
-
-testObject_ConnectionUpdate_user_3 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_3 = ConnectionUpdate {cuStatus = Pending}
-
-testObject_ConnectionUpdate_user_4 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_4 = ConnectionUpdate {cuStatus = Cancelled}
-
-testObject_ConnectionUpdate_user_5 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_5 = ConnectionUpdate {cuStatus = Pending}
-
-testObject_ConnectionUpdate_user_6 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_6 = ConnectionUpdate {cuStatus = Sent}
-
-testObject_ConnectionUpdate_user_7 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_7 = ConnectionUpdate {cuStatus = Cancelled}
-
-testObject_ConnectionUpdate_user_8 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_8 = ConnectionUpdate {cuStatus = Cancelled}
-
-testObject_ConnectionUpdate_user_9 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_9 = ConnectionUpdate {cuStatus = Blocked}
-
-testObject_ConnectionUpdate_user_10 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_10 = ConnectionUpdate {cuStatus = Pending}
-
-testObject_ConnectionUpdate_user_11 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_11 = ConnectionUpdate {cuStatus = Sent}
-
-testObject_ConnectionUpdate_user_12 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_12 = ConnectionUpdate {cuStatus = Pending}
-
-testObject_ConnectionUpdate_user_13 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_13 = ConnectionUpdate {cuStatus = Ignored}
-
-testObject_ConnectionUpdate_user_14 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_14 = ConnectionUpdate {cuStatus = Sent}
-
-testObject_ConnectionUpdate_user_15 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_15 = ConnectionUpdate {cuStatus = Accepted}
-
-testObject_ConnectionUpdate_user_16 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_16 = ConnectionUpdate {cuStatus = Accepted}
-
-testObject_ConnectionUpdate_user_17 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_17 = ConnectionUpdate {cuStatus = Sent}
-
-testObject_ConnectionUpdate_user_18 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_18 = ConnectionUpdate {cuStatus = Sent}
-
-testObject_ConnectionUpdate_user_19 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_19 = ConnectionUpdate {cuStatus = Blocked}
-
-testObject_ConnectionUpdate_user_20 :: ConnectionUpdate
-testObject_ConnectionUpdate_user_20 = ConnectionUpdate {cuStatus = Blocked}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvMembers_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvMembers_user.hs
index 71f7810b9b3..80beffda1cb 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvMembers_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvMembers_user.hs
@@ -18,9 +18,9 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.ConvMembers_user where
 
-import Data.Domain
+import Data.Domain (Domain (Domain))
 import Data.Id (Id (Id))
-import Data.Qualified
+import Data.Qualified (Qualified (Qualified))
 import qualified Data.UUID as UUID (fromString)
 import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust)
 import Wire.API.Conversation
@@ -38,7 +38,6 @@ import Wire.API.Conversation
         memOtrMutedStatus,
         memService
       ),
-    MutedStatus (MutedStatus, fromMutedStatus),
     OtherMember (..),
   )
 import Wire.API.Conversation.Role (parseRoleName)
@@ -52,12 +51,12 @@ testObject_ConvMembers_user_1 =
   ConvMembers
     { cmSelf =
         Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
+          { memId = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")),
             memService =
               Just
                 ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
+                    { _serviceRefId = Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")),
+                      _serviceRefProvider = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))
                     }
                 ),
             memOtrMuted = True,
@@ -68,11 +67,10 @@ testObject_ConvMembers_user_1 =
             memHidden = False,
             memHiddenRef = Just "2",
             memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "pqzher6cs67kz8fg0cd4o8aqs00kvkytkovzkjs1igz9eub_5xey_no8m2me3or8ukbtv05uq7gc54p6g52kwiygyqs3om7yu0istkixp_3395mkaxh9zljjyy8"
-                  )
-              )
+              fromJust
+                ( parseRoleName
+                    "pqzher6cs67kz8fg0cd4o8aqs00kvkytkovzkjs1igz9eub_5xey_no8m2me3or8ukbtv05uq7gc54p6g52kwiygyqs3om7yu0istkixp_3395mkaxh9zljjyy8"
+                )
           },
       cmOthers =
         [ OtherMember
@@ -80,14 +78,13 @@ testObject_ConvMembers_user_1 =
               omService =
                 Just
                   ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
+                      { _serviceRefId = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001")),
+                        _serviceRefProvider = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))
                       }
                   ),
               omConvRoleName =
-                ( fromJust
-                    (parseRoleName "y4zf98vsd7b6zi1_3wch87_k8m0t8mpdhh8zlcq461s80oc0sl7yn85twxn89f7f4kwpd4_hj9q2m3za")
-                )
+                fromJust
+                  (parseRoleName "y4zf98vsd7b6zi1_3wch87_k8m0t8mpdhh8zlcq461s80oc0sl7yn85twxn89f7f4kwpd4_hj9q2m3za")
             }
         ]
     }
@@ -97,12 +94,12 @@ testObject_ConvMembers_user_2 =
   ConvMembers
     { cmSelf =
         Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
+          { memId = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")),
             memService =
               Just
                 ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
+                    { _serviceRefId = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")),
+                      _serviceRefProvider = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))
                     }
                 ),
             memOtrMuted = False,
@@ -112,1327 +109,7 @@ testObject_ConvMembers_user_2 =
             memOtrArchivedRef = Nothing,
             memHidden = False,
             memHiddenRef = Just "",
-            memConvRoleName = (fromJust (parseRoleName "hoz2iwweprpt270t14yq_ge8dbej"))
+            memConvRoleName = fromJust (parseRoleName "hoz2iwweprpt270t14yq_ge8dbej")
           },
       cmOthers = []
     }
-
-testObject_ConvMembers_user_3 :: ConvMembers
-testObject_ConvMembers_user_3 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Nothing,
-            memOtrMutedRef = Just "M",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "5",
-            memHidden = False,
-            memHiddenRef = Nothing,
-            memConvRoleName = (fromJust (parseRoleName "l3e1jootef7"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "_iat9eeo3d3hpegxoagnv_edxygxnt22l8x018dcrvdn1yldv"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "24cmwkzx__1kpkialogtzp4709ii9aa1_j91lxewed0jl15bsoka50u44_m2yp2tn5jcyk353rlj17a4lfs5mu9psf2mrz484mr38t_w4uiemk"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_4 :: ConvMembers
-testObject_ConvMembers_user_4 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Nothing,
-            memOtrMutedRef = Nothing,
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "",
-            memHidden = True,
-            memHiddenRef = Just "",
-            memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "h7lmyguc3tspi_iq2rb96dnujrrnumratq1xtq6aj15x3uzme6jptzvww78_u22iakspdllhuwsap36t4m2j2cui6cjqciv5b_qqfql2r2rrevw9saof6q77d"
-                  )
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "8pab2pgrjaf085srseyhvavmz9nveubwyrgh4788ilfb0rj2t3gh9izi6bkk97io06aj0bwv1868hzpufqnf_pdilz4ho"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName =
-                (fromJust (parseRoleName "mhxmfwnaxzygxlgoomh4jg1l2pttlem3seyve7cqheq7n8rtdyv2ovxfi7x84"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "jx92xe1j6i9wkc9na5um7bca1m94at3gjoc81nn09667vg9xt32zlkldec05cumwltcyxwzj2sj089cdzu0iqso5br2nuk7s67je6xj8i9g8h5tmhzuosqq4wktmmf"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName =
-                (fromJust (parseRoleName "3lwoqfe65zjajm279ixflg1es4vbo8u004reefel78tgyo231qj968zo9bhr3"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "8178_"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_5 :: ConvMembers
-testObject_ConvMembers_user_5 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                    }
-                ),
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-            memOtrMutedRef = Just "",
-            memOtrArchived = False,
-            memOtrArchivedRef = Just "2",
-            memHidden = True,
-            memHiddenRef = Just "\DC1",
-            memConvRoleName =
-              ( fromJust
-                  (parseRoleName "v1y6zn1esg9ptv72rpu4speujl6uqick58m5bsbuqjdg9xs83ei1hvryvsyhvn7o1zntculg6adry1gvglpe")
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "j6cd868soxwsiwf4iaynv371tiotfd9kio"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "h9e303sddeozp391xuq19j0xt6dc26"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "w0f6se19tlklqr46v0i1c5t5ii4dc123"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "xew1uato1o"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "zz07p8aovj0wfrztrwe7b4u02ysxeg72oyfo8dnqzw7odzl7iym1tdsok27d76po1t8b3n9fsin0r8543ruheaoylie99aqjjeiz5ce2wjmdcb4nro2b1pb7p"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_6 :: ConvMembers
-testObject_ConvMembers_user_6 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                    }
-                ),
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-            memOtrMutedRef = Just "",
-            memOtrArchived = False,
-            memOtrArchivedRef = Just "",
-            memHidden = False,
-            memHiddenRef = Just "T",
-            memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "tyugtdx7b6_tnvz0btwo03zht0ee07jgmjgn5cbi6vxf8ge3dte6s2_hz0owrju_hx5g14wpkpr_9wdr_lepejkncj"
-                  )
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    (parseRoleName "w794tuc4_7uds0z1njq0n64rfwgh1ejkzozuikjk845ybh9r4l3d6y1o_v1qo108ri4yhnbpetkhzy1ie95")
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "skl0wbt9"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "2u7h4liwioxhdyw2ums20wc4uuu078x416195m0"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "v7lfuggvm03jjo87bwn1kdwdt86rj7x75gp4t8e8iyii6_rcotf6ojkaczcs93ydllwfn4fybjasv4ediol0auyb7_l2omz74k8iw7lkm4l622v5i2qbqn2e"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "s53zd8pxzf5jnywo11tcqhus0v86oo93vgffrnfao7zv7ddvutnwzs1sv_zoh1nxeqanlyj29x2crpuhrged_hn40pdiefm"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "tn14gkbhny6tynh1ijhruy_nsvw17_wnrd19sbcffh9xmkrpilwfc9wnbv"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "xlaoiqbhmdxeak4vygfx2yw9y1dwxlv2u3_80yrdtu5i5wtkk1y"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "by4w8spnxlbgatis64iz_"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    (parseRoleName "20ki2zvvhvpe4jlvdvvbpzxlfx3nije8ionba35ovbcdrte4y7pjws17jz3bhct7dy20x_8k9sxo34smx25")
-                )
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_7 :: ConvMembers
-testObject_ConvMembers_user_7 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-            memOtrMutedRef = Just "\RS",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "\54519",
-            memHidden = False,
-            memHiddenRef = Just "",
-            memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "lqx9nuwumdniap26x6xql_bqj63xsg345w41xmlgddcdcalubn3yz8xddzyw7q0447yy5xs9g_s3lyfvq7vbmgl25up11z9yt"
-                  )
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    (parseRoleName "gslt5tuoes3wnlf6td917g650hvja7d9lsl7imebq8hy6he50xoz498jxu37m2kdm98egyblf6e9jk8k71gj")
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "vb3ptbhwr5pdikr5avb56bsc2qmlbvmxr_bjry6j1veyz4ppilanfkzq2bv"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_8 :: ConvMembers
-testObject_ConvMembers_user_8 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Nothing,
-            memOtrMutedRef = Just "",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "",
-            memHidden = True,
-            memHiddenRef = Just "?",
-            memConvRoleName = (fromJust (parseRoleName "4mpg6odm53b6afqtdk1wwr57dsoa1jiwhne"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                (fromJust (parseRoleName "vcat_x7n_17ig7gxw1mjyk912pjh8furzbhzfxpo0citjipmkf0cy3j9sqekrxcn1su7fs"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "m_7vhmo6z7kwi0mu1qh9d1o0ztn3t9u1l1gv62bwcbawq89bgy"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_9 :: ConvMembers
-testObject_ConvMembers_user_9 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-            memOtrMutedRef = Just "",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "",
-            memHidden = True,
-            memHiddenRef = Just "I",
-            memConvRoleName = (fromJust (parseRoleName "pi6noe34tsfw6"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                (fromJust (parseRoleName "ytko3vik7nviewv_mlrluswwsoxkxdwexmdy1r7yy1l265cdg5nluqedrxby2zma"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "pwsqgpb966m2o9g9oahmfp83gjb0ll987xdvus_bdxgo3p0gokb6spardga87x__5ueyjpgvy_6lzhimz2_1d967fpvfbs236x6ed777nf0mfuw4j5x4wtk"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "8mveq505d0ftsgaefuyu"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "tr_"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_10 :: ConvMembers
-testObject_ConvMembers_user_10 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-            memService = Nothing,
-            memOtrMuted = False,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-            memOtrMutedRef = Just "",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "\1089705",
-            memHidden = False,
-            memHiddenRef = Just "",
-            memConvRoleName =
-              ( fromJust
-                  (parseRoleName "7dbiql5aifhtio8krbpps8i1r20uplkfvmii9o7nem8r2xe9jyh4vqgw_dt8dznua4ms_ojuy7x8mhko5")
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "svx4t8g9wwsxnjh"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "ozu_7m73jbvhbk0i3jcoyoe4dh2tuew"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName =
-                (fromJust (parseRoleName "tm8gb5smre1aboo4262eckaqv0imy0ke4kzbi9l8eq0yem6g6jjqcx6uavcsuavc"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "50w5dsrib7kvjl_i3w_w8wx0kiilysbj_mdy0hycpcico768nytkqi0d"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "t6f29t4sp_bg9v3_6g2inptndogq1yya8hena72erf5pwi5o47k9hp3x_n4wusj9gfwnhn7v419ovmug4ttvghtlfvyzqgls2wcj_"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_11 :: ConvMembers
-testObject_ConvMembers_user_11 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                    }
-                ),
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-            memOtrMutedRef = Just "",
-            memOtrArchived = False,
-            memOtrArchivedRef = Just "\DC1",
-            memHidden = False,
-            memHiddenRef = Nothing,
-            memConvRoleName = (fromJust (parseRoleName "7gd37ta2eg_"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "w9hqf8lcwwex77nxrgqaro7a97i0up89j1xsz9zv65vvy2vbshfue_bk6h0dqsfcom4yhiy_eusbj84s8hi33rps5lxr"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "bkf39px76nwbf4mz6_b8wuqltfv5dgiwp75ji5bh7tfjrl37zcchv"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "4_9pqyp2h9wt3g2ek62u5zxfs7njrdsbbas9_pnigxjyru5wbbd8rvd1"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "x8aoqx69ptpetu2ijqtdgfcnn4i_fs53xuuvd8wk0w62az2ifcf3"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    (parseRoleName "3x2x2c653mxqbc3033be6nw33o4kbz59c_m2840prcxccsih0vu_xiiij4p2bcuapi2a5pdah43f0cdcw")
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "5mxf8j2rudyj_qp34xght54oi5ze5ibz9gdn0r4c3bswshmh24289g8sexu90fxpbi2in3b0fnim_zkyh7w5jzwl_rr4pxd35sqq4spql3ky60zdoobj"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_12 :: ConvMembers
-testObject_ConvMembers_user_12 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-            memOtrMutedRef = Nothing,
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "\157525",
-            memHidden = False,
-            memHiddenRef = Just "?",
-            memConvRoleName =
-              (fromJust (parseRoleName "metu5hokrekxgyamdqvu5pub1efki_5x00gpjigwjuj5wmyfi6ipy425i87a3phcq"))
-          },
-      cmOthers = []
-    }
-
-testObject_ConvMembers_user_13 :: ConvMembers
-testObject_ConvMembers_user_13 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                    }
-                ),
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-            memOtrMutedRef = Just "\v",
-            memOtrArchived = False,
-            memOtrArchivedRef = Just "",
-            memHidden = True,
-            memHiddenRef = Just "\DC1",
-            memConvRoleName =
-              (fromJust (parseRoleName "42ujl2m6nrjp4ieej3a79t55_q2aqubgpihl2e1q3pv98wtyqxhaebz2n_rnzc95wyzurylgh8ju5g"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "ucf8dtd6st2z1dpc4vty0rkep2m2"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName =
-                (fromJust (parseRoleName "z9plklhipd9vc9xsrmmnjgxvcmn88wd8bsxksz4fz0m_vxochm6fknmxlhv8q7t6pz7zem"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "p5hsxn0iq7cuh0m49o1ra9x3kji9ku088q"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "a7nlm4pb71iu7auorq2wfdwvbqjamumby1l8o_0t_mrrdq8ucurulsrl8j35ulczgcw4h9vli187z74gh2ibutc5jt6esfil9m9t"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "tjzby42utlpbmouqok_0l9zhoqba03bfz_7hgmuk2r1gcd5laozwgu6zwactg8okxg07url_2huwyn1w_5yl9e0dqq_oweplfx3fkg6c365949zbi86c9tsfyf35h0o"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                (fromJust (parseRoleName "pk30v1kj11lzl1l3dty1i5eucmceer6p41wwq5hlewecwzxn_s5sv8lpwmvr7b5_b"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "mh1oif358ntz8xlflodiay7alkiktphvvkfy0jerup_gryt4gm0p08q7ynx1kak7de0uup8o9rdblv118f9fal2c8flmub8vdgt1u8nyphxoj2kq17y"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "y000q2czyxtw7ix6b0cma"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_14 :: ConvMembers
-testObject_ConvMembers_user_14 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Nothing,
-            memOtrMutedRef = Nothing,
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "_",
-            memHidden = True,
-            memHiddenRef = Nothing,
-            memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "dzc663lqhsl5koo9zoydav2svibxi2rldgfs21lozv_47live4tdb_6etua7xbo2h08iehbijx6cnvaiamahoh304_6cua4cce27n8uf1y"
-                  )
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "t7iw7icbnz53p8to8m6b0qjgp8aqd1w"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "dpw7b81s21xnmn230l3meyc9xb50h44adxfjrlcwc4rvu9y46whvv_9_06gr1o8mxqa6fwmhvzq8ugirkige_o440kgu1xzncja856hbiy0wosrfbkohxlnt3ad0n1nf"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_15 :: ConvMembers
-testObject_ConvMembers_user_15 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                    }
-                ),
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-            memOtrMutedRef = Just "y",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "",
-            memHidden = True,
-            memHiddenRef = Just "\1007867",
-            memConvRoleName = (fromJust (parseRoleName "gtot_tiqu6niipivhw02eu"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "q2bss_quf29jonuixms3y4xvohcq387gmgft5imwjk04u1skbjjvg6h92jgfk00j9g5meownkwzijda98xkdzs6"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "jmp56f7fu12_0ufmn4ykdhtdqwxy3atmutw7hkix8ed6"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "razn_c23lmdd_fpf41hto60aw5iftmyrwna_1o"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "e5zwjlctzwwxuks0hxcl8an6oas840jrs7xl2gw1p8rlnun2_rtfa_rw9tsb67x3g4dh4cv62tvx10x4bmmj0dzczsyb_ic0gvzhvsm1vo"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "6bsf2pcmtt15vznyahwm_hsz4fvc94fd9l3etor9h5eok2ggp7gmy8512428lrq1sezdb9xqz8v33ooyr7vyc39x8kohh0cxc_dja4wqgqx_59xyxqbah94tsyx"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "7t50u1ug50o9xo49dbv0g46wbhgu17_4pe6hsooiqye50_a0s0p7i78lwx"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_16 :: ConvMembers
-testObject_ConvMembers_user_16 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-                    }
-                ),
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-            memOtrMutedRef = Nothing,
-            memOtrArchived = True,
-            memOtrArchivedRef = Nothing,
-            memHidden = True,
-            memHiddenRef = Just "",
-            memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "0cbihjuksvzpyno3h86i34yoy6hr2o2yg16_wi8247u84jontkapcs_cms98qq8qkuw9zoa240fdjf8vlyhfsxidoxy1t3k_wefqly5"
-                  )
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "xswztznf4h445esgv862hlnl_w12ofs6gudt5rqm0fmcy1ji1j1tmdxud9knxuv6_1tkj9xdm8e6heqi2aa3nczuyzfckca"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    (parseRoleName "bdee121l0vor_rgs35m64b7akc1ulu2djh36kzp53faqyk2d366wzr56xk2ozzqy2gnq2it_rox4ir6")
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "iuv0fiqut43alvkb_1b3h7dw_nkxu7yco1lbwot_4ly_3r9ru8qudjl4u4rh1xqcmuxh8t6oob6e06br1kn9x6niubo13xwetasp3"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "c3cjc"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_17 :: ConvMembers
-testObject_ConvMembers_user_17 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-            memOtrMutedRef = Just "",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "",
-            memHidden = False,
-            memHiddenRef = Just "",
-            memConvRoleName = (fromJust (parseRoleName "gfzbewc89276dh2bhpftvkqv1lfti5ai_n"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "rd9k2n2q8n7gbm55"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "yctlmr8wp0tiyiyn5qld86rpeqigr83h6hn99zo4x1s5ps5j5es4w00wvpcg9h3eplsvctvzryjle1ynou4f7h7s_z0awql5ownx1joi5var2tt0g"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "6s2wm62g83wg327vlylm0rv64e3yt41j9ofekhhybvwlxx6b9hwtst9sed3s6kh3dlkp61ocjbpxqt033xic98ujq__ck3yn"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "mjpdiejf9fgpxz"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_18 :: ConvMembers
-testObject_ConvMembers_user_18 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                    }
-                ),
-            memOtrMuted = False,
-            memOtrMutedStatus = Nothing,
-            memOtrMutedRef = Just "",
-            memOtrArchived = False,
-            memOtrArchivedRef = Just "",
-            memHidden = False,
-            memHiddenRef = Nothing,
-            memConvRoleName = (fromJust (parseRoleName "5crfexlvlxn_"))
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000002")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "zb1ddtg"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_19 :: ConvMembers
-testObject_ConvMembers_user_19 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-            memService =
-              Just
-                ( ServiceRef
-                    { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                      _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                    }
-                ),
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-            memOtrMutedRef = Just "G",
-            memOtrArchived = False,
-            memOtrArchivedRef = Just "v",
-            memHidden = True,
-            memHiddenRef = Just "I",
-            memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "t4grrg6rq1gacy62wjoc_h5ytk9o4_jv25gr1a6ycai9ylhuyis7m5s062y4e5iyz0xtw_rbmjuzvgdjkn0tzl9a23p_nycqtp7foswfpxgmwahe02iae1eih"
-                  )
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000200000003"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "oqgwbsi97htc7jnxrlo"))
-            }
-        ]
-    }
-
-testObject_ConvMembers_user_20 :: ConvMembers
-testObject_ConvMembers_user_20 =
-  ConvMembers
-    { cmSelf =
-        Member
-          { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-            memService = Nothing,
-            memOtrMuted = True,
-            memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-            memOtrMutedRef = Just "\18833",
-            memOtrArchived = True,
-            memOtrArchivedRef = Just "",
-            memHidden = True,
-            memHiddenRef = Just "*",
-            memConvRoleName =
-              ( fromJust
-                  ( parseRoleName
-                      "3esspudy3w9915yyyonlb3dzmp3blkjrvdfdjejfojfkrhosbtnhsivt6dhutihlq6ija_azgdrx6r4_pdw1a9cj0opv77g087t"
-                  )
-              )
-          },
-      cmOthers =
-        [ OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "b_1s3qhqvz8buhk16hx5kz7moxy6w"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "k5dvtuimn88rwf702hfi3dyn3mmcp_4_rlqogl2t4v29vl5ynu9cnv4n4zi7lat5lwptqerygp5vbq9297sniahtqof3nrah_lotb9m5mowj1p8r049"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "qhzt3rgqtwdtenauy_ju9kov8ezecou02bo9y3sj4gl7thjyw7hvwmryfmnyzjx0r25zzdsi9f8kifueppwtcmlz8kwq0vj31j88ziu2p66o5quz2vt9w"
-                    )
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) domain,
-              omService = Nothing,
-              omConvRoleName = (fromJust (parseRoleName "4fn4nrdzoy1wqumz7550ee6kof6om6e5vy2iii_91ejzcvb8h8rihehyz"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                      }
-                  ),
-              omConvRoleName =
-                ( fromJust
-                    (parseRoleName "t7fwbdtuxk3vgdd_x_q5rpdpz6m_iirgo62f151bh1m191gtu6rirc3wrthfjz188k22cip05ds6k15klrl6")
-                )
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) domain,
-              omService =
-                Just
-                  ( ServiceRef
-                      { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                        _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                      }
-                  ),
-              omConvRoleName = (fromJust (parseRoleName "axoworkfvytprcph0ztay_w55o7ipzy7uj4x52evws9mfw987n30w3"))
-            },
-          OtherMember
-            { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) domain,
-              omService = Nothing,
-              omConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "bhkqaueueah3dgdxrjw8a_mvd2y1jatjhzz5nhx6smsy5dw2a9ru67mqdnx1cbwc8bl5_fupckro1vh5scexr9o1z7pyy4"
-                    )
-                )
-            }
-        ]
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvTeamInfo_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvTeamInfo_user.hs
index 1deeab1ea87..8e1ec683b10 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvTeamInfo_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvTeamInfo_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -20,112 +18,12 @@ module Test.Wire.API.Golden.Generated.ConvTeamInfo_user where
 
 import Data.Id (Id (Id))
 import qualified Data.UUID as UUID (fromString)
-import Imports (Bool (False, True), fromJust)
+import Imports (Bool (False), fromJust)
 import Wire.API.Conversation (ConvTeamInfo (..))
 
 testObject_ConvTeamInfo_user_1 :: ConvTeamInfo
 testObject_ConvTeamInfo_user_1 =
   ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "0000003f-0000-0059-0000-002200000028"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_2 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_2 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "0000000c-0000-005d-0000-006000000003"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_3 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_3 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "00000051-0000-003c-0000-00070000001e"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_4 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_4 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "00000063-0000-0034-0000-007300000025"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_5 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_5 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "00000009-0000-0043-0000-00690000004c"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_6 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_6 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "00000059-0000-005a-0000-00720000005a"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_7 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_7 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "0000000e-0000-0009-0000-007500000036"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_8 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_8 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "00000074-0000-0043-0000-006e00000018"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_9 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_9 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "00000080-0000-0039-0000-000f00000009"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_10 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_10 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "00000028-0000-001d-0000-00210000004c"))),
+    { cnvTeamId = Id (fromJust (UUID.fromString "0000003f-0000-0059-0000-002200000028")),
       cnvManaged = False
     }
-
-testObject_ConvTeamInfo_user_11 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_11 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "00000066-0000-000f-0000-006500000001"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_12 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_12 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "0000005f-0000-0066-0000-00640000004d"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_13 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_13 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "0000001e-0000-005d-0000-006d0000000a"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_14 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_14 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "00000057-0000-001d-0000-003200000055"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_15 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_15 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "00000024-0000-0048-0000-00500000005b"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_16 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_16 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "0000001e-0000-0035-0000-004c00000034"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_17 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_17 =
-  ConvTeamInfo
-    { cnvTeamId = (Id (fromJust (UUID.fromString "00000023-0000-007d-0000-00740000005b"))),
-      cnvManaged = False
-    }
-
-testObject_ConvTeamInfo_user_18 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_18 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "00000030-0000-000a-0000-007c0000005e"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_19 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_19 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "00000073-0000-0048-0000-007000000018"))), cnvManaged = True}
-
-testObject_ConvTeamInfo_user_20 :: ConvTeamInfo
-testObject_ConvTeamInfo_user_20 =
-  ConvTeamInfo {cnvTeamId = (Id (fromJust (UUID.fromString "0000002f-0000-004e-0000-00150000007b"))), cnvManaged = True}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvType_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvType_user.hs
index ecb3c5f0c04..9a8d52c255f 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvType_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConvType_user.hs
@@ -27,55 +27,7 @@ testObject_ConvType_user_2 :: ConvType
 testObject_ConvType_user_2 = One2OneConv
 
 testObject_ConvType_user_3 :: ConvType
-testObject_ConvType_user_3 = One2OneConv
+testObject_ConvType_user_3 = ConnectConv
 
 testObject_ConvType_user_4 :: ConvType
-testObject_ConvType_user_4 = SelfConv
-
-testObject_ConvType_user_5 :: ConvType
-testObject_ConvType_user_5 = ConnectConv
-
-testObject_ConvType_user_6 :: ConvType
-testObject_ConvType_user_6 = RegularConv
-
-testObject_ConvType_user_7 :: ConvType
-testObject_ConvType_user_7 = One2OneConv
-
-testObject_ConvType_user_8 :: ConvType
-testObject_ConvType_user_8 = ConnectConv
-
-testObject_ConvType_user_9 :: ConvType
-testObject_ConvType_user_9 = SelfConv
-
-testObject_ConvType_user_10 :: ConvType
-testObject_ConvType_user_10 = SelfConv
-
-testObject_ConvType_user_11 :: ConvType
-testObject_ConvType_user_11 = One2OneConv
-
-testObject_ConvType_user_12 :: ConvType
-testObject_ConvType_user_12 = One2OneConv
-
-testObject_ConvType_user_13 :: ConvType
-testObject_ConvType_user_13 = RegularConv
-
-testObject_ConvType_user_14 :: ConvType
-testObject_ConvType_user_14 = SelfConv
-
-testObject_ConvType_user_15 :: ConvType
-testObject_ConvType_user_15 = SelfConv
-
-testObject_ConvType_user_16 :: ConvType
-testObject_ConvType_user_16 = RegularConv
-
-testObject_ConvType_user_17 :: ConvType
-testObject_ConvType_user_17 = RegularConv
-
-testObject_ConvType_user_18 :: ConvType
-testObject_ConvType_user_18 = SelfConv
-
-testObject_ConvType_user_19 :: ConvType
-testObject_ConvType_user_19 = RegularConv
-
-testObject_ConvType_user_20 :: ConvType
-testObject_ConvType_user_20 = RegularConv
+testObject_ConvType_user_4 = RegularConv
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationAccessUpdate_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationAccessUpdate_user.hs
index 87ee52ff3fd..cb6522f2bf2 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationAccessUpdate_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationAccessUpdate_user.hs
@@ -19,13 +19,8 @@
 module Test.Wire.API.Golden.Generated.ConversationAccessUpdate_user where
 
 import Wire.API.Conversation
-  ( Access (CodeAccess, InviteAccess, LinkAccess, PrivateAccess),
-    AccessRole
-      ( ActivatedAccessRole,
-        NonActivatedAccessRole,
-        PrivateAccessRole,
-        TeamAccessRole
-      ),
+  ( Access (InviteAccess),
+    AccessRole (ActivatedAccessRole, NonActivatedAccessRole),
     ConversationAccessUpdate (..),
   )
 
@@ -36,109 +31,3 @@ testObject_ConversationAccessUpdate_user_1 =
 testObject_ConversationAccessUpdate_user_2 :: ConversationAccessUpdate
 testObject_ConversationAccessUpdate_user_2 =
   ConversationAccessUpdate {cupAccess = [InviteAccess], cupAccessRole = ActivatedAccessRole}
-
-testObject_ConversationAccessUpdate_user_3 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_3 =
-  ConversationAccessUpdate {cupAccess = [], cupAccessRole = NonActivatedAccessRole}
-
-testObject_ConversationAccessUpdate_user_4 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_4 =
-  ConversationAccessUpdate {cupAccess = [LinkAccess, InviteAccess], cupAccessRole = TeamAccessRole}
-
-testObject_ConversationAccessUpdate_user_5 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_5 =
-  ConversationAccessUpdate
-    { cupAccess = [CodeAccess, PrivateAccess, PrivateAccess, PrivateAccess, CodeAccess, CodeAccess, LinkAccess],
-      cupAccessRole = NonActivatedAccessRole
-    }
-
-testObject_ConversationAccessUpdate_user_6 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_6 =
-  ConversationAccessUpdate {cupAccess = [PrivateAccess, InviteAccess, InviteAccess], cupAccessRole = TeamAccessRole}
-
-testObject_ConversationAccessUpdate_user_7 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_7 =
-  ConversationAccessUpdate {cupAccess = [LinkAccess], cupAccessRole = TeamAccessRole}
-
-testObject_ConversationAccessUpdate_user_8 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_8 =
-  ConversationAccessUpdate {cupAccess = [LinkAccess, InviteAccess], cupAccessRole = ActivatedAccessRole}
-
-testObject_ConversationAccessUpdate_user_9 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_9 =
-  ConversationAccessUpdate
-    { cupAccess =
-        [ CodeAccess,
-          LinkAccess,
-          InviteAccess,
-          PrivateAccess,
-          LinkAccess,
-          CodeAccess,
-          PrivateAccess,
-          InviteAccess,
-          CodeAccess,
-          InviteAccess,
-          PrivateAccess,
-          CodeAccess,
-          LinkAccess
-        ],
-      cupAccessRole = ActivatedAccessRole
-    }
-
-testObject_ConversationAccessUpdate_user_10 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_10 =
-  ConversationAccessUpdate
-    { cupAccess = [LinkAccess, PrivateAccess, CodeAccess, InviteAccess],
-      cupAccessRole = ActivatedAccessRole
-    }
-
-testObject_ConversationAccessUpdate_user_11 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_11 =
-  ConversationAccessUpdate {cupAccess = [PrivateAccess], cupAccessRole = ActivatedAccessRole}
-
-testObject_ConversationAccessUpdate_user_12 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_12 =
-  ConversationAccessUpdate {cupAccess = [InviteAccess, PrivateAccess], cupAccessRole = ActivatedAccessRole}
-
-testObject_ConversationAccessUpdate_user_13 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_13 =
-  ConversationAccessUpdate {cupAccess = [InviteAccess, CodeAccess], cupAccessRole = TeamAccessRole}
-
-testObject_ConversationAccessUpdate_user_14 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_14 =
-  ConversationAccessUpdate
-    { cupAccess = [LinkAccess, CodeAccess, InviteAccess, LinkAccess, CodeAccess, CodeAccess, CodeAccess],
-      cupAccessRole = TeamAccessRole
-    }
-
-testObject_ConversationAccessUpdate_user_15 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_15 =
-  ConversationAccessUpdate {cupAccess = [InviteAccess, CodeAccess, CodeAccess], cupAccessRole = ActivatedAccessRole}
-
-testObject_ConversationAccessUpdate_user_16 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_16 =
-  ConversationAccessUpdate
-    { cupAccess =
-        [InviteAccess, LinkAccess, PrivateAccess, PrivateAccess, LinkAccess, CodeAccess, CodeAccess, CodeAccess],
-      cupAccessRole = ActivatedAccessRole
-    }
-
-testObject_ConversationAccessUpdate_user_17 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_17 =
-  ConversationAccessUpdate {cupAccess = [PrivateAccess], cupAccessRole = PrivateAccessRole}
-
-testObject_ConversationAccessUpdate_user_18 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_18 =
-  ConversationAccessUpdate
-    { cupAccess =
-        [PrivateAccess, InviteAccess, PrivateAccess, PrivateAccess, LinkAccess, CodeAccess, PrivateAccess, InviteAccess],
-      cupAccessRole = NonActivatedAccessRole
-    }
-
-testObject_ConversationAccessUpdate_user_19 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_19 =
-  ConversationAccessUpdate {cupAccess = [LinkAccess, CodeAccess], cupAccessRole = PrivateAccessRole}
-
-testObject_ConversationAccessUpdate_user_20 :: ConversationAccessUpdate
-testObject_ConversationAccessUpdate_user_20 =
-  ConversationAccessUpdate {cupAccess = [], cupAccessRole = NonActivatedAccessRole}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationCode_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationCode_user.hs
index 8aa9754232f..d90f012f48c 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationCode_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationCode_user.hs
@@ -48,8 +48,8 @@ import Wire.API.Conversation.Code (ConversationCode (..))
 testObject_ConversationCode_user_1 :: ConversationCode
 testObject_ConversationCode_user_1 =
   ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("M0vnbETaqAgL8tv5Z1_x")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("sEG3Y60tIsd9P3")))))},
+    { conversationKey = Key {asciiKey = unsafeRange (fromRight undefined (validate "M0vnbETaqAgL8tv5Z1_x"))},
+      conversationCode = Value {asciiValue = unsafeRange (fromRight undefined (validate "sEG3Y60tIsd9P3"))},
       conversationUri =
         Just
           ( coerce
@@ -73,440 +73,7 @@ testObject_ConversationCode_user_1 =
 testObject_ConversationCode_user_2 :: ConversationCode
 testObject_ConversationCode_user_2 =
   ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("NEN=eLUWHXclTp=_2Nap")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("lLz-9vR8ENum0kI-xWJs")))))},
+    { conversationKey = Key {asciiKey = unsafeRange (fromRight undefined (validate "NEN=eLUWHXclTp=_2Nap"))},
+      conversationCode = Value {asciiValue = unsafeRange (fromRight undefined (validate "lLz-9vR8ENum0kI-xWJs"))},
       conversationUri = Nothing
     }
-
-testObject_ConversationCode_user_3 :: ConversationCode
-testObject_ConversationCode_user_3 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("0=qjmkA4cwBtH_7sh1xk")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("XRuFWme95W-BwO_Ftz")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_4 :: ConversationCode
-testObject_ConversationCode_user_4 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("voBZnPMFx8w7qHTJMP7Y")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("fEPoIgD4yWs0mBa-bJ3")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_5 :: ConversationCode
-testObject_ConversationCode_user_5 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("05wvfrdJeHp6rJprZgWB")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("3UvuxN9u")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_6 :: ConversationCode
-testObject_ConversationCode_user_6 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("-luNrgw7W3X0kFR4izG0")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("ju-=kF9RH8Jd")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_7 :: ConversationCode
-testObject_ConversationCode_user_7 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("YUZI4FpWueY0v_l9_JQa")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("L7vTY6vgEeYGzTBtcL")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_8 :: ConversationCode
-testObject_ConversationCode_user_8 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("bY-JjZMrTX8teN75SHjn")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("rkSyHahGe=J-lDQ45S")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_9 :: ConversationCode
-testObject_ConversationCode_user_9 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("Keb12zuEIzF7IUsB6SfQ")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("-L5q5MU16hmMXL")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_10 :: ConversationCode
-testObject_ConversationCode_user_10 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("1zhL_Hp9mlkMM3OW47I8")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("2VrAbmBi1")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_11 :: ConversationCode
-testObject_ConversationCode_user_11 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("ReyDOsYF_D5HyDMX81FP")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("FRpchhjXoWB2")))))},
-      conversationUri = Nothing
-    }
-
-testObject_ConversationCode_user_12 :: ConversationCode
-testObject_ConversationCode_user_12 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("u2EODzrdg6Z7aAgci4MV")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("kMx3bFGd")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_13 :: ConversationCode
-testObject_ConversationCode_user_13 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("16xoACse_WkiFLw1S6w7")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("3acAKsrSdrIHN")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_14 :: ConversationCode
-testObject_ConversationCode_user_14 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("skREPTCY5lQiIoT5_sCo")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("mCwcpFiVwi=1ORILCy5l")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_15 :: ConversationCode
-testObject_ConversationCode_user_15 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("4VKcH84qTo23jJvTUv8O")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("wUEY-g7")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_16 :: ConversationCode
-testObject_ConversationCode_user_16 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("2zRLkYlMAPXsQKL1CM3e")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("XXxpZiqgIwPzcfUBdZh0")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_17 :: ConversationCode
-testObject_ConversationCode_user_17 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("KXXYAV8HosezGSSpNhqR")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("-aQqXyAyXO21ucrJhBQ")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_18 :: ConversationCode
-testObject_ConversationCode_user_18 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("jwP8Otm06gVqxYkvSEmm")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("tSN=4EHIKYVAJz=Ycax")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_19 :: ConversationCode
-testObject_ConversationCode_user_19 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("gk_qLO=OSCUiGqJNRfE3")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("FHEnKf")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
-
-testObject_ConversationCode_user_20 :: ConversationCode
-testObject_ConversationCode_user_20 =
-  ConversationCode
-    { conversationKey = Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("xCco2bPKwJ6xf0DGH2a7")))))},
-      conversationCode = Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("3jUkNeT")))))},
-      conversationUri =
-        Just
-          ( coerce
-              URI
-                { uriScheme = Scheme {schemeBS = "https"},
-                  uriAuthority =
-                    Just
-                      ( Authority
-                          { authorityUserInfo = Nothing,
-                            authorityHost = Host {hostBS = "example.com"},
-                            authorityPort = Nothing
-                          }
-                      ),
-                  uriPath = "",
-                  uriQuery = Query {queryPairs = []},
-                  uriFragment = Nothing
-                }
-          )
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20Conversation_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20Conversation_user.hs
index 12efb9a41e2..2f96bf6ceac 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20Conversation_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20Conversation_user.hs
@@ -25,15 +25,11 @@ import Data.Qualified (Qualified (..))
 import qualified Data.UUID as UUID (fromString)
 import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust)
 import Wire.API.Conversation
-  ( Access (CodeAccess, LinkAccess, PrivateAccess),
-    AccessRole
-      ( ActivatedAccessRole,
-        NonActivatedAccessRole,
-        PrivateAccessRole,
-        TeamAccessRole
+  ( AccessRole
+      ( PrivateAccessRole
       ),
     ConvMembers (ConvMembers, cmOthers, cmSelf),
-    ConvType (ConnectConv, One2OneConv, RegularConv, SelfConv),
+    ConvType (RegularConv),
     Conversation (..),
     ConversationList (..),
     Member
@@ -53,7 +49,6 @@ import Wire.API.Conversation
     ReceiptMode (ReceiptMode, unReceiptMode),
   )
 import Wire.API.Conversation.Role (parseRoleName)
-import Wire.API.Provider.Service (ServiceRef (ServiceRef, _serviceRefId, _serviceRefProvider))
 
 testObject_ConversationList_20Conversation_user_1 :: ConversationList Conversation
 testObject_ConversationList_20Conversation_user_1 =
@@ -62,7 +57,7 @@ testObject_ConversationList_20Conversation_user_1 =
         [ Conversation
             { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
               cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
+              cnvCreator = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")),
               cnvAccess = [],
               cnvAccessRole = PrivateAccessRole,
               cnvName = Just "",
@@ -70,7 +65,7 @@ testObject_ConversationList_20Conversation_user_1 =
                 ConvMembers
                   { cmSelf =
                       Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
+                        { memId = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")),
                           memService = Nothing,
                           memOtrMuted = True,
                           memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
@@ -80,406 +75,13 @@ testObject_ConversationList_20Conversation_user_1 =
                           memHidden = False,
                           memHiddenRef = Just "",
                           memConvRoleName =
-                            (fromJust (parseRoleName "71xuphsrwfoktrpiv4d08dxj6_1umizg67iisctw87gemvi114mtu"))
+                            fromJust (parseRoleName "71xuphsrwfoktrpiv4d08dxj6_1umizg67iisctw87gemvi114mtu")
                         },
                     cmOthers = []
                   },
               cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
               cnvMessageTimer = Just (Ms {ms = 4760386328981119}),
               cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "gja5abzmdbher18aju2a5odl4"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 3500896164423997}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "8uujf_ntws83s6ndw2vtmfl_lvtjm8ryz8_s_vb"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "jyj4ssa0em95hapzqakg8dre3b2n3serk2rxycbu31h4qehsfwkcwsy4nd2cjazw3b2rlnr6xct7_j6h5tj7"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "ezb8hqfaiurv"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 4702135969825321}),
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "6ehv3qr8615hrwur4am"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "cw7mbuwcp403kkn41os05211qyd4_kwo5yqog8vvqfph3efrsgqli_xzrk52_206s2tk9uyngsz4j03zqzmwihf83qgoxvt9g28kjq7u101r8l"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 7888194695541221}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            (fromJust (parseRoleName "rlvq6ir4ydawfd_xbw_g48u0z6nslo74nc05whuh8lirhoo7s6h"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 7607042969989865}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "u59pfu92v2v2bwy79i_t4vzc8n3vgkfu26j15annzdzip7rb0rxqmpbcp514oatnxxzb4neht40vx5fzxp453td4vmyvil_1ivyo1twrw1h34p48w5xtoih7hikle9w"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "k0eaeecf"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 7007725933930634}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "2zndnqqoy09lt9sv0yuiqp9seu0eyzm1rpd_"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 5891726360812026}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "ng9mkv_c44e_bf2sx1kc8z6nddk29xpccow72fmcmq4fw9qqkdy38m9bx7_n3qnwwisfjxvzqf56why"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 8461564964314645}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
             }
         ],
       convHasMore = False
@@ -488,2501 +90,6 @@ testObject_ConversationList_20Conversation_user_1 =
 testObject_ConversationList_20Conversation_user_2 :: ConversationList Conversation
 testObject_ConversationList_20Conversation_user_2 =
   ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [CodeAccess, PrivateAccess],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "i6wt1ve04kf7cnif2ql0mx26pmv4x7i01nsd53lmxdhzdas11y6kzu3rc32tx2c4krryakjh79zdqg7nhdvpfisfvvip9a7oc8qjvmtqlm8y9t1stodu"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            }
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20Conversation_user_3 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_3 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "knvo5u3vhp8392gdab"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            }
-        ],
+    { convList = [],
       convHasMore = False
     }
-
-testObject_ConversationList_20Conversation_user_4 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_4 = ConversationList {convList = [], convHasMore = True}
-
-testObject_ConversationList_20Conversation_user_5 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_5 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "2qzgr5wkn_ldz36qss3cwuwi7oqf_tqnoyvdpa3_g78ci97jnd6vdac5jh9i3narrk6xdxk9g1wntubp"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 1119369570957591}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "awjusc8ycco4z4tulpb22yvxi8bhj2v5r566om"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            (fromJust (parseRoleName "38lml9xkjpmsj719ju264ji_4zj8fn6jllcacwuvbc2jtazsm8"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 5569638481918792}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "14077ahakaln46bwhorrw07_o_y0ja14nz6ev2e7kja9y2q2p8bgj8pzep3ayn6c2o6ksxqoc4e45l4ilwof9hh_l5vzxr6"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 308227151936615}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "b6j6ik3lxqm6f7i3o5m4xaw78ca2q10jv0ein_ky4sbdl20gsdxq5c7c3d0wbarn8o3rmpjtu8qktjszo63jcdzq"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 7093551156016339}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "n6fl88imnu_da5t7w7s7"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 4373112121894721}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "xu0i3ibm5xk_4s3yo8j253zcx0r9fkzs4u4ft5m3idjbky2d_jk_orairyygciww9buthauyexxj7ii7p_a172r42n5wa3x7ji0"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "rwdp"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 8777284529043899}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "abxvawljqg8hsondqgphn8akwbj2rkzfrx0hsuvjjvfp8exd5w_g0aeuhats9633jc5h_byziq7ereq6wzzcvio3c6gd16fs4"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 4697061064867958}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "zvu0tvsjfpn3v9wzlxbjry6gebhfe826b4ywxdr6vxt4przgzxvbg7e803xjorr6hyk8pnq__gac8nwpme"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 4941125897110968}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "ll0_fnj8kds0ciu4gxcaaiwfwj26g896vhudwgdrj_v7pzs50_cs1nil5fbsa57qvf3qljeb3vldv10kdvx69wf"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 312342954800141}),
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "yzw8646ov72hhh_w2bhbz56wigwvli06mnli8dxegyl79zko8j0y0g2fvqtd_zq__zzzl8i6s3zy6lk80js_7z9k35u6xceo6_btyebbpgw4ivi301j9fsxq"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 8527199323798608}),
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                (parseRoleName "m8_lmrnkmpccq3xliv3mjvdbrqcaxjteav21_01txrkzue3dxkhsutmcjfd2mylai2t4")
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 829895852395824}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_6 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_6 = ConversationList {convList = [], convHasMore = True}
-
-testObject_ConversationList_20Conversation_user_7 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_7 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                (parseRoleName "dv1d_nl54nkabi7vrfixhxo8fzyrt2ji0kp0668koza673_1__wmna4t2hl8twtatz9tjqnu")
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 1559334665101385}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            }
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20Conversation_user_8 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_8 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvAccess = [PrivateAccess],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "kklpzjg"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_9 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_9 = ConversationList {convList = [], convHasMore = True}
-
-testObject_ConversationList_20Conversation_user_10 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_10 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "_9l9cqokichtgtjnvhtu32ss0ck6y48muyd69oomsb8713p_gost2_9jcg23j6lt5tbuu9qkpsapo2nm_5h4m4t1zenaoe349pzw"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 282891492942411}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "9r1618v8rx6b9f"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "1ieq3sbt572tc4czhsdl1pf6vd3u4tf17z4p1hmu_ovnv8xjir7nczr6tz5u647z70wxwm41xex4it"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "71wzrfb9ty0rveunyh_moqu0g0e6ttkahj7mvl_pqwbfc9n8ohxto2wt6xxbfrcoi8kybqv0qgsgtgtimnbfj4r2fpms2eycvxmbt2yzgxa"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              cnvMessageTimer = Just (Ms {ms = 1406036180844894}),
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "un3yos7xctb371e8fku5qi9yfayz6keo8z38mpjcf96ttqoqrxk40456t1jlnt4iq6uaep5kq4kwn4bu4vg7zxgcbzouvpcipnj33kffl1e8itjt"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            }
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20Conversation_user_11 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_11 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "crronx0noee9iatd0gh5r"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 6077261848303961}),
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "qa2h42sfabr2se34jysgbor858"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "o48adlocil8hrhc2yiydxkrhj9466c139d8jeau2zahe8bkfc2ao_hdowdnhwa82iz8cgdd1ilda7d9aoiuk5sevqk_upk2qq91331mh"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 4626765468655396}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            (fromJust (parseRoleName "5kh29zl85ii36dgzj60dmvswzi69ofij0o4d0mvioixrjs5nc5k395ix5gcr7"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 3172216229144519}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "q_co4y4_1hpcxpq50pcsrlxauuq25i0efge"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 3354972227724755}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "i4pr7249xf3ittu5s6r"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "m9qbh7lvffqb7k80cee"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "pi8v0uezeyjseqsjw6da9h74lbhgp1fc9d_rxk2n82pd5sqam7skankou8vi66kuqavz_11e4lqvw78qxfvfesvav7c"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 4699647814583777}),
-              cnvReceiptMode = Nothing
-            }
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20Conversation_user_12 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_12 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "u14r7cx401i7qyhh9n868itmh316p67992oko18pfjacl8qe66ww9sl62qfohq4eapx7fg4fbonw7mm43naj21csjzos5rvgppli8927a8m38_yh0a5"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 8314115697628639}),
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "u78l36rd2zqd4"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "famszv2ugu59f0d53o8i7hjc092bwqe8tccwhvl0aappyemhfs3sbc94wo3_oentu_wqzmn8hmrb"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 4496481998290983}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "0juii56qpd0864vcj"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 6904576004663823}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "n5q4dhulov8_ms5zpw5d6fl_x4jilyq1rxawgpomq78zrwslui8s88d50w3eblxom0qb2gujjb8u970o7ah1wc0k300"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 1823461342077434}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "gxhbc2t7q6rrcftfwmg3jse0gy8fyw0iw84bv58kr76d49o17h8mnggopexntbij12qafzyz1o2ep52cf"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              cnvMessageTimer = Just (Ms {ms = 2685267653752513}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_13 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_13 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "_l7oykl7ycvdlba5pe73y9epds"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "_hy7i5xm_11rafcrfebghyi906l330ufunaiyo6k0alofoory6hl7h4xjt75o1_a7pt2xnwcbudqbka4csvzbpbnlllngukfah8bqx7zcoq3"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "utby2ypvyrwlys82_edw23ytrpj"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "w4vn9eu815hobipm_n3da9jhd7yb9ny_f47_0zlk8jrluhdvk0y39fvczidx3q848tc3s_o8cfiuon"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 1294477963626888}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_14 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_14 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "lgd71k4qvxtih"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "r_gc0fohzp_yawd_k1c4tofh_m0ngos87kgxcacjyde1n1js9knbrq5ytdzns3rtyq9k0yciwn7xagtefk7b"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 2256129941904898}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "ohfwggqn9gstvw220280kws34kjr3fa51mg8babmrist1_tgins9q4iwjz4jwg8hzfa4glbqe9c5df1"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 7574050251117485}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "n743vdsooo4ajvp9t_sok1n9i"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvMessageTimer = Just (Ms {ms = 671261490527917}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "m27atvp24yytpx19vp2_2e83pk27eievke6k7d2v1qgs2rncfdz5spzaq6ngt2hg4kobual7bhb29q1npixng71v05o"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "b3e571bd4l2sxhdnm_4r0hpznzish0m0zudnoh"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 1925949395505672}),
-              cnvReceiptMode = Nothing
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "bzkw84_boyuhiqe51_ancwl1bx6c_sl5usf_6xf39dmgvui2uvz87_9xr42_sg8wqokxge_hkmyjo6dhu3des"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 4416586316876087}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            (fromJust (parseRoleName "6l9clln0mj4nu7emkz3ds07iiyduug29o33ecg66g02of2t8xd3llb09vz3d95"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 5544703373031406}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            (fromJust (parseRoleName "tak8j21oh9iuwj1ivx7717hs5iokypsmm_zgfln47wvc4v2pshgl5k3cmsv3_vj8"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 7382109943964396}),
-              cnvReceiptMode = Nothing
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_15 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_15 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvAccess = [CodeAccess, LinkAccess, PrivateAccess, PrivateAccess, CodeAccess],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "k1lnvywuwtpvcblff04ediu27__le7is9hj1fsp7sx9ba8tjwa0zllzrr21g_9ek9joqzjwyiit7drvnylthvmbyepvs_cua7"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 6813643981796860}),
-              cnvReceiptMode = Nothing
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_16 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_16 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "5xme3oh72w6fjk_hz6ktni1qol3jdamb704o24oi4z4l09u"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 5060646367946340}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "a7gz0gjpe"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "7sbkqx73wmlxh7jzclg7ugfne6t0oiw"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "7_j2lhoa8blqpxe6ieoxgj13g44fc3os5c0hzdw0vkicytmm38c1ti44jtwk0awi1p8h3j21ayaoxhgikdf8aqk92sxf"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvMessageTimer = Just (Ms {ms = 4425540032419297}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_17 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_17 = ConversationList {convList = [], convHasMore = False}
-
-testObject_ConversationList_20Conversation_user_18 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_18 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "o8_"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 8298377768402548}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "u_xhbk"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "cl5sp8vi0rzm5nzkg3v3518zc5kixfqvc35qi"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 4445775551954449}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                (parseRoleName "_moxeapv0m19z7oqm15_r00uzfaelz3ql_k6j3ceccc0mk8h8icj2m6dkvx0v_d0vltz318")
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Just (Ms {ms = 7034560312247301}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_19 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_19 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Nothing,
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "39cavf2gxmdivwom4sbqacf5qid3jeh2_yon0puszvkl4e9rof60k4f9t48xqme95zv0zhn4z5m98_x0g9eig6wlj04is6zvwg6byi7z07c6gt9090ny2u3lt"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = RegularConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              cnvAccess = [],
-              cnvAccessRole = NonActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "5h13g6f13e8vecpsadfwntn970iek5v4zl_421qw1p6_v0dudbh1ac_h70og_d7ed4m_q1trwmk9evrzqeq2s1llbwh7mn6ar_g1mikt6s"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Nothing,
-              cnvMessageTimer = Nothing,
-              cnvReceiptMode = Nothing
-            }
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20Conversation_user_20 :: ConversationList Conversation
-testObject_ConversationList_20Conversation_user_20 =
-  ConversationList
-    { convList =
-        [ Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = PrivateAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Nothing,
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "smh85kmu7ryn_0gf0oo5y5xlwpl714k2anilkpdl3lpn_gm3bh4oe4uk_y2sfizmh6odeuyw4odrvlwq0rc8lvsrtv31uqtvdpuadokpzfz8ho53c4kb1ify606d6ou"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 7973507983724794}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "g286jwpeoptn5z1yaxa_zij_buu4fch4plgoz6v59ai1zu_rxc__0le2zxamri3jsgq0tiiwxcb29gkmds2q2zl_pc37w9ikexf2s44ynyzs"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 713209987069426}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                          memService =
-                            Just
-                              ( ServiceRef
-                                  { _serviceRefId =
-                                      (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                                    _serviceRefProvider =
-                                      (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                                  }
-                              ),
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName = (fromJust (parseRoleName "lvva20nz949u9uoh6d653ukgy_qtpugz40j6122"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              cnvMessageTimer = Just (Ms {ms = 5611100743084448}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) (Domain "golden.example.com"),
-              cnvType = ConnectConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = True,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Nothing,
-                          memHidden = True,
-                          memHiddenRef = Nothing,
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "nm0c0tgty7ycwx2sazcmpcubcf_oh6iqufse0ml5u7cl3xxbjzyir8li6iew8t3agg5isko50ha58m9lv5vj933vwrxvpsv"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 3460496531316381}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) (Domain "golden.example.com"),
-              cnvType = One2OneConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              cnvAccess = [],
-              cnvAccessRole = TeamAccessRole,
-              cnvName = Just "",
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = False,
-                          memOtrArchivedRef = Just "",
-                          memHidden = False,
-                          memHiddenRef = Just "",
-                          memConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "nk8qm1m6euslkb4j1x0cs18mfffhmtv9sg7eyudgbd3b2ysqnlr1jkted9s7fhd8v93irig2pk_v4p12_lwu52ml3r2a1eb1gxqrakupmrdp_wm"
-                                )
-                            )
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              cnvMessageTimer = Just (Ms {ms = 2052301235302529}),
-              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-            },
-          Conversation
-            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-              cnvType = SelfConv,
-              cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              cnvAccess = [],
-              cnvAccessRole = ActivatedAccessRole,
-              cnvName = Nothing,
-              cnvMembers =
-                ConvMembers
-                  { cmSelf =
-                      Member
-                        { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                          memService = Nothing,
-                          memOtrMuted = False,
-                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                          memOtrMutedRef = Just "",
-                          memOtrArchived = True,
-                          memOtrArchivedRef = Just "",
-                          memHidden = True,
-                          memHiddenRef = Just "",
-                          memConvRoleName = (fromJust (parseRoleName "ahcbvp03bcrsmxc1rmnripjsaxw99dpw"))
-                        },
-                    cmOthers = []
-                  },
-              cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              cnvMessageTimer = Just (Ms {ms = 7068596443593491}),
-              cnvReceiptMode = Nothing
-            }
-        ],
-      convHasMore = True
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20_28Id_20_2a_20C_29_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20_28Id_20_2a_20C_29_user.hs
index 2cdb1fd9e95..48e077f1d2f 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20_28Id_20_2a_20C_29_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationList_20_28Id_20_2a_20C_29_user.hs
@@ -20,223 +20,19 @@ module Test.Wire.API.Golden.Generated.ConversationList_20_28Id_20_2a_20C_29_user
 
 import Data.Id (ConvId, Id (Id))
 import qualified Data.UUID as UUID (fromString)
-import Imports (Bool (False, True), fromJust)
+import Imports (Bool (False), fromJust)
 import Wire.API.Conversation (ConversationList (..))
 
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_1 :: ConversationList (ConvId)
+testObject_ConversationList_20_28Id_20_2a_20C_29_user_1 :: ConversationList ConvId
 testObject_ConversationList_20_28Id_20_2a_20C_29_user_1 =
   ConversationList
-    { convList = [(Id (fromJust (UUID.fromString "0000002e-0000-002d-0000-00410000001e")))],
+    { convList = [Id (fromJust (UUID.fromString "0000002e-0000-002d-0000-00410000001e"))],
       convHasMore = False
     }
 
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_2 :: ConversationList (ConvId)
+testObject_ConversationList_20_28Id_20_2a_20C_29_user_2 :: ConversationList ConvId
 testObject_ConversationList_20_28Id_20_2a_20C_29_user_2 =
   ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000700000004"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0006-0000-000600000001")))
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_3 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_3 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_4 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_4 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000002"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000002"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000001")))
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_5 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_5 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000002"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001")))
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_6 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_6 = ConversationList {convList = [], convHasMore = True}
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_7 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_7 =
-  ConversationList
-    { convList = [(Id (fromJust (UUID.fromString "00000003-0000-0024-0000-005000000011")))],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_8 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_8 =
-  ConversationList
-    { convList = [(Id (fromJust (UUID.fromString "00000056-0000-0072-0000-00160000007a")))],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_9 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_9 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000002")))
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_10 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_10 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_11 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_11 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000400000003"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000000")))
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_12 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_12 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000002"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000002"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-        ],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_13 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_13 = ConversationList {convList = [], convHasMore = False}
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_14 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_14 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_15 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_15 = ConversationList {convList = [], convHasMore = True}
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_16 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_16 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_17 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_17 =
-  ConversationList
-    { convList = [(Id (fromJust (UUID.fromString "0000006d-0000-0005-0000-00150000005f")))],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_18 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_18 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-        ],
-      convHasMore = True
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_19 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_19 =
-  ConversationList
-    { convList = [(Id (fromJust (UUID.fromString "0000003a-0000-002f-0000-00300000001b")))],
-      convHasMore = False
-    }
-
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_20 :: ConversationList (ConvId)
-testObject_ConversationList_20_28Id_20_2a_20C_29_user_20 =
-  ConversationList
-    { convList =
-        [ (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000002"))),
-          (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000002"))),
-          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-        ],
+    { convList = [],
       convHasMore = False
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationMessageTimerUpdate_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationMessageTimerUpdate_user.hs
index e6a6f72f5b0..0af33e520e3 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationMessageTimerUpdate_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationMessageTimerUpdate_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -28,69 +26,4 @@ testObject_ConversationMessageTimerUpdate_user_1 =
 
 testObject_ConversationMessageTimerUpdate_user_2 :: ConversationMessageTimerUpdate
 testObject_ConversationMessageTimerUpdate_user_2 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 5800340606245917})}
-
-testObject_ConversationMessageTimerUpdate_user_3 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_3 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 7882681684697857})}
-
-testObject_ConversationMessageTimerUpdate_user_4 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_4 = ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
-
-testObject_ConversationMessageTimerUpdate_user_5 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_5 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 717333267646117})}
-
-testObject_ConversationMessageTimerUpdate_user_6 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_6 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 8986531660044029})}
-
-testObject_ConversationMessageTimerUpdate_user_7 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_7 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 2024121451468806})}
-
-testObject_ConversationMessageTimerUpdate_user_8 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_8 = ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
-
-testObject_ConversationMessageTimerUpdate_user_9 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_9 = ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
-
-testObject_ConversationMessageTimerUpdate_user_10 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_10 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 3813387496832226})}
-
-testObject_ConversationMessageTimerUpdate_user_11 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_11 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 6759007605839267})}
-
-testObject_ConversationMessageTimerUpdate_user_12 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_12 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 3236786237768237})}
-
-testObject_ConversationMessageTimerUpdate_user_13 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_13 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 365752479822859})}
-
-testObject_ConversationMessageTimerUpdate_user_14 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_14 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 3294372135518732})}
-
-testObject_ConversationMessageTimerUpdate_user_15 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_15 = ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
-
-testObject_ConversationMessageTimerUpdate_user_16 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_16 = ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
-
-testObject_ConversationMessageTimerUpdate_user_17 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_17 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 1100608128235247})}
-
-testObject_ConversationMessageTimerUpdate_user_18 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_18 = ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
-
-testObject_ConversationMessageTimerUpdate_user_19 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_19 = ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
-
-testObject_ConversationMessageTimerUpdate_user_20 :: ConversationMessageTimerUpdate
-testObject_ConversationMessageTimerUpdate_user_20 =
-  ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 4970702216850713})}
+  ConversationMessageTimerUpdate {cupMessageTimer = Nothing}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationReceiptModeUpdate_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationReceiptModeUpdate_user.hs
index d0ee6459975..8e368268f03 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationReceiptModeUpdate_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationReceiptModeUpdate_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -23,79 +21,3 @@ import Wire.API.Conversation (ConversationReceiptModeUpdate (..), ReceiptMode (R
 testObject_ConversationReceiptModeUpdate_user_1 :: ConversationReceiptModeUpdate
 testObject_ConversationReceiptModeUpdate_user_1 =
   ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -6145}}
-
-testObject_ConversationReceiptModeUpdate_user_2 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_2 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -5552}}
-
-testObject_ConversationReceiptModeUpdate_user_3 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_3 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 11916}}
-
-testObject_ConversationReceiptModeUpdate_user_4 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_4 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 12045}}
-
-testObject_ConversationReceiptModeUpdate_user_5 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_5 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -12284}}
-
-testObject_ConversationReceiptModeUpdate_user_6 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_6 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -14518}}
-
-testObject_ConversationReceiptModeUpdate_user_7 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_7 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 1851}}
-
-testObject_ConversationReceiptModeUpdate_user_8 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_8 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -12424}}
-
-testObject_ConversationReceiptModeUpdate_user_9 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_9 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -1022}}
-
-testObject_ConversationReceiptModeUpdate_user_10 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_10 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 1083}}
-
-testObject_ConversationReceiptModeUpdate_user_11 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_11 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -8195}}
-
-testObject_ConversationReceiptModeUpdate_user_12 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_12 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 4632}}
-
-testObject_ConversationReceiptModeUpdate_user_13 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_13 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -14797}}
-
-testObject_ConversationReceiptModeUpdate_user_14 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_14 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 6949}}
-
-testObject_ConversationReceiptModeUpdate_user_15 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_15 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 6004}}
-
-testObject_ConversationReceiptModeUpdate_user_16 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_16 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 11751}}
-
-testObject_ConversationReceiptModeUpdate_user_17 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_17 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 523}}
-
-testObject_ConversationReceiptModeUpdate_user_18 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_18 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 7756}}
-
-testObject_ConversationReceiptModeUpdate_user_19 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_19 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 3357}}
-
-testObject_ConversationReceiptModeUpdate_user_20 :: ConversationReceiptModeUpdate
-testObject_ConversationReceiptModeUpdate_user_20 =
-  ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = 4465}}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRename_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRename_user.hs
index d49f49dafe2..66ef9fe176a 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRename_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRename_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -25,71 +23,3 @@ testObject_ConversationRename_user_1 =
   ConversationRename
     { cupName = "\160167.\1033803)\154415Fw\47161ucnv\DLE?w+\92527K\1094119`4\1018522\&9\1066263\n\58525\EM>"
     }
-
-testObject_ConversationRename_user_2 :: ConversationRename
-testObject_ConversationRename_user_2 = ConversationRename {cupName = "JWR\29994 !\EMTZ"}
-
-testObject_ConversationRename_user_3 :: ConversationRename
-testObject_ConversationRename_user_3 = ConversationRename {cupName = "{fF\t;\DC4\STXwE\a\50255"}
-
-testObject_ConversationRename_user_4 :: ConversationRename
-testObject_ConversationRename_user_4 = ConversationRename {cupName = "E>\US\135246\992549|X\DC4A\150699^\1022935SWSJUK"}
-
-testObject_ConversationRename_user_5 :: ConversationRename
-testObject_ConversationRename_user_5 =
-  ConversationRename
-    { cupName = "hu\SUBz\53695\ESC\GS\143645;\185910\990233\61052\&3\61730\1110146\RS3{\ETBCPk\67107|\EOT`\24896"
-    }
-
-testObject_ConversationRename_user_6 :: ConversationRename
-testObject_ConversationRename_user_6 = ConversationRename {cupName = "\25222"}
-
-testObject_ConversationRename_user_7 :: ConversationRename
-testObject_ConversationRename_user_7 = ConversationRename {cupName = "DA]\119172\1093457zQ\23644b%{$\SIp\EMue\vVtFzb"}
-
-testObject_ConversationRename_user_8 :: ConversationRename
-testObject_ConversationRename_user_8 =
-  ConversationRename {cupName = "\DC2\SO7o\a\ETB\DC1\SO/\SYN\SO\nn6\985842y\33243\&0\STX<\134256|Vn\GS"}
-
-testObject_ConversationRename_user_9 :: ConversationRename
-testObject_ConversationRename_user_9 = ConversationRename {cupName = "I*<\ETXd\1067190\&4U\14493w\984601"}
-
-testObject_ConversationRename_user_10 :: ConversationRename
-testObject_ConversationRename_user_10 =
-  ConversationRename {cupName = "\SUB3\SYN\1008535rv\DEL\SUBi\1086240\&9\1056248hC>/$\DEL \RS\DC4\168874\SIq\SYN"}
-
-testObject_ConversationRename_user_11 :: ConversationRename
-testObject_ConversationRename_user_11 = ConversationRename {cupName = "\157514\185666\SOH\DC1(\150863"}
-
-testObject_ConversationRename_user_12 :: ConversationRename
-testObject_ConversationRename_user_12 =
-  ConversationRename {cupName = "\1026841[\RSo\1026407\GSjLS\45628\"\v(iU\DLEW\DC16\31313\1030217[5\1100421i9\a(0"}
-
-testObject_ConversationRename_user_13 :: ConversationRename
-testObject_ConversationRename_user_13 = ConversationRename {cupName = "\EOT\FSx\EM\rNX\DC2<\NAK\1076318\DLE$c9"}
-
-testObject_ConversationRename_user_14 :: ConversationRename
-testObject_ConversationRename_user_14 =
-  ConversationRename {cupName = "\DC2N,\7048\1076181w\189434\CAN&\ENQ\1056036\v\1047420\1109295\&3\110820"}
-
-testObject_ConversationRename_user_15 :: ConversationRename
-testObject_ConversationRename_user_15 =
-  ConversationRename {cupName = "<E0\ESCVm\CAN7\999315\156853{.\r\176837#n \150223\59875\&34: \1042067\9706"}
-
-testObject_ConversationRename_user_16 :: ConversationRename
-testObject_ConversationRename_user_16 = ConversationRename {cupName = "Z\EM\EM0\1034214\FS"}
-
-testObject_ConversationRename_user_17 :: ConversationRename
-testObject_ConversationRename_user_17 = ConversationRename {cupName = "\SOM_|#\bO"}
-
-testObject_ConversationRename_user_18 :: ConversationRename
-testObject_ConversationRename_user_18 =
-  ConversationRename {cupName = "B#\999500!\180573-bH0 '\1041317\1063138\ETX\ETX\1086634Xi#9?^"}
-
-testObject_ConversationRename_user_19 :: ConversationRename
-testObject_ConversationRename_user_19 =
-  ConversationRename {cupName = "mgq\ESC\DC1*x\8777Y%\an\160857^W\ENQ\"\EOT\ACKdk\EOTK\SUB4&S"}
-
-testObject_ConversationRename_user_20 :: ConversationRename
-testObject_ConversationRename_user_20 =
-  ConversationRename {cupName = "\GS9\161025\&9\1038982M\SOH\1094380\CAND&5\1070659\169534\vOF"}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRole_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRole_user.hs
index 284393dd193..c7a78852875 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRole_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRole_user.hs
@@ -19,139 +19,30 @@
 module Test.Wire.API.Golden.Generated.ConversationRole_user where
 
 import qualified Data.Set as Set (fromList)
-import Imports (Maybe (Just, Nothing), fromJust)
+import Imports (Maybe (Just), fromJust)
 import Wire.API.Conversation.Role
   ( Action
-      ( AddConversationMember,
-        DeleteConversation,
-        LeaveConversation,
-        ModifyConversationAccess,
-        ModifyConversationMessageTimer,
-        ModifyConversationName,
-        ModifyConversationReceiptMode,
-        ModifyOtherConversationMember
+      ( ModifyConversationAccess,
+        ModifyConversationMessageTimer
       ),
     Actions (Actions),
     ConversationRole,
+    convRoleWireAdmin,
+    convRoleWireMember,
     parseRoleName,
     toConvRole,
   )
 
 testObject_ConversationRole_user_1 :: ConversationRole
-testObject_ConversationRole_user_1 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
+testObject_ConversationRole_user_1 = convRoleWireAdmin
 
 testObject_ConversationRole_user_2 :: ConversationRole
-testObject_ConversationRole_user_2 = (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
+testObject_ConversationRole_user_2 = convRoleWireMember
 
 testObject_ConversationRole_user_3 :: ConversationRole
-testObject_ConversationRole_user_3 = (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-
-testObject_ConversationRole_user_4 :: ConversationRole
-testObject_ConversationRole_user_4 =
-  ( fromJust
-      ( toConvRole
-          (fromJust (parseRoleName "32s49begziet8bw2zajkjk5flc26_pl8lnx5vs"))
-          (Just ((Actions (Set.fromList [ModifyConversationMessageTimer, ModifyConversationAccess]))))
-      )
-  )
-
-testObject_ConversationRole_user_5 :: ConversationRole
-testObject_ConversationRole_user_5 = (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-
-testObject_ConversationRole_user_6 :: ConversationRole
-testObject_ConversationRole_user_6 =
-  ( fromJust
-      ( toConvRole
-          ( fromJust
-              ( parseRoleName
-                  "xtbwm41ey1yulpxoqnzn2lzfc6bmdy2k1pc1wglp51t4_kaj2nxqh9pwj8umsta3tvdh7fne2gdwvnntrbchkgw31f12q9sg46r9qh1qvu8"
-              )
-          )
-          ( Just
-              ( ( Actions
-                    ( Set.fromList
-                        [ AddConversationMember,
-                          ModifyConversationName,
-                          ModifyConversationMessageTimer,
-                          ModifyConversationReceiptMode,
-                          ModifyConversationAccess,
-                          ModifyOtherConversationMember,
-                          DeleteConversation
-                        ]
-                    )
-                )
-              )
-          )
-      )
-  )
-
-testObject_ConversationRole_user_7 :: ConversationRole
-testObject_ConversationRole_user_7 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_8 :: ConversationRole
-testObject_ConversationRole_user_8 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_9 :: ConversationRole
-testObject_ConversationRole_user_9 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_10 :: ConversationRole
-testObject_ConversationRole_user_10 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_11 :: ConversationRole
-testObject_ConversationRole_user_11 =
-  ( fromJust
-      ( toConvRole
-          ( fromJust
-              ( parseRoleName
-                  "4yqqhwyg4cxggtjhjb55f32pn8h9p71tbzxymmlw8hlmz3f79zoai6bw75wy0433ut7is1m2hgs17vokq_hk9udz2jua_leu_l21oqeffcoy"
-              )
-          )
-          ( Just
-              ( ( Actions
-                    ( Set.fromList
-                        [ AddConversationMember,
-                          ModifyConversationName,
-                          ModifyConversationReceiptMode,
-                          ModifyOtherConversationMember,
-                          LeaveConversation,
-                          DeleteConversation
-                        ]
-                    )
-                )
-              )
-          )
-      )
-  )
-
-testObject_ConversationRole_user_12 :: ConversationRole
-testObject_ConversationRole_user_12 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_13 :: ConversationRole
-testObject_ConversationRole_user_13 = (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-
-testObject_ConversationRole_user_14 :: ConversationRole
-testObject_ConversationRole_user_14 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_15 :: ConversationRole
-testObject_ConversationRole_user_15 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_16 :: ConversationRole
-testObject_ConversationRole_user_16 = (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-
-testObject_ConversationRole_user_17 :: ConversationRole
-testObject_ConversationRole_user_17 = (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-
-testObject_ConversationRole_user_18 :: ConversationRole
-testObject_ConversationRole_user_18 = (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-
-testObject_ConversationRole_user_19 :: ConversationRole
-testObject_ConversationRole_user_19 =
-  ( fromJust
-      ( toConvRole
-          (fromJust (parseRoleName "idsg79l46dbcc6qqm12fucmnni7fe4xf6x_rnushx6gojdlgu5"))
-          (Just ((Actions (Set.fromList [AddConversationMember, ModifyConversationAccess]))))
-      )
-  )
-
-testObject_ConversationRole_user_20 :: ConversationRole
-testObject_ConversationRole_user_20 = (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
+testObject_ConversationRole_user_3 =
+  fromJust
+    ( toConvRole
+        (fromJust (parseRoleName "32s49begziet8bw2zajkjk5flc26_pl8lnx5vs"))
+        (Just (Actions (Set.fromList [ModifyConversationMessageTimer, ModifyConversationAccess])))
+    )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRolesList_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRolesList_user.hs
index 0b64ed54b33..f19c8017fd4 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRolesList_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ConversationRolesList_user.hs
@@ -19,18 +19,11 @@
 module Test.Wire.API.Golden.Generated.ConversationRolesList_user where
 
 import qualified Data.Set as Set (fromList)
-import Imports (Maybe (Just, Nothing), fromJust)
+import Imports (Maybe (Just), fromJust)
 import Wire.API.Conversation.Role
   ( Action
       ( AddConversationMember,
-        DeleteConversation,
-        LeaveConversation,
-        ModifyConversationAccess,
-        ModifyConversationMessageTimer,
-        ModifyConversationName,
-        ModifyConversationReceiptMode,
-        ModifyOtherConversationMember,
-        RemoveConversationMember
+        ModifyOtherConversationMember
       ),
     Actions (Actions),
     ConversationRolesList (..),
@@ -42,515 +35,16 @@ testObject_ConversationRolesList_user_1 :: ConversationRolesList
 testObject_ConversationRolesList_user_1 =
   ConversationRolesList
     { convRolesList =
-        [ ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "0g843hmarr"))
-                  (Just ((Actions (Set.fromList [AddConversationMember, ModifyOtherConversationMember]))))
-              )
-          ),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "8t_l205nb44v3byrnei9os7rah6d23arw3z"))
-                  (Just ((Actions (Set.fromList [RemoveConversationMember, ModifyOtherConversationMember]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
+        [ fromJust
+            ( toConvRole
+                (fromJust (parseRoleName "0g843hmarr"))
+                (Just (Actions (Set.fromList [AddConversationMember, ModifyOtherConversationMember])))
+            )
         ]
     }
 
 testObject_ConversationRolesList_user_2 :: ConversationRolesList
 testObject_ConversationRolesList_user_2 =
   ConversationRolesList
-    { convRolesList =
-        [ ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "e83gfmq4_n2ei6jqgj565t3nuk6yu8wpuctbgspd1ja"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "s3ymkciq3hqvtcl5efbsucpb3rnis8lioqm377vq3eg46ghz2ewh3u3vcrscubfog_2zorb1z7zzx7saa01qepie8m_w011r6_unlz_6s0xskl8_cfusxpkbx1f"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_3 :: ConversationRolesList
-testObject_ConversationRolesList_user_3 =
-  ConversationRolesList
-    { convRolesList =
-        [ ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "heihzbym4l1etr1m_njqa19sqy"))
-                  (Just ((Actions (Set.fromList [RemoveConversationMember]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "4ufidhmy67qfeix7mspuo2iwhdet_cygi8sm5_i3xlc3t7ijnu81a59dcdz1zyqcgutzwugfddd5i10nnzumfo90mntok"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList [DeleteConversation]))))
-              )
-          ),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "ywdeyduc7ufos8m5zw15zgpm2jy006x6htzd7xt7qs4p36t401epiqvl928a1"))
-                  (Just ((Actions (Set.fromList [ModifyConversationMessageTimer]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "2xpcq7dwfj3z2yiwuvucdgz71q9qka7cs6vnju6vpsnnuxvnwg563lt0wkld4s4xxwno3i1v446fws77a4wrhasgsccc3jv_gpubdxzmvevbw0ccbq"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList [RemoveConversationMember]))))
-              )
-          ),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "ycok9utkz3_l_h99sao16bbv1fc7ky7oki9gzi3mx5yao_vmlgmin46fttl4arm31f8smcmuq0sc1xtnlu2ubkw2k6inrge9sxt8dkgf4mc_9h2w_2hheuwr6s"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList [ModifyConversationReceiptMode]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      (parseRoleName "cqsgxrpcsqpc9lh8avqirs5y0o7y5_sbf7oofqha55jl1enj1mjaaih39t7cmmcx2hi7akh2ksyr5al5")
-                  )
-                  (Just ((Actions (Set.fromList [ModifyConversationName]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_4 :: ConversationRolesList
-testObject_ConversationRolesList_user_4 = ConversationRolesList {convRolesList = []}
-
-testObject_ConversationRolesList_user_5 :: ConversationRolesList
-testObject_ConversationRolesList_user_5 =
-  ConversationRolesList
-    { convRolesList =
-        [ ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "p2bm1_l6vbj4qefxizficnju6_iyl6t2sdlzbhif94i7p2n6s"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "b4hn3o_rowfzdef6uj4z7d3yvmrg7kf2"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "7bgbztsquv_u3j6tj5hgz4o2ajnhza6y16tla8al79rp8g1h0fha7f7ducn"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          )
-        ]
-    }
-
-testObject_ConversationRolesList_user_6 :: ConversationRolesList
-testObject_ConversationRolesList_user_6 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_7 :: ConversationRolesList
-testObject_ConversationRolesList_user_7 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "ksyk7k7cb739t77es2iluk3336btnq2y52938t4b7ugz2vl0bovd"))
-                  (Just ((Actions (Set.fromList [ModifyConversationName]))))
-              )
-          ),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "isfh6p6g_to3f9bc4af6qa_rz3xjw_p"))
-                  (Just ((Actions (Set.fromList [DeleteConversation]))))
-              )
-          ),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "gvone2nabpj79ryqs696wdglpf23xs65vv5cbyga3vutq"))
-                  (Just ((Actions (Set.fromList [LeaveConversation]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "i4trq6lq11")) (Just ((Actions (Set.fromList []))))))
-        ]
-    }
-
-testObject_ConversationRolesList_user_8 :: ConversationRolesList
-testObject_ConversationRolesList_user_8 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "l6osv5ffa9a4woj9d7f3eg66_4nx7uereh2f05wuqt8ulk0pgjjdvdnimc5hcvofbeysbpm6b2n88lghp715h_9hn0e02u9gqh4b0pz04_"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          )
-        ]
-    }
-
-testObject_ConversationRolesList_user_9 :: ConversationRolesList
-testObject_ConversationRolesList_user_9 =
-  ConversationRolesList
-    { convRolesList =
-        [ ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "rmefq7syeavictewvu7hzpoc3tl2gqjoq0o0kxgjypwrkw30s_nhea59v4lxg4gq708wksgqmonkmep0czln_s45qu_blv8y9"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList [RemoveConversationMember, ModifyConversationAccess]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_10 :: ConversationRolesList
-testObject_ConversationRolesList_user_10 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "hryh5cdsxc6mgbwf_q6")) (Just ((Actions (Set.fromList [])))))),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "rg7zsbeqar03dc8tm0cpbbarywzgx7zfwx0dxixp52mui8m88wf0okpeq8e5g0szljl1ycz3a_9f_wizfvmzpuz05_e7ooxnzetu3u0j0td3ut9fslvprt"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "308ppv2ivrzqmc2xu9_uj3rs4f3qmzyc"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "__vsppi2uimni18xnaeuxzv5j0x56w2oma53ln3ib14l1p56b_0rnwklk8ogkc2u3zuw1ypz4uty1epak92byhp42rq_a3"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          ( fromJust
-              (toConvRole (fromJust (parseRoleName "k3z3lop8j_k")) (Just ((Actions (Set.fromList [DeleteConversation])))))
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_11 :: ConversationRolesList
-testObject_ConversationRolesList_user_11 =
-  ConversationRolesList
-    { convRolesList =
-        [ ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "bnsi81m0tcsgtrah39sunugjnf5cv4qe9cy2_4084vghyzey6giq6ttpkqms2je"))
-                  ( Just
-                      ( ( Actions
-                            ( Set.fromList
-                                [ AddConversationMember,
-                                  RemoveConversationMember,
-                                  ModifyConversationName,
-                                  ModifyConversationAccess,
-                                  ModifyOtherConversationMember,
-                                  LeaveConversation,
-                                  DeleteConversation
-                                ]
-                            )
-                        )
-                      )
-                  )
-              )
-          )
-        ]
-    }
-
-testObject_ConversationRolesList_user_12 :: ConversationRolesList
-testObject_ConversationRolesList_user_12 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      (parseRoleName "b04tpm3tvoex80nz98e90lefymeti4w7sp1a4uwcvgm381j16byr2nessks63v0dtru96ckva6cnbh0")
-                  )
-                  (Just ((Actions (Set.fromList [AddConversationMember]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_13 :: ConversationRolesList
-testObject_ConversationRolesList_user_13 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "123mi1cdo99vdqdnp_ol1pg2h24bf__5_"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "10u348q")) (Just ((Actions (Set.fromList [])))))),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "omk31lw6wrxlnicz79hznnlx5eozskm3r3w3jhzipw2pdg3b09h5zglxifmqti2zjlqnm_hmr6g8op5vpn7lg4_h2tnrenrmgbtan5nqinchf1"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "qdk4sqhbn9mku06gey_k0sm3ek3m8yt6wxb8shgph1m0ks00"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_14 :: ConversationRolesList
-testObject_ConversationRolesList_user_14 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      (parseRoleName "h7b57x14ns6437z_mesx0j57zpsixjpd3wl0vpgo3ew2gytiyymsoj5hewbfhb_2dl1eswjbj88k_ww_zigj")
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "djhu4mvus")) (Just ((Actions (Set.fromList [])))))),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_15 :: ConversationRolesList
-testObject_ConversationRolesList_user_15 =
-  ConversationRolesList
-    { convRolesList =
-        [ ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "bxb790gxo1o8dh99kofgn0m463fg_nupp5_rmlzn_ikitu8un98x3teiybvx7srcqejb2dx"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "vtkdq7dc620aog28hmkxr7j8n2_3xib0dxpgv28d8ypqn_nf61utf69v9t2dy6kepnd_1"))
-                  (Just ((Actions (Set.fromList [ModifyOtherConversationMember]))))
-              )
-          )
-        ]
-    }
-
-testObject_ConversationRolesList_user_16 :: ConversationRolesList
-testObject_ConversationRolesList_user_16 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "jcqbg6ctrw91f_rayto59n4i786tg3n8acm4nf28qggd1zuxo4jgf5b59er3eard_pg1xogrdmizf1rgc3ksqo12qkhcaia2on6"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      (parseRoleName "6am2fi2abl47qpqi6yjozqqc1szr1oxovggb_nhmjg2vpjablbiwia_b77azg7pqyk1v7691wspxv")
-                  )
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "nuyqeanpyt42ye0u5_on94mdkt3j4gljn"))
-                  (Just ((Actions (Set.fromList [ModifyConversationMessageTimer]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  ( fromJust
-                      ( parseRoleName
-                          "fqqq98mmj2z_7_6dxfajrl4ml6hvmqxn57z9wfmwahaxd9kvdebv6hughxqzxn5w8jdogq3hbxn8qoq7w2ev6lwo6zvq15"
-                      )
-                  )
-                  (Just ((Actions (Set.fromList [ModifyConversationReceiptMode]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing))
-        ]
-    }
-
-testObject_ConversationRolesList_user_17 :: ConversationRolesList
-testObject_ConversationRolesList_user_17 = ConversationRolesList {convRolesList = []}
-
-testObject_ConversationRolesList_user_18 :: ConversationRolesList
-testObject_ConversationRolesList_user_18 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "s2cl6cisn_jaw94")) (Just ((Actions (Set.fromList [])))))),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "5st295e8exhw_ozq5_fbzyztszh1thu16g3rwx4but8f3m"))
-                  (Just ((Actions (Set.fromList [ModifyConversationName]))))
-              )
-          )
-        ]
-    }
-
-testObject_ConversationRolesList_user_19 :: ConversationRolesList
-testObject_ConversationRolesList_user_19 = ConversationRolesList {convRolesList = []}
-
-testObject_ConversationRolesList_user_20 :: ConversationRolesList
-testObject_ConversationRolesList_user_20 =
-  ConversationRolesList
-    { convRolesList =
-        [ (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "b85f9ja4y8xih_39u8j2z3w2w0pexfyyawadiq1qxhrnjvfluzq_p3fbmlb8h9ph9y"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "5doti_")) (Just ((Actions (Set.fromList [])))))),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "hj97_m0bam8n53ly3jy8k6oqcq4j3rfjn_4bphxakifcuy8uoqhd90cd"))
-                  (Just ((Actions (Set.fromList []))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_admin")) Nothing)),
-          ( fromJust
-              ( toConvRole
-                  (fromJust (parseRoleName "gla3ue0e95dzuyiy03bls5q2rj3bwzjs9hd"))
-                  (Just ((Actions (Set.fromList [AddConversationMember]))))
-              )
-          ),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing)),
-          (fromJust (toConvRole (fromJust (parseRoleName "wire_member")) Nothing))
-        ]
+    { convRolesList = []
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Conversation_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Conversation_user.hs
index f1b09d6be0b..d84ec11f810 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Conversation_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Conversation_user.hs
@@ -36,7 +36,7 @@ testObject_Conversation_user_1 =
   Conversation
     { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
       cnvType = One2OneConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000001"))),
+      cnvCreator = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000001")),
       cnvAccess = [],
       cnvAccessRole = PrivateAccessRole,
       cnvName = Just " 0",
@@ -44,7 +44,7 @@ testObject_Conversation_user_1 =
         ConvMembers
           { cmSelf =
               Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
+                { memId = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")),
                   memService = Nothing,
                   memOtrMuted = True,
                   memOtrMutedStatus = Nothing,
@@ -53,7 +53,7 @@ testObject_Conversation_user_1 =
                   memOtrArchivedRef = Just "",
                   memHidden = False,
                   memHiddenRef = Just "",
-                  memConvRoleName = (fromJust (parseRoleName "rhhdzf0j0njilixx0g0vzrp06b_5us"))
+                  memConvRoleName = fromJust (parseRoleName "rhhdzf0j0njilixx0g0vzrp06b_5us")
                 },
             cmOthers = []
           },
@@ -67,7 +67,7 @@ testObject_Conversation_user_2 =
   Conversation
     { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))) (Domain "golden.example.com"),
       cnvType = SelfConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))),
+      cnvCreator = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001")),
       cnvAccess =
         [ InviteAccess,
           InviteAccess,
@@ -88,7 +88,7 @@ testObject_Conversation_user_2 =
         ConvMembers
           { cmSelf =
               Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
+                { memId = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")),
                   memService = Nothing,
                   memOtrMuted = True,
                   memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
@@ -98,89 +98,7 @@ testObject_Conversation_user_2 =
                   memHidden = True,
                   memHiddenRef = Just "",
                   memConvRoleName =
-                    (fromJust (parseRoleName "9b2d3thyqh4ptkwtq2n2v9qsni_ln1ca66et_z8dlhfs9oamp328knl3rj9kcj"))
-                },
-            cmOthers = []
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000000"))),
-      cnvMessageTimer = Just (Ms {ms = 1319272593797015}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 2})
-    }
-
-testObject_Conversation_user_3 :: Conversation
-testObject_Conversation_user_3 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))) (Domain "golden.example.com"),
-      cnvType = One2OneConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000001"))),
-      cnvAccess = [],
-      cnvAccessRole = ActivatedAccessRole,
-      cnvName = Just "\994543",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                          }
-                      ),
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "c6vuntjr9gwiigc0_cjtg2eysqquizmi27hr5rcpb273ox_f3r68r51jxqqctu08xd0gbvwwmekpo7yo_duaqh8pcrdh3uk_oogx6ol6kkq9wg3252kx5w9_r"
-                        )
-                    )
-                },
-            cmOthers = []
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000002"))),
-      cnvMessageTimer = Just (Ms {ms = 158183656363340}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 0})
-    }
-
-testObject_Conversation_user_4 :: Conversation
-testObject_Conversation_user_4 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000000"))) (Domain "golden.example.com"),
-      cnvType = ConnectConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-      cnvAccess = [],
-      cnvAccessRole = PrivateAccessRole,
-      cnvName = Just "\NAK-J",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-                          }
-                      ),
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Nothing,
-                  memOtrMutedRef = Nothing,
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    (fromJust (parseRoleName "m123vuiwu65elqzh2xslj7koh_hoaozqcokprzujft6k_g_uv1hwo7xts"))
+                    fromJust (parseRoleName "9b2d3thyqh4ptkwtq2n2v9qsni_ln1ca66et_z8dlhfs9oamp328knl3rj9kcj")
                 },
             cmOthers =
               [ OtherMember
@@ -189,957 +107,20 @@ testObject_Conversation_user_4 =
                     omService =
                       Just
                         ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "r1rg526serx51g15n99y1bw_9q0qrcwck3jxl7ocjsjqcoux7d1zbkz9nnczy92t2oyogxrx3cyh_b8yv44l61mx9uzdnv6"
-                          )
-                      )
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000002"))),
-      cnvMessageTimer = Nothing,
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-    }
-
-testObject_Conversation_user_5 :: Conversation
-testObject_Conversation_user_5 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000001"))) (Domain "golden.example.com"),
-      cnvType = ConnectConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000002"))),
-      cnvAccess = [],
-      cnvAccessRole = PrivateAccessRole,
-      cnvName = Just "'",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                  memService = Nothing,
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Nothing,
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "xvfvxp6h5e0sngt_bnwfa4tyn1lw028rzrxhnuz1mxgyi1ftcj7o9hilr4qo_ir59q9gktkdb6qmmyvju1n9l6ev4vh2clfi7whq4uxtq"
-                        )
-                    )
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-                    omService = Nothing,
-                    omConvRoleName = (fromJust (parseRoleName "94maa8a519kifbmlwehm5sxmkuokr6"))
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "lmzpvgv4f8kt1wzdmecu8aqvnfv5l0cs0x1odmpdvaz25u2kofhywz92kx7mfxvld99im98_ksi0feski60eq63nlwtst2_ud5r2bi3k"
-                          )
-                      )
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) domain,
-                    omService = Nothing,
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "8euvagsxew2ds5r8yiy_soqa2yhy12oi9ljyxmcm40j_oxt4i0q1rsd3twu43af9q6fotbrzeyjktmewqehafl6ax9372wxcg4r5"
-                          )
-                      )
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                            }
-                        ),
-                    omConvRoleName =
-                      (fromJust (parseRoleName "leerha8jseiakvd1pdzoq0sjf6bq1_yxepvf62d_jurktowqwiyswks3fhgm"))
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "n0txwqcuxeq_76cffv3mc4lbddiqtyjzrklf93yfcrw6mmhqoa3na5dm_egdgiflqt29v6t61n32qvvujtk_gs1iue0dbsldj0"
-                          )
-                      )
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "ughz4ajb27yd55w_i9idbgelgut_ksa4pj0k1iwuwgstmwc0ly9_pt1zr3fs1vqph1fzobfccklzmdam_6dbiktrpriqpad8itw4ezzah6d8e27w8xe7751xztz_b"
-                          )
-                      )
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))),
-      cnvMessageTimer = Just (Ms {ms = 3545846644696388}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-    }
-
-testObject_Conversation_user_6 :: Conversation
-testObject_Conversation_user_6 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) (Domain "golden.example.com"),
-      cnvType = RegularConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-      cnvAccess = [PrivateAccess],
-      cnvAccessRole = ActivatedAccessRole,
-      cnvName = Just "",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                  memService = Nothing,
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    (fromJust (parseRoleName "7yrq155bja2p68pkx0ze6lu_i9paws_55wd89qsdghna3muu9eryz4wfu8"))
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                            }
-                        ),
-                    omConvRoleName = (fromJust (parseRoleName "iw0eer5er3zfvoqdlo"))
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))),
-      cnvMessageTimer = Just (Ms {ms = 8467521308908805}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -2})
-    }
-
-testObject_Conversation_user_7 :: Conversation
-testObject_Conversation_user_7 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000001"))) (Domain "golden.example.com"),
-      cnvType = SelfConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-      cnvAccess = [PrivateAccess, CodeAccess],
-      cnvAccessRole = ActivatedAccessRole,
-      cnvName = Nothing,
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                  memService = Nothing,
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Nothing,
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Nothing,
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName = (fromJust (parseRoleName "jfrshedq51a"))
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) domain,
-                    omService = Nothing,
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "7_boa_ycz2wuxjejoukgch7q0ity8k2k7sd6gn_rkk5l6_m4dpmlx0k4klo6mdvc11noo78qeo7d_n05lojjs9"
-                          )
-                      )
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000002"))),
-      cnvMessageTimer = Just (Ms {ms = 118554855340166}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-    }
-
-testObject_Conversation_user_8 :: Conversation
-testObject_Conversation_user_8 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))) (Domain "golden.example.com"),
-      cnvType = SelfConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))),
-      cnvAccess = [InviteAccess, PrivateAccess, PrivateAccess, InviteAccess, InviteAccess, PrivateAccess, LinkAccess],
-      cnvAccessRole = TeamAccessRole,
-      cnvName = Nothing,
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-                          }
-                      ),
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Just "",
-                  memConvRoleName = (fromJust (parseRoleName "othyp2hs"))
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
+                            { _serviceRefId = Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")),
                               _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
+                                Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))
                             }
                         ),
                     omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "fl2vgxnc40qnxz7eivgmb9uer3y_mtfk0whgu5tv4m108ftmryr4ji5duw2srp_7gh73y46f6krak3ef0by6fnko4rnxodby2voxfgb6u05k6z1hwgh4j8ce_as"
-                          )
-                      )
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-      cnvMessageTimer = Just (Ms {ms = 5923643994342681}),
-      cnvReceiptMode = Nothing
-    }
-
-testObject_Conversation_user_9 :: Conversation
-testObject_Conversation_user_9 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000002"))) (Domain "golden.example.com"),
-      cnvType = RegularConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000001"))),
-      cnvAccess = [PrivateAccess, InviteAccess, LinkAccess, LinkAccess, InviteAccess, LinkAccess, CodeAccess],
-      cnvAccessRole = TeamAccessRole,
-      cnvName = Nothing,
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                          }
-                      ),
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        (parseRoleName "xpb7s51x2p54ban1kuq9d5bkwfnmep835yf1r1azgbrusdn12xpi13estxii5t4cval1qkwuskt9yc")
-                    )
-                },
-            cmOthers = []
-          },
-      cnvTeam = Nothing,
-      cnvMessageTimer = Just (Ms {ms = 3783180688855389}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-    }
-
-testObject_Conversation_user_10 :: Conversation
-testObject_Conversation_user_10 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000000"))) (Domain "golden.example.com"),
-      cnvType = ConnectConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000002"))),
-      cnvAccess = [CodeAccess, PrivateAccess, InviteAccess],
-      cnvAccessRole = NonActivatedAccessRole,
-      cnvName = Just "",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                          }
-                      ),
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                  memOtrMutedRef = Nothing,
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
+                      fromJust
                         ( parseRoleName
-                            "f6i7jiywt5z70w0_2uo5nzl6a7jeb8uij_mlvzkutbuzmuv_kfgl4myu_wh5bjkhbm0qdzacid1zytxvl8jjzyxn3u29enr20563j1mx0cm6vayj"
+                            "r1rg526serx51g15n99y1bw_9q0qrcwck3jxl7ocjsjqcoux7d1zbkz9nnczy92t2oyogxrx3cyh_b8yv44l61mx9uzdnv6"
                         )
-                    )
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "8jz06l_sqgy5jsy2tkj36fx2xtkdhuwhuiktpq2trp9i438bk4xw1lzoi3aysancdc15ihj6r5kr67tkw9hsbhaybyv1356wnfkqsdkzo4kgc"
-                          )
-                      )
                   }
               ]
           },
       cnvTeam = Nothing,
-      cnvMessageTimer = Just (Ms {ms = 1131988659409974}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 2})
-    }
-
-testObject_Conversation_user_11 :: Conversation
-testObject_Conversation_user_11 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000002"))) (Domain "golden.example.com"),
-      cnvType = SelfConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000000"))),
-      cnvAccess = [LinkAccess],
-      cnvAccessRole = TeamAccessRole,
-      cnvName = Nothing,
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                          }
-                      ),
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Nothing,
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "eq24_qppnbjp8nxeda3bgg62wy7uviku7tugpzds1sh_rhois7of0ht1yr37ytdgntv9iz_mmvpxd1sl6uwjj75yehuskmxdnsow6wxi08mykn0lgcal5fix28dd0"
-                        )
-                    )
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) domain,
-                    omService = Nothing,
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "7yp6ch28sx90qjew7i2oa6f3a0a67xtkmef1ronl_lmf7u0lve4z6468jswcqkq7ovr48idryq7dqurpehzzl262oqnoi3bj2_"
-                          )
-                      )
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "ogmflb36qx1edb7q8wxacedus_2ppb6pu2vzph4fnhlc_x3kf271v1x127vin878egys54n3hkgs315xo3ufylmom8v25g3snrauoyxmta_iz"
-                          )
-                      )
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "if7jp_ofhfnlx9amsxhapq21fipzxyg0n1fvawnot0z67qbx_2rgu768eq13gyrtv_35y7kx7nizjbmea6mxg8bf9vl_k9fq7bwlzxty"
-                          )
-                      )
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                            }
-                        ),
-                    omConvRoleName = (fromJust (parseRoleName "1p2vr4mofv6q14vovgx5fnqh_ux"))
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) domain,
-                    omService = Nothing,
-                    omConvRoleName = (fromJust (parseRoleName "b61vxuzhoqvvdl6"))
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000000"))),
-      cnvMessageTimer = Just (Ms {ms = 2882038444751786}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 1})
-    }
-
-testObject_Conversation_user_12 :: Conversation
-testObject_Conversation_user_12 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000000"))) (Domain "golden.example.com"),
-      cnvType = ConnectConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-      cnvAccess = [],
-      cnvAccessRole = TeamAccessRole,
-      cnvName = Just "",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                  memService = Nothing,
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Nothing,
-                  memOtrMutedRef = Nothing,
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "svdfjv4ckfm7gre62yh0l1i7x5k49wq1pxd1btsv4g4pz9ikhmfgkfqngjcuo_y08fyrq_lkf9ny2iubxwy"
-                        )
-                    )
-                },
-            cmOthers = []
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000002"))),
-      cnvMessageTimer = Just (Ms {ms = 7684287430983198}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -2})
-    }
-
-testObject_Conversation_user_13 :: Conversation
-testObject_Conversation_user_13 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000002"))) (Domain "golden.example.com"),
-      cnvType = RegularConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))),
-      cnvAccess = [PrivateAccess, PrivateAccess, LinkAccess, LinkAccess, InviteAccess, CodeAccess, InviteAccess],
-      cnvAccessRole = ActivatedAccessRole,
-      cnvName = Just "\1059925\120234",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                          }
-                      ),
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Nothing,
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "pj33g65zp3y35dnme_vedta8j2a3lx85z7m1isi_e87c3dztjm4_1duhtzn1fpkahqnwsdjwk50xqgawspoedhxkxld2bxmgyk9ghhz310hjtgy676sb0zbujo3"
-                        )
-                    )
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-                    omService = Nothing,
-                    omConvRoleName =
-                      (fromJust (parseRoleName "8evjw_y7w0w2l8qxaxr60chk7hd6hj98_mt3ing6xnwnpdca0qp42tomkmlci_jz4"))
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "nyucucx8i_emmsvmhhpfn3o8h9zidow5qn3hu60jnocrhi_9llcgqo5gc396rxdz6lpkct73l9h2bnfkyqyo1lpo1ga283fn2mqel3lrfopztj64siuzcxtl"
-                          )
-                      )
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000002"))),
-      cnvMessageTimer = Just (Ms {ms = 4379292253035264}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-    }
-
-testObject_Conversation_user_14 :: Conversation
-testObject_Conversation_user_14 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))) (Domain "golden.example.com"),
-      cnvType = RegularConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000002"))),
-      cnvAccess = [],
-      cnvAccessRole = PrivateAccessRole,
-      cnvName = Just "",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                          }
-                      ),
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                  memOtrMutedRef = Nothing,
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "pil4htbefn8i9yvwdkfam83c9gb70k1n3zkn_qb9esx177lofhgcv26no2u97l5uasehqgbb5rc36k46uf"
-                        )
-                    )
-                },
-            cmOthers = []
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000"))),
-      cnvMessageTimer = Just (Ms {ms = 3200162608204982}),
-      cnvReceiptMode = Nothing
-    }
-
-testObject_Conversation_user_15 :: Conversation
-testObject_Conversation_user_15 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000001"))) (Domain "golden.example.com"),
-      cnvType = SelfConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))),
-      cnvAccess = [PrivateAccess, PrivateAccess, InviteAccess],
-      cnvAccessRole = PrivateAccessRole,
-      cnvName = Nothing,
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                  memService = Nothing,
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = True,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "h2fasn_kwjucmy4spspzb6bhgimevoxevulwux13m3odd1clvy_okzb3rqpk9jg07z21fyquztzdrwpa2xa"
-                        )
-                    )
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))) domain,
-                    omService = Nothing,
-                    omConvRoleName = (fromJust (parseRoleName "vztm5yqke"))
-                  }
-              ]
-          },
-      cnvTeam = Nothing,
-      cnvMessageTimer = Just (Ms {ms = 6620100302029733}),
-      cnvReceiptMode = Nothing
-    }
-
-testObject_Conversation_user_16 :: Conversation
-testObject_Conversation_user_16 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000001"))) (Domain "golden.example.com"),
-      cnvType = One2OneConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000000"))),
-      cnvAccess = [InviteAccess, LinkAccess, LinkAccess],
-      cnvAccessRole = TeamAccessRole,
-      cnvName = Just "\USv",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                          }
-                      ),
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Nothing,
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "6e8c9xxescuwzsvmczd844iza6d6xkkxklsgv52b9aj03a0_bkatzwfjsvtz313d6judvbpl0dlgswr2_nrd7h2hpw0_veg"
-                        )
-                    )
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-                            }
-                        ),
-                    omConvRoleName = (fromJust (parseRoleName "amfmp778lcab6emu_l7z3ofb5lkbc1pvksfa9o226g9"))
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000001"))),
-      cnvMessageTimer = Just (Ms {ms = 3688870907729890}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 2})
-    }
-
-testObject_Conversation_user_17 :: Conversation
-testObject_Conversation_user_17 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000000"))) (Domain "golden.example.com"),
-      cnvType = ConnectConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000001"))),
-      cnvAccess = [LinkAccess, LinkAccess],
-      cnvAccessRole = ActivatedAccessRole,
-      cnvName = Nothing,
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-                          }
-                      ),
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = False,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Nothing,
-                  memConvRoleName = (fromJust (parseRoleName "km3i"))
-                },
-            cmOthers = []
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))),
-      cnvMessageTimer = Just (Ms {ms = 5675065539284805}),
-      cnvReceiptMode = Nothing
-    }
-
-testObject_Conversation_user_18 :: Conversation
-testObject_Conversation_user_18 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000000"))) (Domain "golden.example.com"),
-      cnvType = One2OneConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-      cnvAccess = [PrivateAccess],
-      cnvAccessRole = ActivatedAccessRole,
-      cnvName = Just "",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                  memService = Nothing,
-                  memOtrMuted = True,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    (fromJust (parseRoleName "u5k_f768_gbc0efd76xdd25k9xad2p4mxit0gpn4ihbp6iukqherpt3hop841_"))
-                },
-            cmOthers =
-              [ OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-                            }
-                        ),
-                    omConvRoleName = (fromJust (parseRoleName "8eai0sl3c2b0ude_hcp1ntoli4didzqbff"))
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                            }
-                        ),
-                    omConvRoleName =
-                      ( fromJust
-                          ( parseRoleName
-                              "fbksch480c5wfn2d64n7mpjjiohdbpzpudtr4fkx8xknon122tia9kspnni_j0d53nx44nos47ms4l7v1v5c8srvc5v2"
-                          )
-                      )
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                            }
-                        ),
-                    omConvRoleName = (fromJust (parseRoleName "qft4gqk2wm7fcd7vsmnl9hsmo7izfqp7cnn_9mh6i9dme"))
-                  },
-                OtherMember
-                  { omQualifiedId =
-                      Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))) domain,
-                    omService =
-                      Just
-                        ( ServiceRef
-                            { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                              _serviceRefProvider =
-                                (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-                            }
-                        ),
-                    omConvRoleName = (fromJust (parseRoleName "9z5plhmkixcljnsfq4"))
-                  }
-              ]
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000"))),
-      cnvMessageTimer = Nothing,
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -2})
-    }
-
-testObject_Conversation_user_19 :: Conversation
-testObject_Conversation_user_19 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000002"))) (Domain "golden.example.com"),
-      cnvType = SelfConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000000"))),
-      cnvAccess = [LinkAccess],
-      cnvAccessRole = TeamAccessRole,
-      cnvName = Just "",
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                  memService =
-                    Just
-                      ( ServiceRef
-                          { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                            _serviceRefProvider =
-                              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-                          }
-                      ),
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Nothing,
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "2x93m15qf1a7el4t7sl_nob1q5q7urc7bb71l816331ktafgxukqlf1oc2b10e9w_5y724upn8kpzdfnpto1__keuuh217g0z1kq32v0w24hjus6s3tdxz1"
-                        )
-                    )
-                },
-            cmOthers = []
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))),
-      cnvMessageTimer = Just (Ms {ms = 8984227582637931}),
-      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 2})
-    }
-
-testObject_Conversation_user_20 :: Conversation
-testObject_Conversation_user_20 =
-  Conversation
-    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000000"))) (Domain "golden.example.com"),
-      cnvType = ConnectConv,
-      cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000000"))),
-      cnvAccess = [],
-      cnvAccessRole = TeamAccessRole,
-      cnvName = Nothing,
-      cnvMembers =
-        ConvMembers
-          { cmSelf =
-              Member
-                { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                  memService = Nothing,
-                  memOtrMuted = False,
-                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-                  memOtrMutedRef = Just "",
-                  memOtrArchived = True,
-                  memOtrArchivedRef = Just "",
-                  memHidden = False,
-                  memHiddenRef = Just "",
-                  memConvRoleName =
-                    ( fromJust
-                        ( parseRoleName
-                            "0z8ynysylxkk56hg4kp26scdeuzyegfhcyzeroujq9vnm1pauclleesi3ql5f_zre59otqxymh6ege8p7d313djsxz3b78177ok1bx7k_gvll923r57a0"
-                        )
-                    )
-                },
-            cmOthers = []
-          },
-      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000002"))),
-      cnvMessageTimer = Just (Ms {ms = 5214522805392567}),
+      cnvMessageTimer = Just (Ms {ms = 1319272593797015}),
       cnvReceiptMode = Nothing
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/EventType_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/EventType_user.hs
index 3ca8decce43..b04b9d2b6b2 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/EventType_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/EventType_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -27,69 +25,54 @@ import Wire.API.Event.Conversation
         ConvCreate,
         ConvDelete,
         ConvMessageTimerUpdate,
+        ConvReceiptModeUpdate,
+        ConvRename,
         MemberJoin,
         MemberLeave,
+        MemberStateUpdate,
         OtrMessageAdd,
         Typing
       ),
   )
 
 testObject_EventType_user_1 :: EventType
-testObject_EventType_user_1 = Typing
+testObject_EventType_user_1 = MemberJoin
 
 testObject_EventType_user_2 :: EventType
-testObject_EventType_user_2 = ConvCodeDelete
+testObject_EventType_user_2 = MemberLeave
 
 testObject_EventType_user_3 :: EventType
-testObject_EventType_user_3 = ConvCreate
+testObject_EventType_user_3 = MemberStateUpdate
 
 testObject_EventType_user_4 :: EventType
-testObject_EventType_user_4 = MemberLeave
+testObject_EventType_user_4 = ConvRename
 
 testObject_EventType_user_5 :: EventType
-testObject_EventType_user_5 = Typing
+testObject_EventType_user_5 = ConvAccessUpdate
 
 testObject_EventType_user_6 :: EventType
-testObject_EventType_user_6 = Typing
+testObject_EventType_user_6 = ConvMessageTimerUpdate
 
 testObject_EventType_user_7 :: EventType
-testObject_EventType_user_7 = ConvDelete
+testObject_EventType_user_7 = ConvCodeUpdate
 
 testObject_EventType_user_8 :: EventType
-testObject_EventType_user_8 = Typing
+testObject_EventType_user_8 = ConvCodeDelete
 
 testObject_EventType_user_9 :: EventType
-testObject_EventType_user_9 = MemberJoin
+testObject_EventType_user_9 = ConvCreate
 
 testObject_EventType_user_10 :: EventType
-testObject_EventType_user_10 = ConvAccessUpdate
+testObject_EventType_user_10 = ConvConnect
 
 testObject_EventType_user_11 :: EventType
-testObject_EventType_user_11 = ConvCodeDelete
+testObject_EventType_user_11 = ConvDelete
 
 testObject_EventType_user_12 :: EventType
-testObject_EventType_user_12 = MemberJoin
+testObject_EventType_user_12 = ConvReceiptModeUpdate
 
 testObject_EventType_user_13 :: EventType
-testObject_EventType_user_13 = Typing
+testObject_EventType_user_13 = OtrMessageAdd
 
 testObject_EventType_user_14 :: EventType
-testObject_EventType_user_14 = ConvAccessUpdate
-
-testObject_EventType_user_15 :: EventType
-testObject_EventType_user_15 = OtrMessageAdd
-
-testObject_EventType_user_16 :: EventType
-testObject_EventType_user_16 = ConvCodeUpdate
-
-testObject_EventType_user_17 :: EventType
-testObject_EventType_user_17 = ConvConnect
-
-testObject_EventType_user_18 :: EventType
-testObject_EventType_user_18 = ConvMessageTimerUpdate
-
-testObject_EventType_user_19 :: EventType
-testObject_EventType_user_19 = OtrMessageAdd
-
-testObject_EventType_user_20 :: EventType
-testObject_EventType_user_20 = MemberLeave
+testObject_EventType_user_14 = Typing
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Event_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Event_user.hs
index b18ded4f611..9fac68288e5 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Event_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Event_user.hs
@@ -19,12 +19,16 @@
 module Test.Wire.API.Golden.Generated.Event_user where
 
 import Data.Domain
+import Data.Either (fromRight)
 import Data.Id (ClientId (ClientId, client), Id (Id))
 import Data.Misc (Milliseconds (Ms, ms))
 import Data.Qualified
+import Data.Range (unsafeRange)
+import Data.Text.Ascii (validate)
 import qualified Data.UUID as UUID (fromString)
-import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust, read)
+import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust, read, undefined)
 import Wire.API.Conversation
+import Wire.API.Conversation.Code (ConversationCode (..), Key (..), Value (..))
 import Wire.API.Conversation.Role (parseRoleName)
 import Wire.API.Conversation.Typing (TypingData (TypingData, tdStatus), TypingStatus (StoppedTyping))
 import Wire.API.Event.Conversation
@@ -34,11 +38,13 @@ import Wire.API.Event.Conversation
     EventType
       ( ConvAccessUpdate,
         ConvCodeDelete,
+        ConvCodeUpdate,
         ConvConnect,
         ConvCreate,
         ConvDelete,
         ConvMessageTimerUpdate,
         ConvReceiptModeUpdate,
+        ConvRename,
         MemberJoin,
         MemberLeave,
         MemberStateUpdate,
@@ -75,543 +81,246 @@ domain = Domain "golden.example.com"
 
 testObject_Event_user_1 :: Event
 testObject_Event_user_1 =
-  ( Event
-      (ConvDelete)
-      (Qualified (Id (fromJust (UUID.fromString "00005d81-0000-0d71-0000-1d8f00007d32"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00003b8b-0000-3395-0000-076a00007830"))) (Domain "faraway.example.com"))
-      (read "1864-05-22 09:51:07.104 UTC")
-      (EdConvDelete)
-  )
+  Event
+    ConvDelete
+    (Qualified (Id (fromJust (UUID.fromString "00005d81-0000-0d71-0000-1d8f00007d32"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00003b8b-0000-3395-0000-076a00007830"))) (Domain "faraway.example.com"))
+    (read "1864-05-22 09:51:07.104 UTC")
+    EdConvDelete
 
 testObject_Event_user_2 :: Event
 testObject_Event_user_2 =
-  ( Event
-      (ConvAccessUpdate)
-      (Qualified (Id (fromJust (UUID.fromString "0000064d-0000-7a7f-0000-5749000029e1"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00006a88-0000-2acb-0000-6aa0000061b2"))) (Domain "faraway.example.com"))
-      (read "1864-06-05 23:01:18.769 UTC")
-      ( ( EdConvAccessUpdate
-            ( ConversationAccessUpdate
-                { cupAccess = [InviteAccess, LinkAccess, PrivateAccess, InviteAccess, InviteAccess],
-                  cupAccessRole = ActivatedAccessRole
-                }
-            )
+  Event
+    ConvAccessUpdate
+    (Qualified (Id (fromJust (UUID.fromString "0000064d-0000-7a7f-0000-5749000029e1"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00006a88-0000-2acb-0000-6aa0000061b2"))) (Domain "faraway.example.com"))
+    (read "1864-06-05 23:01:18.769 UTC")
+    ( EdConvAccessUpdate
+        ( ConversationAccessUpdate
+            { cupAccess = [InviteAccess, LinkAccess, PrivateAccess, InviteAccess, InviteAccess],
+              cupAccessRole = ActivatedAccessRole
+            }
         )
-      )
-  )
+    )
 
 testObject_Event_user_3 :: Event
 testObject_Event_user_3 =
-  ( Event
-      (OtrMessageAdd)
-      (Qualified (Id (fromJust (UUID.fromString "00006f8c-0000-00d6-0000-1568000001e9"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00004b11-0000-5504-0000-55d800002188"))) (Domain "faraway.example.com"))
-      (read "1864-04-27 15:44:23.844 UTC")
-      ( ( EdOtrMessage
-            ( OtrMessage
-                { otrSender = ClientId {client = "c"},
-                  otrRecipient = ClientId {client = "f"},
-                  otrCiphertext = "",
-                  otrData = Just ">\33032\SI\30584"
-                }
-            )
+  Event
+    OtrMessageAdd
+    (Qualified (Id (fromJust (UUID.fromString "00006f8c-0000-00d6-0000-1568000001e9"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00004b11-0000-5504-0000-55d800002188"))) (Domain "faraway.example.com"))
+    (read "1864-04-27 15:44:23.844 UTC")
+    ( EdOtrMessage
+        ( OtrMessage
+            { otrSender = ClientId {client = "c"},
+              otrRecipient = ClientId {client = "f"},
+              otrCiphertext = "",
+              otrData = Just ">\33032\SI\30584"
+            }
         )
-      )
-  )
+    )
 
 testObject_Event_user_4 :: Event
 testObject_Event_user_4 =
-  ( Event
-      (ConvCodeDelete)
-      (Qualified (Id (fromJust (UUID.fromString "00004f04-0000-3939-0000-472d0000316b"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00007c90-0000-766a-0000-01b700002ab7"))) (Domain "faraway.example.com"))
-      (read "1864-05-12 00:59:09.2 UTC")
-      (EdConvCodeDelete)
-  )
+  Event
+    ConvCodeDelete
+    (Qualified (Id (fromJust (UUID.fromString "00004f04-0000-3939-0000-472d0000316b"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00007c90-0000-766a-0000-01b700002ab7"))) (Domain "faraway.example.com"))
+    (read "1864-05-12 00:59:09.2 UTC")
+    EdConvCodeDelete
 
 testObject_Event_user_5 :: Event
 testObject_Event_user_5 =
-  ( Event
-      (MemberStateUpdate)
-      (Qualified (Id (fromJust (UUID.fromString "00003c8c-0000-6394-0000-294b0000098b"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00002a12-0000-73e1-0000-71f700002ec9"))) (Domain "faraway.example.com"))
-      (read "1864-04-12 03:04:00.298 UTC")
-      ( ( EdMemberUpdate
-            ( MemberUpdateData
-                { misTarget = Nothing,
-                  misOtrMuted = Just False,
-                  misOtrMutedStatus = Nothing,
-                  misOtrMutedRef = Just "\94957",
-                  misOtrArchived = Just False,
-                  misOtrArchivedRef = Just "\SOHJ",
-                  misHidden = Nothing,
-                  misHiddenRef = Just "\b\t\CAN",
-                  misConvRoleName =
-                    Just
-                      ( fromJust
-                          (parseRoleName "_smrwzjjyq92t3t9u1pettcfiga699uz98rpzdt4lviu8x9iv1di4uiebz2gmrxor2_g0mfzzsfonqvc")
-                      )
-                }
-            )
+  Event
+    MemberStateUpdate
+    (Qualified (Id (fromJust (UUID.fromString "00003c8c-0000-6394-0000-294b0000098b"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00002a12-0000-73e1-0000-71f700002ec9"))) (Domain "faraway.example.com"))
+    (read "1864-04-12 03:04:00.298 UTC")
+    ( EdMemberUpdate
+        ( MemberUpdateData
+            { misTarget = Nothing,
+              misOtrMuted = Just False,
+              misOtrMutedStatus = Nothing,
+              misOtrMutedRef = Just "\94957",
+              misOtrArchived = Just False,
+              misOtrArchivedRef = Just "\SOHJ",
+              misHidden = Nothing,
+              misHiddenRef = Just "\b\t\CAN",
+              misConvRoleName =
+                Just
+                  ( fromJust
+                      (parseRoleName "_smrwzjjyq92t3t9u1pettcfiga699uz98rpzdt4lviu8x9iv1di4uiebz2gmrxor2_g0mfzzsfonqvc")
+                  )
+            }
         )
-      )
-  )
+    )
 
 testObject_Event_user_6 :: Event
 testObject_Event_user_6 =
-  ( Event
-      (ConvMessageTimerUpdate)
-      (Qualified (Id (fromJust (UUID.fromString "00001fdb-0000-3127-0000-23ef00007183"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "0000705a-0000-0b62-0000-425c000049c8"))) (Domain "faraway.example.com"))
-      (read "1864-05-09 05:44:41.382 UTC")
-      ((EdConvMessageTimerUpdate (ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 5029817038083912})})))
-  )
+  Event
+    ConvMessageTimerUpdate
+    (Qualified (Id (fromJust (UUID.fromString "00001fdb-0000-3127-0000-23ef00007183"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "0000705a-0000-0b62-0000-425c000049c8"))) (Domain "faraway.example.com"))
+    (read "1864-05-09 05:44:41.382 UTC")
+    (EdConvMessageTimerUpdate (ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 5029817038083912})}))
 
 testObject_Event_user_7 :: Event
 testObject_Event_user_7 =
-  ( Event
-      (Typing)
-      (Qualified (Id (fromJust (UUID.fromString "00006ac1-0000-543e-0000-7c8f00000be7"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "0000355a-0000-2979-0000-083000002d5e"))) (Domain "faraway.example.com"))
-      (read "1864-04-18 05:01:13.761 UTC")
-      ((EdTyping (TypingData {tdStatus = StoppedTyping})))
-  )
+  Event
+    Typing
+    (Qualified (Id (fromJust (UUID.fromString "00006ac1-0000-543e-0000-7c8f00000be7"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "0000355a-0000-2979-0000-083000002d5e"))) (Domain "faraway.example.com"))
+    (read "1864-04-18 05:01:13.761 UTC")
+    (EdTyping (TypingData {tdStatus = StoppedTyping}))
 
 testObject_Event_user_8 :: Event
 testObject_Event_user_8 =
-  ( Event
-      (ConvCodeDelete)
-      (Qualified (Id (fromJust (UUID.fromString "00000892-0000-53c7-0000-0c870000027a"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "000008e8-0000-43fa-0000-4dd1000034cc"))) (Domain "faraway.example.com"))
-      (read "1864-06-08 15:19:01.916 UTC")
-      (EdConvCodeDelete)
-  )
+  Event
+    ConvCreate
+    (Qualified (Id (fromJust (UUID.fromString "000019e1-0000-1dc6-0000-68de0000246d"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00000457-0000-0689-0000-77a00000021c"))) (Domain "faraway.example.com"))
+    (read "1864-05-29 19:31:31.226 UTC")
+    ( EdConversation
+        ( Conversation
+            { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
+              cnvType = RegularConv,
+              cnvCreator = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001")),
+              cnvAccess =
+                [InviteAccess, PrivateAccess, LinkAccess, InviteAccess, InviteAccess, InviteAccess, LinkAccess],
+              cnvAccessRole = NonActivatedAccessRole,
+              cnvName = Just "\a\SO\r",
+              cnvMembers =
+                ConvMembers
+                  { cmSelf =
+                      Member
+                        { memId = Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")),
+                          memService =
+                            Just
+                              ( ServiceRef
+                                  { _serviceRefId =
+                                      Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")),
+                                    _serviceRefProvider =
+                                      Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))
+                                  }
+                              ),
+                          memOtrMuted = False,
+                          memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
+                          memOtrMutedRef = Just "",
+                          memOtrArchived = True,
+                          memOtrArchivedRef = Just "",
+                          memHidden = True,
+                          memHiddenRef = Just "",
+                          memConvRoleName =
+                            fromJust
+                              (parseRoleName "kf_7rcnb2oilvdmd9nelmwf52gikr4aqkhktyn5vjzg7lq1dnzym812q1innmegmx9a")
+                        },
+                    cmOthers =
+                      [ OtherMember
+                          { omQualifiedId =
+                              Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
+                            omService = Nothing,
+                            omConvRoleName =
+                              fromJust
+                                ( parseRoleName
+                                    "4190csbyn6n7ooa8w4d7y9na9_a4m5hgvvmfnowu9zib_29nepamxsxl0gvq2hrfzp7obu_mtj43j0rd38jyd9r5j7xvf2ujge7s0pnt43g9cyal_ak2alwyf8uda"
+                                )
+                          }
+                      ]
+                  },
+              cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000001"))),
+              cnvMessageTimer = Just (Ms {ms = 283898987885780}),
+              cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
+            }
+        )
+    )
 
 testObject_Event_user_9 :: Event
 testObject_Event_user_9 =
-  ( Event
-      (ConvAccessUpdate)
-      (Qualified (Id (fromJust (UUID.fromString "00004847-0000-1eb9-0000-2973000039ca"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "000044e3-0000-1c36-0000-42fd00006e01"))) (Domain "faraway.example.com"))
-      (read "1864-05-21 16:22:14.886 UTC")
-      ( ( EdConvAccessUpdate
-            ( ConversationAccessUpdate
-                { cupAccess =
-                    [PrivateAccess, PrivateAccess, PrivateAccess, LinkAccess, InviteAccess, LinkAccess, CodeAccess],
-                  cupAccessRole = NonActivatedAccessRole
-                }
-            )
-        )
-      )
-  )
+  Event
+    ConvReceiptModeUpdate
+    (Qualified (Id (fromJust (UUID.fromString "00000b98-0000-618d-0000-19e200004651"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00004bee-0000-45a0-0000-2c0300005726"))) (Domain "faraway.example.com"))
+    (read "1864-05-01 11:57:35.123 UTC")
+    (EdConvReceiptModeUpdate (ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -10505}}))
 
 testObject_Event_user_10 :: Event
 testObject_Event_user_10 =
-  ( Event
-      (ConvCreate)
-      (Qualified (Id (fromJust (UUID.fromString "000019e1-0000-1dc6-0000-68de0000246d"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00000457-0000-0689-0000-77a00000021c"))) (Domain "faraway.example.com"))
-      (read "1864-05-29 19:31:31.226 UTC")
-      ( ( EdConversation
-            ( Conversation
-                { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) (Domain "golden.example.com"),
-                  cnvType = RegularConv,
-                  cnvCreator = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))),
-                  cnvAccess =
-                    [InviteAccess, PrivateAccess, LinkAccess, InviteAccess, InviteAccess, InviteAccess, LinkAccess],
-                  cnvAccessRole = NonActivatedAccessRole,
-                  cnvName = Just "\a\SO\r",
-                  cnvMembers =
-                    ConvMembers
-                      { cmSelf =
-                          Member
-                            { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                              memService =
-                                Just
-                                  ( ServiceRef
-                                      { _serviceRefId =
-                                          (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                                        _serviceRefProvider =
-                                          (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                                      }
-                                  ),
-                              memOtrMuted = False,
-                              memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                              memOtrMutedRef = Just "",
-                              memOtrArchived = True,
-                              memOtrArchivedRef = Just "",
-                              memHidden = True,
-                              memHiddenRef = Just "",
-                              memConvRoleName =
-                                ( fromJust
-                                    (parseRoleName "kf_7rcnb2oilvdmd9nelmwf52gikr4aqkhktyn5vjzg7lq1dnzym812q1innmegmx9a")
-                                )
-                            },
-                        cmOthers =
-                          [ OtherMember
-                              { omQualifiedId =
-                                  Qualified (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))) domain,
-                                omService = Nothing,
-                                omConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "4190csbyn6n7ooa8w4d7y9na9_a4m5hgvvmfnowu9zib_29nepamxsxl0gvq2hrfzp7obu_mtj43j0rd38jyd9r5j7xvf2ujge7s0pnt43g9cyal_ak2alwyf8uda"
-                                      )
-                                  )
-                              },
-                            OtherMember
-                              { omQualifiedId =
-                                  Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) domain,
-                                omService =
-                                  Just
-                                    ( ServiceRef
-                                        { _serviceRefId =
-                                            (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                                          _serviceRefProvider =
-                                            (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-                                        }
-                                    ),
-                                omConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "yv7zy3tkxrvz7aj3vvdv3e57pdi8euyuiatpvj48yl8ecw2xskacp737wl269wnts4rgbn1f93zbrkxs5oltt61e099wwzgztqpat4laqk6rqafvb_9aku2w"
-                                      )
-                                  )
-                              },
-                            OtherMember
-                              { omQualifiedId =
-                                  Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))) domain,
-                                omService =
-                                  Just
-                                    ( ServiceRef
-                                        { _serviceRefId =
-                                            (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                                          _serviceRefProvider =
-                                            (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-                                        }
-                                    ),
-                                omConvRoleName = (fromJust (parseRoleName "zsltc_f04kycbem134adefbzjuyd7"))
-                              },
-                            OtherMember
-                              { omQualifiedId =
-                                  Qualified (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))) domain,
-                                omService =
-                                  Just
-                                    ( ServiceRef
-                                        { _serviceRefId =
-                                            (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                                          _serviceRefProvider =
-                                            (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-                                        }
-                                    ),
-                                omConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "nm1gzd7dfqwcf_u3zfq991ylfmjavcs0s0gm6kjq532pjjflua6u5f_xk8dxm1t1g4s3mc2piv631phv19qvtix62s4q6_rc4xj5dh3wmoer_"
-                                      )
-                                  )
-                              }
-                          ]
-                      },
-                  cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000001"))),
-                  cnvMessageTimer = Just (Ms {ms = 283898987885780}),
-                  cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -1})
-                }
-            )
+  Event
+    ConvConnect
+    (Qualified (Id (fromJust (UUID.fromString "00005e43-0000-3b56-0000-7c270000538c"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "00007f28-0000-40b1-0000-56ab0000748d"))) (Domain "faraway.example.com"))
+    (read "1864-05-25 01:31:49.802 UTC")
+    ( EdConnect
+        ( Connect
+            { cRecipient = Id (fromJust (UUID.fromString "00000008-0000-0000-0000-000600000001")),
+              cMessage = Just "L",
+              cName = Just "fq",
+              cEmail = Just "\992986"
+            }
         )
-      )
-  )
+    )
 
 testObject_Event_user_11 :: Event
 testObject_Event_user_11 =
-  ( Event
-      (MemberStateUpdate)
-      (Qualified (Id (fromJust (UUID.fromString "000031c2-0000-108c-0000-10a500000882"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00005335-0000-2983-0000-46460000082f"))) (Domain "faraway.example.com"))
-      (read "1864-05-03 06:49:41.178 UTC")
-      ( ( EdMemberUpdate
-            ( MemberUpdateData
-                { misTarget = Just (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000000"))),
-                  misOtrMuted = Nothing,
-                  misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-                  misOtrMutedRef = Just "v\1034354",
-                  misOtrArchived = Just True,
-                  misOtrArchivedRef = Just "v6",
-                  misHidden = Just False,
-                  misHiddenRef = Just "D",
-                  misConvRoleName = Just (fromJust (parseRoleName "spkf0ayk4c4obgc_l2lj54cljtj25ph"))
-                }
-            )
+  Event
+    MemberLeave
+    (Qualified (Id (fromJust (UUID.fromString "0000303b-0000-23a9-0000-25de00002f80"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "000043a6-0000-1627-0000-490300002017"))) (Domain "faraway.example.com"))
+    (read "1864-04-12 01:28:25.705 UTC")
+    ( EdMembersLeave
+        ( QualifiedUserIdList
+            { qualifiedUserIdList =
+                [ Qualified (Id (fromJust (UUID.fromString "00003fab-0000-40b8-0000-3b0c000014ef"))) (Domain "faraway.example.com"),
+                  Qualified (Id (fromJust (UUID.fromString "00001c48-0000-29ae-0000-62fc00001479"))) (Domain "faraway.example.com")
+                ]
+            }
         )
-      )
-  )
+    )
 
 testObject_Event_user_12 :: Event
 testObject_Event_user_12 =
-  ( Event
-      (ConvDelete)
-      (Qualified (Id (fromJust (UUID.fromString "00007474-0000-2a7b-0000-125900006ac9"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00000795-0000-709d-0000-11270000007a"))) (Domain "faraway.example.com"))
-      (read "1864-05-23 17:16:29.326 UTC")
-      (EdConvDelete)
-  )
+  Event
+    MemberJoin
+    (Qualified (Id (fromJust (UUID.fromString "00000838-0000-1bc6-0000-686d00003565"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "0000114a-0000-7da8-0000-40cb00007fcf"))) (Domain "faraway.example.com"))
+    (read "1864-05-12 20:29:47.483 UTC")
+    ( EdMembersJoin
+        ( SimpleMembers
+            { mMembers =
+                [ SimpleMember
+                    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000055-0000-004d-0000-005100000037"))) (Domain "faraway.example.com"),
+                      smConvRoleName = fromJust (parseRoleName "dlkagbmicz0f95d")
+                    },
+                  SimpleMember
+                    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-001f-0000-001500000009"))) (Domain "faraway.example.com"),
+                      smConvRoleName = fromJust (parseRoleName "2e")
+                    }
+                ]
+            }
+        )
+    )
 
 testObject_Event_user_13 :: Event
 testObject_Event_user_13 =
-  ( Event
-      (OtrMessageAdd)
-      (Qualified (Id (fromJust (UUID.fromString "00006355-0000-5f6e-0000-592c0000680c"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "000029eb-0000-06f8-0000-514100000a84"))) (Domain "faraway.example.com"))
-      (read "1864-05-21 03:22:42.926 UTC")
-      ( ( EdOtrMessage
-            ( OtrMessage
-                { otrSender = ClientId {client = "1f"},
-                  otrRecipient = ClientId {client = "4"},
-                  otrCiphertext = "\1016351\FS!kO5",
-                  otrData = Just "sz"
-                }
-            )
-        )
-      )
-  )
+  Event
+    ConvRename
+    (Qualified (Id (fromJust (UUID.fromString "00000838-0000-1bc6-0000-686d00003565"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "0000114a-0000-7da8-0000-40cb00007fcf"))) (Domain "faraway.example.com"))
+    (read "1864-05-12 20:29:47.483 UTC")
+    (EdConvRename (ConversationRename "New conversation name"))
 
 testObject_Event_user_14 :: Event
 testObject_Event_user_14 =
-  ( Event
-      (ConvReceiptModeUpdate)
-      (Qualified (Id (fromJust (UUID.fromString "00000b98-0000-618d-0000-19e200004651"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00004bee-0000-45a0-0000-2c0300005726"))) (Domain "faraway.example.com"))
-      (read "1864-05-01 11:57:35.123 UTC")
-      ((EdConvReceiptModeUpdate (ConversationReceiptModeUpdate {cruReceiptMode = ReceiptMode {unReceiptMode = -10505}})))
-  )
-
-testObject_Event_user_15 :: Event
-testObject_Event_user_15 =
-  ( Event
-      (ConvConnect)
-      (Qualified (Id (fromJust (UUID.fromString "00005e43-0000-3b56-0000-7c270000538c"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00007f28-0000-40b1-0000-56ab0000748d"))) (Domain "faraway.example.com"))
-      (read "1864-05-25 01:31:49.802 UTC")
-      ( ( EdConnect
-            ( Connect
-                { cRecipient = (Id (fromJust (UUID.fromString "00000008-0000-0000-0000-000600000001"))),
-                  cMessage = Just "L",
-                  cName = Just "fq",
-                  cEmail = Just "\992986"
-                }
-            )
-        )
-      )
-  )
-
-testObject_Event_user_16 :: Event
-testObject_Event_user_16 =
-  ( Event
-      (ConvAccessUpdate)
-      (Qualified (Id (fromJust (UUID.fromString "00004b59-0000-55d6-0000-5aad00007373"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "0000211e-0000-0b37-0000-563100003a5d"))) (Domain "faraway.example.com"))
-      (read "1864-05-24 00:49:37.413 UTC")
-      ((EdConvAccessUpdate (ConversationAccessUpdate {cupAccess = [], cupAccessRole = ActivatedAccessRole})))
-  )
-
-testObject_Event_user_17 :: Event
-testObject_Event_user_17 =
-  ( Event
-      (Typing)
-      (Qualified (Id (fromJust (UUID.fromString "00006ac8-0000-1342-0000-76880000021d"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "0000145f-0000-2ce0-0000-4ca800006c72"))) (Domain "faraway.example.com"))
-      (read "1864-04-17 07:39:54.846 UTC")
-      ((EdTyping (TypingData {tdStatus = StoppedTyping})))
-  )
-
-testObject_Event_user_18 :: Event
-testObject_Event_user_18 =
-  ( Event
-      (MemberLeave)
-      (Qualified (Id (fromJust (UUID.fromString "0000303b-0000-23a9-0000-25de00002f80"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "000043a6-0000-1627-0000-490300002017"))) (Domain "faraway.example.com"))
-      (read "1864-04-12 01:28:25.705 UTC")
-      ( ( EdMembersLeave
-            ( QualifiedUserIdList
-                { qualifiedUserIdList =
-                    [ (Qualified (Id (fromJust (UUID.fromString "00003fab-0000-40b8-0000-3b0c000014ef"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00001c48-0000-29ae-0000-62fc00001479"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00003254-0000-4f74-0000-6fc400003a01"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000051f3-0000-077d-0000-1b3d00003745"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000073a6-0000-7dec-0000-673c00005911"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000535c-0000-3949-0000-14aa000076cb"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000095f-0000-696f-0000-5ee200000ace"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00003861-0000-132e-0000-502500005207"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00007be5-0000-251a-0000-469400006f8d"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000078f6-0000-7e08-0000-56d10000390e"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000517f-0000-26ef-0000-24c100002ae0"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000001c6-0000-16c9-0000-58ea00005d5e"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000485b-0000-208e-0000-272200005214"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00004d24-0000-439c-0000-618c00001e77"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000077b4-0000-74a4-0000-26570000353e"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000332a-0000-430c-0000-5fbc00001ca8"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000059c9-0000-6597-0000-667a00005744"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00005777-0000-7a37-0000-6e22000052d2"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000430d-0000-4970-0000-0a9c00007b88"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000530a-0000-305f-0000-71a0000035d4"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000005b8-0000-2691-0000-3a6000007dfb"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00003c9c-0000-0780-0000-7ad500001db8"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000679a-0000-59cf-0000-279100003e58"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00005aba-0000-14f5-0000-5c2e0000642f"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000016b2-0000-56e8-0000-584600006914"))) (Domain "faraway.example.com"))
-                    ]
-                }
-            )
-        )
-      )
-  )
-
-testObject_Event_user_19 :: Event
-testObject_Event_user_19 =
-  ( Event
-      (MemberJoin)
-      (Qualified (Id (fromJust (UUID.fromString "00000838-0000-1bc6-0000-686d00003565"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "0000114a-0000-7da8-0000-40cb00007fcf"))) (Domain "faraway.example.com"))
-      (read "1864-05-12 20:29:47.483 UTC")
-      ( ( EdMembersJoin
-            ( SimpleMembers
-                { mMembers =
-                    [ SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000055-0000-004d-0000-005100000037"))) (Domain "faraway.example.com"),
-                          smConvRoleName = (fromJust (parseRoleName "dlkagbmicz0f95d"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004c-0000-0051-0000-00220000005c"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "1me2in15nttjib_zx_qqx_c_mw4rw9bys2w4y78e6qhziu_85wj8vbnk6igkzld9unfvnl0oosp25i4btj6yehlq7q9em_mxsxodvq7nj_f5hqx"
-                                )
-                            )
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000014-0000-0027-0000-003400000023"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "31664ffg5sx2690yu2059f7hij_m5vmb80kig21u4h3fe8uwfbshhgkdydiv_nwjm3mo4fprgxkizazcvax0vvxwcvdax"
-                                )
-                            )
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-001f-0000-001500000009"))) (Domain "faraway.example.com"),
-                          smConvRoleName = (fromJust (parseRoleName "2e"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005d-0000-0064-0000-00590000007d"))) (Domain "faraway.example.com"),
-                          smConvRoleName = (fromJust (parseRoleName "f3nxp18px4kup3nrarx5wsp1o_eh69"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000068-0000-007a-0000-005a0000006c"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "fixso00nq4580z4ax9zs0sk3rej11c09rcj2ikbvnrg_io84n0eamqvwlz2icdo2u5jzzovta5j64kp0vg7e_21vs4r0hzv9"
-                                )
-                            )
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000074-0000-0036-0000-00780000007d"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            (fromJust (parseRoleName "f9i5d2wd01ijp53en5bq8lch__jlnu8_v2xsgkctpin98byh1009f_v63"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001c-0000-000a-0000-004800000063"))) (Domain "faraway.example.com"),
-                          smConvRoleName = (fromJust (parseRoleName "o_oqigzovv9oc2uxckvk5eofmc"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000056-0000-0028-0000-004f00000079"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            ( fromJust
-                                (parseRoleName "5snj8s5t7nicihwspcp4sg4ny1pa1yb2s6601vjyxhksbciotoi_rvivybk1iviuz8buw")
-                            )
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001e-0000-0054-0000-002300000053"))) (Domain "faraway.example.com"),
-                          smConvRoleName = (fromJust (parseRoleName "73e9u2hpffjb5ids29tbtcceg0i9v2"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004d-0000-0027-0000-007500000042"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            (fromJust (parseRoleName "d2s4mc_qt1cc2rox8c9gak_qivlha7q259lsz7y5bz6dxsv8igx9r"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000050-0000-006e-0000-007000000057"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "7d84htzo4bc9250rer4r8p47ykbesgatuz8wwkoe1m2xnfljpwoi01025ti548frbvdmtykqq4pn1qsoc3s"
-                                )
-                            )
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007a-0000-003c-0000-005300000013"))) (Domain "faraway.example.com"),
-                          smConvRoleName = (fromJust (parseRoleName "v7ldb8mov4an62t6"))
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0064-0000-005e00000072"))) (Domain "faraway.example.com"),
-                          smConvRoleName =
-                            ( fromJust
-                                ( parseRoleName
-                                    "k7uigpk1wwfc0mffoafjqf3dejctneh21zilaup19435zntvwu8kqd3l0k7s938ex2hf_n7_7dld5z604_if5z88f3u2w28qarfdcw5rkczk4jb4n"
-                                )
-                            )
-                        },
-                      SimpleMember
-                        { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000020-0000-0012-0000-000500000036"))) (Domain "faraway.example.com"),
-                          smConvRoleName = (fromJust (parseRoleName "s6creybsl300lqkhu0wv_ikgattm3bd1r"))
-                        }
-                    ]
-                }
-            )
-        )
-      )
-  )
-
-testObject_Event_user_20 :: Event
-testObject_Event_user_20 =
-  ( Event
-      (MemberLeave)
-      (Qualified (Id (fromJust (UUID.fromString "00000c88-0000-433f-0000-669100006374"))) (Domain "faraway.example.com"))
-      (Qualified (Id (fromJust (UUID.fromString "00007547-0000-26d8-0000-52280000157c"))) (Domain "faraway.example.com"))
-      (read "1864-04-21 23:40:54.462 UTC")
-      ( ( EdMembersLeave
-            ( QualifiedUserIdList
-                { qualifiedUserIdList =
-                    [ (Qualified (Id (fromJust (UUID.fromString "00002e78-0000-23d9-0000-1cba00005025"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00003293-0000-6991-0000-533700000e73"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000075b1-0000-2e89-0000-6262000067a9"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00007f94-0000-39fc-0000-28c5000028ed"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000041f3-0000-3886-0000-735900007499"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00004014-0000-675c-0000-688600003ed7"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00002e75-0000-74cd-0000-529a000008c7"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00000cea-0000-4b67-0000-4a2600007dae"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00006b72-0000-1fae-0000-6647000025d0"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00003c64-0000-4b1f-0000-7bc900001c31"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00002cd3-0000-4520-0000-0d8c00004a16"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00003e8f-0000-66a2-0000-067600002d8f"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00004544-0000-0ce2-0000-1c2300007fbc"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000071ef-0000-44f4-0000-7dc500002e5f"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00007e40-0000-7f3a-0000-45a300002aee"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00006eec-0000-4bb0-0000-271000001e9f"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00001893-0000-272e-0000-5ccc0000561f"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00004d81-0000-2d5f-0000-43ec00005771"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00002521-0000-1a18-0000-3bc200005ce2"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "000005f2-0000-3b01-0000-070000005296"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000411b-0000-224b-0000-32650000061a"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00004880-0000-3a0b-0000-56b10000398a"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00002d6b-0000-4f28-0000-11110000309a"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "0000357d-0000-2963-0000-7bb000002734"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00000f40-0000-657c-0000-7d25000019df"))) (Domain "faraway.example.com")),
-                      (Qualified (Id (fromJust (UUID.fromString "00006350-0000-630b-0000-5f560000503e"))) (Domain "faraway.example.com"))
-                    ]
-                }
-            )
-        )
-      )
-  )
+  Event
+    ConvCodeUpdate
+    (Qualified (Id (fromJust (UUID.fromString "00000838-0000-1bc6-0000-686d00003565"))) (Domain "faraway.example.com"))
+    (Qualified (Id (fromJust (UUID.fromString "0000114a-0000-7da8-0000-40cb00007fcf"))) (Domain "faraway.example.com"))
+    (read "1864-05-12 20:29:47.483 UTC")
+    (EdConvCodeUpdate cc)
+  where
+    cc =
+      ConversationCode
+        { conversationKey = Key {asciiKey = unsafeRange (fromRight undefined (validate "NEN=eLUWHXclTp=_2Nap"))},
+          conversationCode = Value {asciiValue = unsafeRange (fromRight undefined (validate "lLz-9vR8ENum0kI-xWJs"))},
+          conversationUri = Nothing
+        }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Invite_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Invite_user.hs
index f74f9fefef5..16c2a2ccfde 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Invite_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Invite_user.hs
@@ -24,319 +24,30 @@ import Data.List1 (List1 (List1))
 import qualified Data.UUID as UUID (fromString)
 import Imports (fromJust)
 import Wire.API.Conversation (Invite (..))
-import Wire.API.Conversation.Role (parseRoleName)
+import Wire.API.Conversation.Role (parseRoleName, roleNameWireAdmin)
 
 testObject_Invite_user_1 :: Invite
 testObject_Invite_user_1 =
   Invite
     { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000002-0000-0058-0000-003c00000079"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-                ]
-            )
-        ),
+        List1
+          ( NonEmpty.fromList
+              [ Id (fromJust (UUID.fromString "00000002-0000-0058-0000-003c00000079")),
+                Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))
+              ]
+          ),
       invRoleName =
-        ( fromJust
-            (parseRoleName "t0xs1a2pemtt5f133cklsuqsxvrq25q5awgxjbuf5m2hf679oxxjcop794lmnuj2rd3t1sp5qya0tmn4qhpw2wxepd")
-        )
+        fromJust
+          (parseRoleName "t0xs1a2pemtt5f133cklsuqsxvrq25q5awgxjbuf5m2hf679oxxjcop794lmnuj2rd3t1sp5qya0tmn4qhpw2wxepd")
     }
 
 testObject_Invite_user_2 :: Invite
 testObject_Invite_user_2 =
-  Invite
-    { invUsers = (List1 (NonEmpty.fromList [(Id (fromJust (UUID.fromString "00000003-0000-0038-0000-000000000030")))])),
-      invRoleName =
-        ( fromJust
-            ( parseRoleName
-                "c8wyxwm1r2tphgh4b9yirte060ts3y5tywdisg_uyon1gpkoyahu0cg6e0n0n1d0799qoozn4gdb5nt3ll1cpe7u_rx8vbs9jgk1z8yuw2voczlfnf8a5"
-            )
-        )
-    }
-
-testObject_Invite_user_3 :: Invite
-testObject_Invite_user_3 =
-  Invite
-    { invUsers = (List1 (NonEmpty.fromList [(Id (fromJust (UUID.fromString "0000001f-0000-005b-0000-00760000005e")))])),
-      invRoleName = (fromJust (parseRoleName "57v38roxp_86gpipmiu"))
-    }
-
-testObject_Invite_user_4 :: Invite
-testObject_Invite_user_4 =
-  Invite
-    { invUsers = (List1 (NonEmpty.fromList [(Id (fromJust (UUID.fromString "00000034-0000-0024-0000-004b00000050")))])),
-      invRoleName =
-        ( fromJust
-            ( parseRoleName
-                "079hquxvhsq317aiqzaqh_xtnlwq2ob5gorilte_6xb7ifqlteayz265glnx4l2nyebn3q41mhd_zaiuqp5v2lg1oel7x1agaten1ejt9smdjbqtzk91bl_ony6m"
-            )
-        )
-    }
-
-testObject_Invite_user_5 :: Invite
-testObject_Invite_user_5 =
-  Invite
-    { invUsers = (List1 (NonEmpty.fromList [(Id (fromJust (UUID.fromString "00000074-0000-0065-0000-000c00000019")))])),
-      invRoleName = (fromJust (parseRoleName "nepk6pn_rztw8dwdfm"))
-    }
-
-testObject_Invite_user_6 :: Invite
-testObject_Invite_user_6 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "0000004f-0000-0003-0000-007200000021"))),
-                  (Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000300000003"))),
-                  (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000400000007")))
-                ]
-            )
-        ),
-      invRoleName =
-        ( fromJust
-            ( parseRoleName
-                "ay8e96nli_o326ctneqxefsl8o06fxn80lsdbfbxceb466ny7tlmq9xk_0eo145ijc0tmazk5ebmpvo91ds1nb5qx_yvecm1eb8prhx2wvic2"
-            )
-        )
-    }
-
-testObject_Invite_user_7 :: Invite
-testObject_Invite_user_7 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "0000000d-0000-003e-0000-007d00000011"))),
-                  (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000400000000"))),
-                  (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000200000004"))),
-                  (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000003")))
-                ]
-            )
-        ),
-      invRoleName = (fromJust (parseRoleName "te16fbrbv_frjr7z1cobf_qw3226r09h2ip6"))
-    }
-
-testObject_Invite_user_8 :: Invite
-testObject_Invite_user_8 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000072-0000-007b-0000-003b00000053"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0005-0000-000100000002"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0005-0000-000300000003")))
-                ]
-            )
-        ),
-      invRoleName = (fromJust (parseRoleName "ne1ke5cw8eebnhze97"))
-    }
-
-testObject_Invite_user_9 :: Invite
-testObject_Invite_user_9 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "0000000a-0000-0059-0000-004500000064"))),
-                  (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000100000007"))),
-                  (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000100000001")))
-                ]
-            )
-        ),
-      invRoleName =
-        ( fromJust
-            ( parseRoleName
-                "fpi6k1c5xsutublh8en17cdzfeucj3jj0xqydhrniuwh59w9dcousk6qpgmyxfz2yf33nzuvnbfu694jsk6nxo37x7dtmz4jt1qdtpr5ko09seqnrktdh9x2a"
-            )
-        )
-    }
-
-testObject_Invite_user_10 :: Invite
-testObject_Invite_user_10 =
-  Invite
-    { invUsers = (List1 (NonEmpty.fromList [(Id (fromJust (UUID.fromString "0000000d-0000-006e-0000-003c0000002b")))])),
-      invRoleName =
-        ( fromJust
-            ( parseRoleName
-                "kcir_y3vbqzd21zk8mni9ykpdcvv0lgw7yn8hsn9d10a4buteq0dget5f4spyn2dty21rs91bl27eimkuuysbo803zpoi8ujls2hl96_mazcr6zx2iwcd63jcwf"
-            )
-        )
-    }
-
-testObject_Invite_user_11 :: Invite
-testObject_Invite_user_11 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000023-0000-0058-0000-005e00000038"))),
-                  (Id (fromJust (UUID.fromString "00000055-0000-0062-0000-006a00000054")))
-                ]
-            )
-        ),
-      invRoleName =
-        (fromJust (parseRoleName "mi2o6aijp5vw63fptcb056791v9b0veom0q072oogofh70yepntd0nihi6bwgle87b1rtzpwrrfpv__"))
-    }
-
-testObject_Invite_user_12 :: Invite
-testObject_Invite_user_12 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "0000006d-0000-0070-0000-005900000006"))),
-                  (Id (fromJust (UUID.fromString "00000078-0000-007d-0000-001c0000007d")))
-                ]
-            )
-        ),
-      invRoleName = (fromJust (parseRoleName "5fjm"))
-    }
-
-testObject_Invite_user_13 :: Invite
-testObject_Invite_user_13 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000055-0000-002e-0000-00210000000f"))),
-                  (Id (fromJust (UUID.fromString "0000003b-0000-0027-0000-000a00000067")))
-                ]
-            )
-        ),
-      invRoleName =
-        (fromJust (parseRoleName "47kpu6zrm055rmo2oacehdtninwcsdrzixki1u3s3xyjvqns1g4qpipguuc8t5ttplttmv8zgjozuyy_z"))
-    }
-
-testObject_Invite_user_14 :: Invite
-testObject_Invite_user_14 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000064-0000-0050-0000-002b00000006"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-                ]
-            )
-        ),
-      invRoleName =
-        ( fromJust
-            ( parseRoleName
-                "dez5nywlp2h2um8aygzz7sa4zs6pid50gry3c29_e6yaz3ssycowlty8sqgq8ng25v3g04lpz3yshfjyv6e0y7gw82h317kkmfvh_hr8sf_kt2s"
-            )
-        )
-    }
-
-testObject_Invite_user_15 :: Invite
-testObject_Invite_user_15 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000045-0000-0033-0000-003d0000001d"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000400000005"))),
-                  (Id (fromJust (UUID.fromString "00000003-0000-0006-0000-000100000005")))
-                ]
-            )
-        ),
-      invRoleName = (fromJust (parseRoleName "z41w"))
-    }
-
-testObject_Invite_user_16 :: Invite
-testObject_Invite_user_16 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000043-0000-005b-0000-006100000032"))),
-                  (Id (fromJust (UUID.fromString "00000074-0000-0002-0000-004800000046")))
-                ]
-            )
-        ),
-      invRoleName =
-        ( fromJust
-            ( parseRoleName
-                "c3a16_lnrlljruno4q6z3qqx01kz1lmkyvuiif0zxrpf5pk0fyg5hpklnhndvdh05blk60mdwcrpy_5a1ng97rq1_a0ukeke5fhbq"
-            )
-        )
-    }
-
-testObject_Invite_user_17 :: Invite
-testObject_Invite_user_17 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "0000001c-0000-0067-0000-006400000024"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                  (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                  (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-                ]
-            )
-        ),
-      invRoleName =
-        (fromJust (parseRoleName "sa3ntyz5lxg170v0ayym1u7lcqye396ecvluh4il1yseihpxa_atjcvkotby82epy3brf71ehgqyazwkkr"))
-    }
-
-testObject_Invite_user_18 :: Invite
-testObject_Invite_user_18 =
-  Invite
-    { invUsers = (List1 (NonEmpty.fromList [(Id (fromJust (UUID.fromString "00000042-0000-0029-0000-005d00000023")))])),
-      invRoleName =
-        (fromJust (parseRoleName "irsnx2fz8pnkdkf8mbgdb7jresq80op5m3956474u_jm_nq8gcab4sq3jw_ucihknqx081s2zx1t784r7fb1"))
-    }
-
-testObject_Invite_user_19 :: Invite
-testObject_Invite_user_19 =
-  Invite
-    { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000054-0000-006e-0000-005900000052"))),
-                  (Id (fromJust (UUID.fromString "00000034-0000-0050-0000-00220000001a")))
-                ]
-            )
-        ),
-      invRoleName = (fromJust (parseRoleName "bt524if4uaj9czwp_1xl72"))
-    }
-
-testObject_Invite_user_20 :: Invite
-testObject_Invite_user_20 =
   Invite
     { invUsers =
-        ( List1
-            ( NonEmpty.fromList
-                [ (Id (fromJust (UUID.fromString "00000025-0000-0034-0000-007900000003"))),
-                  (Id (fromJust (UUID.fromString "00000005-0000-0002-0000-000000000000"))),
-                  (Id (fromJust (UUID.fromString "00000007-0000-0008-0000-000300000001")))
-                ]
-            )
-        ),
-      invRoleName = (fromJust (parseRoleName "s2tpmghgh0ydx5rb41fjx9imc9p57hcodqazij95qub"))
+        List1
+          ( NonEmpty.fromList
+              [Id (fromJust (UUID.fromString "00000002-0000-0058-0000-003c00000079"))]
+          ),
+      invRoleName = roleNameWireAdmin
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdateData_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdateData_user.hs
index 04add0e44b5..529d9cf3d27 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdateData_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdateData_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -36,20 +34,6 @@ testObject_MemberUpdateData_user_1 =
       misOtrArchivedRef = Just "a",
       misHidden = Just True,
       misHiddenRef = Just "1",
-      misConvRoleName = Nothing
-    }
-
-testObject_MemberUpdateData_user_2 :: MemberUpdateData
-testObject_MemberUpdateData_user_2 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))),
-      misOtrMuted = Just False,
-      misOtrMutedStatus = Nothing,
-      misOtrMutedRef = Just "L\r\1008876",
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "\v\DC4",
-      misHidden = Nothing,
-      misHiddenRef = Just "x\ESC\1112603",
       misConvRoleName =
         Just
           ( fromJust
@@ -59,311 +43,16 @@ testObject_MemberUpdateData_user_2 =
           )
     }
 
-testObject_MemberUpdateData_user_3 :: MemberUpdateData
-testObject_MemberUpdateData_user_3 =
-  MemberUpdateData
-    { misTarget = Nothing,
-      misOtrMuted = Just True,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-      misOtrMutedRef = Just "",
-      misOtrArchived = Nothing,
-      misOtrArchivedRef = Nothing,
-      misHidden = Nothing,
-      misHiddenRef = Just "\185389",
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "o2pxqmm_oqv3otnujuy0kpz6g1ag2uifcvoifldu9o3712w2tjzgkq0wujb5kgs9ckw3wl1k6bw7g5ar8w5xcbr917engs11a7448nl7zn1aq00b3dd0vx"
-              )
-          )
-    }
-
-testObject_MemberUpdateData_user_4 :: MemberUpdateData
-testObject_MemberUpdateData_user_4 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000000"))),
-      misOtrMuted = Just True,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      misOtrMutedRef = Just "f\990231\DC2",
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "",
-      misHidden = Nothing,
-      misHiddenRef = Nothing,
-      misConvRoleName = Just (fromJust (parseRoleName "t2hf3xe1ifhpvvoslunyqz2nx_lsufmw5zbh42i5j0ivfvo"))
-    }
-
-testObject_MemberUpdateData_user_5 :: MemberUpdateData
-testObject_MemberUpdateData_user_5 =
-  MemberUpdateData
-    { misTarget = Nothing,
-      misOtrMuted = Just False,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-      misOtrMutedRef = Just "",
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Nothing,
-      misHidden = Just False,
-      misHiddenRef = Just "!",
-      misConvRoleName =
-        Just
-          ( fromJust
-              (parseRoleName "_p1ctmxajl8_xxe9_5vzwv4g7gcw_efe75x55n5qv5mokpe10ddg9cfkdjv0tx1fwg9w3ppw9jtpyj8_da5ptc")
-          )
-    }
-
-testObject_MemberUpdateData_user_6 :: MemberUpdateData
-testObject_MemberUpdateData_user_6 =
-  MemberUpdateData
-    { misTarget = Nothing,
-      misOtrMuted = Nothing,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      misOtrMutedRef = Nothing,
-      misOtrArchived = Just False,
-      misOtrArchivedRef = Just "Q\DC3\29131",
-      misHidden = Just True,
-      misHiddenRef = Nothing,
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "ydqensdr39dvnxk4fcelt2zijpvt_txux15xfo2z2tka925gia97prtrss2zv3bnwpsjsb13tj3x0wg9mbbj2oo4kboh_033za30b4fme5x2m_l85n_"
-              )
-          )
-    }
-
-testObject_MemberUpdateData_user_7 :: MemberUpdateData
-testObject_MemberUpdateData_user_7 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000000"))),
-      misOtrMuted = Just False,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 2}),
-      misOtrMutedRef = Just "$\ACKN",
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "",
-      misHidden = Just False,
-      misHiddenRef = Just "!\a\163817",
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "kgb4ma4yj4k07f1x20fyw3c72hquskp01_d0z3as7ebm29puw728ej132sdoha1m88ex8yo_kv646b54vw_v6llj07zq8qzfsrgh56"
-              )
-          )
-    }
-
-testObject_MemberUpdateData_user_8 :: MemberUpdateData
-testObject_MemberUpdateData_user_8 =
+testObject_MemberUpdateData_user_2 :: MemberUpdateData
+testObject_MemberUpdateData_user_2 =
   MemberUpdateData
     { misTarget = Nothing,
-      misOtrMuted = Just False,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-      misOtrMutedRef = Just "s~",
-      misOtrArchived = Just False,
-      misOtrArchivedRef = Just "\ACKP\v",
-      misHidden = Just True,
-      misHiddenRef = Just "\DC3\RS",
-      misConvRoleName = Just (fromJust (parseRoleName "d0dg0qiu97eat9qbd6ziqu19jagfp89n"))
-    }
-
-testObject_MemberUpdateData_user_9 :: MemberUpdateData
-testObject_MemberUpdateData_user_9 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-      misOtrMuted = Nothing,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-      misOtrMutedRef = Nothing,
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "",
-      misHidden = Just False,
-      misHiddenRef = Nothing,
-      misConvRoleName =
-        Just
-          ( fromJust
-              (parseRoleName "5cbfwwdai0h6bctmk9it8j38j91esopfi3xfi1n1fmwv4ieayi8gzdtay451y8h37veezkrystz4g49wgsv7ab12")
-          )
-    }
-
-testObject_MemberUpdateData_user_10 :: MemberUpdateData
-testObject_MemberUpdateData_user_10 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000001"))),
       misOtrMuted = Nothing,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-      misOtrMutedRef = Just "n\1104041\16853",
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "",
-      misHidden = Just True,
-      misHiddenRef = Nothing,
-      misConvRoleName = Just (fromJust (parseRoleName "ffeb0qucf7nfaerti39parabwgbbuwe2mel5h5skepdriy7"))
-    }
-
-testObject_MemberUpdateData_user_11 :: MemberUpdateData
-testObject_MemberUpdateData_user_11 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000001"))),
-      misOtrMuted = Just True,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      misOtrMutedRef = Just "p\36049",
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "`",
-      misHidden = Just False,
-      misHiddenRef = Just "V",
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "kkdmdyqvaafi1taaxkd2n_75cd6edzu52vhzkw2lgmiwe_ghtxdx0yfuiow5w245cazi6b6__kxcw7nc7lveke1dpv2v8hcv4p3p07tcfrhsxe0br0w2yives34t"
-              )
-          )
-    }
-
-testObject_MemberUpdateData_user_12 :: MemberUpdateData
-testObject_MemberUpdateData_user_12 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))),
-      misOtrMuted = Nothing,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      misOtrMutedRef = Nothing,
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "\DC4&",
-      misHidden = Nothing,
-      misHiddenRef = Just "\177634",
-      misConvRoleName = Nothing
-    }
-
-testObject_MemberUpdateData_user_13 :: MemberUpdateData
-testObject_MemberUpdateData_user_13 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000000"))),
-      misOtrMuted = Just False,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-      misOtrMutedRef = Just "v",
-      misOtrArchived = Nothing,
-      misOtrArchivedRef = Just "N\993883o",
-      misHidden = Just True,
-      misHiddenRef = Just "",
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "uu19t9u0ff3w5kv8spa5zyc7fs6fhx42l0mgyrulb1fno5uo81vaj0i2474ag7dfq8sja4abkuhg00fhwquxkztuvqai"
-              )
-          )
-    }
-
-testObject_MemberUpdateData_user_14 :: MemberUpdateData
-testObject_MemberUpdateData_user_14 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000002"))),
-      misOtrMuted = Just True,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-      misOtrMutedRef = Just "\183388~q",
-      misOtrArchived = Just False,
-      misOtrArchivedRef = Just "",
-      misHidden = Just False,
-      misHiddenRef = Just "&\EOT",
-      misConvRoleName =
-        Just (fromJust (parseRoleName "myz97junegyxat7oqglk92gtatzh189p4rq6aqmyjdd0bj41rg5qhvvpmi7a7ezofimw_x2vw70"))
-    }
-
-testObject_MemberUpdateData_user_15 :: MemberUpdateData
-testObject_MemberUpdateData_user_15 =
-  MemberUpdateData
-    { misTarget = Nothing,
-      misOtrMuted = Just True,
       misOtrMutedStatus = Nothing,
-      misOtrMutedRef = Just "\ENQ\1012859j",
+      misOtrMutedRef = Nothing,
       misOtrArchived = Nothing,
-      misOtrArchivedRef = Just ">\28014d",
-      misHidden = Just False,
-      misHiddenRef = Just "",
-      misConvRoleName = Nothing
-    }
-
-testObject_MemberUpdateData_user_16 :: MemberUpdateData
-testObject_MemberUpdateData_user_16 =
-  MemberUpdateData
-    { misTarget = Nothing,
-      misOtrMuted = Just False,
-      misOtrMutedStatus = Nothing,
-      misOtrMutedRef = Just "",
-      misOtrArchived = Just False,
-      misOtrArchivedRef = Just "]",
-      misHidden = Just True,
-      misHiddenRef = Just "+8\1058595",
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "bod0gqeaes81c9qddjcdyqfi5fyzqalv3ppu5e11wx7hs8phvtccawwc7up7rvxylznt9jxtobt8y4oiww3mojghwp_v9twnatquv1mr"
-              )
-          )
-    }
-
-testObject_MemberUpdateData_user_17 :: MemberUpdateData
-testObject_MemberUpdateData_user_17 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000002"))),
-      misOtrMuted = Nothing,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      misOtrMutedRef = Just "\v",
-      misOtrArchived = Just False,
       misOtrArchivedRef = Nothing,
       misHidden = Nothing,
-      misHiddenRef = Just "\ACK\1055626",
-      misConvRoleName = Nothing
-    }
-
-testObject_MemberUpdateData_user_18 :: MemberUpdateData
-testObject_MemberUpdateData_user_18 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000002"))),
-      misOtrMuted = Just True,
-      misOtrMutedStatus = Nothing,
-      misOtrMutedRef = Nothing,
-      misOtrArchived = Just False,
-      misOtrArchivedRef = Just "",
-      misHidden = Just True,
-      misHiddenRef = Just "\1078097b",
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "c8gq33xy3yowglzoq9rk_x5hul1y8e4d9ceu90jhj3m6u236t7bmw1sss_l4dw_rksd5x7zhyhoji5gh4t5fo49h9lwm3xrlv3ntkmtjusfv0mzcy_c63jkf8oku0"
-              )
-          )
-    }
-
-testObject_MemberUpdateData_user_19 :: MemberUpdateData
-testObject_MemberUpdateData_user_19 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))),
-      misOtrMuted = Nothing,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-      misOtrMutedRef = Nothing,
-      misOtrArchived = Just True,
-      misOtrArchivedRef = Just "I|\990067",
-      misHidden = Just True,
       misHiddenRef = Nothing,
-      misConvRoleName = Just (fromJust (parseRoleName "egpq8z5jbd3gqk0e0i4w5wul5vuwgo49jks0q3_n4gow"))
-    }
-
-testObject_MemberUpdateData_user_20 :: MemberUpdateData
-testObject_MemberUpdateData_user_20 =
-  MemberUpdateData
-    { misTarget = Just (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000001"))),
-      misOtrMuted = Nothing,
-      misOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      misOtrMutedRef = Just "\1087369\49549p",
-      misOtrArchived = Just False,
-      misOtrArchivedRef = Nothing,
-      misHidden = Just True,
-      misHiddenRef = Just "",
-      misConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "towhht2x6vbbej8ez996qoed_txxn7errr31wnzli7zrq2zsd0mm2saxn4_u_7p1hr53o6t4bsojbpb3_kr4ygseuz0f9kklmyjvs3_n5e5yw0mp2y6ve"
-              )
-          )
+      misConvRoleName = Nothing
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdate_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdate_user.hs
index 35f1e8ba073..579913bcb17 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdate_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MemberUpdate_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -18,18 +16,19 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.MemberUpdate_user where
 
-import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust)
+import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust, ($), (.))
 import Wire.API.Conversation (MemberUpdate (..))
+import Wire.API.Conversation.Member (MutedStatus (MutedStatus))
 import Wire.API.Conversation.Role (parseRoleName)
 
 testObject_MemberUpdate_user_1 :: MemberUpdate
 testObject_MemberUpdate_user_1 =
   MemberUpdate
     { mupOtrMute = Just False,
-      mupOtrMuteStatus = Nothing,
+      mupOtrMuteStatus = Just . MutedStatus $ 0,
       mupOtrMuteRef = Just "h\52974N",
-      mupOtrArchive = Nothing,
-      mupOtrArchiveRef = Nothing,
+      mupOtrArchive = Just True,
+      mupOtrArchiveRef = Just "ref",
       mupHidden = Just False,
       mupHiddenRef = Just "",
       mupConvRoleName =
@@ -43,263 +42,13 @@ testObject_MemberUpdate_user_1 =
 
 testObject_MemberUpdate_user_2 :: MemberUpdate
 testObject_MemberUpdate_user_2 =
-  MemberUpdate
-    { mupOtrMute = Just True,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just ",K",
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "\n",
-      mupHidden = Nothing,
-      mupHiddenRef = Nothing,
-      mupConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "imbwyhqhtf8jub3el8j0ztn2gzsyfs6zdv3__86bpts_eksydln4jzjv11evylw748ug5knf7h5lnckj6dq8lfpwgdvapxx60xvpky_1t"
-              )
-          )
-    }
-
-testObject_MemberUpdate_user_3 :: MemberUpdate
-testObject_MemberUpdate_user_3 =
-  MemberUpdate
-    { mupOtrMute = Just True,
-      mupOtrMuteStatus = Just 3,
-      mupOtrMuteRef = Just "/L",
-      mupOtrArchive = Nothing,
-      mupOtrArchiveRef = Nothing,
-      mupHidden = Just True,
-      mupHiddenRef = Just "",
-      mupConvRoleName =
-        Just (fromJust (parseRoleName "29pgeoc1x6764fsdwtticdvz1bvso_q95d5673zo7s076hshdzoa7ufh55os_8eedfy3r8e"))
-    }
-
-testObject_MemberUpdate_user_4 :: MemberUpdate
-testObject_MemberUpdate_user_4 =
-  MemberUpdate
-    { mupOtrMute = Just True,
-      mupOtrMuteStatus = Just 7182,
-      mupOtrMuteRef = Nothing,
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "0T",
-      mupHidden = Just False,
-      mupHiddenRef = Just "I'",
-      mupConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "y3f2wfk4s6odkp67ngv2dqsymq12ru1f6yiar17kpyoi0ng0yu7bqzr4_1c8jsr6zdaw24xs47bdq5um3vc501nr3s89kn0dhe9c5k52pzfzfws3"
-              )
-          )
-    }
-
-testObject_MemberUpdate_user_5 :: MemberUpdate
-testObject_MemberUpdate_user_5 =
   MemberUpdate
     { mupOtrMute = Nothing,
       mupOtrMuteStatus = Nothing,
       mupOtrMuteRef = Nothing,
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "\EOT\37502",
-      mupHidden = Just False,
-      mupHiddenRef = Just "\\",
-      mupConvRoleName = Nothing
-    }
-
-testObject_MemberUpdate_user_6 :: MemberUpdate
-testObject_MemberUpdate_user_6 =
-  MemberUpdate
-    { mupOtrMute = Just True,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Nothing,
-      mupOtrArchive = Just True,
-      mupOtrArchiveRef = Just "",
-      mupHidden = Nothing,
-      mupHiddenRef = Just "\110670\2236*",
-      mupConvRoleName =
-        Just (fromJust (parseRoleName "_loalxj_i6vbh4aebdkbyr59_hawtw3fzjeffcw8llqvhdjx9k6cq3fzsk78zpejqy2om6"))
-    }
-
-testObject_MemberUpdate_user_7 :: MemberUpdate
-testObject_MemberUpdate_user_7 =
-  MemberUpdate
-    { mupOtrMute = Nothing,
-      mupOtrMuteStatus = Just 0,
-      mupOtrMuteRef = Nothing,
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "(\25308t",
-      mupHidden = Just True,
-      mupHiddenRef = Nothing,
-      mupConvRoleName = Just (fromJust (parseRoleName "5la_7_6jn396azj61gyopd1z6dkqfkd56kerwmng27x1"))
-    }
-
-testObject_MemberUpdate_user_8 :: MemberUpdate
-testObject_MemberUpdate_user_8 =
-  MemberUpdate
-    { mupOtrMute = Just True,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "m",
-      mupOtrArchive = Just True,
-      mupOtrArchiveRef = Nothing,
-      mupHidden = Just True,
-      mupHiddenRef = Just "\5167",
-      mupConvRoleName = Nothing
-    }
-
-testObject_MemberUpdate_user_9 :: MemberUpdate
-testObject_MemberUpdate_user_9 =
-  MemberUpdate
-    { mupOtrMute = Just False,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "8\16235Q",
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Nothing,
-      mupHidden = Just True,
-      mupHiddenRef = Just "\CANan",
-      mupConvRoleName =
-        Just (fromJust (parseRoleName "_sg5ujt7r_74lesoq1b__dsmy_ewiryj0ak_6y1mlwf5okqxx7hx9sr7q2hqq0g9xj6bx1144z4mk7"))
-    }
-
-testObject_MemberUpdate_user_10 :: MemberUpdate
-testObject_MemberUpdate_user_10 =
-  MemberUpdate
-    { mupOtrMute = Nothing,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "",
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "\SOH",
-      mupHidden = Just True,
-      mupHiddenRef = Just "",
-      mupConvRoleName = Just (fromJust (parseRoleName "r6pd3cc"))
-    }
-
-testObject_MemberUpdate_user_11 :: MemberUpdate
-testObject_MemberUpdate_user_11 =
-  MemberUpdate
-    { mupOtrMute = Just False,
-      mupOtrMuteStatus = Just (-909),
-      mupOtrMuteRef = Just "",
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "",
-      mupHidden = Nothing,
-      mupHiddenRef = Just "%nc",
-      mupConvRoleName = Just (fromJust (parseRoleName "d1pquul8mcpzzyd"))
-    }
-
-testObject_MemberUpdate_user_12 :: MemberUpdate
-testObject_MemberUpdate_user_12 =
-  MemberUpdate
-    { mupOtrMute = Nothing,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "N",
-      mupOtrArchive = Just True,
-      mupOtrArchiveRef = Nothing,
-      mupHidden = Just True,
-      mupHiddenRef = Nothing,
-      mupConvRoleName = Just (fromJust (parseRoleName "uwira8"))
-    }
-
-testObject_MemberUpdate_user_13 :: MemberUpdate
-testObject_MemberUpdate_user_13 =
-  MemberUpdate
-    { mupOtrMute = Just False,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just ",\136190x",
       mupOtrArchive = Nothing,
       mupOtrArchiveRef = Nothing,
-      mupHidden = Nothing,
-      mupHiddenRef = Just " \98741",
-      mupConvRoleName =
-        Just (fromJust (parseRoleName "8_gp4dnllqkywu8ynwrefdulehdg2tj5a_tuug8pzdbxjmwbzrj4hbmzv74626xwgnvan"))
-    }
-
-testObject_MemberUpdate_user_14 :: MemberUpdate
-testObject_MemberUpdate_user_14 =
-  MemberUpdate
-    { mupOtrMute = Nothing,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Nothing,
-      mupOtrArchive = Just True,
-      mupOtrArchiveRef = Just "",
-      mupHidden = Nothing,
-      mupHiddenRef = Nothing,
-      mupConvRoleName = Nothing
-    }
-
-testObject_MemberUpdate_user_15 :: MemberUpdate
-testObject_MemberUpdate_user_15 =
-  MemberUpdate
-    { mupOtrMute = Just False,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "\54053f\152356",
-      mupOtrArchive = Just True,
-      mupOtrArchiveRef = Just "\998566",
-      mupHidden = Just True,
-      mupHiddenRef = Just "4\ETX\1061048",
-      mupConvRoleName = Just (fromJust (parseRoleName "u19bhfqrug1dc7e98hjpfv3d0"))
-    }
-
-testObject_MemberUpdate_user_16 :: MemberUpdate
-testObject_MemberUpdate_user_16 =
-  MemberUpdate
-    { mupOtrMute = Just False,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "pa/",
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "",
       mupHidden = Just False,
-      mupHiddenRef = Just "",
-      mupConvRoleName = Just (fromJust (parseRoleName "8emml6p8nqqdn61rankt2i2_5mhk3y3baf_bon8v50q"))
-    }
-
-testObject_MemberUpdate_user_17 :: MemberUpdate
-testObject_MemberUpdate_user_17 =
-  MemberUpdate
-    { mupOtrMute = Just False,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Nothing,
-      mupOtrArchive = Just True,
-      mupOtrArchiveRef = Nothing,
-      mupHidden = Just False,
-      mupHiddenRef = Just "5\20987[",
-      mupConvRoleName = Just (fromJust (parseRoleName "lvnn0dbt1o_5lp7f"))
-    }
-
-testObject_MemberUpdate_user_18 :: MemberUpdate
-testObject_MemberUpdate_user_18 =
-  MemberUpdate
-    { mupOtrMute = Nothing,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Nothing,
-      mupOtrArchive = Nothing,
-      mupOtrArchiveRef = Just "",
-      mupHidden = Just True,
       mupHiddenRef = Nothing,
       mupConvRoleName = Nothing
     }
-
-testObject_MemberUpdate_user_19 :: MemberUpdate
-testObject_MemberUpdate_user_19 =
-  MemberUpdate
-    { mupOtrMute = Just False,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "\DC4]\ENQ",
-      mupOtrArchive = Just True,
-      mupOtrArchiveRef = Just "(\ETX2",
-      mupHidden = Just False,
-      mupHiddenRef = Nothing,
-      mupConvRoleName = Just (fromJust (parseRoleName "kpe3j2ccnryh3awf1gx2sqyxzrihjb4nikgfdmphg9r5gxdl97l1q6a4b5c"))
-    }
-
-testObject_MemberUpdate_user_20 :: MemberUpdate
-testObject_MemberUpdate_user_20 =
-  MemberUpdate
-    { mupOtrMute = Nothing,
-      mupOtrMuteStatus = Nothing,
-      mupOtrMuteRef = Just "",
-      mupOtrArchive = Just False,
-      mupOtrArchiveRef = Just "Z(\1091997",
-      mupHidden = Just True,
-      mupHiddenRef = Nothing,
-      mupConvRoleName = Just (fromJust (parseRoleName "9v_lqtkfm4ohgvnqdj5qyua7hn8l7gcwy05"))
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Member_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Member_user.hs
index 7668dfcfab8..d61739804df 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Member_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Member_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -28,426 +26,37 @@ import Wire.API.Provider.Service (ServiceRef (ServiceRef, _serviceRefId, _servic
 testObject_Member_user_1 :: Member
 testObject_Member_user_1 =
   Member
-    { memId = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))),
+    { memId = Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000")),
       memService =
         Just
           ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
+              { _serviceRefId = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")),
+                _serviceRefProvider = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))
               }
           ),
       memOtrMuted = False,
       memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      memOtrMutedRef = Nothing,
+      memOtrMutedRef = Just "ref",
       memOtrArchived = False,
       memOtrArchivedRef = Just "\140694",
       memHidden = True,
       memHiddenRef = Just "\1032750",
       memConvRoleName =
-        (fromJust (parseRoleName "q4g4_8r4m6hz7hx5ob32nexko2ntb3dmv5vogdmm8dhbwzei6rv45b_90kzg11gw6zsq"))
+        fromJust (parseRoleName "q4g4_8r4m6hz7hx5ob32nexko2ntb3dmv5vogdmm8dhbwzei6rv45b_90kzg11gw6zsq")
     }
 
 testObject_Member_user_2 :: Member
 testObject_Member_user_2 =
   Member
-    { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000002"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-              }
-          ),
-      memOtrMuted = False,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      memOtrMutedRef = Just "",
-      memOtrArchived = True,
-      memOtrArchivedRef = Just "\DEL#\173146",
-      memHidden = True,
-      memHiddenRef = Nothing,
-      memConvRoleName =
-        (fromJust (parseRoleName "cxrqwei1me7ftnrql1p2ew9aj1c5um89xip09ymj6wyj5cqfc4s903yxpv9e5j1j_8744acstc_a"))
-    }
-
-testObject_Member_user_3 :: Member
-testObject_Member_user_3 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000002"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-      memOtrMutedRef = Nothing,
-      memOtrArchived = False,
-      memOtrArchivedRef = Nothing,
-      memHidden = False,
-      memHiddenRef = Nothing,
-      memConvRoleName =
-        (fromJust (parseRoleName "m1h8210wgo2f5tg2jgqqmvb4_p6b8m6ycix5d8ci438oulya_al0mxbks6vhzu777afc5uagd5"))
-    }
-
-testObject_Member_user_4 :: Member
-testObject_Member_user_4 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000002"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      memOtrMutedRef = Nothing,
-      memOtrArchived = False,
-      memOtrArchivedRef = Nothing,
-      memHidden = True,
-      memHiddenRef = Just "{",
-      memConvRoleName = (fromJust (parseRoleName "tg09zlo0p6ubotujq"))
-    }
-
-testObject_Member_user_5 :: Member
-testObject_Member_user_5 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000001"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      memOtrMutedRef = Just "",
-      memOtrArchived = True,
-      memOtrArchivedRef = Just "",
-      memHidden = True,
-      memHiddenRef = Just "\1031068+\CAN",
-      memConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "7y0wbix6igwheorpywk1nm22ox2lr1_p4bna_v31w4gx8vrnlu87j13_z8u7w5x971b3aurv0s_ump5eahxvciig6s1n7x7h2dtnr8vsqd81zarrvbl53litl3_"
-            )
-        )
-    }
-
-testObject_Member_user_6 :: Member
-testObject_Member_user_6 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000001"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Nothing,
-      memOtrMutedRef = Nothing,
-      memOtrArchived = False,
-      memOtrArchivedRef = Just "u?f",
-      memHidden = True,
-      memHiddenRef = Just "\136752",
-      memConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "7txy4uu2tmqtn9h79uyilsvkl932ofr2rr3d9mhy8_kpzctem3qyrqnyjwq1veuijjn3o1z4n5neix0c4ns7pxpyulwz3waxig0nci0d9dy02ed7_guomtgxajx"
-            )
-        )
-    }
-
-testObject_Member_user_7 :: Member
-testObject_Member_user_7 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-              }
-          ),
-      memOtrMuted = False,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-      memOtrMutedRef = Just "",
-      memOtrArchived = False,
-      memOtrArchivedRef = Just "",
-      memHidden = True,
-      memHiddenRef = Nothing,
-      memConvRoleName = (fromJust (parseRoleName "pv2oqq4__gmhtskkv9e4digue3d2is3wf1cp1sd4"))
-    }
-
-testObject_Member_user_8 :: Member
-testObject_Member_user_8 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Nothing,
-      memOtrMutedRef = Nothing,
-      memOtrArchived = True,
-      memOtrArchivedRef = Just "\998298,\172080",
-      memHidden = False,
-      memHiddenRef = Nothing,
-      memConvRoleName =
-        ( fromJust
-            (parseRoleName "633hv48jp9a2x4803m3wfv4mv1z7r688eo5kg6uh12hqwks5ewl0mvbvzeucg_831oxr0eggar6gp7k6441c5qlrfik")
-        )
-    }
-
-testObject_Member_user_9 :: Member
-testObject_Member_user_9 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000000"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-      memOtrMutedRef = Just "\\?",
-      memOtrArchived = True,
-      memOtrArchivedRef = Just ".",
-      memHidden = True,
-      memHiddenRef = Just "",
-      memConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "88txfajsznilzfsvr3a6lax5v2o_4f9q0utm29al2x45271loig1gyhcbzrm5hwx0w8lqhc2l4ql4enji8dx7f56zmotyn0rgyabkqd6yhxqjd5up2y"
-            )
-        )
-    }
-
-testObject_Member_user_10 :: Member
-testObject_Member_user_10 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000000"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
-      memOtrMutedRef = Just "\1075676z",
-      memOtrArchived = True,
-      memOtrArchivedRef = Nothing,
-      memHidden = False,
-      memHiddenRef = Nothing,
-      memConvRoleName = (fromJust (parseRoleName "8_k_cle199r7m2w7mvtc3tu55ycm5qnnxjs7buzjjyaydrhi"))
-    }
-
-testObject_Member_user_11 :: Member
-testObject_Member_user_11 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000001"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Nothing,
-      memOtrMutedRef = Just "",
-      memOtrArchived = False,
-      memOtrArchivedRef = Just "\165862\EOT",
-      memHidden = False,
-      memHiddenRef = Just "-]\158933",
-      memConvRoleName = (fromJust (parseRoleName "gsg85grqngzal1y4ptw9qjadg67sv4uileboe_gle521hybeht"))
-    }
-
-testObject_Member_user_12 :: Member
-testObject_Member_user_12 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))),
+    { memId = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000002")),
       memService = Nothing,
       memOtrMuted = False,
       memOtrMutedStatus = Nothing,
-      memOtrMutedRef = Just "R",
-      memOtrArchived = False,
-      memOtrArchivedRef = Just "\DC2\tn",
-      memHidden = False,
-      memHiddenRef = Nothing,
-      memConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "1bgt0uzs1sao2otf76egq864wn0sj0wxlj_bdak6a6adkpfiphoihxs3q55ao66w0_07yavk5kfxiazxbo2caba6pzuqfl2ce_dhgj3dc0nkcyasw0weid__v1ycd"
-            )
-        )
-    }
-
-testObject_Member_user_13 :: Member
-testObject_Member_user_13 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-      memService = Nothing,
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-      memOtrMutedRef = Nothing,
-      memOtrArchived = False,
-      memOtrArchivedRef = Nothing,
-      memHidden = False,
-      memHiddenRef = Just "",
-      memConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "i_tncpnct2bq0zc2588w6rp_nzcc9bdp4y9o47b6nix_lxv9bnqqms308ta2_edqnmgkk8o3wgs44s47q9g5nv2u9122pl675lljzpxx65"
-            )
-        )
-    }
-
-testObject_Member_user_14 :: Member
-testObject_Member_user_14 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Nothing,
-      memOtrMutedRef = Just "*&",
-      memOtrArchived = False,
-      memOtrArchivedRef = Just "Iv",
-      memHidden = True,
-      memHiddenRef = Just "\"",
-      memConvRoleName =
-        (fromJust (parseRoleName "uuttutvr4y5qhlbn1u94e0u74zei_zilbp9bk5is3cvkqywo1cmmb6heqodku7poq2_y"))
-    }
-
-testObject_Member_user_15 :: Member
-testObject_Member_user_15 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000002"))),
-      memService = Nothing,
-      memOtrMuted = True,
-      memOtrMutedStatus = Nothing,
-      memOtrMutedRef = Nothing,
-      memOtrArchived = True,
-      memOtrArchivedRef = Nothing,
-      memHidden = False,
-      memHiddenRef = Just "\NUL^",
-      memConvRoleName = (fromJust (parseRoleName "480poa1dpixu9xztve6ybatlhmevixphxvay9cw"))
-    }
-
-testObject_Member_user_16 :: Member
-testObject_Member_user_16 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000001"))),
-      memService = Nothing,
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 1}),
       memOtrMutedRef = Nothing,
       memOtrArchived = True,
       memOtrArchivedRef = Nothing,
       memHidden = True,
       memHiddenRef = Nothing,
       memConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "n_ka0q5qzafpovvvcrpmjctgwp45pfampamwcyry615ffkldjfzdf_jhuf7m0vb2n9mk90r3krdcqkeutj21_89wqelz0mx7o63cf195cjtqaoi"
-            )
-        )
-    }
-
-testObject_Member_user_17 :: Member
-testObject_Member_user_17 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000001"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = 0}),
-      memOtrMutedRef = Just "x\25043",
-      memOtrArchived = False,
-      memOtrArchivedRef = Nothing,
-      memHidden = True,
-      memHiddenRef = Just "/+\DC1",
-      memConvRoleName = (fromJust (parseRoleName "2sknhz0oe74sqrgglg5d"))
-    }
-
-testObject_Member_user_18 :: Member
-testObject_Member_user_18 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001"))),
-      memService = Nothing,
-      memOtrMuted = False,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
-      memOtrMutedRef = Just "-`",
-      memOtrArchived = False,
-      memOtrArchivedRef = Nothing,
-      memHidden = True,
-      memHiddenRef = Just "",
-      memConvRoleName = (fromJust (parseRoleName "yx997merbgjglzysg93xqhhz6jxs9god5a"))
-    }
-
-testObject_Member_user_19 :: Member
-testObject_Member_user_19 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000002"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      memOtrMutedRef = Just "@c",
-      memOtrArchived = True,
-      memOtrArchivedRef = Just "~}",
-      memHidden = True,
-      memHiddenRef = Just "",
-      memConvRoleName = (fromJust (parseRoleName "chucv55xke4fmjd9hsptz_5_5_z17ted3ugpzobp986y6won8kmmdublh"))
-    }
-
-testObject_Member_user_20 :: Member
-testObject_Member_user_20 =
-  Member
-    { memId = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))),
-      memService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-              }
-          ),
-      memOtrMuted = True,
-      memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -2}),
-      memOtrMutedRef = Just ",\67228",
-      memOtrArchived = False,
-      memOtrArchivedRef = Just "'",
-      memHidden = False,
-      memHiddenRef = Just "q",
-      memConvRoleName = (fromJust (parseRoleName "s8egh5lk5tru_qwecadtn4frf9lhgpv1yqj4ptdrbfgt6fhc4f6h54nheqialc"))
+        fromJust (parseRoleName "cxrqwei1me7ftnrql1p2ew9aj1c5um89xip09ymj6wyj5cqfc4s903yxpv9e5j1j_8744acstc_a")
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Message_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Message_user.hs
index 125417d552b..38dc1bac6b9 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Message_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Message_user.hs
@@ -40,111 +40,3 @@ testObject_Message_user_3 =
     { messageText =
         "\RSq}\NAK\1020676b:w0_\NUL\DC1\66497n\1070477n\19680\1001317\bs[\180332j\986299=H?3Ws\1002277_\SUB\167806M\DELFlri\DC3\NAKT\DC3%'E\ENQ\134278\&7'K\ETB6<4C\SYNzw\1054575u\1052178\NUL\1047548\&95\1095217\139682j\1076207\18110EZ\38671\162883\v:\SI1t-\40007\EMk\ETB_\165311\999923\&16Fl\rI\RSj\991543\STXn\1041967\RSc\120956\a\1052357\ETX\v\22919\78671V\39956-V\191062\DLET\DLE5!\1016332=?D3u&RU\38178C\1037700\EM &SD\166742\132151#\1047332\STX\SOFl\DC3[Y\DEL\DC2Bf\1097273\131372\SI\44149Z\1089260tD!y3\18316\190694;>\1039399n\985064\179479l`d\b7\994265\65240\47074,8\EOT~\RSA\160680\1019516\145254\b]\ETXf\137307\&3n\DC4\54201.99\1095863\&5\n9OqXR[`\68143\155801\994937\33341k\CAN\1057827\&1PK"
     }
-
-testObject_Message_user_4 :: Message
-testObject_Message_user_4 =
-  Message
-    { messageText =
-        "\a9'\64855o[\17446\EOT\97988I\24155\1030005\1018004\EOT\1064942bBl\1068366AR6R\1096046\ETB\SOH\SOHM\r\1062057\US~\181261`\21707"
-    }
-
-testObject_Message_user_5 :: Message
-testObject_Message_user_5 = Message {messageText = "\162563]\GSY\173546\t\44676v)\SOH\EM'{{U"}
-
-testObject_Message_user_6 :: Message
-testObject_Message_user_6 =
-  Message
-    { messageText = ":\ACK\ACK\ACK\1101689([/\74795\135097\1023268vHH\n2:=Bp{!)\\\nw\120665R\r6x,\691\131525\1080174"
-    }
-
-testObject_Message_user_7 :: Message
-testObject_Message_user_7 =
-  Message
-    { messageText =
-        "sd`\1627\57889\1661\62882ph\\z\1016704\1067167\DC3\1026742J\EOT\CAN\21324Ghc&\1089132\DEL4`[|\DC43\DC24\57455\&2R\1061035U\EM\12474\1087552\1036568P\121478%\62701\ESC#\178039\1038770\1020895dnFv6\1093071\1087920<@\ACK\136884\&1\59652\r\152223\50481}5\"\97414[~\DEL^a\1111256\\#\22822\1042872YB\173208VT;\DELa.\v2\1095545C\1036713#\CAN\1016RRRb\986312J\161032\998570\RS\1052735\1038163Y\1073740uG\1026487Y\ETX;\25341v\1003444\986792\&1\1042828\1052465K\69934*\v\1038530\SOHP\1070850\1107585\167139w\143416'Z\FS1V\1007978n5J\DC13IT\SYN\94264\29455\DC3{r8\59100~\NAKvA\b\ETX>w\tU\131672\SI\1083225|\DC1\r\\\DLELD|W\r\1021987Ai9\US\ETX$M\EM\RS\36890D\120891J\996679Ds\1010077"
-    }
-
-testObject_Message_user_8 :: Message
-testObject_Message_user_8 =
-  Message
-    { messageText =
-        "\64880\ENQMO)\r2\US\1050149\DC2\1006559-8:<\STXAgzo\DEL[\t\CANi;\ETB&y\57996\NAKk6/\1111337^\1107271%h^\1051958\1097509\1056861\994170\DEL\135704@WZ\1051672\&0dnA5\CAN\ACK\CAN\1024678\98766\v\1020631\DEL\FS\143296M]g\1050501q@\184632~\110593:16_2\170159I\f\148639\9955\aB\147209\120356\1113588R\180354)\57680\1023806;S`6\164250x|kQ)\95688?\5726K\CANv\1024312-6b7D\v3?sH\DC4`/};\a\1035457Rakt\6312M-)\DLE\SYNN\ETBX\a\FSy8L!\1022938K?oW\STX\1060724\r\5193(J\178868R?\tF>\120162\ftjtYU\r37=L6B\1070152O\190039\ENQx\66228z{\nB8\16460f\SOH@S\bL\74816\187203\182754\161348x\136712\177019)\GS{c\DC1,\SO\69223v1QAv\DLE"
-    }
-
-testObject_Message_user_9 :: Message
-testObject_Message_user_9 =
-  Message
-    { messageText =
-        "/\rgPb[\1001933P\SYNX5|\a\DC3J\131199v\SO\ETB\15221{ky\166060\23546\1108833@H[;\59300T\1012615\nt`U\163356\1016964\1014679\GS8\35725si3\180405'\SO\SI\49779H\DELo/T0Kr/3\31480\1096688Jj\1106161V \SOHN_X\164383\1036414iN\EOT\42022\CAN\1066437\155369\"\184109u.VT\1074249m;k\44040\1070971{iz]bGO}3\ETX\92658,T\1084867\ETX\DC1$^\ETX,@J\f\1018391\5272=R\1023205\1110110\161211\1062422\EM<:z(\DLE=\EME: `\DEL%oM\15251Qy!\992561\US=\1012539%&\EM~2&[\ACK+\a\30401\n\STXo\DC2\8288s\95711\rEj\ESC\FS<h\169614p\SO\NUL\ETXMj\25753'<Z\27200\1065313hoU\\9n\r\135346"
-    }
-
-testObject_Message_user_10 :: Message
-testObject_Message_user_10 =
-  Message
-    { messageText =
-        "#IoH\DC3aAiKYB[\1078939XY-4'M5\r\n\SITkn\SO\1108995\1043115\129459\98660t\1008138|_XG\CANb\STX!\1032817-\1092277\1016276F\77926v{.\1002893w6/c\47927I!zS\DC1\1030842\&8S\1000804\1096483\&86\1110714ly\1001692\59294hKP`r+*\1058051\1016247O88$\995582\1067723\1010909_\ETB\52376byR\r\DC2C[U\FS\US\14561fvvF=\1059043iH\SOH`rk\149609(\1112282\176824\1048014+\15841\t\14903z}\USo\98783@\1095230\US[\183576{@z\28662\t\917856`"
-    }
-
-testObject_Message_user_11 :: Message
-testObject_Message_user_11 =
-  Message
-    { messageText =
-        "\SIw\EOTb\STXA8\1066459P\1111010\CAN,\139701+\96589qs9&\t,vv\SUB\FSE\94443@\1088532e\US\SUBu\182568w4\tws\83384U/1nm_9\78697kO\EOT\SOqx\996098aqH}e\60337\185820my\USIf\63606J\132459oK\fw\1004021\EOT\USt"
-    }
-
-testObject_Message_user_12 :: Message
-testObject_Message_user_12 =
-  Message
-    { messageText =
-        "\1048013AC8\US\rQ\b\985912\1027997\&0\t\1093537\95464e8\DC1\DC4u\1057230XE#\1025753\1058472\GS\135631\1050934Ec_\GS\179900I2q\EM\RS\US\DC4$\STX#\157262h\ENQ~\GS\157418\4142\1074920:`Y\1037123\54516|\14881\1022132\1049093\188207)b\1071741\DC2x\DC3I\ETX\DC4\SUB\16385\1044477O=\b\NUL\187504\1089818\EMK7\98033c\2690\992089\DC3b\a\34717\141515X(-$\1010816\&2FP\166012\ACK\bz\8189\168082\&83\34162glG\183601T~3-`O\1035873\fX\36773\&8\141406Rf2\157619\1057781"
-    }
-
-testObject_Message_user_13 :: Message
-testObject_Message_user_13 =
-  Message
-    { messageText =
-        "\149320z<\83474P:Q^\991118\&6V\1025965\984907q'm|\NULk\STX1,\1002382e\a`)%\42350zKfq\ESC`'\STX\SOHQ0\1014783\ETXh\ETB\134197\1040942&>jizg\986105\998191\ESCZTX\169183y"
-    }
-
-testObject_Message_user_14 :: Message
-testObject_Message_user_14 =
-  Message
-    { messageText =
-        "\1015519\NAKAdc\"\ENQf`!GtF\"l7m\DC2 sCo\10432)\141606w\txk')y/7=\1015337\ETB}\STX\DEL\174098\144528Z\ACK\voR\USs[/>k1\1059408=\\\1057620\135710AB\NUL\EOT\156941\SOH|U&M^\DC3"
-    }
-
-testObject_Message_user_15 :: Message
-testObject_Message_user_15 =
-  Message {messageText = "Dq#[\68008\SO\ETB\38199\42528o\CANGl\990799;.90|\NAK\ESC.AG7|\18985\t\ETB\177417w"}
-
-testObject_Message_user_16 :: Message
-testObject_Message_user_16 =
-  Message
-    { messageText =
-        "\SO%C3\11810#P\SO\149769TV\68413\1028646R-m\NAK5Y\43547h\ETXL\1025759\153647F\aULA\ESC\6722$\998658+_]2\1062048\21530qs\US\FS]Ey^#"
-    }
-
-testObject_Message_user_17 :: Message
-testObject_Message_user_17 =
-  Message
-    { messageText =
-        "{[\GS\187144\DC1\199W\46278'\b\1022322y j\ACK:K&L',\n\1065589\&1n7\1111544x\120849$\ETXop\DLE@u\al`\RS\6616\&3k-\181986\ETXM\1082668\GS\42387\STXaqVwTdD\SYNl\ACK>5}\SYNw\1034271\n0\a\1024727\EOT_\50137\&7\DC2ug\1075783$\1067079}\161804t\432\&0\ETX&IO?"
-    }
-
-testObject_Message_user_18 :: Message
-testObject_Message_user_18 =
-  Message
-    { messageText =
-        "?3\ETXK8R\1092400\989695w 4\nyB\ENQ\SUBdqx\b9B\SYNn\NULE\1054198SJI'.\61292v\NUL`m&1;\rE/\1079082'xAOos0\13050FiB\1073617s\NUL\1109321\EM71\SOH#\"QC8^B\987884D6\992533\a\ACK?\a\ACKQ,^\47475\1029733\8832%\188618a\EOTl|\162352ZT\DC3][\EM\\T\DC3\GSz\DELE\a\1111355\SOH\33429-G\31716\1100033t\v\ETXxWX_`\7262\r\1065342SZ\160800o1m\28130,\47184\&4lU\161354.7QTj\SO:lYdQ\RSW8\SOH\71062%JB\ENQt\98448\&5\997214C\f\1099409o\1061345\163004D\166424\DC2c@\159300\1027434\STX&\1076288 0\ENQo8+%\f\998899\b-\STXu\t\1081547\RS\ESC\ESC#\a}~R\7496sfA\DC1wYV"
-    }
-
-testObject_Message_user_19 :: Message
-testObject_Message_user_19 =
-  Message {messageText = "\DEL\182356_\27186+<\33199h,z\45996a}\1050255?e\EOT\1090297\&2_\SO"}
-
-testObject_Message_user_20 :: Message
-testObject_Message_user_20 =
-  Message
-    { messageText =
-        "m\94425\1048388\1102851h\DEL\52022A@\1075836\185702\&6\ETXMI\83379\1036649\&6\1074657z\61502\148102\143066\1074752<\USZ\NAKlG\DC3\1028601L\36869H\4099\GSV))\b\v|f\63027J\40005\34859\44771\\\185058\142303dC\178665~\"+X\1078146cH\FS\1032045\23324\168822K5\21034\&9\aP8o/\SI\160642u\985569pL\1003670\&8\120094\6940\&2t]\47563i ~\DLE4\f\167195\1058741d \DC2x[\DELXI'\175547D\1090092m&\DC1\EM\f<\1063342\74183\ENQ\1078042x7\FS\1098329s\ETB\1009522U>\ENQ\ETX\DC4g\1054210\&4\1021131\1070566Z\119141\162019"
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MutedStatus_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MutedStatus_user.hs
index 9422e70c283..3b76a797da0 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MutedStatus_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/MutedStatus_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,60 +20,3 @@ import Wire.API.Conversation (MutedStatus (..))
 
 testObject_MutedStatus_user_1 :: MutedStatus
 testObject_MutedStatus_user_1 = MutedStatus {fromMutedStatus = 1253}
-
-testObject_MutedStatus_user_2 :: MutedStatus
-testObject_MutedStatus_user_2 = MutedStatus {fromMutedStatus = 9035}
-
-testObject_MutedStatus_user_3 :: MutedStatus
-testObject_MutedStatus_user_3 = MutedStatus {fromMutedStatus = -24612}
-
-testObject_MutedStatus_user_4 :: MutedStatus
-testObject_MutedStatus_user_4 = MutedStatus {fromMutedStatus = 6636}
-
-testObject_MutedStatus_user_5 :: MutedStatus
-testObject_MutedStatus_user_5 = MutedStatus {fromMutedStatus = -12374}
-
-testObject_MutedStatus_user_6 :: MutedStatus
-testObject_MutedStatus_user_6 = MutedStatus {fromMutedStatus = 25260}
-
-testObject_MutedStatus_user_7 :: MutedStatus
-testObject_MutedStatus_user_7 = MutedStatus {fromMutedStatus = 6794}
-
-testObject_MutedStatus_user_8 :: MutedStatus
-testObject_MutedStatus_user_8 = MutedStatus {fromMutedStatus = -19696}
-
-testObject_MutedStatus_user_9 :: MutedStatus
-testObject_MutedStatus_user_9 = MutedStatus {fromMutedStatus = 12687}
-
-testObject_MutedStatus_user_10 :: MutedStatus
-testObject_MutedStatus_user_10 = MutedStatus {fromMutedStatus = 28180}
-
-testObject_MutedStatus_user_11 :: MutedStatus
-testObject_MutedStatus_user_11 = MutedStatus {fromMutedStatus = -6911}
-
-testObject_MutedStatus_user_12 :: MutedStatus
-testObject_MutedStatus_user_12 = MutedStatus {fromMutedStatus = 2429}
-
-testObject_MutedStatus_user_13 :: MutedStatus
-testObject_MutedStatus_user_13 = MutedStatus {fromMutedStatus = 17666}
-
-testObject_MutedStatus_user_14 :: MutedStatus
-testObject_MutedStatus_user_14 = MutedStatus {fromMutedStatus = 1746}
-
-testObject_MutedStatus_user_15 :: MutedStatus
-testObject_MutedStatus_user_15 = MutedStatus {fromMutedStatus = -20368}
-
-testObject_MutedStatus_user_16 :: MutedStatus
-testObject_MutedStatus_user_16 = MutedStatus {fromMutedStatus = -10239}
-
-testObject_MutedStatus_user_17 :: MutedStatus
-testObject_MutedStatus_user_17 = MutedStatus {fromMutedStatus = -15731}
-
-testObject_MutedStatus_user_18 :: MutedStatus
-testObject_MutedStatus_user_18 = MutedStatus {fromMutedStatus = 12196}
-
-testObject_MutedStatus_user_19 :: MutedStatus
-testObject_MutedStatus_user_19 = MutedStatus {fromMutedStatus = -25051}
-
-testObject_MutedStatus_user_20 :: MutedStatus
-testObject_MutedStatus_user_20 = MutedStatus {fromMutedStatus = 15169}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewAssetToken_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewAssetToken_user.hs
index ac1422380ce..663b080c890 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewAssetToken_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewAssetToken_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,110 +20,22 @@ import Data.Text.Ascii (AsciiChars (validate))
 import Imports (fromRight, undefined)
 import Wire.API.Asset (AssetToken (AssetToken, assetTokenAscii), NewAssetToken (..))
 
-testObject_NewAssetToken_user_1 :: NewAssetToken
-testObject_NewAssetToken_user_1 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("UA==")))}}
-
-testObject_NewAssetToken_user_2 :: NewAssetToken
-testObject_NewAssetToken_user_2 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("wuuPeUF7oYEUKw==")))}}
-
 testObject_NewAssetToken_user_3 :: NewAssetToken
 testObject_NewAssetToken_user_3 =
   NewAssetToken
     { newAssetToken =
-        AssetToken {assetTokenAscii = (fromRight undefined (validate ("v6nnEvDMoXZfLJMZyS_Bg9daSGCLnG9Tgw==")))}
-    }
-
-testObject_NewAssetToken_user_4 :: NewAssetToken
-testObject_NewAssetToken_user_4 =
-  NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("ky_0rWp9LyUWLpEv6w==")))}
+        AssetToken {assetTokenAscii = fromRight undefined (validate "v6nnEvDMoXZfLJMZyS_Bg9daSGCLnG9Tgw==")}
     }
 
-testObject_NewAssetToken_user_5 :: NewAssetToken
-testObject_NewAssetToken_user_5 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("lj_qxU25")))}}
-
 testObject_NewAssetToken_user_6 :: NewAssetToken
 testObject_NewAssetToken_user_6 =
   NewAssetToken
     { newAssetToken =
-        AssetToken {assetTokenAscii = (fromRight undefined (validate ("jtgylSRb-AxTo1u8M5kEKPJ7RbzGf3c=")))}
-    }
-
-testObject_NewAssetToken_user_7 :: NewAssetToken
-testObject_NewAssetToken_user_7 =
-  NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("SA-0KrUJ4vTU_2unt4Were4=")))}
+        AssetToken {assetTokenAscii = fromRight undefined (validate "jtgylSRb-AxTo1u8M5kEKPJ7RbzGf3c=")}
     }
 
-testObject_NewAssetToken_user_8 :: NewAssetToken
-testObject_NewAssetToken_user_8 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("ngRLg3A=")))}}
-
 testObject_NewAssetToken_user_9 :: NewAssetToken
 testObject_NewAssetToken_user_9 =
   NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("i4dAbdQ3A9zQE5txWTo3q-nYIhZ1")))}
-    }
-
-testObject_NewAssetToken_user_10 :: NewAssetToken
-testObject_NewAssetToken_user_10 =
-  NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("cLivtzwlgaeVDAj1aacBxYDSYLLh")))}
-    }
-
-testObject_NewAssetToken_user_11 :: NewAssetToken
-testObject_NewAssetToken_user_11 =
-  NewAssetToken
-    { newAssetToken =
-        AssetToken {assetTokenAscii = (fromRight undefined (validate ("iFdUY8N-N59PLQOhnkn5U60uXSn2AA==")))}
-    }
-
-testObject_NewAssetToken_user_12 :: NewAssetToken
-testObject_NewAssetToken_user_12 =
-  NewAssetToken
-    { newAssetToken =
-        AssetToken {assetTokenAscii = (fromRight undefined (validate ("5FtPMSqyrYPSOq7N7NjRV2EG4uyHsEW9umY=")))}
-    }
-
-testObject_NewAssetToken_user_13 :: NewAssetToken
-testObject_NewAssetToken_user_13 =
-  NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("_VEzujt5aPMEg0zSuyr3Pw9EL0M=")))}
-    }
-
-testObject_NewAssetToken_user_14 :: NewAssetToken
-testObject_NewAssetToken_user_14 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("Njs=")))}}
-
-testObject_NewAssetToken_user_15 :: NewAssetToken
-testObject_NewAssetToken_user_15 =
-  NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("6fzGVyvWLV0431_2a24-mq4=")))}
-    }
-
-testObject_NewAssetToken_user_16 :: NewAssetToken
-testObject_NewAssetToken_user_16 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("a52glGETB5abd7w=")))}}
-
-testObject_NewAssetToken_user_17 :: NewAssetToken
-testObject_NewAssetToken_user_17 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("kMuOGA==")))}}
-
-testObject_NewAssetToken_user_18 :: NewAssetToken
-testObject_NewAssetToken_user_18 =
-  NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("TwwN62QO_1fMjhOtigvXdEM=")))}
-    }
-
-testObject_NewAssetToken_user_19 :: NewAssetToken
-testObject_NewAssetToken_user_19 =
-  NewAssetToken {newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("zRA=")))}}
-
-testObject_NewAssetToken_user_20 :: NewAssetToken
-testObject_NewAssetToken_user_20 =
-  NewAssetToken
-    { newAssetToken = AssetToken {assetTokenAscii = (fromRight undefined (validate ("agX_DLjnHLYM3WC4iVQ=")))}
+    { newAssetToken = AssetToken {assetTokenAscii = fromRight undefined (validate "i4dAbdQ3A9zQE5txWTo3q-nYIhZ1")}
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvManaged_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvManaged_user.hs
index 8711efb108f..b13be02b2b7 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvManaged_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvManaged_user.hs
@@ -21,18 +21,11 @@ module Test.Wire.API.Golden.Generated.NewConvManaged_user where
 import Data.Domain
 import Data.Id (Id (Id))
 import Data.Misc (Milliseconds (Ms, ms))
-import Data.Qualified
 import qualified Data.Set as Set (fromList)
 import qualified Data.UUID as UUID (fromString)
 import Imports (Bool (True), Maybe (Just, Nothing), fromJust)
 import Wire.API.Conversation
-  ( Access (CodeAccess, InviteAccess, LinkAccess, PrivateAccess),
-    AccessRole
-      ( ActivatedAccessRole,
-        NonActivatedAccessRole,
-        PrivateAccessRole,
-        TeamAccessRole
-      ),
+  ( AccessRole (ActivatedAccessRole),
     ConvTeamInfo (ConvTeamInfo, cnvManaged, cnvTeamId),
     NewConv
       ( NewConv,
@@ -66,524 +59,12 @@ testObject_NewConvManaged_user_1 =
           newConvTeam =
             Just
               ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000"))),
+                  { cnvTeamId = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000000")),
                     cnvManaged = True
                   }
               ),
           newConvMessageTimer = Just (Ms {ms = 193643728192048}),
           newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 4}),
-          newConvUsersRole = (fromJust (parseRoleName "37q9eeybycp5972td4oo9_r7y16eh6n67z5spda8sffy8qv"))
-        }
-    )
-
-testObject_NewConvManaged_user_2 :: NewConvManaged
-testObject_NewConvManaged_user_2 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [(Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000400000000")))],
-          newConvQualifiedUsers = [Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) testDomain],
-          newConvName = Just "\995491\SUB5",
-          newConvAccess = Set.fromList [PrivateAccess, InviteAccess, LinkAccess],
-          newConvAccessRole = Just NonActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000002"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 5509522199847054}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole = (fromJust (parseRoleName "bewzponl1a3c_l6ou"))
-        }
-    )
-
-testObject_NewConvManaged_user_3 :: NewConvManaged
-testObject_NewConvManaged_user_3 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            ],
-          newConvQualifiedUsers = [Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) testDomain],
-          newConvName = Just "NwK",
-          newConvAccess = Set.fromList [CodeAccess],
-          newConvAccessRole = Just TeamAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 582808797322573}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 2}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "kbqqptmp0tna583vobrgtadyismkkpnjdwsef9jlgvezy00yu5u2rds0ng11vppapcn9n7enwrg7tkwxvg1mz_rh7pcoi_btpcyg5akueydofop60j"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_4 :: NewConvManaged
-testObject_NewConvManaged_user_4 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "k\61561-",
-          newConvAccess = Set.fromList [PrivateAccess, LinkAccess],
-          newConvAccessRole = Just TeamAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Nothing,
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "pa5z_izggck3l0sn9qc_yx06bwh_k1vf2drs3c8w35wyqwl3tco54d7lvnbh3udjzs8avs0j1dxr7v40ldpqgy4lszpnxx3f0hpy_37ofx30s9oa9t"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_5 :: NewConvManaged
-testObject_NewConvManaged_user_5 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "v",
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 1570858821505994}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -1}),
-          newConvUsersRole = (fromJust (parseRoleName "mqkbqyi796z05v6jj4ijc7nl5unid6eq1t028pp9awv2_8bc61wq0zl"))
-        }
-    )
-
-testObject_NewConvManaged_user_6 :: NewConvManaged
-testObject_NewConvManaged_user_6 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "P\1098873\r",
-          newConvAccess = Set.fromList [InviteAccess, CodeAccess],
-          newConvAccessRole = Just PrivateAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 6614365418177275}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "gf5j3kqv7_6g55q6clu47jn2iq5yy_zvnm2753m2llu04bhb5ct_v53u7kmwdesgs832yylb_v5eddllgbostkjj7qwv7"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_7 :: NewConvManaged
-testObject_NewConvManaged_user_7 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\CAN",
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 7417375067718994}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 0}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "ce4ylezzp_1s9b3xbw7akybntwbaa21p8ijqsk53ymljzx_kubjl4tjvrdwb8jjm21cznytrtaffnemverdd39vqvbfxn_pl_"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_8 :: NewConvManaged
-testObject_NewConvManaged_user_8 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "&",
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 2}),
-          newConvUsersRole = (fromJust (parseRoleName "ms6f79wv82ftbu608wl9jeu8xatyhb1p1ck5t9yht9xqjcldet9kj6gp4b"))
-        }
-    )
-
-testObject_NewConvManaged_user_9 :: NewConvManaged
-testObject_NewConvManaged_user_9 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Nothing,
-          newConvAccess = Set.fromList [PrivateAccess, InviteAccess, LinkAccess],
-          newConvAccessRole = Just NonActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 2550845209410146}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 1}),
-          newConvUsersRole = (fromJust (parseRoleName "yd"))
-        }
-    )
-
-testObject_NewConvManaged_user_10 :: NewConvManaged
-testObject_NewConvManaged_user_10 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [(Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))],
-          newConvQualifiedUsers = [],
-          newConvName = Just "z\1112901",
-          newConvAccess = Set.fromList [LinkAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 8061252799624904}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 1}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "vakyrex99a9vi36iemc7wj4gu39s4wf30c2r_mqatgyer4y4dzypd_y7x3i9embufwc6e4nfuqvuvu9p72r8xdnmho615wrlkcr1h4e8tnokdio9t"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_11 :: NewConvManaged
-testObject_NewConvManaged_user_11 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "r",
-          newConvAccess = Set.fromList [InviteAccess],
-          newConvAccessRole = Just NonActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 6292627004994884}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -2}),
-          newConvUsersRole = (fromJust (parseRoleName "z5r2jhv40n91iwidhdui7jaa6i"))
-        }
-    )
-
-testObject_NewConvManaged_user_12 :: NewConvManaged
-testObject_NewConvManaged_user_12 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [PrivateAccess, CodeAccess],
-          newConvAccessRole = Just TeamAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 7043412511612101}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "4ek91n56al0j6mc3ovtreftmizb2qoh05m_zozgr6ar1vorbh2gdx3b72gm_q65h815zuy_2qehwf9t20l3mabd53813168ccg"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_13 :: NewConvManaged
-testObject_NewConvManaged_user_13 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\tB",
-          newConvAccess = Set.fromList [PrivateAccess, InviteAccess, LinkAccess],
-          newConvAccessRole = Just NonActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 0}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "220zl1nunhfwpvjm85iz_ixp98rq1dlwnqp7s18efvnonl6skfzkqvkxanemogf7ok3q29y5jzd4prt6s6ybl0ko47iu_zux5x7"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_14 :: NewConvManaged
-testObject_NewConvManaged_user_14 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [CodeAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 8669416711689656}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole = (fromJust (parseRoleName "d1t6fg7c_ksqcoe6e308n2xblhwg8m7ahrnia88at1"))
-        }
-    )
-
-testObject_NewConvManaged_user_15 :: NewConvManaged
-testObject_NewConvManaged_user_15 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Nothing,
-          newConvAccess = Set.fromList [PrivateAccess, CodeAccess],
-          newConvAccessRole = Just NonActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 1166285470102499}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 2}),
-          newConvUsersRole = (fromJust (parseRoleName "5uxmr3gdwwipozxh"))
-        }
-    )
-
-testObject_NewConvManaged_user_16 :: NewConvManaged
-testObject_NewConvManaged_user_16 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [InviteAccess, CodeAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 4425819976591162}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "dc5k1w34ghjhorv48fy8f3_ya4n8sq1vrr7oojpht2_tbfviuu9i43aaxgpce744vxs6ikex7q35mv17svnwotre29fm"
-                )
-            )
-        }
-    )
-
-testObject_NewConvManaged_user_17 :: NewConvManaged
-testObject_NewConvManaged_user_17 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [LinkAccess],
-          newConvAccessRole = Just TeamAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 5065871950676797}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole = (fromJust (parseRoleName "faa_2g09yehf26736w2p59cuw_giwelkq2d_y4q5sj49n9"))
-        }
-    )
-
-testObject_NewConvManaged_user_18 :: NewConvManaged
-testObject_NewConvManaged_user_18 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\36412\tJ",
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -1}),
-          newConvUsersRole = (fromJust (parseRoleName "e9_exzeqnr163dd14s7van73vd_9lth079onlldtkmk"))
-        }
-    )
-
-testObject_NewConvManaged_user_19 :: NewConvManaged
-testObject_NewConvManaged_user_19 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers = [(Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000400000002")))],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [PrivateAccess],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 8428756728484885}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole =
-            (fromJust (parseRoleName "x2g84s2bn8uq_i6yizofg4xx9yvbseuw53u8oafwx5cwn26i5xl2ojio90cwv2kz0pl9p6hfrogrp"))
-        }
-    )
-
-testObject_NewConvManaged_user_20 :: NewConvManaged
-testObject_NewConvManaged_user_20 =
-  NewConvManaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\SOH?(",
-          newConvAccess = Set.fromList [PrivateAccess, InviteAccess],
-          newConvAccessRole = Just NonActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    cnvManaged = True
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 6168723896440273}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole = (fromJust (parseRoleName "url0_7h6wig8d_ro8fwdmuqggbynbdkjshlg_ei8qqu"))
+          newConvUsersRole = fromJust (parseRoleName "37q9eeybycp5972td4oo9_r7y16eh6n67z5spda8sffy8qv")
         }
     )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvUnmanaged_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvUnmanaged_user.hs
index e8a136f219d..354b46f65f6 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvUnmanaged_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewConvUnmanaged_user.hs
@@ -24,14 +24,11 @@ import Data.Misc (Milliseconds (Ms, ms))
 import Data.Qualified (Qualified (Qualified))
 import qualified Data.Set as Set (fromList)
 import qualified Data.UUID as UUID (fromString)
-import Imports (Bool (False), Maybe (Just, Nothing), fromJust)
+import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust)
 import Wire.API.Conversation
   ( Access (CodeAccess, InviteAccess, LinkAccess, PrivateAccess),
     AccessRole
-      ( ActivatedAccessRole,
-        NonActivatedAccessRole,
-        PrivateAccessRole,
-        TeamAccessRole
+      ( ActivatedAccessRole
       ),
     ConvTeamInfo (ConvTeamInfo, cnvManaged, cnvTeamId),
     NewConv
@@ -59,8 +56,8 @@ testObject_NewConvUnmanaged_user_1 =
   NewConvUnmanaged
     ( NewConv
         { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
+            [ Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")),
+              Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))
             ],
           newConvQualifiedUsers = [],
           newConvName = Nothing,
@@ -69,13 +66,13 @@ testObject_NewConvUnmanaged_user_1 =
           newConvTeam =
             Just
               ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
+                  { cnvTeamId = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")),
                     cnvManaged = False
                   }
               ),
           newConvMessageTimer = Just (Ms {ms = 3320987366258987}),
           newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 1}),
-          newConvUsersRole = (fromJust (parseRoleName "8tp2gs7b6"))
+          newConvUsersRole = fromJust (parseRoleName "8tp2gs7b6")
         }
     )
 
@@ -87,22 +84,21 @@ testObject_NewConvUnmanaged_user_2 =
           newConvQualifiedUsers = [Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))) testDomain],
           newConvName = Just "\128527\1061495",
           newConvAccess = Set.fromList [],
-          newConvAccessRole = Just PrivateAccessRole,
+          newConvAccessRole = Nothing,
           newConvTeam =
             Just
               ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                    cnvManaged = False
+                  { cnvTeamId = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")),
+                    cnvManaged = True
                   }
               ),
           newConvMessageTimer = Just (Ms {ms = 2406292360203739}),
           newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -1}),
           newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "vmao7psxph3fenvbpsu1u57fns5pfo53d67k98om378rnxr0crcpak_mpspn8q_3m1b02n2n133s1d7q5w3qgmt_5e_dgtvzon8an7dtauiecd32"
-                )
-            )
+            fromJust
+              ( parseRoleName
+                  "vmao7psxph3fenvbpsu1u57fns5pfo53d67k98om378rnxr0crcpak_mpspn8q_3m1b02n2n133s1d7q5w3qgmt_5e_dgtvzon8an7dtauiecd32"
+              )
         }
     )
 
@@ -112,431 +108,16 @@ testObject_NewConvUnmanaged_user_3 =
     ( NewConv
         { newConvUsers = [],
           newConvQualifiedUsers = [],
-          newConvName = Just "f",
+          newConvName = Nothing,
           newConvAccess = Set.fromList [InviteAccess, LinkAccess, CodeAccess],
           newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 6764297310186120}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 0}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "y3otpiwu615lvvccxsq0315jj75jquw01flhtuf49t6mzfurvwe3_sh51f4s257e2x47zo85rif_xyiyfldpan3g4r6zr35rbwnzm0k"
-                )
-            )
-        }
-    )
-
-testObject_NewConvUnmanaged_user_4 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_4 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\135359\70751z",
-          newConvAccess = Set.fromList [CodeAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -2}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "q7sqqur0wu2xui3uemxhzds4w3edw4yin7cuukmu7d7l9v9dw181q7wugi7q87lzzw405pkphgit2g969hqb4n9kcvm0eg0pems55xdfqyhxbe948vhof"
-                )
-            )
-        }
-    )
-
-testObject_NewConvUnmanaged_user_5 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_5 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "X9",
-          newConvAccess = Set.fromList [InviteAccess, LinkAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Nothing,
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "cr2g48i6xjo49qdm04jig5teset_g6kt14u9az9jj5xhxoic55pown5d_rkw_3mrevrm37fosq08fhlsq8l259aio80f6cio"
-                )
-            )
-        }
-    )
-
-testObject_NewConvUnmanaged_user_6 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_6 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "`3",
-          newConvAccess = Set.fromList [LinkAccess],
-          newConvAccessRole = Just TeamAccessRole,
           newConvTeam = Nothing,
-          newConvMessageTimer = Just (Ms {ms = 3993332602038581}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 2}),
-          newConvUsersRole = (fromJust (parseRoleName "5zlsxm_95e5j1lk04d6rka_1svnnk65pov7tqs"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_7 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_7 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [(Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000400000004")))],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\1038759\b\1057989'",
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 5300164242243961}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -3}),
-          newConvUsersRole = (fromJust (parseRoleName "hdvd1wsqebgfamlgxdaoq7or2__7_dg5xg53v3ur9en91guk"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_8 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_8 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [(Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [InviteAccess],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 5317293791913533}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -1}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "eyywm70536valjr5fwpiodgan70f9bw21os6a9q965y_hpww2hirwfm4lbe6220ltzpb8lifi2kd1q2w4qtq5t6bhzctw27b4k09offys"
-                )
-            )
-        }
-    )
-
-testObject_NewConvUnmanaged_user_9 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_9 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "L",
-          newConvAccess = Set.fromList [PrivateAccess, InviteAccess, LinkAccess],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam = Nothing,
-          newConvMessageTimer = Just (Ms {ms = 7179840365742041}),
-          newConvReceiptMode = Nothing,
-          newConvUsersRole = (fromJust (parseRoleName "n8cjajmyhnw3hqv8sohb8674nwnpsv7g57i2hjhexg9tww"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_10 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_10 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [PrivateAccess, CodeAccess],
-          newConvAccessRole = Just ActivatedAccessRole,
-          newConvTeam = Nothing,
-          newConvMessageTimer = Just (Ms {ms = 5041503034744095}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 2}),
-          newConvUsersRole =
-            ( fromJust
-                (parseRoleName "30mnzwj79jo9ear300qs4k_x2262nyaqxt9qga1_zaqmto43q2935t4dzaan_qnlstgjix7efmqfljkpww2lz")
-            )
-        }
-    )
-
-testObject_NewConvUnmanaged_user_11 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_11 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Nothing,
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 6019134025424754}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 1}),
-          newConvUsersRole = (fromJust (parseRoleName "1ewdfj36vw"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_12 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_12 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just ">+",
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Nothing,
-          newConvTeam = Nothing,
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 1}),
-          newConvUsersRole = (fromJust (parseRoleName "wqhaeljk9zpp5nmspwl"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_13 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_13 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just ".L'",
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 211460552735402}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -2}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "40iudwo9123uutd1ppbq2sd5aybain45r_mdb4caukkc6vvu4xdivyg23jl5vigsbq4q8zm4ua9yly3mxygytnv8wuf9__550amkunox7fpxw03b_y_lm86cahubkq"
-                )
-            )
-        }
-    )
-
-testObject_NewConvUnmanaged_user_14 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_14 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "",
-          newConvAccess = Set.fromList [CodeAccess],
-          newConvAccessRole = Just NonActivatedAccessRole,
-          newConvTeam = Nothing,
-          newConvMessageTimer = Just (Ms {ms = 854777662274030}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -2}),
-          newConvUsersRole = (fromJust (parseRoleName "fga_hfm9uzn_5z883y6r_kumb"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_15 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_15 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [(Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000300000003")))],
-          newConvQualifiedUsers = [],
-          newConvName = Just "b\1008988",
-          newConvAccess = Set.fromList [PrivateAccess, InviteAccess, CodeAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000002"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 4005602882980532}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 1}),
-          newConvUsersRole = (fromJust (parseRoleName "_wje4g3_kcquzyoms0q4cwzz8"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_16 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_16 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "!",
-          newConvAccess = Set.fromList [PrivateAccess, CodeAccess],
-          newConvAccessRole = Just PrivateAccessRole,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Nothing,
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 1}),
-          newConvUsersRole = (fromJust (parseRoleName "04ukg5i2nomsgwiphznmsrk1ou3ukxemisi9g"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_17 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_17 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\ETXB\119338",
-          newConvAccess = Set.fromList [PrivateAccess, LinkAccess, CodeAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam =
-            Just
-              ( ConvTeamInfo
-                  { cnvTeamId = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-                    cnvManaged = False
-                  }
-              ),
-          newConvMessageTimer = Just (Ms {ms = 880163555151907}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = 0}),
-          newConvUsersRole =
-            ( fromJust
-                ( parseRoleName
-                    "88mkdi8ivd_o3150rhc9dc7gyf_246m7xjrqwz7kt9vc7h5sgkuukgorx26y6uo7hj2lfe63pkeyva9tfivn08amsydb_i5vb4xn4870v44y0cwe3uk6sli5kqg"
-                )
-            )
-        }
-    )
-
-testObject_NewConvUnmanaged_user_18 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_18 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers =
-            [ (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            ],
-          newConvQualifiedUsers = [],
-          newConvName = Just "sd\ACK",
-          newConvAccess = Set.fromList [PrivateAccess, CodeAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam = Nothing,
-          newConvMessageTimer = Just (Ms {ms = 3120553871655858}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -2}),
-          newConvUsersRole =
-            (fromJust (parseRoleName "ugehcdyu_ob9_woawlths95ez8cgtb6wjqypp7vbjaooiczerb5zpc6srxszgkrdu8l24ygz_"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_19 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_19 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [(Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000002")))],
-          newConvQualifiedUsers = [],
-          newConvName = Just "Cu\DC1",
-          newConvAccess = Set.fromList [InviteAccess, LinkAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam = Nothing,
-          newConvMessageTimer = Just (Ms {ms = 864918593306344}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -1}),
-          newConvUsersRole =
-            (fromJust (parseRoleName "xik7vc3wp82gw4r934rad_bhmf2orany3qgu_tx9huwfrlxy8m0id71x20uddebps30zdahe_ffcxxhc"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_20 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_20 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [],
-          newConvName = Just "\SI\1070774",
-          newConvAccess = Set.fromList [PrivateAccess],
-          newConvAccessRole = Nothing,
-          newConvTeam = Nothing,
-          newConvMessageTimer = Just (Ms {ms = 3641984282941906}),
-          newConvReceiptMode = Just (ReceiptMode {unReceiptMode = -1}),
-          newConvUsersRole = (fromJust (parseRoleName "udhi2sbf7tzyshrh"))
-        }
-    )
-
-testObject_NewConvUnmanaged_user_21 :: NewConvUnmanaged
-testObject_NewConvUnmanaged_user_21 =
-  NewConvUnmanaged
-    ( NewConv
-        { newConvUsers = [],
-          newConvQualifiedUsers = [Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))) testDomain],
-          newConvName = Nothing,
-          newConvAccess = Set.fromList [],
-          newConvAccessRole = Nothing,
           newConvMessageTimer = Nothing,
           newConvReceiptMode = Nothing,
-          newConvTeam = Nothing,
-          newConvUsersRole = fromJust (parseRoleName "udhi2sbf7tzyshrh")
+          newConvUsersRole =
+            fromJust
+              ( parseRoleName
+                  "y3otpiwu615lvvccxsq0315jj75jquw01flhtuf49t6mzfurvwe3_sh51f4s257e2x47zo85rif_xyiyfldpan3g4r6zr35rbwnzm0k"
+              )
         }
     )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewOtrMessage_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewOtrMessage_user.hs
index 27bef7c419a..797b95adf56 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewOtrMessage_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/NewOtrMessage_user.hs
@@ -18,14 +18,13 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.NewOtrMessage_user where
 
-import Data.Id (ClientId (ClientId, client), Id (Id))
-import qualified Data.UUID as UUID (fromString)
+import Data.Id (ClientId (ClientId, client))
 import GHC.Exts (IsList (fromList))
-import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust)
+import Imports (Bool (False, True), Maybe (Just, Nothing))
 import Wire.API.Message
   ( NewOtrMessage (..),
     OtrRecipients (OtrRecipients, otrRecipientsMap),
-    Priority (HighPriority, LowPriority),
+    Priority (HighPriority),
     UserClientMap (UserClientMap, userClientMap),
   )
 
@@ -43,469 +42,12 @@ testObject_NewOtrMessage_user_1 =
 
 testObject_NewOtrMessage_user_2 :: NewOtrMessage
 testObject_NewOtrMessage_user_2 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "3"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                        ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-                          fromList [(ClientId {client = "1"}, "")]
-                        ),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList [])
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = True,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Just "97",
-      newOtrReportMissing = Nothing
-    }
-
-testObject_NewOtrMessage_user_3 :: NewOtrMessage
-testObject_NewOtrMessage_user_3 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "2"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000004"))),
-                          fromList [(ClientId {client = "0"}, "")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = True,
-      newOtrTransient = True,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Nothing,
-      newOtrReportMissing = Just []
-    }
-
-testObject_NewOtrMessage_user_4 :: NewOtrMessage
-testObject_NewOtrMessage_user_4 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "5"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000300000004"))),
-                          fromList [(ClientId {client = "0"}, "e"), (ClientId {client = "1"}, "")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = True,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Nothing,
-      newOtrReportMissing =
-        Just
-          [ (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-            (Id (fromJust (UUID.fromString "00000004-0000-0001-0000-000100000000")))
-          ]
-    }
-
-testObject_NewOtrMessage_user_5 :: NewOtrMessage
-testObject_NewOtrMessage_user_5 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "6"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000100000002"))),
-                          fromList [(ClientId {client = "2"}, "Y")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = False,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Just "J\1055328",
-      newOtrReportMissing = Nothing
-    }
-
-testObject_NewOtrMessage_user_6 :: NewOtrMessage
-testObject_NewOtrMessage_user_6 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "8"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000000"))),
-                          fromList [(ClientId {client = "0"}, "&")]
-                        ),
-                        ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000001"))),
-                          fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = True,
-      newOtrTransient = False,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Just "-;\1036053L",
-      newOtrReportMissing = Just []
-    }
-
-testObject_NewOtrMessage_user_7 :: NewOtrMessage
-testObject_NewOtrMessage_user_7 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "1"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000000"))),
-                          fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                        ),
-                        ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000002"))),
-                          fromList [(ClientId {client = "0"}, "\ETX")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = True,
-      newOtrTransient = True,
-      newOtrNativePriority = Nothing,
-      newOtrData = Just "",
-      newOtrReportMissing = Just [(Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000300000004")))]
-    }
-
-testObject_NewOtrMessage_user_8 :: NewOtrMessage
-testObject_NewOtrMessage_user_8 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "1"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000001"))),
-                          fromList [(ClientId {client = "1"}, "")]
-                        ),
-                        ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000002"))),
-                          fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = False,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Nothing,
-      newOtrReportMissing = Just []
-    }
-
-testObject_NewOtrMessage_user_9 :: NewOtrMessage
-testObject_NewOtrMessage_user_9 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "0"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))), fromList []),
-                        ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                        ),
-                        ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                          fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = False,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Just "(",
-      newOtrReportMissing = Nothing
-    }
-
-testObject_NewOtrMessage_user_10 :: NewOtrMessage
-testObject_NewOtrMessage_user_10 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "0"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))), fromList []),
-                        ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-                          fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                        ),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))), fromList [])
-                      ]
-                }
-          },
-      newOtrNativePush = True,
-      newOtrTransient = True,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Just "",
-      newOtrReportMissing = Just [(Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000100000003")))]
-    }
-
-testObject_NewOtrMessage_user_11 :: NewOtrMessage
-testObject_NewOtrMessage_user_11 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "8"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000000000001"))),
-                          fromList [(ClientId {client = "3"}, "\NAK\19757")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = True,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Just "\ETBa\173224\NAK",
-      newOtrReportMissing =
-        Just
-          [ (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000002"))),
-            (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000003"))),
-            (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000400000004"))),
-            (Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000400000004")))
-          ]
-    }
-
-testObject_NewOtrMessage_user_12 :: NewOtrMessage
-testObject_NewOtrMessage_user_12 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "1"},
-      newOtrRecipients = OtrRecipients {otrRecipientsMap = UserClientMap {userClientMap = fromList []}},
-      newOtrNativePush = False,
-      newOtrTransient = True,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Just "",
-      newOtrReportMissing = Nothing
-    }
-
-testObject_NewOtrMessage_user_13 :: NewOtrMessage
-testObject_NewOtrMessage_user_13 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "5"},
-      newOtrRecipients = OtrRecipients {otrRecipientsMap = UserClientMap {userClientMap = fromList []}},
-      newOtrNativePush = False,
-      newOtrTransient = True,
-      newOtrNativePriority = Nothing,
-      newOtrData = Just "]aY",
-      newOtrReportMissing = Nothing
-    }
-
-testObject_NewOtrMessage_user_14 :: NewOtrMessage
-testObject_NewOtrMessage_user_14 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "3"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-                          fromList [(ClientId {client = "0"}, " ")]
-                        ),
-                        ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                          fromList [(ClientId {client = "0"}, "")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = True,
-      newOtrTransient = True,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Just "cc",
-      newOtrReportMissing =
-        Just
-          [ (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000000000002"))),
-            (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000001"))),
-            (Id (fromJust (UUID.fromString "00000001-0000-0003-0000-000300000000"))),
-            (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000004")))
-          ]
-    }
-
-testObject_NewOtrMessage_user_15 :: NewOtrMessage
-testObject_NewOtrMessage_user_15 =
   NewOtrMessage
     { newOtrSender = ClientId {client = "6"},
       newOtrRecipients = OtrRecipients {otrRecipientsMap = UserClientMap {userClientMap = fromList []}},
       newOtrNativePush = True,
       newOtrTransient = False,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Just "\a",
-      newOtrReportMissing =
-        Just
-          [ (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000000"))),
-            (Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000100000003"))),
-            (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000200000004")))
-          ]
-    }
-
-testObject_NewOtrMessage_user_16 :: NewOtrMessage
-testObject_NewOtrMessage_user_16 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "7"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000300000002"))),
-                          fromList [(ClientId {client = "0"}, "g2")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = True,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Nothing,
-      newOtrReportMissing = Nothing
-    }
-
-testObject_NewOtrMessage_user_17 :: NewOtrMessage
-testObject_NewOtrMessage_user_17 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "2"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))), fromList [])
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = False,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Just "",
-      newOtrReportMissing = Nothing
-    }
-
-testObject_NewOtrMessage_user_18 :: NewOtrMessage
-testObject_NewOtrMessage_user_18 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "3"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                          fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                        ),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))), fromList []),
-                        ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                          fromList [(ClientId {client = "1"}, "")]
-                        )
-                      ]
-                }
-          },
-      newOtrNativePush = True,
-      newOtrTransient = True,
       newOtrNativePriority = Nothing,
-      newOtrData = Just "",
-      newOtrReportMissing = Just []
-    }
-
-testObject_NewOtrMessage_user_19 :: NewOtrMessage
-testObject_NewOtrMessage_user_19 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "3"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))), fromList [])
-                      ]
-                }
-          },
-      newOtrNativePush = False,
-      newOtrTransient = True,
-      newOtrNativePriority = Just HighPriority,
-      newOtrData = Nothing,
-      newOtrReportMissing =
-        Just
-          [ (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000300000001"))),
-            (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000000000000")))
-          ]
-    }
-
-testObject_NewOtrMessage_user_20 :: NewOtrMessage
-testObject_NewOtrMessage_user_20 =
-  NewOtrMessage
-    { newOtrSender = ClientId {client = "2"},
-      newOtrRecipients =
-        OtrRecipients
-          { otrRecipientsMap =
-              UserClientMap
-                { userClientMap =
-                    fromList
-                      [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))), fromList []),
-                        ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))), fromList [])
-                      ]
-                }
-          },
-      newOtrNativePush = True,
-      newOtrTransient = True,
-      newOtrNativePriority = Just LowPriority,
-      newOtrData = Nothing,
-      newOtrReportMissing =
-        Just
-          [ (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000004"))),
-            (Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000000000001")))
-          ]
+      newOtrData = Just "data",
+      newOtrReportMissing = Nothing
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Offset_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Offset_user.hs
index fd829c80ba0..b6aa293045a 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Offset_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Offset_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,60 +20,3 @@ import Wire.API.Asset (Offset (..))
 
 testObject_Offset_user_1 :: Offset
 testObject_Offset_user_1 = Offset {offsetBytes = 1}
-
-testObject_Offset_user_2 :: Offset
-testObject_Offset_user_2 = Offset {offsetBytes = 25}
-
-testObject_Offset_user_3 :: Offset
-testObject_Offset_user_3 = Offset {offsetBytes = 24}
-
-testObject_Offset_user_4 :: Offset
-testObject_Offset_user_4 = Offset {offsetBytes = 0}
-
-testObject_Offset_user_5 :: Offset
-testObject_Offset_user_5 = Offset {offsetBytes = 26}
-
-testObject_Offset_user_6 :: Offset
-testObject_Offset_user_6 = Offset {offsetBytes = 18}
-
-testObject_Offset_user_7 :: Offset
-testObject_Offset_user_7 = Offset {offsetBytes = 19}
-
-testObject_Offset_user_8 :: Offset
-testObject_Offset_user_8 = Offset {offsetBytes = 8}
-
-testObject_Offset_user_9 :: Offset
-testObject_Offset_user_9 = Offset {offsetBytes = 4}
-
-testObject_Offset_user_10 :: Offset
-testObject_Offset_user_10 = Offset {offsetBytes = 12}
-
-testObject_Offset_user_11 :: Offset
-testObject_Offset_user_11 = Offset {offsetBytes = 17}
-
-testObject_Offset_user_12 :: Offset
-testObject_Offset_user_12 = Offset {offsetBytes = 17}
-
-testObject_Offset_user_13 :: Offset
-testObject_Offset_user_13 = Offset {offsetBytes = 12}
-
-testObject_Offset_user_14 :: Offset
-testObject_Offset_user_14 = Offset {offsetBytes = 18}
-
-testObject_Offset_user_15 :: Offset
-testObject_Offset_user_15 = Offset {offsetBytes = 22}
-
-testObject_Offset_user_16 :: Offset
-testObject_Offset_user_16 = Offset {offsetBytes = 30}
-
-testObject_Offset_user_17 :: Offset
-testObject_Offset_user_17 = Offset {offsetBytes = 27}
-
-testObject_Offset_user_18 :: Offset
-testObject_Offset_user_18 = Offset {offsetBytes = 12}
-
-testObject_Offset_user_19 :: Offset
-testObject_Offset_user_19 = Offset {offsetBytes = 20}
-
-testObject_Offset_user_20 :: Offset
-testObject_Offset_user_20 = Offset {offsetBytes = 9}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMemberUpdate_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMemberUpdate_user.hs
index c83c310c37f..0b6df26ed69 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMemberUpdate_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMemberUpdate_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -25,138 +23,3 @@ import Wire.API.Conversation.Role (parseRoleName)
 testObject_OtherMemberUpdate_user_1 :: OtherMemberUpdate
 testObject_OtherMemberUpdate_user_1 =
   OtherMemberUpdate {omuConvRoleName = Just (fromJust (parseRoleName "vvbanmrrrf0kz7y"))}
-
-testObject_OtherMemberUpdate_user_2 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_2 =
-  OtherMemberUpdate {omuConvRoleName = Just (fromJust (parseRoleName "or2kkb9cwydq4axsiqakr7jl8s4h_9a2oo_qz7"))}
-
-testObject_OtherMemberUpdate_user_3 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_3 =
-  OtherMemberUpdate
-    { omuConvRoleName =
-        Just
-          ( fromJust
-              (parseRoleName "99nln_ajv7ozy9n1rry4si2kqvx_o4pannusi6x59g1y7sm1aq86y2l7a6denfdtj793yjo8hbbiyyg6ob1zqlz")
-          )
-    }
-
-testObject_OtherMemberUpdate_user_4 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_4 =
-  OtherMemberUpdate
-    { omuConvRoleName = Just (fromJust (parseRoleName "hmhit7b2l4_li9cfvq2qwj692fo6xf8mkbroq1ndmwkg0y316rl"))
-    }
-
-testObject_OtherMemberUpdate_user_5 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_5 =
-  OtherMemberUpdate
-    { omuConvRoleName =
-        Just
-          ( fromJust
-              (parseRoleName "kajmr9qw2h6wl8tyj_yvbr03gv3cqq27jnu1xxtd85o_udx5e0d5g14dak0ki3t61sjgze5zakev_1zyn91u9pmxu")
-          )
-    }
-
-testObject_OtherMemberUpdate_user_6 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_6 =
-  OtherMemberUpdate {omuConvRoleName = Just (fromJust (parseRoleName "jgdrtk3a_xeb2dhnq2boov"))}
-
-testObject_OtherMemberUpdate_user_7 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_7 =
-  OtherMemberUpdate
-    { omuConvRoleName = Just (fromJust (parseRoleName "qco7881pfhkmlkv6f9sxemk5mwubcpe5pmixn0sbx0fpmjnhnnyxh11mp3et"))
-    }
-
-testObject_OtherMemberUpdate_user_8 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_8 =
-  OtherMemberUpdate
-    { omuConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "_xlywnzi1vn_bmxe3dnqjl0mpywx4er4jk1g0ps6um11n3l6w469gs77fm1qmmlz3a4nk5d6yjvwwzjcu_klim2y9iji3sc"
-              )
-          )
-    }
-
-testObject_OtherMemberUpdate_user_9 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_9 =
-  OtherMemberUpdate {omuConvRoleName = Just (fromJust (parseRoleName "bhzmbkr_z1w3wirenhrwygzl57vthdsqketvpgormegz7"))}
-
-testObject_OtherMemberUpdate_user_10 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_10 =
-  OtherMemberUpdate
-    { omuConvRoleName = Just (fromJust (parseRoleName "qcy9otfo7rl0d9oa1kq7iobys1i59_gxrhiuv5l_w4b2j9r6x6ua441ad99i"))
-    }
-
-testObject_OtherMemberUpdate_user_11 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_11 =
-  OtherMemberUpdate {omuConvRoleName = Just (fromJust (parseRoleName "akw_p5mqagi0klrhzd0ukj1mlupvhno"))}
-
-testObject_OtherMemberUpdate_user_12 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_12 =
-  OtherMemberUpdate
-    { omuConvRoleName = Just (fromJust (parseRoleName "io75ieiijh_xvq4igfte583a1ox2b_w8stske45y0gungrsywu5yn0j1c97a"))
-    }
-
-testObject_OtherMemberUpdate_user_13 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_13 =
-  OtherMemberUpdate
-    { omuConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "4y2w1ji0lwwll4ty19phctezkakazwql8hlc4ybxn95rr62thfgjf75_s239p5bn70m5zaym2hlpdo2wg72sd_jznqgeeo0yym7wy7bif3i3k0fpjwqy9xbcwmdqmo"
-              )
-          )
-    }
-
-testObject_OtherMemberUpdate_user_14 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_14 =
-  OtherMemberUpdate
-    { omuConvRoleName = Just (fromJust (parseRoleName "adzhpxx407p2r4777be9tmaa_qwkuzjt1y90n1jyoo9g8221wmy3x7es"))
-    }
-
-testObject_OtherMemberUpdate_user_15 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_15 =
-  OtherMemberUpdate
-    { omuConvRoleName =
-        Just (fromJust (parseRoleName "026y8leagl0cp664oyxw9oz4w67q3sxrr6ub9p_d6m0yrt7oi8i1sjvjc24wm_jhan"))
-    }
-
-testObject_OtherMemberUpdate_user_16 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_16 =
-  OtherMemberUpdate
-    { omuConvRoleName = Just (fromJust (parseRoleName "0g0efe2d96tn3vnit9olsqlc261g0t0fs97lo1rgssw0ya1jlp6"))
-    }
-
-testObject_OtherMemberUpdate_user_17 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_17 =
-  OtherMemberUpdate
-    { omuConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "453nrxunikcpx531hzey3_2z1hx4syssy2xuoqw1qhkly96wr3vzce2xtqg7dixfli0bunl63i1h87598wan1iy_qm0s5e3osw6nsyaqt84citc622um7363o01dpx1z"
-              )
-          )
-    }
-
-testObject_OtherMemberUpdate_user_18 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_18 =
-  OtherMemberUpdate {omuConvRoleName = Just (fromJust (parseRoleName "7cpb0bypyoji"))}
-
-testObject_OtherMemberUpdate_user_19 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_19 =
-  OtherMemberUpdate {omuConvRoleName = Just (fromJust (parseRoleName "l68mk17rc__bb79q6pzj3kpwxmllg0b2sw241un60ar"))}
-
-testObject_OtherMemberUpdate_user_20 :: OtherMemberUpdate
-testObject_OtherMemberUpdate_user_20 =
-  OtherMemberUpdate
-    { omuConvRoleName =
-        Just
-          ( fromJust
-              ( parseRoleName
-                  "33f9cfma5eqtaf3q0qal6gd2n_ushf3cfi96s2yfgmj09syiun4tlvr15qfktum6fcdu8oscojjqmkrmb4thylztgzzpsb7v40s7_z1c1"
-              )
-          )
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMember_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMember_user.hs
index 405026e5803..d81e884f552 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMember_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtherMember_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -37,266 +35,17 @@ testObject_OtherMember_user_1 =
       omService =
         Just
           ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000300000004"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000002")))
+              { _serviceRefId = Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000300000004")),
+                _serviceRefProvider = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000002"))
               }
           ),
-      omConvRoleName = (fromJust (parseRoleName "kd8736"))
+      omConvRoleName = fromJust (parseRoleName "kd8736")
     }
 
 testObject_OtherMember_user_2 :: OtherMember
 testObject_OtherMember_user_2 =
   OtherMember
     { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001f-0000-000c-0000-001c0000000f"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000000")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "y9z93u3kbwt873eghekqgmy0ho8hgrtlo3f5e6nq9icedmjbzx7ao0ycr5_gyunq4uuw"))
-    }
-
-testObject_OtherMember_user_3 :: OtherMember
-testObject_OtherMember_user_3 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001d-0000-0012-0000-001f0000001f"))) domain,
       omService = Nothing,
-      omConvRoleName =
-        ( fromJust
-            (parseRoleName "224ynn27l35zqag2j8wx3jte0mtacwjx5gqfj8bu6v6z4iab5stg5fu4k7mviu1oi5sgmw3kovmgx6rxtfrzz72")
-        )
-    }
-
-testObject_OtherMember_user_4 :: OtherMember
-testObject_OtherMember_user_4 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001a-0000-000f-0000-000900000008"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000300000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000400000000")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "y_yyztl9rczy3ptybi5iiizt2"))
-    }
-
-testObject_OtherMember_user_5 :: OtherMember
-testObject_OtherMember_user_5 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000015-0000-001b-0000-00020000000d"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000000000004"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000400000002")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "osr9yoilhf5s_7jhibw87rcc1iclohtngeqp7a9k2s4ty8537v"))
-    }
-
-testObject_OtherMember_user_6 :: OtherMember
-testObject_OtherMember_user_6 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0014-0000-000f0000000d"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000300000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000001")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "46c5d6qq5s5act5gzme7z1q5w9vhep"))
-    }
-
-testObject_OtherMember_user_7 :: OtherMember
-testObject_OtherMember_user_7 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-001c-0000-002000000016"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000400000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000300000003")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "p0hv86628m_rzt4ganpw2r3"))
-    }
-
-testObject_OtherMember_user_8 :: OtherMember
-testObject_OtherMember_user_8 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000011-0000-001f-0000-000d0000000f"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000200000002"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000003-0000-0002-0000-000400000001")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "wzjf8x1tw3e6m7e2zrle1teerh9e9bzba"))
-    }
-
-testObject_OtherMember_user_9 :: OtherMember
-testObject_OtherMember_user_9 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0016-0000-000f00000010"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000100000003"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000003-0000-0003-0000-000200000000")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "vfd81bco01v07l2gsgg9c5bolm759sicys0epfrb"))
-    }
-
-testObject_OtherMember_user_10 :: OtherMember
-testObject_OtherMember_user_10 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000005-0000-0020-0000-000b0000001f"))) domain,
-      omService = Nothing,
-      omConvRoleName = (fromJust (parseRoleName "uneetc9i9j3"))
-    }
-
-testObject_OtherMember_user_11 :: OtherMember
-testObject_OtherMember_user_11 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000004-0000-001e-0000-001d0000001a"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000200000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000400000003")))
-              }
-          ),
-      omConvRoleName =
-        (fromJust (parseRoleName "j_0wepobygx3ejil7wdiinpmgp16d4n6lp2chqdtk64ic5lspht_4m0y83o9zltergmkhiisc4rk6lauh7s"))
-    }
-
-testObject_OtherMember_user_12 :: OtherMember
-testObject_OtherMember_user_12 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000016-0000-0019-0000-001200000013"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000200000002"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000300000000")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "s0cumbx6k0vnriouzagmjk5vl9r7k6mw7cp1rrdx8_kcybuo5x9m6wp7a98pzfio6s"))
-    }
-
-testObject_OtherMember_user_13 :: OtherMember
-testObject_OtherMember_user_13 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000008-0000-0009-0000-000d00000011"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000000000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "clxtcuty2d1g_clojjevjpb5ca4a1"))
-    }
-
-testObject_OtherMember_user_14 :: OtherMember
-testObject_OtherMember_user_14 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000016-0000-000c-0000-000e00000016"))) domain,
-      omService = Nothing,
-      omConvRoleName = (fromJust (parseRoleName "gxe_4agkvb3"))
-    }
-
-testObject_OtherMember_user_15 :: OtherMember
-testObject_OtherMember_user_15 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000d-0000-001f-0000-00180000001c"))) domain,
-      omService = Nothing,
-      omConvRoleName =
-        (fromJust (parseRoleName "vp25612u_4o84sy2rigmst6j7zd54d6502f0zogeb2zm93b5vcdcf5z8mm_0by9syvet_u_7a"))
-    }
-
-testObject_OtherMember_user_16 :: OtherMember
-testObject_OtherMember_user_16 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000014-0000-001e-0000-000600000008"))) domain,
-      omService = Nothing,
-      omConvRoleName =
-        ( fromJust
-            (parseRoleName "89u0cp528kwlognk222yl5epk322mwjgip8k4atbko1u_q_3mmlalbdxtbrfdysnp0mii7dugiujclxbil1cjq1")
-        )
-    }
-
-testObject_OtherMember_user_17 :: OtherMember
-testObject_OtherMember_user_17 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000016-0000-001b-0000-00110000000c"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000200000004"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000200000003")))
-              }
-          ),
-      omConvRoleName =
-        ( fromJust
-            (parseRoleName "vi4v4en0v5vnq7nohnqqr18rfh82_tz3kndf38p8_vfr8ogae54h9nbkt0_ysm3isafx6dz57kfzkxu6f73gfkc9")
-        )
-    }
-
-testObject_OtherMember_user_18 :: OtherMember
-testObject_OtherMember_user_18 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000017-0000-000c-0000-001a00000000"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000200000000"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000200000000")))
-              }
-          ),
-      omConvRoleName = (fromJust (parseRoleName "htfohjl1uoehr8upvg_eete17sr304vqbm9imt_l_znz_rd1cq6n"))
-    }
-
-testObject_OtherMember_user_19 :: OtherMember
-testObject_OtherMember_user_19 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-0000-0000-00060000000f"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000400000002"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000400000001")))
-              }
-          ),
-      omConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "lm96_nocxpxllzob9onqrzfawv5eru442jrri387wol1o4affst6zfga9mmxdr3_s_ote0np2dfc4w4otqls3nozgne6frclb"
-            )
-        )
-    }
-
-testObject_OtherMember_user_20 :: OtherMember
-testObject_OtherMember_user_20 =
-  OtherMember
-    { omQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000007-0000-0010-0000-002000000001"))) domain,
-      omService =
-        Just
-          ( ServiceRef
-              { _serviceRefId = (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000400000001"))),
-                _serviceRefProvider = (Id (fromJust (UUID.fromString "00000001-0000-0004-0000-000100000000")))
-              }
-          ),
-      omConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "3nzv9edmf6rv54vgw3xl5fxrwzwm38u3vu2gpyx786hqjimctl7l9aqq01af0_h6nix6111vcm4dujjufqxvlx7f84j8koumw8ws0u5xe8u7al1ba1wj31ob381"
-            )
-        )
+      omConvRoleName = fromJust (parseRoleName "y9z93u3kbwt873eghekqgmy0ho8hgrtlo3f5e6nq9icedmjbzx7ao0ycr5_gyunq4uuw")
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrMessage_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrMessage_user.hs
index 4054fcf2d74..b2df2431457 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrMessage_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrMessage_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -39,165 +37,3 @@ testObject_OtrMessage_user_2 =
       otrCiphertext = "\11788t",
       otrData = Just "\ESC\NAKJj"
     }
-
-testObject_OtrMessage_user_3 :: OtrMessage
-testObject_OtrMessage_user_3 =
-  OtrMessage
-    { otrSender = ClientId {client = "9"},
-      otrRecipient = ClientId {client = "4"},
-      otrCiphertext = "\65727\&5I\US\1022014\CAN",
-      otrData = Just "H\NAK\565\31409"
-    }
-
-testObject_OtrMessage_user_4 :: OtrMessage
-testObject_OtrMessage_user_4 =
-  OtrMessage
-    { otrSender = ClientId {client = "10"},
-      otrRecipient = ClientId {client = "e"},
-      otrCiphertext = "\1064074O\bK\1033507",
-      otrData = Just "#"
-    }
-
-testObject_OtrMessage_user_5 :: OtrMessage
-testObject_OtrMessage_user_5 =
-  OtrMessage
-    { otrSender = ClientId {client = "16"},
-      otrRecipient = ClientId {client = "8"},
-      otrCiphertext = "\985492qB+\SO\20364",
-      otrData = Just "w\SOH"
-    }
-
-testObject_OtrMessage_user_6 :: OtrMessage
-testObject_OtrMessage_user_6 =
-  OtrMessage
-    { otrSender = ClientId {client = "1c"},
-      otrRecipient = ClientId {client = "9"},
-      otrCiphertext = "61",
-      otrData = Just "\1069388\&4\36314y"
-    }
-
-testObject_OtrMessage_user_7 :: OtrMessage
-testObject_OtrMessage_user_7 =
-  OtrMessage
-    { otrSender = ClientId {client = "f"},
-      otrRecipient = ClientId {client = "b"},
-      otrCiphertext = "\1069227",
-      otrData = Just "\99607\96228\EM\14064-\1063852\DLE"
-    }
-
-testObject_OtrMessage_user_8 :: OtrMessage
-testObject_OtrMessage_user_8 =
-  OtrMessage
-    { otrSender = ClientId {client = "4"},
-      otrRecipient = ClientId {client = "18"},
-      otrCiphertext = "\1104710",
-      otrData = Nothing
-    }
-
-testObject_OtrMessage_user_9 :: OtrMessage
-testObject_OtrMessage_user_9 =
-  OtrMessage
-    { otrSender = ClientId {client = "1c"},
-      otrRecipient = ClientId {client = "2"},
-      otrCiphertext = "\USbW\DLE",
-      otrData = Just "rD\995223x'"
-    }
-
-testObject_OtrMessage_user_10 :: OtrMessage
-testObject_OtrMessage_user_10 =
-  OtrMessage
-    { otrSender = ClientId {client = "7"},
-      otrRecipient = ClientId {client = "9"},
-      otrCiphertext = "\15322#d",
-      otrData = Just "v"
-    }
-
-testObject_OtrMessage_user_11 :: OtrMessage
-testObject_OtrMessage_user_11 =
-  OtrMessage
-    { otrSender = ClientId {client = "2"},
-      otrRecipient = ClientId {client = "20"},
-      otrCiphertext = "\135570W\aA\b",
-      otrData = Just "M\1089094\&6\\>\175300\167901"
-    }
-
-testObject_OtrMessage_user_12 :: OtrMessage
-testObject_OtrMessage_user_12 =
-  OtrMessage
-    { otrSender = ClientId {client = "1f"},
-      otrRecipient = ClientId {client = "10"},
-      otrCiphertext = "'rX\169072\FSY",
-      otrData = Just "%"
-    }
-
-testObject_OtrMessage_user_13 :: OtrMessage
-testObject_OtrMessage_user_13 =
-  OtrMessage
-    { otrSender = ClientId {client = "2"},
-      otrRecipient = ClientId {client = "14"},
-      otrCiphertext = "",
-      otrData = Just "P\1078940"
-    }
-
-testObject_OtrMessage_user_14 :: OtrMessage
-testObject_OtrMessage_user_14 =
-  OtrMessage
-    { otrSender = ClientId {client = "19"},
-      otrRecipient = ClientId {client = "14"},
-      otrCiphertext = "m*I",
-      otrData = Just ""
-    }
-
-testObject_OtrMessage_user_15 :: OtrMessage
-testObject_OtrMessage_user_15 =
-  OtrMessage
-    { otrSender = ClientId {client = "19"},
-      otrRecipient = ClientId {client = "20"},
-      otrCiphertext = "\1011164H\38375\DC1toQ",
-      otrData = Just "\US\141117BG\83023<"
-    }
-
-testObject_OtrMessage_user_16 :: OtrMessage
-testObject_OtrMessage_user_16 =
-  OtrMessage
-    { otrSender = ClientId {client = "5"},
-      otrRecipient = ClientId {client = "5"},
-      otrCiphertext = "sl\992896\1007055\&3",
-      otrData = Nothing
-    }
-
-testObject_OtrMessage_user_17 :: OtrMessage
-testObject_OtrMessage_user_17 =
-  OtrMessage
-    { otrSender = ClientId {client = "1"},
-      otrRecipient = ClientId {client = "1a"},
-      otrCiphertext = "K\17139",
-      otrData = Just "\ACKy\SUBY:\53430"
-    }
-
-testObject_OtrMessage_user_18 :: OtrMessage
-testObject_OtrMessage_user_18 =
-  OtrMessage
-    { otrSender = ClientId {client = "14"},
-      otrRecipient = ClientId {client = "1c"},
-      otrCiphertext = "-\GS\NAKy",
-      otrData = Just "\1046081\100210i(0"
-    }
-
-testObject_OtrMessage_user_19 :: OtrMessage
-testObject_OtrMessage_user_19 =
-  OtrMessage
-    { otrSender = ClientId {client = "19"},
-      otrRecipient = ClientId {client = "11"},
-      otrCiphertext = "<",
-      otrData = Just "\143566\1010133\RS"
-    }
-
-testObject_OtrMessage_user_20 :: OtrMessage
-testObject_OtrMessage_user_20 =
-  OtrMessage
-    { otrSender = ClientId {client = "13"},
-      otrRecipient = ClientId {client = "3"},
-      otrCiphertext = "\94241p\DLE",
-      otrData = Nothing
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrRecipients_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrRecipients_user.hs
index 6defca6b266..529afdfc286 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrRecipients_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/OtrRecipients_user.hs
@@ -31,424 +31,16 @@ testObject_OtrRecipients_user_1 =
         UserClientMap
           { userClientMap =
               fromList
-                [ ( (Id (fromJust (UUID.fromString "00000025-0000-0031-0000-003e00000001"))),
+                [ ( Id (fromJust (UUID.fromString "00000025-0000-0031-0000-003e00000001")),
                     fromList
                       [ (ClientId {client = "10"}, "q"),
                         (ClientId {client = "4"}, "\f"),
                         (ClientId {client = "b"}, "\83295")
                       ]
                   ),
-                  ( (Id (fromJust (UUID.fromString "0000002c-0000-0078-0000-001d00000069"))),
+                  ( Id (fromJust (UUID.fromString "0000002c-0000-0078-0000-001d00000069")),
                     fromList [(ClientId {client = "1d"}, "\"\168226l"), (ClientId {client = "3"}, "{Pu^1")]
                   )
                 ]
           }
     }
-
-testObject_OtrRecipients_user_2 :: OtrRecipients
-testObject_OtrRecipients_user_2 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "0000000f-0000-000b-0000-000200000017"))),
-                    fromList [(ClientId {client = "0"}, "\ETB"), (ClientId {client = "1"}, "{")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000011-0000-000c-0000-00000000001f"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "o")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000001d-0000-0000-0000-000a0000000f"))),
-                    fromList [(ClientId {client = "0"}, "\138700"), (ClientId {client = "1"}, "")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_3 :: OtrRecipients
-testObject_OtrRecipients_user_3 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000800000003"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0008-0000-000600000007"))),
-                    fromList [(ClientId {client = "0"}, "\US")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000005-0000-0007-0000-000400000004"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "\1046401")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000006-0000-0006-0000-000800000001"))),
-                    fromList [(ClientId {client = "4"}, "6W")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000006-0000-0008-0000-000000000005"))),
-                    fromList [(ClientId {client = "9"}, "\133043\bZ,$]")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_4 :: OtrRecipients
-testObject_OtrRecipients_user_4 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                    fromList [(ClientId {client = "1"}, "\987038")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000002"))),
-                    fromList [(ClientId {client = "0"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000000"))),
-                    fromList [(ClientId {client = "0"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))),
-                    fromList [(ClientId {client = "2"}, "d")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000001"))),
-                    fromList [(ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000000"))),
-                    fromList [(ClientId {client = "0"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000001"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_5 :: OtrRecipients
-testObject_OtrRecipients_user_5 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000d61-0000-23d4-0000-0dd100006f7f"))),
-                    fromList
-                      [ (ClientId {client = "4c"}, "\1034352\nc"),
-                        (ClientId {client = "4d"}, "G.4\DC3"),
-                        (ClientId {client = "85"}, "6\ETB\STX")
-                      ]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_6 :: OtrRecipients
-testObject_OtrRecipients_user_6 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000002-0000-0008-0000-001b00000010"))),
-                    fromList [(ClientId {client = "0"}, "\1076976"), (ClientId {client = "1"}, "\1068213")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000003-0000-0008-0000-00060000001d"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "0000000f-0000-0008-0000-000e0000000c"))),
-                    fromList [(ClientId {client = "f9"}, "")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_7 :: OtrRecipients
-testObject_OtrRecipients_user_7 = OtrRecipients {otrRecipientsMap = UserClientMap {userClientMap = fromList []}}
-
-testObject_OtrRecipients_user_8 :: OtrRecipients
-testObject_OtrRecipients_user_8 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000003-0000-0005-0000-000500000006"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0001-0000-000800000003"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0008-0000-000500000007"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "5")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000007-0000-0000-0000-000800000007"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_9 :: OtrRecipients
-testObject_OtrRecipients_user_9 = OtrRecipients {otrRecipientsMap = UserClientMap {userClientMap = fromList []}}
-
-testObject_OtrRecipients_user_10 :: OtrRecipients
-testObject_OtrRecipients_user_10 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "0000000e-0000-0005-0000-001e0000000e"))),
-                    fromList [(ClientId {client = "0"}, "5"), (ClientId {client = "1"}, "\DC1")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "0000001e-0000-0011-0000-00070000000e"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "0000001f-0000-001f-0000-002000000001"))),
-                    fromList [(ClientId {client = "6a"}, "\991940\39054\1002871j")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_11 :: OtrRecipients
-testObject_OtrRecipients_user_11 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000300000002"))),
-                    fromList [(ClientId {client = "7"}, "A\DC4")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                    fromList [(ClientId {client = "3"}, "\1057441\10491Tf")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000000000002"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "\1012434")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000100000001"))),
-                    fromList [(ClientId {client = "8"}, "C")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000300000003"))),
-                    fromList [(ClientId {client = "1"}, "\ETB\995895\99481\66895")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000004-0000-0004-0000-000300000004"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_12 :: OtrRecipients
-testObject_OtrRecipients_user_12 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000002"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-                    fromList [(ClientId {client = "0"}, "s"), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                    fromList [(ClientId {client = "0"}, "f")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000002"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000200000001"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, ",")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))),
-                    fromList [(ClientId {client = "4"}, "(`|")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000002"))),
-                    fromList [(ClientId {client = "1"}, "")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_13 :: OtrRecipients
-testObject_OtrRecipients_user_13 = OtrRecipients {otrRecipientsMap = UserClientMap {userClientMap = fromList []}}
-
-testObject_OtrRecipients_user_14 :: OtrRecipients
-testObject_OtrRecipients_user_14 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000007-0000-000f-0000-001d00000008"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000007-0000-0019-0000-001f00000005"))),
-                    fromList [(ClientId {client = "3"}, "\13295\DLE\169979D")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "0000001a-0000-0002-0000-00070000001a"))), fromList [])
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_15 :: OtrRecipients
-testObject_OtrRecipients_user_15 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000001-0000-0019-0000-001e00000003"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "0000000d-0000-0017-0000-00100000001a"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "\57865")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "0000001e-0000-001b-0000-00080000000e"))),
-                    fromList [(ClientId {client = "1"}, "\993508\1100744"), (ClientId {client = "3"}, "6\SI")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_16 :: OtrRecipients
-testObject_OtrRecipients_user_16 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-                    fromList [(ClientId {client = "0"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-                    fromList [(ClientId {client = "0"}, "\146198")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))), fromList [])
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_17 :: OtrRecipients
-testObject_OtrRecipients_user_17 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ((Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000001"))),
-                    fromList [(ClientId {client = "0"}, "\CAN")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000001"))),
-                    fromList [(ClientId {client = "1"}, "\157332")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000000"))),
-                    fromList [(ClientId {client = "0"}, "q\1035661")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000200000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000100000000"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000000"))),
-                    fromList [(ClientId {client = "0"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000001"))),
-                    fromList [(ClientId {client = "2"}, "\164050\1005133")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000002"))),
-                    fromList [(ClientId {client = "0"}, "\1093597\\")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000002"))),
-                    fromList [(ClientId {client = "0"}, "q\t")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_18 :: OtrRecipients
-testObject_OtrRecipients_user_18 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))),
-                    fromList [(ClientId {client = "1"}, "!")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000002"))),
-                    fromList [(ClientId {client = "1"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000002"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000100000000"))),
-                    fromList [(ClientId {client = "0"}, "`")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000200000000"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "?")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000002"))),
-                    fromList [(ClientId {client = "1"}, "@\19909")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000001"))), fromList []),
-                  ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000002"))), fromList [])
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_19 :: OtrRecipients
-testObject_OtrRecipients_user_19 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00000000-0000-0007-0000-000300000006"))),
-                    fromList [(ClientId {client = "0"}, "\143168"), (ClientId {client = "1"}, " \SOH")]
-                  ),
-                  ((Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000200000001"))), fromList []),
-                  ( (Id (fromJust (UUID.fromString "00000006-0000-0000-0000-000500000008"))),
-                    fromList [(ClientId {client = "0"}, "")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000006-0000-0002-0000-000500000008"))),
-                    fromList [(ClientId {client = "1"}, "\15773\&9K"), (ClientId {client = "4"}, "\fy")]
-                  ),
-                  ( (Id (fromJust (UUID.fromString "00000007-0000-0000-0000-000700000004"))),
-                    fromList [(ClientId {client = "0"}, ""), (ClientId {client = "1"}, "")]
-                  )
-                ]
-          }
-    }
-
-testObject_OtrRecipients_user_20 :: OtrRecipients
-testObject_OtrRecipients_user_20 =
-  OtrRecipients
-    { otrRecipientsMap =
-        UserClientMap
-          { userClientMap =
-              fromList
-                [ ( (Id (fromJust (UUID.fromString "00005c3f-0000-157d-0000-1bf200005f06"))),
-                    fromList
-                      [(ClientId {client = "60c"}, ""), (ClientId {client = "aa3"}, "N\1095113\97914h\1092266dc")]
-                  )
-                ]
-          }
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Priority_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Priority_user.hs
index 7a044df31d7..b00f9d56e4a 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Priority_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Priority_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -25,57 +23,3 @@ testObject_Priority_user_1 = HighPriority
 
 testObject_Priority_user_2 :: Priority
 testObject_Priority_user_2 = LowPriority
-
-testObject_Priority_user_3 :: Priority
-testObject_Priority_user_3 = LowPriority
-
-testObject_Priority_user_4 :: Priority
-testObject_Priority_user_4 = LowPriority
-
-testObject_Priority_user_5 :: Priority
-testObject_Priority_user_5 = HighPriority
-
-testObject_Priority_user_6 :: Priority
-testObject_Priority_user_6 = HighPriority
-
-testObject_Priority_user_7 :: Priority
-testObject_Priority_user_7 = HighPriority
-
-testObject_Priority_user_8 :: Priority
-testObject_Priority_user_8 = LowPriority
-
-testObject_Priority_user_9 :: Priority
-testObject_Priority_user_9 = LowPriority
-
-testObject_Priority_user_10 :: Priority
-testObject_Priority_user_10 = LowPriority
-
-testObject_Priority_user_11 :: Priority
-testObject_Priority_user_11 = HighPriority
-
-testObject_Priority_user_12 :: Priority
-testObject_Priority_user_12 = LowPriority
-
-testObject_Priority_user_13 :: Priority
-testObject_Priority_user_13 = HighPriority
-
-testObject_Priority_user_14 :: Priority
-testObject_Priority_user_14 = LowPriority
-
-testObject_Priority_user_15 :: Priority
-testObject_Priority_user_15 = LowPriority
-
-testObject_Priority_user_16 :: Priority
-testObject_Priority_user_16 = HighPriority
-
-testObject_Priority_user_17 :: Priority
-testObject_Priority_user_17 = LowPriority
-
-testObject_Priority_user_18 :: Priority
-testObject_Priority_user_18 = LowPriority
-
-testObject_Priority_user_19 :: Priority
-testObject_Priority_user_19 = HighPriority
-
-testObject_Priority_user_20 :: Priority
-testObject_Priority_user_20 = LowPriority
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyKey_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyKey_user.hs
index dc1bf76a208..4f9177a2ce8 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyKey_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyKey_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -23,69 +21,69 @@ import Imports (fromRight, undefined)
 import Wire.API.Properties (PropertyKey (..))
 
 testObject_PropertyKey_user_1 :: PropertyKey
-testObject_PropertyKey_user_1 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("\\#(pEr>=1=|[3U8#*-")))}
+testObject_PropertyKey_user_1 = PropertyKey {propertyKeyName = fromRight undefined (validate "\\#(pEr>=1=|[3U8#*-")}
 
 testObject_PropertyKey_user_2 :: PropertyKey
-testObject_PropertyKey_user_2 = PropertyKey {propertyKeyName = (fromRight undefined (validate (".ir59 BUmxiD]")))}
+testObject_PropertyKey_user_2 = PropertyKey {propertyKeyName = fromRight undefined (validate ".ir59 BUmxiD]")}
 
 testObject_PropertyKey_user_3 :: PropertyKey
-testObject_PropertyKey_user_3 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("nk?o0R&)7>W")))}
+testObject_PropertyKey_user_3 = PropertyKey {propertyKeyName = fromRight undefined (validate "nk?o0R&)7>W")}
 
 testObject_PropertyKey_user_4 :: PropertyKey
 testObject_PropertyKey_user_4 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate ("bv\"s1=]&\"^\\$05T=h$U.Qd:")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate "bv\"s1=]&\"^\\$05T=h$U.Qd:")}
 
 testObject_PropertyKey_user_5 :: PropertyKey
 testObject_PropertyKey_user_5 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate ("9$\\K\\e*]z[nPd|y.loOEHk")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate "9$\\K\\e*]z[nPd|y.loOEHk")}
 
 testObject_PropertyKey_user_6 :: PropertyKey
 testObject_PropertyKey_user_6 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate ("&32zNqRJI.L:yD!\"Y(P")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate "&32zNqRJI.L:yD!\"Y(P")}
 
 testObject_PropertyKey_user_7 :: PropertyKey
 testObject_PropertyKey_user_7 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate ("to(YvZL!ukU8_lIvP4HD6G 5r.82")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate "to(YvZL!ukU8_lIvP4HD6G 5r.82")}
 
 testObject_PropertyKey_user_8 :: PropertyKey
-testObject_PropertyKey_user_8 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("8Ki&S<z")))}
+testObject_PropertyKey_user_8 = PropertyKey {propertyKeyName = fromRight undefined (validate "8Ki&S<z")}
 
 testObject_PropertyKey_user_9 :: PropertyKey
 testObject_PropertyKey_user_9 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate ("i&m.{ok6}b:9_]5{ m=] ,H,{;h")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate "i&m.{ok6}b:9_]5{ m=] ,H,{;h")}
 
 testObject_PropertyKey_user_10 :: PropertyKey
-testObject_PropertyKey_user_10 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("{4JU(")))}
+testObject_PropertyKey_user_10 = PropertyKey {propertyKeyName = fromRight undefined (validate "{4JU(")}
 
 testObject_PropertyKey_user_11 :: PropertyKey
 testObject_PropertyKey_user_11 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate ("OHeuP_;raj|3E3p6L!gbXC&dz$~")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate "OHeuP_;raj|3E3p6L!gbXC&dz$~")}
 
 testObject_PropertyKey_user_12 :: PropertyKey
-testObject_PropertyKey_user_12 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("ubsV.n^Rg\"Sk_KtM=")))}
+testObject_PropertyKey_user_12 = PropertyKey {propertyKeyName = fromRight undefined (validate "ubsV.n^Rg\"Sk_KtM=")}
 
 testObject_PropertyKey_user_13 :: PropertyKey
-testObject_PropertyKey_user_13 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("K@\"B0-ht4]`)<BW")))}
+testObject_PropertyKey_user_13 = PropertyKey {propertyKeyName = fromRight undefined (validate "K@\"B0-ht4]`)<BW")}
 
 testObject_PropertyKey_user_14 :: PropertyKey
 testObject_PropertyKey_user_14 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate (".a}WC8fxMc+8{AEM6C1ba2c")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate ".a}WC8fxMc+8{AEM6C1ba2c")}
 
 testObject_PropertyKey_user_15 :: PropertyKey
 testObject_PropertyKey_user_15 =
-  PropertyKey {propertyKeyName = (fromRight undefined (validate ("LQ%Y:{w~X9;3sjHSoc/")))}
+  PropertyKey {propertyKeyName = fromRight undefined (validate "LQ%Y:{w~X9;3sjHSoc/")}
 
 testObject_PropertyKey_user_16 :: PropertyKey
-testObject_PropertyKey_user_16 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("w")))}
+testObject_PropertyKey_user_16 = PropertyKey {propertyKeyName = fromRight undefined (validate "w")}
 
 testObject_PropertyKey_user_17 :: PropertyKey
-testObject_PropertyKey_user_17 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("@[wt.MA[~~g%t#")))}
+testObject_PropertyKey_user_17 = PropertyKey {propertyKeyName = fromRight undefined (validate "@[wt.MA[~~g%t#")}
 
 testObject_PropertyKey_user_18 :: PropertyKey
-testObject_PropertyKey_user_18 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("")))}
+testObject_PropertyKey_user_18 = PropertyKey {propertyKeyName = fromRight undefined (validate "")}
 
 testObject_PropertyKey_user_19 :: PropertyKey
-testObject_PropertyKey_user_19 = PropertyKey {propertyKeyName = (fromRight undefined (validate ("/qUJ,5HHe=E3,z`+")))}
+testObject_PropertyKey_user_19 = PropertyKey {propertyKeyName = fromRight undefined (validate "/qUJ,5HHe=E3,z`+")}
 
 testObject_PropertyKey_user_20 :: PropertyKey
-testObject_PropertyKey_user_20 = PropertyKey {propertyKeyName = (fromRight undefined (validate (":7)V]/Gc5Y~n=")))}
+testObject_PropertyKey_user_20 = PropertyKey {propertyKeyName = fromRight undefined (validate ":7)V]/Gc5Y~n=")}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyValue_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyValue_user.hs
index a0022c3eea5..f1507980566 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyValue_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PropertyValue_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -18,204 +16,8 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.PropertyValue_user where
 
-import Data.Aeson (Value (Array, Bool, Null, Number, Object, String))
-import GHC.Exts (IsList (fromList))
-import Imports (Bool (False, True))
+import Data.Aeson (Value (Number))
 import Wire.API.Properties (PropertyValue (..))
 
 testObject_PropertyValue_user_1 :: PropertyValue
-testObject_PropertyValue_user_1 = PropertyValue {propertyValueJson = Number (7.0e-14)}
-
-testObject_PropertyValue_user_2 :: PropertyValue
-testObject_PropertyValue_user_2 =
-  PropertyValue
-    { propertyValueJson =
-        Object
-          ( fromList
-              [ ("M\ETX\ENQ\af\176612\n\155245|n", String "\178208\bwS"),
-                ("\17080Z%\1025245\DELrgT^", Number (-100.0)),
-                ("fgH", Bool False)
-              ]
-          )
-    }
-
-testObject_PropertyValue_user_3 :: PropertyValue
-testObject_PropertyValue_user_3 =
-  PropertyValue
-    { propertyValueJson = Object (fromList [("", Number (7.0e-5)), ("/\vT", Bool True), ("^}Y{Nt", Bool False)])
-    }
-
-testObject_PropertyValue_user_4 :: PropertyValue
-testObject_PropertyValue_user_4 =
-  PropertyValue
-    { propertyValueJson =
-        Array
-          [ Null,
-            Bool True,
-            String "",
-            String "7g",
-            Number (0.2),
-            String "t",
-            Bool True,
-            Bool True,
-            Bool True,
-            Null,
-            Bool True,
-            Number (200.0),
-            Bool False,
-            Bool True,
-            Null
-          ]
-    }
-
-testObject_PropertyValue_user_5 :: PropertyValue
-testObject_PropertyValue_user_5 = PropertyValue {propertyValueJson = Array [Bool False]}
-
-testObject_PropertyValue_user_6 :: PropertyValue
-testObject_PropertyValue_user_6 = PropertyValue {propertyValueJson = Array [Number (2.0e-9)]}
-
-testObject_PropertyValue_user_7 :: PropertyValue
-testObject_PropertyValue_user_7 =
-  PropertyValue
-    { propertyValueJson =
-        Object
-          ( fromList
-              [ ("", Number (1.0e-5)),
-                ("\STXy", Null),
-                ("r\1035660\"TD", String "\54670"),
-                ("\f]X", Number (2.0e-5)),
-                ("f\DC2\1059734", Number (1.0e-2)),
-                ("\987855", String "\997146\RS\CANu\n")
-              ]
-          )
-    }
-
-testObject_PropertyValue_user_8 :: PropertyValue
-testObject_PropertyValue_user_8 = PropertyValue {propertyValueJson = Null}
-
-testObject_PropertyValue_user_9 :: PropertyValue
-testObject_PropertyValue_user_9 =
-  PropertyValue
-    { propertyValueJson =
-        Array
-          [ Bool True,
-            String "F",
-            Null,
-            String "I\NAK",
-            String "(",
-            Bool True,
-            String "",
-            Bool True,
-            Bool True,
-            Null,
-            Number (0.0),
-            Number (200.0)
-          ]
-    }
-
-testObject_PropertyValue_user_10 :: PropertyValue
-testObject_PropertyValue_user_10 = PropertyValue {propertyValueJson = Bool False}
-
-testObject_PropertyValue_user_11 :: PropertyValue
-testObject_PropertyValue_user_11 =
-  PropertyValue
-    { propertyValueJson =
-        Object
-          ( fromList
-              [ ("0", Number (-4.0e7)),
-                ("\873", Bool False),
-                ("\1048918\71091\133971Q3\SOH\"", Null),
-                ("\1089049n", Bool False)
-              ]
-          )
-    }
-
-testObject_PropertyValue_user_12 :: PropertyValue
-testObject_PropertyValue_user_12 =
-  PropertyValue
-    { propertyValueJson =
-        Array
-          [ Bool True,
-            String "\a\1001598",
-            Bool False,
-            Bool True,
-            String "\159573",
-            String "",
-            Null,
-            Null,
-            Number (2.0),
-            String "\188130\ACK",
-            Bool False
-          ]
-    }
-
-testObject_PropertyValue_user_13 :: PropertyValue
-testObject_PropertyValue_user_13 =
-  PropertyValue
-    { propertyValueJson = Array [Null, Bool False, String "*\SOHO", Number (0.1), String "\SOp\12293\1075098"]
-    }
-
-testObject_PropertyValue_user_14 :: PropertyValue
-testObject_PropertyValue_user_14 = PropertyValue {propertyValueJson = Object (fromList [])}
-
-testObject_PropertyValue_user_15 :: PropertyValue
-testObject_PropertyValue_user_15 =
-  PropertyValue
-    { propertyValueJson =
-        Object
-          ( fromList
-              [ ("dN", Null),
-                ("0", Bool True),
-                ("", Bool True),
-                ("K", Bool True),
-                ("\1024195\"", Null),
-                ("\1044199", Bool True),
-                ("D\ACK", String "\r")
-              ]
-          )
-    }
-
-testObject_PropertyValue_user_16 :: PropertyValue
-testObject_PropertyValue_user_16 = PropertyValue {propertyValueJson = Null}
-
-testObject_PropertyValue_user_17 :: PropertyValue
-testObject_PropertyValue_user_17 =
-  PropertyValue {propertyValueJson = Array [Number (100.0), Bool False, String "#\\\993660`r\1110635"]}
-
-testObject_PropertyValue_user_18 :: PropertyValue
-testObject_PropertyValue_user_18 =
-  PropertyValue
-    { propertyValueJson =
-        Object
-          ( fromList
-              [ ("\1078290\SOHeD\991615", Number (3.0e-5)),
-                (")\ESCt\10112", Number (-4.0e-3)),
-                ("\60512%9", Bool False),
-                ("", Number (0.1)),
-                ("\DC3", Number (400.0)),
-                ("{ *f~", Number (-400.0))
-              ]
-          )
-    }
-
-testObject_PropertyValue_user_19 :: PropertyValue
-testObject_PropertyValue_user_19 =
-  PropertyValue
-    { propertyValueJson =
-        Array
-          [ Null,
-            Null,
-            Bool False,
-            Bool False,
-            String "\r\ETX",
-            Bool True,
-            Bool False,
-            Number (2.0e-2),
-            String "e",
-            Number (2.0e-2),
-            String "K"
-          ]
-    }
-
-testObject_PropertyValue_user_20 :: PropertyValue
-testObject_PropertyValue_user_20 = PropertyValue {propertyValueJson = Number (1.2e-21)}
+testObject_PropertyValue_user_1 = PropertyValue {propertyValueJson = Number 7.0e-14}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushTokenList_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushTokenList_user.hs
index 5b6ac375127..bd0982e188b 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushTokenList_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushTokenList_user.hs
@@ -23,7 +23,7 @@ import Wire.API.Push.Token
   ( AppName (AppName, appNameText),
     PushTokenList (..),
     Token (Token, tokenText),
-    Transport (APNS, APNSSandbox, APNSVoIP, APNSVoIPSandbox, GCM),
+    Transport (GCM),
     pushToken,
   )
 
@@ -31,1513 +31,10 @@ testObject_PushTokenList_user_1 :: PushTokenList
 testObject_PushTokenList_user_1 =
   PushTokenList
     { pushTokens =
-        [ (pushToken (GCM) (AppName {appNameText = "p\DELU2r"}) (Token {tokenText = "MK8p\f"}) (ClientId {client = "4"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\n\163637`\1098480>\191239"})
-              (ClientId {client = "1a"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\EM\ETX"})
-              (Token {tokenText = "\181637"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\29574Y\1096493O"})
-              (Token {tokenText = ""})
-              (ClientId {client = "13"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = ">8C9E"})
-              (Token {tokenText = "\STX\1025439\ESCW\1024542\&2\SOH"})
-              (ClientId {client = "18"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\fn\ENQE\RS"})
-              (Token {tokenText = "\1051986\38460\12861\1083961\1074746\""})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "H>8\ETX"})
-              (Token {tokenText = ")\b v"})
-              (ClientId {client = "12"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "V"}) (Token {tokenText = ""}) (ClientId {client = "16"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\1093930\ETB"})
-              (Token {tokenText = "\EM3"})
-              (ClientId {client = "1a"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "`B\136938\\"})
-              (Token {tokenText = ">"})
-              (ClientId {client = "1c"})
-          )
+        [ pushToken GCM (AppName {appNameText = "p\DELU2r"}) (Token {tokenText = "MK8p\f"}) (ClientId {client = "4"})
         ]
     }
 
 testObject_PushTokenList_user_2 :: PushTokenList
 testObject_PushTokenList_user_2 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\ETBa\1063308\&8\1039183"})
-              (ClientId {client = "c"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\DC3"})
-              (Token {tokenText = "wO+"})
-              (ClientId {client = "8"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\ESC"})
-              (Token {tokenText = "\1000123\61357)X\DC4"})
-              (ClientId {client = "1b"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\a(\162592"})
-              (Token {tokenText = "\1089554\170436ZgJE"})
-              (ClientId {client = "1f"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "mY"})
-              (Token {tokenText = "_lB#\989093"})
-              (ClientId {client = "1a"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "#\175613+"})
-              (Token {tokenText = "7#k\n\NULe"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\14628\\Jb\157564"})
-              (Token {tokenText = "\128910\SIY;aw\RS"})
-              (ClientId {client = "10"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "c\1023262"})
-              (Token {tokenText = "\tfS\1046266\183654*\1028550"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "5\CAN#a\t\1021535"})
-              (Token {tokenText = "~"})
-              (ClientId {client = "d"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = " \ETX:"})
-              (Token {tokenText = "\SUBDS\143740"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "z\SO>\17205l\160502\1074572"})
-              (Token {tokenText = "p7"})
-              (ClientId {client = "b"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\EOTj\992654"})
-              (Token {tokenText = "(}]\t\12197?"})
-              (ClientId {client = "4"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\UST5\ETBG"})
-              (Token {tokenText = "\37775+["})
-              (ClientId {client = "3"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "4\1013283\1039903\EOT\STX."})
-              (Token {tokenText = "\STX\32639\US"})
-              (ClientId {client = "3"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "]C"})
-              (Token {tokenText = "N\ESC\32609*_"})
-              (ClientId {client = "4"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\13557B\48674v\SI)"})
-              (Token {tokenText = ";\EOT\ESC\CAN"})
-              (ClientId {client = "9"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\a<!<"})
-              (Token {tokenText = "y\1081792"})
-              (ClientId {client = "20"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "~\994098"})
-              (Token {tokenText = "\46545a\1053177{\14089A"})
-              (ClientId {client = "19"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\SO8.\1026065\&3C8"})
-              (Token {tokenText = "ZIW"})
-              (ClientId {client = "e"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_3 :: PushTokenList
-testObject_PushTokenList_user_3 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNS)
-              (AppName {appNameText = "/\159372"})
-              (Token {tokenText = ",|\ETX"})
-              (ClientId {client = "0"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "\DLE"}) (Token {tokenText = "[\\iS"}) (ClientId {client = "6"})),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\GS\1111132\EOTS\177484"})
-              (Token {tokenText = "NEU\62911oxG"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "]\7470\1080979}"})
-              (Token {tokenText = "\159673R"})
-              (ClientId {client = "10"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\1017921l\132177\1076421\RS\19463"})
-              (Token {tokenText = "\SOH!\1064998\141541\RS"})
-              (ClientId {client = "14"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "E\"7\135812\US"})
-              (ClientId {client = "1"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\1056137K!"})
-              (Token {tokenText = "'"})
-              (ClientId {client = "1a"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "c\1065178\DEL\16137\9236\RS\1082164"})
-              (Token {tokenText = "\NUL\1018030"})
-              (ClientId {client = "1"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_4 :: PushTokenList
-testObject_PushTokenList_user_4 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "2R&"})
-              (Token {tokenText = "G\r,i,Gk"})
-              (ClientId {client = "11"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "g\SO$S\ETB5\n"})
-              (ClientId {client = "2"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "_O"}) (Token {tokenText = "'\4536mt?,"}) (ClientId {client = "1a"})),
-          (pushToken (GCM) (AppName {appNameText = "P}~\SO:"}) (Token {tokenText = "4eP=nj"}) (ClientId {client = "e"})),
-          (pushToken (APNS) (AppName {appNameText = ""}) (Token {tokenText = ""}) (ClientId {client = "1e"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "B0S\1086619"})
-              (Token {tokenText = "GwoD\1110658\EOT\74379"})
-              (ClientId {client = "c"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\DC4\989426"})
-              (Token {tokenText = "+$\f"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "]\152463F\995841"})
-              (ClientId {client = "18"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\r\985108D_"})
-              (Token {tokenText = "."})
-              (ClientId {client = "8"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = "ov"}) (Token {tokenText = "q"}) (ClientId {client = "19"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "L"})
-              (Token {tokenText = "\US\SI4\b"})
-              (ClientId {client = "d"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "\194622a"}) (Token {tokenText = "w6x"}) (ClientId {client = "c"})),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "NsGq"})
-              (Token {tokenText = "{\EOT6to\45449"})
-              (ClientId {client = "9"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "q\CANI\STXz0"})
-              (Token {tokenText = "Pi"})
-              (ClientId {client = "1c"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_5 :: PushTokenList
-testObject_PushTokenList_user_5 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNS)
-              (AppName {appNameText = "\1046364\1011859\1051970\at\143987f"})
-              (Token {tokenText = "=\\\1042600p]"})
-              (ClientId {client = "d"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "=\US6\1025571\DC1Wn"})
-              (Token {tokenText = "\n)\60902$\GS"})
-              (ClientId {client = "a"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\n:a\145407\ESC\1061647\&7"})
-              (Token {tokenText = "i\v[^opY"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\49894"})
-              (Token {tokenText = "\189509\1017881\f\1015433\143015sd"})
-              (ClientId {client = "12"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\45494x\DELIM"})
-              (Token {tokenText = "\SYNL\1039144e\ENQ"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "v\SI"})
-              (Token {tokenText = "]\1006320f"})
-              (ClientId {client = "17"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\DEL6\STX"})
-              (Token {tokenText = "\\"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\1002028?"})
-              (Token {tokenText = "F\SOH\1108263\ENQ\1101725\&3"})
-              (ClientId {client = "c"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\1113784\1102572|\118844\EM&"})
-              (Token {tokenText = "\993828G\1031326\1067982"})
-              (ClientId {client = "9"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "G!-(gD"})
-              (Token {tokenText = "\CANE_\ETX\r"})
-              (ClientId {client = "1b"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "S\167020U\1014164\1084918["})
-              (Token {tokenText = ""})
-              (ClientId {client = "14"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "\10971\28666k"}) (Token {tokenText = ""}) (ClientId {client = "7"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "F3\166273&KZY"})
-              (ClientId {client = "17"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\157776\1070392\999794\164112"})
-              (Token {tokenText = "!3\1072604)\SOH"})
-              (ClientId {client = "1c"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "#\183530"}) (Token {tokenText = ""}) (ClientId {client = "e"}))
-        ]
-    }
-
-testObject_PushTokenList_user_6 :: PushTokenList
-testObject_PushTokenList_user_6 =
-  PushTokenList
-    { pushTokens =
-        [ (pushToken (APNS) (AppName {appNameText = ""}) (Token {tokenText = "#"}) (ClientId {client = "1"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "NJ\13824"})
-              (Token {tokenText = "m"})
-              (ClientId {client = "19"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\DC1"})
-              (Token {tokenText = ""})
-              (ClientId {client = "3"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\36018Ipi\177160\18119"})
-              (Token {tokenText = ""})
-              (ClientId {client = "2"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "'[\133852\100668c"})
-              (Token {tokenText = "\1082078`\FSx\\X"})
-              (ClientId {client = "1c"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = ">"}) (Token {tokenText = "~Z\EOTt8"}) (ClientId {client = "6"})),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "f5e"})
-              (Token {tokenText = "T\83099E\1094942\DC4\DC1\142242"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\b+3I\64154\1097165"})
-              (Token {tokenText = ""})
-              (ClientId {client = "20"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\132205\ESC4\1008274\1093375\74556"})
-              (ClientId {client = "1f"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "f\1072151\&3^y"})
-              (Token {tokenText = "b"})
-              (ClientId {client = "d"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\188479>^\r"})
-              (Token {tokenText = "uJf"})
-              (ClientId {client = "11"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\133498Q\aY"})
-              (Token {tokenText = "\a\34395P\171559\1016454"})
-              (ClientId {client = "c"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\184508\1084974\68836;1N\DC3"})
-              (Token {tokenText = "\SOf\DC3\ENQ"})
-              (ClientId {client = "1e"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = ""}) (Token {tokenText = ""}) (ClientId {client = "20"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "[\US\GS~`"})
-              (Token {tokenText = " d\1025577\36290"})
-              (ClientId {client = "d"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\1028415"})
-              (Token {tokenText = "m0\t5"})
-              (ClientId {client = "18"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "CO3\DC3\1010630\NUL\1089070"})
-              (Token {tokenText = "]"})
-              (ClientId {client = "5"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "4"})
-              (Token {tokenText = "\23563\CAN\66375M)\39081O"})
-              (ClientId {client = "2"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\FS3\DC2\ETB\16475t)"})
-              (Token {tokenText = "\167394\1000094h\EMm\ACK"})
-              (ClientId {client = "20"})
-          ),
-          (pushToken (APNSSandbox) (AppName {appNameText = "5"}) (Token {tokenText = ""}) (ClientId {client = "1"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\1036710c\b4\54554X"})
-              (Token {tokenText = "\\\DC2e8"})
-              (ClientId {client = "10"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\ay=\SUB8\SUB\58780"})
-              (Token {tokenText = "\ETBb7~}"})
-              (ClientId {client = "7"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\51121\1105577\20857\CANU\120963m"})
-              (Token {tokenText = "{"})
-              (ClientId {client = "f"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_7 :: PushTokenList
-testObject_PushTokenList_user_7 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "oB\SO"})
-              (Token {tokenText = "\15103q\1056626\1034486<\DC1\1049028"})
-              (ClientId {client = "6"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "6\SI."}) (Token {tokenText = ""}) (ClientId {client = "1d"})),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\DC2Y\986105n\136674\""})
-              (Token {tokenText = "\118955:e\188969"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "5s\USB"})
-              (Token {tokenText = ")\SUB\SO\EM.X"})
-              (ClientId {client = "7"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "r \nr>"})
-              (Token {tokenText = "sd\1063106"})
-              (ClientId {client = "9"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_8 :: PushTokenList
-testObject_PushTokenList_user_8 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNS)
-              (AppName {appNameText = "\1093247\&4 \134867"})
-              (Token {tokenText = "]-"})
-              (ClientId {client = "18"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\983685\1022852"})
-              (Token {tokenText = "H5"})
-              (ClientId {client = "3"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\1081576"})
-              (Token {tokenText = "\1048552El"})
-              (ClientId {client = "10"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "b&\994956\ESC\1004059\&2"})
-              (Token {tokenText = "\DC4O%\SUBb\EOTT"})
-              (ClientId {client = "12"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\178739\t#$G "})
-              (Token {tokenText = "\1014512o."})
-              (ClientId {client = "18"})
-          ),
-          (pushToken (APNSSandbox) (AppName {appNameText = ""}) (Token {tokenText = "A"}) (ClientId {client = "18"})),
-          (pushToken (APNSVoIP) (AppName {appNameText = ""}) (Token {tokenText = ""}) (ClientId {client = "d"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "8\43536.e\DC3K"})
-              (Token {tokenText = "\SYN"})
-              (ClientId {client = "1"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\RSA"})
-              (Token {tokenText = "8\DC4\SOHK"})
-              (ClientId {client = "12"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\DLE/\r%\1078015D@"})
-              (Token {tokenText = "Q\24447"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\EOT\1071073\1089139"})
-              (Token {tokenText = "\b"})
-              (ClientId {client = "5"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "q"})
-              (Token {tokenText = "\184898\USS\189126"})
-              (ClientId {client = "a"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "EN\21622\181405"})
-              (Token {tokenText = "l\164632 m\DC1ob"})
-              (ClientId {client = "1a"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\992637)\1065394"})
-              (Token {tokenText = "\110813\CAN39"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "9\1050943\1064467\53723w\RS"})
-              (Token {tokenText = "\vefi\GS\42199\138040"})
-              (ClientId {client = "18"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\186219/YS"})
-              (Token {tokenText = "\1055639"})
-              (ClientId {client = "10"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "="}) (Token {tokenText = "iv97\53846"}) (ClientId {client = "4"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "O\195038a"})
-              (Token {tokenText = "EG4pJI\t"})
-              (ClientId {client = "1a"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_9 :: PushTokenList
-testObject_PushTokenList_user_9 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "r\SI\b\rqN\a"})
-              (ClientId {client = "b"})
-          ),
-          (pushToken (APNSVoIPSandbox) (AppName {appNameText = ""}) (Token {tokenText = ""}) (ClientId {client = "14"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\1096025W["})
-              (Token {tokenText = "o\DLE\26505"})
-              (ClientId {client = "5"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = "n"}) (Token {tokenText = ""}) (ClientId {client = "4"})),
-          (pushToken (APNS) (AppName {appNameText = "\145387pQ"}) (Token {tokenText = "<V"}) (ClientId {client = "1c"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\156163\ENQ\\\1063814/Kg"})
-              (Token {tokenText = "\ENQ,\aB"})
-              (ClientId {client = "8"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\1032122"})
-              (Token {tokenText = "\\O\ETB@"})
-              (ClientId {client = "1c"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "\3548%\SOvy"}) (Token {tokenText = ""}) (ClientId {client = "15"}))
-        ]
-    }
-
-testObject_PushTokenList_user_10 :: PushTokenList
-testObject_PushTokenList_user_10 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNS)
-              (AppName {appNameText = "\DC3\ACK\162375\1101221\DELO\a"})
-              (Token {tokenText = "\1018536\SO\161727"})
-              (ClientId {client = "18"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\8090\1000348%"})
-              (Token {tokenText = "s\ENQVun\1005035"})
-              (ClientId {client = "7"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "I^\DEL1"})
-              (Token {tokenText = "V|\170473\\"})
-              (ClientId {client = "13"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\61895P\147746\38021\f"})
-              (Token {tokenText = "!w\45228\1001710"})
-              (ClientId {client = "9"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "|8V"})
-              (Token {tokenText = "\b\194812y\NUL_\EM"})
-              (ClientId {client = "f"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\ETX\RSC"})
-              (Token {tokenText = "D\1041307E"})
-              (ClientId {client = "17"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "t\126508\EOT8"})
-              (Token {tokenText = "`\3402W\NAKf"})
-              (ClientId {client = "b"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "r\16030\993384\51833\1048459"})
-              (ClientId {client = "8"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "?\30044~i:\SOH"})
-              (Token {tokenText = "\v(-}#U"})
-              (ClientId {client = "10"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "]"})
-              (Token {tokenText = "a@"})
-              (ClientId {client = "0"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "B\RS"}) (Token {tokenText = ""}) (ClientId {client = "1d"})),
-          (pushToken (APNSSandbox) (AppName {appNameText = ""}) (Token {tokenText = ""}) (ClientId {client = "14"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "M\140208#\v#"})
-              (Token {tokenText = "vp%2\ETX\ESC"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\133489o\DC3aK"})
-              (ClientId {client = "1c"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = "\SYNzezn"}) (Token {tokenText = "l"}) (ClientId {client = "1"})),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "y\1084633\EM\bSF\1103768"})
-              (Token {tokenText = "\40469n<\78784"})
-              (ClientId {client = "2"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "T\ENQ"}) (Token {tokenText = "z"}) (ClientId {client = "8"})),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "S\1110068E"})
-              (Token {tokenText = "\1062660\1009981\NAK\32290"})
-              (ClientId {client = "12"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\ETXq\3375\1092244\95123"})
-              (Token {tokenText = "y\1048012cE\DC1"})
-              (ClientId {client = "3"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "U7"})
-              (Token {tokenText = "`\134613o"})
-              (ClientId {client = "1c"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = "D-"}) (Token {tokenText = ""}) (ClientId {client = "0"}))
-        ]
-    }
-
-testObject_PushTokenList_user_11 :: PushTokenList
-testObject_PushTokenList_user_11 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\FSO#uoH"})
-              (Token {tokenText = "\16610RP~\b"})
-              (ClientId {client = "1e"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "b\1057247\bZ&\SYN"})
-              (Token {tokenText = "\135818\53866!\DC1\ENQ"})
-              (ClientId {client = "10"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = ")Di\SUB"}) (Token {tokenText = ""}) (ClientId {client = "6"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "5[#*\1075192m"})
-              (Token {tokenText = "\1026003~"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\DLE\98068\NAKV/"})
-              (ClientId {client = "15"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "4"})
-              (Token {tokenText = "\ENQX\1093607MF_"})
-              (ClientId {client = "f"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "b\1031685:\66362R\1041293\1077360"})
-              (Token {tokenText = "M"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "U"})
-              (Token {tokenText = "\nBaP9\FS"})
-              (ClientId {client = "20"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\9336"})
-              (Token {tokenText = "\1080317\65711f\1004099"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "Y\DC2"})
-              (Token {tokenText = "X\n1wv"})
-              (ClientId {client = "1f"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\60408\158201Z"})
-              (Token {tokenText = "\tx"})
-              (ClientId {client = "1d"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "#!G\1109681."})
-              (Token {tokenText = "vZ "})
-              (ClientId {client = "7"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "M\42368$\SUBV"})
-              (Token {tokenText = "T\1047491\DC1x="})
-              (ClientId {client = "11"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\133572e<4P"})
-              (Token {tokenText = "G"})
-              (ClientId {client = "1d"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_12 :: PushTokenList
-testObject_PushTokenList_user_12 =
-  PushTokenList
-    { pushTokens =
-        [ (pushToken (GCM) (AppName {appNameText = "`O8&\16125"}) (Token {tokenText = ">#"}) (ClientId {client = "1e"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "t2;b\73775[\ETB"})
-              (Token {tokenText = "7u\167444"})
-              (ClientId {client = "2"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = ""}) (Token {tokenText = ":\vY"}) (ClientId {client = "15"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\DC4\n\1080841_"})
-              (Token {tokenText = "\38914,u\1043649"})
-              (ClientId {client = "4"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\r"})
-              (Token {tokenText = "\170656\&6"})
-              (ClientId {client = "a"})
-          ),
-          (pushToken (APNSSandbox) (AppName {appNameText = "7bVc"}) (Token {tokenText = "YW"}) (ClientId {client = "f"})),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\SYNOl\DLE\1082224\b"})
-              (Token {tokenText = "\a0@"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "P\ETBt"})
-              (Token {tokenText = "\1063980\DC2\1067158\51560y3"})
-              (ClientId {client = "8"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = " \987853P"})
-              (Token {tokenText = "X\1019079\1029687,"})
-              (ClientId {client = "2"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\b\186166\2975%Y\DELe"})
-              (Token {tokenText = "\GSs\23362\CAN\1048543;"})
-              (ClientId {client = "11"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "q3"})
-              (Token {tokenText = "\96576"})
-              (ClientId {client = "5"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "b"}) (Token {tokenText = "\DC4"}) (ClientId {client = "15"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\38059|\1082189A\61431\74394"})
-              (Token {tokenText = "T?["})
-              (ClientId {client = "4"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\179985"})
-              (Token {tokenText = "\984961\36065"})
-              (ClientId {client = "12"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "%\31677"})
-              (Token {tokenText = "#"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\1004113%"})
-              (Token {tokenText = "\149348\1044202\SOH6F7"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "!NS\168146"})
-              (Token {tokenText = ",\1049258\1064307\154352D\38789|"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\999775dJ"})
-              (Token {tokenText = "|\v-\SUB]"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\SOHVX\74234"})
-              (Token {tokenText = "@\a\77925.\r\DC3\EOT"})
-              (ClientId {client = "3"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\t\154165gA"})
-              (Token {tokenText = "\1017697\&7]\100427"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\ENQSk"})
-              (Token {tokenText = "\168039\CAN\ENQ-\161213"})
-              (ClientId {client = "9"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\SO\SOH\EOTo\EOT"})
-              (Token {tokenText = "2\NULG_{"})
-              (ClientId {client = "11"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "\65604\bX"}) (Token {tokenText = "\DC1"}) (ClientId {client = "3"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "c\ETXb\1110298"})
-              (Token {tokenText = "c\SO"})
-              (ClientId {client = "3"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "Ej\a\SOH"}) (Token {tokenText = ""}) (ClientId {client = "14"}))
-        ]
-    }
-
-testObject_PushTokenList_user_13 :: PushTokenList
-testObject_PushTokenList_user_13 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "!J^l"})
-              (Token {tokenText = "\1035871\DC1]"})
-              (ClientId {client = "b"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\ETBf"})
-              (Token {tokenText = "\1078084\1055795f\188949\DC2Pc"})
-              (ClientId {client = "15"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_14 :: PushTokenList
-testObject_PushTokenList_user_14 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "as\ETXW\1057218"})
-              (Token {tokenText = "\GS"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\1094404\"x"})
-              (Token {tokenText = ""})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "Y_\DEL\EM\49004\&8"})
-              (Token {tokenText = "\USVq\NAK\SUB\10430"})
-              (ClientId {client = "16"})
-          ),
-          (pushToken (APNSVoIPSandbox) (AppName {appNameText = ""}) (Token {tokenText = "d"}) (ClientId {client = "7"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "nq6\1015524\&0U\1062389"})
-              (Token {tokenText = "6^5P\45687\1051701F"})
-              (ClientId {client = "18"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "?;r"})
-              (Token {tokenText = "\1096892\ETX"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\1106578\&9"})
-              (ClientId {client = "3"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\DC4r\1107266\b;"})
-              (Token {tokenText = "R\1053272\178891"})
-              (ClientId {client = "9"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "bIv"}) (Token {tokenText = "\STX"}) (ClientId {client = "c"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ":\62340(#\b"})
-              (Token {tokenText = ""})
-              (ClientId {client = "b"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "{\NUL\aZb!~"})
-              (Token {tokenText = "B\97571Q}\58604"})
-              (ClientId {client = "19"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\127832\186505Z\1003749#"})
-              (Token {tokenText = "\30444YL4[O\DLE"})
-              (ClientId {client = "f"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "B\SI?"})
-              (Token {tokenText = "ROqs\1000507_\173582"})
-              (ClientId {client = "10"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "E\DC2\CAN\93765"})
-              (Token {tokenText = "Ejl;Zgc"})
-              (ClientId {client = "19"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "\CANG"}) (Token {tokenText = "1<"}) (ClientId {client = "14"})),
-          (pushToken (APNS) (AppName {appNameText = "!\57637Y"}) (Token {tokenText = "w!"}) (ClientId {client = "13"}))
-        ]
-    }
-
-testObject_PushTokenList_user_15 :: PushTokenList
-testObject_PushTokenList_user_15 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\181237\f\131302/l!\1110857"})
-              (Token {tokenText = "\1057340R\1084908\tV\7833,"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\ETX\1045203\1001387:}"})
-              (Token {tokenText = "f$PT*|\SO"})
-              (ClientId {client = "8"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = ""}) (Token {tokenText = "x%4k"}) (ClientId {client = "14"})),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "J5\127327i>r"})
-              (Token {tokenText = "\FS\t"})
-              (ClientId {client = "1b"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "[\SYN\1002162v"})
-              (Token {tokenText = "\1015507\12310r@\ETXB\DC2"})
-              (ClientId {client = "14"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = " c=D\NULg2"})
-              (Token {tokenText = "_\RSg"})
-              (ClientId {client = "17"})
-          ),
-          (pushToken (APNSSandbox) (AppName {appNameText = "q"}) (Token {tokenText = ""}) (ClientId {client = "1d"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "="})
-              (Token {tokenText = "C!("})
-              (ClientId {client = "e"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = "\54091"}) (Token {tokenText = "'"}) (ClientId {client = "6"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "d\CAN:`j;*"})
-              (Token {tokenText = "EN\1025768\1018919"})
-              (ClientId {client = "d"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\139704W_\97907"})
-              (Token {tokenText = ""})
-              (ClientId {client = "15"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "vr/+["})
-              (Token {tokenText = ":^\1066182\&7\ETB["})
-              (ClientId {client = "a"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "Z\1099909\1020730\NUL\1087668l"})
-              (Token {tokenText = "\DLEH"})
-              (ClientId {client = "17"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "V\180754$\EOTVJ"})
-              (Token {tokenText = "5\136826F\1112361"})
-              (ClientId {client = "20"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "\163961"}) (Token {tokenText = "'S"}) (ClientId {client = "3"})),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\1009392\183815\DC1y@"})
-              (Token {tokenText = "w"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\SOHS\"\100262?s"})
-              (Token {tokenText = "\136522"})
-              (ClientId {client = "e"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "/\58785\SOHF\1007832o\26020"})
-              (Token {tokenText = "f\1034951<Gz"})
-              (ClientId {client = "4"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "'\66578"})
-              (Token {tokenText = "\60495l\23343\1057245x\NUL"})
-              (ClientId {client = "11"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = ",\1105750H*\1010267\146059\1087441"})
-              (Token {tokenText = "L\NAK\64434"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "0\133103\t+\1102153"})
-              (ClientId {client = "4"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "oO\100447"})
-              (ClientId {client = "2"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_16 :: PushTokenList
-testObject_PushTokenList_user_16 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNS)
-              (AppName {appNameText = "T\167856\39439\1015520"})
-              (Token {tokenText = ""})
-              (ClientId {client = "c"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = "r|"}) (Token {tokenText = "/"}) (ClientId {client = "b"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\44488i\63814\&2\NAK"})
-              (ClientId {client = "a"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "\RS|d#w\SUB"}) (Token {tokenText = ""}) (ClientId {client = "f"})),
-          (pushToken (GCM) (AppName {appNameText = "y\SI\f{"}) (Token {tokenText = "\RS"}) (ClientId {client = "e"})),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\SO\1015286J"})
-              (Token {tokenText = "="})
-              (ClientId {client = "20"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "x"})
-              (Token {tokenText = "\17111\b\170016\RS\98226Bz"})
-              (ClientId {client = "0"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\SI"})
-              (Token {tokenText = ""})
-              (ClientId {client = "13"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\ESC\33474ug\32900\ETB\\"})
-              (Token {tokenText = "FoT7\n\141967\1089002"})
-              (ClientId {client = "d"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "8q\25538k\EM\185153#"})
-              (Token {tokenText = "#-NY\188826\ACK"})
-              (ClientId {client = "13"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\133975EwvK!z"})
-              (Token {tokenText = "\1068274!N*\USi"})
-              (ClientId {client = "a"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\ESC\43864"})
-              (Token {tokenText = "\1088460+"})
-              (ClientId {client = "19"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "0\SOHn\NAK"})
-              (Token {tokenText = "\138019#<\1030926"})
-              (ClientId {client = "e"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "-\54284\1035869\FS\SO"})
-              (Token {tokenText = ",fkyy\1067328"})
-              (ClientId {client = "1d"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\SOH\\"})
-              (Token {tokenText = "\SOHkr\38903\1020799"})
-              (ClientId {client = "2"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\1109645\SUBr"})
-              (Token {tokenText = "rt"})
-              (ClientId {client = "1d"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\140416\95336"})
-              (Token {tokenText = "\"\EOT6"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "9^y5"})
-              (Token {tokenText = "\1073548]\187885c\1066081M"})
-              (ClientId {client = "2"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "s\DEL"})
-              (Token {tokenText = "Y:\DEL\ENQ\DC3\SO"})
-              (ClientId {client = "1a"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "6\170636\169220\1026798N\23939A"})
-              (Token {tokenText = "7"})
-              (ClientId {client = "1d"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\1101750{B;\SI"})
-              (Token {tokenText = "\1094362\184644\174325O?;"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "\189040~r\1085566i"})
-              (Token {tokenText = "q\58879<;%"})
-              (ClientId {client = "7"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_17 :: PushTokenList
-testObject_PushTokenList_user_17 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "0\t"})
-              (Token {tokenText = "q\EOT\1060549G\a\95664f"})
-              (ClientId {client = "10"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\984076\179100\1000727h\\:"})
-              (Token {tokenText = "\SUBZ\997871["})
-              (ClientId {client = "0"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_18 :: PushTokenList
-testObject_PushTokenList_user_18 =
-  PushTokenList
-    { pushTokens =
-        [ (pushToken (GCM) (AppName {appNameText = ""}) (Token {tokenText = "\876\&7"}) (ClientId {client = "11"})),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "x"})
-              (Token {tokenText = "\1022767\DLE\DLEq\"g"})
-              (ClientId {client = "8"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\NAK\1041649|0\1102527\STX"})
-              (Token {tokenText = "q<\DLE"})
-              (ClientId {client = "18"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "7;\162029"}) (Token {tokenText = ""}) (ClientId {client = "18"})),
-          ( pushToken
-              (APNSSandbox)
-              (AppName {appNameText = "?\142609\DEL*\1056538"})
-              (Token {tokenText = "<D\DC4h"})
-              (ClientId {client = "c"})
-          ),
-          (pushToken (GCM) (AppName {appNameText = "\r;"}) (Token {tokenText = "H\SUB#3"}) (ClientId {client = "8"})),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\22970\98791\173509/g"})
-              (Token {tokenText = "C,"})
-              (ClientId {client = "20"})
-          ),
-          (pushToken (APNSVoIP) (AppName {appNameText = ""}) (Token {tokenText = ""}) (ClientId {client = "1b"})),
-          (pushToken (GCM) (AppName {appNameText = "\ACK"}) (Token {tokenText = "4"}) (ClientId {client = "1"})),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\SYN:r="})
-              (Token {tokenText = "n\EMf\39247U"})
-              (ClientId {client = "b"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = ""}) (Token {tokenText = "r\CAN"}) (ClientId {client = "f"}))
-        ]
-    }
-
-testObject_PushTokenList_user_19 :: PushTokenList
-testObject_PushTokenList_user_19 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (GCM)
-              (AppName {appNameText = "2\1032788"})
-              (Token {tokenText = "\1064921+\1009649"})
-              (ClientId {client = "1a"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "w"}) (Token {tokenText = "U"}) (ClientId {client = "19"})),
-          (pushToken (APNSVoIP) (AppName {appNameText = "\DC1"}) (Token {tokenText = "\f\a"}) (ClientId {client = "c"})),
-          (pushToken (GCM) (AppName {appNameText = "\SO\NAK"}) (Token {tokenText = ""}) (ClientId {client = "8"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "j\n\111027>_\RS}"})
-              (Token {tokenText = "\78323%"})
-              (ClientId {client = "16"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\1025206$\15121\EMQw"})
-              (Token {tokenText = "\1000219\1102732z\1109638YY"})
-              (ClientId {client = "15"})
-          ),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "tu\31405@\1032787"})
-              (Token {tokenText = "\EOT\151479nUJY"})
-              (ClientId {client = "1c"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\1045884"})
-              (Token {tokenText = "d\135913\DEL\SUBL"})
-              (ClientId {client = "11"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\ENQ\158055\&4"})
-              (Token {tokenText = "]\DC2"})
-              (ClientId {client = "6"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = "\48633\SYN\983526\&1\9164@"})
-              (Token {tokenText = "\1105779xf("})
-              (ClientId {client = "17"})
-          ),
-          (pushToken (APNS) (AppName {appNameText = "\RS"}) (Token {tokenText = "i!l)E\SOg"}) (ClientId {client = "5"})),
-          ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "+~?lH\1063472\&4"})
-              (Token {tokenText = ""})
-              (ClientId {client = "1"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\1086043\176914L\26531\1042840"})
-              (Token {tokenText = "`\1069575"})
-              (ClientId {client = "b"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "j`8?\ESC^"})
-              (Token {tokenText = "_\1075349Bm"})
-              (ClientId {client = "5"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "t \USE["})
-              (Token {tokenText = "\SOH\162814\DEL<"})
-              (ClientId {client = "1e"})
-          )
-        ]
-    }
-
-testObject_PushTokenList_user_20 :: PushTokenList
-testObject_PushTokenList_user_20 =
-  PushTokenList
-    { pushTokens =
-        [ ( pushToken
-              (APNSVoIP)
-              (AppName {appNameText = "\1014551"})
-              (Token {tokenText = "\51624\DC2$\DC2w"})
-              (ClientId {client = "e"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "50"})
-              (Token {tokenText = "M"})
-              (ClientId {client = "c"})
-          ),
-          ( pushToken
-              (GCM)
-              (AppName {appNameText = ""})
-              (Token {tokenText = "\ESCl\1078085<Z\ACK"})
-              (ClientId {client = "e"})
-          ),
-          ( pushToken
-              (APNSVoIPSandbox)
-              (AppName {appNameText = "\1077617,\DC2X\SO\1025859"})
-              (Token {tokenText = "*\t"})
-              (ClientId {client = "1d"})
-          ),
-          ( pushToken
-              (APNS)
-              (AppName {appNameText = "\10134$"})
-              (Token {tokenText = "\\\183333&\SIq"})
-              (ClientId {client = "12"})
-          )
-        ]
-    }
+  PushTokenList []
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushToken_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushToken_user.hs
index eb36608bd4a..d53531a6c5a 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushToken_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/PushToken_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -23,166 +21,14 @@ import Wire.API.Push.Token
   ( AppName (AppName, appNameText),
     PushToken,
     Token (Token, tokenText),
-    Transport (APNS, APNSSandbox, APNSVoIP, APNSVoIPSandbox, GCM),
+    Transport (APNSSandbox),
     pushToken,
   )
 
 testObject_PushToken_user_1 :: PushToken
 testObject_PushToken_user_1 =
-  ( pushToken
-      (APNSSandbox)
-      (AppName {appNameText = "G\1008289"})
-      (Token {tokenText = "\EOT8M\NAKAv\1104873"})
-      (ClientId {client = "16"})
-  )
-
-testObject_PushToken_user_2 :: PushToken
-testObject_PushToken_user_2 =
-  ( pushToken
-      (APNSVoIP)
-      (AppName {appNameText = "G\r\42700\r"})
-      (Token {tokenText = "\188813\ETX\118978"})
-      (ClientId {client = "1e"})
-  )
-
-testObject_PushToken_user_3 :: PushToken
-testObject_PushToken_user_3 =
-  (pushToken (APNSSandbox) (AppName {appNameText = "9\f"}) (Token {tokenText = "\ETX"}) (ClientId {client = "13"}))
-
-testObject_PushToken_user_4 :: PushToken
-testObject_PushToken_user_4 =
-  ( pushToken
-      (APNSSandbox)
-      (AppName {appNameText = "C%\SOH\v\1091701H\1022158"})
-      (Token {tokenText = "\SOH$\SYNW"})
-      (ClientId {client = "b"})
-  )
-
-testObject_PushToken_user_5 :: PushToken
-testObject_PushToken_user_5 =
-  ( pushToken
-      (GCM)
-      (AppName {appNameText = "<F"})
-      (Token {tokenText = "\468\&9\1037687mz\27063\FS"})
-      (ClientId {client = "19"})
-  )
-
-testObject_PushToken_user_6 :: PushToken
-testObject_PushToken_user_6 =
-  (pushToken (APNSVoIP) (AppName {appNameText = "\1043230"}) (Token {tokenText = "_S"}) (ClientId {client = "15"}))
-
-testObject_PushToken_user_7 :: PushToken
-testObject_PushToken_user_7 =
-  (pushToken (GCM) (AppName {appNameText = "\997790"}) (Token {tokenText = "Z\STXJ"}) (ClientId {client = "14"}))
-
-testObject_PushToken_user_8 :: PushToken
-testObject_PushToken_user_8 =
-  ( pushToken
-      (APNSVoIP)
-      (AppName {appNameText = "*/"})
-      (Token {tokenText = "c\DEL\993798\1029314"})
-      (ClientId {client = "1f"})
-  )
-
-testObject_PushToken_user_9 :: PushToken
-testObject_PushToken_user_9 =
-  ( pushToken
-      (APNSVoIPSandbox)
-      (AppName {appNameText = ""})
-      (Token {tokenText = "\990144Fm\1086553\1050803"})
-      (ClientId {client = "8"})
-  )
-
-testObject_PushToken_user_10 :: PushToken
-testObject_PushToken_user_10 =
-  ( pushToken
-      (APNSVoIPSandbox)
-      (AppName {appNameText = "J"})
-      (Token {tokenText = "h\998173ZFt0"})
-      (ClientId {client = "17"})
-  )
-
-testObject_PushToken_user_11 :: PushToken
-testObject_PushToken_user_11 =
-  ( pushToken
-      (APNSVoIP)
-      (AppName {appNameText = "\1037307\43873\42199"})
-      (Token {tokenText = "I"})
-      (ClientId {client = "11"})
-  )
-
-testObject_PushToken_user_12 :: PushToken
-testObject_PushToken_user_12 =
-  ( pushToken
-      (APNSVoIP)
-      (AppName {appNameText = "4\157970E$\179876Z\152804"})
-      (Token {tokenText = "5Q\29832\9020#\f"})
-      (ClientId {client = "18"})
-  )
-
-testObject_PushToken_user_13 :: PushToken
-testObject_PushToken_user_13 =
-  ( pushToken
-      (APNSVoIP)
-      (AppName {appNameText = "\111173\1022802;\147450;`"})
-      (Token {tokenText = "os\1078856\&9\DC4{"})
-      (ClientId {client = "1b"})
-  )
-
-testObject_PushToken_user_14 :: PushToken
-testObject_PushToken_user_14 =
-  ( pushToken
-      (APNSVoIPSandbox)
-      (AppName {appNameText = "\23524\17553\145614?L"})
-      (Token {tokenText = "@"})
-      (ClientId {client = "1a"})
-  )
-
-testObject_PushToken_user_15 :: PushToken
-testObject_PushToken_user_15 =
-  ( pushToken
-      (APNSSandbox)
-      (AppName {appNameText = ""})
-      (Token {tokenText = "\SI\12188h\120421\54584\NUL\NAK"})
-      (ClientId {client = "6"})
-  )
-
-testObject_PushToken_user_16 :: PushToken
-testObject_PushToken_user_16 =
-  ( pushToken
-      (APNSVoIP)
-      (AppName {appNameText = "s\25171z\182700"})
-      (Token {tokenText = "\CAN"})
-      (ClientId {client = "1d"})
-  )
-
-testObject_PushToken_user_17 :: PushToken
-testObject_PushToken_user_17 =
-  ( pushToken
-      (APNSSandbox)
-      (AppName {appNameText = "$\1042956\SOH"})
-      (Token {tokenText = "\"-*4\1000675q\1045235"})
-      (ClientId {client = "15"})
-  )
-
-testObject_PushToken_user_18 :: PushToken
-testObject_PushToken_user_18 =
-  ( pushToken
-      (GCM)
-      (AppName {appNameText = "\1057135;\134834v4\b6"})
-      (Token {tokenText = "#\983343V\DELH\1053936\94560"})
-      (ClientId {client = "1e"})
-  )
-
-testObject_PushToken_user_19 :: PushToken
-testObject_PushToken_user_19 =
-  ( pushToken
-      (APNSVoIP)
-      (AppName {appNameText = "\992696\1085063\1030175\128353"})
-      (Token {tokenText = "n%\NAK\8959l\ETX"})
-      (ClientId {client = "1d"})
-  )
-
-testObject_PushToken_user_20 :: PushToken
-testObject_PushToken_user_20 =
-  (pushToken (APNS) (AppName {appNameText = "j\462BPh&"}) (Token {tokenText = "\93035,/.pL"}) (ClientId {client = "9"}))
+  pushToken
+    APNSSandbox
+    (AppName {appNameText = "G\1008289"})
+    (Token {tokenText = "\EOT8M\NAKAv\1104873"})
+    (ClientId {client = "16"})
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Push_2eToken_2eTransport_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Push_2eToken_2eTransport_user.hs
index c166ad2f227..c101f3ae628 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Push_2eToken_2eTransport_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Push_2eToken_2eTransport_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,61 +20,16 @@ import Wire.API.Push.Token (Transport (APNS, APNSSandbox, APNSVoIP, APNSVoIPSand
 import qualified Wire.API.Push.Token as Push.Token (Transport)
 
 testObject_Push_2eToken_2eTransport_user_1 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_1 = APNSVoIPSandbox
+testObject_Push_2eToken_2eTransport_user_1 = GCM
 
 testObject_Push_2eToken_2eTransport_user_2 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_2 = APNSSandbox
+testObject_Push_2eToken_2eTransport_user_2 = APNS
 
 testObject_Push_2eToken_2eTransport_user_3 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_3 = APNS
+testObject_Push_2eToken_2eTransport_user_3 = APNSSandbox
 
 testObject_Push_2eToken_2eTransport_user_4 :: Push.Token.Transport
 testObject_Push_2eToken_2eTransport_user_4 = APNSVoIP
 
 testObject_Push_2eToken_2eTransport_user_5 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_5 = APNSSandbox
-
-testObject_Push_2eToken_2eTransport_user_6 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_6 = APNSVoIPSandbox
-
-testObject_Push_2eToken_2eTransport_user_7 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_7 = APNSVoIP
-
-testObject_Push_2eToken_2eTransport_user_8 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_8 = APNS
-
-testObject_Push_2eToken_2eTransport_user_9 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_9 = GCM
-
-testObject_Push_2eToken_2eTransport_user_10 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_10 = GCM
-
-testObject_Push_2eToken_2eTransport_user_11 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_11 = APNSVoIPSandbox
-
-testObject_Push_2eToken_2eTransport_user_12 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_12 = APNSSandbox
-
-testObject_Push_2eToken_2eTransport_user_13 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_13 = GCM
-
-testObject_Push_2eToken_2eTransport_user_14 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_14 = GCM
-
-testObject_Push_2eToken_2eTransport_user_15 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_15 = GCM
-
-testObject_Push_2eToken_2eTransport_user_16 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_16 = APNSVoIPSandbox
-
-testObject_Push_2eToken_2eTransport_user_17 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_17 = APNSVoIPSandbox
-
-testObject_Push_2eToken_2eTransport_user_18 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_18 = APNSVoIPSandbox
-
-testObject_Push_2eToken_2eTransport_user_19 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_19 = APNS
-
-testObject_Push_2eToken_2eTransport_user_20 :: Push.Token.Transport
-testObject_Push_2eToken_2eTransport_user_20 = APNSSandbox
+testObject_Push_2eToken_2eTransport_user_5 = APNSVoIPSandbox
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotificationList_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotificationList_user.hs
index 834ba32cc18..738a421752a 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotificationList_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotificationList_user.hs
@@ -18,7 +18,7 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.QueuedNotificationList_user where
 
-import Data.Aeson (Value (Array, Bool, Null, Number, Object, String))
+import Data.Aeson (Value (Bool, Null))
 import Data.Id (Id (Id))
 import qualified Data.List.NonEmpty as NonEmpty (fromList)
 import Data.List1 (List1 (List1))
@@ -29,449 +29,19 @@ import Wire.API.Notification (QueuedNotificationList, queuedNotification, queued
 
 testObject_QueuedNotificationList_user_1 :: QueuedNotificationList
 testObject_QueuedNotificationList_user_1 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000"))))
-              ( ( List1
-                    ( NonEmpty.fromList
-                        [ fromList [("", Null), ("p", Bool True)],
-                          fromList [],
-                          fromList [],
-                          fromList [],
-                          fromList [],
-                          fromList [],
-                          fromList [],
-                          fromList []
-                        ]
-                    )
-                )
-              )
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000100000002"))))
-              ((List1 (NonEmpty.fromList [fromList [("", Array [String "\SO"])], fromList []])))
-          )
-        ]
-      )
-      (True)
-      (fmap read (Just "1864-05-19 07:34:20.509238926493 UTC"))
-  )
+  queuedNotificationList
+    [ queuedNotification
+        (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000100000000")))
+        ( List1
+            ( NonEmpty.fromList
+                [ fromList [("", Null), ("p", Bool True)]
+                ]
+            )
+        )
+    ]
+    True
+    (fmap read (Just "1864-05-19 07:34:20.509238926493 UTC"))
 
 testObject_QueuedNotificationList_user_2 :: QueuedNotificationList
 testObject_QueuedNotificationList_user_2 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList [], fromList [], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))))
-              ( ( List1
-                    ( NonEmpty.fromList
-                        [fromList [("", Array [Number (0.0), Null])], fromList [("", Array [String "", Null])]]
-                    )
-                )
-              )
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList [("", String "")]])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList [("\1002760", Array [])], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList []])))
-          )
-        ]
-      )
-      (False)
-      (fmap read (Just "1864-04-29 13:53:36.621523022731 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_3 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_3 =
-  (queuedNotificationList ([]) (True) (fmap read (Just "1864-05-16 13:53:35.281384700276 UTC")))
-
-testObject_QueuedNotificationList_user_4 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_4 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000000"))))
-              ( ( List1
-                    ( NonEmpty.fromList
-                        [ fromList [("", Array [Null]), ("\7770c", Number (-20.0))],
-                          fromList [],
-                          fromList [],
-                          fromList [],
-                          fromList [],
-                          fromList []
-                        ]
-                    )
-                )
-              )
-          )
-        ]
-      )
-      (True)
-      (fmap read (Just "1864-05-07 03:04:03.677917355524 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_5 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_5 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))))
-              ( ( List1
-                    (NonEmpty.fromList [fromList [("y", Object (fromList [("", String "")]))], fromList [("!", Array [])]])
-                )
-              )
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList [("", Object (fromList [(":", Null)]))], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList [], fromList []])))
-          )
-        ]
-      )
-      (True)
-      (fmap read (Just "1864-05-04 20:04:00.385969583352 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_6 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_6 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          )
-        ]
-      )
-      (False)
-      (fmap read (Just "1864-05-10 02:08:41.125447101921 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_7 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_7 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000300000001"))))
-              ( ( List1
-                    ( NonEmpty.fromList
-                        [ fromList
-                            [ ("\45585I\171412\SUB", Array []),
-                              ("", Object (fromList [])),
-                              ("'\8002'V\174940", Null),
-                              ("r", String "\34871u\143514DH")
-                            ],
-                          fromList [("", Object (fromList [("1", Null)]))],
-                          fromList [],
-                          fromList []
-                        ]
-                    )
-                )
-              )
-          )
-        ]
-      )
-      (False)
-      (fmap read (Nothing))
-  )
-
-testObject_QueuedNotificationList_user_8 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_8 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000100000004"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList [], fromList []])))
-          )
-        ]
-      )
-      (False)
-      (fmap read (Just "1864-05-06 19:34:07.842851307868 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_9 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_9 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000003-0000-0000-0000-000100000003"))))
-              ( ( List1
-                    ( NonEmpty.fromList
-                        [ fromList
-                            [ ("^e[\1086653i", Array [Null]),
-                              ("l", Array [String "yv\bu\a"]),
-                              ("B8+#", String "\SUB`\1088953"),
-                              ("\NUL&k\1085174", Object (fromList [("e\EM\990200$", Number (4.0e-3))])),
-                              ("c\138868", Null)
-                            ],
-                          fromList []
-                        ]
-                    )
-                )
-              )
-          )
-        ]
-      )
-      (True)
-      (fmap read (Just "1864-05-19 05:14:44.883081744636 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_10 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_10 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList [("", Object (fromList []))]])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList [("", Object (fromList [("", String "")]))]])))
-          )
-        ]
-      )
-      (True)
-      (fmap read (Just "1864-05-14 22:59:36.632886313527 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_11 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_11 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          )
-        ]
-      )
-      (True)
-      (fmap read (Nothing))
-  )
-
-testObject_QueuedNotificationList_user_12 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_12 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList [], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          )
-        ]
-      )
-      (True)
-      (fmap read (Just "1864-05-04 09:15:29.205195175891 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_13 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_13 =
-  (queuedNotificationList ([]) (False) (fmap read (Just "1864-05-01 19:33:18.971740786102 UTC")))
-
-testObject_QueuedNotificationList_user_14 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_14 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          )
-        ]
-      )
-      (False)
-      (fmap read (Just "1864-04-30 07:58:44.856820480203 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_15 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_15 =
-  (queuedNotificationList ([]) (True) (fmap read (Just "1864-05-01 05:18:36.710631729776 UTC")))
-
-testObject_QueuedNotificationList_user_16 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_16 =
-  (queuedNotificationList ([]) (True) (fmap read (Just "1864-05-12 20:30:51.221043991768 UTC")))
-
-testObject_QueuedNotificationList_user_17 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_17 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          )
-        ]
-      )
-      (True)
-      (fmap read (Nothing))
-  )
-
-testObject_QueuedNotificationList_user_18 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_18 = (queuedNotificationList ([]) (True) (fmap read (Nothing)))
-
-testObject_QueuedNotificationList_user_19 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_19 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))))
-              ((List1 (NonEmpty.fromList [fromList [], fromList [], fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList [("\1062330", String "")], fromList []])))
-          )
-        ]
-      )
-      (True)
-      (fmap read (Just "1864-05-01 08:57:14.649508884242 UTC"))
-  )
-
-testObject_QueuedNotificationList_user_20 :: QueuedNotificationList
-testObject_QueuedNotificationList_user_20 =
-  ( queuedNotificationList
-      ( [ ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          ),
-          ( queuedNotification
-              ((Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))))
-              ((List1 (NonEmpty.fromList [fromList []])))
-          )
-        ]
-      )
-      (False)
-      (fmap read (Just "1864-05-01 03:16:29.788087572971 UTC"))
-  )
+  queuedNotificationList [] False Nothing
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotification_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotification_user.hs
index f92af7f1891..63eadadcea7 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotification_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/QueuedNotification_user.hs
@@ -18,700 +18,23 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.QueuedNotification_user where
 
-import Data.Aeson (Value (Array, Bool, Null, Number, Object, String))
+import Data.Aeson (Value (Array))
 import Data.Id (Id (Id))
 import qualified Data.List.NonEmpty as NonEmpty (fromList)
 import Data.List1 (List1 (List1))
 import qualified Data.UUID as UUID (fromString)
 import GHC.Exts (IsList (fromList))
-import Imports (Bool (False, True), fromJust)
+import Imports (fromJust)
 import Wire.API.Notification (QueuedNotification, queuedNotification)
 
 testObject_QueuedNotification_user_1 :: QueuedNotification
 testObject_QueuedNotification_user_1 =
   ( queuedNotification
-      ((Id (fromJust (UUID.fromString "0000005f-0000-007b-0000-001a0000000a"))))
+      (Id (fromJust (UUID.fromString "0000005f-0000-007b-0000-001a0000000a")))
       ( ( List1
             ( NonEmpty.fromList
                 [ fromList [],
-                  fromList [("\179372\&3", Array [])],
-                  fromList [],
-                  fromList [("\\", String "\1054252\1015250")],
-                  fromList [("\1065105\DC4", Null), ("\1067229U", String "#\53284")]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_2 :: QueuedNotification
-testObject_QueuedNotification_user_2 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "0000005d-0000-0048-0000-00720000007c"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList [("\1058751\181510", Number (1500.0)), ("\a\156473", Number (9.0e13)), ("y", Number (3000000.0))],
-                  fromList [],
-                  fromList
-                    [ ( "O>\16513\1022654\FS",
-                        Array [String "", Bool True, Bool True, Null, Bool False, Bool False, Bool True, Null]
-                      ),
-                      ("\1044716P\DC1~", Array [Number (200.0), Bool False]),
-                      ("\1090029", Object (fromList [("F\160193|", Bool False)])),
-                      ("/e\25928\SOH[@", Null),
-                      (")=\US\n", Object (fromList [])),
-                      ("\DLE\1029229\997140", Array [Null, Bool True, Bool True]),
-                      ("B.d\ETX`", String "n\DC3")
-                    ]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_3 :: QueuedNotification
-testObject_QueuedNotification_user_3 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000009-0000-007a-0000-000e00000026"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ("\95007P\GS7\170882l[\t", Array [Number (7000000.0), Null]),
-                      ("", Bool True),
-                      ("y_\"K\1060452\160314\t\SYN\bg\EOT", Null),
-                      ("T{k\1107462\189395\5487\9460\132016D", Number (-9.0)),
-                      ("5Katxb<3\989929\1036697f\"f\1039375", Number (-500.0)),
-                      ( "u#\54486\1055378N~W\CAN7k\1015057g\1072424",
-                        Array
-                          [ String "{",
-                            Null,
-                            Number (-1.0),
-                            Bool True,
-                            String "\1031270",
-                            String "u",
-                            String "\t",
-                            Null,
-                            Null,
-                            Number (0.0),
-                            Bool False,
-                            Number (-1.0),
-                            Bool False
-                          ]
-                      ),
-                      ("0=\1009587;\SOHD", Array [String "\34912!"]),
-                      ("\bD9", Object (fromList [])),
-                      ("\52750q\EOT?F~`xL\DC3-w\t\187110", String "\vme\162923\SOH\SUB\DELL\181039\&5#\SYN\SI\1070836?"),
-                      ("0i\97932i}\NAK\DC1\ETB\ETB-\1069291\31712\&1\1015121", Array [Number (7.0e-4), String "mUX|9uC"])
-                    ],
-                  fromList [("", Object (fromList []))],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [("g", Null)],
-                  fromList [],
-                  fromList [("", Array [Number (0.0), String ""])],
-                  fromList [],
-                  fromList [],
-                  fromList []
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_4 :: QueuedNotification
-testObject_QueuedNotification_user_4 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000069-0000-0074-0000-003a0000001b"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ("=3n?\ENQnD\FS\SO5", Array [Null]),
-                      ("*\ACK\169030\ace\NUL", Object (fromList [])),
-                      ("\SOH\aqy3_Q\153721\986977\35098\f\CAN5x", Null),
-                      ("B\58373x\1023997\SOH", String "4\US"),
-                      ("bRe\172258Y$#Aq3", Null),
-                      ("\24755\1004897\NAK,(\NUL \DELn", Null)
-                    ],
-                  fromList [("", Array [Null, Number (0.0), Number (0.0), Bool True, String ""])],
-                  fromList [],
-                  fromList [("\DC2X", Object (fromList [])), ("\1022854s\13205", Number (2.0))],
-                  fromList [("", Array [Number (-10.0), Bool True]), ("\SI", Bool True), ("X", Array [])]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_5 :: QueuedNotification
-testObject_QueuedNotification_user_5 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "0000000d-0000-0019-0000-002600000076"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ( "\45236\ENQ\124956\1096938~\NAK\999591\1062012H\1092159\1019668]AT\1035524",
-                        Object (fromList [("t\fg\ACK\155286\998134\1048593\97184U\SO@L\n\29410", Number (4.0e7))])
-                      ),
-                      ( "\t\1093623\t\165331",
-                        Array [Bool True, String "", Number (-0.1), Null, String "", Number (0.0), Null, String "\152288"]
-                      ),
-                      ("", Object (fromList [("", String "")])),
-                      ("\EOTX\DLEd\1109960\DC42\CAN7\1034463\&5v\NAK3", String "\1034700;\DC4wZ\998770%"),
-                      ("\DC3hj7\ahO/NoE\149371y\19456", Array []),
-                      ("IFm A\138428\NAK\DC1h\40599\CAN", Array [Bool False, Bool False, Number (-500.0)]),
-                      ("\ENQ\SI\n\ETB#P\1015596\166378=F", Array []),
-                      ( "\1107408=\123179\GS",
-                        Array [Bool False, Number (1.0), Number (1.0), Bool True, Number (-2.0e-2), Number (0.0)]
-                      ),
-                      ("\EMgMH\155071\DC1b\SO\1099952FH\DC1GX", Object (fromList [])),
-                      ( "\95819o\n4\160628\1014499",
-                        Array [Number (0.0), Bool False, String "\1029519", Null, Number (-2000.0)]
-                      ),
-                      ("G\CAN\1033498Jv\RSm7\"\24281\&3\GSj<\64723", Array [Bool False]),
-                      ("B|R\1081521K8^\DC3\1073100<}", Array [Number (7.0e-10)]),
-                      ( "\EM\f\EOTz\ETXF,}\1075552BD\178719m",
-                        Object
-                          ( fromList
-                              [("2\"", Number (0.0)), ("#", Null), ("\145471\ETX", String ""), ("D2", Number (2.0e-3))]
-                          )
-                      )
-                    ],
-                  fromList
-                    [ ( "\1083930K/",
-                        Array
-                          [String "$\RS", String "\t$", String "\SI\1099452", Bool True, String "\999505", String "j\DC1"]
-                      ),
-                      ("M+b<\27207\1015173\28289}\a", Null),
-                      ( "\1047334v",
-                        Object (fromList [("L\ETXE\DC3\1036794^\1041116", Number (0.0)), ("#  ffX", Number (-20000.0))])
-                      ),
-                      ( "N",
-                        Object
-                          ( fromList
-                              [ ("\1077730\&6;", String " "),
-                                ("^\DC2\1038128j\1020596", Bool False),
-                                ("h", String "[\29591q\SI")
-                              ]
-                          )
-                      ),
-                      ("\GS-", Array [String "t\1052943", Bool True, Number (-0.2), Null])
-                    ]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_6 :: QueuedNotification
-testObject_QueuedNotification_user_6 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000016-0000-0025-0000-00720000005b"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ( "\183735\CANZdP_\53614\SYN3/1",
-                        Array [Number (0.0), Null, Number (0.0), String "\NAK", Bool True, Number (-20.0)]
-                      ),
-                      ( "D\1072658\1007557\DLEOk\1107143",
-                        Array [Null, Number (2.0), Number (0.0), Number (-100.0), Number (2.0e-2), Bool False]
-                      ),
-                      ("/\1105704f", Number (-6.0e-7)),
-                      ( "\1007185\&0W3\25378\&8ZZZ9k",
-                        Array [Null, String " ", Null, Number (20.0), Number (-1.0e-2), Bool False, Bool True]
-                      ),
-                      ("5\\\22774\1110197<\51695Y", Object (fromList [("", Bool False)])),
-                      ("YUqBj\143696T\ESC\164377V\1016566\1106151w", Null),
-                      ("F192", Array []),
-                      ( "S\1032695",
-                        Object (fromList [("&<", Number (1.0e-6)), ("%r`\1010329\SO\ETX\ETB", Number (-7.0e-6))])
-                      ),
-                      ("\188827~SJ[u\155261\SOH2C\15525", String "$.\92209DO,\NUL%\149436\&6"),
-                      ("\1109692", Array [Null, Bool False]),
-                      ("K#C", Array [Bool True, Null, Null, Number (-3.0), String "\DEL\DC4"]),
-                      ("wGIB1z\1052731C\995558\1018090\166423\1099552", String "\51474\1111609\133087\&1vxb\1004342\60873"),
-                      ("\31664\ENQ\FS`\1019100\1075958)e,c]r", String "J")
-                    ],
-                  fromList [("\100003`\1060268m%\177299", Array [])],
-                  fromList [("\US\169781\1021396q", Object (fromList [("; ", Null)]))]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_7 :: QueuedNotification
-testObject_QueuedNotification_user_7 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000015-0000-0050-0000-00370000006c"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ( "",
-                        Object
-                          ( fromList
-                              [ ("m", Null),
-                                ("\DLE", Null),
-                                ("", Number (-10.0)),
-                                ("+", Number (-0.1)),
-                                ("[", Bool False),
-                                ("A", Number (-1.0)),
-                                ("/", Bool True),
-                                ("6", Number (0.0))
-                              ]
-                          )
-                      ),
-                      ( "l\990423')\1062179v`\ETB\164677f\EOT",
-                        Object (fromList [("G", Number (-400000.0)), ("\STX$=", Null), ("$d!\1068748", Bool True)])
-                      ),
-                      ( "CI\5695i}\CAN\137004f\DC2",
-                        Object
-                          (fromList [("h7{\985592 ", String ";p"), ("", Bool True), ("c\1053951\1028477\US", Number (0.0))])
-                      ),
-                      ("r\61432\DLEL\1005146\&7_C\ETX\1003390/N", Bool False)
-                    ],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList []
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_8 :: QueuedNotification
-testObject_QueuedNotification_user_8 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000042-0000-004d-0000-001800000054"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList [],
-                  fromList [("", String "")],
-                  fromList
-                    [ ( "",
-                        Array
-                          [ Number (0.0),
-                            Bool False,
-                            String "",
-                            Number (0.0),
-                            Number (0.0),
-                            Bool False,
-                            String "",
-                            Number (0.0)
-                          ]
-                      )
-                    ],
-                  fromList [("\GS", Array [])],
-                  fromList [("\1040105M", String ""), ("\144860\984284", String "\10922C")],
-                  fromList [("", Array [])],
-                  fromList []
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_9 :: QueuedNotification
-testObject_QueuedNotification_user_9 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "0000004e-0000-0040-0000-005c0000003b"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ( "",
-                        Array
-                          [ Null,
-                            Bool True,
-                            Null,
-                            Number (0.0),
-                            Number (-10.0),
-                            Bool True,
-                            Bool False,
-                            Null,
-                            Bool False,
-                            Number (-10.0)
-                          ]
-                      ),
-                      ("q=-\3975We\34648\NAKl\996442m\133105", Array [Null, Number (-2.0e-2), String "\134259", Null]),
-                      ("e\ESCc\\\21868\&0\7566\EM\1071552\148802", Bool False)
-                    ],
-                  fromList [(";", Number (1.0))],
-                  fromList [],
-                  fromList [],
-                  fromList [("J", Array [String ""])],
-                  fromList [],
-                  fromList [("J", Array [String ""])],
-                  fromList [("", Object (fromList [("", Bool False)]))],
-                  fromList [],
-                  fromList [("", Object (fromList [("", Bool False)]))],
-                  fromList [],
-                  fromList [("", Array [])],
-                  fromList [],
-                  fromList [],
-                  fromList [("", Bool False)]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_10 :: QueuedNotification
-testObject_QueuedNotification_user_10 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000017-0000-0079-0000-007f0000000c"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ("|\1027097", String "\SO'\110981\1091808\SYN>Y\DC4\n"),
-                      ( "\US2g\GS\r",
-                        Object
-                          ( fromList
-                              [ ("\DC3\DC3W", String "\f\28427"),
-                                ("h\983608\&5", String "{"),
-                                ("\144054<\1109056\ETB", String "\b")
-                              ]
-                          )
-                      ),
-                      ("S\989804\1030868\NAK\v\a\STXFqb1E\178404", Number (-1.4e12))
-                    ],
-                  fromList
-                    [ ("\18151\178612", Bool False),
-                      ("\SI\984754\1003875(", Array []),
-                      ("/", Object (fromList [("U\1029706>", Number (500000.0))])),
-                      ("/\DC3\SYN", Object (fromList [("w", Null), ("\ETB", Number (10.0)), ("", Number (0.0))]))
-                    ],
-                  fromList
-                    [ ("\DC4\b{", Object (fromList [])),
-                      ( "\1043377",
-                        Array [Bool True, Bool True, Null, Null, Null, Bool False, Null, Bool False, Null, Bool True]
-                      ),
-                      ("|\RS\173007", Array []),
-                      ("Y\1746\1773\t\1024915", Array [Bool True, Null]),
-                      ("/1|~b", Array [])
-                    ],
-                  fromList []
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_11 :: QueuedNotification
-testObject_QueuedNotification_user_11 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000006-0000-000a-0000-007500000067"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ( "\176843\15842\EM\SYN\12112\1024918\v<M",
-                        Object
-                          ( fromList
-                              [ ("<", Number (0.0)),
-                                ("f{", Bool False),
-                                ("", Number (2.0e-2)),
-                                ("p", Bool False),
-                                ("\STX", Number (0.0)),
-                                ("Y", Bool True)
-                              ]
-                          )
-                      )
-                    ],
-                  fromList [("", Object (fromList []))],
-                  fromList [],
-                  fromList [("\1044730", Number (0.0))],
-                  fromList [],
-                  fromList [("", Number (1.0))],
-                  fromList [],
-                  fromList [],
-                  fromList [("M", Object (fromList []))],
-                  fromList [("", Number (0.0))],
-                  fromList [("\189937", Object (fromList []))],
-                  fromList [("\US", Object (fromList []))],
-                  fromList [("", Object (fromList [("", Bool True)]))]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_12 :: QueuedNotification
-testObject_QueuedNotification_user_12 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000034-0000-0039-0000-005200000071"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList [("2kv\fA\DLEI<", Number (-1.2e13))],
-                  fromList [(".", Bool True)],
-                  fromList [("", Null)],
-                  fromList [("s", Array [])],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList []
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_13 :: QueuedNotification
-testObject_QueuedNotification_user_13 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000043-0000-0015-0000-006d00000070"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ("7Ss\RSj\DC3", String "\1045345E\SYN\49550^)0<9\156141sG}\7560k"),
-                      ("", Bool False),
-                      ("\ETX\RS>\173266e\41899V\SOH\154850\STX\RS\1085751D", Null),
-                      ("U\CAN\1090465", Array [Null, Null, Number (-2.0e-2), Number (3.0), Number (-2000.0)])
-                    ],
-                  fromList
-                    [ ("\1037326y", Bool True),
-                      ("4u\1037419\STX\a\1030932d2\1025082:\129058DN0", String "\ETBbUR()X\DC1K\ENQK\38510O\175835"),
-                      ("d%\66691\DLEv\167015~N\68494p-\NAK", Bool True),
-                      ( "\DC4<s\997051\fv\ETBD\1096499",
-                        Object (fromList [("\1015845", Null), ("N\1087357\9312\ETX\2632\1066393", Bool False)])
-                      ),
-                      ("\58695h}\160243", Bool True),
-                      ("\DEL/\DC4\30758", Number (1.5e-9)),
-                      ("\USD.n\SIz6f\EOT\SUBC7\ETXjF", Number (80000.0)),
-                      ("oW\164415", Null)
-                    ]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_14 :: QueuedNotification
-testObject_QueuedNotification_user_14 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000058-0000-0032-0000-00730000005c"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ( "L",
-                        Array [String "\1104725\GS", String "", Number (-0.1), String "\1005231", Bool True, Number (0.0)]
-                      ),
-                      ("\ACKgEE\1023869j4", Number (4.0e-2))
-                    ],
-                  fromList [],
-                  fromList [("T\38347", Array [String "5l+eq"])],
-                  fromList []
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_15 :: QueuedNotification
-testObject_QueuedNotification_user_15 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "0000005d-0000-0059-0000-00340000007b"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ("@", String "{V"),
-                      ("M\1007322", String "R7;\83094'"),
-                      ( "}x\132968",
-                        Object
-                          ( fromList
-                              [ ("", Null),
-                                ("\35448", String ""),
-                                ("T", Number (-0.2)),
-                                ("\17314", Bool False),
-                                ("u", Bool True),
-                                ("S", Bool False)
-                              ]
-                          )
-                      ),
-                      ("$\1111@\SO\ETX?\EM8\DLE\1086312\66620\1029880V", Null),
-                      ("CpD\DLEVl3U\DEL\NAK\DC4W\97261", Object (fromList [("", Null), ("\18890=\ESC\tLp", String "\v")])),
-                      ("@-m k\131917IB", Object (fromList [])),
-                      ( "w\DC3SW\DLE`\1018304\1039063\&5\1014900\1112845T\DC3\1042638",
-                        Object
-                          ( fromList
-                              [("\v\141802\1003230\183861\NUL", Bool False), ("S8\"\SOH\t\187287w", String "\DC3\167256")]
-                          )
-                      ),
-                      ("kz\t\SUBB+Sr9n%\SIc\63483", String ">0\1100072\SOv\SUBH(\SUB\1097319/\155427")
-                    ]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_16 :: QueuedNotification
-testObject_QueuedNotification_user_16 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000009-0000-005f-0000-002d0000003a"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ( "\1085656Q\53349\998514l\40723E\DC2=I\ENQ<\1077146\nL",
-                        Object
-                          ( fromList
-                              [ ("\1100391", Null),
-                                ("", Null),
-                                ("\DC2\1014614", Number (0.0)),
-                                ("\NAK", Null),
-                                ("\ETBY", String "|")
-                              ]
-                          )
-                      ),
-                      ("\1068734I>\1089474\14594[\r\40315\141844", Number (9.0e10)),
-                      ("\FS1?12/~?D\558\1017851R", Number (8.0e-4)),
-                      ("st0\32150I]\52454\ACK\DLE\120566", Number (1.2e-2)),
-                      ( "%\EOT5\1045277\ETX\95408n\SOH}\f2",
-                        Object
-                          ( fromList
-                              [ ("\177635\GSJ", Null),
-                                ("|\r\1052037", Number (3000.0)),
-                                ("\EM\SYN\DLE", Null),
-                                (">\r", String "Q6\ETX")
-                              ]
-                          )
-                      )
-                    ]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_17 :: QueuedNotification
-testObject_QueuedNotification_user_17 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "0000003e-0000-0010-0000-00100000005d"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ("\987647a\179847\t\buB\ACK0", Array [Null, Null, Number (400000.0)]),
-                      ("", Array [String "", String "z;\1085758", String "", Bool True, String ".H"]),
-                      ("\1034094\&6)", Object (fromList [("", Number (0.0))])),
-                      ("\152772vk]c+y2\DC1\20087:Isj", Number (70000.0)),
-                      ("O\111080\1009125 T\b\DLEx\DC1\1064318+", Bool False),
-                      ("\148637A\155972\999326a\185632j", Null),
-                      ( "r\DC2Ny*~\46010|A\100540RC^Ng",
-                        Object
-                          ( fromList
-                              [ ( "{\134218W\1074027\SYN\a\192a\53882#i+`7h",
-                                  String ">\136285\NAKo\191146\&8;\1031859\SYN\1012225\nf\NAK0="
-                                )
-                              ]
-                          )
-                      )
-                    ],
-                  fromList [],
-                  fromList [],
-                  fromList [(">", Object (fromList [("", String "")]))],
-                  fromList [("YW\994503", Number (30.0)), ("", String "w\SI"), ("\a\44144\&8", Number (0.3))]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_18 :: QueuedNotification
-testObject_QueuedNotification_user_18 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000019-0000-0012-0000-002e0000006e"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList
-                    [ ("`\41689\4612\1020636w\SO\GSS(E", Array []),
-                      ( "[\GS\1047962A\SO<\1095693\151254I#\f\14088S\1049776\STX",
-                        Array [String "\1090348", Number (0.0), Null, Bool False, Null, Bool False, Number (0.0), Null]
-                      ),
-                      (">ij\SOW!rDk Sl", Null),
-                      ("\1056572\1071084fMi\CANqx\169671^WK\983236A", Number (1.2e-3))
-                    ],
-                  fromList
-                    [ ("", Object (fromList [("", Null), ("\r\1026636\1019729\1008827", Bool True)])),
-                      ("\1111807.\16622nD\184092y\998883\v\DC1C", Array []),
-                      ("\US9\65030\EM\ESC\EM\1094785", Object (fromList [])),
-                      ("?\163151\1009143\13711\1090298\DC3\DC2s9\993561`Q\DC3", String "\SUB\100159")
-                    ]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_19 :: QueuedNotification
-testObject_QueuedNotification_user_19 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "00000045-0000-005e-0000-007700000025"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList [],
-                  fromList
-                    [ ("cK<=Y(\"", Object (fromList [])),
-                      ("", Null),
-                      ("\1063218\141347\137560\&5r\30585s", Object (fromList [])),
-                      ("&", Array []),
-                      ("L4\DC2\78778`", Array [])
-                    ],
-                  fromList
-                    [ ("O\165343\&5\127969", Bool False),
-                      ( "0\SUB4\1017347=C",
-                        Array
-                          [ Null,
-                            String "",
-                            Bool False,
-                            Bool True,
-                            Number (0.0),
-                            Bool False,
-                            Bool False,
-                            Null,
-                            String "",
-                            Bool False
-                          ]
-                      ),
-                      ("r\13278M\v", Null)
-                    ]
-                ]
-            )
-        )
-      )
-  )
-
-testObject_QueuedNotification_user_20 :: QueuedNotification
-testObject_QueuedNotification_user_20 =
-  ( queuedNotification
-      ((Id (fromJust (UUID.fromString "0000005c-0000-002f-0000-002800000002"))))
-      ( ( List1
-            ( NonEmpty.fromList
-                [ fromList [("", Null), ("@+S\vq", Number (1.2e-9))],
-                  fromList [],
-                  fromList [],
-                  fromList [("<", Array [Bool False])],
-                  fromList [("\FS", Array [])],
-                  fromList [("\996153", String "")],
-                  fromList [],
-                  fromList [],
-                  fromList [("", Object (fromList [("", Null)]))],
-                  fromList [],
-                  fromList [],
-                  fromList [],
-                  fromList [("7", Array [])],
-                  fromList [("", Array [Null])]
+                  fromList [("\179372\&3", Array [])]
                 ]
             )
         )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCConfiguration_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCConfiguration_user.hs
index cb4bf9a9057..cb52eaec7a7 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCConfiguration_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCConfiguration_user.hs
@@ -476,61 +476,7 @@ testObject_RTCConfiguration_user_3 =
                       }
                 )
             )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
+              :| []
           )
       )
       (9)
@@ -745,90 +691,19 @@ testObject_RTCConfiguration_user_5 :: RTCConfiguration
 testObject_RTCConfiguration_user_5 =
   ( rtcConfiguration
       ( ( rtcIceServer
-            ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Nothing))
-                :| [ (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Nothing)),
-                     (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "80.25.165.101"))) (read "1") (Just TransportTCP)),
-                     (turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Just TransportUDP))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("5m7") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                  & tuT .~ ('{')
-              )
-            )
-            ((fromRight undefined (validate ("dvI="))))
-        )
-          :| [ ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("x") & tuVersion .~ (0) & tuKeyindex .~ (2)
-                         & tuT .~ ('\1002612')
-                     )
-                   )
-                   ((fromRight undefined (validate ("cCU="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "007.com") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "007.com") (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("r5n") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                         & tuT .~ ('\DC2')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "73.195.120.125"))) (read "1") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Nothing))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("8f") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('\DEL')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Mw=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "134.245.76.176"))) (read "0") (Nothing)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("e1") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('m')
-                     )
-                   )
-                   ((fromRight undefined (validate ("W/E="))))
-               )
-             ]
-      )
-      (Nothing)
-      (12)
-  )
-
-testObject_RTCConfiguration_user_6 :: RTCConfiguration
-testObject_RTCConfiguration_user_6 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "149.161.183.205"))) (read "0") (Nothing))
-                :| [ (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Just TransportTCP)),
-                     (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP)),
-                     (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "92.128.67.225"))) (read "0") (Just TransportTCP))
+            ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "248.187.155.126"))) (read "1") (Nothing))
+                :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "166.155.90.230"))) (read "0") (Just TransportTCP)),
+                     (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)),
+                     (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Just TransportTCP))
                    ]
             )
-            ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("de") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                  & tuT .~ ('Q')
+            ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("tj") & tuVersion .~ (0) & tuKeyindex .~ (0)
+                  & tuT .~ ('\1011805')
               )
             )
             ((fromRight undefined (validate (""))))
         )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "118.170.44.54"))) (read "0") (Just TransportTCP))
-                       :| [(turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Nothing))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("bi") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('\33797')
-                     )
-                   )
-                   ((fromRight undefined (validate ("N2I="))))
-               )
-             ]
+          :| []
       )
       ( Just
           ( ( sftServer
@@ -849,2484 +724,30 @@ testObject_RTCConfiguration_user_6 =
                       }
                 )
             )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
+              :| []
           )
       )
-      (26)
+      (2)
   )
 
-testObject_RTCConfiguration_user_7 :: RTCConfiguration
-testObject_RTCConfiguration_user_7 =
+testObject_RTCConfiguration_user_6 :: RTCConfiguration
+testObject_RTCConfiguration_user_6 =
   ( rtcConfiguration
       ( ( rtcIceServer
-            ((turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "44.1.165.236"))) (read "1") (Nothing)) :| [])
-            ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("a6m") & tuVersion .~ (0) & tuKeyindex .~ (2)
-                  & tuT .~ ('H')
+            ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "248.187.155.126"))) (read "1") (Nothing))
+                :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "166.155.90.230"))) (read "0") (Just TransportTCP)),
+                     (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)),
+                     (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Just TransportTCP))
+                   ]
+            )
+            ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("tj") & tuVersion .~ (0) & tuKeyindex .~ (0)
+                  & tuT .~ ('\1011805')
               )
             )
             ((fromRight undefined (validate (""))))
         )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Nothing))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "11.96.91.17"))) (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("lp") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ ('e')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "13.23.57.118"))) (read "0") (Just TransportTCP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("8et") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('&')
-                     )
-                   )
-                   ((fromRight undefined (validate ("7w=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "007.com") (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("7ap") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('\DC1')
-                     )
-                   )
-                   ((fromRight undefined (validate ("0Ow="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Nothing))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "135.209.223.40"))) (read "0") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "173.139.89.251"))) (read "1") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("g9") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('X')
-                     )
-                   )
-                   ((fromRight undefined (validate ("ag=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Just TransportUDP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("xlk") & tuVersion .~ (3) & tuKeyindex .~ (0)
-                         & tuT .~ ('\ENQ')
-                     )
-                   )
-                   ((fromRight undefined (validate ("ZQ=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("h") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('B')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Tw=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("x") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('F')
-                     )
-                   )
-                   ((fromRight undefined (validate ("yQ=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "99.124.6.72"))) (read "0") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("b") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('l')
-                     )
-                   )
-                   ((fromRight undefined (validate ("vWc="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "86.184.243.74"))) (read "0") (Nothing))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "244.0.87.83"))) (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "59.44.234.164"))) (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("178") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('2')
-                     )
-                   )
-                   ((fromRight undefined (validate ("wQ=="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (28)
-  )
-
-testObject_RTCConfiguration_user_8 :: RTCConfiguration
-testObject_RTCConfiguration_user_8 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportTCP))
-                :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "117.96.79.180"))) (read "1") (Just TransportUDP)),
-                     (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("ky") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                  & tuT .~ ('\7470')
-              )
-            )
-            ((fromRight undefined (validate (""))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "248.107.4.38"))) (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("2e") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('V')
-                     )
-                   )
-                   ((fromRight undefined (validate ("2g=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "129.183.147.71"))) (read "1") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("ae3") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('+')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("081") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('~')
-                     )
-                   )
-                   ((fromRight undefined (validate ("gnU="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (28)
-  )
-
-testObject_RTCConfiguration_user_9 :: RTCConfiguration
-testObject_RTCConfiguration_user_9 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-                :| [ (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportUDP)),
-                     (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportTCP))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("1h") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                  & tuT .~ ('\111235')
-              )
-            )
-            ((fromRight undefined (validate ("X9k="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Nothing))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "22.129.108.184"))) (read "1") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("5ku") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                         & tuT .~ ('\31409')
-                     )
-                   )
-                   ((fromRight undefined (validate ("og=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("ar") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                         & tuT .~ ('\SOH')
-                     )
-                   )
-                   ((fromRight undefined (validate ("ow=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "164.254.14.80"))) (read "1") (Just TransportUDP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("hc") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ ('\DC4')
-                     )
-                   )
-                   ((fromRight undefined (validate ("tNQ="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "171.181.144.124"))) (read "1") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("vq") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('\DC2')
-                     )
-                   )
-                   ((fromRight undefined (validate ("7Ng="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Nothing))
-                       :| [(turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "94.219.124.35"))) (read "1") (Just TransportTCP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("zc") & tuVersion .~ (1) & tuKeyindex .~ (0)
-                         & tuT .~ ('c')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Qw=="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (13)
-  )
-
-testObject_RTCConfiguration_user_10 :: RTCConfiguration
-testObject_RTCConfiguration_user_10 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Nothing))
-                :| [(turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Nothing))]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("ux") & tuVersion .~ (3) & tuKeyindex .~ (0)
-                  & tuT .~ ('.')
-              )
-            )
-            ((fromRight undefined (validate ("Zh8="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("k") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('\f')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Cg=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("9wq") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('H')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Huw="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (24)
-  )
-
-testObject_RTCConfiguration_user_11 :: RTCConfiguration
-testObject_RTCConfiguration_user_11 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "180.204.175.154"))) (read "0") (Just TransportTCP))
-                :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "243.122.21.187"))) (read "0") (Nothing)),
-                     (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Nothing))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("8") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                  & tuT .~ ('\1110856')
-              )
-            )
-            ((fromRight undefined (validate ("9Uc="))))
-        )
-          :| [ ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "140.96.58.16"))) (read "0") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("v3") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                         & tuT .~ ('H')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "50.111.81.130"))) (read "0") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("h") & tuVersion .~ (3) & tuKeyindex .~ (1)
-                         & tuT .~ ('\a')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("z2") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('6')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("qv") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('\45518')
-                     )
-                   )
-                   ((fromRight undefined (validate ("kA=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Just TransportUDP)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "141.124.238.104"))) (read "0") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "220.161.164.44"))) (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("q") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('\1017549')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (23)
-  )
-
-testObject_RTCConfiguration_user_12 :: RTCConfiguration
-testObject_RTCConfiguration_user_12 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportTCP))
-                :| [(turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "145.53.168.127"))) (read "1") (Just TransportUDP))]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("og") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                  & tuT .~ ('"')
-              )
-            )
-            ((fromRight undefined (validate ("H9Y="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("3s") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('~')
-                     )
-                   )
-                   ((fromRight undefined (validate ("74w="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "214.42.57.20"))) (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("yyd") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('`')
-                     )
-                   )
-                   ((fromRight undefined (validate ("WaE="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (19)
-  )
-
-testObject_RTCConfiguration_user_13 :: RTCConfiguration
-testObject_RTCConfiguration_user_13 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ((turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportUDP)) :| [])
-            ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("5c") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                  & tuT .~ ('\FS')
-              )
-            )
-            ((fromRight undefined (validate (""))))
-        )
-          :| [ ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "241.7.138.168"))) (read "0") (Nothing)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("zac") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('f')
-                     )
-                   )
-                   ((fromRight undefined (validate ("9Uk="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "12.24.56.118"))) (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("1vf") & tuVersion .~ (1) & tuKeyindex .~ (0)
-                         & tuT .~ ('\b')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("wt") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('X')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Cpk="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| []
-          )
-      )
-      (18)
-  )
-
-testObject_RTCConfiguration_user_14 :: RTCConfiguration
-testObject_RTCConfiguration_user_14 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ((turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "9.44.249.238"))) (read "1") (Just TransportUDP)) :| [])
-            ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("0") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                  & tuT .~ ('\ACK')
-              )
-            )
-            ((fromRight undefined (validate (""))))
-        )
-          :| [ ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportUDP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("wp") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('5')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "20.214.247.113"))) (read "0") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportUDP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("te") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('"')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "34.111.158.108"))) (read "1") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportUDP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("ew") & tuVersion .~ (2) & tuKeyindex .~ (2)
-                         & tuT .~ ('\DC2')
-                     )
-                   )
-                   ((fromRight undefined (validate ("gg=="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (29)
-  )
-
-testObject_RTCConfiguration_user_15 :: RTCConfiguration
-testObject_RTCConfiguration_user_15 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "16.13.64.137"))) (read "0") (Nothing))
-                :| [ (turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Just TransportUDP)),
-                     (turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportUDP))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("5") & tuVersion .~ (3) & tuKeyindex .~ (0)
-                  & tuT .~ ('\133622')
-              )
-            )
-            ((fromRight undefined (validate ("gg=="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing))
-                       :| [(turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "4.21.222.180"))) (read "1") (Just TransportUDP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("6") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('?')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "124.52.236.64"))) (read "0") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportUDP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("zxk") & tuVersion .~ (1) & tuKeyindex .~ (0)
-                         & tuT .~ ('\STX')
-                     )
-                   )
-                   ((fromRight undefined (validate ("7XQ="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "82.201.209.41"))) (read "1") (Just TransportTCP))
-                       :| [(turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "207.47.251.117"))) (read "1") (Nothing))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("wq") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('\STX')
-                     )
-                   )
-                   ((fromRight undefined (validate ("xm4="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "81.160.103.101"))) (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("gh7") & tuVersion .~ (3) & tuKeyindex .~ (0)
-                         & tuT .~ ('\STX')
-                     )
-                   )
-                   ((fromRight undefined (validate ("FA=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "47.173.209.140"))) (read "1") (Nothing))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "83.54.196.51"))) (read "0") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("h") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ ('\44193')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Ukk="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "68.110.78.163"))) (read "0") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Nothing))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("j") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('\151303')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "159.210.176.232"))) (read "0") (Nothing))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "133.116.58.206"))) (read "0") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "195.3.162.153"))) (read "0") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("wl2") & tuVersion .~ (2) & tuKeyindex .~ (2)
-                         & tuT .~ ('R')
-                     )
-                   )
-                   ((fromRight undefined (validate ("4BI="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "109.108.175.177"))) (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("asq") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ ('\991437')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "216.186.129.183"))) (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("1t") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ (')')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Nothing))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "43.82.5.88"))) (read "1") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "148.225.106.7"))) (read "1") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("t") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('j')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (19)
-  )
-
-testObject_RTCConfiguration_user_16 :: RTCConfiguration
-testObject_RTCConfiguration_user_16 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing))
-                :| [ (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Just TransportUDP)),
-                     (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "130.9.240.157"))) (read "0") (Just TransportUDP))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("a") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                  & tuT .~ ('8')
-              )
-            )
-            ((fromRight undefined (validate ("wA=="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Nothing))
-                       :| [(turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Just TransportUDP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("z") & tuVersion .~ (3) & tuKeyindex .~ (1)
-                         & tuT .~ ('\155559')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "16.76.164.202"))) (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("mt") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('L')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Nothing)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("f") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                         & tuT .~ ('\SO')
-                     )
-                   )
-                   ((fromRight undefined (validate ("2A=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportTCP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("0c") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ ('$')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-                       :| [(turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportUDP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("url") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('N')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "007.com") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "171.81.187.236"))) (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("eeq") & tuVersion .~ (0) & tuKeyindex .~ (2)
-                         & tuT .~ ('\164609')
-                     )
-                   )
-                   ((fromRight undefined (validate ("OFI="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "007.com") (read "1") (Nothing))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("s") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('H')
-                     )
-                   )
-                   ((fromRight undefined (validate ("jQ=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Nothing)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("5") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('|')
-                     )
-                   )
-                   ((fromRight undefined (validate ("lBw="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "242.239.169.126"))) (read "0") (Just TransportUDP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("q") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('#')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (24)
-  )
-
-testObject_RTCConfiguration_user_17 :: RTCConfiguration
-testObject_RTCConfiguration_user_17 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP))
-                :| [ (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Just TransportTCP)),
-                     (turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Just TransportUDP))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("jme") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                  & tuT .~ ('E')
-              )
-            )
-            ((fromRight undefined (validate ("sB8="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("r") & tuVersion .~ (3) & tuKeyindex .~ (1)
-                         & tuT .~ ('#')
-                     )
-                   )
-                   ((fromRight undefined (validate ("w+c="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "79.55.124.204"))) (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("jn") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                         & tuT .~ ('B')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("vp") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('\165749')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Ug=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("c7") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ (' ')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Sg=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "254.2.228.149"))) (read "0") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "131.78.13.4"))) (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("kbh") & tuVersion .~ (0) & tuKeyindex .~ (2)
-                         & tuT .~ ('o')
-                     )
-                   )
-                   ((fromRight undefined (validate ("KA=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "92.191.110.233"))) (read "0") (Nothing))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("b2") & tuVersion .~ (0) & tuKeyindex .~ (2)
-                         & tuT .~ ('|')
-                     )
-                   )
-                   ((fromRight undefined (validate ("og=="))))
-               )
-             ]
-      )
-      (Nothing)
-      (21)
-  )
-
-testObject_RTCConfiguration_user_18 :: RTCConfiguration
-testObject_RTCConfiguration_user_18 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ((turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Nothing)) :| [])
-            ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("q") & tuVersion .~ (1) & tuKeyindex .~ (0)
-                  & tuT .~ ('A')
-              )
-            )
-            ((fromRight undefined (validate ("a0c="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "220.101.0.43"))) (read "0") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("s88") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ ('w')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Nothing))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("sl") & tuVersion .~ (0) & tuKeyindex .~ (0)
-                         & tuT .~ ('Y')
-                     )
-                   )
-                   ((fromRight undefined (validate ("dg=="))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Nothing)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("c") & tuVersion .~ (3) & tuKeyindex .~ (0)
-                         & tuT .~ ('\EM')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "246.153.120.56"))) (read "0") (Nothing))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("lkz") & tuVersion .~ (3) & tuKeyindex .~ (0)
-                         & tuT .~ ('h')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "206.249.148.39"))) (read "1") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "8.107.15.99"))) (read "1") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportUDP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("i") & tuVersion .~ (1) & tuKeyindex .~ (0)
-                         & tuT .~ ('\38977')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ((turnURI (SchemeTurn) (TurnHostName "123") (read "0") (Just TransportUDP)) :| [])
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("7q5") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('}')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "187.61.112.23"))) (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "15.140.51.24"))) (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "16.22.166.21"))) (read "1") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("y7") & tuVersion .~ (0) & tuKeyindex .~ (2)
-                         & tuT .~ ('u')
-                     )
-                   )
-                   ((fromRight undefined (validate ("AhY="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   ),
-                   ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (26)
-  )
-
-testObject_RTCConfiguration_user_19 :: RTCConfiguration
-testObject_RTCConfiguration_user_19 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ((turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportTCP)) :| [])
-            ( ( turnUsername (secondsToNominalDiffTime (4.000000000000)) ("ku") & tuVersion .~ (3) & tuKeyindex .~ (2)
-                  & tuT .~ ('\\')
-              )
-            )
-            ((fromRight undefined (validate ("XA=="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportUDP))
-                       :| [(turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportTCP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("72s") & tuVersion .~ (2) & tuKeyindex .~ (1)
-                         & tuT .~ ('\1019253')
-                     )
-                   )
-                   ((fromRight undefined (validate ("9Q=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "227.193.165.231"))) (read "1") (Just TransportTCP))
-                       :| [(turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "190.161.166.241"))) (read "0") (Just TransportUDP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("lis") & tuVersion .~ (1) & tuKeyindex .~ (2)
-                         & tuT .~ ('\1001654')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Fg=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportTCP))
-                       :| [(turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP))]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (0.000000000000)) ("kf3") & tuVersion .~ (3) & tuKeyindex .~ (1)
-                         & tuT .~ ('(')
-                     )
-                   )
-                   ((fromRight undefined (validate ("uw=="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "128.94.55.116"))) (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("0") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('\DEL')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Nothing)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "149.38.204.147"))) (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("4u") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                         & tuT .~ ('\176458')
-                     )
-                   )
-                   ((fromRight undefined (validate ("Rf8="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Nothing))
-                       :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "227.57.188.192"))) (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "180.125.230.159"))) (read "1") (Nothing))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("fx") & tuVersion .~ (0) & tuKeyindex .~ (1)
-                         & tuT .~ ('\EOT')
-                     )
-                   )
-                   ((fromRight undefined (validate ("ubQ="))))
-               )
-             ]
-      )
-      ( Just
-          ( ( sftServer
-                ( coerce
-                    URI
-                      { uriScheme = Scheme {schemeBS = "https"},
-                        uriAuthority =
-                          Just
-                            ( Authority
-                                { authorityUserInfo = Nothing,
-                                  authorityHost = Host {hostBS = "example.com"},
-                                  authorityPort = Nothing
-                                }
-                            ),
-                        uriPath = "",
-                        uriQuery = Query {queryPairs = []},
-                        uriFragment = Nothing
-                      }
-                )
-            )
-              :| [ ( sftServer
-                       ( coerce
-                           URI
-                             { uriScheme = Scheme {schemeBS = "https"},
-                               uriAuthority =
-                                 Just
-                                   ( Authority
-                                       { authorityUserInfo = Nothing,
-                                         authorityHost = Host {hostBS = "example.com"},
-                                         authorityPort = Nothing
-                                       }
-                                   ),
-                               uriPath = "",
-                               uriQuery = Query {queryPairs = []},
-                               uriFragment = Nothing
-                             }
-                       )
-                   )
-                 ]
-          )
-      )
-      (20)
-  )
-
-testObject_RTCConfiguration_user_20 :: RTCConfiguration
-testObject_RTCConfiguration_user_20 =
-  ( rtcConfiguration
-      ( ( rtcIceServer
-            ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportUDP))
-                :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "47.244.178.201"))) (read "1") (Just TransportUDP)),
-                     (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "184.150.97.196"))) (read "0") (Nothing))
-                   ]
-            )
-            ( ( turnUsername (secondsToNominalDiffTime (2.000000000000)) ("w5") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                  & tuT .~ ('\178252')
-              )
-            )
-            ((fromRight undefined (validate ("NQ=="))))
-        )
-          :| [ ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportTCP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "175.240.38.214"))) (read "0") (Nothing)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "216.115.207.5"))) (read "1") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("q") & tuVersion .~ (1) & tuKeyindex .~ (1)
-                         & tuT .~ ('@')
-                     )
-                   )
-                   ((fromRight undefined (validate (""))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "231.15.14.20"))) (read "1") (Just TransportUDP)),
-                            (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "214.144.196.143"))) (read "1") (Just TransportTCP)),
-                            (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "106.250.39.172"))) (read "1") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("js") & tuVersion .~ (3) & tuKeyindex .~ (1)
-                         & tuT .~ ('.')
-                     )
-                   )
-                   ((fromRight undefined (validate ("fjs="))))
-               ),
-               ( rtcIceServer
-                   ( (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportUDP))
-                       :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "239.7.100.134"))) (read "0") (Just TransportUDP)),
-                            (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-                          ]
-                   )
-                   ( ( turnUsername (secondsToNominalDiffTime (1.000000000000)) ("jq") & tuVersion .~ (2) & tuKeyindex .~ (0)
-                         & tuT .~ ('q')
-                     )
-                   )
-                   ((fromRight undefined (validate ("NA=="))))
-               )
-             ]
+          :| []
       )
-      (Nothing)
-      (13)
+      Nothing
+      (2)
   )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCIceServer_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCIceServer_user.hs
index 52f12ba6859..ce39dbf14b8 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCIceServer_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RTCIceServer_user.hs
@@ -61,15 +61,7 @@ testObject_RTCIceServer_user_2 :: RTCIceServer
 testObject_RTCIceServer_user_2 =
   ( rtcIceServer
       ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "108.37.81.160"))) (read "0") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "147.240.166.49"))) (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "2") (Nothing)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "242.214.187.48"))) (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "228.51.14.158"))) (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Just TransportUDP))
-             ]
+          :| []
       )
       ( ( turnUsername (secondsToNominalDiffTime (3.000000000000)) ("a8kdffu4") & tuVersion .~ (5) & tuKeyindex .~ (24)
             & tuT .~ ('\SOH')
@@ -77,316 +69,3 @@ testObject_RTCIceServer_user_2 =
       )
       ((fromRight undefined (validate ("d1VUzpxZ3TeM"))))
   )
-
-testObject_RTCIceServer_user_3 :: RTCIceServer
-testObject_RTCIceServer_user_3 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostName "123") (read "2") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "007.com") (read "2") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostName "007.com") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "72.203.31.79"))) (read "2") (Nothing)),
-               (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostName "007.com") (read "2") (Just TransportTCP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (133.000000000000)) ("l9mr") & tuVersion .~ (9) & tuKeyindex .~ (16)
-            & tuT .~ ('^')
-        )
-      )
-      ((fromRight undefined (validate ("jw=="))))
-  )
-
-testObject_RTCIceServer_user_4 :: RTCIceServer
-testObject_RTCIceServer_user_4 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "37.223.75.78"))) (read "1") (Just TransportUDP))
-          :| [ (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "2") (Nothing))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (90.000000000000)) ("rcz") & tuVersion .~ (3) & tuKeyindex .~ (12)
-            & tuT .~ (')')
-        )
-      )
-      ((fromRight undefined (validate ("jHf3PRvglQ=="))))
-  )
-
-testObject_RTCIceServer_user_5 :: RTCIceServer
-testObject_RTCIceServer_user_5 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "host.name") (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "103.196.217.16"))) (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Just TransportUDP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (178.000000000000)) ("gwihax") & tuVersion .~ (0) & tuKeyindex .~ (30)
-            & tuT .~ ('r')
-        )
-      )
-      ((fromRight undefined (validate ("9+ems/6Fv0M="))))
-  )
-
-testObject_RTCIceServer_user_6 :: RTCIceServer
-testObject_RTCIceServer_user_6 =
-  ( rtcIceServer
-      ((turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "196.170.89.170"))) (read "1") (Just TransportUDP)) :| [])
-      ( ( turnUsername (secondsToNominalDiffTime (231.000000000000)) ("z2j8s7exhz") & tuVersion .~ (9) & tuKeyindex .~ (4)
-            & tuT .~ ('b')
-        )
-      )
-      ((fromRight undefined (validate ("b76sRlk="))))
-  )
-
-testObject_RTCIceServer_user_7 :: RTCIceServer
-testObject_RTCIceServer_user_7 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurn) (TurnHostName "123") (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "2") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "a-c") (read "2") (Just TransportUDP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (14.000000000000)) ("f4x") & tuVersion .~ (4) & tuKeyindex .~ (2)
-            & tuT .~ ('\1006244')
-        )
-      )
-      ((fromRight undefined (validate ("ft8iuA=="))))
-  )
-
-testObject_RTCIceServer_user_8 :: RTCIceServer
-testObject_RTCIceServer_user_8 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurn) (TurnHostName "007.com") (read "2") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "89.93.38.11"))) (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "83.231.206.233"))) (read "1") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostName "a-c") (read "2") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "57.223.15.28"))) (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "85.102.29.140"))) (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "95.11.213.169"))) (read "1") (Just TransportTCP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (121.000000000000)) ("wbfglz") & tuVersion .~ (6) & tuKeyindex .~ (18)
-            & tuT .~ ('\132671')
-        )
-      )
-      ((fromRight undefined (validate ("6eRp29c2znw/"))))
-  )
-
-testObject_RTCIceServer_user_9 :: RTCIceServer
-testObject_RTCIceServer_user_9 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "248.142.46.235"))) (read "2") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "12.224.132.41"))) (read "0") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "234.126.43.235"))) (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "221.57.91.255"))) (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "007.com") (read "1") (Just TransportTCP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (137.000000000000)) ("9jwt1") & tuVersion .~ (10) & tuKeyindex .~ (31)
-            & tuT .~ ('0')
-        )
-      )
-      ((fromRight undefined (validate ("nzZx"))))
-  )
-
-testObject_RTCIceServer_user_10 :: RTCIceServer
-testObject_RTCIceServer_user_10 =
-  ( rtcIceServer
-      ((turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Nothing)) :| [])
-      ( ( turnUsername (secondsToNominalDiffTime (225.000000000000)) ("ywvp0wy") & tuVersion .~ (5) & tuKeyindex .~ (17)
-            & tuT .~ ('\1091223')
-        )
-      )
-      ((fromRight undefined (validate ("BaDPJOg="))))
-  )
-
-testObject_RTCIceServer_user_11 :: RTCIceServer
-testObject_RTCIceServer_user_11 =
-  ( rtcIceServer
-      ((turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "2") (Just TransportTCP)) :| [])
-      ( ( turnUsername (secondsToNominalDiffTime (82.000000000000)) ("um7wu") & tuVersion .~ (10) & tuKeyindex .~ (2)
-            & tuT .~ ('\1061785')
-        )
-      )
-      ((fromRight undefined (validate ("+DJTWlqizw=="))))
-  )
-
-testObject_RTCIceServer_user_12 :: RTCIceServer
-testObject_RTCIceServer_user_12 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "195.42.42.234"))) (read "0") (Nothing))
-          :| [ (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Just TransportUDP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (195.000000000000)) ("50buvxyh") & tuVersion .~ (7) & tuKeyindex .~ (8)
-            & tuT .~ ('6')
-        )
-      )
-      ((fromRight undefined (validate ("Bhm/vUAzRQ=="))))
-  )
-
-testObject_RTCIceServer_user_13 :: RTCIceServer
-testObject_RTCIceServer_user_13 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "159.6.46.79"))) (read "1") (Nothing))
-          :| [ (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "235.192.126.115"))) (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "a-c") (read "2") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "2") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "007.com") (read "1") (Just TransportTCP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (98.000000000000)) ("dur1kszw") & tuVersion .~ (10) & tuKeyindex .~ (17)
-            & tuT .~ ('\176036')
-        )
-      )
-      ((fromRight undefined (validate ("y0JeDGJm"))))
-  )
-
-testObject_RTCIceServer_user_14 :: RTCIceServer
-testObject_RTCIceServer_user_14 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "33.104.116.89"))) (read "0") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "132.193.82.132"))) (read "2") (Nothing)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "78.0.56.210"))) (read "2") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "a-c") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "a-c") (read "2") (Just TransportUDP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (129.000000000000)) ("5tjy") & tuVersion .~ (0) & tuKeyindex .~ (4)
-            & tuT .~ ('/')
-        )
-      )
-      ((fromRight undefined (validate ("06HqENnz"))))
-  )
-
-testObject_RTCIceServer_user_15 :: RTCIceServer
-testObject_RTCIceServer_user_15 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "24.131.95.46"))) (read "0") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "72.121.208.204"))) (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "127.13.25.233"))) (read "2") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "123") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "240.77.56.253"))) (read "2") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "48.254.19.119"))) (read "2") (Just TransportTCP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (238.000000000000)) ("ws") & tuVersion .~ (1) & tuKeyindex .~ (27)
-            & tuT .~ ('v')
-        )
-      )
-      ((fromRight undefined (validate ("uxE="))))
-  )
-
-testObject_RTCIceServer_user_16 :: RTCIceServer
-testObject_RTCIceServer_user_16 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "2") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "143.97.234.91"))) (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "175.19.223.168"))) (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "007.com") (read "2") (Just TransportTCP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (54.000000000000)) ("d0s3a") & tuVersion .~ (4) & tuKeyindex .~ (11)
-            & tuT .~ ('\53466')
-        )
-      )
-      ((fromRight undefined (validate ("Mw=="))))
-  )
-
-testObject_RTCIceServer_user_17 :: RTCIceServer
-testObject_RTCIceServer_user_17 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostName "123") (read "2") (Just TransportTCP))
-          :| [ (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "169.70.61.106"))) (read "0") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "2") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "40.231.247.70"))) (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "a-c") (read "2") (Nothing)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "164.220.43.156"))) (read "1") (Nothing))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (81.000000000000)) ("5nxg") & tuVersion .~ (8) & tuKeyindex .~ (30)
-            & tuT .~ ('}')
-        )
-      )
-      ((fromRight undefined (validate ("f8wvNtPhU94A"))))
-  )
-
-testObject_RTCIceServer_user_18 :: RTCIceServer
-testObject_RTCIceServer_user_18 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Nothing))
-          :| [ (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "a-c") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "host.name") (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "a-c") (read "2") (Nothing)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "184.63.122.24"))) (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Nothing)),
-               (turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "117.242.195.170"))) (read "0") (Just TransportTCP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (24.000000000000)) ("jjx53c65i") & tuVersion .~ (7) & tuKeyindex .~ (5)
-            & tuT .~ ('\\')
-        )
-      )
-      ((fromRight undefined (validate ("mQ=="))))
-  )
-
-testObject_RTCIceServer_user_19 :: RTCIceServer
-testObject_RTCIceServer_user_19 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostName "host.name") (read "0") (Just TransportUDP))
-          :| [ (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "007.com") (read "2") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "host.name") (read "1") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostName "123") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "169.100.145.5"))) (read "0") (Just TransportTCP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "221.45.182.44"))) (read "2") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostName "a-c") (read "1") (Just TransportUDP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (249.000000000000)) ("a7hqal0n") & tuVersion .~ (5) & tuKeyindex .~ (29)
-            & tuT .~ ('\51751')
-        )
-      )
-      ((fromRight undefined (validate ("eA5FI9S6Ow=="))))
-  )
-
-testObject_RTCIceServer_user_20 :: RTCIceServer
-testObject_RTCIceServer_user_20 =
-  ( rtcIceServer
-      ( (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "119.72.79.226"))) (read "2") (Just TransportUDP))
-          :| [ (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP)),
-               (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "165.153.82.29"))) (read "2") (Just TransportTCP)),
-               (turnURI (SchemeTurns) (TurnHostName "a-c") (read "1") (Just TransportUDP)),
-               (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "233.158.218.205"))) (read "2") (Just TransportUDP))
-             ]
-      )
-      ( ( turnUsername (secondsToNominalDiffTime (119.000000000000)) ("hdgi3apt") & tuVersion .~ (3) & tuKeyindex .~ (30)
-            & tuT .~ ('&')
-        )
-      )
-      ((fromRight undefined (validate ("o3sXZAOB"))))
-  )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ReceiptMode_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ReceiptMode_user.hs
index 03a160f6fd2..7f816e6f212 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ReceiptMode_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ReceiptMode_user.hs
@@ -24,58 +24,4 @@ testObject_ReceiptMode_user_1 :: ReceiptMode
 testObject_ReceiptMode_user_1 = ReceiptMode {unReceiptMode = -7082}
 
 testObject_ReceiptMode_user_2 :: ReceiptMode
-testObject_ReceiptMode_user_2 = ReceiptMode {unReceiptMode = -15373}
-
-testObject_ReceiptMode_user_3 :: ReceiptMode
-testObject_ReceiptMode_user_3 = ReceiptMode {unReceiptMode = 19461}
-
-testObject_ReceiptMode_user_4 :: ReceiptMode
-testObject_ReceiptMode_user_4 = ReceiptMode {unReceiptMode = -21550}
-
-testObject_ReceiptMode_user_5 :: ReceiptMode
-testObject_ReceiptMode_user_5 = ReceiptMode {unReceiptMode = -2657}
-
-testObject_ReceiptMode_user_6 :: ReceiptMode
-testObject_ReceiptMode_user_6 = ReceiptMode {unReceiptMode = -29406}
-
-testObject_ReceiptMode_user_7 :: ReceiptMode
-testObject_ReceiptMode_user_7 = ReceiptMode {unReceiptMode = 26169}
-
-testObject_ReceiptMode_user_8 :: ReceiptMode
-testObject_ReceiptMode_user_8 = ReceiptMode {unReceiptMode = 7835}
-
-testObject_ReceiptMode_user_9 :: ReceiptMode
-testObject_ReceiptMode_user_9 = ReceiptMode {unReceiptMode = 30914}
-
-testObject_ReceiptMode_user_10 :: ReceiptMode
-testObject_ReceiptMode_user_10 = ReceiptMode {unReceiptMode = 26421}
-
-testObject_ReceiptMode_user_11 :: ReceiptMode
-testObject_ReceiptMode_user_11 = ReceiptMode {unReceiptMode = 15484}
-
-testObject_ReceiptMode_user_12 :: ReceiptMode
-testObject_ReceiptMode_user_12 = ReceiptMode {unReceiptMode = -30165}
-
-testObject_ReceiptMode_user_13 :: ReceiptMode
-testObject_ReceiptMode_user_13 = ReceiptMode {unReceiptMode = 29422}
-
-testObject_ReceiptMode_user_14 :: ReceiptMode
-testObject_ReceiptMode_user_14 = ReceiptMode {unReceiptMode = -31044}
-
-testObject_ReceiptMode_user_15 :: ReceiptMode
-testObject_ReceiptMode_user_15 = ReceiptMode {unReceiptMode = 14938}
-
-testObject_ReceiptMode_user_16 :: ReceiptMode
-testObject_ReceiptMode_user_16 = ReceiptMode {unReceiptMode = 28863}
-
-testObject_ReceiptMode_user_17 :: ReceiptMode
-testObject_ReceiptMode_user_17 = ReceiptMode {unReceiptMode = 23112}
-
-testObject_ReceiptMode_user_18 :: ReceiptMode
-testObject_ReceiptMode_user_18 = ReceiptMode {unReceiptMode = -11526}
-
-testObject_ReceiptMode_user_19 :: ReceiptMode
-testObject_ReceiptMode_user_19 = ReceiptMode {unReceiptMode = -25254}
-
-testObject_ReceiptMode_user_20 :: ReceiptMode
-testObject_ReceiptMode_user_20 = ReceiptMode {unReceiptMode = -15487}
+testObject_ReceiptMode_user_2 = ReceiptMode {unReceiptMode = 19461}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Relation_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Relation_user.hs
index b78bfe83ac5..6cc3b03726e 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Relation_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Relation_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -24,58 +22,19 @@ testObject_Relation_user_1 :: Relation
 testObject_Relation_user_1 = Accepted
 
 testObject_Relation_user_2 :: Relation
-testObject_Relation_user_2 = Pending
+testObject_Relation_user_2 = Blocked
 
 testObject_Relation_user_3 :: Relation
-testObject_Relation_user_3 = Cancelled
+testObject_Relation_user_3 = Pending
 
 testObject_Relation_user_4 :: Relation
-testObject_Relation_user_4 = Accepted
+testObject_Relation_user_4 = Ignored
 
 testObject_Relation_user_5 :: Relation
-testObject_Relation_user_5 = Blocked
+testObject_Relation_user_5 = Sent
 
 testObject_Relation_user_6 :: Relation
-testObject_Relation_user_6 = Pending
+testObject_Relation_user_6 = Cancelled
 
 testObject_Relation_user_7 :: Relation
-testObject_Relation_user_7 = Sent
-
-testObject_Relation_user_8 :: Relation
-testObject_Relation_user_8 = Blocked
-
-testObject_Relation_user_9 :: Relation
-testObject_Relation_user_9 = Cancelled
-
-testObject_Relation_user_10 :: Relation
-testObject_Relation_user_10 = Cancelled
-
-testObject_Relation_user_11 :: Relation
-testObject_Relation_user_11 = Accepted
-
-testObject_Relation_user_12 :: Relation
-testObject_Relation_user_12 = Accepted
-
-testObject_Relation_user_13 :: Relation
-testObject_Relation_user_13 = Accepted
-
-testObject_Relation_user_14 :: Relation
-testObject_Relation_user_14 = Ignored
-
-testObject_Relation_user_15 :: Relation
-testObject_Relation_user_15 = Pending
-
-testObject_Relation_user_16 :: Relation
-testObject_Relation_user_16 = Blocked
-
-testObject_Relation_user_17 :: Relation
-testObject_Relation_user_17 = Cancelled
-
-testObject_Relation_user_18 :: Relation
-testObject_Relation_user_18 = Cancelled
-
-testObject_Relation_user_19 :: Relation
-testObject_Relation_user_19 = Cancelled
-
-testObject_Relation_user_20 :: Relation
-testObject_Relation_user_20 = MissingLegalholdConsent
+testObject_Relation_user_7 = MissingLegalholdConsent
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RemoveBotResponse_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RemoveBotResponse_user.hs
index 6006a747463..549ca63d0dc 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RemoveBotResponse_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RemoveBotResponse_user.hs
@@ -18,829 +18,37 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.RemoveBotResponse_user where
 
-import Data.Code (Key (Key, asciiKey), Value (Value, asciiValue))
-import Data.Coerce (coerce)
 import Data.Domain
-import Data.Id (ClientId (ClientId, client), Id (Id))
-import Data.Misc (HttpsUrl (HttpsUrl), Milliseconds (Ms, ms))
+import Data.Id (Id (Id))
 import Data.Qualified
-import Data.Range (unsafeRange)
-import Data.Text.Ascii (AsciiChars (validate))
 import qualified Data.UUID as UUID (fromString)
-import Imports (Maybe (Just, Nothing), fromJust, fromRight, read, undefined)
-import URI.ByteString
-  ( Authority
-      ( Authority,
-        authorityHost,
-        authorityPort,
-        authorityUserInfo
-      ),
-    Host (Host, hostBS),
-    Query (Query, queryPairs),
-    Scheme (Scheme, schemeBS),
-    URIRef
-      ( URI,
-        uriAuthority,
-        uriFragment,
-        uriPath,
-        uriQuery,
-        uriScheme
-      ),
-  )
-import Wire.API.Conversation
-  ( Access (InviteAccess, PrivateAccess),
-    AccessRole (ActivatedAccessRole),
-    ConversationAccessUpdate
-      ( ConversationAccessUpdate,
-        cupAccess,
-        cupAccessRole
-      ),
-    ConversationMessageTimerUpdate
-      ( ConversationMessageTimerUpdate,
-        cupMessageTimer
-      ),
-    ConversationRename (ConversationRename, cupName),
-  )
+import Imports (fromJust, read)
 import Wire.API.Conversation.Bot (RemoveBotResponse (..))
-import Wire.API.Conversation.Code
-  ( ConversationCode
-      ( ConversationCode,
-        conversationCode,
-        conversationKey,
-        conversationUri
-      ),
-  )
-import Wire.API.Conversation.Role (parseRoleName)
-import Wire.API.Conversation.Typing (TypingData (TypingData, tdStatus), TypingStatus (StartedTyping))
 import Wire.API.Event.Conversation
-  ( Connect (Connect, cEmail, cMessage, cName, cRecipient),
-    Event (Event),
+  ( Event (Event),
     EventData (..),
     EventType
-      ( ConvAccessUpdate,
-        ConvCodeDelete,
-        ConvCodeUpdate,
-        ConvConnect,
-        ConvDelete,
-        ConvMessageTimerUpdate,
-        ConvRename,
-        MemberJoin,
-        MemberLeave,
-        OtrMessageAdd,
-        Typing
-      ),
-    OtrMessage
-      ( OtrMessage,
-        otrCiphertext,
-        otrData,
-        otrRecipient,
-        otrSender
+      ( MemberLeave
       ),
     QualifiedUserIdList (QualifiedUserIdList, qualifiedUserIdList),
-    SimpleMember (..),
-    SimpleMembers (SimpleMembers, mMembers),
   )
 
 testObject_RemoveBotResponse_user_1 :: RemoveBotResponse
 testObject_RemoveBotResponse_user_1 =
   RemoveBotResponse
     { rsRemoveBotEvent =
-        ( Event
-            (MemberLeave)
-            (Qualified (Id (fromJust (UUID.fromString "00003ab8-0000-0cff-0000-427f000000df"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00004166-0000-1e32-0000-52cb0000428d"))) (Domain "faraway.example.com"))
-            (read "1864-05-07 01:13:35.741 UTC")
-            ( ( EdMembersLeave
-                  ( QualifiedUserIdList
-                      { qualifiedUserIdList =
-                          [ (Qualified (Id (fromJust (UUID.fromString "000038c1-0000-4a9c-0000-511300004c8b"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00003111-0000-2620-0000-1c8800000ea0"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00000de2-0000-6a83-0000-094b00007b02"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00001203-0000-7200-0000-7f8600001824"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "0000412f-0000-6e53-0000-6fde00001ffa"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "000035d8-0000-190b-0000-3f6a00004698"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00004a5d-0000-1532-0000-7c0f000057a8"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00001eda-0000-7b4f-0000-35d800001e6f"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "000079aa-0000-1359-0000-42b8000036a9"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00001b31-0000-356b-0000-379b000048ef"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "0000649d-0000-04a0-0000-6dac00001c6d"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00003a75-0000-6289-0000-274d00001220"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00003ffb-0000-1dcc-0000-3ad40000209c"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00007243-0000-40bf-0000-6cd1000079ca"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "000003ef-0000-0ac8-0000-1a060000698d"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00005a61-0000-3900-0000-4b5d00007ea6"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00001ebb-0000-22ef-0000-4df700007541"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00005dc2-0000-68ba-0000-2bd0000010a8"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00001e9c-0000-24ba-0000-0f8e000016b6"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "0000480d-0000-0b25-0000-6f8700001bcf"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00006d2e-0000-7890-0000-77e600007c77"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00005702-0000-2392-0000-643e00000389"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "000041a6-0000-52a9-0000-41ce00003ead"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "000026a1-0000-0fd3-0000-4aa2000012e7"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00000820-0000-54c4-0000-48490000065b"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "000026ea-0000-4310-0000-7c61000078ea"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00005134-0000-19cc-0000-32fe00006ccb"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00006c9f-0000-5750-0000-3d5c00000149"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "00004772-0000-793d-0000-0b4d0000087f"))) (Domain "faraway.example.com")),
-                            (Qualified (Id (fromJust (UUID.fromString "000074ee-0000-5b53-0000-640000005536"))) (Domain "faraway.example.com"))
-                          ]
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_2 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_2 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvDelete)
-            (Qualified (Id (fromJust (UUID.fromString "00005a06-0000-10ab-0000-4999000058de"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00004247-0000-0560-0000-07df00005850"))) (Domain "faraway.example.com"))
-            (read "1864-04-23 16:56:18.982 UTC")
-            (EdConvDelete)
-        )
-    }
-
-testObject_RemoveBotResponse_user_3 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_3 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (MemberJoin)
-            (Qualified (Id (fromJust (UUID.fromString "000031b6-0000-7f2c-0000-22ca000012a0"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00005a35-0000-3751-0000-76fe000044c2"))) (Domain "faraway.example.com"))
-            (read "1864-04-23 02:07:23.62 UTC")
-            ( ( EdMembersJoin
-                  ( SimpleMembers
-                      { mMembers =
-                          [ SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000042-0000-0046-0000-005e0000001f"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "3jqe4rv30oxjs05p0vjx_gv"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000073-0000-003c-0000-005800000069"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "gv66owx6jn8"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003a-0000-0056-0000-000e00000038"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "zx5yjj62r6x5vzvdekehjc6syfkollz3j5ztxjsu1ffrjvolkynevvykqe6dyyntx3t4p7ph_axwmb_9puw2h2i5qrnvkuwx1a7d23ln9q30h_vulfs1x8iiya"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007c-0000-0075-0000-006500000036"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      (parseRoleName "_6hbn84l_4xly84ic0hrz_m4unx_i2_5sfotmu2xjmylyly_qilavdw54n1reep")
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000031-0000-0004-0000-005e00000060"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "u8r_c9n84lvf4v9i8c6tzre_e3jhp327b2vvubky8_25tf6x6cszt770uuuikdpofyu5oa7lyd"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007b-0000-0019-0000-002a00000000"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  (fromJust (parseRoleName "4agujelz62r_o96qfxja1h60hqmsbuowdhmqb1zvrlhtru6b66vl1lu5oc1"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000c-0000-0069-0000-006600000032"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "6o_85q3e0hn13mkqzstg29b3r29ezb52cl6a_1hhzpx1wtdkav8z8nhc8uk5jj3wsp16rn0wx0dbj9rqt"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001d-0000-0006-0000-00540000005a"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "ii7eljki45zqe819xzx16tkvbgb85"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007f-0000-005d-0000-000700000035"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "8fg3lg3rtnjamcshonl6ailheepmslbc_c3vgdhofs2hwbr84duunkatfkotiq246euejqre_sa4ygly"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006b-0000-005e-0000-003d0000007c"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "5moz9hri8wj07ilkxfcsubwzelf8bkv0vpyssxthz7nnwbthym1ux33bn682ddcbv91aq7oquc9osjow75iu75kjp0prd2zam_o_zixgv3"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005e-0000-000e-0000-00300000005f"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "_xq9rxj1fopahja5o9av3g18y4ko17fzdjunr84k0_txycx3sd1sqn2k5_usv0l_007wdzjrnxcss4b32w4c1qe"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000060-0000-0000-0000-001e0000003b"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "h0q7fe607q9oaiw53dbfunmrlposh47fvaoe5mfg8rth7dzl8r0y759kclqbbqzt7zlbu090lkdberm0u78tb"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000030-0000-000e-0000-006f0000001d"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "rw50gu92raxvq87hqpf7r_xyl"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003f-0000-005e-0000-003200000062"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  (fromJust (parseRoleName "5bizt8d567yjavituolq2unxfh0qyih7_9dep7cpix5bucbevifs2m0"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002e-0000-007d-0000-005e0000004d"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "1kit803b528tmtyvlkespy"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007c-0000-0013-0000-007100000049"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "74l03am2b"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000012-0000-0058-0000-00500000004d"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "8ghe34e3xwi0i1e7cfe8ivltslpzuf15xadc7x5741tzeh1ne_v3m_xzjouowchqe5ubn0jptjorvxoksxwqowgp7oey9ptzpe2cegkplw3445q2z390sf1zy_09ngm"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000060-0000-007f-0000-003c0000001d"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "ui1_axn4co_y0u6a8yrmwsam6zar72jdpdorz8xyvxa1_gfd50r4gu47detfx0rgm6s9iqy2"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000034-0000-005a-0000-003600000063"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "32y4b84gygtg3xscfds0vu69bbsir8cbfh0_gmnh6hnbdr6md8807tuoi8ijtsfr2bkfd8d1vlacwytk55gr__t9f48uyd9p1fz07j20"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006a-0000-007f-0000-006700000068"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "wf0v8gr2oqqdm"))
-                              }
-                          ]
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_4 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_4 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvAccessUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "000057d8-0000-4ce9-0000-2a9a00001ced"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00005b30-0000-0805-0000-116700000485"))) (Domain "faraway.example.com"))
-            (read "1864-05-21 00:12:51.49 UTC")
-            ((EdConvAccessUpdate (ConversationAccessUpdate {cupAccess = [], cupAccessRole = ActivatedAccessRole})))
-        )
-    }
-
-testObject_RemoveBotResponse_user_5 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_5 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvAccessUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00004615-0000-2e80-0000-552b0000353c"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "0000134e-0000-6a75-0000-470a00006537"))) (Domain "faraway.example.com"))
-            (read "1864-04-14 01:56:55.057 UTC")
-            ( ( EdConvAccessUpdate
-                  ( ConversationAccessUpdate
-                      { cupAccess = [InviteAccess, PrivateAccess, PrivateAccess],
-                        cupAccessRole = ActivatedAccessRole
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_6 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_6 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (MemberJoin)
-            (Qualified (Id (fromJust (UUID.fromString "00002aa8-0000-7a99-0000-660700000bd3"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "000036f7-0000-6d15-0000-0ff200006a4c"))) (Domain "faraway.example.com"))
-            (read "1864-05-31 11:11:10.792 UTC")
-            ( ( EdMembersJoin
-                  ( SimpleMembers
-                      { mMembers =
-                          [ SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000041-0000-004b-0000-002300000030"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "htshpkwocsefoqvjbzonewymi1zn8fpmdi1o8bwmm7fj161iortxvrz23lrjzabdmh6a55bb8cvq09xv6rq4qdtff95hkuqw4u8tj5ez9xx9cd7pvc_r67s2vw4m"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000055-0000-0065-0000-005000000065"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "j2dtw20p_p7_v96xvpsjwe9ww3eyi4zdq8xx2_cabuv0w21u_vz5l09abprf1hue25srgwrlgeszd1ce3mtgz5w"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000e-0000-0042-0000-00580000000a"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "o7hm7tvk1opilxu1kc5chxj25scof183t5mdwhdkj0zjg7re3vbt5g8988z6gyu4p8sspu8fto0sko9e_m8pzk54zzvwz7vod927_jjcp3wg5jj9n2egwvi8"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006b-0000-0080-0000-00360000000c"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      (parseRoleName "kf14jpkab__n0g0ssfw21_3q52t2op841s0zl8edy11acgb218rr4nmkodozdim")
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000031-0000-0006-0000-003f00000069"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "06i5vil75hof_mqn8_7cuglrizks"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006f-0000-0026-0000-006000000045"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "cux_igluvokgr7z7ikcqcmm9dhskcimfufmsxwb11vfv"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002a-0000-0080-0000-003e00000014"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "es0p"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001d-0000-006f-0000-003e0000003d"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "w28vr_ps429op3rmp3sil1wogmfgf1dsxmmsx2u5smde8srbfb11opw0a_b5z9ywbu9q0yivoz2n70m808m6f1vtvcr6oeh05c20va1jh299hk6q950"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004c-0000-0065-0000-007d00000026"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "4pgdip19fs0"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000028-0000-005b-0000-007d00000042"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "x76ykqupchbjeozez7aqxynobvjd38xuqb"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000011-0000-0031-0000-001e00000055"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "fsttup8l4pwse5n72k34u_swxpalpgzl4gjnko0l7c3gxmu0x6l4nzbyzdcaxstr2iiuxb061f9"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000039-0000-003b-0000-002200000013"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "73c37ry1xfsx"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007c-0000-0065-0000-001b00000046"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "51a4e2v57yge9xa_cc6mg67bix0exndp7swn_dppzuk8n5i19xsqaoqlkyv_x2hhv8h4uzkng185o5y_77189zvwk_y8sy1ynp5y8vo0e5p__kwlcl0yztuvtiyyr1"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000034-0000-004c-0000-001c0000007c"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "3qy1onol9hu2g4hql7ak8gyleg9a2dh0poq72b8opgm3140xjmrvlj0jtovjt3fpbar4x1i08lzdqndo7nhtczrrp9dahulq9fbuhfdrhu7n7kl6tkvu"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000004-0000-0028-0000-002300000045"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "lc4kukb759glnd3j1a5cd141a7a0h8pze2c78n8x3h_9mzn7v8jtfpsgqrvt9lca6l5f8oqk3yplig1ccl8"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000f-0000-007d-0000-00650000006b"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "pfirchcrh2lo5pq1msq2x93tawq4v37onjphe9fcssiwfdpysse0dvk3ehupya4axtiq6ewmsjjj9xsaimlk0l70ovinyo5zmgil24ckv_fd2v_h4fx9i2s"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006c-0000-0028-0000-004000000067"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "2130v11uf_bzjod2p35u_vhotitn"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000059-0000-007e-0000-00580000006c"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      (parseRoleName "6idgmk_1d_g5ii1sfpfcrenr8m2afbe2d71llw8xrlzdhxw_g7vn3foj5_abaul9j71_")
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007f-0000-0057-0000-004c00000005"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "c9ycux2q_6sj1hecc_cvkz6aupdm4g5rc3gzyw9cnd0wqd0miltcb1i0q6tietu0w7khbhg8fx3z600fgsr2m3rj0mxs1pqwblnhazp1f23t"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004a-0000-000b-0000-001000000004"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  (fromJust (parseRoleName "57guddz98hnzetk8xjme1h_gtmczis9jv3xt73rtjgz6jsentre2s7d2"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000a-0000-0039-0000-005c00000048"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "x0qcthwpdmzimnfqh4rd4sf"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006a-0000-000d-0000-006300000074"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "xdobrq683oi0lbxoy9ociqkouclsen5wu8suhbj75co521ipa89bnc7nh3y41fg58bxlet5u0wg94ueejw05iu15zr1kno_oxiqlhx9s9i9zd8ksyb4"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-0078-0000-00310000002b"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "9ble9wkz5sx4fof474zgb"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000006-0000-0042-0000-007e00000013"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "6x00nd8of9_prpikunwo7292vzgp6qivsia735dns1s395syckletc2smrzxezrsn1hgjjvenm"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002d-0000-0043-0000-004f00000078"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "dd2lcxld259xsjsqz2h130ksyeixe21s87mhwa7tas1k_ttqefg66ga13x7ixlfuuiaj5p8i16nn6pf3sbn25p8s4ld9virn3tf"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000015-0000-0069-0000-005400000018"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  (fromJust (parseRoleName "jiyr52auzomq5ui457z209fcszalvj_wy09_zgc05pfp9x304nwxni"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000064-0000-007d-0000-006b00000055"))) (Domain "faraway.example.com"),
-                                smConvRoleName =
-                                  ( fromJust
-                                      ( parseRoleName
-                                          "ldesfdsha0z3olxjyjkijtud5z2ns5oxb5h1vbbamtgymlnmjg4ybed_tfhvntcdr1h78ihk5ztwd27vtiy"
-                                      )
-                                  )
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006d-0000-007a-0000-007a00000017"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "hcfut6_dj"))
-                              },
-                            SimpleMember
-                              { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000005-0000-0065-0000-002600000007"))) (Domain "faraway.example.com"),
-                                smConvRoleName = (fromJust (parseRoleName "q5_32a257neednc3"))
-                              }
-                          ]
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_7 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_7 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (OtrMessageAdd)
-            (Qualified (Id (fromJust (UUID.fromString "00006a93-0000-005c-0000-361e00000180"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00007bb6-0000-07cc-0000-687c00002703"))) (Domain "faraway.example.com"))
-            (read "1864-04-25 18:08:10.735 UTC")
-            ( ( EdOtrMessage
-                  ( OtrMessage
-                      { otrSender = ClientId {client = "b"},
-                        otrRecipient = ClientId {client = "1c"},
-                        otrCiphertext = "",
-                        otrData = Nothing
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_8 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_8 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvConnect)
-            (Qualified (Id (fromJust (UUID.fromString "000022d4-0000-6167-0000-519f0000134c"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "0000200d-0000-386f-0000-0de000003b71"))) (Domain "faraway.example.com"))
-            (read "1864-05-29 09:46:28.943 UTC")
-            ( ( EdConnect
-                  ( Connect
-                      { cRecipient = (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000300000006"))),
-                        cMessage = Just "2\152188Q\EM4\DC3",
-                        cName = Just "$\1094087\1072236",
-                        cEmail = Just "1\\X"
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_9 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_9 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (OtrMessageAdd)
-            (Qualified (Id (fromJust (UUID.fromString "0000324b-0000-23a4-0000-0fbb00006c87"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00006234-0000-7d47-0000-0b95000079f2"))) (Domain "faraway.example.com"))
-            (read "1864-05-18 05:11:02.885 UTC")
-            ( ( EdOtrMessage
-                  ( OtrMessage
-                      { otrSender = ClientId {client = "1c"},
-                        otrRecipient = ClientId {client = "19"},
-                        otrCiphertext = "\STX\1046061\SYN\1945\SYN",
-                        otrData = Nothing
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_10 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_10 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (Typing)
-            (Qualified (Id (fromJust (UUID.fromString "00005788-0000-327b-0000-7ef80000017e"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "0000588d-0000-6704-0000-153f00001692"))) (Domain "faraway.example.com"))
-            (read "1864-04-11 02:49:27.442 UTC")
-            ((EdTyping (TypingData {tdStatus = StartedTyping})))
-        )
-    }
-
-testObject_RemoveBotResponse_user_11 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_11 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvRename)
-            (Qualified (Id (fromJust (UUID.fromString "00001db4-0000-575c-0000-5b9200002c33"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "000009b3-0000-04dc-0000-310100002b5f"))) (Domain "faraway.example.com"))
-            (read "1864-05-25 16:08:53.052 UTC")
-            ( ( EdConvRename
-                  ( ConversationRename
-                      { cupName = "\ETB\157284\160321>P2L\177195x\1075131\1078860\989169T\151842\&0)y\1003901\SYN"
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_12 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_12 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvConnect)
-            (Qualified (Id (fromJust (UUID.fromString "00004c29-0000-0214-0000-1d7300001cdc"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00003ba8-0000-448c-0000-769e00004cdf"))) (Domain "faraway.example.com"))
-            (read "1864-04-23 00:31:51.842 UTC")
-            ( ( EdConnect
-                  ( Connect
-                      { cRecipient = (Id (fromJust (UUID.fromString "00000002-0000-0005-0000-000100000007"))),
-                        cMessage = Just "\EM{ze;RY",
-                        cName = Nothing,
-                        cEmail = Just "}Y\1075650]?\21533o"
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_13 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_13 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvMessageTimerUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "000062a2-0000-46ad-0000-0f8100005bbe"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "000065a2-0000-1aaa-0000-311000003d69"))) (Domain "faraway.example.com"))
-            (read "1864-05-06 22:47:56.147 UTC")
-            ((EdConvMessageTimerUpdate (ConversationMessageTimerUpdate {cupMessageTimer = Nothing})))
-        )
-    }
-
-testObject_RemoveBotResponse_user_14 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_14 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvCodeUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "0000060f-0000-6d7d-0000-33a800005d07"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00005c4c-0000-226a-0000-04b70000100a"))) (Domain "faraway.example.com"))
-            (read "1864-04-21 02:44:02.145 UTC")
-            ( ( EdConvCodeUpdate
-                  ( ConversationCode
-                      { conversationKey =
-                          Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("AbM=P0Cv1K3WFwJLU6eg")))))},
-                        conversationCode =
-                          Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("z3MqXFfMRMlMeTim7025")))))},
-                        conversationUri = Nothing
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_15 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_15 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvMessageTimerUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00006421-0000-0363-0000-192100003398"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "000005cd-0000-7897-0000-1fc700002d35"))) (Domain "faraway.example.com"))
-            (read "1864-04-30 23:29:02.24 UTC")
-            ( ( EdConvMessageTimerUpdate
-                  (ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 8977358108702637})})
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_16 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_16 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvCodeUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "0000067f-0000-0d9b-0000-039f0000033f"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "0000030b-0000-5943-0000-6cd900006eae"))) (Domain "faraway.example.com"))
-            (read "1864-04-27 19:16:49.866 UTC")
-            ( ( EdConvCodeUpdate
-                  ( ConversationCode
-                      { conversationKey =
-                          Key {asciiKey = (unsafeRange ((fromRight undefined (validate ("E=ljiXAMvwAYiYxy3jSG")))))},
-                        conversationCode =
-                          Value {asciiValue = (unsafeRange ((fromRight undefined (validate ("=X8_OGM09")))))},
-                        conversationUri =
-                          Just
-                            ( coerce
-                                URI
-                                  { uriScheme = Scheme {schemeBS = "https"},
-                                    uriAuthority =
-                                      Just
-                                        ( Authority
-                                            { authorityUserInfo = Nothing,
-                                              authorityHost = Host {hostBS = "example.com"},
-                                              authorityPort = Nothing
-                                            }
-                                        ),
-                                    uriPath = "",
-                                    uriQuery = Query {queryPairs = []},
-                                    uriFragment = Nothing
-                                  }
-                            )
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_17 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_17 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvMessageTimerUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00005994-0000-5c94-0000-519300002727"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00003ddd-0000-21a2-0000-6a54000023c3"))) (Domain "faraway.example.com"))
-            (read "1864-04-24 18:38:55.053 UTC")
-            ( ( EdConvMessageTimerUpdate
-                  (ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 3685837512701220})})
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_18 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_18 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvConnect)
-            (Qualified (Id (fromJust (UUID.fromString "000005bf-0000-3fdd-0000-089a0000544e"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00003c0a-0000-3d64-0000-7f74000011e9"))) (Domain "faraway.example.com"))
-            (read "1864-05-05 05:34:43.386 UTC")
-            ( ( EdConnect
-                  ( Connect
-                      { cRecipient = (Id (fromJust (UUID.fromString "00000007-0000-0005-0000-000400000002"))),
-                        cMessage = Just "\1088794\GS\a",
-                        cName = Just "P",
-                        cEmail = Just "y\EMT"
-                      }
-                  )
-              )
-            )
-        )
-    }
-
-testObject_RemoveBotResponse_user_19 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_19 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvCodeDelete)
-            (Qualified (Id (fromJust (UUID.fromString "00000c59-0000-51c7-0000-1b6500001384"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00003046-0000-14df-0000-5a5900005ef2"))) (Domain "faraway.example.com"))
-            (read "1864-04-19 14:51:39.037 UTC")
-            (EdConvCodeDelete)
-        )
-    }
-
-testObject_RemoveBotResponse_user_20 :: RemoveBotResponse
-testObject_RemoveBotResponse_user_20 =
-  RemoveBotResponse
-    { rsRemoveBotEvent =
-        ( Event
-            (ConvMessageTimerUpdate)
-            (Qualified (Id (fromJust (UUID.fromString "00004e98-0000-2ec5-0000-31870000098c"))) (Domain "faraway.example.com"))
-            (Qualified (Id (fromJust (UUID.fromString "00006cb0-0000-6547-0000-1fe500000270"))) (Domain "faraway.example.com"))
-            (read "1864-05-18 03:54:11.412 UTC")
-            ( ( EdConvMessageTimerUpdate
-                  (ConversationMessageTimerUpdate {cupMessageTimer = Just (Ms {ms = 5776200192005000})})
-              )
-            )
-        )
+        Event
+          MemberLeave
+          (Qualified (Id (fromJust (UUID.fromString "00003ab8-0000-0cff-0000-427f000000df"))) (Domain "faraway.example.com"))
+          (Qualified (Id (fromJust (UUID.fromString "00004166-0000-1e32-0000-52cb0000428d"))) (Domain "faraway.example.com"))
+          (read "1864-05-07 01:13:35.741 UTC")
+          ( EdMembersLeave
+              ( QualifiedUserIdList
+                  { qualifiedUserIdList =
+                      [ Qualified (Id (fromJust (UUID.fromString "000038c1-0000-4a9c-0000-511300004c8b"))) (Domain "faraway.example.com"),
+                        Qualified (Id (fromJust (UUID.fromString "00003111-0000-2620-0000-1c8800000ea0"))) (Domain "faraway.example.com")
+                      ]
+                  }
+              )
+          )
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableAsset_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableAsset_user.hs
index f4adbbb4b94..98798a95470 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableAsset_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableAsset_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -18,19 +16,15 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.ResumableAsset_user where
 
-import Control.Lens ((.~))
+import Control.Lens ((.~), (?~))
 import Data.Id (Id (Id))
 import Data.Text.Ascii (AsciiChars (validate))
 import qualified Data.UUID as UUID (fromString)
-import Imports (Functor (fmap), Maybe (Just, Nothing), fromJust, fromRight, read, undefined, (&))
+import Imports (Functor (fmap), Maybe (Just), fromJust, fromRight, read, undefined, (&))
 import Wire.API.Asset
   ( AssetKey (AssetKeyV3),
     AssetRetention
-      ( AssetEternal,
-        AssetEternalInfrequentAccess,
-        AssetExpiring,
-        AssetPersistent,
-        AssetVolatile
+      ( AssetExpiring
       ),
     AssetToken (AssetToken, assetTokenAscii),
     ChunkSize (ChunkSize, chunkSizeBytes),
@@ -43,265 +37,10 @@ import Wire.API.Asset
 
 testObject_ResumableAsset_user_1 :: ResumableAsset
 testObject_ResumableAsset_user_1 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000010-0000-0008-0000-004300000006"))) AssetExpiring)
-            & assetExpires .~ (fmap read (Just "1864-04-13 11:37:47.393 UTC"))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("5A==")))})
-        )
-      )
-      (read "1864-04-09 06:01:25.576 UTC")
-      (ChunkSize {chunkSizeBytes = 17})
-  )
-
-testObject_ResumableAsset_user_2 :: ResumableAsset
-testObject_ResumableAsset_user_2 =
-  ( mkResumableAsset
-      ( ( mkAsset
-            ( AssetKeyV3
-                (Id (fromJust (UUID.fromString "00000027-0000-0020-0000-003200000062")))
-                AssetEternalInfrequentAccess
-            )
-            & assetExpires
-            .~ (fmap read (Just "1864-06-05 22:55:33.083 UTC"))
-            & assetToken
-            .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("tw0NZPaJk0Hl3VHZFPTyjet4u2ZErQ==")))})
-        )
-      )
-      (read "1864-04-26 00:29:12.625 UTC")
-      (ChunkSize {chunkSizeBytes = 19})
-  )
-
-testObject_ResumableAsset_user_3 :: ResumableAsset
-testObject_ResumableAsset_user_3 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000056-0000-0062-0000-00230000007d"))) AssetExpiring)
-            & assetExpires .~ (fmap read (Nothing))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("f7r-XByS")))})
-        )
-      )
-      (read "1864-05-12 00:54:09.852 UTC")
-      (ChunkSize {chunkSizeBytes = 24})
-  )
-
-testObject_ResumableAsset_user_4 :: ResumableAsset
-testObject_ResumableAsset_user_4 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000002e-0000-0005-0000-004500000020"))) AssetVolatile)
-            & assetExpires
-            .~ (fmap read (Nothing))
-            & assetToken
-            .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("dsGh0JVaM5x3-22SN_bey09Sxg==")))})
-        )
-      )
-      (read "1864-06-07 01:55:50.143 UTC")
-      (ChunkSize {chunkSizeBytes = 5})
-  )
-
-testObject_ResumableAsset_user_5 :: ResumableAsset
-testObject_ResumableAsset_user_5 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000026-0000-006e-0000-005200000005"))) AssetExpiring)
-            & assetExpires
-            .~ (fmap read (Just "1864-05-04 21:29:18.482 UTC"))
-            & assetToken
-            .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("jYmC3r4Wb2wSciaI2Hgwwrzgq02OzgmU8xIr")))})
-        )
-      )
-      (read "1864-05-09 07:28:34.68 UTC")
-      (ChunkSize {chunkSizeBytes = 12})
-  )
-
-testObject_ResumableAsset_user_6 :: ResumableAsset
-testObject_ResumableAsset_user_6 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000055-0000-007e-0000-003d00000039"))) AssetExpiring)
-            & assetExpires .~ (fmap read (Just "1864-06-07 14:00:07.598 UTC"))
-            & assetToken .~ Nothing
-        )
-      )
-      (read "1864-04-13 09:12:36.767 UTC")
-      (ChunkSize {chunkSizeBytes = 19})
-  )
-
-testObject_ResumableAsset_user_7 :: ResumableAsset
-testObject_ResumableAsset_user_7 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000004b-0000-0017-0000-00310000006e"))) AssetEternal)
-            & assetExpires .~ (fmap read (Just "1864-05-30 20:13:45.847 UTC"))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("KdZT7_v6l6f5OTs5")))})
-        )
-      )
-      (read "1864-05-03 02:47:46.506 UTC")
-      (ChunkSize {chunkSizeBytes = 8})
-  )
-
-testObject_ResumableAsset_user_8 :: ResumableAsset
-testObject_ResumableAsset_user_8 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000001c-0000-0075-0000-004d0000007c"))) AssetExpiring)
-            & assetExpires .~ (fmap read (Just "1864-04-24 18:20:27.32 UTC"))
-            & assetToken .~ Nothing
-        )
-      )
-      (read "1864-05-07 17:08:41.651 UTC")
-      (ChunkSize {chunkSizeBytes = 27})
-  )
-
-testObject_ResumableAsset_user_9 :: ResumableAsset
-testObject_ResumableAsset_user_9 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000001c-0000-0037-0000-00770000002d"))) AssetPersistent)
-            & assetExpires .~ (fmap read (Just "1864-05-23 18:01:30.768 UTC"))
-            & assetToken .~ Nothing
-        )
-      )
-      (read "1864-05-17 02:44:11.614 UTC")
-      (ChunkSize {chunkSizeBytes = 25})
-  )
-
-testObject_ResumableAsset_user_10 :: ResumableAsset
-testObject_ResumableAsset_user_10 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000007d-0000-002e-0000-00750000006d"))) AssetEternal)
-            & assetExpires .~ (fmap read (Nothing))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("UfKdZy8dO38=")))})
-        )
-      )
-      (read "1864-05-23 07:18:12.803 UTC")
-      (ChunkSize {chunkSizeBytes = 20})
-  )
-
-testObject_ResumableAsset_user_11 :: ResumableAsset
-testObject_ResumableAsset_user_11 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000001d-0000-0078-0000-00470000001b"))) AssetPersistent)
-            & assetExpires .~ (fmap read (Just "1864-06-07 11:41:46.477 UTC"))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("")))})
-        )
-      )
-      (read "1864-05-01 11:31:08.393 UTC")
-      (ChunkSize {chunkSizeBytes = 10})
-  )
-
-testObject_ResumableAsset_user_12 :: ResumableAsset
-testObject_ResumableAsset_user_12 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000022-0000-007e-0000-000d00000055"))) AssetVolatile)
-            & assetExpires
-            .~ (fmap read (Just "1864-05-17 11:30:44.469 UTC"))
-            & assetToken
-            .~ Just
-              (AssetToken {assetTokenAscii = (fromRight undefined (validate ("ae_eVOnDu38P3iQh_3uBbMpIABEc_ppAoiTGmg==")))})
-        )
-      )
-      (read "1864-05-06 10:40:58.261 UTC")
-      (ChunkSize {chunkSizeBytes = 9})
-  )
-
-testObject_ResumableAsset_user_13 :: ResumableAsset
-testObject_ResumableAsset_user_13 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000002d-0000-0075-0000-000600000003"))) AssetPersistent)
-            & assetExpires .~ (fmap read (Just "1864-04-23 13:14:02.408 UTC"))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("qRj2meQ68UfzECKD4C-y")))})
-        )
-      )
-      (read "1864-05-29 22:51:00.991 UTC")
-      (ChunkSize {chunkSizeBytes = 1})
-  )
-
-testObject_ResumableAsset_user_14 :: ResumableAsset
-testObject_ResumableAsset_user_14 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000030-0000-0069-0000-001a00000032"))) AssetPersistent)
-            & assetExpires
-            .~ (fmap read (Nothing))
-            & assetToken
-            .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("sJVOwiBtfAqMC56d-f7qGja7EdQ=")))})
-        )
-      )
-      (read "1864-04-13 15:39:20.608 UTC")
-      (ChunkSize {chunkSizeBytes = 12})
-  )
-
-testObject_ResumableAsset_user_15 :: ResumableAsset
-testObject_ResumableAsset_user_15 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000002f-0000-0064-0000-007f0000004b"))) AssetExpiring)
-            & assetExpires .~ (fmap read (Just "1864-05-22 22:28:50.009 UTC"))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("K2FfT2hIH0Wc-do=")))})
-        )
-      )
-      (read "1864-06-02 06:12:50.515 UTC")
-      (ChunkSize {chunkSizeBytes = 28})
-  )
-
-testObject_ResumableAsset_user_16 :: ResumableAsset
-testObject_ResumableAsset_user_16 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000058-0000-0076-0000-00280000001b"))) AssetExpiring)
-            & assetExpires
-            .~ (fmap read (Just "1864-05-02 08:47:43.202 UTC"))
-            & assetToken
-            .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("g_73-UjzHqlT_rTQYPpXvDdEQO5VOIXyrR8=")))})
-        )
-      )
-      (read "1864-05-09 15:19:28.092 UTC")
-      (ChunkSize {chunkSizeBytes = 11})
-  )
-
-testObject_ResumableAsset_user_17 :: ResumableAsset
-testObject_ResumableAsset_user_17 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "0000007c-0000-0030-0000-001a0000000f"))) AssetVolatile)
-            & assetExpires .~ (fmap read (Nothing))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("_ozCuHYT5FEamP2vYKON")))})
-        )
-      )
-      (read "1864-04-20 04:33:39.822 UTC")
-      (ChunkSize {chunkSizeBytes = 1})
-  )
-
-testObject_ResumableAsset_user_18 :: ResumableAsset
-testObject_ResumableAsset_user_18 =
-  ( mkResumableAsset
-      ( ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000024-0000-0042-0000-00680000004b"))) AssetEternal)
-            & assetExpires .~ (fmap read (Nothing))
-            & assetToken .~ Nothing
-        )
-      )
-      (read "1864-05-13 21:43:48.733 UTC")
-      (ChunkSize {chunkSizeBytes = 26})
-  )
-
-testObject_ResumableAsset_user_19 :: ResumableAsset
-testObject_ResumableAsset_user_19 =
-  ( mkResumableAsset
-      ( ( mkAsset
-            ( AssetKeyV3
-                (Id (fromJust (UUID.fromString "00000016-0000-0072-0000-007700000065")))
-                AssetEternalInfrequentAccess
-            )
-            & assetExpires .~ (fmap read (Nothing))
-            & assetToken .~ Just (AssetToken {assetTokenAscii = (fromRight undefined (validate ("Q41gte2seld_Ng==")))})
-        )
-      )
-      (read "1864-05-26 11:47:03.579 UTC")
-      (ChunkSize {chunkSizeBytes = 14})
-  )
-
-testObject_ResumableAsset_user_20 :: ResumableAsset
-testObject_ResumableAsset_user_20 =
-  ( mkResumableAsset
-      ( ( mkAsset
-            ( AssetKeyV3
-                (Id (fromJust (UUID.fromString "0000002f-0000-003c-0000-004600000044")))
-                AssetEternalInfrequentAccess
-            )
-            & assetExpires .~ (fmap read (Nothing))
-            & assetToken .~ Nothing
-        )
-      )
-      (read "1864-05-30 05:11:58.499 UTC")
-      (ChunkSize {chunkSizeBytes = 21})
-  )
+  mkResumableAsset
+    ( mkAsset (AssetKeyV3 (Id (fromJust (UUID.fromString "00000010-0000-0008-0000-004300000006"))) AssetExpiring)
+        & assetExpires .~ fmap read (Just "1864-04-13 11:37:47.393 UTC")
+        & assetToken ?~ (AssetToken {assetTokenAscii = fromRight undefined (validate "5A==")})
+    )
+    (read "1864-04-09 06:01:25.576 UTC")
+    (ChunkSize {chunkSizeBytes = 17})
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableSettings_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableSettings_user.hs
index 5a742b78d40..3c82024710f 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableSettings_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/ResumableSettings_user.hs
@@ -35,80 +35,20 @@ import Wire.API.Asset
 
 testObject_ResumableSettings_user_1 :: ResumableSettings
 testObject_ResumableSettings_user_1 =
-  (mkResumableSettings (AssetExpiring) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
+  mkResumableSettings AssetExpiring False (Type {mimeType = MIME.Image "png", mimeParams = []})
 
 testObject_ResumableSettings_user_2 :: ResumableSettings
 testObject_ResumableSettings_user_2 =
-  (mkResumableSettings (AssetEternal) (True) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_3 :: ResumableSettings
-testObject_ResumableSettings_user_3 =
-  (mkResumableSettings (AssetVolatile) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
+  mkResumableSettings AssetEternal True (Type {mimeType = MIME.Image "png", mimeParams = []})
 
 testObject_ResumableSettings_user_4 :: ResumableSettings
 testObject_ResumableSettings_user_4 =
-  (mkResumableSettings (AssetEternalInfrequentAccess) (True) (Type {mimeType = MIME.Image "png", mimeParams = []}))
+  mkResumableSettings AssetEternalInfrequentAccess True (Type {mimeType = MIME.Image "png", mimeParams = []})
 
 testObject_ResumableSettings_user_5 :: ResumableSettings
 testObject_ResumableSettings_user_5 =
-  (mkResumableSettings (AssetPersistent) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_6 :: ResumableSettings
-testObject_ResumableSettings_user_6 =
-  (mkResumableSettings (AssetPersistent) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_7 :: ResumableSettings
-testObject_ResumableSettings_user_7 =
-  (mkResumableSettings (AssetEternalInfrequentAccess) (True) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_8 :: ResumableSettings
-testObject_ResumableSettings_user_8 =
-  (mkResumableSettings (AssetPersistent) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_9 :: ResumableSettings
-testObject_ResumableSettings_user_9 =
-  (mkResumableSettings (AssetEternal) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_10 :: ResumableSettings
-testObject_ResumableSettings_user_10 =
-  (mkResumableSettings (AssetEternal) (True) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_11 :: ResumableSettings
-testObject_ResumableSettings_user_11 =
-  (mkResumableSettings (AssetEternal) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_12 :: ResumableSettings
-testObject_ResumableSettings_user_12 =
-  (mkResumableSettings (AssetVolatile) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_13 :: ResumableSettings
-testObject_ResumableSettings_user_13 =
-  (mkResumableSettings (AssetEternal) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_14 :: ResumableSettings
-testObject_ResumableSettings_user_14 =
-  (mkResumableSettings (AssetEternal) (True) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_15 :: ResumableSettings
-testObject_ResumableSettings_user_15 =
-  (mkResumableSettings (AssetVolatile) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_16 :: ResumableSettings
-testObject_ResumableSettings_user_16 =
-  (mkResumableSettings (AssetVolatile) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
+  mkResumableSettings AssetPersistent False (Type {mimeType = MIME.Image "png", mimeParams = []})
 
 testObject_ResumableSettings_user_17 :: ResumableSettings
 testObject_ResumableSettings_user_17 =
-  (mkResumableSettings (AssetVolatile) (True) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_18 :: ResumableSettings
-testObject_ResumableSettings_user_18 =
-  (mkResumableSettings (AssetVolatile) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_19 :: ResumableSettings
-testObject_ResumableSettings_user_19 =
-  (mkResumableSettings (AssetExpiring) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
-
-testObject_ResumableSettings_user_20 :: ResumableSettings
-testObject_ResumableSettings_user_20 =
-  (mkResumableSettings (AssetVolatile) (False) (Type {mimeType = MIME.Image "png", mimeParams = []}))
+  mkResumableSettings AssetVolatile True (Type {mimeType = MIME.Image "png", mimeParams = []})
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RoleName_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RoleName_user.hs
index 8d455703cd7..7c494484ded 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RoleName_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/RoleName_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,97 +20,4 @@ import Imports (fromJust)
 import Wire.API.Conversation.Role (RoleName, parseRoleName)
 
 testObject_RoleName_user_1 :: RoleName
-testObject_RoleName_user_1 = (fromJust (parseRoleName "pbxml8pq27ntqg5b4_63mfi67f8840kpnvcoi06drb7qq1py8k617sly2sg8i"))
-
-testObject_RoleName_user_2 :: RoleName
-testObject_RoleName_user_2 =
-  (fromJust (parseRoleName "gq6zygi8btu9kwebf77kabsf7vjdnk1jm31z0kx9uzjc2nt1g2h4hjl6s3x3igg0mcccosd2"))
-
-testObject_RoleName_user_3 :: RoleName
-testObject_RoleName_user_3 =
-  ( fromJust
-      ( parseRoleName
-          "5wrzchlsgzn6w0xam_t_v6qjtssrwxpf7h5uhz5np4okrpmviv2u5srhr85wf7ymvi2_vrd5w_lc4m_nelecakrjecpfxsbi2uhspwrv"
-      )
-  )
-
-testObject_RoleName_user_4 :: RoleName
-testObject_RoleName_user_4 =
-  ( fromJust
-      ( parseRoleName
-          "dnw29kl7bj6q6g492tkafzidc94re8c6evo042z54rqzlpm6yixqvpo_4artjd22geao8639htp_whsyplcsr4pme91zlevuby96b6us3kleey12d"
-      )
-  )
-
-testObject_RoleName_user_5 :: RoleName
-testObject_RoleName_user_5 = (fromJust (parseRoleName "nz9_bblydqr1sggt_2ynt"))
-
-testObject_RoleName_user_6 :: RoleName
-testObject_RoleName_user_6 =
-  ( fromJust
-      ( parseRoleName
-          "tih5h608yyzxmecep1o8q8ylsjvmxmfk0i7yz32i88kh2coln056vh6uvl2512r2g0e6jtkhumjju2xh4si63fegxaf9dkjfx42ny_5fixbzis76c"
-      )
-  )
-
-testObject_RoleName_user_7 :: RoleName
-testObject_RoleName_user_7 =
-  ( fromJust
-      ( parseRoleName
-          "zz5agzor7qxnzn4nivm65hquuz6vvugqsb3ybg5kz_m8hvky8nd7tinnmd1dicuhi0ptmkr3nmigsyn4dphevw67fo1e9xrs5k7r_ab26hc29pv3fl1m6vz0rp7"
-      )
-  )
-
-testObject_RoleName_user_8 :: RoleName
-testObject_RoleName_user_8 = (fromJust (parseRoleName "uhdnvgyuhx3jddx13oedm"))
-
-testObject_RoleName_user_9 :: RoleName
-testObject_RoleName_user_9 =
-  ( fromJust
-      ( parseRoleName
-          "brwo3gw982sasf4pgq1t5rvbeb8qg4slg5gnon2fky1d1ttb601lnx2sy304dy9x2lo4ky1t43vyoonf6ibpsqb2j4g6acl1cmpn70k8ems"
-      )
-  )
-
-testObject_RoleName_user_10 :: RoleName
-testObject_RoleName_user_10 =
-  (fromJust (parseRoleName "z5a6748jcjtxbd97waofvuc1towcsmi2giisptv423owfz22vl7wqt7oo0l95kx27kygctnr43284s"))
-
-testObject_RoleName_user_11 :: RoleName
-testObject_RoleName_user_11 = (fromJust (parseRoleName "7q71wcd9n5m4yx6f3pyv4xtg29mf3f2"))
-
-testObject_RoleName_user_12 :: RoleName
-testObject_RoleName_user_12 = (fromJust (parseRoleName "nps2b9lcc14oue1ktuh90vl9cftwx8tgqqk8cs39b"))
-
-testObject_RoleName_user_13 :: RoleName
-testObject_RoleName_user_13 =
-  ( fromJust
-      (parseRoleName "4fwlon_vim0rzhe8uwvqtgbibum3ujljee9jur3jknbwrupzq_2ld5uk3xew4usyfmx3hcbziuswy0bimwswpd1y8y2hrazpy")
-  )
-
-testObject_RoleName_user_14 :: RoleName
-testObject_RoleName_user_14 = (fromJust (parseRoleName "udj29bnlfwiqzwc12do1gdsn9ea9_rvbenw7h0vpv9d1ko_9tgq2"))
-
-testObject_RoleName_user_15 :: RoleName
-testObject_RoleName_user_15 = (fromJust (parseRoleName "1wtcnz0qyoixy7atn0emhqal_4vv0rqlif9oxv4aytxao2"))
-
-testObject_RoleName_user_16 :: RoleName
-testObject_RoleName_user_16 = (fromJust (parseRoleName "sbko1kbw1amklw9dfwfba5etnsha9b9ox_fwcxw7yi_x5v53056jtpr7_h8m"))
-
-testObject_RoleName_user_17 :: RoleName
-testObject_RoleName_user_17 = (fromJust (parseRoleName "059yo35eotsfmktp3xvhhn0mr23gvkkbi6"))
-
-testObject_RoleName_user_18 :: RoleName
-testObject_RoleName_user_18 = (fromJust (parseRoleName "8lvi4rvmzpv8z4vo2nytv5kz1iu85kzmofbqs5of4c6x_q0qc30_ozx4m0mzb"))
-
-testObject_RoleName_user_19 :: RoleName
-testObject_RoleName_user_19 =
-  (fromJust (parseRoleName "6yibyw2twtza6cleonm05dn9w0jruyblm_lsdbfmn9v0panffnjxoo8r0kp6itvqfll"))
-
-testObject_RoleName_user_20 :: RoleName
-testObject_RoleName_user_20 =
-  ( fromJust
-      ( parseRoleName
-          "ee4_fwxwpe4y164gtg3h8q6ss22ocbgh3vv965avw9sfexzudgimyi34nbucixs7u7lo_b4dnlnc5yuzuo6x7ij5y66ku5j_u4vozp26mhi0tkq6qrz19_wshh"
-      )
-  )
+testObject_RoleName_user_1 = fromJust (parseRoleName "pbxml8pq27ntqg5b4_63mfi67f8840kpnvcoi06drb7qq1py8k617sly2sg8i")
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SFTServer_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SFTServer_user.hs
index 7fa457b688a..e55074cf732 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SFTServer_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SFTServer_user.hs
@@ -62,402 +62,3 @@ testObject_SFTServer_user_1 =
             }
       )
   )
-
-testObject_SFTServer_user_2 :: SFTServer
-testObject_SFTServer_user_2 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_3 :: SFTServer
-testObject_SFTServer_user_3 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_4 :: SFTServer
-testObject_SFTServer_user_4 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_5 :: SFTServer
-testObject_SFTServer_user_5 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_6 :: SFTServer
-testObject_SFTServer_user_6 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_7 :: SFTServer
-testObject_SFTServer_user_7 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_8 :: SFTServer
-testObject_SFTServer_user_8 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_9 :: SFTServer
-testObject_SFTServer_user_9 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_10 :: SFTServer
-testObject_SFTServer_user_10 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_11 :: SFTServer
-testObject_SFTServer_user_11 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_12 :: SFTServer
-testObject_SFTServer_user_12 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_13 :: SFTServer
-testObject_SFTServer_user_13 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_14 :: SFTServer
-testObject_SFTServer_user_14 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_15 :: SFTServer
-testObject_SFTServer_user_15 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_16 :: SFTServer
-testObject_SFTServer_user_16 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_17 :: SFTServer
-testObject_SFTServer_user_17 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_18 :: SFTServer
-testObject_SFTServer_user_18 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_19 :: SFTServer
-testObject_SFTServer_user_19 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
-
-testObject_SFTServer_user_20 :: SFTServer
-testObject_SFTServer_user_20 =
-  ( sftServer
-      ( coerce
-          URI
-            { uriScheme = Scheme {schemeBS = "https"},
-              uriAuthority =
-                Just
-                  ( Authority
-                      { authorityUserInfo = Nothing,
-                        authorityHost = Host {hostBS = "example.com"},
-                        authorityPort = Nothing
-                      }
-                  ),
-              uriPath = "",
-              uriQuery = Query {queryPairs = []},
-              uriFragment = Nothing
-            }
-      )
-  )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Scheme_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Scheme_user.hs
index a9dc8eb0299..0596abd0ccf 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Scheme_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Scheme_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -26,57 +24,3 @@ testObject_Scheme_user_1 = SchemeTurns
 
 testObject_Scheme_user_2 :: CallConfig.Scheme
 testObject_Scheme_user_2 = SchemeTurn
-
-testObject_Scheme_user_3 :: CallConfig.Scheme
-testObject_Scheme_user_3 = SchemeTurns
-
-testObject_Scheme_user_4 :: CallConfig.Scheme
-testObject_Scheme_user_4 = SchemeTurns
-
-testObject_Scheme_user_5 :: CallConfig.Scheme
-testObject_Scheme_user_5 = SchemeTurn
-
-testObject_Scheme_user_6 :: CallConfig.Scheme
-testObject_Scheme_user_6 = SchemeTurn
-
-testObject_Scheme_user_7 :: CallConfig.Scheme
-testObject_Scheme_user_7 = SchemeTurn
-
-testObject_Scheme_user_8 :: CallConfig.Scheme
-testObject_Scheme_user_8 = SchemeTurns
-
-testObject_Scheme_user_9 :: CallConfig.Scheme
-testObject_Scheme_user_9 = SchemeTurn
-
-testObject_Scheme_user_10 :: CallConfig.Scheme
-testObject_Scheme_user_10 = SchemeTurns
-
-testObject_Scheme_user_11 :: CallConfig.Scheme
-testObject_Scheme_user_11 = SchemeTurns
-
-testObject_Scheme_user_12 :: CallConfig.Scheme
-testObject_Scheme_user_12 = SchemeTurns
-
-testObject_Scheme_user_13 :: CallConfig.Scheme
-testObject_Scheme_user_13 = SchemeTurn
-
-testObject_Scheme_user_14 :: CallConfig.Scheme
-testObject_Scheme_user_14 = SchemeTurns
-
-testObject_Scheme_user_15 :: CallConfig.Scheme
-testObject_Scheme_user_15 = SchemeTurn
-
-testObject_Scheme_user_16 :: CallConfig.Scheme
-testObject_Scheme_user_16 = SchemeTurn
-
-testObject_Scheme_user_17 :: CallConfig.Scheme
-testObject_Scheme_user_17 = SchemeTurn
-
-testObject_Scheme_user_18 :: CallConfig.Scheme
-testObject_Scheme_user_18 = SchemeTurns
-
-testObject_Scheme_user_19 :: CallConfig.Scheme
-testObject_Scheme_user_19 = SchemeTurn
-
-testObject_Scheme_user_20 :: CallConfig.Scheme
-testObject_Scheme_user_20 = SchemeTurn
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMember_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMember_user.hs
index 01c9bde30eb..7b0e1ea957b 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMember_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMember_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -31,177 +29,17 @@ testObject_SimpleMember_user_1 =
   SimpleMember
     { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003a-0000-0042-0000-007500000037"))) (Domain "faraway.example.com"),
       smConvRoleName =
-        ( fromJust
-            ( parseRoleName "wire_admin"
-            )
-        )
+        fromJust
+          ( parseRoleName "wire_member"
+          )
     }
 
 testObject_SimpleMember_user_2 :: SimpleMember
 testObject_SimpleMember_user_2 =
   SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000046-0000-0027-0000-003c00000022"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        ( fromJust
-            ( parseRoleName "wire_member"
-            )
-        )
-    }
-
-testObject_SimpleMember_user_3 :: SimpleMember
-testObject_SimpleMember_user_3 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000039-0000-0070-0000-005700000019"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "7uzp7961dyf_666xqxwvq6uro"))
-    }
-
-testObject_SimpleMember_user_4 :: SimpleMember
-testObject_SimpleMember_user_4 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007c-0000-0075-0000-005b00000049"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "4vr9oed4nvhs625ri_cz1cv5kodntk3edmkpu"))
-    }
-
-testObject_SimpleMember_user_5 :: SimpleMember
-testObject_SimpleMember_user_5 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004c-0000-004e-0000-002400000009"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "wst92x"))
-    }
-
-testObject_SimpleMember_user_6 :: SimpleMember
-testObject_SimpleMember_user_6 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000052-0000-0053-0000-000400000000"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        (fromJust (parseRoleName "nkyx6ypx0p0b_fvx6mt6w5w6n2qpivv9svj2myn5n86isy7n2e07m92t7ostflj4lq1py50bqzdi4smzd"))
-    }
-
-testObject_SimpleMember_user_7 :: SimpleMember
-testObject_SimpleMember_user_7 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003d-0000-006f-0000-00480000006e"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "d8027w_w7pr9fj"))
-    }
-
-testObject_SimpleMember_user_8 :: SimpleMember
-testObject_SimpleMember_user_8 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004c-0000-006c-0000-000800000044"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "_rgnqtn1bdc2eb4nr8ilpka1sm6kt5bvonqm742npdpro1s4b_ydcahfm4q7i0getmnp0vdpod_eye8c_1kb72d_96qypb"
-            )
-        )
-    }
-
-testObject_SimpleMember_user_9 :: SimpleMember
-testObject_SimpleMember_user_9 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000a-0000-007a-0000-003f0000001b"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "sr5pfubd0_cpdp"))
-    }
-
-testObject_SimpleMember_user_10 :: SimpleMember
-testObject_SimpleMember_user_10 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001d-0000-000f-0000-002900000072"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "paru"))
-    }
-
-testObject_SimpleMember_user_11 :: SimpleMember
-testObject_SimpleMember_user_11 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007d-0000-0076-0000-001e00000019"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        ( fromJust
-            (parseRoleName "e0u15rrzql4y8jymut86vv84l4tjzpfti0_b1w44gy13j3d0dq1y22ws75tkgd4n_9tju4pq34_ddk_g9qpypwu4z3b5")
-        )
-    }
-
-testObject_SimpleMember_user_12 :: SimpleMember
-testObject_SimpleMember_user_12 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003c-0000-0001-0000-004a00000014"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        ( fromJust
-            (parseRoleName "telj17ej33ilgtqvqajp0ofng9qm6v9b1n32n_l6_vw_xxtk4o7n6r50ea3w1xgzh3eapah1jytfpz0f65utf9xqc4pv")
-        )
-    }
-
-testObject_SimpleMember_user_13 :: SimpleMember
-testObject_SimpleMember_user_13 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000052-0000-002c-0000-004500000067"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "bfamau83n6sskso4rod8fz1tb4tf1zfz8mfd1v0ae1sx17po1"))
-    }
-
-testObject_SimpleMember_user_14 :: SimpleMember
-testObject_SimpleMember_user_14 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000018-0000-006d-0000-000600000017"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "tu7zi7d5va224nfegt84g0argkadivw4hlvkj_bpixff19r8j2lf1uhde2rex9ery9xskxm2f_2mpbgutdj6kt56n5proalpciwttcomv3j1pzev6qw3ism"
-            )
-        )
-    }
-
-testObject_SimpleMember_user_15 :: SimpleMember
-testObject_SimpleMember_user_15 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006e-0000-0037-0000-00610000007e"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "rt25zies0df"))
-    }
-
-testObject_SimpleMember_user_16 :: SimpleMember
-testObject_SimpleMember_user_16 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000042-0000-006a-0000-000800000052"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "pknq1f2x"))
-    }
-
-testObject_SimpleMember_user_17 :: SimpleMember
-testObject_SimpleMember_user_17 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000020-0000-0000-0000-00500000005c"))) (Domain "faraway.example.com"),
-      smConvRoleName = (fromJust (parseRoleName "w1bcl23oz4ax6dg14h3y8nxqb77sx9ajonsvx7qd"))
-    }
-
-testObject_SimpleMember_user_18 :: SimpleMember
-testObject_SimpleMember_user_18 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000049-0000-000c-0000-004d00000043"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "u1c8n7lhvsnr5cdavje5wbezt4an_h92yp0bma6l_6h6dn67lh8_jpk8_eznfja7qhh7wkczfanq5esl7b9y2g16afnnsvgt6i48pmjeo1msq7uuvm"
-            )
-        )
-    }
-
-testObject_SimpleMember_user_19 :: SimpleMember
-testObject_SimpleMember_user_19 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000031-0000-003d-0000-003800000024"))) (Domain "faraway.example.com"),
-      smConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "jzmvwd4h3ji2yc2wbog57546ono56qpsobzbszmed5y5436ub8lrvfydxmfleq4j6yj04vdivxpagt5lm5luplyy9zwcbjwyhgcom2njlzvj3ydbmol2onhp75p3"
-            )
-        )
-    }
-
-testObject_SimpleMember_user_20 :: SimpleMember
-testObject_SimpleMember_user_20 =
-  SimpleMember
-    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000074-0000-0010-0000-001600000078"))) (Domain "faraway.example.com"),
+    { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003a-0000-0042-0000-007500000037"))) (Domain "faraway.example.com"),
       smConvRoleName =
-        ( fromJust
-            ( parseRoleName
-                "qbb0jgv5yq8ur0ogawcj0gx3f6yau5cnc5x3q8rnq5pn3mn4160ipvryoa2cpz0beg34ur64klqk5a2r9rqvc38w_gp6rbli54r46417_5mmylx5usc9"
-            )
-        )
+        fromJust
+          ( parseRoleName "wire_admin"
+          )
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMembers_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMembers_user.hs
index 1ec3f17abfe..24fdf77feba 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMembers_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/SimpleMembers_user.hs
@@ -31,2176 +31,12 @@ testObject_SimpleMembers_user_1 =
   SimpleMembers
     { mMembers =
         [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000048-0000-0011-0000-002300000050"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "py49zu8bed53ta2nhrhtkv1ck923pk8x70h1zzgp1h15yf6_vcqq7aeckcwpgonge096jg1l2xm4qogs3gucm_s8c_djl718bnwnm6x16rtxttlb47fiazreiew8"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000030-0000-003d-0000-00620000002a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "qslp25fyjfvydgtfk3v3ibh8eqdq3kpek7rb11xteg2y5_0a1mv14v5n79jznd5zjfes70nqyeacesqi8v62fmzsc_4zss75er"
-                    )
-                )
-            },
-          SimpleMember
             { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001f-0000-002b-0000-005500000013"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "n0_wuagfmm6ltcjr0n2ib7l2mdg3i0zwtzmb6aribmg2107sirkgo17wjt9d2h66nj3lerw_blivsh6by09a")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000062-0000-0017-0000-005a00000019"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "4q8i3kin7cuo_xpa"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000065-0000-002e-0000-00730000002f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "e52wem88ym9kubyydku"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000048-0000-0068-0000-002300000042"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "yson37f_88qcp5chnwpjnwin427qoptb7bmlx5u2454vw95vvt241red8i1pkavlha4l9vx3cr1ajgklb")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000021-0000-0057-0000-005d00000055"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "q24o118lbfa5zisiltltauh2qyf2lo_vu10hohqtf157wiasc4old5lwbn0g5xarmmu91kfqczv1om08v81k_a"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000080-0000-0071-0000-003400000066"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "0otsqpgjh2ctmp22nsof114767_vow59km_e"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000036-0000-0050-0000-002a0000005b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "406ogeb8o68w"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000044-0000-0025-0000-002e00000026"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "vgwq1mfqei0embh6msg2q0ucobreh9jl61ql0fge66e9xe"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000059-0000-0000-0000-002e0000002d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "rmv3a7k_p9vlj1l324wnlko6fa0ve13nnf9n0qmey0dgacxewoyss9wih9k0oddw3q634r8ewtj43os8jwg5ka7m58vcqlq2ci6n0a139_g3avnchq9uvi0"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000014-0000-0003-0000-002600000025"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "9pryu0zv3nw_xtb3xr1naukqs0e"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002c-0000-0006-0000-007300000061"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "iy"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003f-0000-002c-0000-00670000002f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "bv0fkxi4521qi41njnulwsz6lp4qwsm0mgbkis1pwjc4bxatdie460vepfj11u_osup17wizy3clm31t_z827yzkw_zcgs"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006c-0000-0072-0000-00400000002d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "5v6_cttr3ctgrijw4h1_gsyi41f4t3dgyh64dhcgeoxvao1h68"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000064-0000-0070-0000-000800000049"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "x0"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006a-0000-002e-0000-006000000070"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ss07m2lagw1v7yvn_swpeauvqdyktrcjreq86gx7shm4xkc3rtimrykvblvtc52pnc8obmsdz475yeet1sxlp0hq7wcaagr2hdi7a7d801khmybj"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000059-0000-005a-0000-002300000061"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "vb_ng523gxc0ci13cmxscmusff8uw12hvbsvfsa"))
+              smConvRoleName = fromJust (parseRoleName "n0_wu2h66nj3lerw_blivsh6by09a")
             }
         ]
     }
 
 testObject_SimpleMembers_user_2 :: SimpleMembers
 testObject_SimpleMembers_user_2 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004c-0000-0022-0000-00720000007c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "s_l79fneq3swkwha5llyp8_b7hw9tyi906s7c5c3n1t_v1rkax_gx88gbc8tti9z8e5ad1y0n3irysgradbjj8_ykfkhjv2xu70"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002c-0000-0079-0000-004b0000002a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "jhrez7dufl3ne050doxot1f7mhup7a0rr59472xmcvukln0cw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006d-0000-0033-0000-006d00000070"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "t9e5nbirc5uv1n4jda1bo8mwc72si1wi0_hngmo0sw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000018-0000-0022-0000-001b00000048"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "fee9mv0u39pyxfjffutut9ahag22y4_bjd_gcflwenmgndeztyuur4ypax_3kwt2i4extz5mg30c6l_6lwtff1tmbh_82uo9y7ni42m2yjjfvwu13gqx2ucw3iv_wh"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-004e-0000-002f00000038"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "4o0ctcw73niokwjhjo8_65khxlxx_1o9ktctoq5kdmm39640gc2f3uc3nq99bq_93sgnhvd04wx3pgw1n1l")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003e-0000-005f-0000-004b00000038"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "4x1goxovt1vshlij0yhfb9hu_adl4dvucsylf6o32fdsrmx0yr1lan69pyz4o50025mqtu1xi9b5h6zky7y31mkw3_lunyoglxxm0mn4loue8wa5c9kqtw3"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000008-0000-0030-0000-004000000062"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "g1lrkbr7ouvsrch981kwrz1k8un"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000071-0000-0074-0000-007500000032"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "7zc5bbxmb4igwsjplqmnttlwrhs4k5dangjj0zvpflv6q6kqfksglq1xq5992v7ce34w3s_s08jfco91s_c4dhbzcyygwfxaty7"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000025-0000-003f-0000-000c0000000a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "yqpt1iljztlmcsh2u3gt5s_gg1t7x81iwpp8ui501"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006f-0000-007f-0000-007300000013"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "vq6envh0bnegl9x1t"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-006b-0000-00200000006a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "3ehnf28yt11ip57arzrw7pow5m1jsjmcvd3dd5v36aftd38n0612dzjp2pofintyzuue89h_vgk47j0r4jsz4anewa_vko96m"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0009-0000-003f00000060"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "de169f9r4vegvo0tcmv0wd8_tp0jw8c2hpv_q2ya_48gner4ablbfke36imbne2wz2miqc_wsbfp5nmgklu1sv9dnar5ftny4s7_w"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000071-0000-0077-0000-004600000064"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "191um99jwj93l_cv5zdb6op2a5j3tkismgxlv0jzf90zbw4hi9i611nilzp2i3dq16fj1naa0mdqou9")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005d-0000-0060-0000-000500000063"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "b0oxc3cm4deaiuhqlip8cerktwoqbdp_z56h8jeyfc5any"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000074-0000-0013-0000-005700000074"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "pti7ldmszyimj_wsjq9k0p0z5jb5z3kar759v7tmwifoxgv1mkz2n4igze26p53mr34a4ghcv67fhvdqq4p7h6klye7ndhoezo6hd243gtibdr"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000063-0000-0078-0000-001000000046"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "5tsp_2"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006c-0000-0062-0000-00440000002e"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "xn825hf3etf479oc7vjahb"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000070-0000-0030-0000-000e00000075"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "6lyro5zz2erfgps9u1hpzlefe364l1uhhfmynczytotfna4wta_z9gkbxkhsn4zcz6ct1yyliz6fkb1fo4fqlgjs5toi44o81j1e8_oldj"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007b-0000-0058-0000-003000000071"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "iabgwa1qc9g1jvz8qvs2zf8knqstfk7uxbg8ok9i6jgb7ngqk9f441bxnxgb35uerdky5atdda5g0h8ywv3x83qt"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007f-0000-0070-0000-007700000034"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "88__aymok2p9flpv0xp5nujwww7ubyxmojd74cim22ixoig78e7ov7vf4s39x3nh85wtr2z0wvsd5lcr48ut9gjgrt1bc7qpo"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000042-0000-001c-0000-005900000054"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "2ogp8swsxisn1w2bohi8rcvl_1rtx0m34lr6x8sqkt9"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000c-0000-0072-0000-001100000014"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "xu52_xbb5yijobss5ls1kkdn_mhgvqkasyfcn1o99ds1pi7zp8lbypszkarhji_bbsdpqylore9zd_woft67s"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000073-0000-0042-0000-005a0000001c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "pma4ikgggpi_q0rvtdvjoff8fztnbolrl6oty_yvxm3qksaeg0l9bh8byrde5mto2f2a1rmn"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000029-0000-0042-0000-001a00000071"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "njm9ltp6fr3yk2ke5skszy0xspo7blk"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000057-0000-0025-0000-002400000040"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "2itlnpkl2w0wh1pso963adsg8psnf8sql_ez6o9qcmy_scfvcvjcin6khn6ye_fqh5z1n52nyqis3wllwnnym6itdqccgr9fk9ttne_h0"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000009-0000-0034-0000-006c00000009"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "x61tv07e4higron1y"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000071-0000-0069-0000-00310000002b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "y7ttveh1qbqrww6el6rpjbz13kla3873tu2t"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007a-0000-0016-0000-005a0000001f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "y2791q0e6ve5oof9ep"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003b-0000-0075-0000-000500000008"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "db051rwfps8foxf3bqqk8"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_3 :: SimpleMembers
-testObject_SimpleMembers_user_3 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-001c-0000-004200000050"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "cfz_d4ungmducvtxdmamhrfwox3_ixnvu3lgxutif4hvhqh2gpcdheclk_t1tc2fo6o1f1l4olzojelbqaktba77gshp4jsodxnlvuhfjv_2yc3xd4hqcjatvqibrf0t"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000025-0000-000b-0000-005200000004"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "3qmhpz4xwoe0esh_q57fof2a0dntyt1rzwsrii_srhk067ashevn25ypd9ulscohnonbk99kka6lo1fvh2405_"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000022-0000-0022-0000-00560000005b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "so7mgd7pd8f5bl2hc28161aqhqht1ii3ysfmj"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000065-0000-001d-0000-00530000001a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "dcd0mqj2i4w35js"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000021-0000-003e-0000-00140000005d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "0n5d40stfqajajw2_q70xrtjct7oursrdqbr"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000016-0000-001d-0000-002400000078"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "6xsb6xh6qstehp328c8pbh4z4nnkjqtv8"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_4 :: SimpleMembers
-testObject_SimpleMembers_user_4 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007f-0000-007b-0000-002c00000013"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ev2phc8z5r_qnawlxzgf7ba70oq8yebweiuaoe0cslzfoffdpos4edxi24p1fi09o7535laz7vuh4c96g2tracz4ofyu5fw"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000079-0000-0021-0000-007000000061"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "2dpw9m0sf8_"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_5 :: SimpleMembers
-testObject_SimpleMembers_user_5 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000053-0000-0076-0000-00100000004e"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "rus8lexaw6nztct_zjcjucxjrs4_atd_3spmbofo3nzlh5ia3llctfiqjs46jw8l6mqazv2pwp93akrkbh6ialmv23yk58_52c34qnbkgdvvephp28"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0075-0000-006500000014"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "rirdp8hwy4qbgbjktu7oonchq2s_kpntqqffd7eh24isbfkwwq0lgmeo3o7rxbuehhwe6dt99xhao3fswgm0xqa2_ag5as"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000a-0000-0068-0000-00100000000c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "48idob6a3qg0k4cyr4x5b3gvqafdeogqtnh_69ov347xwn54j"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000070-0000-000f-0000-002400000032"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "u4ruh9mhqk3m_u6e4guj7ee40_svakap_92pwi89sdme0pkh6inwk4ttg1xmoottx1uy6ryv52w_2lf340g7ohndxa2r3iwue2k3r6c084kifr914ulcon"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002c-0000-0000-0000-007500000037"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "rc779wbhz5nabuxyzdrv6n9oiq06olf0"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005c-0000-0009-0000-001700000033"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "1yeunp1yvablh18tnsoaa8xnggbpbviyabkfh6abd9vw0mrcy3x3gu3m2jvnjhroe44y55c9"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000011-0000-004f-0000-007400000055"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "opmdgq5u1h4ersm_ydrpyydfv2cdlsj7uwkqaz892ajcmuwi28c197"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005b-0000-0076-0000-007f00000034"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "nkencc_183b83h8xpvgbgub80wyn9y2mrdj4b3at0t1iuc39e4szcufloiluzpfm1p63ozppoj_xrd0yen3ain9jpmb6nbhjw"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000044-0000-0065-0000-004f00000039"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "q12f4o68fsu7kmvmha9h7pqadr37mr7anszmrm4gzyij_ejo78kbtxr85ko8ewzbrz6wuuzm1fwjir67o_0x66_gca2up99w4dzvtjhwsonumkcxx8ffhkln2y7i"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000f-0000-0059-0000-002100000019"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "d87qu8t82u8q8isnqw_0_55hpuuwnjfvra2ieaogqqdn6iwv8b"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000076-0000-0044-0000-00110000002b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "flgbw825uiqbe3zydw97iha4be77fnoey3ppqzf6nmwkm8w8gqlwidk6dubc6id4iqqrxb8gbgdrfwwiye1j371xkb2_786vzon9"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007c-0000-0016-0000-001200000027"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "g43z_vqs1w3nubu3uuvq7eycshex3ug1mz7h50o8k4mu9q1tm_z"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003b-0000-0005-0000-002a00000003"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "toatgflm9kmzec4xpbt596ti99yjqh96g4tp"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002c-0000-005d-0000-005e0000005e"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "xgpcwa43"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004b-0000-004c-0000-001300000001"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "jpp1rdcx0mto46xxx26moxicgo2c2voj_ufk9czxpjt9na71urpd9pyllrnpot4cfj7hjqr1renpy0d2tntwnsq303mws_vxbiyitlavo9yszzlv4s4b996336bt"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_6 :: SimpleMembers
-testObject_SimpleMembers_user_6 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000079-0000-002a-0000-004d0000001d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "9adipks6ebghvg1g9a9w1h_oto9w98k8v6i81qpp7l0hk874ixzqqt3qcsjfbscqfyszyz_miodcsoxoz8qlc4405cth5mlo646en1e"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001f-0000-0042-0000-00530000002e"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "99uoa6zruc85ailr9e9lu5537qrixoaq1ufioh4uepukbae"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000049-0000-0022-0000-003f00000045"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "v7wd6iz93y9034f6eq7u__okr92zkjvkwgtbidzo1wm1r2g1qv7r9vab4mgqiicw3k1i_z21zrf3tfp717rb04q7e"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000011-0000-002d-0000-004e0000003c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "xxj8_x7sgu_7j6fjxshorrc5pn_nwrx1_kft7yl8w2383w5eti15qiu0xzmaqa3913938f_"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000039-0000-0032-0000-006b0000007c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "jr8qjzzzoqzxh67eh8qsqp531s0a7ji3a7vtji48tcf56g_fnjn3nax"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000071-0000-0033-0000-006e00000063"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "74mkhdsejovwuzzul9lpdysdt1viedz37o1li8o5lxay9hy2il4_7puyks95krk_7w2t4m9lbadx1ay3abk_mxkq0d6ufg2f9ytx_"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005e-0000-0062-0000-00220000003f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "rk088vrknhjb1qmbzz5b44yziqkeospcorqg3y3f01phq9d7c5ngwhlnq7lich87au3m2yas35ss1vnscom1wv"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000036-0000-003e-0000-00330000002b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "v3m955rl1j5st0fk3t8l0ist2rq5lefq_wt2uwd_h6b1obaa3mt115ph0ukx"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000026-0000-0070-0000-006f00000029"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "zay_s86wwogz16lz8f7rsq40uxgt1j7z0wgj6_t0e6pjvj1n9ri0cpjmjywyqq951ye3jhql4yqb2tjtgc7g6u9yp2_92dcesgftj6l"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000059-0000-0053-0000-005e00000079"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "l_1m2"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001a-0000-0069-0000-002e00000072"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "e65xwo7h8khwqvfvmvj02jj2jkz3wa8bei_"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006c-0000-000a-0000-00470000007f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "ly60ylpqtqx3vqe00gw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001c-0000-0019-0000-007300000070"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "0obmr5yj455s75alew"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000017-0000-0046-0000-003e0000005c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "zlbldhai8hpxijlergrh38ixsxhau35d5_gkejdkgeuz1w6_ojxzrscj3r2wbmhyi175ls73yp0w4schak_f_e8"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000f-0000-005f-0000-006200000042"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "y9dwyc8k9u40pa5h684208vcrlnoryjjekb_l623h1f05gm__mwvcr41m08r4t1kcjrvyfm559vc3_h63gpe2"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000d-0000-0027-0000-002300000072"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "_b64sbeqrp8ou_09bincmxn3"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005a-0000-004f-0000-00700000006b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "vm28h5wk3tzyeng8e0_kge5k61ws2ab21l5hl5fhf63n2171lxrnibaju6wy9oqhy9804c5sry_0xqw6_hb4ebrddbb1i3huqtz_cbdudqglp3yap74qjol1m2vtx"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0015-0000-000a0000000c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "jstp31co2rpas6er_oyazeow51_1aho0uqvdvu6uqv2"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005f-0000-003c-0000-007600000061"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "0gk_nlyr50ot8v0s39c1wgjry6z3e78hcjtv2wmcb397ojix5l8p47tlmsvw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000076-0000-002c-0000-002d00000016"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "cm"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000074-0000-001e-0000-007400000071"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "e9kre1i15j22d"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000051-0000-007c-0000-007b00000025"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "nb8blnutjrsntylz671x"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000046-0000-0031-0000-004400000018"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "sq3if4ijdg5pndfza05zyqz5u6ae3oa2u23bazsc870ijzlsvgj41s2b88zu2d3gvi7h3s_byd35y2izjlblss3v712a3_7v"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_7 :: SimpleMembers
-testObject_SimpleMembers_user_7 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000054-0000-0012-0000-005900000011"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "eldahjnjgyux49p6u4qxz9a0q7e"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000e-0000-004f-0000-003b0000004e"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "yw31a4ikpn_zfb5fd0vee3e1536ak74rqp_qtok7xrhsn5pa"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000062-0000-0055-0000-00600000003d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "9unyjjpklvq_r33t7qkqerx02wummtzrlrscqdm7gyi3vp4t9elyttg0rob3cv3lz8gni_fqr_df3rvt2o7gv"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000049-0000-0058-0000-005000000000"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "810s8rqja"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005a-0000-0020-0000-005400000016"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "yb41udiftgjzo36lbvwtw9xj5qlohvljde90frfx0r26jzgpq08xeo4xw2tepnvx"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000018-0000-002f-0000-006b00000044"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "eyqn_qzpmumu9cvf_6zn8ya0eucpkdjjwwb41pce90xd4buem9o1tp4bprvjzkudtsyvphunmxanf0ej4uad7pbj48t5xemr93bcqb1j97owyuome59njkvznhlpew"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007a-0000-0058-0000-001200000069"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "zze7ew9qk8gurfh"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006f-0000-0018-0000-006f00000076"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "n_roifhghi_l_9b_75beixjh703zyg806b1hin3fui2nj3nj040_7r3ijtyfox4o3o"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002d-0000-0074-0000-003f00000059"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "pgdgmdhjek3iah8ywvcdue4k6yn43l5_zme6o6_yatkktrw5s_ovqmyrwgu_z_5rp9z97jgtv620f0_177cv1s3urmbx406w50dot_yojdsjncunk9hqnl8j"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000057-0000-0078-0000-005700000001"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "kue8gimoaxn3wdbzwb2l9ygk0"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000078-0000-0080-0000-002b0000005c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "jzojg1avl60svt8cnpecbdisbcd6eq9ru2nql33f9ccivtelrga_ls_3iao_dlfh9vj8jrne_nbwmb_73ay2bs3qoyamx5qgd"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000004-0000-007f-0000-007c00000022"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "oz_bg293nizgs3gz2bm2mnulgpnb9jm_pd8uox2qiok86rndsgyqpj5c6l4iqrh4sj8y5ifgo23lja2tq6kwj9e9m07s59112xdypqgaxzf9py_muyd9"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006f-0000-0011-0000-004100000002"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "hdirky_2tz3se2ehu7by2csj7a_jy7qyo1oghueqc_4h118v79xz49olrwkojns"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000042-0000-002f-0000-00030000007d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "9122iz2g941gnqs08mcaqa33l58irkmohj5r"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000027-0000-0014-0000-00250000003b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "0lyosg4pvc5q1dazb5z1v59plf2nqgs"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000e-0000-0055-0000-002200000000"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "01yernwfzht9wjtfyi_jr3mq9cjcsobvwlenbkhpqlmhu9clagiiyoaw2b48mfzx_mgqib99ol3vezr0t0qeu"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006a-0000-0009-0000-003d0000007f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "qb122l4lbi0oy7n5jsv1brin8k4gn1c_5_w0dq4avhnbvd32flikjynd_s0myf3sn2l1c7freo1uvflhcvjuvtrtpwumg5h8atn933stgizpnrc_1kfo0"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000018-0000-000d-0000-006d00000072"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "mzqpku2_1n5f5_c8_zcmv4tejpe4ny41dkg1n067dupdvy7snm24y8syoe2agwc1h8yts_lp59v1aj4dr4sna8cpsgpd2td66xlw1hj_rm27lpiqn"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000031-0000-0023-0000-005f0000004a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "hcy75iscpnouf9aqpon3edkh4uln4gma0niecrde5"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000063-0000-0061-0000-006900000077"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "3jw7u98t20zwu57swxs82genekuvg_hol6pcq5597l858iwgx8vs6anpiguoxetm8_l2e18ww09_xeiytzs64m5dadcmzpn5okzf35moy271z"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002e-0000-0003-0000-00790000001d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "y0u0avpt3orbo6xcee13613ik0sb8xcz308vkb5u33q9np2ws_pvhakw3gjbtihe3"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000052-0000-0054-0000-003e0000005b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ltula3ev2qfdixfbbpspfniw6xgmt4nmn0l1omcihhhkezinnxivgv81d13juourjrc0uqyl7gia0igc4keazm2avjra_ncnbfwy34uv95nbqopikwtb8d2"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000062-0000-0049-0000-005000000022"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "3n2q64e9ea8hxbcwm9n4mlyy330f1zoiaq_ao1d_t90kr4sahr365ji7svmbr6k58bx7o0bjeqij"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000007-0000-0069-0000-000f00000032"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "x7shwqzfrj3qnlvus111ufwgzstnmmob_xhzern6niel5pahgi1_"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-0057-0000-00680000003c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "1tv5og06r1a2al4kc"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000047-0000-006c-0000-003200000031"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "l_qq7b7wyz3ulnpim8dbd9g9bfv89yo_ioq9txnktyl81tkyvw0kx35u658o2_xuiuabbdslo9gxvb7p3i93nc7_tqm"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000074-0000-0059-0000-006800000037"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "uvsqtx_7v0_odhu95uke30sh454iruq9"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000050-0000-0053-0000-006f0000005d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "gs2uzo7gnwot5qm61hyvd7n12n3mra138j0wex17zdhp01hwewiklyvz39e554xf_8us1abd_pysw_rjso9ujz35prg5g68omtevrtb7n1pcp9io681k77jpvj474tkw"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000037-0000-004d-0000-003e00000004"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "ccqqr3w57f9exl7xuhqnr305fqteeziw7hr374is9pkpjtt_z"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000039-0000-0024-0000-003500000002"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "cbowqop368_f44bm2whf8hhkcu5ljs7u930a2lpwirkq4k3sgl56hvj4t8xj33sikbtxznli2ireniu5zvcm4"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_8 :: SimpleMembers
-testObject_SimpleMembers_user_8 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000067-0000-003f-0000-003300000052"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "bmgvnfheg7304j1af2ha8kzlrdsd94sla01p8e32cfuchc4n4d4j_1"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000066-0000-001c-0000-005900000006"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "3z44kbvkfmhwt3cxvztk91xwigzfsqgmwx43rsi2ew7_663q5kd04afdhwes23ea8_7nn4j6hol2k1o")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000013-0000-0072-0000-005000000019"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "_5xab39_3f5_n1jexf9q06jn5c0kx2wszftbp77dq3p5wxon_cg0sgxn38hr4p28i1u20rtg01mhf_xjn3tradschh7vm2ek6hpp788h4w47cnmzwo17lp56h5k"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006d-0000-003f-0000-007f00000025"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "qann8z5wp43fncbnzkxuqeskdrnxclmj1qoiri6zb4ro8jzbsewewgi27xi6pnc"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000019-0000-003a-0000-006500000036"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "552en9ubk7gjrv"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005d-0000-0008-0000-006000000011"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "4fq8ylocoheanwuq9kg6amnrks"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007b-0000-0072-0000-00690000000e"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "9ptg6nyzbr58czopzu0a26w3d1kvnl1zbyqij9j2p10o75869aargj9p3b5vxl9r27eryt6z5o85rlhgvrb4l50tb3jfil3hrlylru05"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000032-0000-0039-0000-007700000022"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "tq"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001a-0000-003b-0000-001e00000080"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "as91oohpdy"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000056-0000-005b-0000-007c00000078"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "0jr8eycubw7cut6ukuegnxp5b2obst6ry8y76fe2qjro3xpp3bjvxg4c707rs1jlf"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_9 :: SimpleMembers
-testObject_SimpleMembers_user_9 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001a-0000-0051-0000-001100000064"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "85wkc4m6uzi3t_s5sb488cxhjl7i_av_erwfdtgya58oc"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000053-0000-007f-0000-00140000007a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "34mo_jfmsyatdcjbdl_o0hpvrc8uutf8ni3vukdy6bozbmf5itp3wsy502jw3b3y9oudqo2lh71ro8id7yvebq_4pxi98i3jdzyrx"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001b-0000-0042-0000-003800000032"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "pc12u7vhdqloizph96i1elxofyps02qanrr2z6_kdvl3zakyappxu7nksvj6oe6yz_ygrgii0v"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000032-0000-0032-0000-002000000005"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "3v2qmyq9xk_tk7nywcco8dz4s_hgsd99cyu73lq8imj7xi09i8ha6nxj0mid6meivcq5wanubww2kpdpiousiel3ea7g5g7e1dggpuctjvbo9n5"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0021-0000-007000000010"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "jcr0d3sv5pm89mkbhinm7aw5njyj0oft6vh8ste7xfn6feqkmx176x93ie9lc58kcik7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001b-0000-004b-0000-00480000000a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "x2qhpqv6n90nosm7tt6xs_zwathnk0l2jgp3om52fmpsz7x54y9061oxncf4v_3_10tlvx11vi57riuxn25gotw7"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000012-0000-0000-0000-00690000005d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "xeyznxh248frdc3jix0_32kir1jobft0g60b75rx9c0x4wk171xseai9irwra9eypmmbplmw6hckha8f0i6zz"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000024-0000-002c-0000-000a0000002b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "40d1mp1rlpq_toli_xsrzzp6azj7abwn9kwyyexu8mzqanezqlkwgzs_maqszagustta7197hluh"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000e-0000-002f-0000-006c0000007e"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "bcxu51qy7gzxryiesnjqirt5dn7kb0lz0nsdf2fbgxjatcf486n210ndta21lli8b64ub3xnerb84atj9_1xjz4kaowbda_rhxgz5qq264g6ikd6r7m1"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001d-0000-000c-0000-001200000072"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "8qz3xbrnjl34e24fvc96wl34jw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000065-0000-0005-0000-00160000007a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "3mcna2fo1fuhmz50gevjyc5iacna3hon9fylu4o9u48"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002e-0000-0028-0000-00240000001f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "q451zrfmym52a86mm41yg1zhb3hgv38i_3qe5l4uhjlz0cum77qlytubryh5s8oya7ql_s5cnseh27vi1rzzcow"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000061-0000-0035-0000-005100000068"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "cxx03t4219b0e3b7u5lwxb4ua_3qif069vharpluygxmxq5vd1hcx4_3yjmtgw99yz"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-0034-0000-00520000005a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "p5ro0m08a808fnqrib4ikm2bz71wvwxs_qa0b7xeneh6q38ucu8n3nq6uw3w3yelajevfdbsw64vqbsbvx0fsmpis3zbwr73pm7srdls_8nrdr4urapsui3goem5zy"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000007-0000-0049-0000-004c00000028"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "op23mrkoau967yyy74znf7smfsr1j46m"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006c-0000-0074-0000-004100000005"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "zzcga0i7uawt0riq_mknqyn98zmawbd__zaf1s0hihhmp3o8vucuv3hlmeem5247e_1i2vml18qcoez3epg9kpnufn_w704s3t74u4yc27d0hkg3a6flr"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-004d-0000-002a00000020"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "66z2l9nijttcg_yu5krtv_llxbwwkdyosut9qmra_3bpeithetio5snkbicofi58z6gr4a_benvx87km99ffgi320rz454xd9s_42kzu8h8g3x0rx98xymh_3"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000058-0000-005d-0000-00100000000a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "uw5x_u9rn2zu0nc6f7eb_v40"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000045-0000-0044-0000-00070000005c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "u0pnq5ipcjjbf2tdndpn5pt0hic9tj6hjrzbscf9_mr5dimm_5e1i1xvo1lppo3ccvlh610tldxpgg2tjpf_nhhqz_gff"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_10 :: SimpleMembers
-testObject_SimpleMembers_user_10 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000047-0000-0044-0000-005c0000003c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "buaqu8i1j2czfkdn3jyq1u3m5w3ohl9tuy9c8kihit3s9cax_4f62sr7kj7wfk6gtf6bsrkl6fcvh59idymwykehmvnqfo232q4m2gnc05237ikemuoto"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000068-0000-006a-0000-002c00000071"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "64s251imkzo_1fnf4o14i68wjowm02yfae3casjqc6fo_qjhhep50tjlir_i1ggt5qfri_1lk07y7ue81lwykuv9m2se6t8rtkm98zaz1k30"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000040-0000-0068-0000-001300000019"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "5eugts7sax037o6wowr1yoccc3hp8t226kk3y6h0dqdljvkktrxse2ci788qpulg7o48nco0x5jn1ahwll0vmsmpdzx_oqt9bpejkcd6w2sqrevyfoxei"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_11 :: SimpleMembers
-testObject_SimpleMembers_user_11 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000069-0000-0074-0000-006800000058"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "yprw788nm_1n_l3i6g1xn1xjokilmavqko9otxa26hobs7e7s1fgruka4iom01i00aoyui37so"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001c-0000-007e-0000-003300000074"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "095o8ll6js3jmhid4vk1j7vc2x_cxq4u7wqr8quf2ndx7wre1525bpa89_k5b6bvy8ypjlkk5xe1u7jqy40dk7blp3fmp0l1vfzg1em2pkpv8dtzp50rgqy_s1c"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000025-0000-0064-0000-007000000046"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "n9yc3pd38tzb9y_h0oi_d_4r01bpumk0puut8s72kdztlrl3k89d49_07kz_z2br0vey8b1fyo4o_45j7vrpz3wiyrdsjr6l3rg8lwhwk_u5flh_62ld3t"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000037-0000-000a-0000-00140000001a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "15firv29l22tvugxzg9x0g59_29h02jqnfg9c5p5e7tr2m64u5bnmsp1fzs8mcvqsb17ym4k1q1ap96v9wxgs1"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004b-0000-004b-0000-005000000005"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "tddu3qs3p60da19ibmx92unwy8mu9goocijbeamqw4bn3d5kt6_zkm2x1j2mawr_ygt"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005b-0000-004a-0000-000f00000029"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "_ooid3_m9x6065k4n_ka4m0n9hf9anvvmlosi6v4a9e7960cc1elsy7h_7i_bjq3573eh2q7d65zhsqkc69uef7lnv4qqnr8disz4y3idhnvvw_7z8"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000069-0000-003e-0000-002300000076"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "u757zclatb90zyqr29fhuyho0ll2ks90fjji59df50j5aj4tga82k5qsv6ltqbabgx2j3tiofb1iorkzw_d6mhe_g9lzt8cb0iqwa7vag0pqrwfhs5lf7b8qm9f"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003e-0000-0047-0000-005e0000006a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "ku38a6jk6fswgsgegqka_b33d6gqkwcy7egbx2rpr4pyravsymugig8l6flqxjyyl"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003d-0000-0034-0000-001100000003"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "x3th543fq4asgv"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000042-0000-0018-0000-006f00000063"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "qc679x0r4twf5feu87fjf1dukbgbjil0otcoyim397"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000066-0000-0065-0000-00640000006c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "neniwbge16i_igh4jj_02qflp698pz5xy6hv435ma6q2qlxn3dyz2oao0b43gg93m"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005b-0000-0068-0000-006300000031"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "mbsnb3cb9i2dxlbz6h0l9_ocpa6zdmtt6708g6bi6b5o59v3s"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000025-0000-000d-0000-000000000008"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "bv8e7m3xfc3bt639goa1tied4"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000010-0000-0007-0000-005700000011"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "oejuw0rpkxojd7lwdvvmypnw5jga0w0i7kf84ryviznjgm_3nd1ls5ykcij2b_xqx9dc36hafa1lvk4x_vo_")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000059-0000-0001-0000-005e00000073"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "nzqm5_qyv5uj1f47xveo_2hlkqt5n6jrb5o14invzlhe2ddo66"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000063-0000-0061-0000-005f00000045"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "i2_ymg4hcm7bl3ll_9azdlhrur24lolk388v7o2dz1d_zvgyi4btbztoucql64gwoxoilsegph5rpc6n6u2tj9uunlgk29xvqntt8_q41l0cuc7pof26ea5wbzg91e3w"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002e-0000-001e-0000-00350000001a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "o7n8q1ocx3r99s32sb4_3xg24xz1akvsjebh_kn5cgaxo3e9j5f31cuewnzay80hngq6jjmpqxzde9da5etny"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000013-0000-005c-0000-006100000023"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "32ph0fihxtoawktwdjjd8680nz_mx8tlawldvwm8jba2kjd6tjwi4obhmpnnfqzcdcz31y_1e00gtmrugnjfwh8_nmhgca17jla9s9yy9q"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000e-0000-0031-0000-00300000000c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "c3ydrescfgmvsgks6xy866xluancois0b4vl6ypsl6810rlnu"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007e-0000-002a-0000-007c0000004f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "nvmtteg8vpg28a9srnw_vn7er1krdecoovramdcin7qdpvrx6bildn885wlfcav9nooubk1hs6g0u5v1v8t0p8vip08o2x1pqj"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000011-0000-001e-0000-001e00000054"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "bhpymrq9y__8p"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005f-0000-000d-0000-004e00000016"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "mmhox9z9kjhkvj_0l8me0ecnp1m2slotp389sts11f43v71arii5z19n8tb6ct2d4hyyjd45vvwwa_qtuejbwvguyje"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001f-0000-005c-0000-00570000002a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "xyep0gej_kghofx50j3bbolxbm2i58wwp0t_l0pscq4"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-0050-0000-00110000004d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "5ozb9c3tnkwaiu4bpw2_nn1o3ib55gjnwen6lw4ltaoitt0ngnxbwahqj631w3pfgphrp0yoh19ip0qfn29p84zijlnystitjm8_v39o4swr2xs3ahs8s2"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000055-0000-006f-0000-002f0000007a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "04n6"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005a-0000-0067-0000-00600000006b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "m1vbstno19orwr77zwq8q8ak1xxdhotqyn30kdv9fq44n2zr0rn46gqfrw8lxp7mt7eywgku3gudup")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000048-0000-007b-0000-001500000034"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "v_ahoalwm78dh_ggai7wusblsnlwhibegsuxe5w1ibm2cnj79a64r_s72hwigx1cw"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_12 :: SimpleMembers
-testObject_SimpleMembers_user_12 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003b-0000-0016-0000-003600000008"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "r812vw__xb9t_hgb5ryc52eujh_ss6aem87h1hakj2u8wvjshpwqrar6ndm5cuka0pkezokcvziv93_8ay2q5a"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000056-0000-0050-0000-00040000006d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "xf6x34y4hcbgklhrr9a7jkjiclu5dv89m59b5sn40ui8iof88mse47t57ti7zch5cf866tzqua171us")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006e-0000-004e-0000-005200000050"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "07bbbbgwl0gkv1pfj719wn3z0n8nehby_fk3h6gs39csow68u4_3pbly54fqkng37jqxwr6ym6injx")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000069-0000-001a-0000-005c0000007b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "bj5m"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004d-0000-0002-0000-005700000067"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ze5lhmk1d8rrjto9615pcoluink8ybkouqa90kogtrbokfv2tdbypoi8inkbi9snsymli7r9bk_ilqjq8ktb7ia2nr2bf6k667nry"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001b-0000-0076-0000-002800000008"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "z3dbyprvipeu8kl4fabnh24fo77t7gqcs0chxw34ovuru0mxeu6e_jl3s744uggcnwqcyhuzkn1ueko_k0")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000032-0000-0007-0000-000400000047"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "sq4pc2q1xo14fl8yiegpw0_5y24vohkynzm6zselylhu2xtd3vi4w7odhh1yv9ux01q31s02lv0p337do46bqsjfjywxu1mv"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000054-0000-0055-0000-002800000002"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "dnrdny"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001c-0000-004b-0000-002c00000037"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "gf52"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000034-0000-007e-0000-006100000061"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "yo2r0bi1rrfg2rws_v18eravmdit0igdaksg3atrzjek7u03ip5fjoo6stxjn2xpie700ejkalgzw0zhl3t3j_"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000030-0000-000b-0000-00790000002a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "hnoqjm2owsv7yrc899nidzee4ib07r40vfplmxyi9_uf2l49gd5htfmckn3bscip7tygw5hc1bdnd66i9ojjc0bzrpxq9blro73yov2xsb940g7dnijsvvkji"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004f-0000-0043-0000-004c0000002b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "gnpcz5crw82yyqtlvvvfdps3b5uxqr0a"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000079-0000-004b-0000-005e00000033"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "h84nu68fxxen4b8d5i8br4gixwyntx3o597v_ds147th29_vkuxblstg9af6x3p7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003b-0000-006c-0000-000f00000059"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "uboc5sab9w92"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000080-0000-001e-0000-002100000043"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "1mcw_zxelu_doxdkqrc5tf660toco4vdv99oecl106z1ygzfnqo6buoysg_s"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000069-0000-0047-0000-00000000004e"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "jv38u3mzfcdi7xln9al3yepden29o1y6a1xtblfi98cg_bpehklvyf8twyfwinev0ozfokbw71iyh_98ajkyd2z1c2d3a9c09ig14r0tcwy6pqpo"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001d-0000-007e-0000-004300000036"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "v5l6fw_m_1lakwhcd6g0uz0gpba82jwjdad0qyypc0plx1t1hnu_6zhi3cg6cy25rj3l5aj50pezusaueat8mnfkj_uescuilehc6b6prp8f4lm_ae0dxxvwp3rgu2e"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000061-0000-005f-0000-00280000002d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "xyb65ic8vzt9x9k1i_a81f6cngzuoii"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_13 :: SimpleMembers
-testObject_SimpleMembers_user_13 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000050-0000-0074-0000-00260000002b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "auzu2e8pwoe6c0gqamygef4xzybb4o1_yoxbelgaw2012jz9owv9stt14y2d_yi1yi8huvqyhele83b_99fg8ncenqi40pqjl18nkgvwilzo8kahww"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-001d-0000-005f00000055"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "8zkp0il16289nuuv9n3h2p8e7znc_4npg5qzdnt18t1l3yx0m40xugm9z_b1w_p98k0b02oq7enifxr4r9b1zyvax"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000005-0000-0010-0000-003b00000043"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "4kkuwyima3ztybzpf3ccy2_mrgcz2sv0nvb29bxjm90dgk6ft_14r7p0qyy12crv_z"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000040-0000-0065-0000-007000000049"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "pcod0980px6sue9r5cjn7ok4ad9sl6rqpmlmhwu1ju8kp7m757o2axicjqha4e9wz_v3wx3ixb6swh3bujsxpc9g0rjd_und"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000015-0000-007f-0000-006c0000004d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "qylzcwu0dvtjvra93ocg8fyuyzzowac5yo5410wh4sveczmfq0t2y2e6cae4fux96q"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000e-0000-007b-0000-003400000043"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "z3id3idffe8rl53wpyrd3f2l0y56qxz"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005d-0000-000d-0000-004500000021"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "2voj8d_5ydou6phiassv9tzhnw185814n90y8rbx5i"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002d-0000-003c-0000-003e0000000f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "09y9r0sl0or7yvw_ztcg3_5xioeq6hk0lwmycvqtfnmhtg84qeotcl3yltg1ibzwdkgw3qz397otoa3xsqvn2uzsvqyzt87_6is2zotb4cgc5m8"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000b-0000-0042-0000-00740000003b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "tw7z9ajikrm79pv0q2gq5fjndf940qdzyjznb052bb9b_6zhhdunxgm91cj6mf04yp1rzapwrx1sox8z9sfijxy1xxn61b0"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000048-0000-0039-0000-008000000004"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "nmhc57h6qa7lzv0d0scl8_53iwuitrlmmujkwf_vgjgn4s027b5i9hbt2nxhm1d"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_14 :: SimpleMembers
-testObject_SimpleMembers_user_14 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000049-0000-0018-0000-002200000071"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "5qxti74lbqe_tgvvnq7ub2xxn0e2w0"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003f-0000-004e-0000-005800000030"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "mwzccu_p4zazafbgnvf"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000017-0000-007e-0000-006f00000027"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "rmr13bsn9lo1dil9j12jj31qdod3izckzpsrflf653suq328bmnd_kirumpr"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000005-0000-003f-0000-00280000005e"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "_tae"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002b-0000-0003-0000-004a0000002d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "kaa5_qbk5nvvgx4jowierx"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005d-0000-0054-0000-002500000028"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "2hco6n9dqp4qph8alctzrcw91aiw1d4eb5g6ebeb3739i31b4o8seok8krf1z95t3zft4gif5ib9qtsuuzvb0ip17svpfk21akw0d_hz46u"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005e-0000-0002-0000-004b00000045"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "o1bfk_p6xvxp7t1i6f3d57jv2_yl4nq5or1zy4vd2dh22ue895yoduwjo3wc5qzostuhbw369j"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005e-0000-0027-0000-003d00000065"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "vf6s6yc5eavaytm7_6"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000035-0000-0035-0000-00010000001f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "n7r9vlgda6kn7ehvrz_hrl6t1p07xr42_rgp"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000054-0000-0069-0000-002e0000007c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "qtfn187ab22rzoan9jy9ug2qyjisshxdeo184e8cjm"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000056-0000-005a-0000-006a0000004c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "lxynbdsl575ahtb1fzz_0ucdcsmeiu4baq0ziei5"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000041-0000-0013-0000-007700000017"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "q4m0kblmex11x_k__yurqoqixdbhbcluk60_kpje7xvt5drk0jdp2jh29ql4hlvz_af8yx61ptki414nip32h59m1m_spku9ac9v8pfxo_ue6"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000022-0000-0071-0000-000f00000072"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "xt24wodqlibu4gtj128oj8e61z4gt_5d_we5m9jk35crgs8levtcul1pwak1vxn95q9h4vqss5qlezj4r3igvmyv4y"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003b-0000-003c-0000-003500000028"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "vitd82h50v"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000047-0000-0005-0000-001a0000007b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "io1uuzbdi7sfvy93f6kgdq31xskuwc8mxphwwrpv9rxc4o8ycdu4l4_0_26hm1g03g2"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000a-0000-0039-0000-00530000006f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "cksijt3o36xuu324i61apsuwdi32k3l1x_oalfaqqtk"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000047-0000-0062-0000-007700000025"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "ru1kksg2ef5_yo7i5uwq"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000049-0000-000c-0000-002400000060"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "lyspep_wcyu0fegqwpmns9lzjpy49i_6ufmhkft3bbmf_yi76hzdacj7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000028-0000-001d-0000-005000000045"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "q8upik7s6rzlcqfbtrx0ty9_pjrqeq02b4nkdnggfu_y_ey8h430k8l900czggrlngyvz0hezpfqg0ta7dv7enlsujqhv9w2qcmrye97ozaswyg671b6cqk5_yprgn5"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000071-0000-0014-0000-002000000080"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "e3xri9yngsx6817txk_k58ybfykismurlmmhsa7k5xv5l8g5qgx48h9sp9ir4tp2n7i01wc4780lwvl9o31yacvdashtu82108yevwv1rnh1co8bzws28_01ao5jhv7"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000037-0000-004c-0000-006800000015"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "tzu6fq7owrz3hkm_7tmtmzr4oj9pyo1oi0bq4hvp3lrn3e5t6ep0x4g84nnmg79kag8tdaoopluff0eavzqpp57ij3us0xat7jua1g2iuhfjlrpoen2dyw1eulrqa5"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005a-0000-0014-0000-005c0000000b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "r7xed76rtgltedolcrxbq67tyo5u5arm9ip49bo5szs24skzui_3h65_2j0md66gjlz850waloiuiqsd")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000c-0000-0059-0000-004600000053"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "80_0tuom0zml0hz7q8ioxscxusk7ghx63wp5o83lax5"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000050-0000-0080-0000-00350000007c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "ae3h61opsksj5x5if1tt3a74ehzw02ds6dqisz_5l"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000014-0000-0046-0000-008000000048"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "c_fbjpth0u2yni1mwed8xyjo7hvrev2ojjb3g8vu2sij81cjnehtpaq5mkd_55qf0eavaxtmrhzv20vbhrxssewk5m7rmxgveuva24e05xs"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_15 :: SimpleMembers
-testObject_SimpleMembers_user_15 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006a-0000-0032-0000-004f0000001e"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "da1vnxfznxggp6c2qcjdx4sbo4usg7jb58hmd_ylzyr_97m9rpyg6gmw9ikw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001f-0000-005a-0000-001a00000078"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "asfpn3xoxsvsz8ubdt6b3b"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001a-0000-0017-0000-007e0000000c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "ftkjnuoy9i1h0yyf1x87m97flhx21n2475_rsnn76nkpl9toieae7wk0y_f83ji"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001e-0000-0019-0000-00180000004c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "g22_kcj2fae4nspxpz30n5f6ib5bhrb"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006d-0000-001b-0000-00050000003f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "qzkowgmbm3t4ck1lzb96ero0d6yw79kzdf2q"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000037-0000-001c-0000-000c0000002f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "cyiw0yfayzt_ynv0h94pdv0hl5u46adyyyb6n"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000047-0000-0014-0000-007e00000049"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "x3x3gfejb_1d1g9nsyw0rey0_tm9zs6pyuily3nrjsue7p1mp_15kffuojhi66z_t_lmnr_lq79wzvcjm3czs7i_9lvokkakhmfwkdg3f"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000028-0000-002f-0000-004a00000063"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "s1cu0tibrwjvgpa49x9sk9kuzyd4hco7pj3gnbcc8ie519vmobd70ln2im2dx_yg_qoh4rc8"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000027-0000-0075-0000-003f00000016"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "e6t98s2m_0jqjwibfan257dq0tbxl452q0dcs5mkl4kn"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000045-0000-007a-0000-003900000015"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "9jjkkwb5spu0x_honfioztulhgg2vu7dwcxngha4581j3dj73mo01oh3r6kdbpbxiwrt2k8q6ixcuu97qzpc962rlz4c7en9do885ykjstaru6yjm6w"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0040-0000-002e0000007c"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "wb1qwb0yfrwzna1gx4xcjrb9uvilio5pv_glva_sy8s9zr5udj10oy3ygf6jvbl0e92z6ucw2c3fur9ebha005gpr45jqkf3_hs40e3f6dssc"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000057-0000-0060-0000-006e0000001d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "hq3mg17cd7p27q00dhyjrdu7pr4kdplicp4ipm"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000037-0000-0007-0000-006600000055"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "v6z1f27bvomf76x_tp5e3yik4qfx6xmohuu7sr40ijtw8b0v10746aja2yyhomb9yov9f4acq0pwng2cg76gqdh8moow_tzeonmqol6wz191m8oo4j7c8_wq"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000032-0000-0078-0000-005100000021"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "8_lth324f81q1zr6nhz1jw5oeu4ovjqnl8lobb9t3azlu7hj3s62_xm30b3fie4s"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_16 :: SimpleMembers
-testObject_SimpleMembers_user_16 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001c-0000-0079-0000-006800000001"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "z2z2ju3pgvxysob_3e2wg_tyxfp1wruzek4c6iuyk23e5qxuieyz3tg436tvzl9l8k5aa_bexy1m9ggauxms8pug1f"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005c-0000-0056-0000-00780000001a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "5roj3c12kqt7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000032-0000-007f-0000-00270000002a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "r_ivn3ruci8x4pl6bl1g_jex4"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002b-0000-000e-0000-003400000009"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "x__i5068zhcdautdjavpic3zi7u950hdw_iy63gdd0h6zbs1pfviyyui2zl"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007a-0000-0017-0000-005800000050"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "g5ignr39a41zundyudm1rovkz6a3rjy3dodkwk0ht3jnsqp1maz2ulc7yx93z7uy_dyqso9ofxblm2xqs")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000061-0000-0036-0000-006700000071"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ltmubflt4eswsuurwvqxkd_ngfbkyilt00dzsjckdyh2eod2v804nw0xc8jbkz8bg29nud9oe3mlgvwoml4t8cmukd7un3ycogbvojmf12ktaxx"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000060-0000-007e-0000-004f0000005a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "ox94nzepea1423z47_yd1txi"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002e-0000-0016-0000-001e0000001a"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "dvrbz7c9_igfu5vl3_9ujy5dqwaevjrb7f1n2kchbxroz8ccnktv6nrybj9s0ogviznxyzw6r6ebu72su9hsz9l62fly8cf_kkf6aeri9thd4z2"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006b-0000-0038-0000-006a0000004d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "307w5bmxkox9r8klphxtmjge_8jgawjnotx_r0krsadx_n7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000043-0000-003e-0000-005a0000007d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "j6_h0zam0_k8x6coroh4ixk9m3pk5acmwx_cg1q7mpnmn1zha_i"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002d-0000-0010-0000-00010000000f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "9j1_jkemhozgdmdcoh39j4gxbccuysthtljfwf7qwgjk50tkamk2p_xcw7i9cclp35faxipa5qt2i23_u2n35anfp9jihl8fj2jebisxmgkfnmh89z"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000043-0000-0070-0000-006400000045"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "ds4scvwxorxgxtlskf27hu"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000026-0000-002a-0000-00150000005d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "1j2p5d49kfu8omp83fr67o4qpdb07"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000079-0000-0040-0000-006100000033"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "j6xf6yvyevf8aweam9h70ga1gs4lr_5n7khmou70p2_g1qzjpsgpdkf45scpqggc2rve2aqrev88u91sj3sny4cavowa1hosih61ycaq0pf41inxqhwzhc"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007b-0000-0033-0000-005a00000007"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "u0lw_wyfzjmmu17s65cau3i295l_0c4hu823csp473bry2cn2zr24vsay4w2m2936y9ja0mvapjxafww89o")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000078-0000-0058-0000-006300000019"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "u5wny30naytnu39dwahr_5trcz66uqb4qrbvvhiu2juwbbkv8udp8whvw3jhy2o2s5jwmwesp_6qx_ceatpyex9xssv4z38p1xs3mpau7"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000068-0000-0042-0000-007b0000002b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "cgx4sx81so7w8wyohtqvr53bzf_8od3j77"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004b-0000-002a-0000-007000000043"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "p35w8lh2_arnf44pbqrk3g4ln0881ml0b4t"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006d-0000-007b-0000-006b00000005"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "0z7pdm65ezdilg_qqnzz34l5e1zi8gsw78qbwitnu2ng"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_17 :: SimpleMembers
-testObject_SimpleMembers_user_17 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000071-0000-0050-0000-006200000041"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ui5u6nk8og1da9q8_ha4hhv2v_qrs_mveewm6h5_4384yf4ovtp67w_z6x9_waqln013ahg3rw9oky5o4yff6v"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-0074-0000-004e0000003c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "qsowevndt0gqwh1yvpqxd_4u3junr66dhuerv38qrhzv5kf9i38fkd"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000b-0000-003a-0000-003900000026"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "dq1mag9bzqoenu3chbc2mn91ivbh"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001b-0000-0058-0000-000500000057"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "9ij9p1jla54lbtk66mhbakd7m7p502p6tz1ryyaep94rz7upsquixaaf6eoewz_oziw_ok7xbo49"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007a-0000-001d-0000-005800000052"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "13tjs8e20xxqd296duhver4er47dj47v2yyspcpfz5pdhbmnmlxyzar0w2recatb6r4_20zcd"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001a-0000-001e-0000-00360000007b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "gy3s_2c0r9lzi08hjnkbc9pbhdu3yvg409ipjztpmthie_j834nn12zjq_m56w1dqqi8mpde"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_18 :: SimpleMembers
-testObject_SimpleMembers_user_18 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000013-0000-003e-0000-006000000058"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "3me5rxn2utoa25v5xxht8ulguq6yxi7tp38dwoyvs_4o40u1to2j5nrtykcbqmxuefqoulfptt90s")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0026-0000-005d00000007"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "934awteu5wur99l7fnw80clvhm_gza7sdsh12wm_ppvma27jwl2ry8u4q3pdm2sqae_w4bqn1l7k3bscfww2c6i"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000078-0000-005b-0000-00580000004f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ykd2zkk62g1dcm7nnuwr3xbho312yshv5ies_zgv954zlari0ayv9x6gnxdckc4s36vvdfdg3ohsr__e5_tlo_y6lbnmhilm_gwblmnzgiqxxmhvegnbh6haxg"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000054-0000-0053-0000-00340000006e"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "tg_h0qkv4aijetsz83m1kgblaem7q"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000023-0000-002f-0000-002000000063"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "wxx0aq41xb9dkhyi1gai4twn840_gv26hyjwwo8xaycbju4xowxt40eimnud63h61y56aacmio7reb1u7xhbkdpkvzr7uw_pu_o"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000022-0000-0057-0000-006f00000014"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "8axn63dyge68i43hczeorjbtz3cyd9nv316fhppz7bfn6ev57rxedqhohixccni74vrd5mujd3xudu1s5jrw5fjcpo5uy52z6mxjpnsi14md10_6o"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000003-0000-0013-0000-003b0000002d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "b72qpthui23k7cbxz8m3226h"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000052-0000-0046-0000-002e0000003a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "4ndtltebfabogp8i9skodvx86xbu_"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000048-0000-0028-0000-001b00000006"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "r9jg4"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007b-0000-004d-0000-005500000006"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "1_r3da_nqzfzbs_6j8sztfleq4ov3zk7e6lhjg04"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000000f-0000-0056-0000-002a00000066"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "_v361ue5c23jdmlu43s7eckol6hzqgdvd49z_ga87_gtfu6s6j49c2g12tfsv"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000014-0000-006d-0000-00600000005f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "woty16_d9_5ot5k0aur_vvud9z_3f41om2hxf7bc4bc1dagzzecnhmnl2asd_slndkj81g2p_9kibhfw71_7wlj9n"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005c-0000-0022-0000-007c00000001"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "gwad3aujch9jwn8wgs36djkofbhgc80q3xpg08kziibyr249qor8xzyhn724zmj57mup_15ik_ts3985q94t2ycjatnt5jzurfb8jy06y4dqiyh3aowp0bgn"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000008-0000-0042-0000-00250000007a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "0_lettu8qvkqk6krt4_nez4e95b7y"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001f-0000-0022-0000-007c00000028"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "z3o8c78vi1ynsrc_s6ebpnz96960dez7lnlijjz843un77jtnj9a5pah"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000022-0000-0045-0000-007d00000007"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "4qwvs96y63anponvr9dm5rlixyqhi3jumk9q5827hpksw8n63u_mcg90c3ymz6flf4g5hfcczn3j6rvoiushsvltz30mou0m6_swr8p9ajzs67a1bkc7"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000007f-0000-006c-0000-006f0000005a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "fnxibm1l1089wzrxa"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000022-0000-0020-0000-006900000033"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "2ty62trmvnnqkyblir4w1hdba9r10gfkxjb8ddj0riit2i7ymxpprtrcgs2p6w05prtzxuhj_07nuntgsk8x4o2e1pe6cijkk1igi45_e49d38x4b_"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-002f-0000-007000000064"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "b6fsp76pbub9rakkxrs7lk8gsh005ajo5m8ap4apvxjxoak95s"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-0042-0000-000000000058"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "hinbqrmh843xzsvpu_a6ifnc6lc164f58gkhv"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005f-0000-0052-0000-005400000002"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "18os8cjhuuv8ng"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004b-0000-0046-0000-006e00000024"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "4k62w0mz4j2hsstjelh8zx0gpg927v3ggod9z17i"))
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_19 :: SimpleMembers
-testObject_SimpleMembers_user_19 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000036-0000-0080-0000-004600000006"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "4fex2pu__ri6dlr68us285w6yv4alufdibfd_b8zt7ckdo7ej590lkosvd4be8cg4acr7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000078-0000-007c-0000-004d0000001c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "6lab82iykqaweibdnw89206lrz9vs16h6ae31uruwd0dat90ms"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002b-0000-0013-0000-006900000050"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "9lhsg7v6b93dyc9mrbtoh8upg5uotf4sygb7ivnzssk0vaj_i7dxoxttzeklh8am0dkzxlm5shu_xht44i7q2ngu5i9itakyus38vfxwhlo9vv14tbtky4do2gy"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000037-0000-0053-0000-00300000001c"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "u9dnn4lg0fkq7wjm352pnvivghndsyu5dc1v7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000001a-0000-0014-0000-004100000073"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "1zrz9vvgb_owenushueadxheydq3xj7p6qnshwytttwuihgplc3swswxt7135l61u719cxyckizmc0tvss209e_u0vs9cq3g7iotw6_rjv1xekwz59jvxbf"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-003c-0000-007f00000051"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "du5q_xfl5_euursw0bgwzmmfikr1jql29qf58tworxnj4c5z3oxp4g2y9hwk9l0azincl_yj7cygwz_k2lse_xhs4j1vj56g58"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000023-0000-001f-0000-001b0000007f"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "b3pojvx2wmrpy7q6adcuo5szs"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000055-0000-004d-0000-006900000053"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "tai2j6zt1iloa7k4lvhete0ia1lixhu0aakslmc3hnva6iiv4lmb7yjspyjz74wcwhg1hwligz1nvc4hkhwijrnf96epf3yc1sdzwe3ml2tj2stucgz"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000047-0000-0003-0000-000500000001"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "xbu28z6zird3kd4iqv0j2r7_e0b2qdxzpdeuzvxb__idnrzhib1rud5o98b4"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004b-0000-003b-0000-007f0000005a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "rl_mm"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000006-0000-0034-0000-007e00000030"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "59kuc3qc4e8bi2a47kw9irbr56x1p95x5qpmapy5q8e_obwek1a356gjb_pekd0oujb08e8u7536n416v4a3k574xz_m6shboen7iq_lihb"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006d-0000-007e-0000-000f00000060"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "u2p8qhkz55ga7ay_lyst30ei5_7mg46cj60uhe0pj2tjbcwaoamnzmlqlwyv6thsr_k36dr69gusa838_a9aoh"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000075-0000-0022-0000-001100000044"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "vcan3ha2ahaaaxbs_rks5vygwuny8zp6st17fv9pk04f_2onxvw_guw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000069-0000-0024-0000-00790000005f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "1ilr38ti5n1mbpm3qysh5e4wou0251c7iarmlo5p8x0dm9gc4wtmuzy1gpc6kubnxcc0tkyjmkhxpncffog4u5n_x7qhwwnyzbqlo_kpz33iwjwqtub8a"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000068-0000-0040-0000-003100000045"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "6rtysqt18oeenfxoi3n5751fia55yfvpiz9bfmy2g31sibwv7ewjl737n6yb_zmc2q3fhikqwtvp9tyynm6wu0p"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004a-0000-0007-0000-005f0000003d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "_g3yp9j43gm8l8d5vgx3kq2as1e0q2qwtro_ah8s5tp4mpzd4syw1kjno1lb_u2qaoqqg3cp5xq873oi3f95llejnd31s3nhzi6m8r"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000068-0000-0008-0000-006f00000067"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "qq2hd0"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000002-0000-000d-0000-00320000006b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "8hsl7yd_1raa4a"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-000f-0000-001800000008"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "ftgvbfyalwkdozipte"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000004e-0000-001f-0000-001e0000007d"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "ubqu_ach_3pmq8xmxniwo1ddu7poprzvvorzmxytdpmavfeond4do7p9g7txo2n9pxvazodp_bxro6ej6kb_qj5m"
-                    )
-                )
-            }
-        ]
-    }
-
-testObject_SimpleMembers_user_20 :: SimpleMembers
-testObject_SimpleMembers_user_20 =
-  SimpleMembers
-    { mMembers =
-        [ SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0026-0000-00580000001f"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    (parseRoleName "wmx8molqscfxab9_imrcssdgf0_4m2ik51npx6i23vig82mer1rji1xwvddqxasyw6jqmy0xzykd2ums")
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002b-0000-003b-0000-007600000012"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "u0n8uiinlswpdr1oqstlmu1hfv3pfoo7ew8z00r2jvzkpkjpfd3u6kb39_sj73exbhv6a0779b1y69momnis84f5w_3uqlmqcp6on3zj6of7t63nwuxn"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005b-0000-005f-0000-006500000034"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "lvczhtpd0dgdsvzxtzyelmrbh6dkl17j3drta713mm4i"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002b-0000-0003-0000-001700000060"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "mhpxkbgdx02x3v2hsjtfm3phl92n4w9ka70i004and0apz620h97vhlp2pxy_moo1op2ipoettcczcxdugw_wus5inhfxzd4fn_jndz0n6wb0kapf76e5r4hldsqqft8"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000072-0000-0012-0000-000500000052"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "sjkd77e2wg_ddyj59wpadnncaup_41e7m8ayhs936zwkfy5"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000003a-0000-002b-0000-00050000002d"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "3bvwtadqp5w2ode0z"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000047-0000-006c-0000-00500000003b"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "2x_5ctyin9ildjj5gs1kwwiw1ipbsdeaqslm8dn8zh02vs1q7id3_whp40e2jgkogpdza5_zm8czqm9ykl_v1"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0075-0000-000b0000000b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "rspqdh94do5jxbxub9t7"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000006d-0000-002b-0000-003800000003"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                (fromJust (parseRoleName "fqkwb05s1i7aww45jcx5hptvdzd856n2y_8uy5v35zcxhu07jp6v19ax1juyczkgtiiw"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000005c-0000-003c-0000-003d00000059"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "fq7zom614_e"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000015-0000-0050-0000-002200000061"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "j3kukcuzzfid3ecr70nzd"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "0000002e-0000-002e-0000-006100000030"))) (Domain "faraway.example.com"),
-              smConvRoleName =
-                ( fromJust
-                    ( parseRoleName
-                        "4r6cieh3t_a2ydpm8shzvl_q9ellq1k4sfdpvng5xzqfnwrwwet5wb0m2nzu8ze_dd7nxnauw2ylvv2y57ykt5k9899capc4ke2l2h2yq1wfjzb4zck38xmec61bvl"
-                    )
-                )
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000010-0000-0030-0000-006c0000006b"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "5v8e6cih_ueu_a2wd28uj8boqxv3gmfx15u1chfrbf_1fupa7fo_yqd"))
-            },
-          SimpleMember
-            { smQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000037-0000-0048-0000-00460000006a"))) (Domain "faraway.example.com"),
-              smConvRoleName = (fromJust (parseRoleName "dxwk4qalr3oi4jh6v8e3r4agor5vce0b_5w_b3fwmdwfhc3_mqsk94ngdw"))
-            }
-        ]
-    }
+  SimpleMembers {mMembers = []}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Token_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Token_user.hs
index 527a109a302..f0842e2490e 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Token_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Token_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,66 +20,3 @@ import Wire.API.Push.Token (Token (..))
 
 testObject_Token_user_1 :: Token
 testObject_Token_user_1 = Token {tokenText = "\ETX\EOT\NUL\NULv,\182847\46735\1084785;)\1081758(s=Ou"}
-
-testObject_Token_user_2 :: Token
-testObject_Token_user_2 =
-  Token {tokenText = "HXPo\ESCaJLCCS\37832\DC4\EM\a\STXbwXJ\179526\DLE\RS\991990\1111367S[\CANo"}
-
-testObject_Token_user_3 :: Token
-testObject_Token_user_3 = Token {tokenText = "\1112228Hcuwt3MZD"}
-
-testObject_Token_user_4 :: Token
-testObject_Token_user_4 = Token {tokenText = ""}
-
-testObject_Token_user_5 :: Token
-testObject_Token_user_5 = Token {tokenText = "{PVg"}
-
-testObject_Token_user_6 :: Token
-testObject_Token_user_6 = Token {tokenText = "\814T\44927\53803)\ENQ\SO\1100453\b\69687"}
-
-testObject_Token_user_7 :: Token
-testObject_Token_user_7 = Token {tokenText = "}\1030672\1102895\&0K3<'m69a\DC3"}
-
-testObject_Token_user_8 :: Token
-testObject_Token_user_8 = Token {tokenText = "\54638\EMLdrOO'\170220f\1055454w\8632\151583\ETBEZ\SYN\1088522"}
-
-testObject_Token_user_9 :: Token
-testObject_Token_user_9 = Token {tokenText = "oj\1002767z\SI\SO/\\9\170699\1047823\f\DC2\DLE\SYN\129580>"}
-
-testObject_Token_user_10 :: Token
-testObject_Token_user_10 = Token {tokenText = "\"`\1003052\\G\r"}
-
-testObject_Token_user_11 :: Token
-testObject_Token_user_11 = Token {tokenText = "^\ENQ%\EM\n\188880\rr\987630X\vvPM"}
-
-testObject_Token_user_12 :: Token
-testObject_Token_user_12 =
-  Token {tokenText = "\32805iN\1093489\DC2]/R]?\US\181417Bw*/o\GS\f\8876\120462\122921\DLEX\1056273\1010430\USA"}
-
-testObject_Token_user_13 :: Token
-testObject_Token_user_13 = Token {tokenText = "Y\1113415+H\a'0"}
-
-testObject_Token_user_14 :: Token
-testObject_Token_user_14 = Token {tokenText = "\129031\DC2b\1045498z\151455\1044017E\140303\ETBNYmg\EOT2w0"}
-
-testObject_Token_user_15 :: Token
-testObject_Token_user_15 = Token {tokenText = "\11365=\EM\55178\aK\120330\t\nd\f\1048288-\1045386\&2;\51933C9C\ACKT"}
-
-testObject_Token_user_16 :: Token
-testObject_Token_user_16 =
-  Token {tokenText = "\40778\&16QGyKz*p\1021914\1108101\EM{\24108\989847P2\1069636F\SOH>F\37860\1035192lyZ"}
-
-testObject_Token_user_17 :: Token
-testObject_Token_user_17 =
-  Token {tokenText = "\132107\&9\191028G?M\nX\b0\v\150813\&7MR\GS\1040590]`\47566\985013\127019o\SOO\137411"}
-
-testObject_Token_user_18 :: Token
-testObject_Token_user_18 = Token {tokenText = ""}
-
-testObject_Token_user_19 :: Token
-testObject_Token_user_19 =
-  Token {tokenText = "f\tZ\r\tU\160614\&2b\SUB\132268vZ,\1003892N\STX\EOT\a\1063931\1061453rzBEO~\NAK}J"}
-
-testObject_Token_user_20 :: Token
-testObject_Token_user_20 =
-  Token {tokenText = "I?\1072404\1037295\SOWS\ETBb\USg1nK\69224C?\154560\\r}\1060571\GS\ETX\1091793X*sK"}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TotalSize_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TotalSize_user.hs
index 3d38d40e790..d60539a5593 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TotalSize_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TotalSize_user.hs
@@ -22,60 +22,3 @@ import Wire.API.Asset (TotalSize (..))
 
 testObject_TotalSize_user_1 :: TotalSize
 testObject_TotalSize_user_1 = TotalSize {totalSizeBytes = 9}
-
-testObject_TotalSize_user_2 :: TotalSize
-testObject_TotalSize_user_2 = TotalSize {totalSizeBytes = 27}
-
-testObject_TotalSize_user_3 :: TotalSize
-testObject_TotalSize_user_3 = TotalSize {totalSizeBytes = 5}
-
-testObject_TotalSize_user_4 :: TotalSize
-testObject_TotalSize_user_4 = TotalSize {totalSizeBytes = 4}
-
-testObject_TotalSize_user_5 :: TotalSize
-testObject_TotalSize_user_5 = TotalSize {totalSizeBytes = 21}
-
-testObject_TotalSize_user_6 :: TotalSize
-testObject_TotalSize_user_6 = TotalSize {totalSizeBytes = 2}
-
-testObject_TotalSize_user_7 :: TotalSize
-testObject_TotalSize_user_7 = TotalSize {totalSizeBytes = 30}
-
-testObject_TotalSize_user_8 :: TotalSize
-testObject_TotalSize_user_8 = TotalSize {totalSizeBytes = 30}
-
-testObject_TotalSize_user_9 :: TotalSize
-testObject_TotalSize_user_9 = TotalSize {totalSizeBytes = 28}
-
-testObject_TotalSize_user_10 :: TotalSize
-testObject_TotalSize_user_10 = TotalSize {totalSizeBytes = 13}
-
-testObject_TotalSize_user_11 :: TotalSize
-testObject_TotalSize_user_11 = TotalSize {totalSizeBytes = 8}
-
-testObject_TotalSize_user_12 :: TotalSize
-testObject_TotalSize_user_12 = TotalSize {totalSizeBytes = 14}
-
-testObject_TotalSize_user_13 :: TotalSize
-testObject_TotalSize_user_13 = TotalSize {totalSizeBytes = 14}
-
-testObject_TotalSize_user_14 :: TotalSize
-testObject_TotalSize_user_14 = TotalSize {totalSizeBytes = 13}
-
-testObject_TotalSize_user_15 :: TotalSize
-testObject_TotalSize_user_15 = TotalSize {totalSizeBytes = 27}
-
-testObject_TotalSize_user_16 :: TotalSize
-testObject_TotalSize_user_16 = TotalSize {totalSizeBytes = 1}
-
-testObject_TotalSize_user_17 :: TotalSize
-testObject_TotalSize_user_17 = TotalSize {totalSizeBytes = 12}
-
-testObject_TotalSize_user_18 :: TotalSize
-testObject_TotalSize_user_18 = TotalSize {totalSizeBytes = 30}
-
-testObject_TotalSize_user_19 :: TotalSize
-testObject_TotalSize_user_19 = TotalSize {totalSizeBytes = 14}
-
-testObject_TotalSize_user_20 :: TotalSize
-testObject_TotalSize_user_20 = TotalSize {totalSizeBytes = 1}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Transport_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Transport_user.hs
index 84c05e6b487..e87415c9241 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Transport_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/Transport_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -25,57 +23,3 @@ testObject_Transport_user_1 = TransportUDP
 
 testObject_Transport_user_2 :: Transport
 testObject_Transport_user_2 = TransportTCP
-
-testObject_Transport_user_3 :: Transport
-testObject_Transport_user_3 = TransportTCP
-
-testObject_Transport_user_4 :: Transport
-testObject_Transport_user_4 = TransportTCP
-
-testObject_Transport_user_5 :: Transport
-testObject_Transport_user_5 = TransportTCP
-
-testObject_Transport_user_6 :: Transport
-testObject_Transport_user_6 = TransportTCP
-
-testObject_Transport_user_7 :: Transport
-testObject_Transport_user_7 = TransportTCP
-
-testObject_Transport_user_8 :: Transport
-testObject_Transport_user_8 = TransportUDP
-
-testObject_Transport_user_9 :: Transport
-testObject_Transport_user_9 = TransportTCP
-
-testObject_Transport_user_10 :: Transport
-testObject_Transport_user_10 = TransportTCP
-
-testObject_Transport_user_11 :: Transport
-testObject_Transport_user_11 = TransportUDP
-
-testObject_Transport_user_12 :: Transport
-testObject_Transport_user_12 = TransportUDP
-
-testObject_Transport_user_13 :: Transport
-testObject_Transport_user_13 = TransportTCP
-
-testObject_Transport_user_14 :: Transport
-testObject_Transport_user_14 = TransportTCP
-
-testObject_Transport_user_15 :: Transport
-testObject_Transport_user_15 = TransportUDP
-
-testObject_Transport_user_16 :: Transport
-testObject_Transport_user_16 = TransportTCP
-
-testObject_Transport_user_17 :: Transport
-testObject_Transport_user_17 = TransportUDP
-
-testObject_Transport_user_18 :: Transport
-testObject_Transport_user_18 = TransportUDP
-
-testObject_Transport_user_19 :: Transport
-testObject_Transport_user_19 = TransportUDP
-
-testObject_Transport_user_20 :: Transport
-testObject_Transport_user_20 = TransportUDP
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnHost_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnHost_user.hs
index 945604cf38d..e68df64ba86 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnHost_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnHost_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -28,56 +26,17 @@ testObject_TurnHost_user_1 = TurnHostName "007.com"
 testObject_TurnHost_user_2 :: TurnHost
 testObject_TurnHost_user_2 = TurnHostIp (IpAddr (read "135.104.207.206"))
 
-testObject_TurnHost_user_3 :: TurnHost
-testObject_TurnHost_user_3 = TurnHostName "007.com"
-
-testObject_TurnHost_user_4 :: TurnHost
-testObject_TurnHost_user_4 = TurnHostName "xn--mgbh0fb.xn--kgbechtv"
-
-testObject_TurnHost_user_5 :: TurnHost
-testObject_TurnHost_user_5 = TurnHostName "a-c"
-
-testObject_TurnHost_user_6 :: TurnHost
-testObject_TurnHost_user_6 = TurnHostIp (IpAddr (read "136.254.52.77"))
-
-testObject_TurnHost_user_7 :: TurnHost
-testObject_TurnHost_user_7 = TurnHostIp (IpAddr (read "99.219.232.78"))
-
 testObject_TurnHost_user_8 :: TurnHost
 testObject_TurnHost_user_8 = TurnHostName "host.name"
 
 testObject_TurnHost_user_9 :: TurnHost
 testObject_TurnHost_user_9 = TurnHostIp (IpAddr (read "b486:27e7:a56f:d885:984b:2ff8:2031:b6d9"))
 
-testObject_TurnHost_user_10 :: TurnHost
-testObject_TurnHost_user_10 = TurnHostIp (IpAddr (read "2684:ab8d:3fda:e8a2:a86c:843:2597:9c9a"))
-
-testObject_TurnHost_user_11 :: TurnHost
-testObject_TurnHost_user_11 = TurnHostIp (IpAddr (read "f11:2ce9:9ae4:162f:db64:e52:41c7:d9ef"))
-
 testObject_TurnHost_user_12 :: TurnHost
 testObject_TurnHost_user_12 = TurnHostName "xn--mgbh0fb.xn--kgbechtv"
 
-testObject_TurnHost_user_13 :: TurnHost
-testObject_TurnHost_user_13 = TurnHostName "xn--mgbh0fb.xn--kgbechtv"
-
 testObject_TurnHost_user_14 :: TurnHost
 testObject_TurnHost_user_14 = TurnHostName "a-c"
 
-testObject_TurnHost_user_15 :: TurnHost
-testObject_TurnHost_user_15 = TurnHostName "007.com"
-
-testObject_TurnHost_user_16 :: TurnHost
-testObject_TurnHost_user_16 = TurnHostIp (IpAddr (read "43.50.81.171"))
-
-testObject_TurnHost_user_17 :: TurnHost
-testObject_TurnHost_user_17 = TurnHostIp (IpAddr (read "cafc:3e71:5359:2b79:ee8f:2baf:4f0f:f824"))
-
-testObject_TurnHost_user_18 :: TurnHost
-testObject_TurnHost_user_18 = TurnHostName "host.name"
-
-testObject_TurnHost_user_19 :: TurnHost
-testObject_TurnHost_user_19 = TurnHostName "a-c"
-
 testObject_TurnHost_user_20 :: TurnHost
 testObject_TurnHost_user_20 = TurnHostName "123"
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnURI_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnURI_user.hs
index ee7f5020693..8bab591e584 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnURI_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TurnURI_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -22,79 +20,14 @@ import Data.Misc (IpAddr (IpAddr))
 import Imports (Maybe (Just, Nothing), read)
 import Wire.API.Call.Config
   ( Scheme (SchemeTurn, SchemeTurns),
-    Transport (TransportTCP, TransportUDP),
+    Transport (TransportTCP),
     TurnHost (TurnHostIp, TurnHostName),
     TurnURI,
     turnURI,
   )
 
 testObject_TurnURI_user_1 :: TurnURI
-testObject_TurnURI_user_1 = (turnURI (SchemeTurns) (TurnHostName "007.com") (read "4") (Just TransportTCP))
-
-testObject_TurnURI_user_2 :: TurnURI
-testObject_TurnURI_user_2 =
-  (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "102.69.197.199"))) (read "0") (Just TransportUDP))
-
-testObject_TurnURI_user_3 :: TurnURI
-testObject_TurnURI_user_3 =
-  (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "203.95.154.51"))) (read "0") (Just TransportTCP))
-
-testObject_TurnURI_user_4 :: TurnURI
-testObject_TurnURI_user_4 = (turnURI (SchemeTurns) (TurnHostName "123") (read "3") (Nothing))
-
-testObject_TurnURI_user_5 :: TurnURI
-testObject_TurnURI_user_5 = (turnURI (SchemeTurns) (TurnHostName "a-c") (read "8") (Just TransportUDP))
-
-testObject_TurnURI_user_6 :: TurnURI
-testObject_TurnURI_user_6 =
-  (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "8") (Just TransportUDP))
-
-testObject_TurnURI_user_7 :: TurnURI
-testObject_TurnURI_user_7 =
-  (turnURI (SchemeTurn) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "8") (Just TransportUDP))
-
-testObject_TurnURI_user_8 :: TurnURI
-testObject_TurnURI_user_8 =
-  (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "150.156.243.74"))) (read "8") (Just TransportUDP))
+testObject_TurnURI_user_1 = turnURI SchemeTurns (TurnHostName "007.com") (read "4") (Just TransportTCP)
 
 testObject_TurnURI_user_9 :: TurnURI
-testObject_TurnURI_user_9 = (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "6.222.51.171"))) (read "1") (Nothing))
-
-testObject_TurnURI_user_10 :: TurnURI
-testObject_TurnURI_user_10 = (turnURI (SchemeTurns) (TurnHostName "123") (read "0") (Just TransportTCP))
-
-testObject_TurnURI_user_11 :: TurnURI
-testObject_TurnURI_user_11 =
-  (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "44.65.131.165"))) (read "0") (Just TransportUDP))
-
-testObject_TurnURI_user_12 :: TurnURI
-testObject_TurnURI_user_12 = (turnURI (SchemeTurn) (TurnHostName "007.com") (read "0") (Just TransportTCP))
-
-testObject_TurnURI_user_13 :: TurnURI
-testObject_TurnURI_user_13 =
-  (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "37.234.77.74"))) (read "1") (Just TransportTCP))
-
-testObject_TurnURI_user_14 :: TurnURI
-testObject_TurnURI_user_14 = (turnURI (SchemeTurns) (TurnHostName "a-c") (read "4") (Just TransportUDP))
-
-testObject_TurnURI_user_15 :: TurnURI
-testObject_TurnURI_user_15 =
-  (turnURI (SchemeTurn) (TurnHostIp (IpAddr (read "5.194.243.81"))) (read "8") (Just TransportTCP))
-
-testObject_TurnURI_user_16 :: TurnURI
-testObject_TurnURI_user_16 =
-  (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "0") (Just TransportUDP))
-
-testObject_TurnURI_user_17 :: TurnURI
-testObject_TurnURI_user_17 =
-  (turnURI (SchemeTurns) (TurnHostIp (IpAddr (read "217.142.35.220"))) (read "4") (Just TransportUDP))
-
-testObject_TurnURI_user_18 :: TurnURI
-testObject_TurnURI_user_18 = (turnURI (SchemeTurns) (TurnHostName "007.com") (read "6") (Just TransportUDP))
-
-testObject_TurnURI_user_19 :: TurnURI
-testObject_TurnURI_user_19 =
-  (turnURI (SchemeTurns) (TurnHostName "xn--mgbh0fb.xn--kgbechtv") (read "4") (Just TransportTCP))
-
-testObject_TurnURI_user_20 :: TurnURI
-testObject_TurnURI_user_20 = (turnURI (SchemeTurns) (TurnHostName "host.name") (read "7") (Just TransportTCP))
+testObject_TurnURI_user_9 = turnURI SchemeTurn (TurnHostIp (IpAddr (read "6.222.51.171"))) (read "1") Nothing
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingData_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingData_user.hs
index 517b7a2a6b2..d841b01ec4e 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingData_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingData_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -18,64 +16,7 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 module Test.Wire.API.Golden.Generated.TypingData_user where
 
-import Wire.API.Conversation.Typing (TypingData (..), TypingStatus (StartedTyping, StoppedTyping))
+import Wire.API.Conversation.Typing (TypingData (..), TypingStatus (StartedTyping))
 
 testObject_TypingData_user_1 :: TypingData
 testObject_TypingData_user_1 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_2 :: TypingData
-testObject_TypingData_user_2 = TypingData {tdStatus = StoppedTyping}
-
-testObject_TypingData_user_3 :: TypingData
-testObject_TypingData_user_3 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_4 :: TypingData
-testObject_TypingData_user_4 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_5 :: TypingData
-testObject_TypingData_user_5 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_6 :: TypingData
-testObject_TypingData_user_6 = TypingData {tdStatus = StoppedTyping}
-
-testObject_TypingData_user_7 :: TypingData
-testObject_TypingData_user_7 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_8 :: TypingData
-testObject_TypingData_user_8 = TypingData {tdStatus = StoppedTyping}
-
-testObject_TypingData_user_9 :: TypingData
-testObject_TypingData_user_9 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_10 :: TypingData
-testObject_TypingData_user_10 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_11 :: TypingData
-testObject_TypingData_user_11 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_12 :: TypingData
-testObject_TypingData_user_12 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_13 :: TypingData
-testObject_TypingData_user_13 = TypingData {tdStatus = StoppedTyping}
-
-testObject_TypingData_user_14 :: TypingData
-testObject_TypingData_user_14 = TypingData {tdStatus = StoppedTyping}
-
-testObject_TypingData_user_15 :: TypingData
-testObject_TypingData_user_15 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_16 :: TypingData
-testObject_TypingData_user_16 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_17 :: TypingData
-testObject_TypingData_user_17 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_18 :: TypingData
-testObject_TypingData_user_18 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_19 :: TypingData
-testObject_TypingData_user_19 = TypingData {tdStatus = StartedTyping}
-
-testObject_TypingData_user_20 :: TypingData
-testObject_TypingData_user_20 = TypingData {tdStatus = StoppedTyping}
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingStatus_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingStatus_user.hs
index 7d812ca437f..3d874cbe6a6 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingStatus_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/TypingStatus_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -24,58 +22,4 @@ testObject_TypingStatus_user_1 :: TypingStatus
 testObject_TypingStatus_user_1 = StoppedTyping
 
 testObject_TypingStatus_user_2 :: TypingStatus
-testObject_TypingStatus_user_2 = StoppedTyping
-
-testObject_TypingStatus_user_3 :: TypingStatus
-testObject_TypingStatus_user_3 = StartedTyping
-
-testObject_TypingStatus_user_4 :: TypingStatus
-testObject_TypingStatus_user_4 = StartedTyping
-
-testObject_TypingStatus_user_5 :: TypingStatus
-testObject_TypingStatus_user_5 = StoppedTyping
-
-testObject_TypingStatus_user_6 :: TypingStatus
-testObject_TypingStatus_user_6 = StartedTyping
-
-testObject_TypingStatus_user_7 :: TypingStatus
-testObject_TypingStatus_user_7 = StoppedTyping
-
-testObject_TypingStatus_user_8 :: TypingStatus
-testObject_TypingStatus_user_8 = StoppedTyping
-
-testObject_TypingStatus_user_9 :: TypingStatus
-testObject_TypingStatus_user_9 = StoppedTyping
-
-testObject_TypingStatus_user_10 :: TypingStatus
-testObject_TypingStatus_user_10 = StoppedTyping
-
-testObject_TypingStatus_user_11 :: TypingStatus
-testObject_TypingStatus_user_11 = StartedTyping
-
-testObject_TypingStatus_user_12 :: TypingStatus
-testObject_TypingStatus_user_12 = StartedTyping
-
-testObject_TypingStatus_user_13 :: TypingStatus
-testObject_TypingStatus_user_13 = StoppedTyping
-
-testObject_TypingStatus_user_14 :: TypingStatus
-testObject_TypingStatus_user_14 = StoppedTyping
-
-testObject_TypingStatus_user_15 :: TypingStatus
-testObject_TypingStatus_user_15 = StartedTyping
-
-testObject_TypingStatus_user_16 :: TypingStatus
-testObject_TypingStatus_user_16 = StoppedTyping
-
-testObject_TypingStatus_user_17 :: TypingStatus
-testObject_TypingStatus_user_17 = StoppedTyping
-
-testObject_TypingStatus_user_18 :: TypingStatus
-testObject_TypingStatus_user_18 = StoppedTyping
-
-testObject_TypingStatus_user_19 :: TypingStatus
-testObject_TypingStatus_user_19 = StartedTyping
-
-testObject_TypingStatus_user_20 :: TypingStatus
-testObject_TypingStatus_user_20 = StoppedTyping
+testObject_TypingStatus_user_2 = StartedTyping
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UpdateBotPrekeys_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UpdateBotPrekeys_user.hs
index 22085286e90..67ce17c03df 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UpdateBotPrekeys_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UpdateBotPrekeys_user.hs
@@ -26,517 +26,12 @@ testObject_UpdateBotPrekeys_user_1 =
   UpdateBotPrekeys
     { updateBotPrekeyList =
         [ Prekey {prekeyId = PrekeyId {keyId = 81}, prekeyKey = "Ox\DLE*\120423\&8m\DC4%J\34541\"/r"},
-          Prekey {prekeyId = PrekeyId {keyId = 29}, prekeyKey = "r\GS"},
-          Prekey {prekeyId = PrekeyId {keyId = 85}, prekeyKey = "J\DC2z"},
-          Prekey {prekeyId = PrekeyId {keyId = 7}, prekeyKey = "]\RS\54967\1108322\EM4\995845\&9\149943{\1105325d8"},
-          Prekey {prekeyId = PrekeyId {keyId = 86}, prekeyKey = "\NAK]J4\15954\t06l\DC3"},
-          Prekey {prekeyId = PrekeyId {keyId = 70}, prekeyKey = "0\NUL\24026_6\SYN@MU\1078633"},
-          Prekey {prekeyId = PrekeyId {keyId = 70}, prekeyKey = "\DC1E\SInw\SO*x}\1090376Q\a\EOT\1042768\FS"},
-          Prekey {prekeyId = PrekeyId {keyId = 13}, prekeyKey = "\1102073\&9&$"},
-          Prekey {prekeyId = PrekeyId {keyId = 92}, prekeyKey = "\SYNtGpIv\ETX\9051\158884"},
-          Prekey {prekeyId = PrekeyId {keyId = 33}, prekeyKey = "\f\\wy\34841\&5;"},
-          Prekey {prekeyId = PrekeyId {keyId = 13}, prekeyKey = "\ESC?V"},
-          Prekey {prekeyId = PrekeyId {keyId = 88}, prekeyKey = "$'\STXU\f]b"},
-          Prekey {prekeyId = PrekeyId {keyId = 6}, prekeyKey = "i<m"},
-          Prekey {prekeyId = PrekeyId {keyId = 83}, prekeyKey = "}ru\29773\ETB\48126gxGp"},
-          Prekey {prekeyId = PrekeyId {keyId = 60}, prekeyKey = "\157912sc|\1016391\152377\&27\990842m\45654\RS<"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 121},
-              prekeyKey = "{\SYN[\DLE4\1039699@\990790\DEL\169148\134168\ETB\1008349\NAK{"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 1}, prekeyKey = "#CL3Q:3uzl@"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 53},
-              prekeyKey = "\49713\b\1013902\SYN[,\40848s\SYN\60024\36104@\1098886:"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 67}, prekeyKey = "3\t\1101369#{\1079015y&\194867\159402\1113175A\RS"},
-          Prekey {prekeyId = PrekeyId {keyId = 79}, prekeyKey = "\994408T[*O\1008775u\1004042\EM\1056803\62687V\7275!"},
-          Prekey {prekeyId = PrekeyId {keyId = 6}, prekeyKey = "\FS\SOH\SI\t=Q\156871\148799_6x-"},
-          Prekey {prekeyId = PrekeyId {keyId = 120}, prekeyKey = "\NUL"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 102},
-              prekeyKey = "v\5985*\EOT\SYN\ESC\v\r\1029151\149576b\"<\1008877\1088349"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 77}, prekeyKey = "&\ETB\ACK "},
-          Prekey {prekeyId = PrekeyId {keyId = 112}, prekeyKey = "\1101874\1111709*\ACK\DC3+_v^t"}
+          Prekey {prekeyId = PrekeyId {keyId = 29}, prekeyKey = "r\GS"}
         ]
     }
 
 testObject_UpdateBotPrekeys_user_2 :: UpdateBotPrekeys
 testObject_UpdateBotPrekeys_user_2 =
   UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 12}, prekeyKey = "I\1105665CY<\147919&\NAK\9280)HG"},
-          Prekey {prekeyId = PrekeyId {keyId = 56}, prekeyKey = "M0\r>\990451<)5"},
-          Prekey {prekeyId = PrekeyId {keyId = 43}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 92}, prekeyKey = "x\\\f"},
-          Prekey {prekeyId = PrekeyId {keyId = 46}, prekeyKey = "\17259q"},
-          Prekey {prekeyId = PrekeyId {keyId = 3}, prekeyKey = "wap\SO\r\64439\GS0md\SOH\1020755"},
-          Prekey {prekeyId = PrekeyId {keyId = 80}, prekeyKey = "q\39863\22662\DLE&@^\190367\&9|\1036301.\83019b;"},
-          Prekey {prekeyId = PrekeyId {keyId = 42}, prekeyKey = "p\ETX"},
-          Prekey {prekeyId = PrekeyId {keyId = 98}, prekeyKey = "\t"},
-          Prekey {prekeyId = PrekeyId {keyId = 95}, prekeyKey = "@(h"},
-          Prekey {prekeyId = PrekeyId {keyId = 35}, prekeyKey = "\1085155\1024562\1046133O\RSOmz\DC4\129300\1007334"},
-          Prekey {prekeyId = PrekeyId {keyId = 62}, prekeyKey = "["},
-          Prekey {prekeyId = PrekeyId {keyId = 87}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 75}, prekeyKey = "R\RS;g"},
-          Prekey {prekeyId = PrekeyId {keyId = 87}, prekeyKey = "Nb\1054916\&9"},
-          Prekey {prekeyId = PrekeyId {keyId = 108}, prekeyKey = "\46832\DC4,\DC4"},
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = "\59020,_\187543fU"},
-          Prekey {prekeyId = PrekeyId {keyId = 11}, prekeyKey = "\RS\1071191\\\NUL"},
-          Prekey {prekeyId = PrekeyId {keyId = 110}, prekeyKey = "#Fr\ETX~yKN\60866G"},
-          Prekey {prekeyId = PrekeyId {keyId = 120}, prekeyKey = "4o%\21685\190887\STX\ETXU"},
-          Prekey {prekeyId = PrekeyId {keyId = 19}, prekeyKey = "\EMG"},
-          Prekey {prekeyId = PrekeyId {keyId = 20}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 84}, prekeyKey = "rXz{Al"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 118},
-              prekeyKey = "\146955\100451\DC1\153649\ETX<\aFt}\SOH\1059850/\1105305'"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 103}, prekeyKey = "\DC2X\SYNgJp\SIX=z-\1079374/\178157\1028950"},
-          Prekey {prekeyId = PrekeyId {keyId = 2}, prekeyKey = "\1050000\&3]\tV\74277\ACKL/\184354\DLE6"},
-          Prekey {prekeyId = PrekeyId {keyId = 70}, prekeyKey = "p\52880a\96111\&0"},
-          Prekey {prekeyId = PrekeyId {keyId = 65}, prekeyKey = "A;(hc\SYN\ETX\157261(\\"},
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = ""}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_3 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_3 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 120}, prekeyKey = "P`\ETXo`9Q4\49641\SOHa\ESCqY{"},
-          Prekey {prekeyId = PrekeyId {keyId = 35}, prekeyKey = "t\NAK\DC2?O\ESCb5W"},
-          Prekey {prekeyId = PrekeyId {keyId = 100}, prekeyKey = "$"},
-          Prekey {prekeyId = PrekeyId {keyId = 121}, prekeyKey = "\40539]m)"},
-          Prekey {prekeyId = PrekeyId {keyId = 33}, prekeyKey = "-5}]Q\SUB\b\GSR/d"},
-          Prekey {prekeyId = PrekeyId {keyId = 107}, prekeyKey = " Fq9?L\ETX"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 84},
-              prekeyKey = "e\r\DC3\US\1037575\1083812-W\STX\1015022\988679B\998970"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = "\SUBY\37170\60154\1078792T\147558\SYN\r"},
-          Prekey {prekeyId = PrekeyId {keyId = 27}, prekeyKey = "~\54236\&2\1101916\SI\vI:W\160986r"},
-          Prekey {prekeyId = PrekeyId {keyId = 76}, prekeyKey = "\29170c\167433\CAN\151857\3920T\16124=MW\ETB\SUB"},
-          Prekey {prekeyId = PrekeyId {keyId = 33}, prekeyKey = "\1064824\1062680\ACK.Z"},
-          Prekey {prekeyId = PrekeyId {keyId = 52}, prekeyKey = "\1105144@e[\138150\&4"},
-          Prekey {prekeyId = PrekeyId {keyId = 121}, prekeyKey = "\1033359B\US!pV"},
-          Prekey {prekeyId = PrekeyId {keyId = 72}, prekeyKey = "\US\DC3\999430\&2\43909\1053944\SYN"},
-          Prekey {prekeyId = PrekeyId {keyId = 69}, prekeyKey = "\ACKO"},
-          Prekey {prekeyId = PrekeyId {keyId = 16}, prekeyKey = "kOyh\1101389\SI\1060972g"},
-          Prekey {prekeyId = PrekeyId {keyId = 110}, prekeyKey = "\ETBU:$"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_4 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_4 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 77}, prekeyKey = "j:c"},
-          Prekey {prekeyId = PrekeyId {keyId = 96}, prekeyKey = "\f 7Dy'T\FSm\a"},
-          Prekey {prekeyId = PrekeyId {keyId = 69}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 123}, prekeyKey = "\ACKD\1046139F"},
-          Prekey {prekeyId = PrekeyId {keyId = 97}, prekeyKey = "\1076061\984123\n\139341\v\9449\1051694+\20261'"},
-          Prekey {prekeyId = PrekeyId {keyId = 101}, prekeyKey = "\165411]\v=\1107987p\EMB"},
-          Prekey {prekeyId = PrekeyId {keyId = 108}, prekeyKey = "CG>@\1071560w+w\ESC\5549YC"},
-          Prekey {prekeyId = PrekeyId {keyId = 99}, prekeyKey = "r\34362\35121\6152\"1*:\NULQR\1059286"},
-          Prekey {prekeyId = PrekeyId {keyId = 63}, prekeyKey = "'>\DLEYv\40916"},
-          Prekey {prekeyId = PrekeyId {keyId = 75}, prekeyKey = "\ETBx\1099793\1013739"},
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = ",Jp"},
-          Prekey {prekeyId = PrekeyId {keyId = 92}, prekeyKey = ";\160386Kr\134739'"},
-          Prekey {prekeyId = PrekeyId {keyId = 110}, prekeyKey = "\EOT\n\1037357\134968|MLd`\SUBek`"},
-          Prekey {prekeyId = PrekeyId {keyId = 121}, prekeyKey = "rm{I\CANG\66403e\8143\164302\1070043\135416"},
-          Prekey {prekeyId = PrekeyId {keyId = 29}, prekeyKey = "nkP|\1020103\DLE^\149126'\64795"},
-          Prekey {prekeyId = PrekeyId {keyId = 45}, prekeyKey = "f\STX\1052771r\DC3R?\178128\SOH"},
-          Prekey {prekeyId = PrekeyId {keyId = 11}, prekeyKey = "\f\152062dL\35775\1025573G\""},
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = "\148309\n\146690\n\DLE<\FS>Qd@n|R"},
-          Prekey {prekeyId = PrekeyId {keyId = 84}, prekeyKey = "w\182916"},
-          Prekey {prekeyId = PrekeyId {keyId = 50}, prekeyKey = ";"},
-          Prekey {prekeyId = PrekeyId {keyId = 72}, prekeyKey = "\1020344\&5^r=@"},
-          Prekey {prekeyId = PrekeyId {keyId = 66}, prekeyKey = "\NAKx\1068333\US"},
-          Prekey {prekeyId = PrekeyId {keyId = 76}, prekeyKey = "gGk"},
-          Prekey {prekeyId = PrekeyId {keyId = 23}, prekeyKey = "aKN\DLEo\1083664"},
-          Prekey {prekeyId = PrekeyId {keyId = 37}, prekeyKey = "\1065357cT%?\t\1069125"},
-          Prekey {prekeyId = PrekeyId {keyId = 38}, prekeyKey = "\94294\"YE:Tmg"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_5 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_5 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList = [Prekey {prekeyId = PrekeyId {keyId = 80}, prekeyKey = ")t\1230Mf]ph\r\1055082\18259 t"}]
-    }
-
-testObject_UpdateBotPrekeys_user_6 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_6 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 86}, prekeyKey = "V!\SIz"},
-          Prekey {prekeyId = PrekeyId {keyId = 90}, prekeyKey = "\1011250\990478\1024582$\1088708g\146251pp\SYNj"},
-          Prekey {prekeyId = PrekeyId {keyId = 14}, prekeyKey = "g\13400N\r\SOc`_6\ESC\41141\&1\1048373\&9"},
-          Prekey {prekeyId = PrekeyId {keyId = 14}, prekeyKey = "U"},
-          Prekey {prekeyId = PrekeyId {keyId = 105}, prekeyKey = "Y\SUBy\1097254\38505"},
-          Prekey {prekeyId = PrekeyId {keyId = 63}, prekeyKey = "'\14479\&4v/h\ACK\SOH\US\24375\127073\DC2J\v"},
-          Prekey {prekeyId = PrekeyId {keyId = 102}, prekeyKey = "D\1003377"},
-          Prekey {prekeyId = PrekeyId {keyId = 31}, prekeyKey = "\FSe2\57543\&8\ENQ"},
-          Prekey {prekeyId = PrekeyId {keyId = 0}, prekeyKey = "d\46220dy\134263\&5\191045Z1"},
-          Prekey {prekeyId = PrekeyId {keyId = 63}, prekeyKey = "q7\ACKAg=\".%G,\1063432\9679\33173b"},
-          Prekey {prekeyId = PrekeyId {keyId = 54}, prekeyKey = "\13147Af*\DC4\97760R}"},
-          Prekey {prekeyId = PrekeyId {keyId = 77}, prekeyKey = "\DLE\1110247\48610\a\1027275k\59453[~Z?\SYN\27032s'"},
-          Prekey {prekeyId = PrekeyId {keyId = 107}, prekeyKey = "\986459"},
-          Prekey {prekeyId = PrekeyId {keyId = 89}, prekeyKey = "\ACKv"},
-          Prekey {prekeyId = PrekeyId {keyId = 112}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 24}, prekeyKey = "#C\ENQ\1047918\1087032ix\GS?9j\988288\DC4\DC2\ETB"},
-          Prekey {prekeyId = PrekeyId {keyId = 5}, prekeyKey = "\1013207\CAN"},
-          Prekey {prekeyId = PrekeyId {keyId = 22}, prekeyKey = "{Z`}\DC1ADO\1078212>#\r/\29720"},
-          Prekey {prekeyId = PrekeyId {keyId = 50}, prekeyKey = "L\DLE:"},
-          Prekey {prekeyId = PrekeyId {keyId = 17}, prekeyKey = "\DC4%\DEL\CANJNS\f"},
-          Prekey {prekeyId = PrekeyId {keyId = 71}, prekeyKey = "^\69740\190486\&2\14087XhPur\"\EOTal"},
-          Prekey {prekeyId = PrekeyId {keyId = 4}, prekeyKey = "oE\EM\1029500j\3778\STX#6\1020334+\1057460"},
-          Prekey {prekeyId = PrekeyId {keyId = 91}, prekeyKey = "(\ESCa"},
-          Prekey {prekeyId = PrekeyId {keyId = 120}, prekeyKey = "\USd\19812'0\ETBf\DC3Q(\b\DC1h"},
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = "M\45528\1080379c\33983\&0k\1013433"},
-          Prekey {prekeyId = PrekeyId {keyId = 55}, prekeyKey = "7\147276\DC2p\1083500\&6\DC3\RSaJZ\1025085X"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_7 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_7 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 128}, prekeyKey = "\1020838N':`_j\171674"},
-          Prekey {prekeyId = PrekeyId {keyId = 17}, prekeyKey = "\6062\1034736:)\DC42\18571]S\SYN\SO\1024426\67597"},
-          Prekey {prekeyId = PrekeyId {keyId = 22}, prekeyKey = "\15252*?\160207\19077\&6\EOT1\176348\1001424"},
-          Prekey {prekeyId = PrekeyId {keyId = 27}, prekeyKey = "E"},
-          Prekey {prekeyId = PrekeyId {keyId = 5}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 47}, prekeyKey = "#\NAK"},
-          Prekey {prekeyId = PrekeyId {keyId = 5}, prekeyKey = "\EMc*^r\57539\r"},
-          Prekey {prekeyId = PrekeyId {keyId = 109}, prekeyKey = "\r\149398"},
-          Prekey {prekeyId = PrekeyId {keyId = 46}, prekeyKey = "\1066859u\RSY.K\1069831\r5\EOT#\71213\DC4"},
-          Prekey {prekeyId = PrekeyId {keyId = 121}, prekeyKey = "H\t$+\SUBv\FS\SOHi"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_8 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_8 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 76}, prekeyKey = "\163949\1067633\1054769J\1040912"},
-          Prekey {prekeyId = PrekeyId {keyId = 8}, prekeyKey = "o\USOO/4\1083251\STX"},
-          Prekey {prekeyId = PrekeyId {keyId = 33}, prekeyKey = "\1051726X\1057103\CAN\73711u\NAK#\993445j"},
-          Prekey {prekeyId = PrekeyId {keyId = 118}, prekeyKey = "tX\132839O\b\51989\1042064B^\1027360"},
-          Prekey {prekeyId = PrekeyId {keyId = 41}, prekeyKey = "\983697`"},
-          Prekey {prekeyId = PrekeyId {keyId = 7}, prekeyKey = "t\985187)\17328!c\RSGp\186241\&6\v\183991"},
-          Prekey {prekeyId = PrekeyId {keyId = 93}, prekeyKey = "\148051eDC"},
-          Prekey {prekeyId = PrekeyId {keyId = 61}, prekeyKey = "k+\26359\SOH]\1030518\EOT\1036034\18778\&7!w"},
-          Prekey {prekeyId = PrekeyId {keyId = 95}, prekeyKey = "\DEL\GS\t\17153-\1033050\120908L"},
-          Prekey {prekeyId = PrekeyId {keyId = 75}, prekeyKey = "zHf\984720,|!pL"},
-          Prekey {prekeyId = PrekeyId {keyId = 12}, prekeyKey = "Z6\"|\1097823d\185147m\NAKZ\SOAZ"},
-          Prekey {prekeyId = PrekeyId {keyId = 94}, prekeyKey = "\a\185236("},
-          Prekey {prekeyId = PrekeyId {keyId = 32}, prekeyKey = "E\1030543q'\ETB\6400:$~"},
-          Prekey {prekeyId = PrekeyId {keyId = 119}, prekeyKey = "@A*)\USBk\US\RS\EOT\NAK\DC1\1078116"},
-          Prekey {prekeyId = PrekeyId {keyId = 106}, prekeyKey = "}4\159287\&7t/R"},
-          Prekey {prekeyId = PrekeyId {keyId = 44}, prekeyKey = "\1083107'_\1090580\SO.\1101495H\ETXQ\NAKBS\182232?"},
-          Prekey {prekeyId = PrekeyId {keyId = 126}, prekeyKey = "&3\36222_"},
-          Prekey {prekeyId = PrekeyId {keyId = 101}, prekeyKey = "\1074612\63029\NAKTl \68765kRq"},
-          Prekey {prekeyId = PrekeyId {keyId = 44}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 42}, prekeyKey = "P\155109\3260\167030\36581"},
-          Prekey {prekeyId = PrekeyId {keyId = 73}, prekeyKey = "\rya-d"},
-          Prekey {prekeyId = PrekeyId {keyId = 73}, prekeyKey = "\1026889\STX\DC1}"},
-          Prekey {prekeyId = PrekeyId {keyId = 24}, prekeyKey = ""}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_9 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_9 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 85}, prekeyKey = "`"},
-          Prekey {prekeyId = PrekeyId {keyId = 49}, prekeyKey = "f:\ETX}\59341A\n\128239\&9G^\DC4\b"},
-          Prekey {prekeyId = PrekeyId {keyId = 74}, prekeyKey = " \STX7\ESC\1022285-\65865+5\FSg`u2\180433"},
-          Prekey {prekeyId = PrekeyId {keyId = 103}, prekeyKey = "\135914\r\DEL\US?-'8C"},
-          Prekey {prekeyId = PrekeyId {keyId = 80}, prekeyKey = "\1014038\DC2uPC\158075\ESC\49504\&1\173002\STX<Y"},
-          Prekey {prekeyId = PrekeyId {keyId = 48}, prekeyKey = "\1091867\1069341\181224"},
-          Prekey {prekeyId = PrekeyId {keyId = 35}, prekeyKey = "B"},
-          Prekey {prekeyId = PrekeyId {keyId = 48}, prekeyKey = "g$S\1063397G\1105261"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_10 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_10 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 97}, prekeyKey = "X*\CAND\vsaQ\f\58653"},
-          Prekey {prekeyId = PrekeyId {keyId = 53}, prekeyKey = "\7454\NAK\26270E\1083536h+$"},
-          Prekey {prekeyId = PrekeyId {keyId = 64}, prekeyKey = "pExkb{U\USZ\1010471X],2\DC1"},
-          Prekey {prekeyId = PrekeyId {keyId = 117}, prekeyKey = "\70503\tS"},
-          Prekey {prekeyId = PrekeyId {keyId = 89}, prekeyKey = "\DC4\60730C"},
-          Prekey {prekeyId = PrekeyId {keyId = 120}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 8}, prekeyKey = "\167878"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_11 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_11 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 18}, prekeyKey = "PZ\DEL\158613W\1004559"},
-          Prekey {prekeyId = PrekeyId {keyId = 107}, prekeyKey = "\SYN)"},
-          Prekey {prekeyId = PrekeyId {keyId = 24}, prekeyKey = "/^a\DC2\ENQ\64615"},
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = ".o\172532\&1|"},
-          Prekey {prekeyId = PrekeyId {keyId = 10}, prekeyKey = "-T\DC1\aT\\\ESCY\1014914ez>"},
-          Prekey {prekeyId = PrekeyId {keyId = 10}, prekeyKey = "\GS!xZJj"},
-          Prekey {prekeyId = PrekeyId {keyId = 65}, prekeyKey = "\v\1032769\n\1095379\1041929"},
-          Prekey {prekeyId = PrekeyId {keyId = 4}, prekeyKey = "9\ETBS\SO=\32599oa$g"},
-          Prekey {prekeyId = PrekeyId {keyId = 107}, prekeyKey = "Qv4bD"},
-          Prekey {prekeyId = PrekeyId {keyId = 46}, prekeyKey = "\17071Z;8\185679\98820paT"},
-          Prekey {prekeyId = PrekeyId {keyId = 118}, prekeyKey = "1\1004394|\ENQDJ\993994\ETX;|\ACK;"},
-          Prekey {prekeyId = PrekeyId {keyId = 99}, prekeyKey = "\SUBF"},
-          Prekey {prekeyId = PrekeyId {keyId = 5}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 85}, prekeyKey = "\DC2F3\ACK\SOH\DC1"},
-          Prekey {prekeyId = PrekeyId {keyId = 35}, prekeyKey = "\1051610\151007#\DC3\1063295\&4\DC2\72101\SUB\\z"},
-          Prekey {prekeyId = PrekeyId {keyId = 4}, prekeyKey = "o\FS\n\1106182*\CAN"},
-          Prekey {prekeyId = PrekeyId {keyId = 17}, prekeyKey = "\1088842\1011361"},
-          Prekey {prekeyId = PrekeyId {keyId = 71}, prekeyKey = "\49986\DC1\1020004L"},
-          Prekey {prekeyId = PrekeyId {keyId = 80}, prekeyKey = "\43956z\144991\1044570\1080305"},
-          Prekey {prekeyId = PrekeyId {keyId = 109}, prekeyKey = "3\DC4gx\36161<"},
-          Prekey {prekeyId = PrekeyId {keyId = 123}, prekeyKey = "\1090856\CAN\1003996,.\STX#\1063403"},
-          Prekey {prekeyId = PrekeyId {keyId = 2}, prekeyKey = "$E\128207j\3734\168581\72794"},
-          Prekey {prekeyId = PrekeyId {keyId = 118}, prekeyKey = "\f\983527E\SYN\SOHTsw{P\1069495\1004576D\ESC"},
-          Prekey {prekeyId = PrekeyId {keyId = 18}, prekeyKey = "M>\b\1073351\1080383Z\EM\1078414\&7\ENQ"},
-          Prekey {prekeyId = PrekeyId {keyId = 8}, prekeyKey = "O\rn,\1002517\ETBE\166787F^-\169385\DC3"},
-          Prekey {prekeyId = PrekeyId {keyId = 59}, prekeyKey = "U\CAN\ACK@"},
-          Prekey {prekeyId = PrekeyId {keyId = 112}, prekeyKey = "3p\127881\1086441C"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_12 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_12 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 35}, prekeyKey = "\110821\999064@a"},
-          Prekey {prekeyId = PrekeyId {keyId = 78}, prekeyKey = "\1113802\EOT\162680^Ec\ESCH\1096020`"},
-          Prekey {prekeyId = PrekeyId {keyId = 101}, prekeyKey = "gf2p"},
-          Prekey {prekeyId = PrekeyId {keyId = 27}, prekeyKey = "\1093368\&8"},
-          Prekey {prekeyId = PrekeyId {keyId = 19}, prekeyKey = "\41901e\b4?\165912.\n\120021\&5\40291\190138\36198[F"},
-          Prekey {prekeyId = PrekeyId {keyId = 0}, prekeyKey = "h(\1002547\146319{R\CANi|E)\ETB!S"},
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = "TV\EM-"},
-          Prekey {prekeyId = PrekeyId {keyId = 76}, prekeyKey = "\CAN=\4008}\10778z\996918\SIWf"},
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = "]"},
-          Prekey {prekeyId = PrekeyId {keyId = 107}, prekeyKey = "S\31744\180518[EV\SYN\b/=\\\EM\v"},
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = "w\\\ENQo/j\57957\&9\1027844j\26955r\64710"},
-          Prekey {prekeyId = PrekeyId {keyId = 46}, prekeyKey = "Mj\1047939(z\US\1047723\t"},
-          Prekey {prekeyId = PrekeyId {keyId = 101}, prekeyKey = ",`\nw^"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 105},
-              prekeyKey = "hPs\78598@\991671Q\61272\71738\DC1\77988\SYN\1069969$1"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = "\1019872"},
-          Prekey {prekeyId = PrekeyId {keyId = 14}, prekeyKey = "\ETB"},
-          Prekey {prekeyId = PrekeyId {keyId = 76}, prekeyKey = "&;\DLE\n=FOH\1024017\40102^D"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_13 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_13 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 87}, prekeyKey = ",WcO\19762"},
-          Prekey {prekeyId = PrekeyId {keyId = 39}, prekeyKey = "/!>r\133774jn\44950\999816"},
-          Prekey {prekeyId = PrekeyId {keyId = 12}, prekeyKey = ">^\1029220}\r\EM\USOCm\1038246\DC249"},
-          Prekey {prekeyId = PrekeyId {keyId = 5}, prekeyKey = "D"},
-          Prekey {prekeyId = PrekeyId {keyId = 109}, prekeyKey = "@9N[\DEL\153655\175032\ETXyS\29711U<;\v"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_14 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_14 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 125}, prekeyKey = "!$r7\DC2nS\1032730\SYN"},
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = "/$N\CAN,\1021874Y\ACK40\133303\r"},
-          Prekey {prekeyId = PrekeyId {keyId = 62}, prekeyKey = "\EM%k}\ESC\1040283"},
-          Prekey {prekeyId = PrekeyId {keyId = 20}, prekeyKey = "\165229q\r\ACKf\988565~\132922\RS/\128340a K"},
-          Prekey {prekeyId = PrekeyId {keyId = 59}, prekeyKey = "L\t]"},
-          Prekey {prekeyId = PrekeyId {keyId = 47}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 13}, prekeyKey = "D\27884\983609O\DC4I\1003406n1\SYN\DLE"},
-          Prekey {prekeyId = PrekeyId {keyId = 50}, prekeyKey = "\1062320\GS\153627\1023309\FSl5{\NAK/\986143\39732CX?"},
-          Prekey {prekeyId = PrekeyId {keyId = 94}, prekeyKey = "z\SYN6\CANfQ-\1031637sD\SUB\1016917]\\"},
-          Prekey {prekeyId = PrekeyId {keyId = 100}, prekeyKey = "4\DC3\1034709\1010358n\59520vb<"},
-          Prekey {prekeyId = PrekeyId {keyId = 10}, prekeyKey = "3\2486yi\1112201(\RS"},
-          Prekey {prekeyId = PrekeyId {keyId = 66}, prekeyKey = "8p"},
-          Prekey {prekeyId = PrekeyId {keyId = 71}, prekeyKey = "\US44|\1062147i\US"},
-          Prekey {prekeyId = PrekeyId {keyId = 49}, prekeyKey = "\SUB\41855*\618"},
-          Prekey {prekeyId = PrekeyId {keyId = 93}, prekeyKey = "W|R\1103848m.\SO\1104705\ACK@\v\b\182827 "},
-          Prekey {prekeyId = PrekeyId {keyId = 80}, prekeyKey = "\ESC1\b'\r#\SOv\EOT"},
-          Prekey {prekeyId = PrekeyId {keyId = 59}, prekeyKey = "\EMB\1069585\NAK\ESCg:d7kU\FS"},
-          Prekey {prekeyId = PrekeyId {keyId = 120}, prekeyKey = "]\NAK\986006]Qu_"},
-          Prekey {prekeyId = PrekeyId {keyId = 53}, prekeyKey = "o"},
-          Prekey {prekeyId = PrekeyId {keyId = 27}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 103}, prekeyKey = "\4281\DC3\152691"},
-          Prekey {prekeyId = PrekeyId {keyId = 62}, prekeyKey = "y\46587\SUB\EMU&0\17194"},
-          Prekey {prekeyId = PrekeyId {keyId = 75}, prekeyKey = ")\1047562("},
-          Prekey {prekeyId = PrekeyId {keyId = 10}, prekeyKey = "\STX8Z\1027996"},
-          Prekey {prekeyId = PrekeyId {keyId = 59}, prekeyKey = "\n12\CAN"},
-          Prekey {prekeyId = PrekeyId {keyId = 95}, prekeyKey = "\1002955n\1024707%h\65077\1083530{U0"},
-          Prekey {prekeyId = PrekeyId {keyId = 67}, prekeyKey = "\4140k\186331\58799\DEL\40829\rZ)+"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_15 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_15 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 109}, prekeyKey = "&\96922\54048\1035878\SUB\SO\EOT"},
-          Prekey {prekeyId = PrekeyId {keyId = 0}, prekeyKey = "\125067D\171401p"},
-          Prekey {prekeyId = PrekeyId {keyId = 84}, prekeyKey = "\rPt>\DC1\46380"},
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = "\15153<i7\rA\1062656\183872\173956)g"},
-          Prekey {prekeyId = PrekeyId {keyId = 73}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 21}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 4}, prekeyKey = "\ETB]"},
-          Prekey {prekeyId = PrekeyId {keyId = 33}, prekeyKey = ":\ETX\EM\184320S\NAK\159039\r\ACK\36500\155468\bQdt"},
-          Prekey {prekeyId = PrekeyId {keyId = 63}, prekeyKey = "f6\n\1034538"},
-          Prekey {prekeyId = PrekeyId {keyId = 10}, prekeyKey = "\v\42109\43406pw"},
-          Prekey {prekeyId = PrekeyId {keyId = 31}, prekeyKey = "\\hl\EM\191276?[\SUB7\1065248\DLE\172183k"},
-          Prekey {prekeyId = PrekeyId {keyId = 39}, prekeyKey = "(\ESClKoe"},
-          Prekey {prekeyId = PrekeyId {keyId = 112}, prekeyKey = "\EOT\1086367\&0\DELyq\139941JoM\DLE"},
-          Prekey {prekeyId = PrekeyId {keyId = 6}, prekeyKey = "\SUBuX"},
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = "x\10480B\1021763I\1037249<\144766\36327\b"},
-          Prekey {prekeyId = PrekeyId {keyId = 12}, prekeyKey = "s\994303A7\EM~\DC12^\1114071\CAN"},
-          Prekey {prekeyId = PrekeyId {keyId = 42}, prekeyKey = "\40163\&0@"},
-          Prekey {prekeyId = PrekeyId {keyId = 26}, prekeyKey = "\994698m\f7d\1093592\183191z\US"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_16 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_16 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 40}, prekeyKey = "\1075516^\1091648\CAN*w\1027500"},
-          Prekey {prekeyId = PrekeyId {keyId = 65}, prekeyKey = "X\DC3\fp\DC4\994221'\141100G\25427\164068\1035625Bp`"},
-          Prekey {prekeyId = PrekeyId {keyId = 55}, prekeyKey = "\v\DC2\ETX\1046377"},
-          Prekey {prekeyId = PrekeyId {keyId = 91}, prekeyKey = "h\NUL-\1082892"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_17 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_17 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 29}, prekeyKey = "wJ\41180;\v"},
-          Prekey {prekeyId = PrekeyId {keyId = 4}, prekeyKey = "\183272\SOHE\NUL"},
-          Prekey {prekeyId = PrekeyId {keyId = 40}, prekeyKey = "\1036906 w\NAK"},
-          Prekey {prekeyId = PrekeyId {keyId = 34}, prekeyKey = "\60095q\EOT\RSW\1004759\SI\EM\r\1003579"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 39},
-              prekeyKey = "\98751o-\43824\STX\ENQ\148526\1041585w\ACK~\1109793x\NULe"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 82}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 53}, prekeyKey = "\v]W\EOT\1084916\28278\1076439<@u&\8992\12324\SOH\SO"},
-          Prekey {prekeyId = PrekeyId {keyId = 122}, prekeyKey = "C"},
-          Prekey {prekeyId = PrekeyId {keyId = 35}, prekeyKey = "~|\RS0\132061"},
-          Prekey {prekeyId = PrekeyId {keyId = 6}, prekeyKey = "\30751"},
-          Prekey {prekeyId = PrekeyId {keyId = 100}, prekeyKey = "E"},
-          Prekey {prekeyId = PrekeyId {keyId = 86}, prekeyKey = "R\1007664\DC4+`\fV"},
-          Prekey {prekeyId = PrekeyId {keyId = 100}, prekeyKey = "K\DEL%"},
-          Prekey
-            { prekeyId = PrekeyId {keyId = 116},
-              prekeyKey = "\n\STX+\190340\&9\60692\30919\1040557&d\41314B\1034785\DEL\SOH"
-            },
-          Prekey {prekeyId = PrekeyId {keyId = 25}, prekeyKey = "\148272\&8FI\17360ar=\1000050"},
-          Prekey {prekeyId = PrekeyId {keyId = 57}, prekeyKey = "j\1053977ve8\DLE<y\ESC\STX \EMg"},
-          Prekey {prekeyId = PrekeyId {keyId = 71}, prekeyKey = "+<%Y\DLEK\7429X\127883\t%RTf"},
-          Prekey {prekeyId = PrekeyId {keyId = 82}, prekeyKey = "\SUB\DC1"},
-          Prekey {prekeyId = PrekeyId {keyId = 20}, prekeyKey = "\1005271\1090731/\DEL\2344"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_18 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_18 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 56}, prekeyKey = "\99301i\ENQQ\STX"},
-          Prekey {prekeyId = PrekeyId {keyId = 49}, prekeyKey = "\1002791\2673\EM;\a\35676R\110667[\190684=/h\1067076W"},
-          Prekey {prekeyId = PrekeyId {keyId = 92}, prekeyKey = "\1105607_"},
-          Prekey {prekeyId = PrekeyId {keyId = 8}, prekeyKey = "9X\FS\DELa\129290\ESC\RSH"},
-          Prekey {prekeyId = PrekeyId {keyId = 67}, prekeyKey = "\NAKr\157632^}t\32671"},
-          Prekey {prekeyId = PrekeyId {keyId = 84}, prekeyKey = "p\64629\23659B`?\NUL\22324\32254\f"},
-          Prekey {prekeyId = PrekeyId {keyId = 16}, prekeyKey = "\DEL8\ACK\vo\1041981\1096759\"\DC3\1104273"},
-          Prekey {prekeyId = PrekeyId {keyId = 77}, prekeyKey = "\39492\r\176349\SO\ENQM\1088247\STXX"},
-          Prekey {prekeyId = PrekeyId {keyId = 43}, prekeyKey = "\CAN\15105\&4X\\\65946G#yg\36801\151617\FS"},
-          Prekey {prekeyId = PrekeyId {keyId = 75}, prekeyKey = "LBE\US\60363\SO"},
-          Prekey {prekeyId = PrekeyId {keyId = 56}, prekeyKey = "%UL"},
-          Prekey {prekeyId = PrekeyId {keyId = 70}, prekeyKey = "\v)\1094396\48265\a\45658v\DLE.G\t"},
-          Prekey {prekeyId = PrekeyId {keyId = 32}, prekeyKey = "\t4b2U"},
-          Prekey {prekeyId = PrekeyId {keyId = 41}, prekeyKey = "\SO|\b\1019634\51641aQ\1090686l\161838"},
-          Prekey {prekeyId = PrekeyId {keyId = 98}, prekeyKey = "\DC1"},
-          Prekey {prekeyId = PrekeyId {keyId = 18}, prekeyKey = "\r\NULh\f2"},
-          Prekey {prekeyId = PrekeyId {keyId = 15}, prekeyKey = "V#L\179781i*\v<%\\jIr\f"},
-          Prekey {prekeyId = PrekeyId {keyId = 67}, prekeyKey = "\147074-Z\ETBtS"},
-          Prekey {prekeyId = PrekeyId {keyId = 61}, prekeyKey = "\17944T"},
-          Prekey {prekeyId = PrekeyId {keyId = 41}, prekeyKey = " "},
-          Prekey {prekeyId = PrekeyId {keyId = 106}, prekeyKey = "BV\1107644\v\1104902wT?\1043373\v\187097\984896G?"},
-          Prekey {prekeyId = PrekeyId {keyId = 75}, prekeyKey = "\53776?,q\78530<\83298\92161"},
-          Prekey {prekeyId = PrekeyId {keyId = 51}, prekeyKey = "\ENQ"},
-          Prekey {prekeyId = PrekeyId {keyId = 14}, prekeyKey = "D^"},
-          Prekey {prekeyId = PrekeyId {keyId = 100}, prekeyKey = "pV+\34500F=\1067417<"},
-          Prekey {prekeyId = PrekeyId {keyId = 71}, prekeyKey = "5fIV/ddv\USQO\f\SO\r"}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_19 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_19 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 112}, prekeyKey = "Y)w\t\58867"},
-          Prekey {prekeyId = PrekeyId {keyId = 10}, prekeyKey = "_\135675s"},
-          Prekey {prekeyId = PrekeyId {keyId = 97}, prekeyKey = "^^%\DC1\tCK\1050068x0\11915x"},
-          Prekey {prekeyId = PrekeyId {keyId = 34}, prekeyKey = "\ESCj\ETX&@\DC3N\131994)t\DC2E*3"},
-          Prekey {prekeyId = PrekeyId {keyId = 63}, prekeyKey = "\DC3\20589^\tW)"},
-          Prekey {prekeyId = PrekeyId {keyId = 77}, prekeyKey = "/\SOH1\999720\ETX"},
-          Prekey {prekeyId = PrekeyId {keyId = 124}, prekeyKey = "\148321"},
-          Prekey {prekeyId = PrekeyId {keyId = 28}, prekeyKey = "`"},
-          Prekey {prekeyId = PrekeyId {keyId = 107}, prekeyKey = "Y\DELb6\63682"},
-          Prekey {prekeyId = PrekeyId {keyId = 104}, prekeyKey = "\NAKG)\1002066\1046180\53983\120999\FS"},
-          Prekey {prekeyId = PrekeyId {keyId = 88}, prekeyKey = ")\74535}y\1050200\1094390F\1104074i&=t\917785b"},
-          Prekey {prekeyId = PrekeyId {keyId = 36}, prekeyKey = "I\23194\NAKC"},
-          Prekey {prekeyId = PrekeyId {keyId = 128}, prekeyKey = "\1108606+\1027413\"\SYNuv_)2d\nh\SI"},
-          Prekey {prekeyId = PrekeyId {keyId = 24}, prekeyKey = "\ENQcG5OL\t\1094678-Lc\188420"},
-          Prekey {prekeyId = PrekeyId {keyId = 84}, prekeyKey = "ab\NUL\29969L*$C"},
-          Prekey {prekeyId = PrekeyId {keyId = 21}, prekeyKey = "\DC2Z"},
-          Prekey {prekeyId = PrekeyId {keyId = 63}, prekeyKey = "\1018927bh\1071822\&1A\USV\\\RS5"},
-          Prekey {prekeyId = PrekeyId {keyId = 115}, prekeyKey = "\DC1\164145C\ACK)|~\1009968D"},
-          Prekey {prekeyId = PrekeyId {keyId = 16}, prekeyKey = ">$\162633U\1107469"},
-          Prekey {prekeyId = PrekeyId {keyId = 47}, prekeyKey = "\DC3g\78394J\33798\GS>8_\133201\994200|"},
-          Prekey {prekeyId = PrekeyId {keyId = 80}, prekeyKey = "-\SYNj`u4dy1\1027520\15568\DLE"},
-          Prekey {prekeyId = PrekeyId {keyId = 54}, prekeyKey = ""}
-        ]
-    }
-
-testObject_UpdateBotPrekeys_user_20 :: UpdateBotPrekeys
-testObject_UpdateBotPrekeys_user_20 =
-  UpdateBotPrekeys
-    { updateBotPrekeyList =
-        [ Prekey {prekeyId = PrekeyId {keyId = 98}, prekeyKey = "n\1032160\28861bJ"},
-          Prekey {prekeyId = PrekeyId {keyId = 119}, prekeyKey = ""},
-          Prekey {prekeyId = PrekeyId {keyId = 101}, prekeyKey = ";n\DEL4\121116\1001957\70278oq&]W;\1075046"},
-          Prekey {prekeyId = PrekeyId {keyId = 58}, prekeyKey = "\"%6=\126102]9n "},
-          Prekey {prekeyId = PrekeyId {keyId = 88}, prekeyKey = "1\ENQ\GSQ\1113402C^M\bO;^"},
-          Prekey {prekeyId = PrekeyId {keyId = 83}, prekeyKey = "\DLE\1110151\RS\NAK\1021175X6\DC3\DLE"},
-          Prekey {prekeyId = PrekeyId {keyId = 116}, prekeyKey = "N\US?hX\186983\38745\100712"},
-          Prekey {prekeyId = PrekeyId {keyId = 43}, prekeyKey = "Q\CAN"},
-          Prekey {prekeyId = PrekeyId {keyId = 60}, prekeyKey = "\998376ZT-H\"\DC1\\B\188913a\43476f`c"},
-          Prekey {prekeyId = PrekeyId {keyId = 28}, prekeyKey = "\SUB"},
-          Prekey {prekeyId = PrekeyId {keyId = 20}, prekeyKey = "*\118953<3"},
-          Prekey {prekeyId = PrekeyId {keyId = 120}, prekeyKey = "\ENQ\SI\bIj\SI1\1019204SB\148243"},
-          Prekey {prekeyId = PrekeyId {keyId = 24}, prekeyKey = "\94360\ESC["},
-          Prekey {prekeyId = PrekeyId {keyId = 117}, prekeyKey = "\155001\171453"},
-          Prekey {prekeyId = PrekeyId {keyId = 11}, prekeyKey = "AclL\FS"},
-          Prekey {prekeyId = PrekeyId {keyId = 39}, prekeyKey = "i/\DC1\ENQK\DC2q\a"},
-          Prekey {prekeyId = PrekeyId {keyId = 97}, prekeyKey = "q\5620\DC2\5121\184478"},
-          Prekey {prekeyId = PrekeyId {keyId = 41}, prekeyKey = "3\n\DC2\SIYl@\SYN\984033n"},
-          Prekey {prekeyId = PrekeyId {keyId = 30}, prekeyKey = "*\1009686\ETX\1049715\SOH"},
-          Prekey {prekeyId = PrekeyId {keyId = 35}, prekeyKey = "\USZ';\1069360\58404v6\"\v\119840"},
-          Prekey {prekeyId = PrekeyId {keyId = 62}, prekeyKey = "\8496{w\SI\1059788\1021702{\137479\83435"}
-        ]
+    { updateBotPrekeyList = []
     }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnectionList_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnectionList_user.hs
index 94755e0685f..799afb99489 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnectionList_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnectionList_user.hs
@@ -24,7 +24,7 @@ import qualified Data.UUID as UUID (fromString)
 import Imports (Bool (False, True), Maybe (Just, Nothing), fromJust)
 import Wire.API.Connection
   ( Message (Message, messageText),
-    Relation (Accepted, Blocked, Cancelled, Ignored, Pending, Sent),
+    Relation (Accepted, Pending),
     UserConnection
       ( UserConnection,
         ucConvId,
@@ -42,10 +42,10 @@ testObject_UserConnectionList_user_1 =
   UserConnectionList
     { clConnections =
         [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
+            { ucFrom = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")),
+              ucTo = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")),
               ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T06:44:37.367Z")),
+              ucLastUpdate = fromJust (readUTCTimeMillis "1864-05-09T06:44:37.367Z"),
               ucMessage =
                 Just
                   ( Message
@@ -56,10 +56,10 @@ testObject_UserConnectionList_user_1 =
               ucConvId = Nothing
             },
           UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
+            { ucFrom = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")),
+              ucTo = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")),
               ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T00:43:52.049Z")),
+              ucLastUpdate = fromJust (readUTCTimeMillis "1864-05-09T00:43:52.049Z"),
               ucMessage =
                 Just
                   ( Message
@@ -68,48 +68,6 @@ testObject_UserConnectionList_user_1 =
                       }
                   ),
               ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T01:40:27.247Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "f7T.\983177mRM`F_\SI.\144465Z\SI\142229A~g}\3779c\"8\142788\NAKK\a z.6\DC3\1019820\151791\50367\b_\181934S%v{_"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T02:29:04.518Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "Wz\189323ONx\SIB_\176367t\USHu\r\1046423\fE\24890[\ETB\1106226&\1013399-\1093330rCcyQ\DC1*\1100505\US\1068463\"\"^\29996\ETB\DLE\187299[j\50732\4863e$`5\101087^\b\1055708\SYN\25418)<\GS\1085205\17195U\1088789d\ETB>R\1007\14028Cf\1101438\994536\181048<\a\FS\92678\173113ff..\NAKkY(\152791t\SOc.d\SYN4a\997289*\1091628*/\1052425<\39469i\nC2v\63426O\59258\NUL_N#Ryra\1090243\&7+\1071913axE\1100117\DC2Ofu\GSyt{\997364q\1032583\DLE\4186\995325G0Jgf\1015132\SI\bgiBbI\1098755\41799\CAN\68883J\57572dfge@\26601\n1P\1046052a\EOT\f\RS\SUBf+xa&\174355\SYN)\FS\1110001z\FS\SYN4'\189190p\94911L\ESC\1113365WR"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T07:26:54.689Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\159324(\142498=q\b\140958\1057874\987683\36938Gn\DLE473\STXe\1066278\990364\v\94856\999474*\177897?\CAN\149013\&1\"\fP\45177on\aY6?5k\SOH\b+\162517\73737\&5\1072245\&02g\1036051\22548C6Nt=6\83506=\151441^#\1089515\US!\v\RS3}T!\185346\1012136\SOH\SI\SOH\1006762\131362#LIZ}H\984014Cg3\48293H.+}\DC1\DELx:"
-                      }
-                  ),
-              ucConvId = Nothing
             }
         ],
       clHasMore = False
@@ -117,1343 +75,3 @@ testObject_UserConnectionList_user_1 =
 
 testObject_UserConnectionList_user_2 :: UserConnectionList
 testObject_UserConnectionList_user_2 = UserConnectionList {clConnections = [], clHasMore = True}
-
-testObject_UserConnectionList_user_3 :: UserConnectionList
-testObject_UserConnectionList_user_3 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-08T02:11:50.603Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "X\tS\66256\1107078\1011188@\175171\44202]\1069880\187983F\149763+\SO\78742_uq`Y\1015350G\EM'/\1039206!iE\159225\175697(\1068052\159524)19\STX\ACK7ns\bHJ\96593xM^\1045192\1024360oc\191311\1012582\"\ENQ ju}:\GS\173705A\169860\"\t\1046860\1009593\&1\20440.@\v\1085413\EOT\FS\1047324\b(X\NAK{\b\1009263:!\1034330\f|\SYNJg9\ETX6\44659_F[\50726<'\RS`2y\SYN\DC1i\14897\1058366\152300\b!Q\ACK\1022273\39186\NUL\1003141\1109082\1058204\997124/?r,|y\DC4\r\149501sj=\SUBn0\720\EMb\37946\CANPqrX\98266?w\ENQ\44914^O\1029932t?\1019028\154679E`\987484l&h+\13881eN\NAK\23509\1044981\&3!UGK\SUB\DC1i\\O\174453{\993206`?WC\13978\&5)\40762_+o\986780@R\1074648\fT%jp0e)\1111614x1\26517"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-10T18:09:42.397Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "&\SOH0\1071342:0{\1069512$t\43240j\188869\145502\DEL[E^\1010039\EOT\nT@qo&`L(SP\1067057\SIX\nA\t\1070255g e!h\999334y\\pQ\57566\DC2*)\1077039I\GSF\990841\NUL\92446YA\18144=H\1041712A\97462\1073385T%YYD\tj\31928C~S\1038705\DC4X\1082958\n=\188828"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_4 :: UserConnectionList
-testObject_UserConnectionList_user_4 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-08T10:45:56.744Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\1020726\&7\1094842 \51875m~\45229}\ENQ \1026039xo7{|\1081241\DLEQ^\994829\182853\ACK'r1-!j\996636\1111358LU\166604C\1022639\&9\1109990\ACK+@\DC3\SUB]\176912\1084563Z)\DEL\US\1009904\DLE\47790\1009804{\189061\1000513h'\SYN\99312U\ENQ`\83023,\DLE\120300\1012919&\49365\GSO\188796\f#\r!\GS{\t\EM\1040937l\1110399\&1[\DC3\EOT0\1049624oBa\1002117+I\CAN$\blL\190547:\12457\SYN\16393\DC1nb0\74228zq\156778\SYNo4:\nA\994985\1059331E\158130\46915\ETX\b\1038295\165049\139293zr60\1078809\40610\&64d_\EM<d\1079591XWtm\181612{\USl$\SOH\EOT\a9g\1026615\NAKu\DC2~2\SYN\SOOWO\1070029|\1102446\1011695k_SyVR\1010532\DC2\ACK4N|4+g\64432X\1060834A^\8651[\fT\1043735\NUL\DC3~D1U|m-\ETXKd\v\b\51568%\1073691\145362>\72421\1054663\ACK9LT<\DC4\33315Z\177\13705\32737-\1092490i5ge\CAN8\ETX\1069015\126221q\34710\&0\SO\DC4T4+\DC3\4633"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-08T09:59:06.024Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "E\SI\DELK\994235\188953l\96401\a\52326\46295\60583'\191254fBm\fT\SIL\150239\&7\169874\1012278\184629lE\FS\35763b^\r\152021)qs`R\917976\1073323\&2]b5k }\3942~\156110j\101026\SOmZ\159095~5\NUL2\995257\187515\NAKM\CAN0\986803/h\DC2.T9\DC1\50343[.i\GS,PV<\ACK\15606\"\EM=r\175239\1082552\&7SA%\51649\DC12E\53449yG\DC25Q\n\51279\21520VD<\STX$\NULl|\v\1103466!\36856$\51570|T@n\EM\"B\EOT\a\EMI\EOT\ETXj\1076852\58037m\ESC%y\GSe36\1019389\f\1028311fI|lt\SOH,\22216a\EOT\1084630i"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_5 :: UserConnectionList
-testObject_UserConnectionList_user_5 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T04:48:55.532Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\1000064so!\NUL-i\171299W:/Q.&\n\1097166z\SOS5\EOTp)?D#!\DLE\38530\r\1030435\1103377\1090128\1047559\DEL"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T04:06:01.784Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "0j\RS[#\1035280C\EM;}\1110566\78808\r\b\1101258\163465M\1040960%\1002498\NUL\1097061\1086628\fvi\1070767\125241m\US\EOT1YfdxIS\STXP\ACK>\ENQ|5c}n\1102612\NAKG\69688jm\995912&:xpJ]F{\EM\STX#\ESCp\29892v\1082524b\DC3~\991651\984608\1036862q\1067654\&4\1082391<\166677\a\EM\1073621n\DC3"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T00:03:25.908Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T12:10:46.357Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\175878\118917\38030B\USXtX\CANpf\1001639QU@\EOT$\170247LA\24174N_x\"\178375\GS`\DC3\CAN]l\1093246c#w\1020092kTn\15042*W'7\NAKR\nX\US>Ewvz3<\95413,A\US)\1039314}mL\178609\1114040\1074049\&4P+\74917j\v\aW0\64531P\54915\SUBS\142374\f\179810\1009958h\990950?\RSli7{\1020785\162795j\151580\DC4\r\74980\ENQ\DC39x-\993414c\ENQ\68675\ETXSLNu\983233,\GSQc\984851O7\DC4P\SUB\SO<\n\1008934)\DC13\155022d4T,#\DC4.\DC1@JF\989696\ENQiW\r#\NUL\CAN\1113290k\DLE\26007\1002959ajsL\"u\44986\99131\194978\1014367\&5v\148791\1097237W\1071539\1012568|4&9\10584\1063396\ACK\1016599$\1046395\&1\177797\1104771\DLE\DC1)^64\62900\173017y\59199h_R\1078499\DC1G\1010560Z\1033272\71098'\1006385\1093864\EM\GS\GS\b\b#"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T08:25:25.817Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T09:12:01.153Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T16:01:44.742Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T00:15:38.478Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "07\DC1\164007%g\CANlWU\1052133/\FS;l6\34221!r\36875\1002203\1055161\126245\183810Y%\FS]q0fk\1093981\ETX\184324\r\140804pah\DC3\34544Z\1083153'\SUBQ\190669\DC1\ETB\ENQ\148292+we\31387\DC4_Z&z\1070563!I\179225v\1105016\20766\DEL\1008649\SI>I[1\1095569y\1070030\161495\t\SUBR\"\989608\188373\1077799\rW\DLE\NAK\t\DC4\177531\128974\DC1 \SYN55b\984462\NUL\DC2`\1040715n\173593\DC4\DC2o\1011143$/:\990503:HzuX\187426\STX\DEL`4x\NAKU\EOT\38447.\DC4Q\NULk\SI/m*/\142569\17974\1050848)\GSD{a\1030978a\DC2\22504a\1085303r\NUL\46143"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T07:21:07.732Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "7\14846\DC4X\95425\1079442\ACK\US\1015640AtX\1093513\1000713\EM>\DC3\SOHxN=b\t>\1007874G\1111779E+Qhcc5\\=j\142274l'#\1045472\1025367\b"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T15:01:49.115Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\120021H\1114042,;\999358\60861\1049918V8C[<\f\986342\NAKK\40598\95034\180349\&5N\vG\1112515#!\SIFu%!\1017270\1095429R\FS\1097793$)\1059368\GS,\NAKV\43874k\SYN\\}~"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:47:40.390Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "b\DC3v\r?\v\DELZ\SUBZ\78052Y\DLEn4\DC1\SI%vE\173184p\ns\DC4\USq#\EMa\997760\USa-1 E\1074731\983101\156662\156680=\v\r\984101\133253u\33327F+\11077Gv\11520\DC1l!s\992060\190313X:q\FS\ETX\SUB\NAK(X\"y\ENQ\nxq\US}\GS\159825j\DLE\DC4h\DC2\150005\ESC8n}j-{eUY\ETB\6128pG,\DELx\DC4K9\25510\1039141\148442\SUB\STX\41583\6982 \NUL\185381\DC37]\43015_\DLE\ESC\7774\ETBH\RS3\165060\r\a\tzu\\F/\1098924\98233\t!\1087882G\187341L\DELk>\1009226\1005523\1108889\v8o{t\ETX\DC2\44837\13463L\FSTk_b\1024357\ACKP\v\12139/\SOH\1072087Z\t\n{@\EM\DC2\EM\USY\1004347L\NULF}*?\984171\fA\1074231E\RS\172397~V8TX.\985079\ACKL<\74849"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T02:21:31.150Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T11:13:33.637Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\SO_\147554\&6I1x\1076626\DC2\53441\146421\DC3P7H\1065494\141929u\SI^DZ\1052542\FSMMc\1021200Pi\1005635\1061590*D\1086192rRp\DEL\1031896[]#\174651\&1#\120740\NAK\ETX\168922\GSM\DC1/\tq\1048293M\13015/\57792\&8\1046668\v<\39070d9*\1096131vkjUr\1034271\51171ra\vCp"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T05:43:15.087Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T12:30:28.519Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T10:24:31.073Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "A\DC3'\STX\\\1083877\52570\b\b\DLE\DELl1mY.N\STX*\178322\&0E\131327@ n|nm!E(\US\DC4.\7097\DLEK\997293\1103782\&6i\174056\1047262?p\1039039\991594\CANB\"\1013113\EME\177988\50931\1047279\171923W\SI\FS\52437\987843\&0\153852\40202\t\RS\1015831& i;HsO}I\146662\RSwbJdVAvRvQ\SI\1014384|\SI?`z\b}\ACK\ETX\1085904\v\136068{\aB\t\1093744_?\1066649\t\9617F\STX5\1091613-XTXiuX:1\97652#\SUBt\723\94978\a\134573\157479.\1017009\EM\DLE\1000028S#iwv \SOH\34599L\1101835,\161329\n\DEL\1113078aU\175398^>\NAKU\US\1018898h\1060682o\STX2L\1061739[\136926\98823z\1043814\30382h&\GS"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T17:15:55.011Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "q\DC3\32010C@\1042776q\1036465/[l\"wK7Q\STX\1107323W= `sN\1085208zi\142637p\1093399\&6~\146466r/!\GS#g\t\11422!d\EOT\996226\ACK\biB>\ACKso\\o?`\19765\GSD\78041\1055257\133592\164164\161197e\ETB-GG\DC2\1106504\1073803\&0) NodP\46708\DC2\NAKx\128782\168001J\96942\&5\1090945\1041654o#@Rou\1086919#M2\EOTa6\137441\DC2\SYNS\178862=\ACK9\1061804\77890q39~\CAN7T8\164474\"\DLE\USe\1057174q=_ *#\1070349$=Iu7O$3\ESC\182322?yI\991436\&88\164465^\993334$\n?P\1104410>:/,\13280q|T\EM\n\19279*|\42322B\f:\62443\ESC*m3\29297\1047550')\171600a\DC3\GS5\22391`?\5230\DC2`b\98740\162027f<]\28935U5}b\45221\1081960v4\1043655Fs3\188795\EMlPoMU1<\GSc~\ETB\1012643O\1044586k,\SOH*\NAK:t\1036433k\142417hdn>C8"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T01:54:32.384Z")),
-              ucMessage = Just (Message {messageText = "C"}),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:12:52.624Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\n\RSW*M\r\"\185764\SOH\145407-~#\a[_bN{r1\EOT\39214\v\170987jX\54213D_\ETX|\1023557vh\1012747\1067378=\160714q\180140*h\ETX,g\1056625"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_6 :: UserConnectionList
-testObject_UserConnectionList_user_6 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T10:08:52.228Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "C\1107727\&6\EOTx\190050|\STX\1002373\78739,Y\EM!\EOTC,i\a\1038260\917909\&9\1085268\EM#\145209\ENQKD6zB\DC2\161152\989430\ACK\CAN.\GS\1059986\54625z\5302F\38490%\1019505\25767\10099Z3]\163471wv9\61682\1112374\ENQ\v\140366z')5y\36508/%P S\1004030\DC4\13879\\B\ETBt\93970\DELh\4897\ETXv\13349zQ\159003[\144310\\|bx\1092830\nr\\\57380%\RS\1065451\ETXq\1068824].\1113589d\1040756\ESC,WwI4>&q\990381jR\DC22<=f"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T09:47:23.081Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\1095433|\v\1052127\&2Q\DLEO\DC1rF\1081141^K\aU\DC3\1095810>B\149695`)\44487\92669\t.\1093025\&87|w\164779i\fY\DC1|(th#!w\ETB|J\RST]N1\6452\&3*C\1020662\DC2\140492U#D\no\EM\995284I)\RS\178388@>x\a\159536L\171762RUys\DC1\125038bF)\DC4\1013474\\i\36131\1014151\EOT\987228\994971Y5^\1108885C`\f\CAN^\16801\t*EL&bQjq\1101242c\169108\1020509{3\25636\40860\NAK2>2X~rw\1056229\167743 Z\1084092|\ACK\1036785\1004291\1041185}\r\988564_<kQ+\49258\&3_\US;\1057452\NULV\1007751\27895&6v\36487\a/\ESC\b T\f\997790\1001052T.g\137456ub\1098875K\30295\14770l!Q\29789\"\1014257K\1074902\185716p\ESCE\DC3\1032295I\f:\1015020\97539v\1052764w\STX\GS#%s-\181142\&1\1053959J\165728W[\166~}\NAK\1046179\v\ETB%\EOT\152955K\37461\66871\1057163\1070044\1111811\983270\DC1U%\147113\1089131\DC4\63068\1048964>e"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T13:20:55.672Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\\\16521>\1104678:w\SOH\144047\&0\1071809\ETB{\1024170\ETB:w\46784\CAN\139731L<\SUB\182831Q5\DC4\1102218\174648q\DC4\60110\66009I4@\167034\54317F\1095206>'q\1083855v\DC2z\EMF\61092\176061\1081861\DC3\GS@\SO\188908H{0\1057163]y\ETXE\STX9X6gWL\SO\"R/(`M[\1038661H\1000792~\SO\n1JZSjw\1104488od\94407u\1017121pEsXF:9\162588I{\50369b:\46937%\995662\SIM\1051346\ETB\DC39\CAN\180190d\t.}\99176_]=\1110273fEIaaKGI>\1064515\998582\DC3\83253\GS\vII)~\172177QJ|"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T20:42:08.294Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "-\132651\DC1Wxe$?\4123\NAK}\16538.\EM<v\1001092\ETB?\FS/'\187049C3\1008876\1046257\t\DC3\100450b\1061268-\SOoH\15729L\1111121s\FSzo@\1034291z}2\1031601\165634\1029534:\DLE0\54355\&6=\tm-@\SYN\NAK\1107672\STX\nT\GS1r\DC3f%%),s83\DC4H\93954:\DEL\"4\1097541\6791\169983\59513p\358\1093837\a]g\DC4\1046366\&5{#,9\1031967\&7#\t\143692r\bU\NAKfD\EOTB\1067214b\NAKe\167678\61752+de;>\1030980.l"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T03:40:59.296Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "G#tU\25280\984208\nl9T\"\39372\&4n.\13236V\EOT\183807\n/\1110282Y\EM\br821\SOXK\ESCN13dY\158786m\a(>6[\1018226!c*\1011466\994635\1113231\NUL5\1093436Z\b\ESCW\121124\DEL,W\1034365\DC4%\RSX\DC3\13973\ACKZ4B68\1031015\1080955\1107252\1063460i$\DC4\139850\ETX\188106K\46371^:)\10784D\62678\EOTW{|0\DC3g1\1099785cp\1000256u1q\120713j\DC4*hs\24930c8S\1091414yO1+\t\f\999061\1084615()\ENQ_$gJq\DC3\b\135974eXF\33427\NUL'B*\1000794:r\SYN8\12863\1019721Q\119933\DC1N\1090957T\990684+\RS\SO\17516\SYN\46340\175762>G\1032678\66582\48305\t\1040066O\1040819(\1065262\6129QvT*\RS\58598\&8\140707_D{8\ESC'N(b\23556PaH\94524#DY(/rV}\t<5\146924\1086975Q^\988386\998136w\1039254.\SYN\vh@\28654cHZ;\SI\a\71193O>~s\10589!\SUBa\1001082\998935_7<\1046685F\SOHVr"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T16:17:19.100Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\1059270J&\1058594[\ACKsk\af\a\t2\DC3hUx\46363\1060559\1701\169533\&8\1041589=\1068117\30078ozg\41643o\US.\25896\RS\49286{\NUL\166622<\ETX@\\\"\1079961\US\989420\162265%\27068^x\1082128#\28895\42377TQ\ESC1-3\ESC -\ACK;\SYNn\51937QS=\RSd\1031088g`+?\NAKA\a\SOv\182182\&9p7_?\FS'41K\159378y\v\1043835Is5*\1066772GZ\DC1\1048964\ETB\RS\40096)\DLE=\DC1\6715W\NUL\RS"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T19:50:29.653Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T20:32:08.864Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "x\1096332e\1010643\SUBEz\120309\&1$!\15283Yo\1030600J\65757Bb9\4465@[I@\USe\NUL\23020kksdr\EM-P\30623\22665j\165783\1066838C\STX\ESC\96325[wri\154327\"\60501v'\63842xH\1074589 \GS\NAKp\CANm\139708\ESC+%\1081427\NULq#\38415Zdd,\NAKuI\ACKs*\134712\DEL[3z\1032545\ACK\1110819hO7i\EM\DC2\167616\998660\1048344A1\EM=\1109112_\149008\t\USh\1083289#"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T08:00:02.922Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "@\98901\a\5130u\n[v\NAK\1001559\189426*l\CAN6!r@sb\ENQ\50290+\15831\58156C6R\1060713\GS\61263q8\FSA"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:34:54.989Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\EM\tG\1039336~\ENQV/U/\1074956\149557u\DC1J\1032001\"\RSw@.\1105902\1062762\bbV\142375\1054385\DC4X}se\1066803L\1031565\DC3\SUBK\154297\176212\SYNLG%\CAN/`#KD\1062811-\1070318m\DC2\984177\RSd\180412!\NULy\1057936BU\177019\&1\68244\42194Y\1003389u\GS\1026864\SUB4\1087240\19667\180438TaOS\1012290\&6\16026;\\\33053FCd\CAN[\DC3(\EOTv\83099%x6\165494O=\tF*\DEL9%Bu@\140073\92708\NUL\n\DC2#\NULb\FS\8258D*\9958\SYNR/\110991K\997588\94816r\163318%[\1072088!\NAK`\1012363qsH\98309\SI\20566#YgS#\78183d-S\1035366\38799f\STXx<Bs\32651q\138375\&4Q[cNs\DLE\992146+ZK\EOTnLG.(LX \DEL\1094542=}\96236\SUBt\129527Pz\ACKU\GS\b\EM#>\1105022\DC2|\SUB*\1022144E8\NAK\152628i7\34243{\ACK\RS\NUL@ \US\1074167r0&rpQ^\\\GS$+"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T05:35:16.125Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "&\1050348@2H\1070628F\SO\120054\ETBX\1021891-\US\SI\ETBW@\22202\172478?a*Al2\1055120\&4\146195"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T09:41:33.128Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "k}\SYN\1055801F\1094901<wc\159918\tb\a\STX*:\12423\SItQ\RSo$j'\GS1\1033425\44729\41694\1103026^'A\"Cy\r\19524PN!J\NAK\v\1020018\&8(\38990n\RSs\SOH[\1094632\1030458\ETBG\DELW\1012517\DEL}\171610\1041465\1065730.\1096266\ESCHS\42277(\189073&\23646?7}\SUBN\182293\1040004\1112991RC\52134H[i\ESC*:\EM?\146330\991482.\133597\32640sI_\STX\SOH\182729DUe7_\1086596*O\ETB\ETX\1008735^\1029810\1083461\53622\29912\&4N}\RS\vwbFT'F\\BaHM\1061890J\\(Rq\185312\189686\&2g|;\NAK\171839_J;\999599\SObw5uw\\^\33852\rx\SUB{mk\99103\146794H\100918\&4\1055880\12699\SI;W\1088983\16644\1017077h~\1106022\DC2}\1105946\1084332j-l\1082340\41021\n\1092711u+\ETX\988506U6\nA\1020134"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T22:36:15.880Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText = "\1054587LUx\EMVU>\150057n\985921|y\68643\169530\1068113g\983889\DLE\92884=\DC1G"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T11:52:37.732Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "I3\135077e\158503s3Od\ACK\EOT-\SYNg\34328\1041118[9s1\1106741\DC3HBGHymJ\1015832)f\vg!<da\DC25\SOHhv\SUBp\95785y6\ratxy\\$.E:\CAN\1065434\aF\1022362;>\EM\990568%ah\22316|\"\DC2g}\RS\1083407;\ACK\128569@faH\1080307\992993~\6356E\NUL[\1067994\SO\EOTZ"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T23:11:11.073Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "!|\168599\ETB\EM~\1047714\ETB8\37746\&1[u\1021200\NAK\58839\"@J\44393G\139447P.\1068880\45871\95788\167658u\1051023\&2f\100770=\12840\ETX]\70786\NAKu\"\159194S\185154Q\128488\EOTv\1088416\160578\173369\1097424b\NULN \171404\1052116\1081190\DELw\GS\1088472\DC4K\SYN(J\1009050\1077623y\54301\v+\STX\DLEZk\CAN\1109776e\100179L\159924T\STX\22437\v@k\1026823lV\160847\v\996035\SYN\1041033\RS`\119042\158129_"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T21:23:28.620Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T03:02:21.118Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T12:53:32.635Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-            }
-        ],
-      clHasMore = True
-    }
-
-testObject_UserConnectionList_user_7 :: UserConnectionList
-testObject_UserConnectionList_user_7 = UserConnectionList {clConnections = [], clHasMore = False}
-
-testObject_UserConnectionList_user_8 :: UserConnectionList
-testObject_UserConnectionList_user_8 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T01:16:45.156Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "PVR(Fb\1004499wp]\170943\DC1\126996nz\1049945`=>\1110825N\1009968.&\RSJ\SO!j\SO\\\SUB(q\DC4k:bP$a3\47725\38888\1055166\148233Y\1070604[\1028169v?\FS\188397\"\67373\70300!)p\r\1039997\152215\1095636*q|\ENQ+yQt2\135701\151326\CAN\1014042s\40170\1080034\DC4\98416\&0\SYN\1060713\169629R\1079319=\1073100;\139256\&6Fg~\SYN\999907IG2ij\1091860x\1012721\DC4\1114038\"9\1722\110867e\DC2\SUB\171063O'U#-E\995348'\13477P@+\"\32885\\\1043854\f\1035081Q\993733O\53183\38918d\\,d#\b\1048102~6\SI\11312\EM\b9#\1056960\FS}D\FS\1110667"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T09:34:26.091Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\SYNj+WQ\NAK\1090319Q+\1002343\DC4\30427\1063316QOA^~SV\99938k\DC10K\141752b\16546<\ETX\1090112dU\n\DC2|x\1080757\996064b\1022377H{\DC2\SI\SUB\74325\&3C\163679u\a\35964;e\ENQN\NULJI\ETB%*mq\"z\92336A\1006098em}\1050398_\1037864\SIKjj\1065234}eAL1\b\1058519\US\148795\ENQ\995146f\179980\DLEF>\DC3U\65185;\US\1083732\994238Ve1Nl\DLE?a\1019676\1109364@\59150\v\EM\CANngkMt\49564]#4\ACK\1099558\1103317|_\SI\EM\GSO8\51010\NUL3\\Z\44959\175567e$hN\DC1]I\DC3\fIo\GS\1100530c\1042086\RS\t&pX\96425aR\1074313\51138\34857\DELLC"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T23:56:03.881Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "o\ETX\trxo\EM[+kw\DC1-\1074291~ZDT%\DC3J\65224\&9D~\DC4\SYNhC,\145694`\\\1025848!i\ENQX*{\EOT\4123\GS\tL\RS\4204/\r\128684\1051702ji\DLE#\132831=\r\DC1\181436qH\985245{\989824\&2\148677]R\ESC\1061087\16931eJ\35949\95996_\40820a\1076642\GS/1*5WF\ETBN'\120921\\\FS1h=\DLEX\CAN[NiP\1065488!c<[6!WU\STX\1095329\14487\50895a\1074542D\987943\1084551zhcc_.c3\SO\999735\STXz\DC2\DEL\96170\"f\STX\RS\38327\188658\&61\8863W\\\a\48719M\21107sr<X&\1023867\60684%\STX\t\1049318N\SOH\127242iIwj\ENQ|\EOT\1087525\983209\99253\EMC~\\JT\vD\165828\1084476}9;\DC1o\rp\DC4u^]?+>v?{3w\a\EOTI\190375\1000953~lP\30757\SUB\1111250\a96\39393\SYNg"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T06:03:58.277Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_9 :: UserConnectionList
-testObject_UserConnectionList_user_9 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T05:18:43.747Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T22:10:45.987Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\f\SO9\987294\138584\r&\EOTT\182652\"j]6@i\16829+bc\SOY/\ACK\1058404BF@Q}'1\DC3\DELYP#Z\73105\983408\&43\164375]V\1025378s\SO(\23424zv6\DC2;\77914\&1\20071\\\NAK\DC4\61537\\\ESC^\4737\1087803P\191280^~\144282Y2b\179910.\reg'y?\1024797\994311&\39945\149192\SUB\39730+*7*#\GS\1065520\28645\&6\NAK\EOT\SOC\1093932\1056355\986125\SYN\64368\US\EOT\50983k\fM$T\tJAP K%E\187411o1\100886&\ETX\1089788\DC31\NUL\146767\138849_HBZDJdy\np|l9\1010092Ot\SYN[\1097917g\1023993A\154871\SO\SYN\57574\1088627sP\fk\1016869bd\\\ACKB\f`\14679\995206q\57567N\1074455V\DC1 \180544l\44329XL\t\SYN\1038872\173431KH\1107878l\ENQPm\FSQKVl\47170\1082113r\DC1Eo\74571i\NAK\181988\SOM9\ACK"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T04:21:58.696Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\fQvQ U:%B=PF\172530\173067\179872v\f\1073595M-I\FS01\1060999I\\\GS\1067460/Cz|l</\1085561\t\t\DLEY<W\b\r\1036282\1092010p\"u\42435\1046554o\185339\1101653\95500-\1056284\&3Vkx6\185238i<\SI\1026577\60415\28671p\137853\99382\1105150\&5m\DELO\1101197%j\SYN\147916.m\1069145d\1110463\177623NUD5\NAKa\ACK\GS#\DLEK\12185@C\171837.P\a\97368\1038202ql\NUL\vP\171831\1065968{\4260PfJ,R\985968\&9*h\1038989# \646\&4c\147632\1075171\NAK{{L67,\180965#-Ddhy=\1021823\rZ\1011632\68020\1091480A\CAN\DC2\187014D\ETBd\120911\&4~M\\k5\135454O\ETXZSk~'\NUL$\EMEt\1113137\1067956b\3795\154488"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T15:26:16.369Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T16:22:06.661Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_10 :: UserConnectionList
-testObject_UserConnectionList_user_10 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T21:59:02.193Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\EM\1012688\DLE~\173552:\993685O;B\DC2\1088447\50601g0J\70339\ESC\SOHmxB\"\EM\DC4G\ESC\133781\b:\1069669~\SYN\1082660\154527\SUB.oZmNI\1004166S\DC4t\ETB\CANT\FSP\ETBm{&\99016\20682\DC4S\b\38823\fWe\1023549fe\140331D\DEL\151004WCpp\73061\1109217(mW\4888db/{\DC3\8817\"6h\180681GYik\DC3\f<A7qf\1110076\1056303\121299\149816(5E\1009922\NULEu\r\"%\CAN\95392\DEL2\1049933.\153818\f>Mn7L\r\31090\" 7\1003294\1047612\&5l'\f\37811P\ENQ'\167604\42671\1062122N\ETBN\SI^"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T20:29:57.465Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\133075\150134H|\159625\98422d\172508F<eu\20165\97866XKc\1101039\v\185266\"1\83341>4u_H\DC4|\136921m\STX \37490\24295|\370\51285!^ \NAK"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T10:12:06.916Z")),
-              ucMessage = Just (Message {messageText = "\43836\30674\CAN\19343!{i4&nd+\r\n\DC2s0.&\12484k"}),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_11 :: UserConnectionList
-testObject_UserConnectionList_user_11 = UserConnectionList {clConnections = [], clHasMore = True}
-
-testObject_UserConnectionList_user_12 :: UserConnectionList
-testObject_UserConnectionList_user_12 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T21:34:11.432Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "k\1098630H\DC1G\1089355(*4w\160057B\US\995978\1074065|0\NUL\fb\a9\1025520R\STX\viC\1058003hmX\1076599-\52939=\1079816%<\989745\1013598R\985198\187458A_5@vV\111041\US\DC2'\160391\DC1\41067glKQ\v\"\36026.>+\vs$\USC\1022220uX4Z9\6332&\61884iS|\1082227$4FV:No\39644\SYN\1092639\FS\1001843R2yE6f\1003112j\t\1032148\131836I\ENQ\SI{"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T10:36:09.883Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\FSN\169889!N\DC2\32905d% X$d/>k\RS\vnH\n\181554j\1089490wj\94413\177791\ENQ~\173030\1035420 W\1015349#\153325'\fs2\ESCi\181714\147309\ACK\1076060v*-\21162\8549P\154039\&5\STX&Y\38928@\52277\SOH&o\1023521(\EM_:2-\RSW\"cQ\11172\987747\RSg,\SYNpY\DEL\n\DELY(Bl\2725#~k0\1113357\133662\ACKv\t\US\1085452cr"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T00:37:23.018Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            }
-        ],
-      clHasMore = True
-    }
-
-testObject_UserConnectionList_user_13 :: UserConnectionList
-testObject_UserConnectionList_user_13 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T12:28:33.117Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "H\1085827L\DC1]\n}F\DLE\DLE0\1023537\ACK\1088855\EM\1020483adWNy?\SOl){R\16938\59729\CAN9`\24558r\1036753SCMY=\194706DA\SUBeg\SI\EM\58376\ESC\51629\1060711\DELBN\1020062-\SUB\190625>,4{[\STX;DP\n\ENQd01# \ESC\1085236\DC1gF%\RS\1087133=\177456\DC2>lrO>\EOTtrz~<\r}g-\SUB#8\NAK\183740Q\ACK\26901e^\1005217>\1052237\&7\DC2\GS2=cB+j|L[E`\42081~vdxD\GSl?;\63450\EOTFl\f\1051205*\RS\51778 \1087164Q`\4711\b}\ETBMn.\829CVX(\1065683y\ETX\1092727`L#\DC2\NUL>(@3\20333\149171V\STX\180972'"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T00:04:09.041Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\DLE\ESC\CANbe\33068\1062179\26270A\120854\178381ZA\STX\9019\983277)\v0\vx\45983\DLEP\10177\ETX\DLE5\r\16709\SOHNq.\119529Bdm\SO,\vo\172725\1004103g\b\GS\\\1048257`[\137373x\1052823L[\22474E\142128\DEL\158828\1037208a\1017335?\1056638\DLE\EOT:\DEL[\147476.la\35556\DLE9\DC1@\1010585\DEL\25014\DLE\171098\SYN9>\145590\ENQv\CANbm7\1010003N.\SUB=\34097\SYN-\ETB\1052112\1007095':$P\188987]c:3(R\1113667\SO3h\96338\983477=\266*\NUL\1020101\ETBI\ESC*|}gD\13565w:\\\DLE{\49902\1075829\95251\aw|\ACK\1028158a}&q1)\a\fJ4\n\n\STX\1059207\995089\1012850\SUB\31672\52743{^\190651piuXo{jHa\13804;!$0 \USi\150219\36053\4668\"}.Q&\1094480+I|]h3Tt\SOg\SUB\DC2\f+\EM\f\1008424r}9uJ\1024142N(\1032865\vOz\1069114Y\1065451~/\1029239\b]"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T04:48:54.495Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "=m\1019673D\\0\163789\EOTJ*@\136719\DC2\fO$\SUB\65723I8w}\1218\75035T\188300!\1077414y\FS\1112157)M4A\ETX\DC1\8873+Bb&\144266.a\DEL\141139*\1006904F&[d\NULu\52476A3\151243|$8\52545w9%l\CAN3\t\14387z\"v\f9T\USqH]V\990194OH\\\14323/\153522bF\65602+\DELQ(@S\SUB?\984881b\ETBM~%\n\131132gG2\DC4 u\1077308\DLEX\\J\1042480;\rT-\1063862\RS\1004542u\b\168104y\1026741_\994437\GS\164387O\1047987\FS\SUB'/&\178636x\66293\12946\164141\&0\n\nm\f\EOT\DC4d\STX%\ACK\nl\DC3\FSPIW\\\"{Y\1084209\DC3\1062168\178553\6509\1019408=s+a\ETB?\1093446eh\NULy\1063071\EMl\n\1028548\GSM\b\181969#\ETB\139707\&22\SO\1072440\FSK\r>\98248]\1029169}v\151577 3\r\140430]\1019781,Ju'3Co\83166\1032444\&2\97422"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_14 :: UserConnectionList
-testObject_UserConnectionList_user_14 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T06:40:39.351Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T13:28:18.216Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\1022021N`CxL\1035271\STX\168128\&6}A\188075Ib7x\1033151|+t7H\1006717*$J\DC2\1017654\FS{ 9Q\DC4\FS~\v\STX?\1103196\100383\DC1\1097169Y\180957L1\989555%T\DC4P\NAK\23640o\1057845\DLE\bPB\30653|fy\1030751\ETB\CAN\95418\"\1092397\SUBci\RS\1047643\917569\1025757^%\61839\1334\2542\ACK\DC4s1w4a!5\127159eYUCb\DC1\127009\1057898A\NUL-~\1014027*l\DC2\f9iy\110622K1WG6\fV\nsg\ACK\NUL\1112135\1019440\DLE\n[\158865\1073237vh\1014465\63346qI\a/*+\50126\63797\SO0\1105418}E\STXII"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T03:34:36.808Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          ":0e\1011680\DC2t' \1017040\v\990953E3\ESChHM\27428\ACKw\DEL\989385\FSi\1054044:\DC4\39953,H\DC3\1042457\190434\163911\NAK\SOH\1094239b\996969\v\83116\984449\1038945\1111848Y\n\1093060-\EM\ETBU{ir+\1070229\CAN\ESC\b\50660\EOTrac\v\ESCo\DC4\177201\1004035I\1108143TI\DC3=H\DC2:q4NC\1044987\&9.Iy\r%\995783)\72804i\DLEv\987323u|\azQkm\1016981\50658\162947\131814Qr\GSnVd\STXEsb4\STX]\1083398k\95029\SUB\1033137G\1094533{\ACKmG\993963'g\1053135d\ESC9k\5125e\NULdT3\1676\1068186Q/\byH\135301\CANtU\996195;\1085096\1053891\94973\SUB\78578\1095502\95309\"R\DC2\998593\1053926S!d`!9\160183lq\a\ETX\61853X\62435bL$?K\1014570U\DEL\1017557\1107286Lt\n\64126^U/T\ESC51\\kwV_F1K \ETXp*1%)\998531D\172723m?\1045106\1022022u$|d7\SUB\1016526-\EOTu\47140"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T15:03:31.446Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T03:28:16.129Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "foi\DC4\US\136626=~\138729<\147840NLS@\1095654\&5\fP2\64806\60376@\1108319p\SUB\NAK\SYN \\X\EMo\10556\1058889KR\78671vi\1043408?\96504"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T06:45:16.969Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          " \DELY\1036396\DC1\vo\1008287\STXO\127854\FSM\994957\46159,_\120192\41318\1087604j\1105576V\156479\v\144892q\EM-D\ETBNk\189932\tL\1083571\1076916\"FI\137350BV)@o (zi1\1042284\137194\1048404\CAN\NAK]\1052698;<wr.\STXjC7\STX\DC3\1028402\94535{Z6g\NAKr3\1070725s]\1043955nDFv>3\30395\USgKf\vU\EM*\t\2285\DC1\r9\a\1020812\NAKLS\ETX\1074258&fUy\DELB\1097217\DELM\1010851q\1076411/-\188370\1083822\&3+?8B\1094472\n\1008266\987977\DLE>#a1\147487\&9\69849\1107933%@u5Z4MDCDzl\1101944\SIk\ACK)|\1083707!\1046597b\b4\143947u\fl`Jg\n\144747\SIK\"|"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T12:40:24.320Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T13:26:50.261Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "W\ENQ{;I\7155N\1004308SC+\135847c(\EOTA\CAN\159895\af*\190951\f\16948\1035017/G_\23776|A\1015337\13268\vVZ&\13626L\DLET\1001024u\1098272\&5I\SI[\1108454~\1081072\\\177159\171817Y\30197\b\1013525cI\1098882\DC3\1093803"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T18:21:03.201Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            }
-        ],
-      clHasMore = True
-    }
-
-testObject_UserConnectionList_user_15 :: UserConnectionList
-testObject_UserConnectionList_user_15 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T15:13:47.534Z")),
-              ucMessage = Nothing,
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:38:27.967Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "Q\ETX\ETBHy\142969>\GSZ{\US&9Z\1041885k\GS2\1007345\64380H\NAK\1047423/\SYN\174117)\1003692{b\1100600QG\185733c\1062118\139750\DC3Q!\SYN\STX\EM0\CAN\v!\ETBlT\1497\&05\vh\1105406\1099636\SI\1011080\21581wqo;\SOH>4rx\46201L\1063856c>F):I<\1035883'MC \GSX[\1097988\US\73014|\1032211-BQ]8W\nWp\CAN\163387Vg"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T19:11:48.008Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "|z |\SOH^\\\"{\RS*7\1046872\25934:Y\132810Eth\1112349%<!+!\EMF\992837\1004981\DC1\1079942\984980\DEL\SOH\23454\n\134005P{&D*$I\140590!]\69923\1083850\FSFz\NUL\1042276\DLEwN\r*\1089457\119923\1011579\1042529\&2&\STX2\37408\DC4#\ENQsw%\DC1\tHap9s\ETB\166232\r\61848[\n\1079925\72399x\ETBf\28827n\119631Fd:\1064921\&8\1091639\DLEX0\1016374\&5\185980Z\155624\DC2T[Khk0\DC2\SOH{)\990624hLA\175576B\to\a\1018478\SYNHG0J+^\US\SOH\ACKU\ACKvR\DLE\RSq\ETBC\US\1001622-\v\1003236r\RS\"\1103849\1106991\GSJ0J\EMD\SYN{d't\1058073_\1108001\NUL\1020728}\28550\NAKHn\1049290\985861\176719\1095126RxP8"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T05:37:11.962Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "[\989170(\vr\34066O'6znFZ\ETX\58038\SUBag\134677G\ESC0\139687\984765C=Nn\vM\SOm\1000255A|\ENQ\DLE!hhN\140292g\149052\US\1005429\66851\US9\174730i\1008247\&5\1093581\189652\&7\FS\DC2\f\12064wc:*2J\94010.\178269@g\ESC\CAN\161690B\28283\FSI\v5A\b}e2|9\n#U.9\ACK71\n\aiU\FSE\FSeU\1037846N;#Z*\1059022\22731\42025>?\1017385e\DC12RPJ\ESC_y\v\1057458\SI.\SOH\n\n\917543_6|t\DC3\127195^\50827\146196\155662Q=u\181415\SUB%;L\f0M\DC4|W\1016438\191017\1062762\b\ENQ\SUB\ETB\US\46740t\1050772QJ\ACK\USi\DC1+\147442#\1097339"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T11:33:27.281Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\138989?@V4\DELz\182487\1042251\1012614\DC1y\CAN\1054165\1008632\1010901\NAK\4311,\SUBqu6\3747\1057819U\186461\24780*\1016499\"\v\EM<fn\EM\SUB\1029050\1048680w?}-8}lnHp3\45737t_\152210\fu\\O\72811b\2097Y\1041921\STXiJEz\23685[q\169175+#\1034931\DC4k#y\58473\68447^6\177917\&6|\1984\&8a0y]p#\n\SUBXoK;/\1046222zT\1071466\1033792w\58913\166297I\1061063|\b\1013014\987942\28541"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T21:19:42.145Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\174702\DLEh\123641\"BTT82\ENQ\SYN\28500\&3i\f\134112w~<zY\143034a\1020017\1001854\176941=\180801\CAN4B|sz\DC3I%\1112309\US\168861\tL\DC2'\74973`_\EM\NUL\\\169643\SOZb\1095697\1036232\SOH \r\169450\&8\3793-(~\EOT\1086937 4\SYN9\129496\SOHrx\987677]\34109\1108630\31765WUG8"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:39:36.233Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\1025712a\1010520\1027993lJ\995051\50552\FS0XJl\13868-'BRU\118917J-^\1049380\ETX\1003769\&8\991224\22895\1109499\&9>z5F:\ENQ\100482B|\185825Tx\DLE]8=G(f\19248\162948.d'M\1031561(U\STXLf\1009847\EMMtw\ETBwS1^wBj\ETX86@\DLE~I\1111573\30763j\DC2e?\\\170026V{\11911P\ACK\8119\1001684\1056421\&36\189853\1016747)\1004934ro\131409\r-\47445zX-\STX\189402\&8qM.33@vXT\57415Q/7{\1057544e&\966`GN\ETBp9\DLE\1023842\188272([wW\997939\120900\ETB\SUB\DC26EL\59036t\168358-\1015832|\189627r\DC4-2H\2925\DC1RK\f\10775\SUB\1042937/\EOT\1073548',S\1088952\f4~\151575Hat[_o\SI->DS150\1112728\1005946\&7\US\38506\62493\&4N\ENQXJc"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T13:38:17.908Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\ESC4\ACK\1051828\97461d.\t\1074160\b\ESC\RS\ao\1071785#\rP\14263@o\151099\1050193{RM\1073620\141933\t8I\ACKZ\1052419j\\\fz\ETB52\46878\DC1\n[K^\RSQ\172515&\1110176u|M\US\180895\&2=2\SUBz+\1103593\SUBR<Q_\1019412\EM\162497xdd\163516\151906f\RS{\1064747\152672\1018106\1090398\NUL<`6wA\n\1067780\GS=a$\1017262\DC2\n\nz\a\988764Z\29095\48667"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            }
-        ],
-      clHasMore = True
-    }
-
-testObject_UserConnectionList_user_16 :: UserConnectionList
-testObject_UserConnectionList_user_16 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T05:58:16.368Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\70664d\1016618\&8\r\190175`N\1048899Y\1013329\98037%\ENQ\STX\ETX0\615<A^I7Zb?H?\1001465TU]\1072197\138893\176021:R\DC1p[\ESC\8266F\ETX\59296\&297\ENQ\94037\&4*25\EOT\fEc\DC1YWR*\SUBp\SYN7\ACK-\122897MHh\1103104z\1093592p<"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T11:05:42.209Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\31706]/]|\1048792\162426Y^\1031207x\148607\USN\48441\1099262\141289\DC4R\nE\STX\175721+3+\144449Ycd0b\1026064\&7dp_~U\DC1\DC4\STXK?\10432\78783f_\EOT_\15143Xrn\NUL\SOj'\STXr\1040998VOcq4\a\1088384\157370\1051504\135130s\ESC\ve\1097283\49624\v\1050443\1101780\1012628WP\FS\98965h7zO\52406\v\194642\rK\1051319\&1!\SYNq5\1099648\1061214\161507\ETBt<\"KY=\nUL%;7\21391K@\42041d\123150\985726\\U\1086756W\1093392O\a\NUL#\28289pI^B\\~\ETB\DC1|\SO"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:40:41.004Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "N\\\38858\SI\NAKV\\$\22604SLq\RS\113812\&1| \46524H*?C4\147955J\120221Q-\98363\ACK\1025002J\b\146184\164205&y\1010122V:f\nA\1030292\&3\996083|\DC1\SIkm\184599\1105885,\29991\NAKcr\SOz*\SO\993779\ACK"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            }
-        ],
-      clHasMore = True
-    }
-
-testObject_UserConnectionList_user_17 :: UserConnectionList
-testObject_UserConnectionList_user_17 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T13:02:33.244Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "MQ\ACK\ACK!\99562\1070114\72280\vwRu\ETX\32410r2\tuk\110709f\1035392\ESC\1047893\EOT7<t/]\16664Z\"Ye\1026030\1102115\"S.\1108304\STXY\1013005=nK.q\1046194ZsF\1108142/\58070Wo\t\b\DC3\DC3C\1102996\&1\4938\&8\SO3\ENQRHN\v`N/\36794Y.\ETX[o\SOHUVbQMH;\1014848 pU\DC1\EOT\31597\&2\152576\EOT\1048577h#\20370$\ESC\DC3\EMih_\38457z\SIn\173843\&8m\SYN\160021p\161810\r\STX!f\1026495\1073143n(\r"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T16:56:20.205Z")),
-              ucMessage = Just (Message {messageText = " {\30527r9C\1041864$\DLE\187048<\t\ESChR\DC1+\137777?"}),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T01:20:04.372Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\v\fM\1098609\"R\997647T>w:\"#sa5{Q\SI_\2529\171567Y|\9379\t\1061994^\RSR)q3V\ENQ\1087889rw\a\97862\1029017BU\152370\DEL\1015271aLo!\1057961\1017526(\FS\17402n\1087588\25665\1047452\44817?\RS\1096005{j\137733f\1082427\1076891\120967*\190138\FS^gfU\ESC:r"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T09:59:13.470Z")),
-              ucMessage = Just (Message {messageText = "\185149d\ESC\1020675Q\SUBn\a\96659wz\EM8Nb"}),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:52:36.952Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "0<jv\1051724\1069281\RS!\ETBx\997245\169697!HF\1111812\1029781\RS\10856HU\59823m\1061583\1150:e\GS\1014304h\37349V0\v\1050963;\1105645\DEL)\1082236(\1002119!Jy76n\44717H\137362\1102272?aMjJ\1030614*\SOH\29102h</\EOTl/\1101888\ETBj>i\SI@vt}]S'8B\41395*\ETB>\rK\a5$\47470]\aN|\DC16\63431g\EM\ENQ\1028896\1020089>@\t<-C\1026592\DC1::\1031263I\2409e\US<\RSu\1077304tam\fy*j\DC3I\100030"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T07:16:19.530Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "?\1031288kn\1060642)\992453FoZ<]\ENQ\NUL\STX\61662Cn\b[eF\9989Ar;\r\bO\991209\&8\1095832\DC1\STX).%\151001r,\fpt\DC2x\138592j\EMc\DC1\v\1000771)s\ACK\148575.a4S\f\1052702\1668\172290\fh&)MGv\126215\STX9a\DC1\57355h{QS4A`\1064463oBvmbrP\"/c\1102070\1027344}2\989471B\t\1017717FzX\f\143398\1031797,\997091y,G\149129s\fl\\\EM&\FS\n\FS\DC4\DC1:\48701\"\1057293\2839\DC4\DLE\ETB\1024536A**\DC3XSy\DC1f\US#\4142\vF\1096807[\1055891\44136\SUB\996589"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T16:26:01.827Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\b~|\1011779\GSZ-aE\CANc\USY>[4h{\54340\EMI\997834\&2+;\t\168841\993691\&3\134096\n\SI\ACK\136028\&6\78243O8\\a\n\1037507\998948\1094294\52846=\92320\&7m\ESCZt\989195\71912uj|\CANv\74636/eg\1010923\22878*\64866@\32648\n\DC1v\177781\US"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T21:57:41.050Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "=9\340(D tF>Bm\1040265F\v\178968m*d\NAK\DC4\bn\SOH\GSU6\DELm\20107\1061312&\SOHQ\179789\1064914\NULu9\EOT!\986008i{\1039167b\152033\FS)NV\20636g\SUB\EM\96218\DLE\4947(X\DEL\1111695\32398l\18870\40058\t6\NAK\993509"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T02:41:56.943Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "E\ETXwrEfC\1044288\1003000\1039947\DC2\983347--\988172!\1003170\162525/\1109545\ENQ\SO\1105578\1030840{!\DEL}`\187156c$y\FSW[\v\140779\1091720\1069136\SUB1xW\1048055'$2\"\SYN\ACK\1107887%\1111512_[\1068734uAhof\94670)\SYN?\1015696\48273\EM\bP\1113006\163053\1006962\n@\1102736\992129m\n\156819\&4\45878\139921\1071692o#\ACK\180723\&1\21510\1002846\21916|\136509\ETX8\988645\ETX\DC3\RS\ENQt*\96440\ENQG\1077130\146290q\CAN&\DC4\165642NZ4v\GSEu}\61932^~\1102663H\STX\SYN\f0#f@\SIX\EMd}\39215\ACKf\DC3Fy\NAKMC\EOT\SO:/Y\NUL\\\1061497*\DC1*\110812\60660>G#O\55169yGl8\159144\NUL\1036793\50784Y\64593B\RSb\SUB<fn\rvj\1059591\996918\1084009\USI\"\62047\&1\1100707,HW\SO\EM\121184Y\1051379\f:\CAN\139734c\\0C.\SIi!\189026\1048899\70178\32711\63694*/\ACK\179918Y&<k7,u\SUB\1035527ny[\1005094i"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T04:01:44.990Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_18 :: UserConnectionList
-testObject_UserConnectionList_user_18 = UserConnectionList {clConnections = [], clHasMore = True}
-
-testObject_UserConnectionList_user_19 :: UserConnectionList
-testObject_UserConnectionList_user_19 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000001"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T05:02:53.576Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\1044181\988575}\f_\98225rB_ib\1051+\41229\ESCWq\38772+dS;\FS\31404.\1046327\GS+\1025249\173434\bb\1036521i\RS&"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Pending,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T07:27:07.932Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "4%ofb?$M#8XH\1046186\SO|9\1083417J\DC3\1027748\60892\1054775\39048c\DEL\ENQ\47461w\37885\30097M\50366wR.\DC3\DC4~(p\1003679\v`\1112851\SO!\138010\GS\78787O/\182247B\GS\ACK<|v?c\1072588\NAK[D?\v\83526t?\t~q_?\NAK\DC2zU[H\1074378>\SI\54777D\1013841\NAK\SI\DEL72#\1107776\r3^**\ENQ\EM\a\163719,7\21067\r>\\\NAKQ+\1037102\r\1008612\50607r\ETX\141437^\16473\175822\SO\143812\ENQ]b\1097819CK\a\SI\1041437\998215[4k\63276\ESCpibKR\1094830\1098267IO\GS[\ETXds\1088893\CANN+@\\E5\1042229\ENQ$\STX\1105616#Z\STX\994642)\1049100E\1112695\1104256\ACK\SOWN\SOOT\13370\1028638G!<\8090\176360$"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T08:45:48.151Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "C\1102756\51705\&1\DC3(Iy,P\46788\1102840\161791\CAN\1070487^,+\1017869O\USzxjLy67\29859p\1101628\DLEv\92400\SYNL\146180'\EOTL\159515b\DC4&S\51275\1057035\1010799\159404K<oOk\1040965ad&\f\167621&?\182324\&7\RS<\983914.\1025195\11806\1034115R,\1014945\147030\1017226\EOTP?\NULHY[\1018588\1042150\1035037\1045897x\149249V,\1021385\1076560\180136R\SI0\1083705\SIg\1010438\139970:\SYN\v\DC3y,\DC1\1087717@\1047260K4,B\SI,\164600\f\19055E\1043231\DLE\GSk\CAN\"\59315\DEL)/\4973r\989734/J\ENQ\1060460O\155393\100856\&9UI\ENQL\1001671\143897\USq\1006356\DC4V\174321a\172727\SYN2\59686F{C,Rh\1023800"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000001"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T08:33:46.140Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "KI\SIF]\1014286>H\EOTg~\NAK\33243\187339M\ESCD\NAK=B`\DC40\1055429J\1093791H5\132504\992678)\28722R\63968\1065079 P\1021207\&4\rk\172221C7b\EM\14283x\27071M>\EMa\165696@\1097499\140298@\165046ZD\1093916\58047YM\161665(\159468\1095283\30760}2\DC1\1094031\132430r\10859\1021443\EOT\1069428zn\182131 4\USb:\SUB\DC1\RS\1022012\156821\ACK\49017<m\t\984207\&8L\171380\ETB\SOH\FS\1104934\FShx\13200\SUB\n2\95811\996931\DC1|@\SOHa9$K\SOH2\DELY\t8}G\1086187\&5!\1043862P\67631\1007005S\ETBCXc\53753\1048303\&1a\24780'\9314WI\ESCQ$\DC2\133846\984867\1088954e\1050603\1096841\1108375\DC1\1004408@)\9070C\STX\EM\SYN(aH[\5645\1079915x\ENQ~_\997085\&8+)\1090228K\t:\STX\DC3\1040469P\CAN\ENQ\21664l|y\EM\v\137766M\n)JK\DC1\DC4Z((\NAK\1098777\&7NYZa\FSxS3\DC14W\v*~\1070514gf {!\\YJ\"x"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Accepted,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T15:42:58.803Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\DC3\1041913\18893\DELO6wKea\141468\999928L\SUB \"|^\29801uC\1090290/M-c{~\179948\187813Xt\1079504\1067829\&5\STX\1018705\1013538)aGKe^X Fs\DLE\nP\16980Pi\\>\t\1002220\NAK\GSQ&\ENQ\ETX\39427\RS\138931\&2(9\t~\1040831\137528^\RSc\NULi\159996|_\DLEAG\1059935L!zk@\SI"
-                      }
-                  ),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucStatus = Cancelled,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T07:44:32.326Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "4\DC4\28777<[~\FS>]v-s\GS>Mp\190630@n\\8uUP\ACKMb-%fX0%\1065303o1\5352\b\152405i)\br\SYN[0;\DLE\DC1Cv\NAKL\NAK\1014877h/a5\36283N`d\1003392U{=$I\174468\&4\1016687.\DC3\EM\1025963N\1092454g\153731\68099\1016147"
-                      }
-                  ),
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000000000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T12:02:00.432Z")),
-              ucMessage =
-                Just
-                  ( Message
-                      { messageText =
-                          "\STX,C\ESCS\CANK'\ETB\CANg(9<\134453@\1060280l\US\EOT-A3\987924\29144Lh#\61925\1072862\4536\DC1\30769\137641LO\t\131401\1043868ty1\1027181\168252\42059\DC4\ETXn1\\\ESC\NULJ\12949v\DC2M\GS(\1051797r7\165949\169380\33795\186414\986306eu*n\1043756EMMB9#e\54432\ENQZwr\ETB\f\987156\SOtnE[I\1007950\8289@\989839\20674)_37S\CANo '\1082259,J\a\1019753\1038142|o\f1?A,f\aeI\STX\153937f\\\aS\DLEbZKl\19664U\181337\&1T\EOT\STX[=\1847\1027529\r)BO+=V3\1074095\1081936;*9\1044408kSJBHw\DELH\\qzp\v\172796M\FS\SI\FS\52184\US\173186mh?.\f%f\1083942V\EOT6gQ\SO\1090865g*7\140748*\74482\GS:\""
-                      }
-                  ),
-              ucConvId = Nothing
-            }
-        ],
-      clHasMore = False
-    }
-
-testObject_UserConnectionList_user_20 :: UserConnectionList
-testObject_UserConnectionList_user_20 =
-  UserConnectionList
-    { clConnections =
-        [ UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000000000001"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucStatus = Ignored,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T23:43:50.202Z")),
-              ucMessage = Just (Message {messageText = "s\t\1062978g'"}),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000000"))),
-              ucStatus = Blocked,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T15:11:43.015Z")),
-              ucMessage = Nothing,
-              ucConvId = Nothing
-            },
-          UserConnection
-            { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000000"))),
-              ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000"))),
-              ucStatus = Sent,
-              ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T15:40:02.929Z")),
-              ucMessage = Just (Message {messageText = "X'\EMb)\\\ESC\ESC9\1057698`\1111921n#\1086087Ki"}),
-              ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")))
-            }
-        ],
-      clHasMore = False
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnection_user.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnection_user.hs
index bc8ab49ba9e..a2131317acd 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnection_user.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Generated/UserConnection_user.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedLists #-}
-
 -- This file is part of the Wire Server implementation.
 --
 -- Copyright (C) 2021 Wire Swiss GmbH <opensource@wire.com>
@@ -24,17 +22,17 @@ import qualified Data.UUID as UUID (fromString)
 import Imports (Maybe (Just, Nothing), fromJust)
 import Wire.API.Connection
   ( Message (Message, messageText),
-    Relation (Accepted, Blocked, Cancelled, Ignored, Pending, Sent),
+    Relation (Cancelled, Pending),
     UserConnection (..),
   )
 
 testObject_UserConnection_user_1 :: UserConnection
 testObject_UserConnection_user_1 =
   UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000100000001"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000300000002"))),
+    { ucFrom = Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000100000001")),
+      ucTo = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000300000002")),
       ucStatus = Pending,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-07T21:52:21.955Z")),
+      ucLastUpdate = fromJust (readUTCTimeMillis "1864-05-07T21:52:21.955Z"),
       ucMessage = Nothing,
       ucConvId = Nothing
     }
@@ -42,10 +40,10 @@ testObject_UserConnection_user_1 =
 testObject_UserConnection_user_2 :: UserConnection
 testObject_UserConnection_user_2 =
   UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000000000004"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000001-0000-0003-0000-000100000000"))),
+    { ucFrom = Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000000000004")),
+      ucTo = Id (fromJust (UUID.fromString "00000001-0000-0003-0000-000100000000")),
       ucStatus = Cancelled,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-11T10:43:38.227Z")),
+      ucLastUpdate = fromJust (readUTCTimeMillis "1864-05-11T10:43:38.227Z"),
       ucMessage =
         Just
           ( Message
@@ -59,10 +57,10 @@ testObject_UserConnection_user_2 =
 testObject_UserConnection_user_3 :: UserConnection
 testObject_UserConnection_user_3 =
   UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000200000003"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000001"))),
+    { ucFrom = Id (fromJust (UUID.fromString "00000004-0000-0002-0000-000200000003")),
+      ucTo = Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000000000001")),
       ucStatus = Pending,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-07T19:25:59.201Z")),
+      ucLastUpdate = fromJust (readUTCTimeMillis "1864-05-07T19:25:59.201Z"),
       ucMessage =
         Just
           ( Message
@@ -76,258 +74,10 @@ testObject_UserConnection_user_3 =
 testObject_UserConnection_user_4 :: UserConnection
 testObject_UserConnection_user_4 =
   UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000300000001"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000400000001"))),
+    { ucFrom = Id (fromJust (UUID.fromString "00000004-0000-0000-0000-000300000001")),
+      ucTo = Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000400000001")),
       ucStatus = Cancelled,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-08T14:39:50.322Z")),
+      ucLastUpdate = fromJust (readUTCTimeMillis "1864-05-08T14:39:50.322Z"),
       ucMessage = Nothing,
       ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000200000000")))
     }
-
-testObject_UserConnection_user_5 :: UserConnection
-testObject_UserConnection_user_5 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000400000000"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000200000000"))),
-      ucStatus = Blocked,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-13T06:10:28.560Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "A\188888 \DC3$\1056679\NUL\RS$7%\SOH;\1027563^O\ACK!\95262\189636\&8\990383X\13407c+\12459=:dct\ACK"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000100000000")))
-    }
-
-testObject_UserConnection_user_6 :: UserConnection
-testObject_UserConnection_user_6 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000400000004"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0001-0000-000200000001"))),
-      ucStatus = Sent,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T12:04:01.926Z")),
-      ucMessage = Nothing,
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000003-0000-0003-0000-000200000001")))
-    }
-
-testObject_UserConnection_user_7 :: UserConnection
-testObject_UserConnection_user_7 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000100000003"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000400000002"))),
-      ucStatus = Pending,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-06T17:21:11.586Z")),
-      ucMessage = Nothing,
-      ucConvId = Nothing
-    }
-
-testObject_UserConnection_user_8 :: UserConnection
-testObject_UserConnection_user_8 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000000000003"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000200000001"))),
-      ucStatus = Accepted,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-07T21:27:56.433Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "\194824\986678\EM\185672|D8q(cueA\991797g}U\74308\\\1092763\&2\btR\DC3\1017950.t\36063>\GS\SOH\1041549\121406\1091087G\az\185883A\1028764\EOT\1070585\1104678@O<{\20817XE\GS?\1099881f\120354\155685\120480\1097338\EOT\STXM\DEL\55149T\1102748'"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000300000003")))
-    }
-
-testObject_UserConnection_user_9 :: UserConnection
-testObject_UserConnection_user_9 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000003-0000-0001-0000-000100000002"))),
-      ucStatus = Accepted,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-11T01:59:33.405Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "\1073946\36516 \1089607< /\1012911f\SYN4\1108720>\1062360\SUB!\NUL\1086550\SI\181852'\996807g\1041377Ak\STXHI\992631\DC23EJ'>n\SI\n\SO\n\ETX\665\1063331n\2329\120541\EM_\DC3d\EOT'C\vYF\8711)\NUL\"[}u%\30648qc\SOH/#)\1006871\1027535I`\GS\119587\&2*%!u:\ESC\1041800\NAK\FSH\136125f9/\1096599\128449B\1001125J<\1056108`[u\1016181\&7\152911N\a>\521\158287i\4184\v\ETB67\EM2r\RS\996654\RS\US\a\NUL8&Ae\SIK\1085789\1101619\1041753\99530\ENQ\ACK>iTu\186918\188290LrY\173368\154276\EOT~=a3Q\SO\&H\1099938\&5lN\NUL\EOTE\\\CAN\64888\b\27421\ACKFuJ1\145195\1038200I)L\1054744\r\DC4\147656;g\1093593\1088508^7\SYN\FS>(\45890\1084891\145257\159097b,9\DC2\177325+&4,\CAN&\a\NAK6A\177995jR0\1052988\&9M\SUB"
-              }
-          ),
-      ucConvId = Nothing
-    }
-
-testObject_UserConnection_user_10 :: UserConnection
-testObject_UserConnection_user_10 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000400000001"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000300000002"))),
-      ucStatus = Ignored,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T23:20:11.508Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "B{rg\b=_&\1024093\SYNn58\18354f`\RSj\1109808\2817L\ESC\GSN\NAK\34635G\DC1\SI\1048723(\NAK15My\21584rN1<\EOT\1039277Ro5\vA\DLEK\120139\EM\151540&\1008102\50056\NUL\ENQyf2p,\1031274\1094062]\USs'\1076202,\ETXG\29564\SUB\149048\1042592\nS\1109138U\127060m\NAK?vX\999879@.\ETBfr\159399h\SOH\177670\1064176Hq\999963&\1089697;?\EM"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000100000002")))
-    }
-
-testObject_UserConnection_user_11 :: UserConnection
-testObject_UserConnection_user_11 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000003-0000-0003-0000-000200000002"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000100000002"))),
-      ucStatus = Cancelled,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-06T01:03:59.594Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "h\1051816\DC1\185085HH\RS\EOT\1019294o\149471\65937T\DC3WR\EOTf\178380\NAKa\59133wJ#\NULbRBN\ETX\DEL\60125r:\988826L\FSmXu\46977R\NAKE\DLE\SOH\DC3\GS\ETX:A\1030522\1032822\185220#Ki\12091\119635\SO\1110240#s!y\DC3B"
-              }
-          ),
-      ucConvId = Nothing
-    }
-
-testObject_UserConnection_user_12 :: UserConnection
-testObject_UserConnection_user_12 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000400000000"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000400000000"))),
-      ucStatus = Sent,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-11T04:35:47.647Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "D\RSj\45864a\1092668F52t8 ;Jt\1058663\DC4\SO\SYNse\SIX\1002089\DELQ3\1050069m\STXw\SYN/e\97642sG\1074243\74602`\35540\ACK\1016307L;\1064910\1061941@;\35482\12629~\78343M\\\USI\NUL\1026796{;=d\SUB\NAKJw\DC1?\137976\CAN0Kl#D\175531W\\^\1049138\153027\SOHp\997672\ESC!n\SO<}\8367`>(\1000749\f]\1100371\nl^\US\3659\DEL\ACK\SOH\142182\&8M\SYN\b\FS \ETB\1003073-\"K:3\rE4`\120177\ETB\EM\984863\&0!^a\1094483\US8\1092660n\1077279\RS\1013154\165388Q\990365\EOTq\188521As\SI\1103654\DC2\DELqJ$r]\1104340 \vk%*\t \1055351s\ACK\\y)+$ \1006569$?1\US\DELQ\1087252\r\1072918M\149834\160560A`\96015[)pJ/\1012118\bcI\13595)*\191107\157231~s\DLE;\1044875$:w\EM\1110848\ETX\167891\1016014\DEL\ACKz\NUL4\122882A72obm^X\FS\1084097c"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000002-0000-0003-0000-000200000003")))
-    }
-
-testObject_UserConnection_user_13 :: UserConnection
-testObject_UserConnection_user_13 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0002-0000-000000000001"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0004-0000-000000000001"))),
-      ucStatus = Cancelled,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-09T14:20:36.319Z")),
-      ucMessage = Just (Message {messageText = "{\168289\EOTa\ETB\35015\1092855%"}),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000200000004")))
-    }
-
-testObject_UserConnection_user_14 :: UserConnection
-testObject_UserConnection_user_14 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0003-0000-000300000002"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000004-0000-0003-0000-000100000002"))),
-      ucStatus = Ignored,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-06T15:50:31.413Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "YI97f\177582\1090316P5ra;\DC2d\125130\1031258\"cp\blU\1090133\1095282+\SUBQ,tWuX\1101900\176614\1053952u\ETXh\b`p"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0003-0000-000300000003")))
-    }
-
-testObject_UserConnection_user_15 :: UserConnection
-testObject_UserConnection_user_15 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000001"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000400000003"))),
-      ucStatus = Ignored,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-08T01:23:07.786Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "ABA`\1105648\DC4\a\161279DUz1\ESCsztI\68488\137727\DEL%Y9s0a\FS\SYN\1033572#\DC3\1035580\1090107?6\1013669G?4\1070751g:n\DLE\NUL\992906\162531-\RS)0}w\DLE\1063599\fMQ\ETB\r\1063073\67668\NAKB\NUL\161940f>!P\RSt\SI\74757\136503\SOH?v$j2\SO\US\144761@\993024\bz\20343\60956\SOD\STX\DC4_?d\97745\46338>\144784\&2+\GSH\USiN2\1071976\74954\1081176\&7\DLE;\1060692\1090776nJlO%\RSa-\151524\f+\61109f\158867\ENQ\SO\"\54924z\f\176230w\186430\1054863S#mH|\1068008C\1080668S!\STX\no\RS\1034986K\t\CAN\DC1h"
-              }
-          ),
-      ucConvId = Nothing
-    }
-
-testObject_UserConnection_user_16 :: UserConnection
-testObject_UserConnection_user_16 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000200000002"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000000-0000-0004-0000-000200000000"))),
-      ucStatus = Cancelled,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-13T18:59:24.504Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "gZ9\ENQs-\ACKPu\DC3\ETByt\nD~\97072\SI\ar\1053572\172903q\166739^n\ESC*!\1081907C\1112059-)tm>7\FSc&\CAN)\186733\ETX\177450M\997742\&3\1007160xS\SUBRks\CAN\EMa\v\151355g\57713\49603\STX:A\1017614S38f*\1045521\1052407\63254\1094089\1064724_0w\"of;\ETX\65884\152974\1010820Yw\142146\US\187431\USYq\f\GS58\tO"
-              }
-          ),
-      ucConvId = Nothing
-    }
-
-testObject_UserConnection_user_17 :: UserConnection
-testObject_UserConnection_user_17 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000003-0000-0003-0000-000100000003"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000000"))),
-      ucStatus = Pending,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-08T23:56:52.951Z")),
-      ucMessage = Nothing,
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000003-0000-0004-0000-000300000000")))
-    }
-
-testObject_UserConnection_user_18 :: UserConnection
-testObject_UserConnection_user_18 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000000-0000-0003-0000-000100000001"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000003-0000-0002-0000-000300000003"))),
-      ucStatus = Cancelled,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-11T22:44:27.192Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "B\DC3:\"|\97044m?\DC2GA\ENQ/ n\SYN\1069097dz5\132085$'[$un\b{\vaK\b\GS\170798[\ENQ\996060\165773\989461\SUB\SYN\STX2_R\149935\96591\1092985P\1029686,\EM\1093608\FS!\995920'G\182421A \139308;p\121400\t\985347:\DC3j\176831\&4+\DC2+\ETX\194895wuBb\1087404*_\4944_[y=\ACK\1042791\64515\1087143\18031ly\143288ce=kaOy\f\164181>\US\66819|\52659!n6H\157652\24829F{M\154394i\\\44652;9q>?[\11262\DLE\n\r\SI\r|\"\1068128MxwjZ;^\1558A\1039463G;S\DC2uB\a(}_Z\18385\110843V'\STX#Aa\SUBM\1080726\GS\9719\&1_"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000400000000")))
-    }
-
-testObject_UserConnection_user_19 :: UserConnection
-testObject_UserConnection_user_19 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000001-0000-0003-0000-000300000000"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000003-0000-0002-0000-000000000002"))),
-      ucStatus = Accepted,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-04T10:25:12.601Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "g\182853\1108760\1056585\993432\151849\134553\1077980h\DLE\998328\SUB\166789\1064260I\150170\1084112O\1082101\26629L\ETBZfM*\ESC\n\1040416Q\EOTf\USX\1051398m{cf\SOZ\1035788\997310}EJ\SO/fi\163344]\171918W<L.pK9H\177871\SO4\1087974(\1056365\&7SO\r\1105429,N\fy\1053085\EOT\CAN\179331\DEL\r\1042176q\a\1040491\EOT\SYN\985201RPy5:I$d\1057843\&2w"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000002-0000-0002-0000-000100000000")))
-    }
-
-testObject_UserConnection_user_20 :: UserConnection
-testObject_UserConnection_user_20 =
-  UserConnection
-    { ucFrom = (Id (fromJust (UUID.fromString "00000003-0000-0003-0000-000200000004"))),
-      ucTo = (Id (fromJust (UUID.fromString "00000002-0000-0000-0000-000000000000"))),
-      ucStatus = Cancelled,
-      ucLastUpdate = (fromJust (readUTCTimeMillis "1864-05-12T04:26:30.406Z")),
-      ucMessage =
-        Just
-          ( Message
-              { messageText =
-                  "z@h\987054>\SI\998936`\US\r\SIB{sy\1102535\CAN\173513%\SO<\1002662)5SL\1050619\RS1\67401D\1063259\DC2d\3370,\1006997\NULSB6P\1063559Y\45085\153566\99660\31105\149405\DC3h\r@\31145d\"{i\"@=_\STX\n@\DC1L;oU~\STX`\tf\SOHNp\STX\46173(\ETX_\1047159S\DC1{e\1068612[\n\1091016a.?sq\GS\163218\12245\1039553\&4av2=\1048862\&4\51618\DC4%0\1039214\41227 9\1094194\DC2P\1005432\1097200\SYN4S\996693\1024956\52233y\DC40D1\1108505=2d\1072731\DC1|k\US\989599\62592\DEL\52613\1050002\RS4\983939w\SUBi.\1064004\74510=Su\1048545}\CAN\1003828\1059673{kg3(\1048808\30697"
-              }
-          ),
-      ucConvId = Just (Id (fromJust (UUID.fromString "00000000-0000-0002-0000-000000000004")))
-    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual.hs
index e13083c4dce..c5d09a6c73b 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual.hs
@@ -25,8 +25,10 @@ import Test.Wire.API.Golden.Manual.ClientCapabilityList
 import Test.Wire.API.Golden.Manual.ConvIdsPage
 import Test.Wire.API.Golden.Manual.ConversationCoverView
 import Test.Wire.API.Golden.Manual.ConversationPagingState
+import Test.Wire.API.Golden.Manual.ConversationsResponse
 import Test.Wire.API.Golden.Manual.FeatureConfigEvent
 import Test.Wire.API.Golden.Manual.GetPaginatedConversationIds
+import Test.Wire.API.Golden.Manual.ListConversationsV2
 import Test.Wire.API.Golden.Manual.QualifiedUserClientPrekeyMap
 import Test.Wire.API.Golden.Manual.UserClientPrekeyMap
 import Test.Wire.API.Golden.Manual.UserIdList
@@ -94,5 +96,10 @@ tests =
         testObjects
           [ (testObject_UserIdList_1, "testObject_UserIdList_1.json"),
             (testObject_UserIdList_2, "testObject_UserIdList_2.json")
-          ]
+          ],
+      testCase "ListConversationsV2" $
+        testObjects
+          [(testObject_ListConversationsV2_1, "testObject_ListConversationsV2_1.json")],
+      testCase "ConversationsResponse" $
+        testObjects [(testObject_ConversationsResponse_1, "testObject_ConversationsResponse_1.json")]
     ]
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ConversationsResponse.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ConversationsResponse.hs
new file mode 100644
index 00000000000..d4733ff41aa
--- /dev/null
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ConversationsResponse.hs
@@ -0,0 +1,103 @@
+module Test.Wire.API.Golden.Manual.ConversationsResponse
+  ( testObject_ConversationsResponse_1,
+  )
+where
+
+import Data.Domain
+import Data.Id (Id (Id))
+import Data.Misc
+import Data.Qualified
+import qualified Data.UUID as UUID
+import Imports
+import Wire.API.Conversation
+import Wire.API.Conversation.Role
+
+testObject_ConversationsResponse_1 :: ConversationsResponse
+testObject_ConversationsResponse_1 =
+  ConversationsResponse
+    { crFound = [conv1, conv2],
+      crNotFound =
+        [ Qualified (Id (fromJust (UUID.fromString "00000018-0000-0020-0000-000e00000002"))) (Domain "golden.example.com"),
+          Qualified (Id (fromJust (UUID.fromString "00000018-0000-0020-0000-111111111112"))) (Domain "golden2.example.com")
+        ],
+      crFailed =
+        [ Qualified (Id (fromJust (UUID.fromString "00000018-4444-0020-0000-000e00000002"))) (Domain "golden.example.com"),
+          Qualified (Id (fromJust (UUID.fromString "99999999-0000-0020-0000-111111111112"))) (Domain "golden3.example.com")
+        ]
+    }
+
+conv1 :: Conversation
+conv1 =
+  Conversation
+    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000001-0000-0000-0000-000000000000"))) (Domain "golden.example.com"),
+      cnvType = One2OneConv,
+      cnvCreator = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000200000001")),
+      cnvAccess = [],
+      cnvAccessRole = PrivateAccessRole,
+      cnvName = Just " 0",
+      cnvMembers =
+        ConvMembers
+          { cmSelf =
+              Member
+                { memId = Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000000")),
+                  memService = Nothing,
+                  memOtrMuted = True,
+                  memOtrMutedStatus = Nothing,
+                  memOtrMutedRef = Nothing,
+                  memOtrArchived = False,
+                  memOtrArchivedRef = Just "",
+                  memHidden = False,
+                  memHiddenRef = Just "",
+                  memConvRoleName = fromJust (parseRoleName "rhhdzf0j0njilixx0g0vzrp06b_5us")
+                },
+            cmOthers = []
+          },
+      cnvTeam = Just (Id (fromJust (UUID.fromString "00000001-0000-0001-0000-000100000002"))),
+      cnvMessageTimer = Nothing,
+      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = -2})
+    }
+
+conv2 :: Conversation
+conv2 =
+  Conversation
+    { cnvQualifiedId = Qualified (Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000000000002"))) (Domain "golden.example.com"),
+      cnvType = SelfConv,
+      cnvCreator = Id (fromJust (UUID.fromString "00000000-0000-0000-0000-000200000001")),
+      cnvAccess =
+        [ InviteAccess,
+          InviteAccess,
+          CodeAccess,
+          LinkAccess,
+          InviteAccess,
+          PrivateAccess,
+          LinkAccess,
+          CodeAccess,
+          CodeAccess,
+          LinkAccess,
+          PrivateAccess,
+          InviteAccess
+        ],
+      cnvAccessRole = NonActivatedAccessRole,
+      cnvName = Just "",
+      cnvMembers =
+        ConvMembers
+          { cmSelf =
+              Member
+                { memId = Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000100000001")),
+                  memService = Nothing,
+                  memOtrMuted = True,
+                  memOtrMutedStatus = Just (MutedStatus {fromMutedStatus = -1}),
+                  memOtrMutedRef = Nothing,
+                  memOtrArchived = False,
+                  memOtrArchivedRef = Nothing,
+                  memHidden = True,
+                  memHiddenRef = Just "",
+                  memConvRoleName =
+                    fromJust (parseRoleName "9b2d3thyqh4ptkwtq2n2v9qsni_ln1ca66et_z8dlhfs9oamp328knl3rj9kcj")
+                },
+            cmOthers = []
+          },
+      cnvTeam = Just (Id (fromJust (UUID.fromString "00000000-0000-0001-0000-000200000000"))),
+      cnvMessageTimer = Just (Ms {ms = 1319272593797015}),
+      cnvReceiptMode = Just (ReceiptMode {unReceiptMode = 2})
+    }
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ListConversations.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ListConversationsV2.hs
similarity index 53%
rename from libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ListConversations.hs
rename to libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ListConversationsV2.hs
index cb4580d6c2b..6cac2a29ca9 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ListConversations.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Manual/ListConversationsV2.hs
@@ -15,10 +15,21 @@
 -- You should have received a copy of the GNU Affero General Public License along
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 
-module Test.Wire.API.Golden.Manual.ListConversations where
+module Test.Wire.API.Golden.Manual.ListConversationsV2 where
 
+import Data.Domain (Domain (Domain))
+import Data.Id (Id (Id))
+import Data.Qualified (Qualified (Qualified))
+import Data.Range (unsafeRange)
+import qualified Data.UUID as UUID
 import Imports
-import Wire.API.Conversation (ListConversations (..))
+import Wire.API.Conversation (ListConversationsV2 (..))
 
-testObject_ListConversations_1 :: ListConversations
-testObject_ListConversations_1 = ListConversations Nothing Nothing Nothing
+testObject_ListConversationsV2_1 :: ListConversationsV2
+testObject_ListConversationsV2_1 =
+  ListConversationsV2
+    ( unsafeRange
+        [ Qualified (Id (fromJust (UUID.fromString "00000018-0000-0020-0000-000e00000002"))) (Domain "domain.example.com"),
+          Qualified (Id (fromJust (UUID.fromString "00000018-0000-0020-0000-111111111112"))) (Domain "domain2.example.com")
+        ]
+    )
diff --git a/libs/wire-api/test/unit/Test/Wire/API/Golden/Runner.hs b/libs/wire-api/test/unit/Test/Wire/API/Golden/Runner.hs
index da5d0f79d5a..13e2f2c5ed2 100644
--- a/libs/wire-api/test/unit/Test/Wire/API/Golden/Runner.hs
+++ b/libs/wire-api/test/unit/Test/Wire/API/Golden/Runner.hs
@@ -19,12 +19,14 @@ module Test.Wire.API.Golden.Runner
   ( testObjects,
     protoTestObjects,
     testFromJSONFailure,
+    testFromJSONFailureWithMsg,
+    testFromJSONObject,
     testFromJSONObjects,
   )
 where
 
 import Data.Aeson
-import Data.Aeson.Encode.Pretty (encodePretty)
+import Data.Aeson.Encode.Pretty (Config (..), defConfig, encodePretty')
 import qualified Data.ByteString as ByteString
 import qualified Data.ByteString.Lazy as LBS
 import Data.ProtoLens.Encoding (decodeMessage, encodeMessage)
@@ -45,7 +47,7 @@ testObjects objs = do
 testObject :: forall a. (Typeable a, ToJSON a, FromJSON a, Eq a, Show a) => a -> FilePath -> IO Bool
 testObject obj path = do
   let actualValue = toJSON obj :: Value
-      actualJson = encodePretty actualValue
+      actualJson = encodePretty' config actualValue
       dir = "test/golden"
       fullPath = dir <> "/" <> path
   createDirectoryIfMissing True dir
@@ -63,6 +65,8 @@ testObject obj path = do
     (fromJSON actualValue)
 
   pure exists
+  where
+    config = defConfig {confCompare = compare, confTrailingNewline = True}
 
 protoTestObjects ::
   forall m a.
@@ -102,7 +106,7 @@ protoTestObject obj path = do
 
   pure exists
 
-testFromJSONObjects :: forall a. (Typeable a, ToJSON a, FromJSON a, Eq a, Show a) => [(a, FilePath)] -> IO ()
+testFromJSONObjects :: forall a. (Typeable a, FromJSON a, Eq a, Show a) => [(a, FilePath)] -> IO ()
 testFromJSONObjects = traverse_ (uncurry testFromJSONObject)
 
 testFromJSONObject :: forall a. (Typeable a, FromJSON a, Eq a, Show a) => a -> FilePath -> IO ()
@@ -113,13 +117,27 @@ testFromJSONObject expected path = do
   assertEqual (show (typeRep @a) <> ": FromJSON of " <> path <> " should match object") (Right expected) parsed
 
 testFromJSONFailure :: forall a. (Typeable a, FromJSON a, Show a) => FilePath -> IO ()
-testFromJSONFailure path = do
+testFromJSONFailure = testFromJSONFailureWithMsg @a Nothing
+
+testFromJSONFailureWithMsg :: forall a. (Typeable a, FromJSON a, Show a) => Maybe String -> FilePath -> IO ()
+testFromJSONFailureWithMsg msg path = do
   let dir = "test/golden/fromJSON"
       fullPath = dir <> "/" <> path
   parsed <- eitherDecodeFileStrict @a fullPath
   case parsed of
-    Right x -> assertFailure $ show (typeRep @a) <> ": FromJSON of " <> path <> ": expected failure, got " <> show x
-    Left _ -> pure ()
+    Right x -> assertFailure $ failurePrefix <> ": expected failure, got " <> show x
+    Left err -> case msg of
+      Nothing -> pure ()
+      Just m ->
+        assertBool
+          ( failurePrefix <> " had a wrong failure: "
+              <> show m
+              <> " is not contained in "
+              <> show err
+          )
+          (m `isSuffixOf` err)
+  where
+    failurePrefix = show (typeRep @a) <> ": FromJSON of " <> path
 
 assertRight :: Show a => Either a b -> IO b
 assertRight =
diff --git a/libs/wire-api/wire-api.cabal b/libs/wire-api/wire-api.cabal
index a70062305e8..dfa774db991 100644
--- a/libs/wire-api/wire-api.cabal
+++ b/libs/wire-api/wire-api.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 2e4bca56fcdff432834ff4ef0e7678b73cafc509219dd2b1b0f6308dca6a2588
+-- hash: efca28ca2d2ca3ccfcaf3b543293e01d05d18802dd38283d7658ec50939231d9
 
 name:           wire-api
 version:        0.1.0
@@ -148,6 +148,7 @@ library
     , servant-multipart
     , servant-server
     , servant-swagger
+    , singletons
     , sop-core
     , string-conversions
     , swagger >=0.1
@@ -401,10 +402,11 @@ test-suite wire-api-tests
       Test.Wire.API.Golden.Manual.ClientCapabilityList
       Test.Wire.API.Golden.Manual.ConversationCoverView
       Test.Wire.API.Golden.Manual.ConversationPagingState
+      Test.Wire.API.Golden.Manual.ConversationsResponse
       Test.Wire.API.Golden.Manual.ConvIdsPage
       Test.Wire.API.Golden.Manual.FeatureConfigEvent
       Test.Wire.API.Golden.Manual.GetPaginatedConversationIds
-      Test.Wire.API.Golden.Manual.ListConversations
+      Test.Wire.API.Golden.Manual.ListConversationsV2
       Test.Wire.API.Golden.Manual.QualifiedUserClientPrekeyMap
       Test.Wire.API.Golden.Manual.UserClientPrekeyMap
       Test.Wire.API.Golden.Manual.UserIdList
diff --git a/services/brig/src/Brig/API/Federation.hs b/services/brig/src/Brig/API/Federation.hs
index 017d0be1537..455a606903e 100644
--- a/services/brig/src/Brig/API/Federation.hs
+++ b/services/brig/src/Brig/API/Federation.hs
@@ -100,9 +100,3 @@ searchUsers (SearchRequest searchTerm) = do
 
 getUserClients :: GetUserClients -> Handler (UserMap (Set PubClient))
 getUserClients (GetUserClients uids) = API.lookupLocalPubClientsBulk uids !>> clientError
-
--- FUTUREWORK(federation): currently these API types make use of the same types in the
--- federation server-server API than the client-server API does. E.g.
--- SearchResult Contact, or UserProfile.  This means changing these types in
--- federation or in the client-server API without changing them on the other
--- side may be tricky. Should new types be introduced for that flexibility?
diff --git a/services/brig/src/Brig/API/Public.hs b/services/brig/src/Brig/API/Public.hs
index e5cb99a9088..5db00dda25e 100644
--- a/services/brig/src/Brig/API/Public.hs
+++ b/services/brig/src/Brig/API/Public.hs
@@ -977,7 +977,6 @@ listUsersByIdsOrHandles self q = do
     getIds :: [Handle] -> Handler [Qualified UserId]
     getIds localHandles = do
       localUsers <- catMaybes <$> traverse (lift . API.lookupHandle) localHandles
-      -- FUTUREWORK(federation, #1268): resolve qualified handles, too
       domain <- viewFederationDomain
       pure $ map (`Qualified` domain) localUsers
     byIds :: [Qualified UserId] -> Handler [Public.UserProfile]
diff --git a/services/brig/src/Brig/Federation/Client.hs b/services/brig/src/Brig/Federation/Client.hs
index ce9d787f2cd..9ae8b86c226 100644
--- a/services/brig/src/Brig/Federation/Client.hs
+++ b/services/brig/src/Brig/Federation/Client.hs
@@ -18,6 +18,7 @@
 -- You should have received a copy of the GNU Affero General Public License along
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 
+-- FUTUREWORK: Remove this module all together.
 module Brig.Federation.Client where
 
 import Brig.App (AppIO)
@@ -74,10 +75,6 @@ claimMultiPrekeyBundle domain uc = do
   Log.info $ Log.msg @Text "Brig-federation: claiming remote multi-user prekey bundle"
   executeFederated domain $ FederatedBrig.claimMultiPrekeyBundle clientRoutes uc
 
--- FUTUREWORK(federation): rework error handling and FUTUREWORK from getUserHandleInfo and search:
---       decoding error should not throw a 404 most likely
---       and non-200, non-404 should also not become 404s. Looks like some tests are missing and
---       https://wearezeta.atlassian.net/browse/SQCORE-491 is not quite done yet.
 searchUsers :: Domain -> SearchRequest -> FederationAppIO (Public.SearchResult Public.Contact)
 searchUsers domain searchTerm = do
   Log.warn $ Log.msg $ T.pack "Brig-federation: search call on remote backend"
diff --git a/services/brig/test/integration/Federation/End2end.hs b/services/brig/test/integration/Federation/End2end.hs
index ad66dad6c99..39961ea2478 100644
--- a/services/brig/test/integration/Federation/End2end.hs
+++ b/services/brig/test/integration/Federation/End2end.hs
@@ -67,6 +67,8 @@ import Wire.API.User.Client
 -- - Remote discovery succeeds but server doesn't exist
 -- - Remote federator fails to respond in many ways (protocol error, timeout, etc.)
 -- - SRV record has two servers but higher priority one always fails
+--
+-- See https://wearezeta.atlassian.net/browse/SQCORE-914
 spec ::
   BrigOpts.Opts ->
   Manager ->
@@ -396,10 +398,6 @@ testListUserClients brig1 brig2 = do
       actual = responseJsonUnsafe resp
   liftIO $ Set.fromList actual @?= Set.fromList expected
 
--- FUTUREWORK: check the happy path case as implementation of these things progresses:
---  - conversation can be queried and shows members (galley1)
---  - conversation can be queried and shows members (galley2 via qualified get conversation endpoint)
---
 testListConversations :: Brig -> Brig -> Galley -> Galley -> Http ()
 testListConversations brig1 brig2 galley1 galley2 = do
   alice <- randomUser brig1
diff --git a/services/federator/src/Federator/Discovery.hs b/services/federator/src/Federator/Discovery.hs
index 3d90175418c..2123539ccab 100644
--- a/services/federator/src/Federator/Discovery.hs
+++ b/services/federator/src/Federator/Discovery.hs
@@ -66,6 +66,7 @@ runFederatorDiscovery = interpret $ \case
   where
     -- FUTUREWORK(federation): This string conversion is wrong, we should encode
     -- this using IDNA encoding or expect domain to be bytestring everywhere
+    -- (https://wearezeta.atlassian.net/browse/SQCORE-912)
     domainSrv d = cs $ "_wire-server-federator._tcp." <> domainText d
 
 lookupDomainByDNS :: Members '[DNSLookup, TinyLog] r => ByteString -> Sem r (Either LookupError (NonEmpty SrvTarget))
diff --git a/services/federator/src/Federator/ExternalServer.hs b/services/federator/src/Federator/ExternalServer.hs
index 40039d2b37c..139904a1447 100644
--- a/services/federator/src/Federator/ExternalServer.hs
+++ b/services/federator/src/Federator/ExternalServer.hs
@@ -55,7 +55,7 @@ import Wire.Network.DNS.Effect as Polysemy
 
 -- FUTUREWORK(federation): Versioning of the federation API. See
 -- https://higherkindness.io/mu-haskell/registry/ for some mu-haskell support
--- for versioning schemas here.
+-- for versioning schemas here. See https://wearezeta.atlassian.net/browse/SQCORE-883.
 
 -- https://wearezeta.atlassian.net/wiki/spaces/CORE/pages/224166764/Limiting+access+to+federation+endpoints
 callLocal ::
diff --git a/services/federator/src/Federator/Remote.hs b/services/federator/src/Federator/Remote.hs
index f61595350b1..13ea7d5c7cf 100644
--- a/services/federator/src/Federator/Remote.hs
+++ b/services/federator/src/Federator/Remote.hs
@@ -33,7 +33,7 @@ import Data.Domain (Domain, domainText)
 import Data.String.Conversions (cs)
 import qualified Data.X509 as X509
 import qualified Data.X509.Validation as X509
-import Federator.Discovery (DiscoverFederator, LookupError, discoverFederator)
+import Federator.Discovery
 import Federator.Env (TLSSettings, caStore, creds)
 import Federator.Options
 import Federator.Validation
@@ -66,31 +66,30 @@ data Remote m a where
 makeSem ''Remote
 
 interpretRemote ::
-  (Members [Embed IO, DiscoverFederator, TinyLog, Polysemy.Reader RunSettings, Polysemy.Reader TLSSettings] r) =>
+  Members
+    '[ Embed IO,
+       DiscoverFederator,
+       TinyLog,
+       Polysemy.Reader RunSettings,
+       Polysemy.Reader TLSSettings
+     ]
+    r =>
   Sem (Remote ': r) a ->
   Sem r a
 interpretRemote = interpret $ \case
-  DiscoverAndCall ValidatedFederatedRequest {..} -> do
-    eitherTarget <- discoverFederator vDomain
-    case eitherTarget of
-      Left err -> do
-        Log.debug $
-          Log.msg ("Failed to find remote federator" :: ByteString)
-            . Log.field "domain" (domainText vDomain)
-            . Log.field "error" (show err)
-        pure $ Left (RemoteErrorDiscoveryFailure vDomain err)
-      Right target -> do
-        eitherClient <- mkGrpcClient target
-        case eitherClient of
-          Right client ->
-            Right <$> callInward client vRequest
-          Left err -> pure $ Left err
+  DiscoverAndCall ValidatedFederatedRequest {..} -> Polysemy.runError . logRemoteErrors $ do
+    target <-
+      Polysemy.mapError (RemoteErrorDiscoveryFailure vDomain) $
+        discoverFederatorWithError vDomain
+    client <- mkGrpcClient target
+    callInward client vRequest
 
 callInward :: MonadIO m => GrpcClient -> Request -> m (GRpcReply InwardResponse)
 callInward client request =
   liftIO $ gRpcCall @'MsgProtoBuf @Inward @"Inward" @"call" client request
 
 -- FUTUREWORK: get review on blessed ciphers
+-- (https://wearezeta.atlassian.net/browse/SQCORE-910)
 blessedCiphers :: [Cipher]
 blessedCiphers =
   [ TLS.cipher_TLS13_AES128CCM8_SHA256,
@@ -112,17 +111,20 @@ blessedCiphers =
 -- hooks. This might involve forking http2-client: https://github.com/lucasdicioccio/http2-client/issues/76
 -- FUTUREWORK(federation): Use openssl
 --   See also https://github.com/lucasdicioccio/http2-client/issues/76
--- FUTUREWORK(federation): Cache this client and use it for many requests
+-- FUTUREWORK(federation): Cache this client and use it for many requests (https://wearezeta.atlassian.net/browse/SQCORE-901)
 mkGrpcClient ::
-  Members '[Embed IO, TinyLog, Polysemy.Reader TLSSettings] r =>
+  Members
+    '[ Embed IO,
+       Polysemy.Error RemoteError,
+       Polysemy.Reader TLSSettings
+     ]
+    r =>
   SrvTarget ->
-  Sem r (Either RemoteError GrpcClient)
-mkGrpcClient target@(SrvTarget host port) = logAndReturn target $ do
+  Sem r GrpcClient
+mkGrpcClient target@(SrvTarget host port) = do
   -- grpcClientConfigSimple using TLS is INSECURE and IGNORES any certificates
   -- See https://github.com/haskell-grpc-native/http2-grpc-haskell/issues/47
   --
-  -- FUTUREWORK: load client certificate and client key from disk
-  -- and use it when making a request
   let cfg = grpcClientConfigSimple (cs host) (fromInteger $ toInteger port) True
 
   settings <- Polysemy.ask
@@ -151,16 +153,24 @@ mkGrpcClient target@(SrvTarget host port) = logAndReturn target $ do
     . Polysemy.fromEither
     =<< Polysemy.fromExceptionVia (RemoteErrorTLSException target) (createGrpcClient cfg')
 
-logAndReturn :: Members '[TinyLog] r => SrvTarget -> Sem (Polysemy.Error RemoteError ': r) a -> Sem r (Either RemoteError a)
-logAndReturn (SrvTarget host port) action = do
-  eitherClient <- Polysemy.runError action
-  case eitherClient of
-    Left err -> do
-      Log.debug $
-        Log.msg ("Failed to connect to remote federator" :: ByteString)
-          . Log.field "host" host
-          . Log.field "port" port
-          . Log.field "error" (show err)
-      pure ()
-    _ -> pure ()
-  pure eitherClient
+logRemoteErrors ::
+  Members '[Polysemy.Error RemoteError, TinyLog] r =>
+  Sem r x ->
+  Sem r x
+logRemoteErrors action = Polysemy.catch action $ \err -> do
+  Log.debug $
+    Log.msg ("Failed to connect to remote federator" :: ByteString)
+      . addFields err
+  Polysemy.throw err
+  where
+    addFields (RemoteErrorDiscoveryFailure domain err) =
+      Log.field "domain" (domainText domain)
+        . Log.field "error" (show err)
+    addFields (RemoteErrorClientFailure (SrvTarget host port) err) =
+      Log.field "host" host
+        . Log.field "port" port
+        . Log.field "error" (show err)
+    addFields (RemoteErrorTLSException (SrvTarget host port) err) =
+      Log.field "host" host
+        . Log.field "port" port
+        . Log.field "error" (show err)
diff --git a/services/federator/src/Federator/Run.hs b/services/federator/src/Federator/Run.hs
index 5f3c52db448..ddae51d8f1f 100644
--- a/services/federator/src/Federator/Run.hs
+++ b/services/federator/src/Federator/Run.hs
@@ -66,7 +66,7 @@ import qualified Wire.Network.DNS.Helper as DNS
 -- (this probably requires using HTTP. A Servant API could be used; and the
 -- internal grpc server converted to a WAI application, and the grpc application be
 -- "merged" using Servant's 'Raw' type (like in 'brig') with servant's http
--- endpoints and exposed on the same port.
+-- endpoints and exposed on the same port. See https://wearezeta.atlassian.net/browse/SQCORE-911.
 run :: Opts -> IO ()
 run opts = do
   let resolvConf = mkResolvConf (optSettings opts) DNS.defaultResolvConf
diff --git a/services/federator/test/integration/Test/Federator/IngressSpec.hs b/services/federator/test/integration/Test/Federator/IngressSpec.hs
index 36cff85675a..5d0fe918451 100644
--- a/services/federator/test/integration/Test/Federator/IngressSpec.hs
+++ b/services/federator/test/integration/Test/Federator/IngressSpec.hs
@@ -29,12 +29,13 @@ import qualified Data.X509 as X509
 import qualified Data.X509.Validation as X509
 import Federator.Env (caStore)
 import Federator.Options
-import Federator.Remote (blessedCiphers, mkGrpcClient)
+import Federator.Remote (RemoteError, blessedCiphers, mkGrpcClient)
 import Imports
 import Mu.GRpc.Client.TyApps
 import Network.GRPC.Client.Helpers (_grpcClientConfigTLS)
 import qualified Network.TLS as TLS
 import qualified Polysemy
+import qualified Polysemy.Error as Polysemy
 import qualified Polysemy.Reader as Polysemy
 import Polysemy.TinyLog (discardLogs)
 import Test.Federator.Util
@@ -102,7 +103,14 @@ inwardBrigCallViaIngress requestPath payload = do
   let target = SrvTarget (cs ingressHost) ingressPort
   runSettings <- optSettings . view teOpts <$> ask
   tlsSettings <- view teTLSSettings
-  c <- liftIO . Polysemy.runM . discardLogs . Polysemy.runReader tlsSettings . Polysemy.runReader runSettings $ mkGrpcClient target
+  c <-
+    liftIO
+      . Polysemy.runM
+      . Polysemy.runError @RemoteError
+      . discardLogs
+      . Polysemy.runReader tlsSettings
+      . Polysemy.runReader runSettings
+      $ mkGrpcClient target
   client <- case c of
     Left clientErr -> liftIO $ assertFailure (show clientErr)
     Right cli -> pure cli
diff --git a/services/federator/test/unit/Test/Federator/Remote.hs b/services/federator/test/unit/Test/Federator/Remote.hs
index 51392236e25..abdc59039e7 100644
--- a/services/federator/test/unit/Test/Federator/Remote.hs
+++ b/services/federator/test/unit/Test/Federator/Remote.hs
@@ -11,9 +11,9 @@ import Network.HTTP.Types (status200)
 import Network.Wai
 import qualified Network.Wai.Handler.Warp as Warp
 import qualified Network.Wai.Handler.WarpTLS as WarpTLS
-import qualified Polysemy
+import Polysemy
+import qualified Polysemy.Error as Polysemy
 import qualified Polysemy.Reader as Polysemy
-import qualified Polysemy.TinyLog as TinyLog
 import Test.Federator.Options (defRunSettings)
 import Test.Tasty
 import Test.Tasty.HUnit
@@ -42,6 +42,16 @@ settings =
       remoteCAStore = Just "test/resources/unit/unit-ca.pem"
     }
 
+assertNoError ::
+  forall e r x.
+  (Show e, Member (Embed IO) r) =>
+  Sem (Polysemy.Error e ': r) x ->
+  Sem r x
+assertNoError action =
+  Polysemy.runError action >>= \case
+    Left err -> embed . assertFailure $ "Unexpected error: " <> show err
+    Right x -> pure x
+
 testValidatesCertificateSuccess :: TestTree
 testValidatesCertificateSuccess =
   testGroup
@@ -49,24 +59,20 @@ testValidatesCertificateSuccess =
     [ testCase "when hostname=localhost and certificate-for=localhost" $ do
         bracket (startMockServer certForLocalhost) (\(serverThread, _) -> Async.cancel serverThread) $ \(_, port) -> do
           tlsSettings <- mkTLSSettings settings
-          eitherClient <- Polysemy.runM . TinyLog.discardLogs . Polysemy.runReader tlsSettings $ mkGrpcClient (SrvTarget "localhost" (fromIntegral port))
-          case eitherClient of
-            Left err -> assertFailure $ "Unexpected error: " <> show err
-            Right _ -> pure (),
+          void . Polysemy.runM . assertNoError @RemoteError . Polysemy.runReader tlsSettings $ mkGrpcClient (SrvTarget "localhost" (fromIntegral port)),
       testCase "when hostname=localhost. and certificate-for=localhost" $ do
         bracket (startMockServer certForLocalhost) (\(serverThread, _) -> Async.cancel serverThread) $ \(_, port) -> do
           tlsSettings <- mkTLSSettings settings
-          eitherClient <- Polysemy.runM . TinyLog.discardLogs . Polysemy.runReader tlsSettings $ mkGrpcClient (SrvTarget "localhost." (fromIntegral port))
-          case eitherClient of
-            Left err -> assertFailure $ "Unexpected error: " <> show err
-            Right _ -> pure (),
+          void . Polysemy.runM . assertNoError @RemoteError . Polysemy.runReader tlsSettings $ mkGrpcClient (SrvTarget "localhost." (fromIntegral port)),
       -- This is a limitation of the TLS library, this test just exists to document that.
       testCase "when hostname=localhost. and certificate-for=localhost." $ do
         bracket (startMockServer certForLocalhostDot) (\(serverThread, _) -> Async.cancel serverThread) $ \(_, port) -> do
           tlsSettings <- mkTLSSettings settings
           eitherClient <-
-            Polysemy.runM . TinyLog.discardLogs . Polysemy.runReader tlsSettings $
-              mkGrpcClient (SrvTarget "localhost." (fromIntegral port))
+            Polysemy.runM
+              . Polysemy.runError @RemoteError
+              . Polysemy.runReader tlsSettings
+              $ mkGrpcClient (SrvTarget "localhost." (fromIntegral port))
           case eitherClient of
             Left _ -> pure ()
             Right _ -> assertFailure "Congratulations, you fixed a known issue!"
@@ -80,8 +86,10 @@ testValidatesCertificateWrongHostname =
         bracket (startMockServer certForWrongDomain) (Async.cancel . fst) $ \(_, port) -> do
           tlsSettings <- mkTLSSettings settings
           eitherClient <-
-            Polysemy.runM . TinyLog.discardLogs . Polysemy.runReader tlsSettings $
-              mkGrpcClient (SrvTarget "localhost." (fromIntegral port))
+            Polysemy.runM
+              . Polysemy.runError
+              . Polysemy.runReader tlsSettings
+              $ mkGrpcClient (SrvTarget "localhost." (fromIntegral port))
           case eitherClient of
             Left (RemoteErrorTLSException _ _) -> pure ()
             Left x -> assertFailure $ "Expected TLS failure, got: " <> show x
diff --git a/services/galley/src/Galley/API/Create.hs b/services/galley/src/Galley/API/Create.hs
index 08b4c97575d..8167c2551e4 100644
--- a/services/galley/src/Galley/API/Create.hs
+++ b/services/galley/src/Galley/API/Create.hs
@@ -106,7 +106,6 @@ createRegularGroupConv zusr zcon (NewConvUnmanaged body) = do
   ensureConnected zusr locals
   checkRemoteUsersExist remotes
   ensureNoLegalholdConflicts remotes locals
-  -- FUTUREWORK: Implement (3) per comments for Update.addMembers. (also for createTeamGroupConv)
   c <-
     Data.createConversation
       localDomain
@@ -168,7 +167,6 @@ createTeamGroupConv zusr zcon tinfo body = do
         pure checkedPartitionedUsers
   checkRemoteUsersExist remotes
   ensureNoLegalholdConflicts remotes localUserIds
-  -- FUTUREWORK: Implement (3) per comments for Update.addMembers.
   conv <-
     Data.createConversation
       localDomain
@@ -321,9 +319,8 @@ notifyCreatedConversation :: Maybe UTCTime -> UserId -> Maybe ConnId -> Data.Con
 notifyCreatedConversation dtime usr conn c = do
   localDomain <- viewFederationDomain
   now <- maybe (liftIO getCurrentTime) pure dtime
-  -- FUTUREWORK: Should these calls that push notifications to local and remote
-  -- users be made in this, or a different order, or in parallel/applicative
-  -- fashion?
+  -- FUTUREWORK: Handle failures in notifying so it does not abort half way
+  -- through (either when notifying remotes or locals)
   --
   -- Ask remote server to store conversation membership and notify remote users
   -- of being added to a conversation
diff --git a/services/galley/src/Galley/API/Federation.hs b/services/galley/src/Galley/API/Federation.hs
index 691df1e42ae..5bb4c39dee1 100644
--- a/services/galley/src/Galley/API/Federation.hs
+++ b/services/galley/src/Galley/API/Federation.hs
@@ -94,8 +94,8 @@ getConversations (GetConversationsRequest qUid gcrConvIds) = do
 
 -- | Update the local database with information on conversation members joining
 -- or leaving. Finally, push out notifications to local users.
-updateConversationMemberships :: ConversationMemberUpdate -> Galley ()
-updateConversationMemberships cmu = do
+updateConversationMemberships :: Domain -> ConversationMemberUpdate -> Galley ()
+updateConversationMemberships requestingDomain cmu = do
   localDomain <- viewFederationDomain
   let users = case cmuAction cmu of
         FederationAPIGalley.ConversationMembersActionAdd toAdd -> fst <$> toAdd
@@ -103,15 +103,16 @@ updateConversationMemberships cmu = do
       localUsers = filter ((== localDomain) . qDomain) . toList $ users
       localUserIds = qUnqualified <$> localUsers
       targets = nubOrd $ cmuAlreadyPresentUsers cmu <> localUserIds
+      qconvId = Qualified (cmuConvId cmu) requestingDomain
   event <- case cmuAction cmu of
     FederationAPIGalley.ConversationMembersActionAdd toAdd -> do
       unless (null localUsers) $
-        Data.addLocalMembersToRemoteConv localUserIds (cmuConvId cmu)
+        Data.addLocalMembersToRemoteConv localUserIds qconvId
       let mems = SimpleMembers (map (uncurry SimpleMember) . toList $ toAdd)
       pure $
         Event
           MemberJoin
-          (cmuConvId cmu)
+          qconvId
           (cmuOrigUserId cmu)
           (cmuTime cmu)
           (EdMembersJoin mems)
@@ -120,12 +121,12 @@ updateConversationMemberships cmu = do
         [] -> pure ()
         (h : t) ->
           Data.removeLocalMembersFromRemoteConv
-            (cmuConvId cmu)
+            qconvId
             (list1 h t)
       pure $
         Event
           MemberLeave
-          (cmuConvId cmu)
+          qconvId
           (cmuOrigUserId cmu)
           (cmuTime cmu)
           (EdMembersLeave . QualifiedUserIdList . toList $ toRemove)
diff --git a/services/galley/src/Galley/API/Public.hs b/services/galley/src/Galley/API/Public.hs
index cba48a48c78..7f93785ce39 100644
--- a/services/galley/src/Galley/API/Public.hs
+++ b/services/galley/src/Galley/API/Public.hs
@@ -85,6 +85,7 @@ servantSitemap =
         GalleyAPI.getConversations = Query.getConversations,
         GalleyAPI.getConversationByReusableCode = Query.getConversationByReusableCode,
         GalleyAPI.listConversations = Query.listConversations,
+        GalleyAPI.listConversationsV2 = Query.listConversationsV2,
         GalleyAPI.createGroupConversation = Create.createGroupConversation,
         GalleyAPI.createSelfConversation = Create.createSelfConversation,
         GalleyAPI.createOne2OneConversation = Create.createOne2OneConversation,
diff --git a/services/galley/src/Galley/API/Query.hs b/services/galley/src/Galley/API/Query.hs
index d401ed47306..525b5d991b8 100644
--- a/services/galley/src/Galley/API/Query.hs
+++ b/services/galley/src/Galley/API/Query.hs
@@ -25,6 +25,7 @@ module Galley.API.Query
     conversationIdsPageFrom,
     getConversations,
     listConversations,
+    listConversationsV2,
     iterateConversations,
     getSelfH,
     internalGetMemberH,
@@ -35,6 +36,7 @@ where
 
 import qualified Cassandra as C
 import Control.Monad.Catch (throwM)
+import Control.Monad.Except (ExceptT, runExceptT)
 import qualified Data.ByteString.Lazy as LBS
 import Data.Code
 import Data.CommaSeparatedList
@@ -43,6 +45,8 @@ import Data.Id as Id
 import Data.Proxy
 import Data.Qualified (Qualified (..), Remote, partitionRemote, partitionRemoteOrLocalIds', toRemote)
 import Data.Range
+import qualified Data.Set as Set
+import Data.Tagged (unTagged)
 import Galley.API.Error
 import qualified Galley.API.Mapping as Mapping
 import Galley.API.Util
@@ -56,6 +60,7 @@ import Network.HTTP.Types
 import Network.Wai
 import Network.Wai.Predicate hiding (result, setStatus)
 import Network.Wai.Utilities
+import qualified System.Logger.Class as Logger
 import UnliftIO (pooledForConcurrentlyN)
 import Wire.API.Conversation (ConversationCoverView (..))
 import qualified Wire.API.Conversation as Public
@@ -63,6 +68,7 @@ import qualified Wire.API.Conversation.Role as Public
 import Wire.API.ErrorDescription (convNotFound)
 import Wire.API.Federation.API.Galley (gcresConvs)
 import qualified Wire.API.Federation.API.Galley as FederatedGalley
+import Wire.API.Federation.Client (FederationError, executeFederated)
 import Wire.API.Federation.Error
 import qualified Wire.API.Provider.Bot as Public
 
@@ -115,6 +121,30 @@ getRemoteConversations zusr remoteConvs = do
     gcresConvs <$> runFederatedGalley remoteDomain rpc
   pure $ concat convs
 
+getRemoteConversationsWithFailures :: UserId -> [Remote ConvId] -> Galley ([Qualified ConvId], [Public.Conversation])
+getRemoteConversationsWithFailures zusr remoteConvs = do
+  localDomain <- viewFederationDomain
+  let qualifiedZUser = Qualified zusr localDomain
+  let convsByDomain = partitionRemote remoteConvs
+  convs <- pooledForConcurrentlyN 8 convsByDomain $ \(remoteDomain, convIds) -> handleFailures remoteDomain convIds $ do
+    let req = FederatedGalley.GetConversationsRequest qualifiedZUser convIds
+        rpc = FederatedGalley.getConversations FederatedGalley.clientRoutes req
+    gcresConvs <$> executeFederated remoteDomain rpc
+  pure $ concatEithers convs
+  where
+    handleFailures :: Domain -> [ConvId] -> ExceptT FederationError Galley a -> Galley (Either [Qualified ConvId] a)
+    handleFailures domain convIds action = do
+      res <- runExceptT action
+      case res of
+        Right a -> pure $ Right a
+        Left e -> do
+          Logger.warn $
+            Logger.msg ("Error occurred while fetching remote conversations" :: ByteString)
+              . Logger.field "error" (show e)
+          pure . Left $ map (`Qualified` domain) convIds
+    concatEithers :: (Monoid a, Monoid b) => [Either a b] -> (a, b)
+    concatEithers = bimap mconcat mconcat . partitionEithers
+
 getConversationRoles :: UserId -> ConvId -> Galley Public.ConversationRolesList
 getConversationRoles zusr cnv = do
   void $ getConversationAndCheckMembership zusr cnv
@@ -184,7 +214,6 @@ getConversationsInternal :: UserId -> Maybe (Range 1 32 (CommaSeparatedList Conv
 getConversationsInternal user mids mstart msize = do
   (more, ids) <- getIds mids
   let localConvIds = ids
-  -- FUTUREWORK(federation, #1273): fetch remote conversations from other backend
   cs <-
     Data.conversations localConvIds
       >>= filterM removeDeleted
@@ -196,7 +225,7 @@ getConversationsInternal user mids mstart msize = do
     -- get ids and has_more flag
     getIds (Just ids) =
       (False,)
-        <$> Data.conversationIdsOf
+        <$> Data.localConversationIdsOf
           user
           (fromCommaSeparatedList (fromRange ids))
     getIds Nothing = do
@@ -208,8 +237,7 @@ getConversationsInternal user mids mstart msize = do
       | Data.isConvDeleted c = Data.deleteConversation (Data.convId c) >> pure False
       | otherwise = pure True
 
--- FUTUREWORK: pagination support for remote conversations, or should *all* of them be returned always?
--- FUTUREWORK: optimize cassandra requests when retrieving conversations (avoid large IN queries, prefer parallel/chunked requests)
+-- | Deprecated. FUTUREWORK(federation): Delete this endpoint
 listConversations :: UserId -> Public.ListConversations -> Galley (Public.ConversationList Public.Conversation)
 listConversations user (Public.ListConversations mIds qstart msize) = do
   localDomain <- viewFederationDomain
@@ -242,7 +270,7 @@ listConversations user (Public.ListConversations mIds qstart msize) = do
     size = fromMaybe (toRange (Proxy @32)) msize
 
     getIdsAndMore :: [ConvId] -> Galley (Bool, [ConvId])
-    getIdsAndMore ids = (False,) <$> Data.conversationIdsOf user ids
+    getIdsAndMore ids = (False,) <$> Data.localConversationIdsOf user ids
 
     getAll :: Maybe ConvId -> Galley (Bool, [ConvId])
     getAll mstart = do
@@ -255,6 +283,52 @@ listConversations user (Public.ListConversations mIds qstart msize) = do
       | Data.isConvDeleted c = Data.deleteConversation (Data.convId c) >> pure False
       | otherwise = pure True
 
+listConversationsV2 :: UserId -> Public.ListConversationsV2 -> Galley Public.ConversationsResponse
+listConversationsV2 user (Public.ListConversationsV2 ids) = do
+  localDomain <- viewFederationDomain
+
+  let (remoteIds, localIds) = partitionRemoteOrLocalIds' localDomain (fromRange ids)
+  (foundLocalIds, notFoundLocalIds) <- foundsAndNotFounds (Data.localConversationIdsOf user) localIds
+  (foundRemoteIds, locallyNotFoundRemoteIds) <- foundsAndNotFounds (Data.remoteConversationIdOf user) remoteIds
+
+  localInternalConversations <-
+    Data.conversations foundLocalIds
+      >>= filterM removeDeleted
+      >>= filterM (pure . isMember user . Data.convLocalMembers)
+  localConversations <- mapM (Mapping.conversationView user) localInternalConversations
+
+  (remoteFailures, remoteConversations) <- getRemoteConversationsWithFailures user foundRemoteIds
+  let fetchedOrFailedRemoteIds = Set.fromList $ map Public.cnvQualifiedId remoteConversations <> remoteFailures
+      remoteNotFoundRemoteIds = filter (`Set.notMember` fetchedOrFailedRemoteIds) $ map unTagged foundRemoteIds
+  unless (null remoteNotFoundRemoteIds) $
+    -- FUTUREWORK: This implies that the backends are out of sync. Maybe the
+    -- current user should be considered removed from this conversation at this
+    -- point.
+    Logger.warn $
+      Logger.msg ("Some locally found conversation ids were not returned by remotes" :: ByteString)
+        . Logger.field "convIds" (show remoteNotFoundRemoteIds)
+
+  let allConvs = localConversations <> remoteConversations
+  pure $
+    Public.ConversationsResponse
+      { crFound = allConvs,
+        crNotFound =
+          map unTagged locallyNotFoundRemoteIds
+            <> remoteNotFoundRemoteIds
+            <> map (`Qualified` localDomain) notFoundLocalIds,
+        crFailed = remoteFailures
+      }
+  where
+    removeDeleted :: Data.Conversation -> Galley Bool
+    removeDeleted c
+      | Data.isConvDeleted c = Data.deleteConversation (Data.convId c) >> pure False
+      | otherwise = pure True
+    foundsAndNotFounds :: (Monad m, Eq a) => ([a] -> m [a]) -> [a] -> m ([a], [a])
+    foundsAndNotFounds f xs = do
+      founds <- f xs
+      let notFounds = xs \\ founds
+      pure (founds, notFounds)
+
 iterateConversations :: forall a. UserId -> Range 1 500 Int32 -> ([Data.Conversation] -> Galley a) -> Galley [a]
 iterateConversations uid pageSize handleConvs = go Nothing
   where
diff --git a/services/galley/src/Galley/API/Teams.hs b/services/galley/src/Galley/API/Teams.hs
index 62b1181d5d7..587d325ed08 100644
--- a/services/galley/src/Galley/API/Teams.hs
+++ b/services/galley/src/Galley/API/Teams.hs
@@ -865,7 +865,7 @@ ensureNotTooLarge tid = do
 -- If LegalHold is configured for whitelisted teams only we consider the team
 -- size unlimited, because we make the assumption that these teams won't turn
 -- LegalHold off after activation.
--- FUTUREWORK: Find a way around the fanout limit.
+--  FUTUREWORK: Find a way around the fanout limit.
 ensureNotTooLargeForLegalHold :: TeamId -> Int -> Galley ()
 ensureNotTooLargeForLegalHold tid teamSize = do
   whenM (isLegalHoldEnabledForTeam tid) $ do
diff --git a/services/galley/src/Galley/API/Update.hs b/services/galley/src/Galley/API/Update.hs
index 8c84414a569..cef95744cef 100644
--- a/services/galley/src/Galley/API/Update.hs
+++ b/services/galley/src/Galley/API/Update.hs
@@ -281,7 +281,8 @@ uncheckedUpdateConversationAccess body usr zcon conv (currentAccess, targetAcces
   case removedUsers of
     [] -> return ()
     x : xs -> do
-      -- FUTUREWORK: deal with remote members, too, see removeMembers
+      -- FUTUREWORK: deal with remote members, too, see removeMembers (Jira
+      -- SQCORE-903)
       e <- Data.removeLocalMembersFromLocalConv localDomain conv (Qualified usr localDomain) (x :| xs)
       -- push event to all clients, including zconn
       -- since updateConversationAccess generates a second (member removal) event here
@@ -476,19 +477,6 @@ addMembersH (zusr ::: zcon ::: cid ::: req) = do
   let qInvite = Public.InviteQualified (flip Qualified domain <$> toNonEmpty u) r
   handleUpdateResult <$> addMembers zusr zcon cid qInvite
 
--- FUTUREWORK(federation): we need the following checks/implementation:
---  - (1) [DONE] Remote qualified users must exist before they can be added (a
---  call to the respective backend should be made): Avoid clients making up random
---  Ids, and increase the chances that the updateConversationMemberships call
---  suceeds
---  - (2) [DONE] A call must be made to the remote backend informing it that this user is
---  now part of that conversation. Use and implement 'updateConversationMemberships'.
---    - that call should probably be made *after* inserting the conversation membership
---    happens in this backend.
---    - 'updateConversationMemberships' should send an event to the affected
---    users informing them they have joined a remote conversation.
---  - (3) Events should support remote / qualified users, too.
---  These checks need tests :)
 addMembers :: UserId -> ConnId -> ConvId -> Public.InviteQualified -> Galley UpdateResult
 addMembers zusr zcon convId invite = do
   conv <- Data.conversation convId >>= ifNothing (errorDescriptionToWai convNotFound)
@@ -666,7 +654,6 @@ removeMemberFromLocalConv remover@(Qualified removerUid removerDomain) zcon conv
         else rmConvRoleName <$> getSelfMemberFromRemotes (toRemote remover) (Data.convRemoteMembers conv)
 
   generalConvChecks localDomain removerRole conv
-  for_ (Data.convTeam conv) teamConvChecks
 
   unless
     ( (victimDomain == localDomain && victim `isMember` locals)
@@ -721,12 +708,6 @@ removeMemberFromLocalConv remover@(Qualified removerUid removerDomain) zcon conv
         ACOCustomRolesNotSupported ->
           throwE RemoveFromConversationErrorCustomRolesNotSupported
 
-    teamConvChecks :: TeamId -> ExceptT RemoveFromConversationError Galley ()
-    teamConvChecks tid = do
-      tcv <- Data.teamConversation tid convId
-      when (maybe False (view managedConversation) tcv) $
-        throwE RemoveFromConversationErrorManagedConvNotAllowed
-
 -- OTR
 
 data OtrResult
@@ -752,9 +733,6 @@ postBotMessage :: BotId -> ConvId -> Public.OtrFilterMissing -> Public.NewOtrMes
 postBotMessage zbot zcnv val message =
   postNewOtrMessage Bot (botUserId zbot) Nothing zcnv val message
 
--- | FUTUREWORK: Send message to remote users, as of now this function fails if
--- the conversation is not hosted on current backend. If the conversation is
--- hosted on current backend, it completely ignores remote users.
 postProteusMessage :: UserId -> ConnId -> Qualified ConvId -> RawProto Public.QualifiedNewOtrMessage -> Galley (Public.PostOtrResponse Public.MessageSendingStatus)
 postProteusMessage zusr zcon conv msg = do
   localDomain <- viewFederationDomain
@@ -843,7 +821,9 @@ postNewOtrMessage utype usr con cnv val msg = do
       mapM_ (deleteBot cnv . botMemId) gone
 
 -- | Locally post a message originating from a remote conversation
+--
 -- FUTUREWORK: error handling for missing / mismatched clients
+-- (https://wearezeta.atlassian.net/browse/SQCORE-894)
 postRemoteToLocal :: RemoteMessage (Remote ConvId) -> Galley ()
 postRemoteToLocal rm = do
   localDomain <- viewFederationDomain
diff --git a/services/galley/src/Galley/API/Util.hs b/services/galley/src/Galley/API/Util.hs
index 352c63d455e..a9f5a08ca7e 100644
--- a/services/galley/src/Galley/API/Util.hs
+++ b/services/galley/src/Galley/API/Util.hs
@@ -556,15 +556,15 @@ fromRegisterConversation d MkRegisterConversation {..} =
       Public.Conversation
         { cnvQualifiedId = rcCnvId,
           cnvType = rcCnvType,
-          -- FUTUREWORK: a UserId from another instance is communicated here, which
-          -- without domain does not make much sense here.
+          -- FUTUREWORK: Document this is the same domain as the conversation
+          -- domain
           cnvCreator = qUnqualified rcOrigUserId,
           cnvAccess = rcCnvAccess,
           cnvAccessRole = rcCnvAccessRole,
           cnvName = rcCnvName,
           cnvMembers = ConvMembers this others,
-          -- FUTUREWORK: Once conversation IDs become qualified, this information
-          -- should be sent from the hosting Galley and stored here in 'cnvTeam'.
+          -- FUTUREWORK: Document this is the same domain as the conversation
+          -- domain.
           cnvTeam = Nothing,
           cnvMessageTimer = rcMessageTimer,
           cnvReceiptMode = rcReceiptMode
@@ -614,19 +614,22 @@ notifyRemoteAboutConvUpdate ::
   Galley ()
 notifyRemoteAboutConvUpdate origUser convId time action remotesToNotify = do
   localDomain <- viewFederationDomain
-  let qconvId = Qualified convId localDomain
-      mkUpdate oth = ConversationMemberUpdate time origUser qconvId oth action
-  traverse_ (uncurry (notificationRPC . mkUpdate) . swap)
+  let mkUpdate oth = ConversationMemberUpdate time origUser convId oth action
+  traverse_ (uncurry (notificationRPC localDomain . mkUpdate) . swap)
     . Map.assocs
     . partitionQualified
     . nubOrd
     . map unTagged
     $ remotesToNotify
   where
-    notificationRPC :: ConversationMemberUpdate -> Domain -> Galley ()
-    notificationRPC cmu domain = do
-      let rpc = FederatedGalley.updateConversationMemberships FederatedGalley.clientRoutes cmu
-      runFederated domain rpc
+    notificationRPC :: Domain -> ConversationMemberUpdate -> Domain -> Galley ()
+    notificationRPC sendingDomain cmu receivingDomain = do
+      let rpc =
+            FederatedGalley.updateConversationMemberships
+              FederatedGalley.clientRoutes
+              sendingDomain
+              cmu
+      runFederated receivingDomain rpc
 
 --------------------------------------------------------------------------------
 -- Legalhold
diff --git a/services/galley/src/Galley/Data.hs b/services/galley/src/Galley/Data.hs
index 32e5797d3f7..520f37dde02 100644
--- a/services/galley/src/Galley/Data.hs
+++ b/services/galley/src/Galley/Data.hs
@@ -58,9 +58,10 @@ module Galley.Data
     acceptConnect,
     conversation,
     conversationIdsFrom,
+    localConversationIdsOf,
+    remoteConversationIdOf,
     localConversationIdsPageFrom,
     conversationIdRowsForPagination,
-    conversationIdsOf,
     conversationMeta,
     conversations,
     conversationsRemote,
@@ -575,12 +576,22 @@ conversationIdRowsForPagination usr start (fromRange -> max) =
       Just c -> paginate Cql.selectUserConvsFrom (paramsP Quorum (usr, c) max)
       Nothing -> paginate Cql.selectUserConvs (paramsP Quorum (Identity usr) max)
 
-conversationIdsOf ::
-  (MonadClient m, Log.MonadLogger m, MonadThrow m) =>
-  UserId ->
-  [ConvId] ->
-  m [ConvId]
-conversationIdsOf usr cids = runIdentity <$$> retry x1 (query Cql.selectUserConvsIn (params Quorum (usr, cids)))
+-- | Takes a list of conversation ids and returns those found for the given
+-- user.
+localConversationIdsOf :: forall m. (MonadClient m, MonadUnliftIO m) => UserId -> [ConvId] -> m [ConvId]
+localConversationIdsOf usr cids = do
+  runIdentity <$$> retry x1 (query Cql.selectUserConvsIn (params Quorum (usr, cids)))
+
+-- | Takes a list of remote conversation ids and splits them by those found for
+-- the given user
+remoteConversationIdOf :: forall m. (MonadClient m, MonadLogger m, MonadUnliftIO m) => UserId -> [Remote ConvId] -> m [Remote ConvId]
+remoteConversationIdOf usr cnvs = do
+  concat <$$> pooledMapConcurrentlyN 8 findRemoteConvs . Map.assocs . partitionQualified . map unTagged $ cnvs
+  where
+    findRemoteConvs :: (Domain, [ConvId]) -> m [Remote ConvId]
+    findRemoteConvs (domain, remoteConvIds) = do
+      foundCnvs <- runIdentity <$$> query Cql.selectRemoteConvMembershipIn (params Quorum (usr, domain, remoteConvIds))
+      pure $ toRemote . (`Qualified` domain) <$> foundCnvs
 
 conversationsRemote :: (MonadClient m) => UserId -> m [Remote ConvId]
 conversationsRemote usr = do
@@ -987,8 +998,6 @@ removeMember usr cnv = retry x5 . batch $ do
   addPrepQuery Cql.removeMember (cnv, usr)
   addPrepQuery Cql.deleteUserConv (usr, cnv)
 
--- FUTUREWORK: the user's conversation has to be deleted on their own backend
-
 newMember :: a -> InternalMember a
 newMember = flip newMemberWithRole roleNameWireAdmin
 
diff --git a/services/galley/src/Galley/Data/Queries.hs b/services/galley/src/Galley/Data/Queries.hs
index cdc2bc3128a..7bf9ad8c928 100644
--- a/services/galley/src/Galley/Data/Queries.hs
+++ b/services/galley/src/Galley/Data/Queries.hs
@@ -310,6 +310,9 @@ selectUserRemoteConvs = "select conv_remote_domain, conv_remote_id from user_rem
 selectRemoteConvMembership :: PrepQuery R (UserId, Domain, ConvId) (Identity UserId)
 selectRemoteConvMembership = "select user from user_remote_conv where user = ? and conv_remote_domain = ? and conv_remote_id = ?"
 
+selectRemoteConvMembershipIn :: PrepQuery R (UserId, Domain, [ConvId]) (Identity ConvId)
+selectRemoteConvMembershipIn = "select conv_remote_id from user_remote_conv where user = ? and conv_remote_domain = ? and conv_remote_id in ?"
+
 deleteUserRemoteConv :: PrepQuery W (UserId, Domain, ConvId) ()
 deleteUserRemoteConv = "delete from user_remote_conv where user = ? and conv_remote_domain = ? and conv_remote_id = ?"
 
diff --git a/services/galley/test/integration/API.hs b/services/galley/test/integration/API.hs
index 05d882be5b7..f9502042fce 100644
--- a/services/galley/test/integration/API.hs
+++ b/services/galley/test/integration/API.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 -- This file is part of the Wire Server implementation.
@@ -35,7 +36,6 @@ import API.Util
 import Bilge hiding (timeout)
 import Bilge.Assert
 import Brig.Types
-import qualified Cassandra as Cql
 import qualified Control.Concurrent.Async as Async
 import Control.Lens (at, ix, preview, view, (.~), (?~), (^.))
 import Control.Monad.Except (MonadError (throwError))
@@ -59,7 +59,6 @@ import Data.String.Conversions (cs)
 import qualified Data.Text as T
 import qualified Data.Text.Ascii as Ascii
 import Data.Time.Clock (getCurrentTime)
-import qualified Galley.Data as Cql
 import Galley.Options (Opts, optFederator)
 import Galley.Types hiding (InternalMember (..))
 import Galley.Types.Conversations.Roles
@@ -153,7 +152,10 @@ tests s =
           test s "fail to add members when not connected" postMembersFail,
           test s "fail to add too many members" postTooManyMembersFail,
           test s "add remote members" testAddRemoteMember,
-          test s "get and list remote conversations" testGetRemoteConversations,
+          test s "get conversations/:domain/:cnv - local" testGetQualifiedLocalConv,
+          test s "get conversations/:domain/:cnv - remote" testGetQualifiedRemoteConv,
+          test s "post list-conversations" testListRemoteConvs,
+          test s "post conversations/list/v2" testBulkGetQualifiedConvs,
           test s "add non-existing remote members" testAddRemoteMemberFailure,
           test s "add deleted remote members" testAddDeletedRemoteUser,
           test s "add remote members on invalid domain" testAddRemoteMemberInvalidDomain,
@@ -217,7 +219,7 @@ emptyFederatedGalley =
    in FederatedGalley.Api
         { FederatedGalley.registerConversation = \_ -> e "registerConversation",
           FederatedGalley.getConversations = \_ -> e "getConversations",
-          FederatedGalley.updateConversationMemberships = \_ -> e "updateConversationMemberships",
+          FederatedGalley.updateConversationMemberships = \_ _ -> e "updateConversationMemberships",
           FederatedGalley.leaveConversation = \_ _ -> e "leaveConversation",
           FederatedGalley.receiveMessage = \_ _ -> e "receiveMessage",
           FederatedGalley.sendMessage = \_ _ -> e "sendMessage"
@@ -1296,11 +1298,11 @@ paginateConvListIds = do
           FederatedGalley.ConversationMemberUpdate
             { FederatedGalley.cmuTime = now,
               FederatedGalley.cmuOrigUserId = qChad,
-              FederatedGalley.cmuConvId = Qualified conv chadDomain,
+              FederatedGalley.cmuConvId = conv,
               FederatedGalley.cmuAlreadyPresentUsers = [],
               FederatedGalley.cmuAction = FederatedGalley.ConversationMembersActionAdd $ pure (qAlice, roleNameWireMember)
             }
-    FederatedGalley.updateConversationMemberships fedGalleyClient cmu
+    FederatedGalley.updateConversationMemberships fedGalleyClient chadDomain cmu
 
   remoteDee <- randomId
   let deeDomain = Domain "dee.example.com"
@@ -1311,11 +1313,11 @@ paginateConvListIds = do
           FederatedGalley.ConversationMemberUpdate
             { FederatedGalley.cmuTime = now,
               FederatedGalley.cmuOrigUserId = qDee,
-              FederatedGalley.cmuConvId = Qualified conv deeDomain,
+              FederatedGalley.cmuConvId = conv,
               FederatedGalley.cmuAlreadyPresentUsers = [],
               FederatedGalley.cmuAction = FederatedGalley.ConversationMembersActionAdd $ pure (qAlice, roleNameWireMember)
             }
-    FederatedGalley.updateConversationMemberships fedGalleyClient cmu
+    FederatedGalley.updateConversationMemberships fedGalleyClient deeDomain cmu
 
   -- 1 self conv + 2 convs with bob and eve + 197 local convs + 25 convs on
   -- chad.example.com + 31 on dee.example = 256 convs. Getting them 16 at a time
@@ -1354,11 +1356,11 @@ paginateConvListIdsPageEndingAtLocalsAndDomain = do
           FederatedGalley.ConversationMemberUpdate
             { FederatedGalley.cmuTime = now,
               FederatedGalley.cmuOrigUserId = qChad,
-              FederatedGalley.cmuConvId = Qualified conv chadDomain,
+              FederatedGalley.cmuConvId = conv,
               FederatedGalley.cmuAlreadyPresentUsers = [],
               FederatedGalley.cmuAction = FederatedGalley.ConversationMembersActionAdd $ pure (qAlice, roleNameWireMember)
             }
-    FederatedGalley.updateConversationMemberships fedGalleyClient cmu
+    FederatedGalley.updateConversationMemberships fedGalleyClient chadDomain cmu
 
   remoteDee <- randomId
   let deeDomain = Domain "dee.example.com"
@@ -1370,11 +1372,11 @@ paginateConvListIdsPageEndingAtLocalsAndDomain = do
           FederatedGalley.ConversationMemberUpdate
             { FederatedGalley.cmuTime = now,
               FederatedGalley.cmuOrigUserId = qDee,
-              FederatedGalley.cmuConvId = Qualified conv deeDomain,
+              FederatedGalley.cmuConvId = conv,
               FederatedGalley.cmuAlreadyPresentUsers = [],
               FederatedGalley.cmuAction = FederatedGalley.ConversationMembersActionAdd $ pure (qAlice, roleNameWireMember)
             }
-    FederatedGalley.updateConversationMemberships fedGalleyClient cmu
+    FederatedGalley.updateConversationMemberships fedGalleyClient deeDomain cmu
 
   foldM_ (getChunkedConvs 16 0 alice) Nothing [4, 3, 2, 1, 0 :: Int]
 
@@ -1829,8 +1831,60 @@ testAddRemoteMember = do
         toJSON [mkProfile bob (Name "bob")]
       | otherwise = toJSON ()
 
-testGetRemoteConversations :: TestM ()
-testGetRemoteConversations = do
+testGetQualifiedLocalConv :: TestM ()
+testGetQualifiedLocalConv = do
+  alice <- randomUser
+  convId <- decodeQualifiedConvId <$> postConv alice [] (Just "gossip") [] Nothing Nothing
+  conv :: Conversation <- fmap responseJsonUnsafe $ getConvQualified alice convId <!! const 200 === statusCode
+  liftIO $ do
+    assertEqual "conversation id" convId (cnvQualifiedId conv)
+    assertEqual "conversation name" (Just "gossip") (cnvName conv)
+
+testGetQualifiedRemoteConv :: TestM ()
+testGetQualifiedRemoteConv = do
+  aliceQ <- randomQualifiedUser
+  let aliceId = qUnqualified aliceQ
+  bobId <- randomId
+  convId <- randomId
+  let remoteDomain = Domain "far-away.example.com"
+      bobQ = Qualified bobId remoteDomain
+      remoteConvId = Qualified convId remoteDomain
+      aliceAsOtherMember = OtherMember aliceQ Nothing roleNameWireAdmin
+      bobAsOtherMember = OtherMember bobQ Nothing roleNameWireAdmin
+      aliceAsMember = Member aliceId Nothing False Nothing Nothing False Nothing False Nothing roleNameWireAdmin
+
+  registerRemoteConv remoteConvId bobQ Nothing (Set.fromList [aliceAsOtherMember])
+
+  let mockConversation =
+        Conversation
+          { cnvQualifiedId = remoteConvId,
+            cnvType = RegularConv,
+            cnvCreator = bobId,
+            cnvAccess = [],
+            cnvAccessRole = ActivatedAccessRole,
+            cnvName = Just "federated gossip",
+            cnvMembers = ConvMembers aliceAsMember [bobAsOtherMember],
+            cnvTeam = Nothing,
+            cnvMessageTimer = Nothing,
+            cnvReceiptMode = Nothing
+          }
+      remoteConversationResponse = GetConversationsResponse [mockConversation]
+
+  opts <- view tsGConf
+  (respAll, _) <-
+    withTempMockFederator
+      opts
+      remoteDomain
+      (const remoteConversationResponse)
+      (getConvQualified aliceId remoteConvId)
+
+  conv <- responseJsonUnsafe <$> (pure respAll <!! const 200 === statusCode)
+  -- FUTUREWORK: The backend should augment returned conversation data with
+  -- Alice's membership data stored locally
+  liftIO $ assertEqual "conversation" mockConversation conv
+
+testListRemoteConvs :: TestM ()
+testListRemoteConvs = do
   -- alice on local domain
   -- bob and the conversation on the remote domain
   aliceQ <- randomQualifiedUser
@@ -1838,6 +1892,7 @@ testGetRemoteConversations = do
   bobId <- randomId
   convId <- randomId
   let remoteDomain = Domain "far-away.example.com"
+      bobQ = Qualified bobId remoteDomain
       remoteConvId = Qualified convId remoteDomain
 
   let aliceAsOtherMember = OtherMember aliceQ Nothing roleNameWireAdmin
@@ -1857,22 +1912,8 @@ testGetRemoteConversations = do
           }
       remoteConversationResponse = GetConversationsResponse [mockConversation]
   opts <- view tsGConf
-  -- test GET /conversations/:domain/:cnv for single conversation
-  (respOne, _) <-
-    withTempMockFederator
-      opts
-      remoteDomain
-      (const remoteConversationResponse)
-      (getConvQualified alice remoteConvId)
-  conv :: Conversation <- responseJsonUnsafe <$> (pure respOne <!! const 200 === statusCode)
-  liftIO $ do
-    let actual = cmOthers $ cnvMembers conv
-    let expected = [OtherMember aliceQ Nothing roleNameWireAdmin]
-    assertEqual "getConversation: other members should include remoteBob" expected actual
 
-  -- insert remote conversationId for alice
-  cassState <- view tsCass
-  Cql.runClient cassState $ Cql.addLocalMembersToRemoteConv [alice] remoteConvId
+  registerRemoteConv remoteConvId bobQ Nothing (Set.fromList [aliceAsOtherMember])
 
   -- FUTUREWORK: Do this test with more than one remote domains
   -- test POST /list-conversations
@@ -1882,24 +1923,117 @@ testGetRemoteConversations = do
       remoteDomain
       (const remoteConversationResponse)
       (listAllConvs alice)
-  convs :: ConversationList Conversation <- responseJsonUnsafe <$> (pure respAll <!! const 200 === statusCode)
+  convs <- responseJsonUnsafe <$> (pure respAll <!! const 200 === statusCode)
   liftIO $ do
+    -- FUTUREWORK: Expect membership metadata to change
     let expected = mockConversation
     let actual = find ((== remoteConvId) . cnvQualifiedId) (convList convs)
-    assertEqual
-      "name mismatch"
-      (Just $ cnvName expected)
-      (cnvName <$> actual)
-    assertEqual
-      "self member mismatch"
-      (Just . cmSelf $ cnvMembers expected)
-      (cmSelf . cnvMembers <$> actual)
-    assertEqual
-      "other members mismatch"
-      (Just [])
-      ((\c -> cmOthers (cnvMembers c) \\ cmOthers (cnvMembers expected)) <$> actual)
+    assertEqual "conversations" (Just expected) actual
     assertEqual "expecting two conversation: Alice's self conversation and remote one with Bob" 2 (length (convList convs))
 
+-- | Tests getting many converations given their ids.
+--
+-- In this test, Alice is a local user, who will be asking for metadata of these
+-- conversations:
+--
+-- - A local conversation which she is part of
+--
+-- - A remote conv on a.far-away.example.com (with Bob)
+--
+-- - A remote conv on b.far-away.example.com (with Carl)
+--
+-- - A remote conv on a.far-away.example.com, which is not found in the local DB
+--
+-- - A remote conv on b.far-away.example.com, it is found in the local DB but
+--   the remote does not return it
+--
+-- - A remote conv on c.far-away.example.com, for which the federated call fails
+--
+-- - A local conversation which doesn't exist
+--
+-- - A local conversation which they're not part of
+testBulkGetQualifiedConvs :: TestM ()
+testBulkGetQualifiedConvs = do
+  localDomain <- viewFederationDomain
+  aliceQ <- randomQualifiedUser
+  let alice = qUnqualified aliceQ
+  bobId <- randomId
+  carlId <- randomId
+  let remoteDomainA = Domain "a.far-away.example.com"
+      remoteDomainB = Domain "b.far-away.example.com"
+      remoteDomainC = Domain "c.far-away.example.com"
+      bobQ = Qualified bobId remoteDomainA
+      carlQ = Qualified carlId remoteDomainB
+
+  localConv <- responseJsonUnsafe <$> postConv alice [] (Just "gossip") [] Nothing Nothing
+  let localConvId = cnvQualifiedId localConv
+
+  remoteConvIdA <- randomQualifiedId remoteDomainA
+  remoteConvIdB <- randomQualifiedId remoteDomainB
+  remoteConvIdALocallyNotFound <- randomQualifiedId remoteDomainA
+  remoteConvIdBNotFoundOnRemote <- randomQualifiedId remoteDomainB
+  localConvIdNotFound <- randomQualifiedId localDomain
+  remoteConvIdCFailure <- randomQualifiedId remoteDomainC
+
+  eve <- randomQualifiedUser
+  localConvIdNotParticipating <- decodeQualifiedConvId <$> postConv (qUnqualified eve) [] (Just "gossip about alice!") [] Nothing Nothing
+
+  let aliceAsOtherMember = OtherMember aliceQ Nothing roleNameWireAdmin
+  registerRemoteConv remoteConvIdA bobQ Nothing (Set.fromList [aliceAsOtherMember])
+  registerRemoteConv remoteConvIdB carlQ Nothing (Set.fromList [aliceAsOtherMember])
+  registerRemoteConv remoteConvIdBNotFoundOnRemote carlQ Nothing (Set.fromList [aliceAsOtherMember])
+  registerRemoteConv remoteConvIdCFailure carlQ Nothing (Set.fromList [aliceAsOtherMember])
+
+  let aliceAsSelfMember = Member (qUnqualified aliceQ) Nothing False Nothing Nothing False Nothing False Nothing roleNameWireAdmin
+      bobAsOtherMember = OtherMember bobQ Nothing roleNameWireAdmin
+      carlAsOtherMember = OtherMember carlQ Nothing roleNameWireAdmin
+      mockConversationA = mkConv remoteConvIdA bobId aliceAsSelfMember [bobAsOtherMember]
+      mockConversationB = mkConv remoteConvIdB carlId aliceAsSelfMember [carlAsOtherMember]
+      req =
+        ListConversationsV2 . unsafeRange $
+          [ localConvId,
+            remoteConvIdA,
+            remoteConvIdB,
+            remoteConvIdALocallyNotFound,
+            localConvIdNotFound,
+            localConvIdNotParticipating,
+            remoteConvIdBNotFoundOnRemote,
+            remoteConvIdCFailure
+          ]
+  opts <- view tsGConf
+  (respAll, receivedRequests) <-
+    withTempMockFederator'
+      opts
+      remoteDomainA
+      ( \fedReq -> do
+          let success = pure . F.OutwardResponseBody . LBS.toStrict . encode
+          case F.domain fedReq of
+            d | d == domainText remoteDomainA -> success $ GetConversationsResponse [mockConversationA]
+            d | d == domainText remoteDomainB -> success $ GetConversationsResponse [mockConversationB]
+            d | d == domainText remoteDomainC -> pure . F.OutwardResponseError $ F.OutwardError F.DiscoveryFailed Nothing
+            _ -> assertFailure $ "Unrecognized domain: " <> show fedReq
+      )
+      (listConvsV2 alice req)
+  convs <- responseJsonUnsafe <$> (pure respAll <!! const 200 === statusCode)
+
+  liftIO $ do
+    let expectedFound = sortOn cnvQualifiedId [localConv, mockConversationA, mockConversationB]
+        actualFound = sortOn cnvQualifiedId $ crFound convs
+    assertEqual "found conversations" expectedFound actualFound
+
+    -- Assumes only one request is made
+    let requestedConvIdsA =
+          fmap FederatedGalley.gcrConvIds
+            . decode @FederatedGalley.GetConversationsRequest
+            =<< fmap (LBS.fromStrict . F.body) . F.request
+            =<< find ((== domainText remoteDomainA) . F.domain) receivedRequests
+    assertEqual "only locally found conversations should be queried" (Just [qUnqualified remoteConvIdA]) requestedConvIdsA
+
+    let expectedNotFound = sort [localConvIdNotFound, localConvIdNotParticipating, remoteConvIdALocallyNotFound, remoteConvIdBNotFoundOnRemote]
+        actualNotFound = sort $ crNotFound convs
+    assertEqual "not founds" expectedNotFound actualNotFound
+    assertEqual "failures" [remoteConvIdCFailure] (crFailed convs)
+
 testAddRemoteMemberFailure :: TestM ()
 testAddRemoteMemberFailure = do
   alice <- randomUser
diff --git a/services/galley/test/integration/API/Federation.hs b/services/galley/test/integration/API/Federation.hs
index a3d31099ded..9dcc456948e 100644
--- a/services/galley/test/integration/API/Federation.hs
+++ b/services/galley/test/integration/API/Federation.hs
@@ -151,13 +151,13 @@ addLocalUser = do
         FedGalley.ConversationMemberUpdate
           { FedGalley.cmuTime = now,
             FedGalley.cmuOrigUserId = qbob,
-            FedGalley.cmuConvId = qconv,
+            FedGalley.cmuConvId = conv,
             FedGalley.cmuAlreadyPresentUsers = [],
             FedGalley.cmuAction =
               FedGalley.ConversationMembersActionAdd (pure (qalice, roleNameWireMember))
           }
   WS.bracketR c alice $ \ws -> do
-    FedGalley.updateConversationMemberships fedGalleyClient cmu
+    FedGalley.updateConversationMemberships fedGalleyClient remoteDomain cmu
     void . liftIO $
       WS.assertMatch (5 # Second) ws $
         wsAssertMemberJoinWithRole qconv qbob [qalice] roleNameWireMember
@@ -189,7 +189,7 @@ removeLocalUser = do
         FedGalley.ConversationMemberUpdate
           { FedGalley.cmuTime = now,
             FedGalley.cmuOrigUserId = qBob,
-            FedGalley.cmuConvId = qconv,
+            FedGalley.cmuConvId = conv,
             FedGalley.cmuAlreadyPresentUsers = [],
             FedGalley.cmuAction =
               FedGalley.ConversationMembersActionAdd (pure (qAlice, roleNameWireMember))
@@ -198,16 +198,16 @@ removeLocalUser = do
         FedGalley.ConversationMemberUpdate
           { FedGalley.cmuTime = addUTCTime (secondsToNominalDiffTime 5) now,
             FedGalley.cmuOrigUserId = qBob,
-            FedGalley.cmuConvId = qconv,
+            FedGalley.cmuConvId = conv,
             FedGalley.cmuAlreadyPresentUsers = [alice],
             FedGalley.cmuAction =
               FedGalley.ConversationMembersActionRemove (pure qAlice)
           }
 
   WS.bracketR c alice $ \ws -> do
-    FedGalley.updateConversationMemberships fedGalleyClient cmuAdd
+    FedGalley.updateConversationMemberships fedGalleyClient remoteDomain cmuAdd
     afterAddition <- listRemoteConvs remoteDomain alice
-    FedGalley.updateConversationMemberships fedGalleyClient cmuRemove
+    FedGalley.updateConversationMemberships fedGalleyClient remoteDomain cmuRemove
     liftIO $ do
       void . WS.assertMatch (3 # Second) ws $
         wsAssertMemberJoinWithRole qconv qBob [qAlice] roleNameWireMember
@@ -245,7 +245,7 @@ removeRemoteUser = do
         FedGalley.ConversationMemberUpdate
           { FedGalley.cmuTime = now,
             FedGalley.cmuOrigUserId = qBob,
-            FedGalley.cmuConvId = qconv,
+            FedGalley.cmuConvId = conv,
             FedGalley.cmuAlreadyPresentUsers = [],
             FedGalley.cmuAction =
               FedGalley.ConversationMembersActionAdd
@@ -255,18 +255,18 @@ removeRemoteUser = do
         FedGalley.ConversationMemberUpdate
           { FedGalley.cmuTime = addUTCTime (secondsToNominalDiffTime 5) now,
             FedGalley.cmuOrigUserId = qBob,
-            FedGalley.cmuConvId = qconv,
+            FedGalley.cmuConvId = conv,
             FedGalley.cmuAlreadyPresentUsers = [alice],
             FedGalley.cmuAction =
               FedGalley.ConversationMembersActionRemove (pure qEve)
           }
 
   WS.bracketR c alice $ \ws -> do
-    FedGalley.updateConversationMemberships fedGalleyClient cmuAdd
+    FedGalley.updateConversationMemberships fedGalleyClient remoteDomain cmuAdd
     afterAddition <- listRemoteConvs remoteDomain alice
     void . liftIO . WS.assertMatch (3 # Second) ws $
       wsAssertMemberJoinWithRole qconv qBob [qAlice, qEve] roleNameWireMember
-    FedGalley.updateConversationMemberships fedGalleyClient cmuRemove
+    FedGalley.updateConversationMemberships fedGalleyClient remoteDomain cmuRemove
     afterRemoval <- listRemoteConvs remoteDomain alice
     void . liftIO $
       WS.assertMatch (3 # Second) ws $
@@ -293,13 +293,13 @@ notifyLocalUser = do
         FedGalley.ConversationMemberUpdate
           { FedGalley.cmuTime = now,
             FedGalley.cmuOrigUserId = qbob,
-            FedGalley.cmuConvId = qconv,
+            FedGalley.cmuConvId = conv,
             FedGalley.cmuAlreadyPresentUsers = [alice],
             FedGalley.cmuAction =
               FedGalley.ConversationMembersActionAdd (pure (qcharlie, roleNameWireMember))
           }
   WS.bracketR c alice $ \ws -> do
-    FedGalley.updateConversationMemberships fedGalleyClient cmu
+    FedGalley.updateConversationMemberships fedGalleyClient bdom cmu
     void . liftIO $
       WS.assertMatch (5 # Second) ws $
         wsAssertMemberJoinWithRole qconv qbob [qcharlie] roleNameWireMember
@@ -386,12 +386,12 @@ receiveMessage = do
         FedGalley.ConversationMemberUpdate
           { FedGalley.cmuTime = now,
             FedGalley.cmuOrigUserId = qbob,
-            FedGalley.cmuConvId = qconv,
+            FedGalley.cmuConvId = conv,
             FedGalley.cmuAlreadyPresentUsers = [],
             FedGalley.cmuAction =
               FedGalley.ConversationMembersActionAdd (pure (qalice, roleNameWireMember))
           }
-  FedGalley.updateConversationMemberships fedGalleyClient cmu
+  FedGalley.updateConversationMemberships fedGalleyClient bdom cmu
 
   let txt = "Hello from another backend"
       msg client = Map.fromList [(client, txt)]
diff --git a/services/galley/test/integration/API/Util.hs b/services/galley/test/integration/API/Util.hs
index 1daad12b955..361aede80a0 100644
--- a/services/galley/test/integration/API/Util.hs
+++ b/services/galley/test/integration/API/Util.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 -- This file is part of the Wire Server implementation.
@@ -63,6 +64,7 @@ import qualified Data.Set as Set
 import Data.String.Conversions (ST, cs)
 import Data.Text.Encoding (decodeUtf8)
 import qualified Data.Text.Encoding as Text
+import Data.Time (getCurrentTime)
 import qualified Data.UUID as UUID
 import Data.UUID.V4
 import Galley.Intra.User (chunkify)
@@ -803,6 +805,17 @@ listConvs u req = do
       . zType "access"
       . json req
 
+listConvsV2 :: (MonadIO m, MonadHttp m, HasGalley m) => UserId -> ListConversationsV2 -> m ResponseLBS
+listConvsV2 u req = do
+  g <- viewGalley
+  post $
+    g
+      . path "/conversations/list/v2"
+      . zUser u
+      . zConn "conn"
+      . zType "access"
+      . json req
+
 getConv :: (MonadIO m, MonadHttp m, HasGalley m, HasCallStack) => UserId -> ConvId -> m ResponseLBS
 getConv u c = do
   g <- viewGalley
@@ -1128,6 +1141,26 @@ getTeamQueue' zusr msince msize onlyLast = do
           ]
     )
 
+registerRemoteConv :: Qualified ConvId -> Qualified UserId -> Maybe Text -> Set OtherMember -> TestM ()
+registerRemoteConv convId originUser name othMembers = do
+  fedGalleyClient <- view tsFedGalleyClient
+  now <- liftIO getCurrentTime
+  FederatedGalley.registerConversation
+    fedGalleyClient
+    ( FederatedGalley.MkRegisterConversation
+        { rcTime = now,
+          rcOrigUserId = originUser,
+          rcCnvId = convId,
+          rcCnvType = RegularConv,
+          rcCnvAccess = [],
+          rcCnvAccessRole = ActivatedAccessRole,
+          rcCnvName = name,
+          rcMembers = othMembers,
+          rcMessageTimer = Nothing,
+          rcReceiptMode = Nothing
+        }
+    )
+
 -------------------------------------------------------------------------------
 -- Common Assertions
 
@@ -1320,9 +1353,10 @@ assertNoMsg ws f = do
 assertRemoveUpdate :: (MonadIO m, HasCallStack) => F.Request -> Qualified ConvId -> Qualified UserId -> [UserId] -> Qualified UserId -> m ()
 assertRemoveUpdate req qconvId remover alreadyPresentUsers victim = liftIO $ do
   F.path req @?= "/federation/update-conversation-memberships"
+  F.originDomain req @?= (domainText . qDomain) qconvId
   let Just cmu = decodeStrict (F.body req)
   FederatedGalley.cmuOrigUserId cmu @?= remover
-  FederatedGalley.cmuConvId cmu @?= qconvId
+  FederatedGalley.cmuConvId cmu @?= qUnqualified qconvId
   sort (FederatedGalley.cmuAlreadyPresentUsers cmu) @?= sort alreadyPresentUsers
   FederatedGalley.cmuAction cmu @?= FederatedGalley.ConversationMembersActionRemove (pure victim)
 
@@ -1354,7 +1388,10 @@ decodeConvCodeEvent r = case responseJsonUnsafe r of
   _ -> error "Failed to parse ConversationCode from Event"
 
 decodeConvId :: HasCallStack => Response (Maybe Lazy.ByteString) -> ConvId
-decodeConvId = qUnqualified . cnvQualifiedId . responseJsonUnsafe
+decodeConvId = qUnqualified . decodeQualifiedConvId
+
+decodeQualifiedConvId :: HasCallStack => Response (Maybe Lazy.ByteString) -> Qualified ConvId
+decodeQualifiedConvId = cnvQualifiedId . responseJsonUnsafe
 
 decodeConvList :: Response (Maybe Lazy.ByteString) -> [Conversation]
 decodeConvList = convList . responseJsonUnsafeWithMsg "conversations"
@@ -1510,6 +1547,9 @@ randomUser = qUnqualified <$> randomUser' False True True
 randomQualifiedUser :: HasCallStack => TestM (Qualified UserId)
 randomQualifiedUser = randomUser' False True True
 
+randomQualifiedId :: MonadIO m => Domain -> m (Qualified (Id a))
+randomQualifiedId domain = flip Qualified domain <$> randomId
+
 randomTeamCreator :: HasCallStack => TestM UserId
 randomTeamCreator = qUnqualified <$> randomUser' True True True
 
@@ -1810,6 +1850,21 @@ someLastPrekeys =
     lastPrekey "pQABARn//wKhAFgg1rZEY6vbAnEz+Ern5kRny/uKiIrXTb/usQxGnceV2HADoQChAFgglacihnqg/YQJHkuHNFU7QD6Pb3KN4FnubaCF2EVOgRkE9g=="
   ]
 
+mkConv :: Qualified ConvId -> UserId -> Member -> [OtherMember] -> Conversation
+mkConv cnvId creator selfMember otherMembers =
+  Conversation
+    { cnvQualifiedId = cnvId,
+      cnvType = RegularConv,
+      cnvCreator = creator,
+      cnvAccess = [],
+      cnvAccessRole = ActivatedAccessRole,
+      cnvName = Just "federated gossip",
+      cnvMembers = ConvMembers selfMember otherMembers,
+      cnvTeam = Nothing,
+      cnvMessageTimer = Nothing,
+      cnvReceiptMode = Nothing
+    }
+
 -- | ES is only refreshed occasionally; we don't want to wait for that in tests.
 refreshIndex :: TestM ()
 refreshIndex = do
diff --git a/stack.yaml b/stack.yaml
index 9c2b6a95c83..e39daebbcc5 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -139,7 +139,6 @@ extra-deps:
 # Dropped from upstream snapshot
 - template-0.2.0.10
 - HaskellNet-0.5.2
-- snappy-0.2.0.2
 - smtp-mail-0.2.0.0
 - stm-containers-1.1.0.4 # Latest: lts-15.16
 - redis-resp-1.0.0
@@ -234,12 +233,16 @@ extra-deps:
   subdirs:
     - http2-client-grpc
 
-# Fix in for issue #27: https://github.com/kazu-yamamoto/http2/issues/27
+# Fix for issue #27: https://github.com/kazu-yamamoto/http2/issues/27
 # PR here: https://github.com/kazu-yamamoto/http2/pull/28
 # Note: the commit used here is based on version 2.0.6 of http2
 - git: https://github.com/wireapp/http2 # (2021-06-09) branch: header-encoding-0-size-table-backport
   commit: 7c465be1201e0945b106f7cc6176ac1b1193be13
 
+# Fix in PR: https://github.com/bos/snappy/pull/7
+- git: https://github.com/wireapp/snappy
+  commit: b0e5c08af48911caecffa4fa6a3e74872018b258 # master (Sep 03, 2021)
+
 ############################################################
 # Development tools
 ############################################################
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 7fec0d171fb..e17149372df 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -316,13 +316,6 @@ packages:
       sha256: 20f0361675729e606fb37b8a1865f4bd49d952f2d0148693b62f68fadf5801d5
   original:
     hackage: HaskellNet-0.5.2
-- completed:
-    hackage: snappy-0.2.0.2@sha256:2931b03c5fdab2dac8d7eadb3be2f4ef8906666e43f1f1db65a06efd57ea701b,1591
-    pantry-tree:
-      size: 709
-      sha256: cd05c6ddfbbd3969adab3869d38d161e5ec8e72b1a72e00ca08f5e39538368cf
-  original:
-    hackage: snappy-0.2.0.2
 - completed:
     hackage: smtp-mail-0.2.0.0@sha256:b91c81f6dbb41a9ceee8c443385118684ecec55006b77f7d3c0e49cffd2468cf,1211
     pantry-tree:
@@ -792,6 +785,17 @@ packages:
   original:
     git: https://github.com/wireapp/http2
     commit: 7c465be1201e0945b106f7cc6176ac1b1193be13
+- completed:
+    name: snappy
+    version: 0.2.0.2
+    git: https://github.com/wireapp/snappy
+    pantry-tree:
+      size: 989
+      sha256: ae7fdf1988910fa026279052e85ade0a99962a3e7812ace104797e12ead0cd1d
+    commit: b0e5c08af48911caecffa4fa6a3e74872018b258
+  original:
+    git: https://github.com/wireapp/snappy
+    commit: b0e5c08af48911caecffa4fa6a3e74872018b258
 - completed:
     hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499
     pantry-tree: