Fixed sonar violations
Remove commons-lang3 dependency
Added additional tests. Tests refactoring