updated Kiwi to 2.1 and used string matchers