Update OSGI Test Suite.
Fix style