diff --git a/testdata/ouput_todo.txt b/testdata/ouput_todo.txt
index 09dc6b1..bee9a39 100644
--- a/testdata/ouput_todo.txt
+++ b/testdata/ouput_todo.txt
@@ -1,6 +1,6 @@
 2013-02-22 Pick up milk @GroceryStore
 x Download Todo.txt mobile app @Phone
-(B) 2013-12-01 Outline chapter 5 @Computer +Novel Level:5 private:false due:2014-02-17
+(C) 2013-12-01 Go home! @Computer +Novel Level:5 private:false due:2011-11-11
 x 2014-01-02 (B) 2013-12-30 Create golang library test cases @Go +go-todotxt
 x 2014-01-03 2014-01-01 Create some more golang library test cases @Go +go-todotxt
 (B) 2013-12-01 Outline chapter 5 @Computer +Novel Level:5 private:false due:2014-02-17
diff --git a/testdata/task_todo.txt b/testdata/task_todo.txt
index 7277312..f5deec3 100644
--- a/testdata/task_todo.txt
+++ b/testdata/task_todo.txt
@@ -1,6 +1,6 @@
 # String test cases
 2013-02-22 Pick up milk @GroceryStore
-x Download Todo.txt mobile app @Phone    
+x Download Todo.txt mobile app @Phone
 (B) 2013-12-01 private:false Outline chapter 5 +Novel @Computer Level:5 due:2014-02-17
 x 2014-01-02 (B) 2013-12-30 Create golang library test cases @Go +go-todotxt
 x 2014-01-03 2014-01-01 Create some more golang library test cases @Go +go-todotxt
@@ -9,15 +9,15 @@ x 2014-01-03 2014-01-01 Create some more golang library test cases @Go +go-todot
 (B) 2013-12-01 private:false Outline chapter 5 +Novel @Computer Level:5 due:2014-02-17
 x (C) 2014-01-01 Create golang library documentation @Go +go-todotxt due:2014-01-12
 x 2014-01-02 (B) 2013-12-30 Create golang library test cases @Go +go-todotxt
-+Gardening Plan backyard herb garden +Planning @Home +Improving			   
++Gardening Plan backyard herb garden +Planning @Home +Improving
 
 # CreatedDate test cases
 (A) 2012-01-30 @Phone Call Mom @Call +Family
 2013-02-22 Pick up milk @GroceryStore
 x (C) 2014-01-01 Create golang library documentation @Go +go-todotxt due:2014-01-12
-x 2014-01-02 (B) 2013-12-30 Create golang library test cases @Go +go-todotxt 
-x 2014-01-03 2014-01-01 Create some more golang library test cases @Go +go-todotxt  
-(C) Add cover sheets @Office +TPSReports		
+x 2014-01-02 (B) 2013-12-30 Create golang library test cases @Go +go-todotxt
+x 2014-01-03 2014-01-01 Create some more golang library test cases @Go +go-todotxt
+(C) Add cover sheets @Office +TPSReports
 
 # Contexts test cases
 (A) 2012-01-30 @Phone Call Mom @Call +Family
@@ -31,7 +31,7 @@ Research self-publishing services +Novel +Novel +Novel due:2014-01-01
 @Home Turn off TV @Electricity @Television @Electricity Importance:Very!
 
 # DueDate test cases
-(B) 2013-12-01 private:false Outline chapter 5 +Novel @Computer due:2014-02-17 Level:5 
+(B) 2013-12-01 private:false Outline chapter 5 +Novel @Computer due:2014-02-17 Level:5
 x 2014-01-02 (B) 2013-12-30 Create golang library test cases @Go +go-todotxt
 
 # AdditionalTags test cases
@@ -57,7 +57,7 @@ x 2014-01-03 2014-01-01 Create some more golang library test cases @Go +go-todot
 
 # Overdue test cases
 x 2014-01-04 (B) 2013-12-30 Create golang library @Go +go-todotxt due:2014-01-02
-(B) 2013-12-01 private:false Outline chapter 5 +Novel @Computer due:2017-07-17 Level:5 
+(B) 2013-12-01 private:false Outline chapter 5 +Novel @Computer due:2027-07-17 Level:5
 Research self-publishing services +Novel +Novel +Novel due:2014-01-01
 x 2014-01-03 2014-01-01 Create some more golang library test cases @Go +go-todotxt