Fix event cleanup
Fix XCTest Xcode6 support