diff --git a/test/functional/3rd-party/3rd-party-bundle-add-basic.bats b/test/functional/3rd-party/3rd-party-bundle-add-basic.bats
index 84d88b39..81b3bd85 100755
--- a/test/functional/3rd-party/3rd-party-bundle-add-basic.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-add-basic.bats
@@ -140,4 +140,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/"$THIRD_PARTY_BUNDLES_DIR"/test-repo2/usr/share/clear/bundles/test-bundle2
 	assert_file_exists "$TPSTATEDIR"/bundles/test-bundle2
 }
-#WEIGHT=21
+#WEIGHT=24
diff --git a/test/functional/3rd-party/3rd-party-bundle-add-config-file.bats b/test/functional/3rd-party/3rd-party-bundle-add-config-file.bats
index c6839b86..e9975ed4 100755
--- a/test/functional/3rd-party/3rd-party-bundle-add-config-file.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-add-config-file.bats
@@ -69,4 +69,4 @@ test_setup() {
 	assert_file_not_exists "$TPSTATEDIR"/bundles/test-bundle3
 
 }
-#WEIGHT=6
+#WEIGHT=7
diff --git a/test/functional/3rd-party/3rd-party-bundle-add-dangerous-flags.bats b/test/functional/3rd-party/3rd-party-bundle-add-dangerous-flags.bats
index 06699cb5..e2d7e00f 100755
--- a/test/functional/3rd-party/3rd-party-bundle-add-dangerous-flags.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-add-dangerous-flags.bats
@@ -142,3 +142,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=12
diff --git a/test/functional/3rd-party/3rd-party-bundle-add-export-bin.bats b/test/functional/3rd-party/3rd-party-bundle-add-export-bin.bats
index 5d8a4861..23764ce5 100755
--- a/test/functional/3rd-party/3rd-party-bundle-add-export-bin.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-add-export-bin.bats
@@ -89,7 +89,6 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=8
 
 @test "TPR068: Adding bundles that share a binary" {
 
@@ -202,3 +201,4 @@ test_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
+#WEIGHT=22
diff --git a/test/functional/3rd-party/3rd-party-bundle-add-multi-repo.bats b/test/functional/3rd-party/3rd-party-bundle-add-multi-repo.bats
index e991a850..fb311101 100755
--- a/test/functional/3rd-party/3rd-party-bundle-add-multi-repo.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-add-multi-repo.bats
@@ -76,4 +76,4 @@ test_setup() {
 	assert_file_exists "$STATEDIR"/3rd-party/repo2/bundles/test-bundle1
 
 }
-#WEIGHT=13
+#WEIGHT=15
diff --git a/test/functional/3rd-party/3rd-party-bundle-add-state.bats b/test/functional/3rd-party/3rd-party-bundle-add-state.bats
index 52aac6c5..0f0f5936 100755
--- a/test/functional/3rd-party/3rd-party-bundle-add-state.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-add-state.bats
@@ -45,3 +45,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/"$THIRD_PARTY_BUNDLES_DIR"/repo1/boot/file_4
 
 }
+#WEIGHT=5
diff --git a/test/functional/3rd-party/3rd-party-bundle-add-symlink.bats b/test/functional/3rd-party/3rd-party-bundle-add-symlink.bats
index b1927d62..1c7c4499 100755
--- a/test/functional/3rd-party/3rd-party-bundle-add-symlink.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-add-symlink.bats
@@ -45,3 +45,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/"$THIRD_PARTY_BUNDLES_DIR"/test-repo1/usr/share/clear/bundles/test-bundle1
 
 }
+#WEIGHT=5
diff --git a/test/functional/3rd-party/3rd-party-bundle-info-basic.bats b/test/functional/3rd-party/3rd-party-bundle-info-basic.bats
index babccb8c..8096b125 100755
--- a/test/functional/3rd-party/3rd-party-bundle-info-basic.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-info-basic.bats
@@ -155,4 +155,4 @@ global_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=9
+#WEIGHT=10
diff --git a/test/functional/3rd-party/3rd-party-bundle-list-basic.bats b/test/functional/3rd-party/3rd-party-bundle-list-basic.bats
index 9c0c20c9..925ade82 100755
--- a/test/functional/3rd-party/3rd-party-bundle-list-basic.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-list-basic.bats
@@ -131,4 +131,4 @@ global_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=8
+#WEIGHT=10
diff --git a/test/functional/3rd-party/3rd-party-bundle-list-deps.bats b/test/functional/3rd-party/3rd-party-bundle-list-deps.bats
index cd68eeb9..3aac7891 100755
--- a/test/functional/3rd-party/3rd-party-bundle-list-deps.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-list-deps.bats
@@ -69,4 +69,4 @@ global_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=8
+#WEIGHT=9
diff --git a/test/functional/3rd-party/3rd-party-bundle-remove-basic.bats b/test/functional/3rd-party/3rd-party-bundle-remove-basic.bats
index 806603c0..10215f24 100755
--- a/test/functional/3rd-party/3rd-party-bundle-remove-basic.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-remove-basic.bats
@@ -123,4 +123,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/"$THIRD_PARTY_BUNDLES_DIR"/test-repo1/usr/share/clear/bundles/test-bundle1
 
 }
-#WEIGHT=22
+#WEIGHT=24
diff --git a/test/functional/3rd-party/3rd-party-bundle-remove-exported-bin.bats b/test/functional/3rd-party/3rd-party-bundle-remove-exported-bin.bats
index 0971550b..7d9d4f06 100755
--- a/test/functional/3rd-party/3rd-party-bundle-remove-exported-bin.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-remove-exported-bin.bats
@@ -49,7 +49,6 @@ test_setup() {
 	assert_file_exists "$PATH_PREFIX"/"$THIRD_PARTY_BIN_DIR"/bin_file1
 
 }
