fix checkstyle violations for testsuite-osgi