Updated formatting to deal with crossing midnight.
Updated specs to deal with new wording.