Adding some tests for timestamp, could use a few more