Return null on extraction if date is null
Update tests