diff --git a/.classpath b/.classpath
index 4659018..00c88ef 100644
--- a/.classpath
+++ b/.classpath
@@ -7,5 +7,6 @@
 	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/dev/sowinski/comp1510/lab4/Student.java b/src/dev/sowinski/comp1510/lab4/Student.java
index 17e480e..16c79b9 100644
--- a/src/dev/sowinski/comp1510/lab4/Student.java
+++ b/src/dev/sowinski/comp1510/lab4/Student.java
@@ -21,25 +21,31 @@ public class Student {
     /** birthYear student year of birth as int. */
     private int birthYear;
     
+    /** studentNumber student id number. */
+    private String studentNumber;
+    
     /** gpa student GPA as int. */
-    private float gpa;
+    private int gpa;
     
     /**
      * Student constructor.
      * @param first student firstname
      * @param last student lastname
      * @param yearOfBirth student birth year
+     * @param id student number
      * @param studentGPA student gpa
      */
     public Student(
             String first, 
             String last, 
-            int yearOfBirth, 
-            float studentGPA
+            int yearOfBirth,
+            String id,
+            int studentGPA
     ) {
         firstName = first;
         lastName = last;
         birthYear = yearOfBirth;
+        studentNumber = id;
         gpa = studentGPA;
     }
 
@@ -95,7 +101,7 @@ public class Student {
      * getGPA returns student GPA.
      * @return the gpa
      */
-    public float getGPA() {
+    public int getGradeAverage() {
         return gpa;
     }
 
@@ -103,9 +109,25 @@ public class Student {
      * setGPA update student GPA.
      * @param newGPA the gpa to set
      */
-    public void setGPA(float newGPA) {
+    public void setGradeAverage(int newGPA) {
         this.gpa = newGPA;
     }
+ 
+    /**
+     * getStudentNumber return student id number.
+     * @return studentNumber as string
+     */
+    public String getStudentNumber() {
+        return studentNumber;
+    }
+    
+    /**
+     * setStudentNumber updates student id number.
+     * @param studentNumber new student id number
+     */
+    public void setStudentNumber(String studentNumber) {
+        this.studentNumber = studentNumber;
+    }
     
     /**
      * toString concatonates student information.
@@ -113,8 +135,9 @@ public class Student {
      */
     public String toString() {
         return firstName + " "
-                + lastName + " ("
-                + birthYear + ") "
-                + gpa + " GPA";
+                + lastName + " "
+                + birthYear + " "
+                + studentNumber + " "
+                + gpa;
     }
 }
diff --git a/src/dev/sowinski/comp1510/lab4/StudentTest.java b/src/dev/sowinski/comp1510/lab4/StudentTest.java
new file mode 100644
index 0000000..70c616c
--- /dev/null
+++ b/src/dev/sowinski/comp1510/lab4/StudentTest.java
@@ -0,0 +1,51 @@
+package dev.sowinski.comp1510.lab4;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+public class StudentTest {
+    private final Student s = new Student("Tashi", "Delek", 1985, 
+            "A00234534", 84);
+    private String studentStr = "Tashi Delek 1985 A00234534 84";
+    @Test
+    void testCreation() {
+        assertSame("Tashi", s.getFirstName());
+        assertSame("Delek", s.getLastName());
+        assertEquals(1985, s.getBirthYear());
+        assertSame("A00234534", s.getStudentNumber());
+        assertEquals(84, s.getGradeAverage());
+    }
+
+    @Test
+    void testFirstName() {
+        s.setFirstName("Drolma");
+        assertSame("Drolma", s.getFirstName());
+    }
+
+    @Test
+    void testLastName() {
+        s.setLastName("Rabten");
+        assertSame("Rabten", s.getLastName());
+    }
+
+    @Test
+    void testBirthYear() {
+        s.setBirthYear(2001);
+        assertEquals(2001, s.getBirthYear());
+    }
+    @Test
+    void testStudentNumber() {
+        s.setStudentNumber("A00384495");
+        assertSame("A00384495", s.getStudentNumber());
+    }
+    @Test
+    void testGradeAverage() {
+        s.setGradeAverage(78);
+        assertEquals(78, s.getGradeAverage());
+    }
+    @Test
+    void testToString() {
+        assertEquals(studentStr, s.toString());
+    }
+
+}