Fix events and add spec setup