Make dependency on events in test external (??)