Fixed so it works to remove events by namespace. Added test to confirm this