2 files changed, 15 insertions, 21 deletions

diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java
index ffcd808..6b4ddfc 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/NeedTest.java
@@ -14,13 +14,10 @@ public class NeedTest {
     public void createNeed() {
 
         String name = "Jellyfish";
-        int id = 0;
         double maxGoal = 100.00;
         GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, id, maxGoal, type);
-
+        Need need = new Need(name, type, maxGoal);
         assertNotNull(need);
-
     }
 
     @Test
@@ -29,7 +26,7 @@ public class NeedTest {
         int id = 0;
         double maxGoal = 100.00;
         GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, id, maxGoal, type);
+        Need need = new Need(name, type, maxGoal);
 
        
         assertEquals(name, need.getName());
@@ -41,22 +38,21 @@ public class NeedTest {
     @Test
     public void testCurrentGoal() {
         String name = "Jellyfish";
-        int id = 0;
         double maxGoal = 100.00;
         GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, id, maxGoal, type);
+        Need need = new Need(name, type, maxGoal);
 
         double current = 0.00;
         need.setCurrent(current);
-        assertEquals(need.getCurrent(), current);
+        assertEquals(current, need.getCurrent());
 
         current = 100.00;
         need.setCurrent(current);
-        assertEquals(need.getCurrent(), current);
+        assertEquals(current, need.getCurrent());
 
         current = -100.00;
         need.setCurrent(current);
-        assertEquals(need.getCurrent(), current);
+        assertEquals(current, need.getCurrent());
 
     }
 
@@ -64,10 +60,9 @@ public class NeedTest {
     public void testFilterAttributes() {
 
         String name = "Jellyfish";
-        int id = 0;
         double maxGoal = 100.00;
         GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, id, maxGoal, type);
+        Need need = new Need(name, type, maxGoal);
 
         String[] filterAttributes = {"seaweed", "divers", "pacific", "plankton"};
 
@@ -80,10 +75,9 @@ public class NeedTest {
     public void testSetMaxGoal() {
 
         String name = "Jellyfish";
-        int id = 0;
         double maxGoal = 100.00;
         GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, id, maxGoal, type);
+        Need need = new Need(name, type, maxGoal);
 
         double newGoal = 200.00;
         need.setMaxGoal(newGoal);
@@ -96,10 +90,9 @@ public class NeedTest {
     public void testSetName() {
 
         String name = "Jellyfish";
-        int id = 0;
         double maxGoal = 100.00;
         GoalType type = GoalType.MONETARY;
-        Need need = new Need(name, id, maxGoal, type);
+        Need need = new Need(name, type, maxGoal);
 
         String newName = "TESTINGFUN";
         need.setName(newName);
diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
index 716fbfd..1725190 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/model/UserTest.java
@@ -1,10 +1,10 @@
 package com.ufund.api.ufundapi.model;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @Tag("Model-tier")
 public class UserTest {
 
@@ -23,10 +23,11 @@ public class UserTest {
     public void testUsername() {
 
         String expectedName = "Bob";
+        String password = "password";
 
-        User user = new User(expectedName);
+        User user = User.create(expectedName, password);
 
-        assertEquals(expectedName, user.getName());
+        assertEquals(expectedName, user.getUsername());
 
     }
 
@@ -69,7 +70,7 @@ public class UserTest {
 
         User user = new User(expectedName);
 
-        assertEquals(false, user.verifyPassword(expectedName));
+        assertFalse(user.verifyPassword(expectedName));
 
     }