Remove events: Make the test more robust