Adds tests and fixes events for DIT