diff --git a/src/server/testsuite/lyskomd.0/03.exp b/src/server/testsuite/lyskomd.0/03.exp
index 6a5e651368bf698827df579f14f1f9bd129ccece..26e1ac97d901cd1bfd7ba43b7d43062dbf814a2c 100644
--- a/src/server/testsuite/lyskomd.0/03.exp
+++ b/src/server/testsuite/lyskomd.0/03.exp
@@ -3,6 +3,7 @@
 # The following objects are created in this test case:
 #   Conferences
 #    7 "(So called) Christian Music", later "PRIMa musik"
+#    9 "Temporary Sancturay"
 #   Persons
 #    6 "Per Cederqvist"
 #         Member of 7.
@@ -304,40 +305,190 @@ simple_expect "%1063 12 0"
 send "1064 42 255\n"
 simple_expect "=1064"
 send "1065 6 8 0\n"
-simple_expect "=1065 [holl ""] 0000010000000000 00000000 $any_time 0 0 2 0 64 0 0 0 0 1 4 0 2"
+simple_expect "=1065 [holl ""] 0000010000000000 00000000 $any_time 0 $any_num 2 0 64 0 0 0 0 1 4 0 2"
 send "1066 7 8 0000000000000000\n"
 simple_expect "=1066"
 send "1067 6 8 0\n"
-simple_expect "=1067 [holl ""] 0000000000000000 00000000 $any_time 0 0 2 0 64 0 0 0 0 1 4 0 2"
+simple_expect "=1067 [holl ""] 0000000000000000 00000000 $any_time 0 $any_num 2 0 64 0 0 0 0 1 4 0 2"
 send "1068 7 8 1111111111111111\n"
 simple_expect "=1068"
 send "1069 6 8 0\n"
-simple_expect "=1069 [holl ""] 1111111111111111 00000000 $any_time 0 0 2 0 64 0 0 0 0 1 4 0 2"
+simple_expect "=1069 [holl ""] 1111111111111111 00000000 $any_time 0 $any_num 2 0 64 0 0 0 0 1 4 0 2"
 send "1070 7 8 0000010000000000\n"
 simple_expect "=1070"
 send "1071 6 8 0\n"
