diff --git a/local_examples/cmd_exists/NRedisStack/CmdsGenericExample.cs b/local_examples/cmds_generic/NRedisStack/CmdsGenericExample.cs
similarity index 100%
rename from local_examples/cmd_exists/NRedisStack/CmdsGenericExample.cs
rename to local_examples/cmds_generic/NRedisStack/CmdsGenericExample.cs
diff --git a/local_examples/cmd_exists/go-redis/cmds_generic_test.go b/local_examples/cmds_generic/go-redis/cmds_generic_test.go
similarity index 100%
rename from local_examples/cmd_exists/go-redis/cmds_generic_test.go
rename to local_examples/cmds_generic/go-redis/cmds_generic_test.go
diff --git a/local_examples/cmd_exists/jedis/CmdsGenericExample.java b/local_examples/cmds_generic/jedis/CmdsGenericExample.java
similarity index 100%
rename from local_examples/cmd_exists/jedis/CmdsGenericExample.java
rename to local_examples/cmds_generic/jedis/CmdsGenericExample.java
diff --git a/local_examples/cmd_exists/lettuce-async/CmdsGenericExample.java b/local_examples/cmds_generic/lettuce-async/CmdsGenericExample.java
similarity index 100%
rename from local_examples/cmd_exists/lettuce-async/CmdsGenericExample.java
rename to local_examples/cmds_generic/lettuce-async/CmdsGenericExample.java
diff --git a/local_examples/cmd_exists/lettuce-reactive/CmdsGenericExample.java b/local_examples/cmds_generic/lettuce-reactive/CmdsGenericExample.java
similarity index 100%
rename from local_examples/cmd_exists/lettuce-reactive/CmdsGenericExample.java
rename to local_examples/cmds_generic/lettuce-reactive/CmdsGenericExample.java
diff --git a/local_examples/cmd_exists/node-redis/cmds_generic.js b/local_examples/cmds_generic/node-redis/cmds-generic.js
similarity index 87%
rename from local_examples/cmd_exists/node-redis/cmds_generic.js
rename to local_examples/cmds_generic/node-redis/cmds-generic.js
index ba35a19841..37e37f7742 100644
--- a/local_examples/cmd_exists/node-redis/cmds_generic.js
+++ b/local_examples/cmds_generic/node-redis/cmds-generic.js
@@ -54,25 +54,41 @@ console.log(expireRes2); // 1
 
 const expireRes3 = await client.ttl('mykey');
 console.log(expireRes3); // 10
+// REMOVE_START
+assert.equal(expireRes3, 10);
+// REMOVE_END
 
 const expireRes4 = await client.set('mykey', 'Hello World');
 console.log(expireRes4); // OK
 
 const expireRes5 = await client.ttl('mykey');
 console.log(expireRes5); // -1
+// REMOVE_START
+assert.equal(expireRes5, -1);
+// REMOVE_END
 
 const expireRes6 = await client.expire('mykey', 10, "XX");
 console.log(expireRes6); // 0
+// REMOVE_START
+assert.equal(expireRes6, 0)
+// REMOVE_END
 
 const expireRes7 = await client.ttl('mykey');
 console.log(expireRes7); // -1
+// REMOVE_START
+assert.equal(expireRes7, -1);
+// REMOVE_END
 
 const expireRes8 = await client.expire('mykey', 10, "NX");
 console.log(expireRes8); // 1
+// REMOVE_START
+assert.equal(expireRes8, 1);
+// REMOVE_END
 
 const expireRes9 = await client.ttl('mykey');
 console.log(expireRes9); // 10
 // REMOVE_START
+assert.equal(expireRes9, 10);
 await client.del('mykey');
 // REMOVE_END
 // STEP_END
@@ -87,6 +103,7 @@ console.log(ttlRes2); // 1
 const ttlRes3 = await client.ttl('mykey');
 console.log(ttlRes3); // 10
 // REMOVE_START
+assert.equal(ttlRes3, 10);
 await client.del('mykey');
 // REMOVE_END
 // STEP_END
