 -                r zadd zsetinf2 -inf key
 -                r $cmd zsetinf3 2 zsetinf1 zsetinf2
 -                assert_equal -inf [r zscore zsetinf3 key]
--            }
--
--            test "$cmd with NaN weights $encoding" {
++                r del "{slot}zsetinf1" "{slot}zsetinf2"
++
++                r zadd "{slot}zsetinf1" +inf key
++                r zadd "{slot}zsetinf2" +inf key
++                r $cmd "{slot}zsetinf3" 2 "{slot}zsetinf1" "{slot}zsetinf2"
++                assert_equal inf [r zscore "{slot}zsetinf3" key]
++
++                r zadd "{slot}zsetinf1" -inf key
++                r zadd "{slot}zsetinf2" +inf key
++                r $cmd "{slot}zsetinf3" 2 "{slot}zsetinf1" "{slot}zsetinf2"
++                assert_equal 0 [r zscore "{slot}zsetinf3" key]
++
++                r zadd "{slot}zsetinf1" +inf key
++                r zadd "{slot}zsetinf2" -inf key
++                r $cmd "{slot}zsetinf3" 2 "{slot}zsetinf1" "{slot}zsetinf2"
++                assert_equal 0 [r zscore "{slot}zsetinf3" key]
++
++                r zadd "{slot}zsetinf1" -inf key
++                r zadd "{slot}zsetinf2" -inf key
++                r $cmd "{slot}zsetinf3" 2 "{slot}zsetinf1" "{slot}zsetinf2"
++                assert_equal -inf [r zscore "{slot}zsetinf3" key]
+             }
+ 
+             test "$cmd with NaN weights $encoding" {
 -                r del zsetinf1 zsetinf2
--
++                r del "{slot}zsetinf1" "{slot}zsetinf2"
+ 
 -                r zadd zsetinf1 1.0 key
 -                r zadd zsetinf2 1.0 key
--                assert_error "*weight*not*float*" {
++                r zadd "{slot}zsetinf1" 1.0 key
++                r zadd "{slot}zsetinf2" 1.0 key
+                 assert_error "*weight*not*float*" {
 -                    r $cmd zsetinf3 2 zsetinf1 zsetinf2 weights nan nan
--                }
--            }
--        }
--
--        test "Basic ZPOP with a single key - $encoding" {
--            r del zset
--            assert_equal {} [r zpopmin zset]
--            create_zset zset {-1 a 1 b 2 c 3 d 4 e}
--            assert_equal {a -1} [r zpopmin zset]
--            assert_equal {b 1} [r zpopmin zset]
--            assert_equal {e 4} [r zpopmax zset]
--            assert_equal {d 3} [r zpopmax zset]
--            assert_equal {c 2} [r zpopmin zset]
--            assert_equal 0 [r exists zset]
--            r set foo bar
--            assert_error "*WRONGTYPE*" {r zpopmin foo}
--        }
--
--        test "ZPOP with count - $encoding" {
--            r del z1 z2 z3 foo
--            r set foo bar
--            assert_equal {} [r zpopmin z1 2]
--            assert_error "*WRONGTYPE*" {r zpopmin foo 2}
--            create_zset z1 {0 a 1 b 2 c 3 d}
--            assert_equal {a 0 b 1} [r zpopmin z1 2]
--            assert_equal {d 3 c 2} [r zpopmax z1 2]
--        }
--
++                    r $cmd "{slot}zsetinf3" 2 "{slot}zsetinf1" "{slot}zsetinf2" weights nan nan
+                 }
+             }
+         }
+@@ -689,93 +692,98 @@ start_server {tags {"zset"}} {
+             assert_equal {d 3 c 2} [r zpopmax z1 2]
+         }
+ 
 -        test "BZPOP with a single existing sorted set - $encoding" {
 -            set rd [redis_deferring_client]
 -            create_zset zset {0 a 1 b 2 c}

-
-            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb]
-            assert_equal {a 1 b 3 d 3 c 5} [r zrange zsetc 0 -1 withscores]
-        }
-
-        test "ZUNIONSTORE with weights - $encoding" {
-            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb weights 2 3]
-            assert_equal {a 2 b 7 d 9 c 12} [r zrange zsetc 0 -1 withscores]
-        }
-
-        test "ZUNIONSTORE with a regular set and weights - $encoding" {
-            r del seta
-            r sadd seta a
-            r sadd seta b
-            r sadd seta c
-
-            assert_equal 4 [r zunionstore zsetc 2 seta zsetb weights 2 3]
-            assert_equal {a 2 b 5 c 8 d 9} [r zrange zsetc 0 -1 withscores]
-        }
-
-        test "ZUNIONSTORE with AGGREGATE MIN - $encoding" {
-            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb aggregate min]
-            assert_equal {a 1 b 1 c 2 d 3} [r zrange zsetc 0 -1 withscores]
-        }
-
-        test "ZUNIONSTORE with AGGREGATE MAX - $encoding" {
-            assert_equal 4 [r zunionstore zsetc 2 zseta zsetb aggregate max]
-            assert_equal {a 1 b 2 c 3 d 3} [r zrange zsetc 0 -1 withscores]
-        }
-
-        test "ZINTERSTORE basics - $encoding" {
-            assert_equal 2 [r zinterstore zsetc 2 zseta zsetb]
-            assert_equal {b 3 c 5} [r zrange zsetc 0 -1 withscores]
-        }
-
-        test "ZINTERSTORE with weights - $encoding" {
-            assert_equal 2 [r zinterstore zsetc 2 zseta zsetb weights 2 3]
-            assert_equal {b 7 c 12} [r zrange zsetc 0 -1 withscores]
-        }
-
-        test "ZINTERSTORE with a regular set and weights - $encoding" {
-            r del seta
-            r sadd seta a

+        #     $rd read
+        # } {zset a 0}
+
+        # Geode fails with unknown command `bzpopmin`
+        # test "BZPOPMIN with variadic ZADD" {
+        #     set rd [redis_deferring_client]
+        #     r del zset
