Fixing TodayActivity - With test code