diff --git a/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/de.py b/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/de.py
index ddf3d91071..2f961bfdf8 100644
--- a/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/de.py
+++ b/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/de.py
@@ -1,6 +1,11 @@
 from behave import step
 
 
+@step('Es sind ausschliesslich "{ifc_classes}" Bauteile vorhanden')
+def step_impl(context, ifc_classes):
+    context.execute_steps(f'* There are exclusively "{ifc_class}" elements only')
+
+
 @step('Es sind keine "{ifc_class}" Bauteile vorhanden')
 def step_impl(context, ifc_class):
     context.execute_steps(f'* There are no "{ifc_class}" elements')
@@ -24,8 +29,3 @@ def step_impl(context, ifc_class):
 @step('Bei allen "{ifc_class}" Bauteilen ist die Beschreibung angegeben')
 def step_impl(context, ifc_class):
     context.execute_steps(f'* All "{ifc_class}" elements have a description given')
-
-
-@step('Es sind ausschliesslich "{ifc_classes}" Bauteile vorhanden')
-def step_impl(context, ifc_classes):
-    context.execute_steps(f'* There are exclusively "{ifc_class}" elements only')
diff --git a/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/en.py b/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/en.py
index 9f7244daa8..5b183689e5 100644
--- a/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/en.py
+++ b/src/ifcbimtester/bimtester/features/steps/attributes_eleclasses/en.py
@@ -7,6 +7,14 @@ from bimtester.ifc import IfcStore
 from bimtester.lang import _
 
 
+@step('There are exclusively "{ifc_classes}" elements only')
+def step_impl(context, ifc_classes):
+    only_eleclasses(
+        context,
+        ifc_classes
+    )
+
+
 @step('There are no "{ifc_class}" elements')
 def step_impl(context, ifc_class):
     no_eleclass(
@@ -47,14 +55,6 @@ def step_impl(context, ifc_class):
     )
 
 
-@step('There are exclusively "{ifc_class}" elements only')
-def step_impl(context, ifc_classes):
-    only_eleclasses(
-        context,
-        ifc_classes
-    )
-
-
 @step('All "{ifc_class}" elements have a name matching the pattern "{pattern}"')
 def step_impl(context, ifc_class, pattern):
     import re
@@ -188,8 +188,8 @@ def eleclass_have_class_attributes_with_a_value(
     context.falseprops = {}
 
     elements = IfcStore.file.by_type(ifc_class)
+    failed_attribs = []
     for elem in elements:
-        failed_attribs = []
         elem_failed = False
         for cl_attrib in class_attributes:
             attrib_value = getattr(elem, cl_attrib)
@@ -235,7 +235,7 @@ def eleclass_has_name_with_a_value(context, ifc_class):
         context.elemcount,
         context.falsecount,
         context.falseelems,
-        message_all_falseelems=_("The name of all {elemcount} {elemcount} elements is not set."),
+        message_all_falseelems=_("The name of all {elemcount} elements is not set."),
         message_some_falseelems=_("The name of {falsecount} out of {elemcount} {ifc_class} elements is not set: {falseelems}"),
         message_no_elems=_("There are no {ifc_class} elements in the IFC file."),
     )
@@ -262,7 +262,7 @@ def eleclass_has_description_with_a_value(
         context.elemcount,
         context.falsecount,
         context.falseelems,
-        message_all_falseelems=_("The description of all {elemcount} {elemcount} elements is not set."),
+        message_all_falseelems=_("The description of all {elemcount} elements is not set."),
         message_some_falseelems=_("The description of {falsecount} out of {elemcount} {ifc_class} elements is not set: {falseelems}"),
         message_no_elems=_("There are no {ifc_class} elements in the IFC file."),
     )