Expand the timestamp tests a bit