Hi Miriam
If you are planning to use the jbpm 6 version you should use all the Kie* classes.
I guess that switchard will stick with that so I strongly suggest you to use those classes. I know that version 6 has also backward compatibility but I would suggest you to migrate your tests to use Kie* classes.