@@ -155,13 +172,20 @@ console.log(scan3Res2); // 1
 
 const scan3Res3 = await client.type('geokey');
 console.log(scan3Res3); // zset
+// REMOVE_START
+console.assert(scan3Res3 === 'zset');
+// REMOVE_END
 
 const scan3Res4 = await client.type('zkey');
 console.log(scan3Res4); // zset
+// REMOVE_START
+console.assert(scan3Res4 === 'zset');
+// REMOVE_END
 
 const scan3Res5 = await client.scan('0', { TYPE: 'zset' });
 console.log(scan3Res5.keys); // ['zkey', 'geokey']
 // REMOVE_START
+console.assert(scan3Res5.keys.sort().toString() === ['zkey', 'geokey'].sort().toString());
 await client.del(['geokey', 'zkey']);
 // REMOVE_END
 // STEP_END
@@ -172,11 +196,18 @@ console.log(scan4Res1); // 2
 
 const scan4Res2 = await client.hScan('myhash', '0');
 console.log(scan4Res2.entries); // [{field: 'a', value: '1'}, {field: 'b', value: '2'}]
+// REMOVE_START
+assert.deepEqual(scan4Res2.entries, [
+  { field: 'a', value: '1' },
+  { field: 'b', value: '2' }
+]);
+// REMOVE_END
 
 const scan4Res3 = await client.hScan('myhash', '0', { COUNT: 10 });
 const items = scan4Res3.entries.map((item) => item.field)
 console.log(items); // ['a', 'b']
 // REMOVE_START
+assert.deepEqual(items, ['a', 'b'])
 await client.del('myhash');
 // REMOVE_END
 // STEP_END
diff --git a/local_examples/cmd_exists/predis/CmdsGenericTest.php b/local_examples/cmds_generic/predis/CmdsGenericTest.php
similarity index 100%
rename from local_examples/cmd_exists/predis/CmdsGenericTest.php
rename to local_examples/cmds_generic/predis/CmdsGenericTest.php
diff --git a/local_examples/cmd_exists/redis-py/cmds_generic.py b/local_examples/cmds_generic/redis-py/cmds_generic.py
similarity index 91%
rename from local_examples/cmd_exists/redis-py/cmds_generic.py
rename to local_examples/cmds_generic/redis-py/cmds_generic.py
index 6ea3333753..8fa4155994 100644
--- a/local_examples/cmd_exists/redis-py/cmds_generic.py
+++ b/local_examples/cmds_generic/redis-py/cmds_generic.py
@@ -132,7 +132,7 @@
 print(res)
 # >>> ['foobar', 'foo', 'feelsgood']
 # REMOVE_START
-assert set(res) == {"foo", "foobar", "feelsgood"}
+assert sorted(res) == sorted(["foo", "foobar", "feelsgood"])
 r.delete("myset")
 # REMOVE_END
 # STEP_END
@@ -181,16 +181,22 @@
 res = r.type("geokey")
 print(res)
 # >>> zset
+# REMOVE_START
+assert res == "zset"
+# REMOVE_END
 
 res = r.type("zkey")
 print(res)
 # >>> zset
+# REMOVE_START
+assert res == "zset"
+# REMOVE_END
 
 cursor, keys = r.scan(cursor=0, _type="zset")
 print(keys)
 # >>> ['zkey', 'geokey']
 # REMOVE_START
-assert set(keys) == {"zkey", "geokey"}
+assert sorted(keys) == sorted(["zkey", "geokey"])
 r.delete("geokey", "zkey")
 # REMOVE_END
 # STEP_END
@@ -203,12 +209,18 @@
 cursor, keys = r.hscan("myhash", 0)
 print(keys)
 # >>> {'a': '1', 'b': '2'}
+# REMOVE_START
+assert keys == {'a': '1', 'b': '2'}
+# REMOVE_END
 
 cursor, keys = r.hscan("myhash", 0, no_values=True)
 print(keys)
 # >>> ['a', 'b']
 # REMOVE_START
 assert keys == ['a', 'b']
+# REMOVE_END
+
+# REMOVE_START
 r.delete("myhash")
 # REMOVE_END
 # STEP_END