Fixed test date
Merging with repo