Stop using sun internal StringUtils
Fix tests for parameterized class
Add jar baseName