Fix an issue with the timestamp, extra assertions in the tests.