diff --git a/scripts/errors/coll/Correct.py b/scripts/errors/coll/Correct.py
index 59b2d4d19be364b2d2f679bb6fdc79e84c842bf7..57fce928abe1a72a2b656ea1d20b13608ba6ceff 100644
--- a/scripts/errors/coll/Correct.py
+++ b/scripts/errors/coll/Correct.py
@@ -30,12 +30,16 @@ class CorrectColl(ErrorGenerator):
             tm = get_collective_template(func_to_use)
             tm.set_description("Correct-" + func_to_use, "Correct code")
             yield tm
+            if generate_level <= BASIC_TEST_LEVEL:
+                break
 
         # Separate function called depending on process ID
         for func_to_use in self.functions_to_use:
             tm = get_two_collective_template(func_to_use, func_to_use)
             tm.set_description("Correct-" + func_to_use + "-" + func_to_use, "Correct code")
             yield tm
+            if generate_level <= BASIC_TEST_LEVEL:
+                break
 
         # Generate scenarios with topology functions
         for func_to_use in self.topology_functions:
@@ -47,6 +51,5 @@ class CorrectColl(ErrorGenerator):
             cart_get.set_arg("comm_cart", "mpi_comm_0")
             tm.register_instruction(cart_get)
             yield tm
-
-        if generate_level >= BASIC_TEST_LEVEL:
-            return
+            if generate_level <= BASIC_TEST_LEVEL:
+                break
diff --git a/scripts/errors/coll/InvalidComm.py b/scripts/errors/coll/InvalidComm.py
index c1546c794cde0a96d9b3722d445a3fc84bc6f05f..618fd1f16be784d6f292acfab62b586aa886bc75 100644
--- a/scripts/errors/coll/InvalidComm.py
+++ b/scripts/errors/coll/InvalidComm.py
@@ -35,6 +35,8 @@ class InvalidComErrorColl(ErrorGenerator):
                     call.set_has_error()
 
                 yield tm
+                if generate_level <= BASIC_TEST_LEVEL:
+                    break
 
         for fun_to_use in self.topology_functions:
             tm = get_collective_template(func_to_use)
@@ -49,6 +51,5 @@ class InvalidComErrorColl(ErrorGenerator):
                 cart_get.set_has_error()
                 yield tm
 
-            # only check for one comm
             if generate_level <= BASIC_TEST_LEVEL:
                 return
diff --git a/scripts/errors/coll/InvalidOp.py b/scripts/errors/coll/InvalidOp.py
index 891f56a103c764b6e54a7544b367783f2b54e813..d39708985e0491b9ecd09ac827977cbe11aefa4a 100644
--- a/scripts/errors/coll/InvalidOp.py
+++ b/scripts/errors/coll/InvalidOp.py
@@ -28,6 +28,5 @@ class InvalidComErrorColl(ErrorGenerator):
                     call.set_has_error()
                 yield tm
 
-            # only check for one comm
-            if generate_level <= BASIC_TEST_LEVEL:
-                return
+                if generate_level <= BASIC_TEST_LEVEL:
+                    return
diff --git a/scripts/errors/coll/InvalidRank.py b/scripts/errors/coll/InvalidRank.py
index 4eccd286f01b61ae4b991456e4ef1106c395cae6..720b5c783d40ee360e0641c3abc241a9a9ee520b 100644
--- a/scripts/errors/coll/InvalidRank.py
+++ b/scripts/errors/coll/InvalidRank.py
@@ -29,5 +29,5 @@ class InvalidRankErrorColl(ErrorGenerator):
                     call.set_has_error()
 
                 yield tm
-            if generate_level <= BASIC_TEST_LEVEL:
-                return
+                if generate_level <= BASIC_TEST_LEVEL:
+                    return
diff --git a/scripts/errors/coll/InvalidType.py b/scripts/errors/coll/InvalidType.py
index 934a51efea23e74e6566270a10beac596ab23c84..a79d5f276280c2f9b84d0396ce3fcd41e705d49c 100644
--- a/scripts/errors/coll/InvalidType.py
+++ b/scripts/errors/coll/InvalidType.py
@@ -39,6 +39,5 @@ class InvalidComErrorColl(ErrorGenerator):
                         call.set_has_error()
                     yield tm
 
-            # only check for one comm
-            if generate_level <= BASIC_TEST_LEVEL:
-                return
+                if generate_level <= BASIC_TEST_LEVEL:
+                    return
diff --git a/scripts/errors/coll/ParamMatching.py b/scripts/errors/coll/ParamMatching.py
index 82c1032d53769ba60e52186ba1a1dec19ea25e6b..e1bf2f96da99796b4d187b1996dfc18a8d77f201 100644
--- a/scripts/errors/coll/ParamMatching.py
+++ b/scripts/errors/coll/ParamMatching.py
@@ -29,13 +29,13 @@ class InvalidComErrorColl(ErrorGenerator):
 
     def generate(self, generate_level, real_world_score_table):
 
-       # type missmatches are generated by ParamMatchingTypes.py
+        # type missmatches are generated by ParamMatchingTypes.py
 
         # Generate codes with op mismatch
         for func_to_use in self.func_with_op:
             tm = get_collective_template(func_to_use)
             op_to_use = "MPI_MAX"  # this could be a list of op
-            #TODO implement Real world coverage for that
+            # TODO implement Real world coverage for that
             tm.set_description("ParamMatching-Op-" + func_to_use, "Wrong operation matching")
 
             for call in tm.get_instruction("MPICALL", return_list=True):
@@ -48,6 +48,8 @@ class InvalidComErrorColl(ErrorGenerator):
                 tm.insert_instruction(c, after_instruction=call)
 
             yield tm
+            if generate_level <= BASIC_TEST_LEVEL:
+                break
 
         # Generate codes with root mismatch
         for func_to_use in self.func_with_root:
@@ -62,12 +64,14 @@ class InvalidComErrorColl(ErrorGenerator):
                 c = CorrectMPICallFactory.get(func_to_use)
 
             yield tm
+            if generate_level <= BASIC_TEST_LEVEL:
+                break
 
         # Generate codes with communicator mismatch
         for func_to_use in self.functions_to_use:
             tm = get_collective_template(func_to_use)
             com_to_use = "MPI_COMM_SELF"
-            #TODO use real word coverage for that
+            # TODO use real word coverage for that
             tm.set_description("ParamMatching-Com-" + func_to_use, "Wrong communicator matching")
 
             for call in tm.get_instruction("MPICALL", return_list=True):
@@ -80,6 +84,5 @@ class InvalidComErrorColl(ErrorGenerator):
                 tm.insert_instruction(c, after_instruction=call)
 
             yield tm
-
-        if generate_level <= BASIC_TEST_LEVEL:
-            return
+            if generate_level <= BASIC_TEST_LEVEL:
+                break