Make the OSGi tests run only in a specific profile

* plus a little cleanup