Fix OSGi unit test, update h2