Fix OSGi bundles

AFFINITY-15 Wrong OSGi export packages
AFFINITY-16 Add OSGi unit tests