diff --git a/sample/data.xml b/sample/data.xml
deleted file mode 100644
index 81b7112f735a..000000000000
--- a/sample/data.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
-
- Submit CS2103 Assignment
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-10-26 20:00:00
-
-
- Write essay for IS1103
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-11-07 23:59:00
-
-
- CS2101 Group meeting
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-11-04 12:00:00
- 2016-11-04 14:00:00
-
-
- IS1103 Group meeting
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-11-10 13:00:00
- 2016-10-27 22:00:00
-
-
- Read 'UML Distilled'
- true
- false
- false
- 2016-10-30 12:52:44
-
-
- Clear wardrobe clutter
- false
- false
- false
- 2016-10-30 12:52:44
- 2017-01-01 10:09:26
-
-
- Buy soap and shampoo
- false
- false
- false
- 2016-10-30 12:49:30
-
-
- Deposit $50 into bank
- false
- false
- false
- 2016-10-29 14:53:10
-
-
- catch pokemon
- true
- false
- false
- 2016-10-30 12:52:44
-
-
- Buy present for Jim
- true
- false
- false
- 2016-10-30 12:52:44
- 2016-10-20 14:56:43
-
-
- Go to gym with John
- true
- false
- false
- 2016-10-30 12:52:44
- 2016-09-20 10:00:00
- 2016-09-20 11:00:00
-
-
- Brother's wedding
- true
- false
- false
- 2016-10-30 12:52:44
- 2016-08-10 08:00:00
- 2016-08-10 09:00:00
-
-
- Buy new headphones
- false
- false
- false
- 2016-10-29 14:52:52
-
-
- Proofread CS2101 Reflection
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-10-29 20:00:00
- 2016-10-29 22:00:00
-
-
- Clean dust inside PC
- false
- false
- false
- 2016-10-29 14:52:29
-
-
- Buy new i7-6700k CPU
- false
- false
- false
- 2016-10-29 14:52:08
-
-
- Search for Shaun Mendez songs
- false
- false
- false
- 2016-10-29 14:51:30
-
-
- Return books to library
- true
- false
- false
- 2016-10-30 12:52:44
-
-
- Write reflection for CS2101
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-10-26 00:00:00
-
-
- Attend cake-making lesson
- true
- false
- false
- 2016-10-30 12:52:44
- 2016-07-29 11:00:00
- 2016-07-29 14:00:00
-
-
- Submit CS1231 Assignment
- true
- false
- false
- 2016-10-30 12:52:44
- 2016-02-29 10:17:36
-
-
- Read up on Extremism
- false
- false
- false
- 2016-10-29 14:55:22
-
-
- Read 'The Mythical Man-Month'
- false
- false
- false
- 2016-10-29 14:58:08
-
-
- Decorate house
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-12-25 12:42:46
-
-
- Buy present for Jim
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-11-04 23:59:00
-
-
- CS2101 Oral Presentation 1
- true
- false
- false
- 2016-10-30 12:54:19
- 2016-09-06 12:00:00
- 2016-09-06 13:00:00
-
-
- CS2103 Post-Lecture Quiz
- false
- false
- false
- 2016-10-30 12:52:44
- 2016-11-05 12:50:11
-
-
diff --git a/src/test/data/ManualTesting/SampleData.xml b/src/test/data/ManualTesting/SampleData.xml
new file mode 100644
index 000000000000..f14d74f6d367
--- /dev/null
+++ b/src/test/data/ManualTesting/SampleData.xml
@@ -0,0 +1,301 @@
+
+
+
+ Submit CS2103 Assignment
+ false
+ 2016-11-06 10:27:30
+ 2016-10-26 20:00:00
+
+
+ Write essay for IS1103
+ false
+ 2016-11-06 10:27:30
+ 2016-11-07 23:59:00
+
+
+ CS2103 group meeting
+ false
+ 2016-11-06 10:27:30
+ 2016-11-04 12:00:00
+ 2016-11-04 14:00:00
+
+
+ CS2103 group meeting
+ false
+ 2016-11-06 10:31:26
+ 2016-11-11 12:00:00
+ 2016-11-11 14:00:00
+
+
+ Clear wardrobe clutter
+ false
+ 2016-11-06 10:27:30
+ 2016-12-31 23:59:00
+
+
+ Buy soap and shampoo
+ false
+ 2016-10-30 12:49:30
+
+
+ Deposit $50 into bank
+ false
+ 2016-10-29 14:53:10
+
+
+ Buy new headphones
+ false
+ 2016-10-29 14:52:52
+
+
+ Proofread CS2103 reflection
+ false
+ 2016-11-06 10:27:30
+ 2016-10-29 20:00:00
+ 2016-10-29 22:00:00
+
+
+ Clean dust inside PC
+ true
+ 2016-11-06 10:27:30
+
+
+ Buy new i7-6700k CPU
+ false
+ 2016-10-29 14:52:08
+
+
+ Search for Shaun Mendez songs
+ true
+ 2016-11-06 10:27:30
+
+
+ Write reflection for CS2103
+ true
+ 2016-11-06 10:28:17
+ 2016-10-26 00:00:00
+
+
+ Read up on Extremism
+ false
+ 2016-10-29 14:55:22
+
+
+ Read 'The Mythical Man-Month'
+ false
+ 2016-10-29 14:58:08
+
+
+ Decorate house
+ false
+ 2016-11-06 10:29:43
+ 2016-12-25 00:00:00
+
+
+ Buy present for Jim
+ false
+ 2016-11-06 10:27:30
+ 2016-11-04 23:59:00
+
+
+ CS2101 Oral Presentation 1
+ true
+ 2016-11-06 10:27:30
+ 2016-09-06 12:00:00
+ 2016-09-06 13:00:00
+
+
+ CS2103 Post-Lecture Quiz
+ false
+ 2016-11-06 10:27:30
+ 2016-11-05 12:50:11
+
+
+ Complete peer review on TEAMMATES
+ false
+ 2016-11-06 10:27:30
+ 2016-10-10 12:00:00
+
+
+ Go to NTUC
+ false
+ 2016-11-03 17:14:50
+
+
+ Attend CS2103 lecture
+ true
+ 2016-11-06 10:27:30
+ 2016-11-04 14:00:00
+ 2016-11-04 16:00:00
+
+
+ Visit relatives
+ true
+ 2016-11-06 10:27:30
+ 2000-02-01 17:16:02
+ 2000-02-05 17:16:02
+
+
+ Revise for exams
+ false
+ 2016-11-06 10:27:30
+ 2016-11-14 00:00:00
+ 2016-11-19 00:00:00
+
+
+ Download Pokemon GO
+ false
+ 2016-11-03 17:16:29
+
+
+ Sister's wedding
+ false
+ 2016-11-06 10:27:30
+ 2016-12-20 00:00:00
+ 2016-12-21 00:00:00
+
+
+ Visit grandma
+ false
+ 2016-11-06 10:27:30
+ 2016-12-10 12:00:00
+ 2016-12-10 17:00:00
+
+
+ CS2103 V0.1
+ true
+ 2016-11-06 10:27:30
+ 2016-10-05 00:00:00
+
+
+ CS2103 V0.2
+ true
+ 2016-11-06 10:27:30
+ 2016-10-12 00:00:00
+
+
+ CS2103 V0.3
+ true
+ 2016-11-06 10:27:30
+ 2016-10-19 00:00:00
+
+
+ CS2103 V0.4
+ true
+ 2016-11-06 10:27:30
+ 2016-10-26 00:00:00
+
+
+ CS2103 V0.5rc
+ true
+ 2016-11-06 10:27:30
+ 2016-11-02 00:00:00
+
+
+ CS2103 V0.5
+ false
+ 2016-11-06 10:27:30
+ 2016-11-07 17:22:54
+
+
+ Army training
+ false
+ 2016-11-06 10:27:30
+ 2016-12-12 00:00:00
+ 2016-12-16 00:00:00
+
+
+ Go to CS2103 lecture
+ true
+ 2016-11-06 10:27:30
+ 2016-10-28 14:00:00
+ 2016-10-28 16:00:00
+
+
+ CS2103 Final Exam
+ false
+ 2016-11-06 10:27:30
+ 2016-11-26 13:00:00
+ 2016-11-26 15:00:00
+
+
+ Buy groceries for next week
+ false
+ 2016-11-06 10:27:30
+ 2016-11-06 23:59:00
+
+
+ Transfer money back to Jim
+ false
+ 2016-11-06 09:58:57
+
+
+ Buy Nvidia GTX 1090 Ti
+ false
+ 2016-11-06 10:00:22
+
+
+ Data Privacy Asia 2016
+ false
+ 2016-11-06 10:27:30
+ 2016-11-09 00:00:00
+ 2016-11-09 23:59:00
+
+
+ Cybersecurity Nexus Conference
+ false
+ 2016-11-06 10:27:30
+ 2016-11-15 08:00:00
+ 2016-11-15 12:00:00
+
+
+ Buy tickets to singapore international film festival
+ false
+ 2016-11-06 10:07:42
+
+
+ Social Media Marketing Course
+ false
+ 2016-11-06 10:27:30
+ 2016-11-28 09:00:00
+ 2016-11-28 18:00:00
+
+
+ Binge watch Game of Thrones
+ false
+ 2016-11-06 10:29:13
+ 2016-11-08 00:00:00
+ 2016-11-08 10:00:00
+
+
+ Sharpen pencils for exams
+ false
+ 2016-11-06 10:30:51
+ 2016-11-13 23:59:00
+
+
+ Try new ramen at Menya Musashi
+ false
+ 2016-11-06 10:31:57
+
+
+ Watch Dr. Strange
+ false
+ 2016-11-06 10:32:17
+
+
+ Buy holy oil from kong hee
+ false
+ 2016-11-06 10:32:48
+
+
+ Look for salad dressing in NTUC
+ false
+ 2016-11-06 10:34:38
+
+
+ Buy pimple cream
+ false
+ 2016-11-06 10:35:09
+
+
diff --git a/src/test/data/ManualTesting/testScript.md b/src/test/data/ManualTesting/testScript.md
new file mode 100644
index 000000000000..743f563ed032
--- /dev/null
+++ b/src/test/data/ManualTesting/testScript.md
@@ -0,0 +1,253 @@
+[comment]: # (@@author A0148031R)
+# Test Script for Manual Testing
+
+## Loading the sample data
+
+1. Ensure that you put `SampleData.xml` inside the `/src/test/data/ManualTesting` folder.
+2. Start `Agendum.jar` by double clicking it.
+3. Type `load src/test/data/ManualTesting/SampleData.xml`.
+
+####Result:
+* In the **Do It Soon** column, there should be 22 tasks appearing with indices from 1 to 22, where task 1-6 are highlighted in red, 7-12 in yellow, and the remaining not highlighted.
+* In the **Do It Anytime** column, there should be 16 tasks appearing, with indices from 23 to 38.
+* In the **Done** column, there should be 12 tasks appearing, with indices 39-50.
+
+## Help
+
+1. Type `help`
+2. Press ESC
+
+####Result:
+1. A help window appears with in a table style, listing out all the command available, together with the command description and format.
+2. Agendum exits the help window.
+
+## Date Time Formats
+
+Before proceeding to add or schedule tasks with dates and time, here is a brief on the date time formats that Agendum supports, by combining any of the date format and time format below. The date/time formats are case insensitive too.
+
+*Date Format*
+
+| Date Format | Example(s) |
+|-----------------|----------------------|
+| Month/day | 1/23 |
+| Day Month | 1 Oct |
+| Month Day | Oct 1 |
+| Day of the week | Wed, Wednesday |
+| Relative date | today, tmr, next wed |
+
+ > If no year is specified, it is always assumed to be the current year.
+ > It is possible to specify the year before or after the month-day pair in the first 3 formats (e.g. 1/23/2016 or 2016 1 Oct)
+ > The day of the week refers to the following week. For example, today is Sunday (30 Oct). Agendum will interpret Wednesday and Sunday as 2 Nov and 6 Nov respectively (a week from now).
+
+*Time Format*
+
+| Time Format | Example(s) |
+|-----------------|-----------------------------------------|
+| Hour | 10, 22 |
+| Hour:Minute | 10:30 |
+| Hour.Minute | 10.30 |
+| Relative time | this morning, this afternoon, tonight |
+
+> By default, we use the 24 hour time format but we do support the meridian format as well e.g. 10am, 10pm
+
+
+## Add
+To add a task, you have to start your command with the keyword `add`.
+
+>Here are the *acceptable format(s)*:
+
+> * `add ` - adds a task which can be done anytime.
+* `add by ` - adds a task which have to be done by the specified deadline. Note the keyword `by`.
+* `add from to ` - adds a event which will take place between start time and end time. Note the keyword `from` and `to`.
+
+
+### 1. Add a floating task
+Type `add watch movie`.
+#### Result
+A new floating task named "watch movie" is created at the top of **Do It Anytime** column, and highlighted in purple borders.
+
+### 2. Add a task with deadline
+Type `add submit essay by 10pm`.
+#### Result
+A new task named "submit essay" is created in the **Do It Soon** column, with its deadline under the name the this task. Also, it is highlighted in purple borders.
+
+### 3. Add a task with event time
+Type `add go for church camp from 20 nov 2pm to 25 nov 5pm`
+#### Result
+A new task named "go for church" is created in the **Do It Soon** column, with its deadline under the name the this task . Also, it is highlighted in purple borders.
+
+## Rename
+To rename a task, you have to start your command with the keyword `rename`.
+
+>Here is the *acceptable format*
+
+> * `rename ` - give a new name to the task identified by . The must be a positive number and be in the most recent to-do list displayed.
+
+Type `rename 1 complete peer review on TEAMMATES for 2101`.
+#### Result
+The task with index 1 is renamed to `complete peer review on TEAMMATES for 2101`. Also, it is highlighted in purple borders.
+
+## (Re)schedule
+To reschedule a task, you have to start your command with the keyword `schedule`.
+
+>Here are the *acceptable format(s)*:
+
+>* `schedule ` - re-schedule the task identified by ``. It can now be done anytime. It is no longer bounded by a deadline or event time!
+* `schedule by ` - set or update the deadline for the task identified. Note the keyword `by`.
+* `schedule from to ` - update the start/end time of the task identified by ``. Note the keyword `from` and `to`.
+
+###1. Schedule a task with no deadline or event time
+Type `schedule 22`.
+####Result
+Task with index 22 now has no deadline, and it is shifted to **Do It Anytime** column with a new index. Also, it is highlighted in purple borders.
+
+###2. Schedule a task with a deadline
+Type `schedule 23 by 11 nov 10pm`.
+####Result
+Task with index 23 now has a deadline, and it is shifted to **Do It Soon** column with a new index. Also, it is highlighted in purple borders.
+
+###3. Schedule a task with event time
+Type `schedule 14 from 13 nov 2pm to 13 nov 4pm`.
+####Result
+Task with index 14 now has a event time, and it is assigned with a new index. Also, it is highlighted in purple borders.
+
+## Delete
+To delete a task, you have to start your command with the keyword `delete`.
+
+>Here is the *format*:
+
+>* `delete ...` - Deletes the task at the specified `INDEX`. Each `` must be a positive number and in the most recent to-do list displayed. If there are multiple ``s, they should be separated by commas, space, or input as a range.
+
+###1. Delete a single task
+Type `delete 10`.
+####Result
+Task with index 10 is deleted.
+
+###2. Delete multiple tasks
+Type `delete 11 21-23`
+####Result
+Tasks with indices 11, 21, 22 and 23 are deleted.
+
+## Mark
+To mark a task as completed, you have to start your command with the keyword `mark`.
+
+>Here is the *format*:
+
+>* `mark ...` - mark all the tasks identified by ``(s) as completed. Each `` must be a positive number and in the most recent to-do list displayed. If there are multiple ``s, they should be separated by commas, space, or input as a range.
+
+###1. Mark a single task
+Type `mark 1`.
+####Result
+Task with index 1 is marked as completed, shifting from **Do It Soon** column to **Done** column, and the completion time is shown below the task name. Also, it is highlighted in purple borders.
+
+###2. Mark multiple tasks
+Type `mark 1 3-5`.
+####Result
+Tasks with indices 1, 3, 4 and 5 are marked as completed, shifting from **Do It Soon** column to **Done** column, and their completion times are shown below their task names. Also, they are all highlighted in purple borders.
+
+## Unmark
+To unmark a task as completed, you have to start your command with the keyword `unmark`.
+
+>Here is the *format*:
+
+>* `unmark ...` - unmark all the tasks identified by ``(s) as uncompleted. Each `` must be a positive number and in the most recent to-do list displayed.
+
+###1. Unmark a single task
+Type `mark 36`.
+####Result
+Task with index 36 is marked as completed, shifting from **Done** column to **Do It Soon** column, and there is no more completion time under the task name. Also, it is highlighted in purple borders. If there are multiple ``s, they should be separated by commas, space, or input as a range.
+
+###2. Unmark multiple tasks
+Type `mark 37-40`.
+####Result
+Tasks with indices 37, 38, 39 and 40 are unmarked as uncompleted, shifting from **Done** column to **Do It Soon** column, and there are no more completion times under their task names. Also, they are all highlighted in purple borders.
+
+## Undo
+1. Type `undo`.
+2. Press Ctrl Z
+
+####Result
+1. The previous unmarked tasks are marked again, and the affected tasks are highlighted in purple borders.
+2. The previous marked task is marked again, and the affected task is highlighted in purple borders.
+
+## Find
+>Here is the *format*:
+
+>* `find ...` - filter out all tasks containing any of the keyword(s) given. The keywords should be full word, and they are case insensitive.
+
+Type `find cs2103`
+####result
+Tasks containing `cs2103` in their names will be listed out.
+
+## List
+After you are done with searching for tasks, you can use `list` to exit your find results and see a list of tasks. Alternatively, you can press ESC to go exit.
+
+1. Type `list`
+2. Type `find cs2103`
+3. Press ESC
+
+####Result
+1. After the first step, agendum will exit the find results and go back to list all the tasks.
+2. After the second step, agendum will list out tasks containing `cs2103` in their names.
+3. After the third step, agendum will exit the find results and go back to list all the tasks.
+
+## Alias
+To alias a command, you have to start your command with the keyword `alias`.
+>Here is the *format*:
+
+>* `alias ` - `` must be a single alphanumeric word, and it cannot be a original-command or already aliased to another command. `` must be a command word that is specified in the Command Summary section
+
+1. Type `alias schedule s`
+2. Type `s 1 by 10pm`
+
+####Result
+1. After the first step, `s` is created as an alias command for `schedule`, and you can now use both `s` and `schedule` to reschedule a task.
+2. After the second step, task with index 1 is rescheduled to be by today 10pm.
+
+## Unalias
+To unalias a command, you have to start your command with the keyword `unalias`.
+>Here is the *format*:
+
+>* `unalias ` - `` must be a single alphanumeric word, and it cannot be a original-command or already aliased to another command.
+
+1. Type `unalias s`
+2. Type `s 1 by 11pm`
+3. Type `schedule 1 by 11pm`
+
+####Result
+1. After the first step, `s` is no longer an alias command for `schedule`.
+2. After the second step, the pop up window will tell you that agendum no longer recognizes the command `s`.
+3. After the third step, task with index 1 is rescheduled to be by today 11pm.
+
+## Store
+To change the default data save location, you have to start command with the keyword `store`.
+
+>Here is the *format*:
+
+>* `store ` - `` must be a valid path to a file on the local computer. If the folders specified in the new filepath does not exist, they will be created. Note that the save file in the old save location remains.
+
+Type `> store src/test/data/ManualTesting/Test/newData.xml`
+
+####Result
+The storage file is stored in the specified path.
+
+## Sync
+To sync your tasks in agendum into Google calendar, you have to start comamnd with the keyword `sync`.
+
+>Here is the *format*:
+
+>* `sync on` to turn syncing on
+>* `sync off` to turn syncing off
+
+1. Type `sync on`.
+2. Type `sync off`.
+
+####Result
+1. After the first step, agendum will direct you to the Google calender authorization page in your browser. Once authorizd with your Google account, there will be a pop up window telling you that sync has been turned on, and you may close the authorization page and go back to agendum. After the authorization, all the tasks with an event time you added will sync to your goolge calender, whereh there is a separate calendur called `Agendum Calendar` to view all your tasks from agendum.
+2. After the second step, sync to Google Calendar will be turned off.
+
+
+
+
+
+