More specs passing. Added more events, clashing works