Fix timestamp_test again and stop relying on the ivar