Fix OSGI-related tests