Fix tests issues with dates