diff --git a/src/test/java/seedu/us/among/logic/commands/ToggleCommandTest.java b/src/test/java/seedu/us/among/logic/commands/ToggleCommandTest.java
index 073520a9c25..681f3c062c4 100644
--- a/src/test/java/seedu/us/among/logic/commands/ToggleCommandTest.java
+++ b/src/test/java/seedu/us/among/logic/commands/ToggleCommandTest.java
@@ -2,36 +2,37 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.us.among.testutil.TypicalEndpoints.getTypicalEndpointList;
 
 import org.junit.jupiter.api.Test;
 
-import seedu.us.among.model.Model;
-import seedu.us.among.model.ModelManager;
-import seedu.us.among.model.UserPrefs;
 import seedu.us.among.ui.ThemeType;
 
 public class ToggleCommandTest {
-    private Model model = new ModelManager(getTypicalEndpointList(), new UserPrefs());
 
     @Test
     public void equals() {
-        final ToggleCommand standardCommand = new ToggleCommand(ThemeType.getTheme("light").name());
 
-        // same values -> returns true
-        ToggleCommand commandWithSameValues = new ToggleCommand(ThemeType.getTheme("light").name());
-        assertTrue(standardCommand.equals(commandWithSameValues));
+        for (ThemeType theme : ThemeType.values()) {
+            String userInput = ThemeType.getTheme(theme.toString()).name();
+            ToggleCommand standardCommand = new ToggleCommand(userInput);
 
-        // same object -> returns true
-        assertTrue(standardCommand.equals(standardCommand));
+            // same values -> returns true
+            ToggleCommand commandWithSameValues = new ToggleCommand(userInput);
+            assertTrue(standardCommand.equals(commandWithSameValues));
 
-        // null -> returns false
-        assertFalse(standardCommand.equals(null));
+            // same object -> returns true
+            assertTrue(standardCommand.equals(standardCommand));
 
-        // different types -> returns false
-        assertFalse(standardCommand.equals(new ClearCommand()));
+            // null -> returns false
+            assertFalse(standardCommand.equals(null));
 
-        // different index -> returns false
+            // different types -> returns false
+            assertFalse(standardCommand.equals(new ClearCommand()));
+        }
+
+        ToggleCommand standardCommand = new ToggleCommand(ThemeType.getTheme("light").name());
+
+        // different theme toggle -> returns false
         assertFalse(standardCommand.equals(new ToggleCommand(ThemeType.getTheme("dark").name())));
     }
 }