REFACTOR spec date string to date type - as it might yet change