Improved the source splitting in the tasks
Fixed the event based tests by fixing the ordeging of the sources