-#WEIGHT=5
 
 @test "TPR070: Removing all third party bundles that exported a binary that is still needed but non-exported" {
 
@@ -120,3 +119,4 @@ test_setup() {
 	assert_file_exists "$TPTARGETDIR"/usr/bin/bin_file1
 
 }
+#WEIGHT=21
diff --git a/test/functional/3rd-party/3rd-party-bundle-remove-multi-repo.bats b/test/functional/3rd-party/3rd-party-bundle-remove-multi-repo.bats
index f1b7c371..fb6ac474 100755
--- a/test/functional/3rd-party/3rd-party-bundle-remove-multi-repo.bats
+++ b/test/functional/3rd-party/3rd-party-bundle-remove-multi-repo.bats
@@ -100,4 +100,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=29
+#WEIGHT=33
diff --git a/test/functional/3rd-party/3rd-party-check-update-basic.bats b/test/functional/3rd-party/3rd-party-check-update-basic.bats
index 6719534f..b06a38eb 100755
--- a/test/functional/3rd-party/3rd-party-check-update-basic.bats
+++ b/test/functional/3rd-party/3rd-party-check-update-basic.bats
@@ -77,4 +77,4 @@ global_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=7
+#WEIGHT=8
diff --git a/test/functional/3rd-party/3rd-party-diagnose-basic.bats b/test/functional/3rd-party/3rd-party-diagnose-basic.bats
index d27c510f..1aae4e7e 100755
--- a/test/functional/3rd-party/3rd-party-diagnose-basic.bats
+++ b/test/functional/3rd-party/3rd-party-diagnose-basic.bats
@@ -217,4 +217,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=9
+#WEIGHT=10
diff --git a/test/functional/3rd-party/3rd-party-info.bats b/test/functional/3rd-party/3rd-party-info.bats
index ddfd2615..f37e6294 100755
--- a/test/functional/3rd-party/3rd-party-info.bats
+++ b/test/functional/3rd-party/3rd-party-info.bats
@@ -60,3 +60,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=12
diff --git a/test/functional/3rd-party/3rd-party-repair-basic.bats b/test/functional/3rd-party/3rd-party-repair-basic.bats
index 762823b9..d8a90b87 100755
--- a/test/functional/3rd-party/3rd-party-repair-basic.bats
+++ b/test/functional/3rd-party/3rd-party-repair-basic.bats
@@ -254,4 +254,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=38
+#WEIGHT=40
diff --git a/test/functional/3rd-party/3rd-party-repair-exported-bin.bats b/test/functional/3rd-party/3rd-party-repair-exported-bin.bats
index deae9362..374c1162 100755
--- a/test/functional/3rd-party/3rd-party-repair-exported-bin.bats
+++ b/test/functional/3rd-party/3rd-party-repair-exported-bin.bats
@@ -72,3 +72,4 @@ test_setup() {
 	sudo grep -vq "TEST_STRING" "$TARGETDIR"/"$THIRD_PARTY_BIN_DIR"/binary_3 || exit 1
 
 }
+#WEIGHT=5
diff --git a/test/functional/3rd-party/3rd-party-repo-add-force.bats b/test/functional/3rd-party/3rd-party-repo-add-force.bats
index 5a41a0b0..923cad7c 100755
--- a/test/functional/3rd-party/3rd-party-repo-add-force.bats
+++ b/test/functional/3rd-party/3rd-party-repo-add-force.bats
@@ -96,3 +96,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=8
diff --git a/test/functional/3rd-party/3rd-party-repo-add.bats b/test/functional/3rd-party/3rd-party-repo-add.bats
index 072d7bfb..a27f7f0d 100755
--- a/test/functional/3rd-party/3rd-party-repo-add.bats
+++ b/test/functional/3rd-party/3rd-party-repo-add.bats
@@ -90,4 +90,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=8
+#WEIGHT=9
diff --git a/test/functional/3rd-party/3rd-party-repo-remove-corrupt.bats b/test/functional/3rd-party/3rd-party-repo-remove-corrupt.bats
index 60f61ae5..6554c620 100755
--- a/test/functional/3rd-party/3rd-party-repo-remove-corrupt.bats
+++ b/test/functional/3rd-party/3rd-party-repo-remove-corrupt.bats
@@ -52,3 +52,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=8
diff --git a/test/functional/3rd-party/3rd-party-repo-remove-negative.bats b/test/functional/3rd-party/3rd-party-repo-remove-negative.bats
index 9e25276f..56a42003 100755
--- a/test/functional/3rd-party/3rd-party-repo-remove-negative.bats
+++ b/test/functional/3rd-party/3rd-party-repo-remove-negative.bats
@@ -63,4 +63,4 @@ test_setup(){
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=11
+#WEIGHT=12
diff --git a/test/functional/3rd-party/3rd-party-repo-remove.bats b/test/functional/3rd-party/3rd-party-repo-remove.bats
index 02e904a5..ce781f8f 100755
--- a/test/functional/3rd-party/3rd-party-repo-remove.bats
+++ b/test/functional/3rd-party/3rd-party-repo-remove.bats
@@ -57,4 +57,4 @@ test_setup(){
 	assert_file_exists "$PATH_PREFIX"/"$THIRD_PARTY_BIN_DIR"/binary_5
 
 }
-#WEIGHT=11
+#WEIGHT=12
diff --git a/test/functional/3rd-party/3rd-party-update-basic.bats b/test/functional/3rd-party/3rd-party-update-basic.bats
index b37ef50c..6efa6b37 100755
--- a/test/functional/3rd-party/3rd-party-update-basic.bats
+++ b/test/functional/3rd-party/3rd-party-update-basic.bats
@@ -143,4 +143,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=32
+#WEIGHT=35
diff --git a/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats b/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats
index 4bd7754b..1370d417 100755
--- a/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats
+++ b/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats
@@ -196,3 +196,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=20
diff --git a/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats b/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats
index 92d43bb5..2ca7819e 100755
--- a/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats
+++ b/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats
@@ -219,3 +219,4 @@ test_setup() {
 	assert_equal "$template_file" "$template"
 
 }
+#WEIGHT=23
diff --git a/test/functional/3rd-party/3rd-party-update-export-template.bats b/test/functional/3rd-party/3rd-party-update-export-template.bats
index fec888f4..a4ee8464 100755
--- a/test/functional/3rd-party/3rd-party-update-export-template.bats
+++ b/test/functional/3rd-party/3rd-party-update-export-template.bats
@@ -239,3 +239,4 @@ test_setup() {
 	assert_equal "$template_file" "$template"
 
 }
+#WEIGHT=24
diff --git a/test/functional/3rd-party/3rd-party-update-exported-bin.bats b/test/functional/3rd-party/3rd-party-update-exported-bin.bats
index 35f4af2b..f1c3a577 100755
--- a/test/functional/3rd-party/3rd-party-update-exported-bin.bats
+++ b/test/functional/3rd-party/3rd-party-update-exported-bin.bats
@@ -85,4 +85,4 @@ test_setup() {
 	sudo grep -vq "TEST_STRING" "$TARGETDIR"/"$THIRD_PARTY_BIN_DIR"/binary_2 || exit 1
 
 }
-#WEIGHT=9
+#WEIGHT=14
diff --git a/test/functional/3rd-party/3rd-party-update-specific-version.bats b/test/functional/3rd-party/3rd-party-update-specific-version.bats
index a72fc455..34eba677 100755
--- a/test/functional/3rd-party/3rd-party-update-specific-version.bats
+++ b/test/functional/3rd-party/3rd-party-update-specific-version.bats
@@ -68,4 +68,4 @@ test_setup() {
 	assert_in_output "$expected_output"
 
 }
-#WEIGHT=10
+#WEIGHT=12
diff --git a/test/functional/api/api-3rd-party-bundle-add.bats b/test/functional/api/api-3rd-party-bundle-add.bats
index af95524a..e5829761 100755
--- a/test/functional/api/api-3rd-party-bundle-add.bats
+++ b/test/functional/api/api-3rd-party-bundle-add.bats
@@ -33,3 +33,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=14
diff --git a/test/functional/api/api-3rd-party-bundle-info.bats b/test/functional/api/api-3rd-party-bundle-info.bats
index 35e053c0..4c9f772c 100755
--- a/test/functional/api/api-3rd-party-bundle-info.bats
+++ b/test/functional/api/api-3rd-party-bundle-info.bats
@@ -182,3 +182,4 @@ global_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
+#WEIGHT=10
diff --git a/test/functional/api/api-3rd-party-bundle-list.bats b/test/functional/api/api-3rd-party-bundle-list.bats
index 59539900..2a45b7cd 100755
--- a/test/functional/api/api-3rd-party-bundle-list.bats
+++ b/test/functional/api/api-3rd-party-bundle-list.bats
@@ -146,3 +146,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=10
diff --git a/test/functional/api/api-3rd-party-bundle-remove.bats b/test/functional/api/api-3rd-party-bundle-remove.bats
index a5b9647b..d20c4d99 100755
--- a/test/functional/api/api-3rd-party-bundle-remove.bats
+++ b/test/functional/api/api-3rd-party-bundle-remove.bats
@@ -31,3 +31,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=10
diff --git a/test/functional/api/api-3rd-party-checkupdate.bats b/test/functional/api/api-3rd-party-checkupdate.bats
index 74182521..e4d19529 100755
--- a/test/functional/api/api-3rd-party-checkupdate.bats
+++ b/test/functional/api/api-3rd-party-checkupdate.bats
@@ -55,3 +55,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=21
diff --git a/test/functional/api/api-3rd-party-clean.bats b/test/functional/api/api-3rd-party-clean.bats
index c70a8f84..a22bcbf8 100755
--- a/test/functional/api/api-3rd-party-clean.bats
+++ b/test/functional/api/api-3rd-party-clean.bats
@@ -70,3 +70,4 @@ test_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
+#WEIGHT=13
diff --git a/test/functional/api/api-3rd-party-diagnose.bats b/test/functional/api/api-3rd-party-diagnose.bats
index df4871f6..ccbc5aa4 100755
--- a/test/functional/api/api-3rd-party-diagnose.bats
+++ b/test/functional/api/api-3rd-party-diagnose.bats
@@ -62,3 +62,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=9
diff --git a/test/functional/api/api-3rd-party-info.bats b/test/functional/api/api-3rd-party-info.bats
index 6736863f..7bf2b2f5 100755
--- a/test/functional/api/api-3rd-party-info.bats
+++ b/test/functional/api/api-3rd-party-info.bats
@@ -42,3 +42,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=9
diff --git a/test/functional/api/api-3rd-party-repair.bats b/test/functional/api/api-3rd-party-repair.bats
index 25e54b34..f4e02cf5 100755
--- a/test/functional/api/api-3rd-party-repair.bats
+++ b/test/functional/api/api-3rd-party-repair.bats
@@ -62,3 +62,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=17
diff --git a/test/functional/api/api-3rd-party-update.bats b/test/functional/api/api-3rd-party-update.bats
index 5b0e238d..da891a2a 100755
--- a/test/functional/api/api-3rd-party-update.bats
+++ b/test/functional/api/api-3rd-party-update.bats
@@ -48,3 +48,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=24
diff --git a/test/functional/api/api-autoupdate.bats b/test/functional/api/api-autoupdate.bats
index ed3dde89..d61285ba 100755
--- a/test/functional/api/api-autoupdate.bats
+++ b/test/functional/api/api-autoupdate.bats
@@ -49,3 +49,4 @@ test_setup() {
 
 }
 
+#WEIGHT=3
diff --git a/test/functional/api/api-bundle-add.bats b/test/functional/api/api-bundle-add.bats
index 80db35ed..3d9f7d46 100755
--- a/test/functional/api/api-bundle-add.bats
+++ b/test/functional/api/api-bundle-add.bats
@@ -20,3 +20,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=2
diff --git a/test/functional/api/api-bundle-info.bats b/test/functional/api/api-bundle-info.bats
index 67e20c52..36fc954f 100755
--- a/test/functional/api/api-bundle-info.bats
+++ b/test/functional/api/api-bundle-info.bats
@@ -97,3 +97,4 @@ global_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
+#WEIGHT=6
diff --git a/test/functional/api/api-bundle-list.bats b/test/functional/api/api-bundle-list.bats
index 9d3cb870..08ba63df 100755
--- a/test/functional/api/api-bundle-list.bats
+++ b/test/functional/api/api-bundle-list.bats
@@ -106,3 +106,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=5
diff --git a/test/functional/api/api-bundle-remove.bats b/test/functional/api/api-bundle-remove.bats
index 2fa7f7c1..9f8ab0de 100755
--- a/test/functional/api/api-bundle-remove.bats
+++ b/test/functional/api/api-bundle-remove.bats
@@ -20,3 +20,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=2
diff --git a/test/functional/api/api-checkupdate.bats b/test/functional/api/api-checkupdate.bats
index 90fe7812..1eaedb8c 100755
--- a/test/functional/api/api-checkupdate.bats
+++ b/test/functional/api/api-checkupdate.bats
@@ -36,3 +36,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=3
diff --git a/test/functional/api/api-clean.bats b/test/functional/api/api-clean.bats
index 687e1955..856381e7 100755
--- a/test/functional/api/api-clean.bats
+++ b/test/functional/api/api-clean.bats
@@ -39,3 +39,4 @@ test_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
+#WEIGHT=2
diff --git a/test/functional/api/api-diagnose.bats b/test/functional/api/api-diagnose.bats
index ef6e1019..28d3211f 100755
--- a/test/functional/api/api-diagnose.bats
+++ b/test/functional/api/api-diagnose.bats
@@ -55,3 +55,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=6
diff --git a/test/functional/api/api-hashdump.bats b/test/functional/api/api-hashdump.bats
index 3534acb7..9de8af65 100755
--- a/test/functional/api/api-hashdump.bats
+++ b/test/functional/api/api-hashdump.bats
@@ -23,3 +23,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=1
diff --git a/test/functional/api/api-info.bats b/test/functional/api/api-info.bats
index 070f4b47..cfa41b2a 100755
--- a/test/functional/api/api-info.bats
+++ b/test/functional/api/api-info.bats
@@ -23,3 +23,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=1
diff --git a/test/functional/api/api-os-install.bats b/test/functional/api/api-os-install.bats
index 3aec71cb..6e15779e 100755
--- a/test/functional/api/api-os-install.bats
+++ b/test/functional/api/api-os-install.bats
@@ -20,3 +20,4 @@ global_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=1
diff --git a/test/functional/api/api-repair.bats b/test/functional/api/api-repair.bats
index 07c12f1d..bcf6a86a 100755
--- a/test/functional/api/api-repair.bats
+++ b/test/functional/api/api-repair.bats
@@ -97,3 +97,4 @@ test_teardown() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=17
diff --git a/test/functional/api/api-search-file.bats b/test/functional/api/api-search-file.bats
index 93689ad9..a8fd2796 100755
--- a/test/functional/api/api-search-file.bats
+++ b/test/functional/api/api-search-file.bats
@@ -59,3 +59,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=4
diff --git a/test/functional/api/api-update.bats b/test/functional/api/api-update.bats
index d91fc774..2d66229a 100755
--- a/test/functional/api/api-update.bats
+++ b/test/functional/api/api-update.bats
@@ -34,3 +34,4 @@ test_setup() {
 	assert_output_is_empty
 
 }
+#WEIGHT=5
diff --git a/test/functional/bundleadd/add-alias-basic.bats b/test/functional/bundleadd/add-alias-basic.bats
index d1e2c5a5..f7839a7c 100755
--- a/test/functional/bundleadd/add-alias-basic.bats
+++ b/test/functional/bundleadd/add-alias-basic.bats
@@ -319,4 +319,4 @@ test_teardown() {
 	assert_file_exists "$TARGETDIR"/usr/share/clear/bundles/alias-bundle1
 
 }
-#WEIGHT=7
+#WEIGHT=8
diff --git a/test/functional/bundleadd/add-also-add-flag.bats b/test/functional/bundleadd/add-also-add-flag.bats
index 2135a527..5f596b66 100755
--- a/test/functional/bundleadd/add-also-add-flag.bats
+++ b/test/functional/bundleadd/add-also-add-flag.bats
@@ -81,4 +81,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/usr/share/clear/bundles/test-bundle3
 
 }
-#WEIGHT=8
+#WEIGHT=11
diff --git a/test/functional/bundleadd/add-basics.bats b/test/functional/bundleadd/add-basics.bats
index bc5ae982..8b5370a7 100755
--- a/test/functional/bundleadd/add-basics.bats
+++ b/test/functional/bundleadd/add-basics.bats
@@ -242,4 +242,4 @@ test_teardown() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=6
+#WEIGHT=7
diff --git a/test/functional/bundleadd/add-fall-back-to-fullfile.bats b/test/functional/bundleadd/add-fall-back-to-fullfile.bats
index 58923e51..40ffd19c 100755
--- a/test/functional/bundleadd/add-fall-back-to-fullfile.bats
+++ b/test/functional/bundleadd/add-fall-back-to-fullfile.bats
@@ -98,4 +98,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=6
+#WEIGHT=7
diff --git a/test/functional/bundleadd/add-include.bats b/test/functional/bundleadd/add-include.bats
index 1c2e3003..4ce30f63 100755
--- a/test/functional/bundleadd/add-include.bats
+++ b/test/functional/bundleadd/add-include.bats
@@ -140,4 +140,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=9
+#WEIGHT=11
diff --git a/test/functional/bundleadd/add-no-disk-space.bats b/test/functional/bundleadd/add-no-disk-space.bats
index e3b86e4d..bd2712d3 100755
--- a/test/functional/bundleadd/add-no-disk-space.bats
+++ b/test/functional/bundleadd/add-no-disk-space.bats
@@ -149,4 +149,4 @@ test_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=13
+#WEIGHT=16
diff --git a/test/functional/bundleadd/add-no-signature.bats b/test/functional/bundleadd/add-no-signature.bats
index 4aa65ef4..f7406319 100755
--- a/test/functional/bundleadd/add-no-signature.bats
+++ b/test/functional/bundleadd/add-no-signature.bats
@@ -48,4 +48,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/test-file
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/bundleadd/add-overwrite-files.bats b/test/functional/bundleadd/add-overwrite-files.bats
index a839d39d..b87dea7b 100755
--- a/test/functional/bundleadd/add-overwrite-files.bats
+++ b/test/functional/bundleadd/add-overwrite-files.bats
@@ -46,4 +46,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/file1
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/bundleinfo/bundle-info-basic.bats b/test/functional/bundleinfo/bundle-info-basic.bats
index 0adf52f2..fde9f978 100755
--- a/test/functional/bundleinfo/bundle-info-basic.bats
+++ b/test/functional/bundleinfo/bundle-info-basic.bats
@@ -133,4 +133,4 @@ global_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=6
diff --git a/test/functional/bundleinfo/bundle-info-files.bats b/test/functional/bundleinfo/bundle-info-files.bats
index c2ee4083..34c4180d 100755
--- a/test/functional/bundleinfo/bundle-info-files.bats
+++ b/test/functional/bundleinfo/bundle-info-files.bats
@@ -122,4 +122,4 @@ global_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/bundleinfo/bundle-info-includes.bats b/test/functional/bundleinfo/bundle-info-includes.bats
index 7c1ea111..7c9ba07a 100755
--- a/test/functional/bundleinfo/bundle-info-includes.bats
+++ b/test/functional/bundleinfo/bundle-info-includes.bats
@@ -83,4 +83,4 @@ global_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=6
+#WEIGHT=7
diff --git a/test/functional/bundleinfo/bundle-info-optional.bats b/test/functional/bundleinfo/bundle-info-optional.bats
index 0a939924..60f77aed 100755
--- a/test/functional/bundleinfo/bundle-info-optional.bats
+++ b/test/functional/bundleinfo/bundle-info-optional.bats
@@ -78,4 +78,4 @@ global_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=7
diff --git a/test/functional/bundleinfo/bundle-info-status.bats b/test/functional/bundleinfo/bundle-info-status.bats
index 1df13d06..2ac03d80 100755
--- a/test/functional/bundleinfo/bundle-info-status.bats
+++ b/test/functional/bundleinfo/bundle-info-status.bats
@@ -60,4 +60,4 @@ global_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/bundlelist/list-all.bats b/test/functional/bundlelist/list-all.bats
index efe1c0cb..0a67ca81 100755
--- a/test/functional/bundlelist/list-all.bats
+++ b/test/functional/bundlelist/list-all.bats
@@ -51,4 +51,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=6
+#WEIGHT=8
diff --git a/test/functional/bundlelist/list-deps-flat.bats b/test/functional/bundlelist/list-deps-flat.bats
index af811eb0..aa7af377 100755
--- a/test/functional/bundlelist/list-deps-flat.bats
+++ b/test/functional/bundlelist/list-deps-flat.bats
@@ -33,4 +33,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/bundlelist/list-deps-nested.bats b/test/functional/bundlelist/list-deps-nested.bats
index 8ff415fe..e6e2e5c6 100755
--- a/test/functional/bundlelist/list-deps-nested.bats
+++ b/test/functional/bundlelist/list-deps-nested.bats
@@ -56,4 +56,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=6
+#WEIGHT=7
diff --git a/test/functional/bundlelist/list-experimental.bats b/test/functional/bundlelist/list-experimental.bats
index f90b591d..c5766a57 100755
--- a/test/functional/bundlelist/list-experimental.bats
+++ b/test/functional/bundlelist/list-experimental.bats
@@ -99,4 +99,4 @@ global_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/bundlelist/list-has-dep-nested-not-installed.bats b/test/functional/bundlelist/list-has-dep-nested-not-installed.bats
index 74210769..c48dc7b3 100755
--- a/test/functional/bundlelist/list-has-dep-nested-not-installed.bats
+++ b/test/functional/bundlelist/list-has-dep-nested-not-installed.bats
@@ -27,4 +27,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/bundlelist/list-has-dep-nested-server.bats b/test/functional/bundlelist/list-has-dep-nested-server.bats
index 3d057955..50d554e3 100755
--- a/test/functional/bundlelist/list-has-dep-nested-server.bats
+++ b/test/functional/bundlelist/list-has-dep-nested-server.bats
@@ -32,4 +32,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/bundlelist/list-has-dep-nested.bats b/test/functional/bundlelist/list-has-dep-nested.bats
index a1348577..dacf88aa 100755
--- a/test/functional/bundlelist/list-has-dep-nested.bats
+++ b/test/functional/bundlelist/list-has-dep-nested.bats
@@ -58,4 +58,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=6
+#WEIGHT=8
diff --git a/test/functional/bundlelist/list-installed.bats b/test/functional/bundlelist/list-installed.bats
index fc33db55..b13bd463 100755
--- a/test/functional/bundlelist/list-installed.bats
+++ b/test/functional/bundlelist/list-installed.bats
@@ -51,4 +51,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=6
diff --git a/test/functional/bundlelist/list-no-deps.bats b/test/functional/bundlelist/list-no-deps.bats
index fc6db344..e0036631 100755
--- a/test/functional/bundlelist/list-no-deps.bats
+++ b/test/functional/bundlelist/list-no-deps.bats
@@ -24,4 +24,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/bundlelist/list-no-disk-space.bats b/test/functional/bundlelist/list-no-disk-space.bats
index 966f7d19..4c1e5617 100755
--- a/test/functional/bundlelist/list-no-disk-space.bats
+++ b/test/functional/bundlelist/list-no-disk-space.bats
@@ -65,4 +65,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=7
diff --git a/test/functional/bundlelist/list-none-has-deps.bats b/test/functional/bundlelist/list-none-has-deps.bats
index c35cfbde..c5002e3b 100755
--- a/test/functional/bundlelist/list-none-has-deps.bats
+++ b/test/functional/bundlelist/list-none-has-deps.bats
@@ -24,4 +24,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/bundlelist/list-quiet.bats b/test/functional/bundlelist/list-quiet.bats
index d0cc27ad..001c94fb 100755
--- a/test/functional/bundlelist/list-quiet.bats
+++ b/test/functional/bundlelist/list-quiet.bats
@@ -47,4 +47,4 @@ test_setup() {
 	assert_is_output --identical "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=6
diff --git a/test/functional/bundleremove/remove-basics.bats b/test/functional/bundleremove/remove-basics.bats
index 46d249bf..d259f2a4 100755
--- a/test/functional/bundleremove/remove-basics.bats
+++ b/test/functional/bundleremove/remove-basics.bats
@@ -197,4 +197,4 @@ test_teardown() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=6
diff --git a/test/functional/bundleremove/remove-include-nested.bats b/test/functional/bundleremove/remove-include-nested.bats
index 64fea19e..28ffd706 100755
--- a/test/functional/bundleremove/remove-include-nested.bats
+++ b/test/functional/bundleremove/remove-include-nested.bats
@@ -246,4 +246,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/common
 
 }
-#WEIGHT=17
+#WEIGHT=22
diff --git a/test/functional/bundleremove/remove-no-disk-space.bats b/test/functional/bundleremove/remove-no-disk-space.bats
index 2862f0c9..9bf0c242 100755
--- a/test/functional/bundleremove/remove-no-disk-space.bats
+++ b/test/functional/bundleremove/remove-no-disk-space.bats
@@ -98,4 +98,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=6
+#WEIGHT=8
diff --git a/test/functional/bundleremove/remove-optional-bundles.bats b/test/functional/bundleremove/remove-optional-bundles.bats
index 0c1ccdd2..abc9be8b 100755
--- a/test/functional/bundleremove/remove-optional-bundles.bats
+++ b/test/functional/bundleremove/remove-optional-bundles.bats
@@ -44,4 +44,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/usr/share/clear/bundles/test-bundle3
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/bundleremove/remove-recursive.bats b/test/functional/bundleremove/remove-recursive.bats
index ae5305d4..035cae25 100755
--- a/test/functional/bundleremove/remove-recursive.bats
+++ b/test/functional/bundleremove/remove-recursive.bats
@@ -225,4 +225,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/test-file6
 
 }
