Wip/event and commitment test fix

Fixed the failing tests in various test classes. - Robyn