Further progress on OSGi layer
Make OSGi tests runnable