fix problem with creation and modification dates
Fix generic repository problem
Add a test to avoid conflict