Add Kiwi test and fix