Use Calendar, rather than arithmetic to compute expected Timestamp, Date and Time.