-simple_expect "=1071 [holl ""] 0000010000000000 00000000 $any_time 0 0 2 0 64 0 0 0 0 1 4 0 2"
-
-# FIXME: test call 8
-# FIXME: test call 9
-# FIXME: test call 10
-# FIXME: test call 11
-# FIXME: test call 12
-# FIXME: test call 13
-# FIXME: test call 14
-# call 15 is tested above
-# FIXME: test call 16
-# FIXME: test call 17
-# FIXME: test call 18
-# FIXME: test call 19
-# FIXME: test call 20
-# FIXME: test call 21
-# FIXME: test call 22
-# FIXME: test call 23
-# FIXME: test call 24
-# FIXME: test call 25
-# FIXME: test call 26
-# FIXME: test call 27
+simple_expect "=1071 [holl ""] 0000010000000000 00000000 $any_time 0 $any_num 2 0 64 0 0 0 0 1 4 0 2"
+
+# test call 8 (set-passwd)
+send "1072 8 5 [holl "foo"] [holl "bar"]\n"
+simple_expect "%1072 4 5"
+send "1073 8 5 [holl "gazonk"] [holl "bar"]\n"
+simple_expect "=1073"
+send "1074 1\n"
+simple_expect "=1074"
+send "1075 62 5 [holl "gazonk"] 1\n"
+simple_expect "%1075 4 5"
+send "1076 62 5 [holl "bar"] 1\n"
+simple_expect "=1076"
+
+# test call 9 (query-read-texts-old)
+talk_to client 0
+send "1077 9 6 7\n"
+simple_expect "=1077 $any_time 7 100 0 0 \\*"
+
+# test call 10 (create-conf-old)
+send "1078 78 9\n"
+simple_expect "%1078 9 9"
+send "1079 10 [holl "Temporary Sanctuary"] 1010\n"
+simple_expect "=1079 9"
+send "1080 78 9\n"
+simple_expect "=1080 [holl "Temporary Sanctuary"] 10100000 0 77"
+
+# test call 11 (delete-conf)
+send "1081 11 9\n"
+simple_expect "=1081"
+send "1082 78 9\n"
+simple_expect "%1082 9 9"
+
+# test call 12 (lookup-name)
+send "1083 12 [holl "p"]\n"
+simple_expect "=1083 4 { 1 2 6 7 } { 0000 0000 1001 0000 }"
+send "1084 12 [holl "p c"]\n"
+simple_expect "=1084 1 { 6 } { 1001 }"
+send "1085 12 [holl "xyzzy"]\n"
+simple_expect "=1085 0 \\* \\*"
+
+# test call 13 (get-conf-stat-older)
+send "1086 13 3 0\n"
+simple_expect "=1086 [holl ""] 0000 $any_time $any_time 0 0 0 0 0 0 77 0 1 0"
+send "1087 13 3 1\n"
+simple_expect "=1087 [holl "Lappar .p�. d�rren"] 0000 $any_time $any_time 0 0 0 0 0 0 77 0 1 0"
+
+# test call 14 (add-member-old)
+send "1088 14 3 6 90 2\n"
+simple_expect "=1088"
+send "1089 13 3 1\n"
+simple_expect "=1089 [holl "Lappar .p�. d�rren"] 0000 $any_time $any_time 0 0 0 0 0 0 77 1 1 0"
+
+# test call 15 (sub-member)
+send "1090 15 3 6\n"
+simple_expect ":1 8 3"
+simple_expect "=1090"
+send "1091 15 3 6\n"
+simple_expect "%1091 13 3"
+
+# test call 16 (set-presentation)
+send "1092 16 7 3\n"
+simple_expect "=1092"
+# We check the result under call 50 below.
+
+# test call 17 (set-etc-motd)
+send "1093 17 7 2\n"
+simple_expect "=1093"
+# We check the result under call 50 below.
+
+# test call 18 (set-supervisor)
+send "1094 18 7 7\n"
+simple_expect "=1094"
+# We check the result under call 50 below.
+
+# test call 19 (set-permitted-submitters)
+send "1095 19 7 8\n"
+simple_expect "=1095"
+# We check the result under call 50 below.
+
+# test call 20 (set-super-conf)
+send "1096 20 7 4\n"
+simple_expect "=1096"
+# We check the result under call 50 below.
+
+# test call 21 (set-conf-type)
+send "1097 21 7 0100\n"
+simple_expect "=1097"
+send "1098 21 7 01001000\n"
+simple_expect "=1098"
+# We check the result under call 50 below.
+
+# test call 22 (set-garb-nice)
+send "1099 22 7 144\n"
+simple_expect "=1099"
+# We check the result under call 50 below.
+
+# test call 23 (get-marks) and call 24 (mark-text-old)
+send "1100 24 2 15\n"
+simple_expect "=1100"
+send "1101 23\n"
+simple_expect "=1101 1 { 2 15 }"
+send "1102 24 2 28\n"
+simple_expect "=1102"
+send "1103 23\n"
+simple_expect "=1103 1 { 2 28 }"
+send "1104 24 3 9\n"
+simple_expect "=1104"
+send "1105 23\n"
+simple_expect "=1105 2 { 2 28 3 9 }"
+send "1106 24 2 0\n"
+simple_expect "=1106"
+send "1107 23\n"
+simple_expect "=1107 1 { 3 9 }"
+send "1108 24 3 0\n"
+simple_expect "=1108"
+send "1109 23\n"
+simple_expect "=1109 0 \\*"
+
+# call 25 is tested extensively in 02.exp
+
+# test call 26 (get-text-stat-old)
+send "1110 26 1\n"
+simple_expect "=1110 $any_time 6 0 16 0 2 { 0 7 6 1 }"
+
+# test call 27 (mark-as-read)
+send "1111 9 6 7\n"
+simple_expect "=1111 $any_time 7 100 0 0 \\*"
+
+send "1112 27 7 1 { 2 }\n"
+simple_expect "=1112"
+send "1113 9 6 7\n"
+simple_expect "=1113 $any_time 7 100 0 1 { 2 }"
+
+send "1114 27 7 1 { 2 }\n"
+simple_expect "=1114"
+send "1115 46 6 1 1 1\n"
+simple_expect "=1115 1 { $any_time 7 100 0 1 { 2 } }"
+
+send "1116 27 7 1 { 4 }\n"
+simple_expect "=1116"
+send "1117 9 6 7\n"
+simple_expect "=1117 $any_time 7 100 0 2 { 2 4 }"
+
+send "1118 27 7 1 { 5 }\n"
+simple_expect "=1118"
+send "1119 9 6 7\n"
+simple_expect "=1119 $any_time 7 100 0 3 { 2 4 5 }"
+
+send "1120 27 7 1 { 6 }\n"
+simple_expect "=1120"
+send "1121 9 6 7\n"
+simple_expect "=1121 $any_time 7 100 0 4 { 2 4 5 6 }"
+
+send "1122 27 7 1 { 1 }\n"
+simple_expect "=1122"
+send "1123 9 6 7\n"
+simple_expect "=1123 $any_time 7 100 2 3 { 4 5 6 }"
+
+send "1124 27 7 1 { 7 }\n"
+simple_expect "%1124 16 0"
+send "1125 9 6 7\n"
+simple_expect "=1125 $any_time 7 100 2 3 { 4 5 6 }"
+
+send "1126 27 7 1 { 3 }\n"
+simple_expect "=1126"
+send "1127 9 6 7\n"
+simple_expect "=1127 $any_time 7 100 6 0 \\*"
+
+# FIXME: test call 27 more (sequential, other orders, more than a
+# single argument at the same time).
+
 # FIXME: test call 28
 # FIXME: test call 29
 # FIXME: test call 30
