added testdate and improved parser