Added service methods to colect events
Fixed unit tests
Fix regressions on providers