remove event-variables
fix tests
fix some future tests