Fixed startup issues for the integration tests
Fixs OSGi bundle. Nearly finished with restructurign ...