diff --git a/lib/commands/EVAL.ts b/lib/commands/EVAL.ts
index 89645df9f3..f269815b7e 100644
--- a/lib/commands/EVAL.ts
+++ b/lib/commands/EVAL.ts
@@ -3,7 +3,3 @@ import { EvalOptions, pushEvalArguments } from './generic-transformers';
 export function transformArguments(script: string, options?: EvalOptions): Array<string> {
     return pushEvalArguments(['EVAL', script], options);
 }
-
-export function transformReply(reply: unknown): unknown {
-    return reply;
-}
diff --git a/lib/commands/EVALSHA.ts b/lib/commands/EVALSHA.ts
index a81595bc4c..105784cf5f 100644
--- a/lib/commands/EVALSHA.ts
+++ b/lib/commands/EVALSHA.ts
@@ -3,7 +3,3 @@ import { EvalOptions, pushEvalArguments } from './generic-transformers';
 export function transformArguments(sha1: string, options?: EvalOptions): Array<string> {
     return pushEvalArguments(['EVALSHA', sha1], options);
 }
-
-export function transformReply(reply: unknown): unknown {
-    return reply;
-}
diff --git a/lib/commands/ZRANGESTORE.spec.ts b/lib/commands/ZRANGESTORE.spec.ts
index 30dee7c0b5..5405565640 100644
--- a/lib/commands/ZRANGESTORE.spec.ts
+++ b/lib/commands/ZRANGESTORE.spec.ts
@@ -1,6 +1,6 @@
 import { strict as assert } from 'assert';
 import { TestRedisServers, itWithClient, describeHandleMinimumRedisVersion } from '../test-utils';
-import { transformArguments } from './ZRANGESTORE';
+import { transformArguments, transformReply } from './ZRANGESTORE';
 
 describe('ZRANGESTORE', () => {
     describeHandleMinimumRedisVersion([6, 2]);
@@ -68,6 +68,15 @@ describe('ZRANGESTORE', () => {
         });
     });
 
+    describe('transformReply', () => {
+        it('should throw TypeError when reply is not a number', () => {
+            assert.throws(
+                () => (transformReply as any)([]),
+                TypeError
+            );
+        });
+    });
+
     itWithClient(TestRedisServers.OPEN, 'client.zRangeStore', async client => {
         await client.zAdd('src', {
             score: 0.5,
diff --git a/lib/commands/generic-transformers.spec.ts b/lib/commands/generic-transformers.spec.ts
index 9ac72bb1b2..9bde6ebb3a 100644
--- a/lib/commands/generic-transformers.spec.ts
+++ b/lib/commands/generic-transformers.spec.ts
@@ -300,6 +300,13 @@ describe('Generic Transformers', () => {
             );
         });
 
+        it('with COUNT', () => {
+            assert.deepEqual(
+                pushGeoCountArgument([], 1),
+                ['COUNT', '1']
+            );
+        });
+
         it('with ANY', () => {
             assert.deepEqual(
                 pushGeoCountArgument([], {
diff --git a/lib/commands/generic-transformers.ts b/lib/commands/generic-transformers.ts
index 87325e61d7..84a6c97b81 100644
--- a/lib/commands/generic-transformers.ts
+++ b/lib/commands/generic-transformers.ts
@@ -204,12 +204,10 @@ export function pushGeoSearchArguments(
         args.push('BYBOX', by.width.toString(), by.height.toString());
     }
 
-    if (by.unit) {
-        args.push(by.unit);
-    }
+    args.push(by.unit);
 
     if (options?.SORT) {
-        args.push(options?.SORT);
+        args.push(options.SORT);
     }
 
     pushGeoCountArgument(args, options?.COUNT);
diff --git a/package-lock.json b/package-lock.json
index e4625a0740..bb840cc6dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1789,9 +1789,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.853",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.853.tgz",
-      "integrity": "sha512-W4U8n+U8I5/SUaFcqZgbKRmYZwcyEIQVBDf+j5QQK6xChjXnQD+wj248eGR9X4u+dDmDR//8vIfbu4PrdBBIoQ==",
+      "version": "1.3.854",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.854.tgz",
+      "integrity": "sha512-00/IIC1mFPkq32MhUJyLdcTp7+wsKK2G3Sb65GSas9FKJQGYkDcZ4GwJkkxf5YyM3ETvl6n+toV8OmtXl4IA/g==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -6967,9 +6967,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.853",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.853.tgz",
-      "integrity": "sha512-W4U8n+U8I5/SUaFcqZgbKRmYZwcyEIQVBDf+j5QQK6xChjXnQD+wj248eGR9X4u+dDmDR//8vIfbu4PrdBBIoQ==",
+      "version": "1.3.854",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.854.tgz",
+      "integrity": "sha512-00/IIC1mFPkq32MhUJyLdcTp7+wsKK2G3Sb65GSas9FKJQGYkDcZ4GwJkkxf5YyM3ETvl6n+toV8OmtXl4IA/g==",
       "dev": true
     },
     "emoji-regex": {