diff --git a/src/server/testsuite/l2g.0/00.exp b/src/server/testsuite/l2g.0/00.exp
index 937de9fcb8707c2c79448a7718854ce3f69a0581..00c5b4555baa2fcb7c1c6aeb06ac1beae0d6aba8 100644
--- a/src/server/testsuite/l2g.0/00.exp
+++ b/src/server/testsuite/l2g.0/00.exp
@@ -9,43 +9,43 @@ l2g_send "C0 1"
 l2g_send "C0 1"
 l2g_send "l 0 0"
 
-simple_expect "0"
+simple_expect "0" "test 0"
 l2g_send "l 0 1"
-simple_expect "0"
+simple_expect "0" "test 1"
 l2g_send "l 0 2"
-simple_expect "0"
+simple_expect "0" "test 2"
 l2g_send "l 0 3"
-simple_expect "0"
+simple_expect "0" "test 3"
 l2g_send "l 0 4"
-simple_expect "0"
+simple_expect "0" "test 4"
 l2g_send "l 0 5"
-simple_expect "0"
+simple_expect "0" "test 5"
 
 l2g_send "a 0 3 103"
 
 l2g_send "l 0 1"
-simple_expect "0"
+simple_expect "0" "test 6"
 l2g_send "l 0 2"
-simple_expect "0"
+simple_expect "0" "test 7"
 l2g_send "l 0 3"
-simple_expect "103"
+simple_expect "103" "test 8"
 l2g_send "l 0 4"
-simple_expect "0"
+simple_expect "0" "test 9"
 l2g_send "l 0 5"
-simple_expect "0"
+simple_expect "0" "test 10"
 
 l2g_send "a 0 4 104"
 
 l2g_send "l 0 1"
-simple_expect "0"
+simple_expect "0" "test 11"
 l2g_send "l 0 2"
-simple_expect "0"
+simple_expect "0" "test 12"
 l2g_send "l 0 3"
-simple_expect "103"
+simple_expect "103" "test 13"
 l2g_send "l 0 4"
-simple_expect "104"
+simple_expect "104" "test 14"
 l2g_send "l 0 5"
-simple_expect "0"
+simple_expect "0" "test 15"
 
 l2g_send "a 0 5 105"
 l2g_send "a 0 6 106"
@@ -57,8 +57,8 @@ l2g_send "a 0 11 1011"
 l2g_send "a 0 12 1012"
 
 l2g_send "u 0"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 10 0 3 .dense. .103 104 105 106 107 108 109 1010 1011 1012 ."
+simple_expect "Number of blocks: 1" "test 16"
+simple_expect "0: 10 0 3 .dense. .103 104 105 106 107 108 109 1010 1011 1012 ." "test 17"
 #
 l2g_send "a 0 13 1013"
 l2g_send "a 0 14 1014"
@@ -73,87 +73,83 @@ l2g_send "a 0 22 1022"
 l2g_send "a 0 23 1023"
 
 l2g_send "l 0 1"
-simple_expect "0" "test 1"
+simple_expect "0" "test 18"
 l2g_send "l 0 2"
-simple_expect "0" "test 2"
+simple_expect "0" "test 19"
 l2g_send "l 0 3"
-simple_expect "103"
+simple_expect "103" "test 20"
 l2g_send "l 0 4"
-simple_expect "104"
+simple_expect "104" "test 21"
 l2g_send "l 0 5"
-simple_expect "105"
+simple_expect "105" "test 22"
 l2g_send "l 0 24"
-simple_expect "0"
+simple_expect "0" "test 23"
 l2g_send "l 0 23"
-simple_expect "1023"
+simple_expect "1023" "test 24"
 l2g_send "l 0 22"
-simple_expect "1022"
+simple_expect "1022" "test 25"
 l2g_send "l 0 20"
-simple_expect "1020"
+simple_expect "1020" "test 26"
 
 l2g_send "d 0 20"
 
 l2g_send "l 0 20"
