added end date for time 2, cleaned up some tests, implemented events in the next seven days