Finish server date parsing; Refactor tests