-#WEIGHT=21
+#WEIGHT=29
diff --git a/test/functional/bundleremove/remove-with-dependency.bats b/test/functional/bundleremove/remove-with-dependency.bats
index 93a0b076..8ad5bf23 100755
--- a/test/functional/bundleremove/remove-with-dependency.bats
+++ b/test/functional/bundleremove/remove-with-dependency.bats
@@ -39,4 +39,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/checkupdate/chk-update-json.bats b/test/functional/checkupdate/chk-update-json.bats
index 056f22e7..ede63535 100755
--- a/test/functional/checkupdate/chk-update-json.bats
+++ b/test/functional/checkupdate/chk-update-json.bats
@@ -35,4 +35,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=1
+#WEIGHT=2
diff --git a/test/functional/checkupdate/chk-update-no-server-content.bats b/test/functional/checkupdate/chk-update-no-server-content.bats
index 951d22ef..7ac646e4 100755
--- a/test/functional/checkupdate/chk-update-no-server-content.bats
+++ b/test/functional/checkupdate/chk-update-no-server-content.bats
@@ -23,4 +23,4 @@ test_setup() {
 	assert_in_output "$expected_output"
 
 }
-#WEIGHT=1
+#WEIGHT=2
diff --git a/test/functional/checkupdate/chk-update-slow-server.bats b/test/functional/checkupdate/chk-update-slow-server.bats
index e9fdef70..f8a9bcea 100755
--- a/test/functional/checkupdate/chk-update-slow-server.bats
+++ b/test/functional/checkupdate/chk-update-slow-server.bats
@@ -30,4 +30,4 @@ test_setup() {
 	)
 	assert_is_output "$expected_output"
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/diagnose/diagnose-also-add.bats b/test/functional/diagnose/diagnose-also-add.bats
index 34ff1f81..f8e247f8 100755
--- a/test/functional/diagnose/diagnose-also-add.bats
+++ b/test/functional/diagnose/diagnose-also-add.bats
@@ -73,4 +73,4 @@ test_setup() {
 	)
 	assert_is_output "$expected_output"
 }
