diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template
new file mode 100644
index 00000000..bb13dfc4
--- /dev/null
+++ b/.github/workflows/test.yml-template
@@ -0,0 +1,23 @@
+name: Test
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - run: npm test
diff --git a/package-lock.json b/package-lock.json
index eadb3115..84d432db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "license": "GPL-3.0",
       "devDependencies": {
         "@mate-academy/eslint-config": "latest",
-        "@mate-academy/scripts": "^1.8.6",
+        "@mate-academy/scripts": "^2.1.3",
         "eslint": "^8.57.0",
         "eslint-plugin-jest": "^28.6.0",
         "eslint-plugin-node": "^11.1.0",
@@ -1467,10 +1467,11 @@
       }
     },
     "node_modules/@mate-academy/scripts": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz",
-      "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz",
+      "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@octokit/rest": "^17.11.2",
         "@types/get-port": "^4.2.0",
diff --git a/package.json b/package.json
index 9c0b7bbd..0827621b 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "license": "GPL-3.0",
   "devDependencies": {
     "@mate-academy/eslint-config": "latest",
-    "@mate-academy/scripts": "^1.8.6",
+    "@mate-academy/scripts": "^2.1.3",
     "eslint": "^8.57.0",
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-node": "^11.1.0",
diff --git a/src/arrayMethodSort.js b/src/arrayMethodSort.js
index 32363d0d..6e3c1a1d 100644
--- a/src/arrayMethodSort.js
+++ b/src/arrayMethodSort.js
@@ -4,8 +4,40 @@
  * Implement method Sort
  */
 function applyCustomSort() {
-  [].__proto__.sort2 = function(compareFunction) {
-    // write code here
+  [].__proto__.sort2 = function (compareFunction) {
+    // Se não houver callback --> lógica do Unicode
+    const compare =
+      compareFunction ||
+      ((a, b) => {
+        const s1 = String(a);
+        const s2 = String(b);
+
+        if (s1 < s2) {
+          return -1;
+        }
+
+        if (s1 > s2) {
+          return 1;
+        }
+
+        return 0;
+      });
+
+    // Bubble Sort
+    for (let i = 0; i < this.length; i++) {
+      for (let j = 0; j < this.length - 1; j++) {
+        const resultado = compare(this[j], this[j + 1]);
+
+        if (resultado > 0) {
+          const temp = this[j];
+
+          this[j] = this[j + 1];
+          this[j + 1] = temp;
+        }
+      }
+    }
+
+    return this;
   };
 }