CLC-1986 Fix Canvas upcoming_events test & make less fragile