diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
index 5e1b96b0..08d5cbcb 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
@@ -240,30 +240,30 @@ public class ImportOfficeData extends ContextBasedTest {
                 """);
         assertThat(toFormattedString(contacts)).isEqualToIgnoringWhitespace("""
                 {
-                    1101=contact(label='Herr Michael Mellies ', emailAddresses='mih@example.org'),
-                    1200=contact(label='JM e.K.', emailAddresses='jm-ex-partner@example.org'),
-                    1201=contact(label='Frau Dr. Jenny Meyer-Billing , JM GmbH', emailAddresses='jm-billing@example.org'),
-                    1202=contact(label='Herr Andrew Meyer-Operation , JM GmbH', emailAddresses='am-operation@example.org'),
-                    1203=contact(label='Herr Philip Meyer-Contract , JM GmbH', emailAddresses='pm-partner@example.org'),
-                    1204=contact(label='Frau Tammy Meyer-VIP , JM GmbH', emailAddresses='tm-vip@example.org'),
-                    1301=contact(label='Petra Schmidt , Test PS', emailAddresses='ps@example.com'),
-                    1401=contact(label='Frau Frauke Fanninga ', emailAddresses='ff@example.org'),
-                    1501=contact(label='Frau Cecilia Camus ', emailAddresses='cc@example.org')
-                }
+                    1101=contact(label='Herr Michael Mellies ', emailAddresses='{main=mih@example.org}'),
+                    1200=contact(label='JM e.K.', emailAddresses='{main=jm-ex-partner@example.org}'),
+                    1201=contact(label='Frau Dr. Jenny Meyer-Billing , JM GmbH', emailAddresses='{main=jm-billing@example.org}'),
+                    1202=contact(label='Herr Andrew Meyer-Operation , JM GmbH', emailAddresses='{main=am-operation@example.org}'),
+                    1203=contact(label='Herr Philip Meyer-Contract , JM GmbH', emailAddresses='{main=pm-partner@example.org}'),
+                    1204=contact(label='Frau Tammy Meyer-VIP , JM GmbH', emailAddresses='{main=tm-vip@example.org}'),
+                    1301=contact(label='Petra Schmidt , Test PS', emailAddresses='{main=ps@example.com}'),
+                    1401=contact(label='Frau Frauke Fanninga ', emailAddresses='{main=ff@example.org}'),
+                    1501=contact(label='Frau Cecilia Camus ', emailAddresses='{main=cc@example.org}')
+                 }
                 """);
         assertThat(toFormattedString(persons)).isEqualToIgnoringWhitespace("""
                 {
                     1=person(personType='LP', tradeName='Hostsharing eG'),
-                    1101=person(personType='NP', tradeName='', familyName='Mellies', givenName='Michael'),
-                    1200=person(personType='LP', tradeName='JM e.K.', familyName='', givenName=''),
+                    1101=person(personType='NP', familyName='Mellies', givenName='Michael'),
+                    1200=person(personType='LP', tradeName='JM e.K.'),
                     1201=person(personType='LP', tradeName='JM GmbH', familyName='Meyer-Billing', givenName='Jenny'),
                     1202=person(personType='LP', tradeName='JM GmbH', familyName='Meyer-Operation', givenName='Andrew'),
                     1203=person(personType='LP', tradeName='JM GmbH', familyName='Meyer-Contract', givenName='Philip'),
                     1204=person(personType='LP', tradeName='JM GmbH', familyName='Meyer-VIP', givenName='Tammy'),
                     1301=person(personType='??', tradeName='Test PS', familyName='Schmidt', givenName='Petra'),
-                    1401=person(personType='NP', tradeName='', familyName='Fanninga', givenName='Frauke'),
-                    1501=person(personType='NP', tradeName='', familyName='Camus', givenName='Cecilia')
-                }
+                    1401=person(personType='NP', familyName='Fanninga', givenName='Frauke'),
+                    1501=person(personType='NP', familyName='Camus', givenName='Cecilia')
+                 }
                 """);
         assertThat(toFormattedString(debitors)).isEqualToIgnoringWhitespace("""
                 {
@@ -363,11 +363,11 @@ public class ImportOfficeData extends ContextBasedTest {
 
         assertThat(toFormattedString(coopShares)).isEqualToIgnoringWhitespace("""
                 {
-                    33443=CoopShareTransaction(M-1001700: 2000-12-06, SUBSCRIPTION, 20, legacy data import, initial share subscription),
-                    33451=CoopShareTransaction(M-1002000: 2000-12-06, SUBSCRIPTION, 2, legacy data import, initial share subscription),
-                    33701=CoopShareTransaction(M-1001700: 2005-01-10, SUBSCRIPTION, 40, legacy data import, increase),
-                    33810=CoopShareTransaction(M-1002000: 2016-12-31, CANCELLATION, 22, legacy data import, membership ended)
-                }
+                    33443=CoopShareTransaction(M-1001700: 2000-12-06, SUBSCRIPTION, 20, 1001700, initial share subscription),
+                    33451=CoopShareTransaction(M-1002000: 2000-12-06, SUBSCRIPTION, 2, 1002000, initial share subscription),
+                    33701=CoopShareTransaction(M-1001700: 2005-01-10, SUBSCRIPTION, 40, 1001700, increase),
+                    33810=CoopShareTransaction(M-1002000: 2016-12-31, CANCELLATION, 22, 1002000, membership ended)
+                 }
                 """);
     }