-simple_expect "0" "deletion works"
+simple_expect "0" "deletion works test 27"
 
 l2g_send "l 0 1"
-simple_expect "0"
+simple_expect "0" "test 28"
 l2g_send "l 0 2"
-simple_expect "0"
+simple_expect "0" "test 29"
 l2g_send "l 0 3"
-simple_expect "103"
+simple_expect "103" "test 30"
 l2g_send "l 0 4"
-simple_expect "104"
+simple_expect "104" "test 31"
 l2g_send "l 0 5"
-simple_expect "105"
+simple_expect "105" "test 32"
 l2g_send "l 0 24"
-simple_expect "0"
+simple_expect "0" "test 33"
 l2g_send "l 0 23"
-simple_expect "1023"
+simple_expect "1023" "test 34"
 l2g_send "l 0 22"
-simple_expect "1022"
+simple_expect "1022" "test 35"
 l2g_send "l 0 20"
-simple_expect "0"
+simple_expect "0" "test 36"
 l2g_send "l 0 21"
-simple_expect "1021"
+simple_expect "1021" "test 37"
 l2g_send "l 0 19"
-simple_expect "1019"
+simple_expect "1019" "test 38"
 
 l2g_send "d 0 19"
 l2g_send "l 0 18"
-simple_expect "1018"
+simple_expect "1018" "test 39"
 l2g_send "l 0 19"
-simple_expect "0"
+simple_expect "0" "test 40"
 l2g_send "l 0 20"
-simple_expect "0"
+simple_expect "0" "test 41"
 l2g_send "l 0 21"
-simple_expect "1021"
+simple_expect "1021" "test 42"
 
 proc check_state {map} {
     l2g_send "n $map 0"
-    setup_xfail "*"
-    simple_expect "3" "checking index 0 in $map"
+    simple_expect "3" "checking index 0 in $map (test 43)"
     foreach n {3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 20 21 22} {
 	l2g_send "n $map $n"
-	setup_xfail "*"
-	simple_expect "[expr {$n + 1}]" "checking $n in $map"
+	simple_expect "[expr {$n + 1}]" "checking $n in $map (test 44)"
     }
     l2g_send "n $map 18"
-    setup_xfail "*"
-    simple_expect "21" "checking 18 in $map"
+    simple_expect "21" "checking 18 in $map (test 45)"
     l2g_send "n $map 19"
-    setup_xfail "*"
-    simple_expect "21" "checking 19 in $map"
+    simple_expect "21" "checking 19 in $map (test 46)"
     l2g_send "n $map 23"
-    simple_expect "0" "checking 23 in $map"
+    simple_expect "0" "checking 23 in $map (test 47)"
     l2g_send "n $map 24"
-    simple_expect "0" "checking 24 in $map"
+    simple_expect "0" "checking 24 in $map (test 48)"
 }
 
 check_state 0
 
 l2g_send "n 1 0"
-simple_expect "0"
+simple_expect "0" "test 49"
 
 l2g_send "C0 1"
 
@@ -164,43 +160,87 @@ check_state 1
 
 l2g_send "d 1 13"
 l2g_send "l 0 14"
-simple_expect "0"
+simple_expect "0" "test 50"
 l2g_send "l 1 13"
-simple_expect "0"
+simple_expect "0" "test 51"
 
 l2g_send "I2"
 l2g_send "u 2"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 0 10 0 \\(dense\\) \\\[\\\]"
+simple_expect "Number of blocks: 0" "test 52"
 
 l2g_send "a2 10 139"
 l2g_send "u 2"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 1 9 10 \\(dense\\) \\\[139 \\\]"
+simple_expect "Number of blocks: 1" "test 53"
+simple_expect "0: 1 9 10 \\(dense\\) \\\[139 \\\]" "test 54"
 
 l2g_send "a2 12 141"
 l2g_send "u 2"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 3 8 10 \\(dense\\) \\\[139 0 141 \\\]"
