diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
index 25993c92f30..ec27eb5dfe9 100644
--- a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
+++ b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
@@ -1,12 +1,14 @@
 package seedu.address.storage;
 
-//import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static seedu.address.testutil.Assert.assertThrows;
-/*import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.HOON;
-import static seedu.address.testutil.TypicalPersons.IDA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;*/
+import static seedu.address.testutil.TypicalClients.ALICE;
+import static seedu.address.testutil.TypicalClients.HOON;
+import static seedu.address.testutil.TypicalClients.IDA;
+import static seedu.address.testutil.TypicalProducts.CALCULATOR;
+import static seedu.address.testutil.TypicalProducts.IPHONE;
+import static seedu.address.testutil.TypicalProducts.TISSUE;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -18,9 +20,10 @@
 import seedu.address.commons.exceptions.DataConversionException;
 import seedu.address.model.AddressBook;
 import seedu.address.model.ReadOnlyAddressBook;
-//import seedu.address.testutil.TypicalClients;
-
-//import javax.xml.crypto.Data;
+import seedu.address.model.client.Client;
+import seedu.address.model.product.Product;
+import seedu.address.testutil.TypicalClients;
+import seedu.address.testutil.TypicalProducts;
 
 public class JsonAddressBookStorageTest {
     private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonAddressBookStorageTest");
@@ -73,6 +76,115 @@ public void readAddressBook_invalidAndValidProductsAddressBook_throwDataConversi
         assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidProductsAddressBook.json"));
     }
 
+    @Test
+    public void readAndSaveClientAddressBook_allInOrder_success() throws Exception {
+        Path filePath = testFolder.resolve("TempClientAddressBook.json");
+        AddressBook original = TypicalClients.getTypicalAddressBook();
+        JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
+
+        // Save in new file and read back
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        ReadOnlyAddressBook readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        AddressBook compare = new AddressBook();
+        for (int i = 0; i < original.getClientList().size(); i++) {
+            compare.addClient(Client.updateClient(
+                    original.getClientList().get(i),
+                    readBack.getClientList().get(i).getName(),
+                    readBack.getClientList().get(i).getPhoneNumber(),
+                    readBack.getClientList().get(i).getEmail(),
+                    readBack.getClientList().get(i).getAddress()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Modify data, overwrite exiting file, and read back
+        original.addClient(HOON);
+        original.removeClient(ALICE);
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        compare = new AddressBook();
+        for (int i = 0; i < original.getClientList().size(); i++) {
+            compare.addClient(Client.updateClient(
+                    original.getClientList().get(i),
+                    readBack.getClientList().get(i).getName(),
+                    readBack.getClientList().get(i).getPhoneNumber(),
+                    readBack.getClientList().get(i).getEmail(),
+                    readBack.getClientList().get(i).getAddress()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Save and read without specifying file path
+        original.addClient(IDA);
+        jsonAddressBookStorage.saveAddressBook(original); // file path not specified
+        readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
+        compare = new AddressBook();
+        for (int i = 0; i < original.getClientList().size(); i++) {
+            compare.addClient(Client.updateClient(
+                    original.getClientList().get(i),
+                    readBack.getClientList().get(i).getName(),
+                    readBack.getClientList().get(i).getPhoneNumber(),
+                    readBack.getClientList().get(i).getEmail(),
+                    readBack.getClientList().get(i).getAddress()
+            ));
+        }
+        assertEquals(original, compare);
+
+    }
+
+    @Test
+    public void readAndSaveProductAddressBook_allInOrder_success() throws Exception {
+        Path filePath = testFolder.resolve("TempProductAddressBook.json");
+        AddressBook original = TypicalProducts.getTypicalAddressBook();
+        JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
+
+        // Save in new file and read back
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        ReadOnlyAddressBook readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        AddressBook compare = new AddressBook();
+        for (int i = 0; i < original.getProductList().size(); i++) {
+            compare.addProduct(Product.updateProduct(
+                    original.getProductList().get(i),
+                    readBack.getProductList().get(i).getName(),
+                    readBack.getProductList().get(i).getUnitPrice(),
+                    readBack.getProductList().get(i).getQuantity()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Modify data, overwrite exiting file, and read back
+        original.addProduct(CALCULATOR);
+        original.removeProduct(IPHONE);
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        compare = new AddressBook();
+        for (int i = 0; i < original.getProductList().size(); i++) {
+            compare.addProduct(Product.updateProduct(
+                    original.getProductList().get(i),
+                    readBack.getProductList().get(i).getName(),
+                    readBack.getProductList().get(i).getUnitPrice(),
+                    readBack.getProductList().get(i).getQuantity()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Save and read without specifying file path
+        original.addProduct(TISSUE);
+        jsonAddressBookStorage.saveAddressBook(original); // file path not specified
+        readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
+        compare = new AddressBook();
+        for (int i = 0; i < original.getProductList().size(); i++) {
+            compare.addProduct(Product.updateProduct(
+                    original.getProductList().get(i),
+                    readBack.getProductList().get(i).getName(),
+                    readBack.getProductList().get(i).getUnitPrice(),
+                    readBack.getProductList().get(i).getQuantity()
+            ));
+        }
+        assertEquals(original, compare);
+
+    }
+
     /*@Test
     public void readAndSaveAddressBook_allInOrder_success() throws Exception {
         Path filePath = testFolder.resolve("TempAddressBook.json");