Changed dependencies on OSGi
Removed dependency on JUnit for OSGi part
Code cleanup