Merge pull request #32 from marekcirkos/master

Updated Kiwi and changed tests to XCTest