More Timestamp Tests

I was going to add these to #231, it was merged before I could push the commits up. My fault - I should have marked the previous pull as WIP.