EventsSource generified
Tests fixed