Fix OSGi test suite