diff --git a/CLI/parser_test.go b/CLI/parser_test.go
index 280364abc..01bdaac0f 100644
--- a/CLI/parser_test.go
+++ b/CLI/parser_test.go
@@ -293,11 +293,10 @@ var commandsMatching = map[string]node{
 	"+site:${toto}/tata":             &createSiteNode{testPath},
 	"+si:${toto}/tata":               &createSiteNode{testPath},
 	"+building:${toto}/tata@[1., 2.]@3.@[.1, 2., 3.]":      &createBuildingNode{testPath, vec2(1., 2.), &valueNode{3.}, vec3(.1, 2., 3.)},
-	"+room:${toto}/tata@[1., 2.]@3.@[.1, 2., 3.]@+x-y":     &createRoomNode{testPath, vec2(1., 2.), &valueNode{3.}, vec3(.1, 2., 3.), &valueNode{"+x-y"}, nil, nil},
-	"+room:${toto}/tata@[1., 2.]@3.@[.1, 2., 3.]@+x-y@m":   &createRoomNode{testPath, vec2(1., 2.), &valueNode{3.}, vec3(.1, 2., 3.), &valueNode{"+x-y"}, &valueNode{"m"}, nil},
-	"+room:${toto}/tata@[1., 2.]@3.@template":              &createRoomNode{testPath, vec2(1., 2.), &valueNode{3.}, nil, nil, nil, &valueNode{"template"}},
-	"+rack:${toto}/tata@[1., 2.]@[.1, 2., 3.]@front":       &createRackNode{testPath, vec2(1., 2.), vec3(.1, 2., 3.), &valueNode{"front"}},
-	"+rack:${toto}/tata@[1., 2.]@template@front":           &createRackNode{testPath, vec2(1., 2.), &valueNode{"template"}, &valueNode{"front"}},
+	"+room:${toto}/tata@[1., 2.]@3.@[.1, 2., 3.]@+x-y":     &createRoomNode{testPath, vec2(1., 2.), &valueNode{3.}, vec3(.1, 2., 3.), &valueNode{"+x-y"}, nil},
+	"+room:${toto}/tata@[1., 2.]@3.@template":              &createRoomNode{testPath, vec2(1., 2.), &valueNode{3.}, nil, nil, &valueNode{"template"}},
+	"+rack:${toto}/tata@[1., 2.]@t@front@[.1, 2., 3.]":     &createRackNode{testPath, vec2(1., 2.), &valueNode{"t"}, &valueNode{"front"}, vec3(.1, 2., 3.)},
+	"+rack:${toto}/tata@[1., 2.]@m@front@template":         &createRackNode{testPath, vec2(1., 2.), &valueNode{"m"}, &valueNode{"front"}, &valueNode{"template"}},
 	"+device:${toto}/tata@42@42":                           &createDeviceNode{testPath, &valueNode{"42"}, &valueNode{"42"}, nil},
 	"+device:${toto}/tata@42@template":                     &createDeviceNode{testPath, &valueNode{"42"}, &valueNode{"template"}, nil},
 	"+device:${toto}/tata@42@template@frontflipped ":       &createDeviceNode{testPath, &valueNode{"42"}, &valueNode{"template"}, &valueNode{"frontflipped"}},