Add kiwi BDD UnitTest
remove old DemoTest