refactor and and more tests for chronologize with timestamps and its helper