continued tweaking
properly forward needed events to pass test suite (most of the time…)