-#WEIGHT=7
+#WEIGHT=9
diff --git a/test/functional/diagnose/diagnose-bundles.bats b/test/functional/diagnose/diagnose-bundles.bats
index caf9db6d..cd6d5758 100755
--- a/test/functional/diagnose/diagnose-bundles.bats
+++ b/test/functional/diagnose/diagnose-bundles.bats
@@ -168,4 +168,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=18
+#WEIGHT=24
diff --git a/test/functional/diagnose/diagnose-flags.bats b/test/functional/diagnose/diagnose-flags.bats
index cdcb4a91..f5494f33 100755
--- a/test/functional/diagnose/diagnose-flags.bats
+++ b/test/functional/diagnose/diagnose-flags.bats
@@ -70,4 +70,4 @@ load "../testlib"
 	assert_in_output "Error: --bundles and --extra-files-only options are mutually exclusive"
 
 }
-#WEIGHT=2
+#WEIGHT=1
diff --git a/test/functional/diagnose/diagnose-path.bats b/test/functional/diagnose/diagnose-path.bats
index bd8526f6..9640d686 100755
--- a/test/functional/diagnose/diagnose-path.bats
+++ b/test/functional/diagnose/diagnose-path.bats
@@ -207,4 +207,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=33
+#WEIGHT=36
diff --git a/test/functional/diagnose/diagnose-picky-downgrade.bats b/test/functional/diagnose/diagnose-picky-downgrade.bats
index 1c698ca6..a572fc9c 100755
--- a/test/functional/diagnose/diagnose-picky-downgrade.bats
+++ b/test/functional/diagnose/diagnose-picky-downgrade.bats
@@ -50,4 +50,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/usr/share/defaults/swupd/contenturl
 
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/mirror/mirror-allow-http.bats b/test/functional/mirror/mirror-allow-http.bats
index c819b08c..c87becbb 100755
--- a/test/functional/mirror/mirror-allow-http.bats
+++ b/test/functional/mirror/mirror-allow-http.bats
@@ -72,4 +72,4 @@ global_setup() {
 	)
 	assert_in_output "$expected_output"
 }
