diff --git a/apptbook/src/it/java/edu/pdx/cs410J/bdesmond/Project1IT.java b/apptbook/src/it/java/edu/pdx/cs410J/bdesmond/Project1IT.java
index 39f28f9..fd05a34 100644
--- a/apptbook/src/it/java/edu/pdx/cs410J/bdesmond/Project1IT.java
+++ b/apptbook/src/it/java/edu/pdx/cs410J/bdesmond/Project1IT.java
@@ -49,36 +49,41 @@ void testWithAllCorrectValues() {
   @Test
   void missingDescription() {
     MainMethodResult result = invokeMain("John");
-    String message = "No description was given.\n";
-    assertThat(result.getTextWrittenToStandardError(), equalTo(message));
+    //String message = "No description was given.\n";
+    String message = "usage";
+    assertThat(result.getTextWrittenToStandardError(), containsString(message));
     assertThat(result.getExitCode(), equalTo(1));
   }
 
   @Test
   void missingBeginDate() {
     MainMethodResult result = invokeMain("John","This is an event");
-    assertThat(result.getTextWrittenToStandardError(), containsString("No starting date was given"));
+    //assertThat(result.getTextWrittenToStandardError(), containsString("No starting date was given"));
+    assertThat(result.getTextWrittenToStandardError(), containsString("usage"));
     assertThat(result.getExitCode(), equalTo(1));
   }
 
   @Test
   void missingBeginTime() {
     MainMethodResult result = invokeMain("John","This is an event","02/13/2000");
-    assertThat(result.getTextWrittenToStandardError(), containsString("No starting time was given"));
+    //assertThat(result.getTextWrittenToStandardError(), containsString("No starting time was given"));
+    assertThat(result.getTextWrittenToStandardError(), containsString("usage"));
     assertThat(result.getExitCode(), equalTo(1));
   }
 
   @Test
   void missingEndDate() {
     MainMethodResult result = invokeMain("John","This is an event","02/13/2000","14:39");
-    assertThat(result.getTextWrittenToStandardError(), containsString("No ending date was given"));
+    //assertThat(result.getTextWrittenToStandardError(), containsString("No ending date was given"));
+    assertThat(result.getTextWrittenToStandardError(), containsString("usage"));
     assertThat(result.getExitCode(), equalTo(1));
   }
 
   @Test
   void missingEndTime() {
     MainMethodResult result = invokeMain("John","This is an event","02/13/2000","14:39","03/13/2000");
-    assertThat(result.getTextWrittenToStandardError(), containsString("No ending time was given"));
+    //assertThat(result.getTextWrittenToStandardError(), containsString("No ending time was given"));
+    assertThat(result.getTextWrittenToStandardError(), containsString("usage"));
     assertThat(result.getExitCode(), equalTo(1));
   }
 
diff --git a/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/Project1.java b/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/Project1.java
index cb388fb..4c37721 100644
--- a/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/Project1.java
+++ b/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/Project1.java
@@ -45,10 +45,10 @@ public static void main(String[] args) {
       printErrorAndExit(USAGE_MESSAGE);
     }
     for (String arg : args) {
-      if(arg == "-README") {
+      if(arg.equals("-README")) {
         readMe();
         numOfOptions++;
-      } else if(arg == "-print") {
+      } else if(arg.equals("-print")) {
         printFlag = true;
         numOfOptions++;
       } else if(name == null) {
@@ -117,15 +117,20 @@ private static void validateInput(String name,String description,String startDat
     if(name == null) {
       printErrorAndExit(USAGE_MESSAGE);
     } else if(description == null) {
-      printErrorAndExit(MISSING_DESCRIPTION);
+      //printErrorAndExit(MISSING_DESCRIPTION);
+      printErrorAndExit(USAGE_MESSAGE);
     } else if(startDate == null) {
-      printErrorAndExit(MISSING_BEGINDATE);
+      //printErrorAndExit(MISSING_BEGINDATE);
+      printErrorAndExit(USAGE_MESSAGE);
     } else if(startTime == null) {
-      printErrorAndExit(MISSING_BEGINTIME);
+      //printErrorAndExit(MISSING_BEGINTIME);
+      printErrorAndExit(USAGE_MESSAGE);
     } else if(endDate == null) {
-      printErrorAndExit(MISSING_ENDDATE);
+      //printErrorAndExit(MISSING_ENDDATE);
+      printErrorAndExit(USAGE_MESSAGE);
     } else if(endTime == null) {
-      printErrorAndExit(MISSING_ENDTIME);
+      //printErrorAndExit(MISSING_ENDTIME);
+      printErrorAndExit(USAGE_MESSAGE);
     }
     validateEventDates(startDate,startTime);
     validateEventDates(endDate,endTime);
@@ -140,14 +145,10 @@ private static void validateInput(String name,String description,String startDat
    *        if the date is valid.
    */
   private static boolean validateDate(String date) {
-    DateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
-    sdf.setLenient(false);
-    try {
-      sdf.parse(date);
-    } catch (ParseException e) {
-      return false;
-    }
-    return true;
+    String regex = "([0-9]|0[0-9]|1[0-2])/([0-9]|[0-2][0-9]|3[0-2])/([0-9][0-9]|[0-9][0-9][0-9][0-9])";
+    Pattern p = Pattern.compile(regex);
+    Matcher m = p.matcher(date);
+    return m.matches();
   }
 
   /**
diff --git a/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/TextDumper.java b/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/TextDumper.java
deleted file mode 100644
index 11d3529..0000000
--- a/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/TextDumper.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package edu.pdx.cs410J.bdesmond;
-
-import edu.pdx.cs410J.AppointmentBookDumper;
-
-public class TextDumper {
-}
diff --git a/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/TextParser.java b/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/TextParser.java
deleted file mode 100644
index 9f71750..0000000
--- a/apptbook/src/main/java/edu/pdx/cs410J/bdesmond/TextParser.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package edu.pdx.cs410J.bdesmond;
-
-import edu.pdx.cs410J.AppointmentBookParser;
-
-public class TextParser {
-}