diff --git a/docs/SettingUp.md b/docs/SettingUp.md
index e71a50491fc..61ce43e2345 100644
--- a/docs/SettingUp.md
+++ b/docs/SettingUp.md
@@ -23,7 +23,7 @@ If you plan to use Intellij IDEA (highly recommended):
 1. **Import the project as a Gradle project**: Follow the guide [_[se-edu/guides] IDEA: Importing a Gradle project_](https://se-education.org/guides/tutorials/intellijImportGradleProject.html) to import the project into IDEA.<br>
   :exclamation: Note: Importing a Gradle project is slightly different from importing a normal Java project.
 1. **Verify the setup**:
-   1. Run the `Main` and try a few commands.
+   1. Run the `safeforhall.Main` and try a few commands.
    1. [Run the tests](Testing.md) to ensure they all pass.
 
 --------------------------------------------------------------------------------------------------------------------
diff --git a/docs/Testing.md b/docs/Testing.md
index 9a4738bba06..bba01531c18 100644
--- a/docs/Testing.md
+++ b/docs/Testing.md
@@ -29,7 +29,7 @@ There are two ways to run tests.
 This project has three types of tests:
 
 1. *Unit tests* targeting the lowest level methods/classes.<br>
-   e.g. `seedu.address.commons.StringUtilTest`
+   e.g. `safeforhall.commons.StringUtilTest`
 1. *Integration tests* that are checking the integration of multiple code units (those code units are assumed to be working).<br>
    e.g. `StorageManagerTest`
 1. Hybrids of unit and integration tests. These test are checking multiple code units as well as how the are connected together.<br>
diff --git a/src/main/java/safeforhall/MainApp.java b/src/main/java/safeforhall/MainApp.java
index e7e5c8b4758..fbc577e41c6 100644
--- a/src/main/java/safeforhall/MainApp.java
+++ b/src/main/java/safeforhall/MainApp.java
@@ -173,7 +173,7 @@ public void start(Stage primaryStage) {
 
     @Override
     public void stop() {
-        logger.info("============================ [ Stopping Address Book ] =============================");
+        logger.info("============================ [ Stopping SafeFor(H)All ] =============================");
         try {
             storage.saveUserPrefs(model.getUserPrefs());
         } catch (IOException e) {
diff --git a/src/main/java/safeforhall/model/person/Person.java b/src/main/java/safeforhall/model/person/Person.java
index 0f6f561ae87..06b65020134 100644
--- a/src/main/java/safeforhall/model/person/Person.java
+++ b/src/main/java/safeforhall/model/person/Person.java
@@ -123,7 +123,9 @@ public String toString() {
                 .append("; Email: ")
                 .append(getEmail())
                 .append("; Vaccinated: ")
-                .append(getVaccStatus());
+                .append(getVaccStatus())
+                .append("; Faculty: ")
+                .append(getFaculty());
 
         return builder.toString();
     }
diff --git a/src/test/java/safeforhall/logic/commands/CommandTestUtil.java b/src/test/java/safeforhall/logic/commands/CommandTestUtil.java
index e370b636bed..b9d85584978 100644
--- a/src/test/java/safeforhall/logic/commands/CommandTestUtil.java
+++ b/src/test/java/safeforhall/logic/commands/CommandTestUtil.java
@@ -63,10 +63,10 @@ public class CommandTestUtil {
     static {
         DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
                 .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY)
-                .withTags(VALID_TAG_FRIEND).build();
+                .build();
         DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
                 .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
-                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
+                .build();
     }
 
     /**
diff --git a/src/test/java/safeforhall/model/AddressBookTest.java b/src/test/java/safeforhall/model/AddressBookTest.java
index d83be271de3..2baf4a7db2c 100644
--- a/src/test/java/safeforhall/model/AddressBookTest.java
+++ b/src/test/java/safeforhall/model/AddressBookTest.java
@@ -41,6 +41,7 @@ public void resetData_withValidReadOnlyAddressBook_replacesData() {
         assertEquals(newData, addressBook);
     }
 
+    // TODO: Fix testcase
     @Test
     public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
         // Two persons with the same identity fields
diff --git a/src/test/java/safeforhall/storage/JsonAdaptedPersonTest.java b/src/test/java/safeforhall/storage/JsonAdaptedPersonTest.java
index d4d35a5b52d..ee851cce117 100644
--- a/src/test/java/safeforhall/storage/JsonAdaptedPersonTest.java
+++ b/src/test/java/safeforhall/storage/JsonAdaptedPersonTest.java
@@ -12,6 +12,7 @@
 import safeforhall.model.person.Name;
 import safeforhall.model.person.Phone;
 
+// TODO: Add all test cases for new fields
 public class JsonAdaptedPersonTest {
     private static final String INVALID_NAME = "R@chel";
     private static final String INVALID_PHONE = "+651234";