-#WEIGHT=72
+#WEIGHT=2
diff --git a/test/functional/mirror/mirror-createdir-negative.bats b/test/functional/mirror/mirror-createdir-negative.bats
index f49565b7..b095ce5f 100755
--- a/test/functional/mirror/mirror-createdir-negative.bats
+++ b/test/functional/mirror/mirror-createdir-negative.bats
@@ -42,4 +42,4 @@ global_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=1
+#WEIGHT=2
diff --git a/test/functional/os-install/install-also-add.bats b/test/functional/os-install/install-also-add.bats
index 4364a8da..3a74b247 100755
--- a/test/functional/os-install/install-also-add.bats
+++ b/test/functional/os-install/install-also-add.bats
@@ -52,4 +52,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/bar/test-file3
 
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/os-install/install-basics.bats b/test/functional/os-install/install-basics.bats
index 36fbb055..e6c93cd9 100755
--- a/test/functional/os-install/install-basics.bats
+++ b/test/functional/os-install/install-basics.bats
@@ -94,4 +94,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/core
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/os-install/install-hardlink-symlink.bats b/test/functional/os-install/install-hardlink-symlink.bats
index 47fd062c..1adaf469 100755
--- a/test/functional/os-install/install-hardlink-symlink.bats
+++ b/test/functional/os-install/install-hardlink-symlink.bats
@@ -56,3 +56,4 @@ test_setup() {
 	assert_is_output "1"
 
 }