+simple_expect "Number of blocks: 1" "test 55"
+simple_expect "0: 3 8 10 \\(dense\\) \\\[139 0 141 \\\]" "test 56"
 
 l2g_send "a2 14 147"
 l2g_send "u 2"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 5 7 10 \\(dense\\) \\\[139 0 141 0 147 \\\]"
+simple_expect "Number of blocks: 1" "test 57"
+simple_expect "0: 5 7 10 \\(dense\\) \\\[139 0 141 0 147 \\\]" "test 58"
 
 l2g_send "a2 16 153"
 l2g_send "u 2"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 7 6 10 \\(dense\\) \\\[139 0 141 0 147 0 153 \\\]"
+simple_expect "Number of blocks: 1" "test 59"
+simple_expect "0: 7 6 10 \\(dense\\) \\\[139 0 141 0 147 0 153 \\\]" "test 60"
 
 l2g_send "a2 18 157"
 l2g_send "u 2"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 9 5 10 \\(dense\\) \\\[139 0 141 0 147 0 153 0 157 \\\]"
+simple_expect "Number of blocks: 1" "test 61"
+simple_expect "0: 9 5 10 \\(dense\\) \\\[139 0 141 0 147 0 153 0 157 \\\]" "test 62"
 
 l2g_send "a2 21 167"
 l2g_send "u 2"
-simple_expect "Number of blocks: 1"
-simple_expect "0: 6 4 10 \\(sparse\\) \\\[10:139 12:141 14:147 16:153 18:157 21:167 \\\]"
+simple_expect "Number of blocks: 1" "test 63"
+simple_expect "0: 6 4 10 \\(sparse\\) \\\[10:139 12:141 14:147 16:153 18:157 21:167 \\\]" "test 64"
+
+l2g_send "a2 28 170"
+l2g_send "a2 92 171"
+l2g_send "a2 99 172"
+l2g_send "a2 102 173"
+
+l2g_send "u 2"
+simple_expect "Number of blocks: 1" "test 65"
+simple_expect "0: 10 0 10 \\(sparse\\) \\\[10:139 12:141 14:147 16:153 18:157 21:167 28:170 92:171 99:172 102:173 \\\]" "test 66"
+
+set block1 ""
+set nf 0
+set zeroes 10
+foreach x {{103 177} {104 178} {105 179} {106 180} {107 181} {108 182} {109 183} {110 184} {111 185} {112 186}} {
+    
+    l2g_send "a2 $x"
+    append block1 "[lindex $x 1] "
+
+    l2g_send "u 2"
+    incr nf 1
+    incr zeroes -1
+
+    simple_expect "Number of blocks: 2" "test 67"
+    simple_expect "0: 10 0 10 \\(sparse\\) \\\[10:139 12:141 14:147 16:153 18:157 21:167 28:170 92:171 99:172 102:173 \\\]" "test 68"
+    simple_expect "1: $nf $zeroes 103 \\(dense\\) \\\[$block1\\\]" "test 69"
+}
+
+l2g_send "a2 113 189"
+l2g_send "u2"
+simple_expect "Number of blocks: 3" "test 70"
+simple_expect "0: 10 0 10 \\(sparse\\) \\\[10:139 12:141 14:147 16:153 18:157 21:167 28:170 92:171 99:172 102:173 \\\]" "test 71"
+simple_expect "1: 10 0 103 \\(dense\\) \\\[$block1\\\]" "test 72"
+simple_expect "2: 1 9 113 \\(dense\\) \\\[189 \\\]" "test 73"
+
+l2g_send "l2 113"
+simple_expect "189" "test 74"
+l2g_send "l2 112"
+simple_expect 186 "test 75"
+l2g_send "l2 103"
+simple_expect 177 "test 76"
+l2g_send "l2 102"
+simple_expect 173 "test 77"
+l2g_send "l2 101"
+simple_expect 0 "test 78"
+
 
 l2g_stop