diff --git a/.gitea/workflows/gradle_build.yml b/.gitea/workflows/gradle_build.yml
index f135547..89f015a 100644
--- a/.gitea/workflows/gradle_build.yml
+++ b/.gitea/workflows/gradle_build.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '11'
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v3
       - name: Gradle build
diff --git a/clients/build.gradle b/clients/build.gradle
index c701d4d..7ba5603 100644
--- a/clients/build.gradle
+++ b/clients/build.gradle
@@ -15,6 +15,11 @@ dependencies {
     implementation project(':module4')
     implementation project(':module5')
 }
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
 
 test {
     useJUnitPlatform()
diff --git a/clients/src/main/java/com/hithomelabs/clients/module5/InsertionClient.java b/clients/src/main/java/com/hithomelabs/clients/module5/InsertionClient.java
index 41fe34c..c0d75c7 100644
--- a/clients/src/main/java/com/hithomelabs/clients/module5/InsertionClient.java
+++ b/clients/src/main/java/com/hithomelabs/clients/module5/InsertionClient.java
@@ -20,14 +20,6 @@ public class InsertionClient {
         //* * Sample output
         for (int i = 0; i < apples.length; i++)
             System.out.println(apples[i]);
-
-        oranges[0] = new Orange(4);
-        oranges[1] = new Orange(1);
-        // * Should give runtime exception as ClassCastException is a runtime exception
-        //insertion.sort(oranges);
-        Insertion<Orange> selection2 = new Insertion<>();
-        // * Should result in a compile time exception, as casting to Orange will fail
-        //selection2.sort(apples);
     }
 
 
diff --git a/clients/src/main/java/com/hithomelabs/clients/module5/SelectionClient.java b/clients/src/main/java/com/hithomelabs/clients/module5/SelectionClient.java
index 48028e1..95c5ee7 100644
--- a/clients/src/main/java/com/hithomelabs/clients/module5/SelectionClient.java
+++ b/clients/src/main/java/com/hithomelabs/clients/module5/SelectionClient.java
@@ -26,7 +26,7 @@ public class SelectionClient {
         oranges[0] = new Orange(4);
         oranges[1] = new Orange(1);
         // * Should give runtime exception as ClassCastException is a runtime exception
-        //insertion.sort(oranges);
+        //selection.sort(oranges);
         Selection<Orange> selection2 = new Selection<Orange>();
         // * Should result in a compile time exception, as casting to Orange will fail
         //selection2.sort(apples);
diff --git a/module5/build.gradle b/module5/build.gradle
index ab1eb25..6b1dd5d 100644
--- a/module5/build.gradle
+++ b/module5/build.gradle
@@ -13,7 +13,11 @@ dependencies {
     testImplementation platform('org.junit:junit-bom:5.10.0')
     testImplementation 'org.junit.jupiter:junit-jupiter'
 }
-
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
 test {
     useJUnitPlatform()
 }
\ No newline at end of file
diff --git a/module5/src/test/java/com/hithomelabs/princeton1/module5/SortTest.java b/module5/src/test/java/com/hithomelabs/princeton1/module5/SortTest.java
index 62b3f34..d0b2e4a 100644
--- a/module5/src/test/java/com/hithomelabs/princeton1/module5/SortTest.java
+++ b/module5/src/test/java/com/hithomelabs/princeton1/module5/SortTest.java
@@ -10,7 +10,7 @@ import java.util.Random;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class InsertionTest {
+class SortTest {
 
     private ArrayList<Apple> apples;
     private AbstractCustomSorts<Apple> sortingAlgorithm;
@@ -47,6 +47,13 @@ class InsertionTest {
         testSort(sortingAlgorithm);
     }
 
+    @Test
+    @DisplayName("Testing Shell sort functionality")
+    public void testShellSort() {
+        sortingAlgorithm = new Shell<>();
+        testSort(sortingAlgorithm);
+    }
+
 
     @AfterEach
     void tearDown() {
diff --git a/settings.gradle b/settings.gradle
index 3314330..f786f9b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,5 +14,4 @@ rootProject.name = 'Pricenton1'
 include('module4')
 include 'clients'
 include 'module5'
-include 'module5'