Moved tests closer to date