diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java
index 237d2f39c4..de02d71b4d 100644
--- a/src/main/java/redis/clients/jedis/BuilderFactory.java
+++ b/src/main/java/redis/clients/jedis/BuilderFactory.java
@@ -46,7 +46,7 @@ public String toString() {
   public static final Builder<byte[]> BYTE_ARRAY = new Builder<byte[]>() {
     @Override
     public byte[] build(Object data) {
-      return ((byte[]) data); // deleted == 1
+      return (byte[]) data;
     }
 
     @Override
@@ -65,8 +65,24 @@ public Long build(Object data) {
     public String toString() {
       return "long";
     }
+  };
 
+  public static final Builder<List<Long>> LONG_LIST = new Builder<List<Long>>() {
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<Long> build(Object data) {
+      if (null == data) {
+        return null;
+      }
+      return (List<Long>) data;
+    }
+
+    @Override
+    public String toString() {
+      return "List<Long>";
+    }
   };
+
   public static final Builder<String> STRING = new Builder<String>() {
     @Override
     public String build(Object data) {
@@ -102,52 +118,34 @@ public List<String> build(Object data) {
     public String toString() {
       return "List<String>";
     }
-
   };
-  public static final Builder<Map<String, String>> STRING_MAP = new Builder<Map<String, String>>() {
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map<String, String> build(Object data) {
-      final List<byte[]> flatHash = (List<byte[]>) data;
-      final Map<String, String> hash = new HashMap<>(flatHash.size()/2, 1);
-      final Iterator<byte[]> iterator = flatHash.iterator();
-      while (iterator.hasNext()) {
-        hash.put(SafeEncoder.encode(iterator.next()), SafeEncoder.encode(iterator.next()));
-      }
-
-      return hash;
-    }
 
-    @Override
-    public String toString() {
-      return "Map<String, String>";
-    }
-
-  };
-
-  public static final Builder<Map<String, String>> PUBSUB_NUMSUB_MAP = new Builder<Map<String, String>>() {
+  public static final Builder<Set<String>> STRING_SET = new Builder<Set<String>>() {
     @Override
     @SuppressWarnings("unchecked")
-    public Map<String, String> build(Object data) {
-      final List<Object> flatHash = (List<Object>) data;
-      final Map<String, String> hash = new HashMap<>(flatHash.size()/2, 1);
-      final Iterator<Object> iterator = flatHash.iterator();
-      while (iterator.hasNext()) {
-        hash.put(SafeEncoder.encode((byte[]) iterator.next()),
-          String.valueOf((Long) iterator.next()));
+    public Set<String> build(Object data) {
+      if (null == data) {
+        return null;
       }
-
-      return hash;
+      List<byte[]> l = (List<byte[]>) data;
+      final Set<String> result = new HashSet<String>(l.size(), 1);
+      for (final byte[] barray : l) {
+        if (barray == null) {
+          result.add(null);
+        } else {
+          result.add(SafeEncoder.encode(barray));
+        }
+      }
+      return result;
     }
 
     @Override
     public String toString() {
-      return "PUBSUB_NUMSUB_MAP<String, String>";
+      return "Set<String>";
     }
-
   };
 
-  public static final Builder<Set<String>> STRING_SET = new Builder<Set<String>>() {
+  public static final Builder<Set<String>> STRING_ZSET = new Builder<Set<String>>() {
     @Override
     @SuppressWarnings("unchecked")
     public Set<String> build(Object data) {
@@ -155,7 +153,7 @@ public Set<String> build(Object data) {
         return null;
       }
       List<byte[]> l = (List<byte[]>) data;
-      final Set<String> result = new HashSet<>(l.size(), 1);
+      final Set<String> result = new LinkedHashSet<String>(l.size(), 1);
       for (final byte[] barray : l) {
         if (barray == null) {
           result.add(null);
@@ -168,9 +166,28 @@ public Set<String> build(Object data) {
 
     @Override
     public String toString() {
-      return "Set<String>";
+      return "ZSet<String>";
+    }
+  };
+
+  public static final Builder<Map<String, String>> STRING_MAP = new Builder<Map<String, String>>() {
+    @Override
+    @SuppressWarnings("unchecked")
+    public Map<String, String> build(Object data) {
+      final List<byte[]> flatHash = (List<byte[]>) data;
+      final Map<String, String> hash = new HashMap<String, String>(flatHash.size()/2, 1);
+      final Iterator<byte[]> iterator = flatHash.iterator();
+      while (iterator.hasNext()) {
+        hash.put(SafeEncoder.encode(iterator.next()), SafeEncoder.encode(iterator.next()));
+      }
+
+      return hash;
     }
 
+    @Override
+    public String toString() {
+      return "Map<String, String>";
+    }
   };
 
   public static final Builder<List<byte[]>> BYTE_ARRAY_LIST = new Builder<List<byte[]>>() {
@@ -236,30 +253,23 @@ public String toString() {
 
   };
 
-  public static final Builder<Set<String>> STRING_ZSET = new Builder<Set<String>>() {
+  public static final Builder<Tuple> TUPLE = new Builder<Tuple>() {
     @Override
     @SuppressWarnings("unchecked")
-    public Set<String> build(Object data) {
-      if (null == data) {
+    public Tuple build(Object data) {
+      if (null == data) { // *Never* null. Still it doesn't hurt to be safe for future.
         return null;
       }
       List<byte[]> l = (List<byte[]>) data;
-      final Set<String> result = new LinkedHashSet<>(l.size(), 1);
-      for (final byte[] barray : l) {
-        if (barray == null) {
-          result.add(null);
-        } else {
-          result.add(SafeEncoder.encode(barray));
-        }
-      }
-      return result;
+      Iterator<byte[]> i = l.iterator();
+      if (i.hasNext()) return new Tuple(i.next(), DOUBLE.build(i.next()));
+      return null;
     }
 
     @Override
     public String toString() {
-      return "ZSet<String>";
+      return "Tuple";
     }
-
   };
 
   public static final Builder<Set<Tuple>> TUPLE_ZSET = new Builder<Set<Tuple>>() {
@@ -282,27 +292,29 @@ public Set<Tuple> build(Object data) {
     public String toString() {
       return "ZSet<Tuple>";
     }
-
   };
 
-  public static final Builder<Tuple> TUPLE = new Builder<Tuple>() {
+  public static final Builder<Map<String, String>> PUBSUB_NUMSUB_MAP = new Builder<Map<String, String>>() {
     @Override
     @SuppressWarnings("unchecked")
-    public Tuple build(Object data) {
-      List<byte[]> l = (List<byte[]>) data; // never null
-      if (l.isEmpty()) {
-        return null;
+    public Map<String, String> build(Object data) {
+      final List<Object> flatHash = (List<Object>) data;
+      final Map<String, String> hash = new HashMap<String, String>(flatHash.size()/2, 1);
+      final Iterator<Object> iterator = flatHash.iterator();
+      while (iterator.hasNext()) {
+        hash.put(SafeEncoder.encode((byte[]) iterator.next()),
+          String.valueOf((Long) iterator.next()));
       }
-      return new Tuple(l.get(0), DOUBLE.build(l.get(1)));
+
+      return hash;
     }
 
     @Override
     public String toString() {
-      return "Tuple";
+      return "PUBSUB_NUMSUB_MAP<String, String>";
     }
-
   };
-  
+
   public static final Builder<Object> EVAL_RESULT = new Builder<Object>() {
 
     @Override
@@ -367,16 +379,8 @@ public List<GeoCoordinate> build(Object data) {
       if (null == data) {
         return null;
       }
-      return interpretGeoposResult((List<Object>) data);
-    }
-
-    @Override
-    public String toString() {
-      return "List<GeoCoordinate>";
-    }
-
-    private List<GeoCoordinate> interpretGeoposResult(List<Object> responses) {
-      List<GeoCoordinate> responseCoordinate = new ArrayList<>(responses.size());
+      List<Object> responses = (List<Object>) data;
+      List<GeoCoordinate> responseCoordinate = new ArrayList<GeoCoordinate>(responses.size());
       for (Object response : responses) {
         if (response == null) {
           responseCoordinate.add(null);
@@ -389,6 +393,11 @@ private List<GeoCoordinate> interpretGeoposResult(List<Object> responses) {
       }
       return responseCoordinate;
     }
+
+    @Override
+    public String toString() {
+      return "List<GeoCoordinate>";
+    }
   };
 
   public static final Builder<List<GeoRadiusResponse>> GEORADIUS_WITH_PARAMS_RESULT = new Builder<List<GeoRadiusResponse>>() {
@@ -442,7 +451,7 @@ public List<GeoRadiusResponse> build(Object data) {
 
     @Override
     public String toString() {
-      return "GeoRadiusWithParamsResult";
+      return "List<GeoRadiusResponse>";
     }
   };
 
@@ -475,23 +484,6 @@ public String toString() {
     }
   };
 
-  public static final Builder<List<Long>> LONG_LIST = new Builder<List<Long>>() {
-    @Override
-    @SuppressWarnings("unchecked")
-    public List<Long> build(Object data) {
-      if (null == data) {
-        return null;
-      }
-      return (List<Long>) data;
-    }
-
-    @Override
-    public String toString() {
-      return "List<Long>";
-    }
-
-  };
-
   public static final Builder<StreamEntryID> STREAM_ENTRY_ID = new Builder<StreamEntryID>() {
     @Override
     @SuppressWarnings("unchecked")
diff --git a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
index 77c2bc3691..abb00d5b8e 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/SortedSetCommandsTest.java
@@ -682,13 +682,13 @@ public void zpopmin() {
     jedis.zadd(bfoo, 0.1d, bc);
     jedis.zadd(bfoo, 2d, ba);
 
-    Set<Tuple> brange = jedis.zpopmin(bfoo, 2);
+    range = jedis.zpopmin(bfoo, 2);
 
-    Set<Tuple> bexpected = new LinkedHashSet<Tuple>();
-    bexpected.add(new Tuple(bc, 0.1d));
-    bexpected.add(new Tuple(ba, 2d));
+    expected = new LinkedHashSet<Tuple>();
+    expected.add(new Tuple(bc, 0.1d));
+    expected.add(new Tuple(ba, 2d));
 
-    assertEquals(bexpected, brange);
+    assertEquals(expected, range);
 
     tuple = jedis.zpopmin(bfoo);
     assertEquals(new Tuple(bb, 10d), tuple);