updated the tests so that osgi tests are run as part of integration tests, and unit tests as normal testing