Work on date conversion, added better tests.