diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/seedu/address/logic/Messages.java
index 497ea190436..e3a6aae52c6 100644
--- a/src/main/java/seedu/address/logic/Messages.java
+++ b/src/main/java/seedu/address/logic/Messages.java
@@ -12,11 +12,11 @@
  */
 public class Messages {
 
-    public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
+    public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command. Type 'help -c' to see the list of commands.";
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
-    public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
+    public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid.";
     public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
-    public static final String MESSAGE_PERSON_NOT_FOUND = "The specified person is not found";
+    public static final String MESSAGE_PERSON_NOT_FOUND = "The specified person is not found.";
     public static final String MESSAGE_DUPLICATE_FIELDS =
                 "Multiple values specified for the following single-valued field(s): ";
 
@@ -43,9 +43,11 @@ public static String format(Person person) {
                 .append("; Email: ")
                 .append(person.getEmail())
                 .append("; Address: ")
-                .append(person.getAddress())
-                .append("; Allergens: ");
-        person.getAllergens().forEach(builder::append);
+                .append(person.getAddress());
+        if (person.getAllergens().isEmpty()) {
+            builder.append("; Allergens: ");
+            person.getAllergens().forEach(builder::append);
+        }
         return builder.toString();
     }
 
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
index 4b9d7b35a81..6c1391fa886 100644
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddCommand.java
@@ -6,6 +6,7 @@
 import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_POINTS;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
@@ -20,20 +21,22 @@ public class AddCommand extends Command {
 
     public static final String COMMAND_WORD = "addmem";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. \n"
             + "Parameters: "
             + PREFIX_NAME + "MEMBER_NAME "
             + PREFIX_PHONE + "MEMBER_PHONE "
             + PREFIX_EMAIL + "MEMBER_EMAIL "
             + PREFIX_ADDRESS + "MEMBER_ADDRESS "
+            + "[" + PREFIX_POINTS + "POINTS] "
             + "[" + PREFIX_ALLERGENS + "ALLERGENS]...\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "johnd@example.com "
             + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
+            + PREFIX_POINTS + "100 "
             + PREFIX_ALLERGENS + "friends "
-            + PREFIX_ALLERGENS + "owesMoney";
+            + PREFIX_ALLERGENS + "owesMoney ";
 
     public static final String MESSAGE_SUCCESS = "New person added: %1$s";
     public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
diff --git a/src/main/java/seedu/address/logic/commands/AddItemCommand.java b/src/main/java/seedu/address/logic/commands/AddItemCommand.java
index fd4975a13b9..9525eeaeaee 100644
--- a/src/main/java/seedu/address/logic/commands/AddItemCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddItemCommand.java
@@ -22,16 +22,16 @@ public class AddItemCommand extends Command {
     public static final String COMMAND_WORD = "additem";
     public static final String INVALID_COMMAND_FORMAT = "Invalid command format! ";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an item to the catalogue. "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an item to the catalogue. \n"
             + "Parameters: "
             + PREFIX_ITEM + "ITEM_NAME "
             + PREFIX_POINTS + "POINTS_PER_UNIT\n"
             + "Example: " + COMMAND_WORD + " "
-            + PREFIX_ITEM + "Chocolate Cake "
+            + PREFIX_ITEM + "chocolate cake "
             + PREFIX_POINTS + "50";
 
     public static final String MESSAGE_SUCCESS = "New item added: %1$s";
-    public static final String MESSAGE_DUPLICATE_ITEM = "This item already exists in the catalogue";
+    public static final String MESSAGE_DUPLICATE_ITEM = "This item already exists in the catalogue.";
 
     private final Item toAdd;
 
diff --git a/src/main/java/seedu/address/logic/commands/AddMemPointsCommand.java b/src/main/java/seedu/address/logic/commands/AddMemPointsCommand.java
index 4266a64ac44..056b72477fa 100644
--- a/src/main/java/seedu/address/logic/commands/AddMemPointsCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddMemPointsCommand.java
@@ -20,15 +20,14 @@ public class AddMemPointsCommand extends Command {
     public static final String COMMAND_WORD = "addmempts";
 
     public static final String INVALID_COMMAND_FORMAT = "Invalid command format.";
-    public static final String MESSAGE_CONSTRAINTS = "Points to add must be a positive integer";
+    public static final String MESSAGE_CONSTRAINTS = "Points to add must be a positive integer.";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Add membership points to the person identified "
-            + "by the name of the person in the listing. "
-            + "Existing membership will be overwritten by the input.\n"
-            + "Parameters: n/MEMBER_NAME " + PREFIX_MEMSHIP_PTS + "[POINTS_TO_ADD]\n"
+            + ": Add membership points to the person identified. "
+            + "May upgrade the member's tier after adding points.\n"
+            + "Parameters: n/MEMBER_NAME " + PREFIX_MEMSHIP_PTS + "POINTS_TO_ADD\n"
             + "Example: " + COMMAND_WORD + " n/Alice "
-            + PREFIX_MEMSHIP_PTS + "T1";
+            + PREFIX_MEMSHIP_PTS + "100";
     public static final String MESSAGE_ADD_MEMBERSHIP_SUCCESS = "Added %1$d membership points to Person: %2$s";
     private final Name name;
     private final int pointsToAdd;
@@ -47,7 +46,7 @@ public CommandResult execute(Model model) throws CommandException {
         List<Person> lastShownList = model.getFilteredPersonList();
 
         Optional<Person> personOptional = lastShownList.stream()
-                .filter(person -> person.getName().equals(this.name))
+                .filter(person -> person.getName().fullName.toLowerCase().contains(this.name.fullName.toLowerCase()))
                 .findFirst();
 
         if (personOptional.isEmpty()) {
diff --git a/src/main/java/seedu/address/logic/commands/AddOrderCommand.java b/src/main/java/seedu/address/logic/commands/AddOrderCommand.java
index e04ddf5efb0..01d50be02ae 100644
--- a/src/main/java/seedu/address/logic/commands/AddOrderCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddOrderCommand.java
@@ -25,8 +25,9 @@ public class AddOrderCommand extends Command {
     public static final String COMMAND_WORD = "addorder";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Adds an order to the order list of the person identified by the given Name.\n"
+            + ": Adds an order to the order list of the person identified by the given name.\n"
             + "Parameters: n/MEMBER_NAME i/ITEM_NAME [q/QUANTITY]\n"
+            + "NOTE: If quantity is not specified, it will default to 1.\n"
             + "Example: " + COMMAND_WORD + " n/Alex Yeoh i/Chocolate Chip Cookies 100g q/3";
 
     public static final String MESSAGE_ADD_ORDER_SUCCESS = "Added order to Person: %1$s";
diff --git a/src/main/java/seedu/address/logic/commands/AddPointsCommand.java b/src/main/java/seedu/address/logic/commands/AddPointsCommand.java
index 8bea67d32a8..3442830e300 100644
--- a/src/main/java/seedu/address/logic/commands/AddPointsCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddPointsCommand.java
@@ -24,9 +24,9 @@ public class AddPointsCommand extends Command {
     public static final String MESSAGE_CONSTRAINTS = "Points added should be greater than 0.";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Adds points to the person identified. "
+            + ": Adds points to the person identified. \n"
             + "Parameters: " + PREFIX_NAME + "NAME " + PREFIX_POINTS + "POINTS \n"
-            + "Example: " + COMMAND_WORD + " " + PREFIX_NAME + " John Doe " + PREFIX_POINTS + "40";
+            + "Example: " + COMMAND_WORD + " " + PREFIX_NAME + "John Doe " + PREFIX_POINTS + "40";
     public static final String MESSAGE_ADDPOINTS_SUCCESS =
             "Added %1$s points to %2$s";
     private final Name name;
@@ -55,7 +55,7 @@ public CommandResult execute(Model model) throws CommandException {
 
         if (personOptional.isEmpty()) {
             throw new CommandException(
-                    Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+                    Messages.MESSAGE_PERSON_NOT_FOUND);
         }
 
         Person personToEdit = personOptional.get();
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
index 2f47d321bc9..91c89fed69e 100644
--- a/src/main/java/seedu/address/logic/commands/ClearCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ClearCommand.java
@@ -12,9 +12,8 @@ public class ClearCommand extends Command {
 
     public static final String COMMAND_WORD = "clear";
     public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
-    public static final String MESSAGE_CONFIRM = "Are you sure you want to clear the address book? Use\n"
-            + "clear --force\n"
-            + "to confirm clearing of the address book.";
+    public static final String MESSAGE_CONFIRM = "Are you sure you want to clear the address book? \n"
+            + "Use `clear --force` to confirm clearing of the address book.";
     private final boolean isForced;
 
     public ClearCommand() {
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
index 1135ac19b74..076628a1afa 100644
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
@@ -16,11 +16,11 @@
  */
 public class DeleteCommand extends Command {
 
-    public static final String COMMAND_WORD = "delete";
+    public static final String COMMAND_WORD = "delmem";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Deletes the person identified by the index number used in the displayed person list.\n"
-            + "Parameters: INDEX (must be a positive integer)\n"
+            + "Parameters: INDEX\n"
             + "Example: " + COMMAND_WORD + " 1";
 
     public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 8c765334118..4c15f9a7725 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -44,18 +44,18 @@ public class EditCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
             + "by the index number used in the displayed person list. "
             + "Existing values will be overwritten by the input values.\n"
-            + "Orders cannot be edited this way.\n"
-            + "Parameters: INDEX (must be a positive integer) "
+            + "NOTE: Orders cannot be edited this way.\n"
+            + "Parameters: INDEX "
             + "[" + PREFIX_NAME + "MEMBER_NAME] "
             + "[" + PREFIX_PHONE + "MEMBER_PHONE] "
             + "[" + PREFIX_EMAIL + "MEMBER_EMAIL] "
-            + "[" + PREFIX_ADDRESS + "MEMBER_ADDRESS] "
-            + "[" + PREFIX_ALLERGENS + "ALLERGENS]"
-            + "[" + PREFIX_POINTS + "POINTS]...\n"
+            + "[" + PREFIX_ADDRESS + "MEMBER_ADDRESS] \n"
+            + "\t\t\t[" + PREFIX_ALLERGENS + "ALLERGENS] "
+            + "[" + PREFIX_POINTS + "POINTS] "
             + "[" + PREFIX_MEMSHIP_PTS + "MEMBERSHIP_POINTS]...\n"
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_PHONE + "91234567 "
-            + PREFIX_EMAIL + "johndoe@example.com";
+            + PREFIX_EMAIL + "johndoe@example.com\n";
 
     public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
     public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
diff --git a/src/main/java/seedu/address/logic/commands/FindCommand.java b/src/main/java/seedu/address/logic/commands/FindCommand.java
index 72b9eddd3a7..b28cb12eb64 100644
--- a/src/main/java/seedu/address/logic/commands/FindCommand.java
+++ b/src/main/java/seedu/address/logic/commands/FindCommand.java
@@ -15,11 +15,13 @@ public class FindCommand extends Command {
 
     public static final String COMMAND_WORD = "find";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names contain any of "
-            + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Displays all persons whose names contain ANY of "
+            + "the specified keywords (case-insensitive)\n"
             + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
             + "Example: " + COMMAND_WORD + " alice bob charlie";
 
+    public static final String MESSAGE_NO_PERSONS_FOUND = "No persons found! Showing all persons instead.";
+
     private final NameContainsKeywordsPredicate predicate;
 
     public FindCommand(NameContainsKeywordsPredicate predicate) {
@@ -30,6 +32,10 @@ public FindCommand(NameContainsKeywordsPredicate predicate) {
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.updateFilteredPersonList(predicate);
+        if (model.getFilteredPersonList().isEmpty()) {
+            model.updateFilteredPersonList(Model.PREDICATE_SHOW_ALL_PERSONS);
+            return new CommandResult(MESSAGE_NO_PERSONS_FOUND);
+        }
         return new CommandResult(
                 String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, model.getFilteredPersonList().size()));
     }
diff --git a/src/main/java/seedu/address/logic/commands/HelpCommand.java b/src/main/java/seedu/address/logic/commands/HelpCommand.java
index 3e519c0c7b3..8884c14a1d3 100644
--- a/src/main/java/seedu/address/logic/commands/HelpCommand.java
+++ b/src/main/java/seedu/address/logic/commands/HelpCommand.java
@@ -10,25 +10,28 @@ public class HelpCommand extends Command {
     public static final String COMMAND_WORD = "help";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Shows program usage instructions.\n"
+            + "Parameters: [--commands/-c]\n"
             + "Example: " + COMMAND_WORD;
 
     public static final String SHOWING_HELP_MESSAGE = "Opened help window.";
 
+    public static final String INVALID_FLAG_MESSAGE = "The flag `%s` is invalid.";
+
     public static final String COMMAND_LIST = "Command List " + "\n"
             + AddCommand.COMMAND_WORD + " : Add a member" + "\n"
+            + AddItemCommand.COMMAND_WORD + " : Add item" + "\n"
             + AddMemPointsCommand.COMMAND_WORD + " : Add membership points" + "\n"
-            + AddPointsCommand.COMMAND_WORD + " : Add redemption points" + "\n"
             + AddOrderCommand.COMMAND_WORD + " : Add order" + "\n"
-            + AddItemCommand.COMMAND_WORD + " : Add item" + "\n"
-            + DeleteItemCommand.COMMAND_WORD + " : Delete item" + "\n"
-            + RedeemPointsCommand.COMMAND_WORD + " : Redeem points" + "\n"
+            + AddPointsCommand.COMMAND_WORD + " : Add redemption points" + "\n"
             + ClearCommand.COMMAND_WORD + " : Clear all members" + "\n"
             + DeleteCommand.COMMAND_WORD + " : Delete a member" + "\n"
+            + DeleteItemCommand.COMMAND_WORD + " : Delete item" + "\n"
             + EditCommand.COMMAND_WORD + " : Edit member details" + "\n"
             + ExitCommand.COMMAND_WORD + " : Exit the program" + "\n"
             + FindCommand.COMMAND_WORD + " : Find members" + "\n"
             + HelpCommand.COMMAND_WORD + " : Access user guide" + "\n"
             + ListCommand.COMMAND_WORD + " : List all members" + "\n"
+            + RedeemPointsCommand.COMMAND_WORD + " : Redeem points" + "\n"
             + SeedDataCommand.COMMAND_WORD + " : Seed data";
 
     private String helpType;
diff --git a/src/main/java/seedu/address/logic/commands/RedeemPointsCommand.java b/src/main/java/seedu/address/logic/commands/RedeemPointsCommand.java
index 2d6c4810898..efc30b78214 100644
--- a/src/main/java/seedu/address/logic/commands/RedeemPointsCommand.java
+++ b/src/main/java/seedu/address/logic/commands/RedeemPointsCommand.java
@@ -23,14 +23,14 @@ public class RedeemPointsCommand extends Command {
     public static final String MESSAGE_CONSTRAINTS = "Points to redeem should be greater than 0.";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
-            + ": Redeems points from the person identified. "
+            + ": Redeems points from the person identified. \n"
             + "Parameters: " + PREFIX_NAME + "NAME " + PREFIX_POINTS + "POINTS \n"
-            + "Example: " + COMMAND_WORD + " John Doe " + PREFIX_POINTS + "30";
+            + "Example: " + COMMAND_WORD + " " + PREFIX_NAME + "John Doe " + PREFIX_POINTS + "30";
 
     public static final String MESSAGE_REDEEMPOINTS_SUCCESS =
             "Redeemed %1$s points from %2$s";
     public static final String MESSAGE_INSUFFICIENT_POINTS =
-            "Insufficient points. Current points: %1$s";
+            "%s has insufficient points (%s pts) to redeem.";
 
     private final Name name;
     private final Points pointsToRedeem;
@@ -66,7 +66,8 @@ public CommandResult execute(Model model) throws CommandException {
         int pointsToRedeemValue = this.pointsToRedeem.getValue();
 
         if (currentPointsValue < pointsToRedeemValue) {
-            throw new CommandException(String.format(MESSAGE_INSUFFICIENT_POINTS, currentPointsValue));
+            throw new CommandException(
+                    String.format(MESSAGE_INSUFFICIENT_POINTS, personToEdit.getName(), currentPointsValue));
         }
 
         Points newPoints = new Points(Integer.toString(currentPointsValue - pointsToRedeemValue));
diff --git a/src/main/java/seedu/address/logic/parser/AddMemPointsCommandParser.java b/src/main/java/seedu/address/logic/parser/AddMemPointsCommandParser.java
index 12eda837b05..8ca0fdb1ed0 100644
--- a/src/main/java/seedu/address/logic/parser/AddMemPointsCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddMemPointsCommandParser.java
@@ -41,8 +41,7 @@ public AddMemPointsCommand parse(String args) throws ParseException {
         try {
             pointsToAdd = ParserUtil.parseMemPointsToAdd(argMultimap.getValue(PREFIX_MEMSHIP_PTS).orElse(""));
         } catch (ParseException pe) {
-            throw new ParseException(AddMemPointsCommand.MESSAGE_CONSTRAINTS
-                    + "\n" + AddMemPointsCommand.MESSAGE_USAGE);
+            throw new ParseException(AddMemPointsCommand.MESSAGE_CONSTRAINTS);
         }
 
         return new AddMemPointsCommand(name, pointsToAdd);
diff --git a/src/main/java/seedu/address/logic/parser/HelpCommandParser.java b/src/main/java/seedu/address/logic/parser/HelpCommandParser.java
index 82b8ecbf5a9..fae056d3efa 100644
--- a/src/main/java/seedu/address/logic/parser/HelpCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/HelpCommandParser.java
@@ -1,6 +1,7 @@
 package seedu.address.logic.parser;
 
 import seedu.address.logic.commands.HelpCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
 
 /**
  * Parses input arguments and creates a new HelpCommand object
@@ -12,8 +13,11 @@ public class HelpCommandParser implements Parser<HelpCommand> {
      * @param args the user input string
      * @return the parsed HelpCommand object
      */
-    public HelpCommand parse(String args) {
+    public HelpCommand parse(String args) throws ParseException {
         args = args.trim();
+        if (args.isEmpty()) {
+            return new HelpCommand();
+        }
         String[] argsList = args.split(" ");
         String commandType = null;
         for (String arg : argsList) {
@@ -24,13 +28,10 @@ public HelpCommand parse(String args) {
                 commandType = "commands";
                 break;
             default:
-                break;
+                throw new ParseException(String.format(HelpCommand.INVALID_FLAG_MESSAGE, arg) + "\n"
+                        + HelpCommand.MESSAGE_USAGE);
             }
         }
-        if (commandType == null) {
-            return new HelpCommand();
-        } else {
-            return new HelpCommand(commandType);
-        }
+        return new HelpCommand(commandType);
     }
 }
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
index aed9cb864ae..dbe2bae8762 100644
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ b/src/test/java/seedu/address/logic/LogicManagerTest.java
@@ -21,6 +21,7 @@
 
 import seedu.address.logic.commands.AddCommand;
 import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.DeleteCommand;
 import seedu.address.logic.commands.ListCommand;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
@@ -61,7 +62,7 @@ public void execute_invalidCommandFormat_throwsParseException() {
 
     @Test
     public void execute_commandExecutionError_throwsCommandException() {
-        String deleteCommand = "delete 9";
+        String deleteCommand = DeleteCommand.COMMAND_WORD + " 9";
         assertCommandException(deleteCommand, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
     }
 
diff --git a/src/test/java/seedu/address/logic/commands/AddPointsCommandTest.java b/src/test/java/seedu/address/logic/commands/AddPointsCommandTest.java
index 4bdb059c702..d7ae6a68153 100644
--- a/src/test/java/seedu/address/logic/commands/AddPointsCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/AddPointsCommandTest.java
@@ -50,7 +50,7 @@ public void execute_invalidPersonNameUnfilteredList_failure() {
         Name outOfBoundName = new Name("Nonexistent Name");
         AddPointsCommand addPointsCommand = new AddPointsCommand(outOfBoundName, new Points(POINTS_STUB));
 
-        assertCommandFailure(addPointsCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        assertCommandFailure(addPointsCommand, model, Messages.MESSAGE_PERSON_NOT_FOUND);
     }
 
     @Test
diff --git a/src/test/java/seedu/address/logic/commands/FindCommandTest.java b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
index b8b7dbba91a..d6c48ed9cc5 100644
--- a/src/test/java/seedu/address/logic/commands/FindCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
@@ -56,12 +56,11 @@ public void equals() {
 
     @Test
     public void execute_zeroKeywords_noPersonFound() {
-        String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 0);
+        String expectedMessage = FindCommand.MESSAGE_NO_PERSONS_FOUND;
         NameContainsKeywordsPredicate predicate = preparePredicate(" ");
         FindCommand command = new FindCommand(predicate);
-        expectedModel.updateFilteredPersonList(predicate);
+        expectedModel.updateFilteredPersonList(Model.PREDICATE_SHOW_ALL_PERSONS);
         assertCommandSuccess(command, model, expectedMessage, expectedModel);
-        assertEquals(Collections.emptyList(), model.getFilteredPersonList());
     }
 
     @Test
diff --git a/src/test/java/seedu/address/logic/parser/AddMemPointsCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddMemPointsCommandParserTest.java
index ed94a39ec13..310c6b9350f 100644
--- a/src/test/java/seedu/address/logic/parser/AddMemPointsCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddMemPointsCommandParserTest.java
@@ -35,7 +35,7 @@ public void parse_missingMembershipPoints_failure() {
 
     @Test
     public void parse_invalidMembershipPoints_failure() {
-        String expectedMessage = AddMemPointsCommand.MESSAGE_CONSTRAINTS + "\n" + AddMemPointsCommand.MESSAGE_USAGE;
+        String expectedMessage = AddMemPointsCommand.MESSAGE_CONSTRAINTS;
         assertParseFailure(parser, " n/Alice " + PREFIX_MEMSHIP_PTS + "abc", expectedMessage);
     }
 
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
index 47d1e45f9cd..c440f3fa412 100644
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -87,7 +87,6 @@ public void parseCommand_find() throws Exception {
     @Test
     public void parseCommand_help() throws Exception {
         assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
-        assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
     }
 
     @Test
diff --git a/src/test/java/seedu/address/logic/parser/HelpCommandParserTest.java b/src/test/java/seedu/address/logic/parser/HelpCommandParserTest.java
index 130db41c436..147cc0e8f68 100644
--- a/src/test/java/seedu/address/logic/parser/HelpCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/HelpCommandParserTest.java
@@ -1,20 +1,26 @@
 package seedu.address.logic.parser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.testutil.Assert.assertThrows;
 
 import org.junit.jupiter.api.Test;
 
 import seedu.address.logic.commands.HelpCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
 
 public class HelpCommandParserTest {
 
     @Test
-    public void parse_validArgs_returnsHelpCommand() {
+    public void parse_validArgs_returnsHelpCommand() throws ParseException {
         HelpCommandParser parser = new HelpCommandParser();
-        assertEquals(new HelpCommand(), parser.parse(""));
-        assertEquals(new HelpCommand(), parser.parse(" "));
-        assertEquals(new HelpCommand("commands"), parser.parse(" --commands"));
-        assertEquals(new HelpCommand("commands"), parser.parse(" -c"));
+        assertEquals(parser.parse("").getClass(), HelpCommand.class);
+        assertEquals(parser.parse(" --commands").getClass(), HelpCommand.class);
+    }
+
+    @Test
+    public void parse_invalidArgs_throwsParseException() {
+        HelpCommandParser parser = new HelpCommandParser();
+        assertThrows(ParseException.class, () -> parser.parse("-invalid"));
     }
 
 }