added date and update unit test