(Finally) fix user-event coupling for test data