Added timestamp and test for it.