Updated dependencies and improved OSGi integration test