use bleeding edge kiwi, added some tests