replace with Kiwi tests
enchance existing Kiwi tests with more test cases
xcode proj update