diff --git a/src/test/expect/test_dot.expected b/src/test/expect/test_dot.expected
index e1eb0ff3..7d4f7c2f 100644
--- a/src/test/expect/test_dot.expected
+++ b/src/test/expect/test_dot.expected
@@ -34,51 +34,63 @@ subgraph "cluster_0" {
 	n4->n2[penwidth="2.0"];
 	n4->n3[penwidth="2.0"];
 
+}
+subgraph "cluster_1" {
+	label = "JRC"
 	n3->n6[penwidth="2.0"];
 	n6[shape="box",label="methods.inputs.generate_fine_circular_coverage"];
 	n6->n5[penwidth="2.0"];
 
 }
-subgraph "cluster_1" {
+subgraph "cluster_2" {
 	label = "Ecoregions"
 	n8[shape="box",label="methods.inputs.download_shapefiles"];
 	n8->n7[penwidth="2.0"];
 
+}
+subgraph "cluster_3" {
+	label = "Ecoregions"
 	n7->n10[penwidth="2.0"];
 	n3->n10[penwidth="2.0"];
 	n10[shape="box",label="methods.inputs.generate_ecoregion_rasters"];
 	n10->n9[penwidth="2.0"];
 
 }
-subgraph "cluster_2" {
+subgraph "cluster_4" {
 	label = "ACCESS"
 	n12[shape="box",label="methods.inputs.download_accessibility"];
 	n12->n11[penwidth="2.0"];
 
+}
+subgraph "cluster_5" {
+	label = "ACCESS"
 	n11->n14[penwidth="2.0"];
 	n3->n14[penwidth="2.0"];
 	n14[shape="box",label="methods.inputs.generate_access_tiles"];
 	n14->n13[penwidth="2.0"];
 
 }
-subgraph "cluster_3" {
+subgraph "cluster_6" {
 	label = "Country boarders"
 	n16[shape="box",label="methods.inputs.osm_countries"];
 	n16->n15[penwidth="2.0"];
 
 }
-subgraph "cluster_4" {
+subgraph "cluster_7" {
 	label = "Make variations on project shapes"
 	n0->n18[penwidth="2.0"];
 	n18[shape="box",label="methods.inputs.generate_boundary"];
 	n18->n17[penwidth="2.0"];
 
+}
+subgraph "cluster_8" {
+	label = "Make variations on project shapes"
 	n0->n20[penwidth="2.0"];
 	n20[shape="box",label="methods.inputs.generate_leakage"];
 	n20->n19[penwidth="2.0"];
 
 }
-subgraph "cluster_5" {
+subgraph "cluster_9" {
 	label = "Make LUC tiles"
 	n17->n22[penwidth="2.0"];
 	n3->n22[penwidth="2.0"];
@@ -86,25 +98,40 @@ subgraph "cluster_5" {
 	n22->n21[penwidth="2.0"];
 
 }
-subgraph "cluster_6" {
+subgraph "cluster_10" {
+	label = "GEDI data"
+}
+subgraph "cluster_11" {
 	label = "GEDI data"
 	n17->n24[penwidth="2.0"];
 	n24[shape="box",label="methods.inputs.download_gedi_data"];
 	n24->n23[penwidth="2.0"];
 
+}
+subgraph "cluster_12" {
+	label = "GEDI data"
 	n23->n25[penwidth="2.0"];
 	n25[shape="box",label="methods.inputs.import_gedi_data"];
 
+}
+subgraph "cluster_13" {
+	label = "GEDI data"
 	n17->n27[penwidth="2.0"];
 	n21->n27[penwidth="2.0"];
 	n27[shape="box",label="methods.inputs.generate_carbon_density"];
 	n27->n26[penwidth="2.0"];
 
+}
+subgraph "cluster_14" {
+	label = "GEDI data"
 	n0->n29[penwidth="2.0"];
 	n15->n29[penwidth="2.0"];
 	n29[shape="box",label="methods.inputs.generate_country_list"];
 	n29->n28[penwidth="2.0"];
 
+}
+subgraph "cluster_15" {
+	label = "GEDI data"
 	n0->n31[penwidth="2.0"];
 	n28->n31[penwidth="2.0"];
 	n15->n31[penwidth="2.0"];
@@ -114,7 +141,7 @@ subgraph "cluster_6" {
 	n31->n30[penwidth="2.0"];
 
 }
-subgraph "cluster_7" {
+subgraph "cluster_16" {
 	label = "Elevation and slope data"
 	n0->n34[penwidth="2.0"];
 	n30->n34[penwidth="2.0"];
@@ -122,10 +149,16 @@ subgraph "cluster_7" {
 	n34->n32[penwidth="2.0"];
 	n34->n33[penwidth="2.0"];
 
+}
+subgraph "cluster_17" {
+	label = "Elevation and slope data"
 	n33->n36[penwidth="2.0"];
 	n36[shape="box",label="methods.inputs.generate_slope"];
 	n36->n35[penwidth="2.0"];
 
+}
+subgraph "cluster_18" {
+	label = "Elevation and slope data"
 	n3->n38[penwidth="2.0"];
 	n33->n38[penwidth="2.0"];
 	n38[shape="box",label="methods.inputs.rescale_tiles_to_jrc"];
@@ -137,7 +170,7 @@ subgraph "cluster_7" {
 	n40->n39[penwidth="2.0"];
 
 }
-subgraph "cluster_8" {
+subgraph "cluster_19" {
 	label = "Country raster"
 	n3->n42[penwidth="2.0"];
 	n30->n42[penwidth="2.0"];
@@ -146,7 +179,7 @@ subgraph "cluster_8" {
 	n42->n41[penwidth="2.0"];
 
 }
-subgraph "cluster_9" {
+subgraph "cluster_20" {
 	label = "Calculate set K"
 	n0->n44[penwidth="2.0"];
 	n3->n44[penwidth="2.0"];
@@ -160,7 +193,7 @@ subgraph "cluster_9" {
 	n44->n43[penwidth="2.0"];
 
 }
-subgraph "cluster_10" {
+subgraph "cluster_21" {
 	label = "Calculate set M"
 	n43->n46[penwidth="2.0"];
 	n30->n46[penwidth="2.0"];
@@ -174,10 +207,16 @@ subgraph "cluster_10" {
 	n46[shape="box",label="methods.matching.find_potential_matches"];
 	n46->n45[penwidth="2.0"];
 
+}
+subgraph "cluster_22" {
+	label = "Calculate set M"
 	n45->n48[penwidth="2.0"];
 	n48[shape="box",label="methods.matching.build_m_raster"];
 	n48->n47[penwidth="2.0"];
 
+}
+subgraph "cluster_23" {
+	label = "Calculate set M"
 	n47->n50[penwidth="2.0"];
 	n30->n50[penwidth="2.0"];
 	n3->n50[penwidth="2.0"];
@@ -191,7 +230,7 @@ subgraph "cluster_10" {
 	n50->n49[penwidth="2.0"];
 
 }
-subgraph "cluster_11" {
+subgraph "cluster_24" {
 	label = "Find pairs"
 	n43->n52[penwidth="2.0"];
 	n49->n52[penwidth="2.0"];
@@ -199,7 +238,7 @@ subgraph "cluster_11" {
 	n52->n51[penwidth="2.0"];
 
 }
-subgraph "cluster_12" {
+subgraph "cluster_25" {
 	label = "Calculate additionality"
 	n0->n54[penwidth="2.0"];
 	n26->n54[penwidth="2.0"];