CLC-1986 Canvas coming_up API replaced by upcoming_events
CLC-1986 Fix Canvas upcoming_events test & make less fragile