Fix remaining tests to work with new Timestamp type.

Change-Id: Ib0fb4e0b714d723e08e83283fbe95233fd0f987a