Work on completion events: many tests fail