Added active and dispose events and tests