diff --git a/package_check.sh b/package_check.sh
index d74ecb6..5c0a9b3 100755
--- a/package_check.sh
+++ b/package_check.sh
@@ -599,114 +599,68 @@ TEST_RESULTS () {
     test -n "${level[5]}" || level[5]=auto
     test -n "${level[6]}" || level[6]=auto
     test -n "${level[7]}" || level[7]=auto
-    test -n "${level[8]}" || level[8]=0
+    test -n "${level[8]}" || level[8]=auto
     test -n "${level[9]}" || level[9]=0
     test -n "${level[10]}" || level[10]=0
 
-    # Check if the level can be changed
-    level_can_change () {
-        # If the level is set at auto, it's waiting for a change
-        # And if it's set at 2, its value can be modified by a new result
-        if [ "${level[$1]}" == "auto" ] || [ "${level[$1]}" -eq 2 ]
-        then
-            return 0
-        fi
-        return 1
+    pass_level_1() {
+        # -> The package can be install and remove.
+        [ $RESULT_global_setup -eq 1 ] && \
+        [ $RESULT_global_remove -eq 1 ]
     }
 
-    # Evaluate the first level
-    # -> The package can be install and remove.
-    if level_can_change 1
-    then
-        # Validated if at least one install and remove work fine
-        if	[ $RESULT_global_setup -eq 1 ] && \
-            [ $RESULT_global_remove -eq 1 ]
-    then level[1]=2
-    else level[1]=0
-    fi
-fi
-
-# Evaluate the second level
-# -> The package can be install and remove in all tested configurations.
-if level_can_change 2
-then
-    # Validated if none install failed
-    if 	[ $RESULT_check_sub_dir -ne -1 ] && \
+    pass_level_2() {
+        # -> The package can be install and remove in all tested configurations.
+        # Validated if none install failed
+        [ $RESULT_check_sub_dir -ne -1 ] && \
         [ $RESULT_check_remove_sub_dir -ne -1 ] && \
         [ $RESULT_check_root -ne -1 ] && \
         [ $RESULT_check_remove_root -ne -1 ] && \
         [ $RESULT_check_private -ne -1 ] && \
         [ $RESULT_check_public -ne -1 ] && \
         [ $RESULT_check_multi_instance -ne -1 ]
-then level[2]=2
-else level[2]=0
-fi
-    fi
+    }
 
-    # Evaluate the third level
-    # -> The package can be upgraded from the same version.
-    if level_can_change 3
-    then
+    pass_level_3() {
+        # -> The package can be upgraded from the same version.
         # Validated if the upgrade is ok. Or if the upgrade has been not tested but already validated before.
-        if 	[ $RESULT_check_upgrade -eq 1 ] || \
-            ( [ $RESULT_check_upgrade -ne -1 ] && \
-            [ "${level[3]}" == "2" ] )
-    then level[3]=2
-    else level[3]=0
-    fi
-fi
+        [ $RESULT_check_upgrade -eq 1 ] || \
+        ( [ $RESULT_check_upgrade -ne -1 ] && \
+        [ "${level[3]}" == "2" ] )
+    }
 
-# Evaluate the fourth level
-# -> The package can be backup and restore without error
-if level_can_change 4
-then
-    # Validated if backup and restore are ok. Or if backup and restore have been not tested but already validated before.
-    if 	( [ $RESULT_check_backup -eq 1 ] && \
+    pass_level_4() {
+        # -> The package can be backup and restore without error
+        # Validated if backup and restore are ok. Or if backup and restore have been not tested but already validated before.
+        ( [ $RESULT_check_backup -eq 1 ] && \
         [ $RESULT_check_restore -eq 1 ] ) || \
         ( [ $RESULT_check_backup -ne -1 ] && \
         [ $RESULT_check_restore -ne -1 ] && \
         [ "${level[4]}" == "2" ] )
-then level[4]=2
-else level[4]=0
-fi
-    fi
+    }
 
-    # Evaluate the fifth level
-    # -> The package have no error with package linter
-    # -> The package does not have any alias_traversal error
-    if level_can_change 5
-    then
+    pass_level_5() {
+        # -> The package have no error with package linter
+        # -> The package does not have any alias_traversal error
         # Validated if Linter is ok. Or if Linter has been not tested but already validated before.
-        if 	[ $RESULT_linter -ge 1 ] || \
-            ( [ $RESULT_linter -eq 0 ] && \
-            [ "${level[5]}" == "2" ] )
-    then level[5]=2
-    else level[5]=0
-    fi
-    if [ $RESULT_alias_traversal -eq 1 ]
-    then
-        level[5]=0
-    fi
-fi
+        [ $RESULT_alias_traversal -ne 1 ] && \
+        ([ $RESULT_linter -ge 1 ] || \
+        ( [ $RESULT_linter -eq 0 ] && \
+        [ "${level[5]}" == "2" ] ) )
+    }
 
-# Evaluate the sixth level
-# -> The package can be backup and restore without error
-if level_can_change 6
-then
-    # This is from the linter, tests if app is the Yunohost-apps organization
-    if [ $RESULT_linter_level_6 -eq 1 ]
-    then level[6]=2
-    else level[6]=0
-    fi
-fi
+    pass_level_6() {
+        # -> The package can be backup and restore without error
+        # This is from the linter, tests if app is the Yunohost-apps organization
+        [ $RESULT_linter_level_6 -eq 1 ] || \
+        ([ $RESULT_linter_level_6 -eq 0 ] && \
+        [ "${level[6]}" == "2" ] )
+    }
 
-# Evaluate the seventh level
-# -> None errors in all tests performed
-if level_can_change 7
-then
-    level[7]=0
-    # Validated if none errors is happened.
-    if 	[ $RESULT_global_setup -ne -1 ] && \
+    pass_level_7() {
+        # -> None errors in all tests performed
+        # Validated if none errors is happened.
+        [ $RESULT_global_setup -ne -1 ] && \
         [ $RESULT_global_remove -ne -1 ] && \
         [ $RESULT_check_sub_dir -ne -1 ] && \
         [ $RESULT_check_remove_sub_dir -ne -1 ] && \
@@ -721,27 +675,41 @@ then
         [ $RESULT_check_restore -ne -1 ] && \
         [ $RESULT_change_url -ne -1 ] && \
         [ $RESULT_action_config_panel -ne -1 ] && \
-        [ $RESULT_linter_level_7 -ge 1 ]
-then
-    level[7]=2
-fi
-    fi
+        ([ $RESULT_linter_level_7 -ge 1 ] ||
+        ([ $RESULT_linter_level_7 -eq 0 ] && \
+        [ "${level[8]}" == "2" ] ))
+    }
 
-    # Evaluate the eighth level
-    # This happens in the linter
-    # When writing this, defined as app being maintained + long term quality (=
-    # certain amount of time level 5+ in the last year)
-    level[8]=0
-    if [ $RESULT_linter_level_8 -ge 1 ]
-    then
-        level[8]=2
-    fi
+    pass_level_8() {
+        # This happens in the linter
+        # When writing this, defined as app being maintained + long term quality (=
+        # certain amount of time level 5+ in the last year)
+        [ $RESULT_linter_level_8 -ge 1 ] || \
+        ([ $RESULT_linter_level_8 -eq 0 ] && \
+        [ "${level[8]}" == "2" ] )
+    }
+
+    # Check if the level can be changed
+    level_can_change () {
+        # If the level is set at auto, it's waiting for a change
+        # And if it's set at 2, its value can be modified by a new result
+        [ "${level[$1]}" == "auto" ] || [ "${level[$1]}" -eq 2 ]
+    }
+
+    if level_can_change 1; then pass_level_1 && level[1]=2 || level[1]=0; fi
+    if level_can_change 2; then pass_level_2 && level[2]=2 || level[2]=0; fi
+    if level_can_change 3; then pass_level_3 && level[3]=2 || level[3]=0; fi
+    if level_can_change 4; then pass_level_4 && level[4]=2 || level[4]=0; fi
+    if level_can_change 5; then pass_level_5 && level[5]=2 || level[5]=0; fi
+    if level_can_change 6; then pass_level_6 && level[6]=2 || level[6]=0; fi
+    if level_can_change 7; then pass_level_7 && level[7]=2 || level[7]=0; fi
+    if level_can_change 8; then pass_level_8 && level[8]=2 || level[8]=0; fi
 
     # Evaluate the ninth level
     # -> High quality package.
     # The level 9 can be validated only by the official list of app.
     level[9]=0
-    # Define the level 8 only if we're working on a repository. Otherwise, we can't assert that this is the correct app.
+    # Define the level 9 only if we're working on a repository. Otherwise, we can't assert that this is the correct app.
     if echo "$app_arg" | grep --extended-regexp --quiet "https?:\/\/"
     then
         # Get the name of the app from the repository name.
@@ -749,7 +717,7 @@ fi
 
         # Get the last version of the app list
         list_url="https://raw.githubusercontent.com/YunoHost/apps/master/apps.json"
-        if curl $list_url | jq ".$app_name.high_quality" | grep -q "true"
+        if curl --silent $list_url | jq ".[\"$app_name\"].high_quality" | grep -q "true"
         then
             level[9]=2
         fi
@@ -797,7 +765,7 @@ fi
     fi
 
     # If the package linter returned a critical error, the app is flagged as broken / level 0
-    if [ $RESULT_linter -le -2 ]
+    if [ $RESULT_linter_broken -eq 1 ]
     then
         error "The package linter reported a critical failure ! App is considered broken !"
         global_level=0
@@ -872,6 +840,7 @@ initialize_values() {
     RESULT_linter_level_6=0
     RESULT_linter_level_7=0
     RESULT_linter_level_8=0
+	RESULT_linter_broken=0
     RESULT_global_setup=0
     RESULT_global_remove=0
     RESULT_check_sub_dir=0
diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 7530196..cf41040 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -1755,6 +1755,7 @@ PACKAGE_LINTER () {
     cat "$script_dir/temp_linter_result.log" | tee --append "$complete_log"
     cat "$script_dir/temp_linter_result.json" >> "$complete_log"
 
+	RESULT_linter_broken=0
     RESULT_linter_level_6=0
     RESULT_linter_level_7=0
     RESULT_linter_level_8=0
@@ -1779,7 +1780,8 @@ PACKAGE_LINTER () {
     if [[ -n "$(cat "$script_dir/temp_linter_result.json" | jq ".critical" | grep -v '\[\]')" ]]
     then
         report_test_failed
-        RESULT_linter=-2
+        RESULT_linter_broken=1
+        RESULT_linter=-1
         # If there are any regular errors, we'll cap to 4
     elif [[ -n "$(cat "$script_dir/temp_linter_result.json" | jq ".error" | grep -v '\[\]')" ]]
     then
@@ -1791,11 +1793,10 @@ PACKAGE_LINTER () {
         if [[ -n "$(cat "$script_dir/temp_linter_result.json" | jq ".warning" | grep -v '\[\]')" ]]
         then
             report_test_warning
-            RESULT_linter=1
         else
             report_test_success
-            RESULT_linter=2
         fi
+        RESULT_linter=1
     fi
 }