Bug/days till

This is to fix a bug where it appears the "days till" message would wrap around 30 days. (35 days would become 5 days)

Added regression test for it.