Fix/osgi test do not merge