--- a/KeyedCollection.st	Sun Feb 10 14:52:18 2019 +0100
+++ b/KeyedCollection.st	Sun Feb 10 14:54:15 2019 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1998 by eXept Software AG
               All Rights Reserved
@@ -766,6 +764,39 @@
 ! !
 
 
+!KeyedCollection methodsFor:'queries'!
+
+includesAssociation:anAssociation
+    "return true, if there is an association in the receiver with the
+     same key and value as the argument, anAssociation.
+     NOTICE: in contrast to #includes:, this compares both key and value."
+
+    |val|
+
+    val := self at:(anAssociation key) ifAbsent:[^ false].
+    ^ val = anAssociation value
+
+    "Created: / 14-09-2018 / 16:48:10 / Stefan Vogel"
+!
+
+includesIdenticalKey:aKey
+    "return true, if the argument, aKey is a key in the receiver"
+
+    self keysDo:[:elKey | aKey == elKey ifTrue:[^ true]].
+    ^ false
+
+    "Created: / 19.6.1998 / 00:55:05 / cg"
+!
+
+includesKey:aKey
+    "return true, if the argument, aKey is a key in the receiver"
+
+    self keysDo:[:elKey | aKey = elKey ifTrue:[^ true]].
+    ^ false
+
+    "Created: / 19.6.1998 / 00:55:05 / cg"
+! !
+
 !KeyedCollection methodsFor:'removing'!
 
 removeAllKeys:aCollection
@@ -850,39 +881,6 @@
     "Modified: 8.10.1996 / 22:02:03 / cg"
 ! !
 
-!KeyedCollection methodsFor:'testing'!
-
-includesAssociation:anAssociation
-    "return true, if there is an association in the receiver with the
-     same key and value as the argument, anAssociation.
-     NOTICE: in contrast to #includes:, this compares both key and value."
-
-    |val|
-
-    val := self at:(anAssociation key) ifAbsent:[^ false].
-    ^ val = anAssociation value
-
-    "Created: / 14-09-2018 / 16:48:10 / Stefan Vogel"
-!
-
-includesIdenticalKey:aKey
-    "return true, if the argument, aKey is a key in the receiver"
-
-    self keysDo:[:elKey | aKey == elKey ifTrue:[^ true]].
-    ^ false
-
-    "Created: / 19.6.1998 / 00:55:05 / cg"
-!
-
-includesKey:aKey
-    "return true, if the argument, aKey is a key in the receiver"
-
-    self keysDo:[:elKey | aKey = elKey ifTrue:[^ true]].
-    ^ false
-
-    "Created: / 19.6.1998 / 00:55:05 / cg"
-! !
-
 !KeyedCollection class methodsFor:'documentation'!
 
 version