Move to one Task per event to be processed

I think I agree with you. I'll see if I can create a test to double check it.