+#WEIGHT=4
diff --git a/test/functional/os-install/install-json.bats b/test/functional/os-install/install-json.bats
index 07f922da..0973b29a 100755
--- a/test/functional/os-install/install-json.bats
+++ b/test/functional/os-install/install-json.bats
@@ -72,4 +72,4 @@ test_setup() {
 	assert_in_output "$expected_output2"
 
 }
-#WEIGHT=1
+#WEIGHT=2
diff --git a/test/functional/os-install/install-multiple.bats b/test/functional/os-install/install-multiple.bats
index 662ddbe5..d1a7a294 100755
--- a/test/functional/os-install/install-multiple.bats
+++ b/test/functional/os-install/install-multiple.bats
@@ -105,4 +105,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/bar/file_4
 
 }
-#WEIGHT=4
+#WEIGHT=9
diff --git a/test/functional/os-install/install-no-also-add.bats b/test/functional/os-install/install-no-also-add.bats
index 28b038d6..fd1b0e7f 100755
--- a/test/functional/os-install/install-no-also-add.bats
+++ b/test/functional/os-install/install-no-also-add.bats
@@ -50,4 +50,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/bar/test-file3
 
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/os-install/install-no-packs.bats b/test/functional/os-install/install-no-packs.bats
index c1d467a0..718788d2 100755
--- a/test/functional/os-install/install-no-packs.bats
+++ b/test/functional/os-install/install-no-packs.bats
@@ -46,4 +46,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/core
 
 }
-#WEIGHT=1
+#WEIGHT=2
diff --git a/test/functional/os-install/install-statedir-cache-offline.bats b/test/functional/os-install/install-statedir-cache-offline.bats
index ab8563fc..18921670 100755
--- a/test/functional/os-install/install-statedir-cache-offline.bats
+++ b/test/functional/os-install/install-statedir-cache-offline.bats
@@ -176,4 +176,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/core
 
 }
-#WEIGHT=5
+#WEIGHT=6
diff --git a/test/functional/os-install/install-version.bats b/test/functional/os-install/install-version.bats
index 5c8df83e..16959cde 100755
--- a/test/functional/os-install/install-version.bats
+++ b/test/functional/os-install/install-version.bats
@@ -112,4 +112,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/core
 
 }
-#WEIGHT=7
+#WEIGHT=8
diff --git a/test/functional/repair/repair-add-missing-include-old.bats b/test/functional/repair/repair-add-missing-include-old.bats
index f0cae615..15cd5f78 100755
--- a/test/functional/repair/repair-add-missing-include-old.bats
+++ b/test/functional/repair/repair-add-missing-include-old.bats
@@ -49,4 +49,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/test-file2
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/repair/repair-basics.bats b/test/functional/repair/repair-basics.bats
index c91c77d8..111eed3d 100755
--- a/test/functional/repair/repair-basics.bats
+++ b/test/functional/repair/repair-basics.bats
@@ -182,4 +182,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/usr/untracked_file3
 
 }
-#WEIGHT=13
+#WEIGHT=18
diff --git a/test/functional/repair/repair-bundles.bats b/test/functional/repair/repair-bundles.bats
index d1ffdf0b..0902683d 100755
--- a/test/functional/repair/repair-bundles.bats
+++ b/test/functional/repair/repair-bundles.bats
@@ -187,4 +187,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=14
+#WEIGHT=20
diff --git a/test/functional/repair/repair-deleted-include-manifest.bats b/test/functional/repair/repair-deleted-include-manifest.bats
index fb54ec7e..6f1a68f7 100755
--- a/test/functional/repair/repair-deleted-include-manifest.bats
+++ b/test/functional/repair/repair-deleted-include-manifest.bats
@@ -37,4 +37,4 @@ test_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/repair/repair-directory-tree-deleted.bats b/test/functional/repair/repair-directory-tree-deleted.bats
index db65484d..3ccd6b98 100755
--- a/test/functional/repair/repair-directory-tree-deleted.bats
+++ b/test/functional/repair/repair-directory-tree-deleted.bats
@@ -46,4 +46,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/testdir1/testdir2/testfile
 
 }
-#WEIGHT=2
+#WEIGHT=12
diff --git a/test/functional/repair/repair-error.bats b/test/functional/repair/repair-error.bats
index 3f6d52cf..d5f8be90 100755
--- a/test/functional/repair/repair-error.bats
+++ b/test/functional/repair/repair-error.bats
@@ -83,3 +83,4 @@ test_teardown() {
 	assert_is_output "$expected_output"
 
 }
+#WEIGHT=6
diff --git a/test/functional/repair/repair-flags.bats b/test/functional/repair/repair-flags.bats
index 71c96c4e..ec230061 100755
--- a/test/functional/repair/repair-flags.bats
+++ b/test/functional/repair/repair-flags.bats
@@ -37,4 +37,4 @@ load "../testlib"
 	assert_in_output "Error: --extra-files-only and --picky options are mutually exclusive"
 
 }
-#WEIGHT=2
+#WEIGHT=1
diff --git a/test/functional/repair/repair-ignore-also-add.bats b/test/functional/repair/repair-ignore-also-add.bats
index 87524301..c00c194a 100755
--- a/test/functional/repair/repair-ignore-also-add.bats
+++ b/test/functional/repair/repair-ignore-also-add.bats
@@ -86,4 +86,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/bar/test-file3
 
 }
-#WEIGHT=7
+#WEIGHT=9
diff --git a/test/functional/repair/repair-no-disk-space.bats b/test/functional/repair/repair-no-disk-space.bats
index 76d2a9ef..7be9c4c8 100755
--- a/test/functional/repair/repair-no-disk-space.bats
+++ b/test/functional/repair/repair-no-disk-space.bats
@@ -109,4 +109,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=12
+#WEIGHT=16
diff --git a/test/functional/repair/repair-path.bats b/test/functional/repair/repair-path.bats
index 2bc76543..365f2488 100755
--- a/test/functional/repair/repair-path.bats
+++ b/test/functional/repair/repair-path.bats
@@ -276,4 +276,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=39
+#WEIGHT=40
diff --git a/test/functional/repair/repair-picky-downgrade.bats b/test/functional/repair/repair-picky-downgrade.bats
index 597b8d67..b90ce813 100755
--- a/test/functional/repair/repair-picky-downgrade.bats
+++ b/test/functional/repair/repair-picky-downgrade.bats
@@ -127,4 +127,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/usr/share/clear/bundles/test-bundle2
 
 }
