Done, and I added unit tests against timestamp behavior