Replace date stubbing with library