-#WEIGHT=11
+#WEIGHT=12
diff --git a/test/functional/repair/repair-picky-ghosted-missing.bats b/test/functional/repair/repair-picky-ghosted-missing.bats
index ff2b96ae..2394ae7a 100755
--- a/test/functional/repair/repair-picky-ghosted-missing.bats
+++ b/test/functional/repair/repair-picky-ghosted-missing.bats
@@ -44,4 +44,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/usr/foo
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/repair/repair-picky-ghosted.bats b/test/functional/repair/repair-picky-ghosted.bats
index 5945efd1..e78b2372 100755
--- a/test/functional/repair/repair-picky-ghosted.bats
+++ b/test/functional/repair/repair-picky-ghosted.bats
@@ -43,4 +43,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/usr/foo
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/repair/repair-skip-scripts.bats b/test/functional/repair/repair-skip-scripts.bats
index dc672c30..e8c4d364 100755
--- a/test/functional/repair/repair-skip-scripts.bats
+++ b/test/functional/repair/repair-skip-scripts.bats
@@ -38,4 +38,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/usr/lib/kernel/testfile
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/repair/repair-unsafe-to-delete.bats b/test/functional/repair/repair-unsafe-to-delete.bats
index 5a654ac4..e9cea101 100755
--- a/test/functional/repair/repair-unsafe-to-delete.bats
+++ b/test/functional/repair/repair-unsafe-to-delete.bats
@@ -39,4 +39,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/search/search-content-check-negative.bats b/test/functional/search/search-content-check-negative.bats
index dd0aaec7..eda7de66 100755
--- a/test/functional/search/search-content-check-negative.bats
+++ b/test/functional/search/search-content-check-negative.bats
@@ -58,4 +58,4 @@ global_setup() {
 
 }
 
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/search/search-content-check-positive.bats b/test/functional/search/search-content-check-positive.bats
index 1982a495..1d4391a3 100755
--- a/test/functional/search/search-content-check-positive.bats
+++ b/test/functional/search/search-content-check-positive.bats
@@ -206,4 +206,4 @@ global_setup() {
 	assert_regex_in_output "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=6
diff --git a/test/functional/search/search-experimental.bats b/test/functional/search/search-experimental.bats
index 554889e1..1e959710 100755
--- a/test/functional/search/search-experimental.bats
+++ b/test/functional/search/search-experimental.bats
@@ -103,4 +103,4 @@ global_setup() {
 	assert_regex_in_output "$expected_output"
 
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/search/search-no-disk-space.bats b/test/functional/search/search-no-disk-space.bats
index ae156680..0e37a040 100755
--- a/test/functional/search/search-no-disk-space.bats
+++ b/test/functional/search/search-no-disk-space.bats
@@ -73,4 +73,4 @@ test_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=4
+#WEIGHT=6
diff --git a/test/functional/search/search-sort.bats b/test/functional/search/search-sort.bats
index ff6f0295..18e70516 100755
--- a/test/functional/search/search-sort.bats
+++ b/test/functional/search/search-sort.bats
@@ -127,4 +127,4 @@ global_setup() {
 	assert_regex_in_output "$expected_output"
 
 }
-#WEIGHT=5
+#WEIGHT=6
diff --git a/test/functional/signature/corrupted-certificate.bats b/test/functional/signature/corrupted-certificate.bats
index b80cb8bc..438097e5 100755
--- a/test/functional/signature/corrupted-certificate.bats
+++ b/test/functional/signature/corrupted-certificate.bats
@@ -49,4 +49,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/test-file
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/signature/corrupted-signature.bats b/test/functional/signature/corrupted-signature.bats
index ebd15754..1ebb55e1 100755
--- a/test/functional/signature/corrupted-signature.bats
+++ b/test/functional/signature/corrupted-signature.bats
@@ -54,4 +54,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/test-file
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/signature/key-rotation.bats b/test/functional/signature/key-rotation.bats
index d179ee2b..72cf7946 100755
--- a/test/functional/signature/key-rotation.bats
+++ b/test/functional/signature/key-rotation.bats
@@ -156,4 +156,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/core
 
 }
-#WEIGHT=19
+#WEIGHT=20
diff --git a/test/functional/signature/no-signature.bats b/test/functional/signature/no-signature.bats
index d93d5ff0..199db1f8 100755
--- a/test/functional/signature/no-signature.bats
+++ b/test/functional/signature/no-signature.bats
@@ -51,4 +51,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/test-file
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/signature/valid-certificate.bats b/test/functional/signature/valid-certificate.bats
index e6eb9884..66b332a7 100755
--- a/test/functional/signature/valid-certificate.bats
+++ b/test/functional/signature/valid-certificate.bats
@@ -29,4 +29,4 @@ test_setup() {
 	assert_status_is "$SWUPD_OK"
 
 }
-#WEIGHT=4
+#WEIGHT=2
diff --git a/test/functional/signature/version-sig-check.bats b/test/functional/signature/version-sig-check.bats
index 7da5469f..2fc8d9f3 100755
--- a/test/functional/signature/version-sig-check.bats
+++ b/test/functional/signature/version-sig-check.bats
@@ -160,4 +160,4 @@ test_setup() {
 
 }
 
-#WEIGHT=5
+#WEIGHT=13
diff --git a/test/functional/update/update-attr-change.bats b/test/functional/update/update-attr-change.bats
index eb68c57e..630ae1a2 100755
--- a/test/functional/update/update-attr-change.bats
+++ b/test/functional/update/update-attr-change.bats
@@ -108,3 +108,4 @@ test_setup() {
 	show_target
 
 }
+#WEIGHT=5
diff --git a/test/functional/update/update-boot-skip.bats b/test/functional/update/update-boot-skip.bats
index 35de29b1..b92886ff 100755
--- a/test/functional/update/update-boot-skip.bats
+++ b/test/functional/update/update-boot-skip.bats
@@ -41,4 +41,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/usr/lib/kernel/testfile
 
 }
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/update/update-deleted-include-manifest.bats b/test/functional/update/update-deleted-include-manifest.bats
index cae0f0bf..d36a16bf 100755
--- a/test/functional/update/update-deleted-include-manifest.bats
+++ b/test/functional/update/update-deleted-include-manifest.bats
@@ -37,4 +37,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/update/update-fail-to-get-mom.bats b/test/functional/update/update-fail-to-get-mom.bats
index 71be0592..4b1a45d1 100755
--- a/test/functional/update/update-fail-to-get-mom.bats
+++ b/test/functional/update/update-fail-to-get-mom.bats
@@ -46,4 +46,4 @@ test_setup() {
 	assert_regex_is_output "$expected_output"
 
 }
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/update/update-ignore-also-add.bats b/test/functional/update/update-ignore-also-add.bats
index c0e1578d..caa2a652 100755
--- a/test/functional/update/update-ignore-also-add.bats
+++ b/test/functional/update/update-ignore-also-add.bats
@@ -53,4 +53,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/bar/testfile2
 
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/update/update-include-old-bundle-with-tracked-file.bats b/test/functional/update/update-include-old-bundle-with-tracked-file.bats
index 47d669b3..e2b420c0 100755
--- a/test/functional/update/update-include-old-bundle-with-tracked-file.bats
+++ b/test/functional/update/update-include-old-bundle-with-tracked-file.bats
@@ -53,4 +53,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/ftb3
 
 }
-#WEIGHT=9
+#WEIGHT=11
diff --git a/test/functional/update/update-include-old-bundle.bats b/test/functional/update/update-include-old-bundle.bats
index 2a7ce261..59433d1c 100755
--- a/test/functional/update/update-include-old-bundle.bats
+++ b/test/functional/update/update-include-old-bundle.bats
@@ -50,4 +50,4 @@ test_setup() {
 
 }
 
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/update/update-include.bats b/test/functional/update/update-include.bats
index 76385217..d9631d87 100755
--- a/test/functional/update/update-include.bats
+++ b/test/functional/update/update-include.bats
@@ -77,4 +77,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/foo/testfile7
 
 }
-#WEIGHT=9
+#WEIGHT=12
diff --git a/test/functional/update/update-json.bats b/test/functional/update/update-json.bats
index d6b828ae..14d80f37 100755
--- a/test/functional/update/update-json.bats
+++ b/test/functional/update/update-json.bats
@@ -89,4 +89,4 @@ test_setup() {
 	assert_regex_in_output "$expected_output3"
 
 }
