Re-did the event removing, as the new setup would break in listening dataviews where there were no events but RemoveEvents was called (gave an error)
Updated package in the test project