Added tests and date parser