OSGI Fix

Fixed failed tests in osgi.test.