Added OSGI test stuff