Fix timestamp + tests