Add tests for timestamps management