Update test for new date formats
Move factory date into a block for lazy evaluating