diff --git a/src/Containers-AVL-Tree-Tests/CTAVLNodeTest.class.st b/src/Containers-AVL-Tree-Tests/CTAVLNodeTest.class.st
new file mode 100644
index 0000000..55253ce
--- /dev/null
+++ b/src/Containers-AVL-Tree-Tests/CTAVLNodeTest.class.st
@@ -0,0 +1,49 @@
+Class {
+	#name : 'CTAVLNodeTest',
+	#superclass : 'TestCase',
+	#category : 'Containers-AVL-Tree-Tests',
+	#package : 'Containers-AVL-Tree-Tests'
+}
+
+{ #category : 'tests' }
+CTAVLNodeTest >> testCopyLeafNode [
+	| node copiedNode |
+	node := CTAVLNode new contents: 42.
+	
+	copiedNode := node copy.
+	
+	self assert: copiedNode contents equals: 42.
+	self deny: node == copiedNode.
+	
+	self assert: copiedNode height equals: 1.
+	self assert: copiedNode left isNilNode.
+	self assert: copiedNode right isNilNode
+]
+
+{ #category : 'tests' }
+CTAVLNodeTest >> testIsLeaf [
+    | parentNode childNode |
+    parentNode := CTAVLNode new contents: 50.
+    self assert: parentNode isLeaf.
+
+    childNode := CTAVLNode new contents: 30.
+    parentNode left: childNode.
+
+    self deny: parentNode isLeaf.
+    self assert: childNode isLeaf.
+]
+
+{ #category : 'tests' }
+CTAVLNodeTest >> testParentChildRelationships [
+    | root leftChild rightChild |
+    root := CTAVLNode new contents: 50.
+    leftChild := CTAVLNode new contents: 30.
+    rightChild := CTAVLNode new contents: 70.
+
+    root left: leftChild.
+    root right: rightChild.
+
+    self assert: root parent isNil.
+    self assert: leftChild parent equals: root.
+    self assert: rightChild parent equals: root.
+]
diff --git a/src/Containers-AVL-Tree-Tests/CTAVLTreeTest.class.st b/src/Containers-AVL-Tree-Tests/CTAVLTreeTest.class.st
index 686db71..7209450 100644
--- a/src/Containers-AVL-Tree-Tests/CTAVLTreeTest.class.st
+++ b/src/Containers-AVL-Tree-Tests/CTAVLTreeTest.class.st
@@ -148,21 +148,6 @@ CTAVLTreeTest >> testCopyLargeTree [
 	self assert: copiedTree asArray equals: tree asArray.
 ]
 
-{ #category : 'tests' }
-CTAVLTreeTest >> testCopyLeafNode [
-	| node copiedNode |
-	node := CTAVLNode new contents: 42.
-	
-	copiedNode := node copy.
-	
-	self assert: copiedNode contents equals: 42.
-	self deny: node == copiedNode.
-	
-	self assert: copiedNode height equals: 1.
-	self assert: copiedNode left isNilNode.
-	self assert: copiedNode right isNilNode
-]
-
 { #category : 'tests' }
 CTAVLTreeTest >> testCopySingleNode [
 	| copiedTree |
@@ -373,17 +358,6 @@ CTAVLTreeTest >> testIncludes [
 	self deny: (tree includes: 99)
 ]
 
-{ #category : 'tests' }
-CTAVLTreeTest >> testIsLeaf [
-
-	tree add: 50.
-	self assert: tree root isLeaf.
-	
-	tree add: 30.
-	self deny: tree root isLeaf.
-	self assert: tree root left isLeaf
-]
-
 { #category : 'tests' }
 CTAVLTreeTest >> testLLRotation [
 
@@ -417,16 +391,6 @@ CTAVLTreeTest >> testNegativeNumbers [
 	self assert: tree validate
 ]
 
-{ #category : 'tests' }
-CTAVLTreeTest >> testParentChildRelationships [
-
-	tree addAll: #(50 30 70 20 40).
-	
-	self assert: tree root parent isNil.
-	self assert: tree root left parent equals: tree root.
-	self assert: tree root right parent equals: tree root
-]
-
 { #category : 'tests' }
 CTAVLTreeTest >> testPostOrderTraversal [