Merge sketch with so xmi to test.

Test are not all validated. But basic test almost work.