Updated Kiwi and changed tests to XCTest