Merge "Fix test: the event should be from the previous bucket"