Migrate testkit and scala sample

I have upgraded the testkit and test examples to work with the new code structure. This is perfect but it is a start