Some refactorings in OSGi tests