@@ -360,7 +511,9 @@ simple_expect "=1071 [holl ""] 0000010000000000 00000000 $any_time 0 0 2 0 64 0
 # FIXME: test call 47
 # FIXME: test call 48
 # FIXME: test call 49
-# FIXME: test call 50
+# test call 50 (get-conf-stat-old)
+send "1128 50 7\n"
+simple_expect "=1128 [holl "PRIMa musik"] 0100 $any_time $any_time 6 3 7 8 4 2 144 2 1 6"
 # FIXME: test call 51
 # FIXME: test call 52
 # FIXME: test call 53
@@ -388,7 +541,10 @@ simple_expect "=1071 [holl ""] 0000010000000000 00000000 $any_time 0 0 2 0 64 0
 # FIXME: test call 75
 # FIXME: test call 76
 # FIXME: test call 77
-# FIXME: test call 78
+# test call 78 (get-uconf-stat)
+send "1129 78 7\n"
+simple_expect "=1129 [holl "PRIMa musik"] 01001000 6 144"
+
 # FIXME: test call 79
 # call 80 is tested during startup of client 1.
 # call 81 is tested during startup of client 1.
@@ -417,32 +573,32 @@ simple_expect "=1071 [holl ""] 0000010000000000 00000000 $any_time 0 0 2 0 64 0
 # FIXME: test call 104
 
 # There is no call 105--yet.
-send "1072 105\n"
-simple_expect "%1072 2 0"
+send "1130 105\n"
+simple_expect "%1130 2 0"
 
 # There is no call 106--yet.
-send "1073 106\n"
-simple_expect "%1073 2 0"
+send "1131 106\n"
+simple_expect "%1131 2 0"
 
 # There is no call 107--yet.
-send "1074 107\n"
-simple_expect "%1074 2 0"
+send "1132 107\n"
+simple_expect "%1132 2 0"
 
 # There is no call 108--yet.
-send "1075 108\n"
-simple_expect "%1075 2 0"
+send "1133 108\n"
+simple_expect "%1133 2 0"
 
 # There is no call 109--yet.
-send "1076 109\n"
-simple_expect "%1076 2 0"
+send "1134 109\n"
+simple_expect "%1134 2 0"
 
 # There is no call 110--yet.
-send "1077 110\n"
-simple_expect "%1077 2 0"
+send "1135 110\n"
+simple_expect "%1135 2 0"
 
 talk_to client 1
-send "1078 55 2\n"
-simple_expect "=1078"
+send "1136 55 2\n"
+simple_expect "=1136"
 simple_expect ":2 13 8 2"
 client_death 1
 
@@ -450,15 +606,15 @@ client_death 1
 talk_to client 0
 simple_expect ":2 13 8 2"
 
-send "1079 62 5 [holl "gazonk"] 0\n"
+send "1137 62 5 [holl "bar"] 0\n"
 simple_expect ":2 13 6 1"
 simple_expect ":2 9 5 1"
-simple_expect "=1079"
+simple_expect "=1137"
 
-send "1080 42 255\n"
-simple_expect "=1080" "42=enable succeeded"
-send "1081 44 0\n"
-simple_expect "=1081" "44=shutdown-kom succeeded"
+send "1138 42 255\n"
+simple_expect "=1138" "42=enable succeeded"
+send "1139 44 0\n"
+simple_expect "=1139" "44=shutdown-kom succeeded"
 simple_expect ":2 13 5 1"
 client_death 0
 # FIXME: There are enqueued logout/disconnect messages to this client.