tweaked event calling and removing during tests
removed unnecessary test as there is no need to check for modal when defaultAction was not prevented