all tests passed

src/main/java/org/zipcoder/store/ListMap.java

@@ -46,7 +46,7 @@ public class ListMap implements MyMap {
     public void put(User key, Cart value) {
         if(get(key) != null) {
             for(Entry e : getEntries()) {
-                if(e.getKey() == key) {
+                if(e.getKey().equals(key)) {
                     e.setValue(value);
                 }
             }

src/main/java/org/zipcoder/store/MyHashMap.java

@@ -95,7 +95,7 @@ public class MyHashMap implements MyMap{
     public Cart remove(User key) {
         for (int i = 0; i < BUCKET_SIZE; i++) {
             for (Entry e : getEntries()[i]) {
-                if (e.getKey() == key) {
+                if (e.getKey().equals(key)) {
                     getEntries()[i].remove(e);
                     return e.getValue();
                 }

src/main/java/org/zipcoder/store/User.java

@@ -38,23 +38,33 @@ public class User {
         this.name = name;
     }
 
-    public boolean equals(User otherUser) {
-
-    try {
-        if (this.getName().equalsIgnoreCase(otherUser.getName()) && this.getId() == otherUser.getId()) {
-            return true;
-        }
-    } catch (NullPointerException e) {
-
-        if (this.getName() == null && otherUser.getName() == null) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-        return false;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return id == user.id &&
+                Objects.equals(name, user.name);
     }
 
+    //    @Override
+//    public boolean equals(Object otherUser) {
+//
+//        try {
+//        if (this.getName().equalsIgnoreCase(otherUser.getName()) && this.getId() == otherUser.getId()) {
+//            return true;
+//        }
+//        } catch (NullPointerException e) {
+//
+//        if (this.getName() == null && otherUser.getName() == null) {
+//            return true;
+//        } else {
+//            return false;
+//        }
+//        }
+//        return false;
+//        }
+
     @Override
     public int hashCode() {
         return Objects.hash(id, name);