Extract date creation for mock purpose and the test
Clean bad stuff