-#WEIGHT=4
+#WEIGHT=5
diff --git a/test/functional/update/update-manifest-delta.bats b/test/functional/update/update-manifest-delta.bats
index 4515d38c..8bee2c59 100755
--- a/test/functional/update/update-manifest-delta.bats
+++ b/test/functional/update/update-manifest-delta.bats
@@ -113,4 +113,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=8
+#WEIGHT=14
diff --git a/test/functional/update/update-minversion.bats b/test/functional/update/update-minversion.bats
index af186170..8e6c1742 100755
--- a/test/functional/update/update-minversion.bats
+++ b/test/functional/update/update-minversion.bats
@@ -41,4 +41,4 @@ test_setup() {
 	)
 	assert_in_output "$expected_output"
 }
-#WEIGHT=2
+#WEIGHT=3
diff --git a/test/functional/update/update-missing-os-core.bats b/test/functional/update/update-missing-os-core.bats
index 07fbd94e..121c8736 100755
--- a/test/functional/update/update-missing-os-core.bats
+++ b/test/functional/update/update-missing-os-core.bats
@@ -44,4 +44,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/testfile1
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/update/update-newest-deleted.bats b/test/functional/update/update-newest-deleted.bats
index 194cf123..2b002dc3 100755
--- a/test/functional/update/update-newest-deleted.bats
+++ b/test/functional/update/update-newest-deleted.bats
@@ -51,4 +51,4 @@ test_setup() {
 
 }
 
-#WEIGHT=6
+#WEIGHT=7
diff --git a/test/functional/update/update-no-disk-space.bats b/test/functional/update/update-no-disk-space.bats
index fa7b23fa..e54b472d 100755
--- a/test/functional/update/update-no-disk-space.bats
+++ b/test/functional/update/update-no-disk-space.bats
@@ -182,4 +182,4 @@ test_setup() {
 	assert_in_output "$expected_output2"
 
 }
-#WEIGHT=14
+#WEIGHT=17
diff --git a/test/functional/update/update-re-update-bad-os-release.bats b/test/functional/update/update-re-update-bad-os-release.bats
index a25c0add..dbe44acf 100755
--- a/test/functional/update/update-re-update-bad-os-release.bats
+++ b/test/functional/update/update-re-update-bad-os-release.bats
@@ -46,4 +46,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/core
 
 }
-#WEIGHT=7
+#WEIGHT=8
diff --git a/test/functional/update/update-to-same-version.bats b/test/functional/update/update-to-same-version.bats
index 8f0a6834..eb8b0ef2 100755
--- a/test/functional/update/update-to-same-version.bats
+++ b/test/functional/update/update-to-same-version.bats
@@ -60,4 +60,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/update/update-type-changes-dir-to-file.bats b/test/functional/update/update-type-changes-dir-to-file.bats
index b1ca7ac1..ef16173c 100755
--- a/test/functional/update/update-type-changes-dir-to-file.bats
+++ b/test/functional/update/update-type-changes-dir-to-file.bats
@@ -79,3 +79,4 @@ test_setup() {
 	show_target
 
 }
+#WEIGHT=5
diff --git a/test/functional/update/update-type-changes-file-to-recursive-symlink.bats b/test/functional/update/update-type-changes-file-to-recursive-symlink.bats
index 3c073c00..43ee621f 100755
--- a/test/functional/update/update-type-changes-file-to-recursive-symlink.bats
+++ b/test/functional/update/update-type-changes-file-to-recursive-symlink.bats
@@ -97,3 +97,4 @@ test_setup() {
 	assert_status_is "$SWUPD_OK"
 
 }
+#WEIGHT=10
diff --git a/test/functional/update/update-type-changes-file-to-symlink.bats b/test/functional/update/update-type-changes-file-to-symlink.bats
index 4f5e0ad9..092aacef 100755
--- a/test/functional/update/update-type-changes-file-to-symlink.bats
+++ b/test/functional/update/update-type-changes-file-to-symlink.bats
@@ -83,3 +83,4 @@ test_setup() {
 	show_target
 
 }
+#WEIGHT=6
diff --git a/test/functional/update/update-type-changes-symlink-to-file.bats b/test/functional/update/update-type-changes-symlink-to-file.bats
index 34163e32..f84bb9bc 100755
--- a/test/functional/update/update-type-changes-symlink-to-file.bats
+++ b/test/functional/update/update-type-changes-symlink-to-file.bats
@@ -98,3 +98,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/file4
 
 }
+#WEIGHT=6
diff --git a/test/functional/update/update-unusual-file-names.bats b/test/functional/update/update-unusual-file-names.bats
index 68facda8..565628c5 100755
--- a/test/functional/update/update-unusual-file-names.bats
+++ b/test/functional/update/update-unusual-file-names.bats
@@ -82,3 +82,4 @@ test_setup() {
 	assert_symlink_exists "$TARGETDIR"'/usr/links/very_unusual_¹²³!@#$%^&*()_;[]{}\_link3'
 	assert_symlink_exists "$TARGETDIR""/usr/links/link:4"
 }
+#WEIGHT=10
diff --git a/test/functional/update/update-with-mirror-signature.bats b/test/functional/update/update-with-mirror-signature.bats
index 2ee6ac30..9c8f6036 100755
--- a/test/functional/update/update-with-mirror-signature.bats
+++ b/test/functional/update/update-with-mirror-signature.bats
@@ -92,4 +92,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/file_3
 
 }
-#WEIGHT=3
+#WEIGHT=7
diff --git a/test/functional/update/update-with-mirror.bats b/test/functional/update/update-with-mirror.bats
index a862164c..b334f890 100755
--- a/test/functional/update/update-with-mirror.bats
+++ b/test/functional/update/update-with-mirror.bats
@@ -58,4 +58,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/file_3
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/update/update-with-old-mirror.bats b/test/functional/update/update-with-old-mirror.bats
index 88b7c77d..a383639c 100755
--- a/test/functional/update/update-with-old-mirror.bats
+++ b/test/functional/update/update-with-old-mirror.bats
@@ -61,4 +61,4 @@ test_setup() {
 	assert_file_exists "$TARGETDIR"/file_3
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/update/update-with-slightly-old-mirror.bats b/test/functional/update/update-with-slightly-old-mirror.bats
index 0db1e277..e8ed757b 100755
--- a/test/functional/update/update-with-slightly-old-mirror.bats
+++ b/test/functional/update/update-with-slightly-old-mirror.bats
@@ -61,4 +61,4 @@ test_setup() {
 	assert_file_not_exists "$TARGETDIR"/file_3
 
 }
-#WEIGHT=3
+#WEIGHT=4
diff --git a/test/functional/usability/usa-download-retries.bats b/test/functional/usability/usa-download-retries.bats
index d252cf54..26f79b25 100755
--- a/test/functional/usability/usa-download-retries.bats
+++ b/test/functional/usability/usa-download-retries.bats
@@ -98,4 +98,4 @@ test_setup() {
 	assert_is_output "$expected_output"
 
 }
-#WEIGHT=14
+#WEIGHT=15
diff --git a/test/functional/verify-legacy/verify-bundle.bats b/test/functional/verify-legacy/verify-bundle.bats
index d1ff1f42..1cfe33e9 100755
--- a/test/functional/verify-legacy/verify-bundle.bats
+++ b/test/functional/verify-legacy/verify-bundle.bats
@@ -147,4 +147,4 @@ test_setup() {
 	assert_in_output "$expected_output"
 
 }
-#WEIGHT=9
+#WEIGHT=14