#32 Timestamp Cycle
Close #32: Bring test coverage back to 100%