format->format_date

Also tidied up the format_today function to reuse format_date
Updated tests