diff --git a/src/main/java/com/github/curriculeon/Person.java b/src/main/java/com/github/curriculeon/Person.java
index 7eaecca..3ff6945 100644
--- a/src/main/java/com/github/curriculeon/Person.java
+++ b/src/main/java/com/github/curriculeon/Person.java
@@ -4,29 +4,46 @@
  * Created by leon on 2/12/18.
  */
 public class Person {
+    private String name;
+    private Integer age;
+
     public Person() {
+        this.name="";
+        this.age=Integer.MAX_VALUE;
     }
 
-    public Person(int age) {
-    }
+    public Person(Integer age) {
+            this.age=age;
+            this.name=name;
+        }
+
 
     public Person(String name) {
+        this.name=name;
+        this.age=Integer.MAX_VALUE;
     }
 
-    public Person(String name, int age) {
+    public Person(String name, Integer age) {
+        this.name=name;
+        this.age=age;
     }
 
     public void setName(String name) {
+        this.name=name;
     }
 
-    public void setAge(int age) {
+    public void setAge(Integer age) {
+            this.age=age;
+
     }
 
     public String getName() {
-        return null;
+        return name;
+        //return null;
     }
 
     public Integer getAge() {
-        return null;
+       return age;
+        // return null;
     }
 }
diff --git a/src/test/java/com/github/curriculeon/SetAgeTest.java b/src/test/java/com/github/curriculeon/SetAgeTest.java
index 9e80952..42cfe49 100644
--- a/src/test/java/com/github/curriculeon/SetAgeTest.java
+++ b/src/test/java/com/github/curriculeon/SetAgeTest.java
@@ -13,7 +13,7 @@ private void test(Integer expected) {
 
         // When
         person.setAge(expected);
-        String actual = person.getName();
+        Integer actual = person.getAge();
 
         // Then
         Assert.assertEquals(expected, actual);