Updated StringUtils and tests