Inline variable fixes and tests; removed apache's StringUtils usage;