WIP: Updated tests and modified unused events