Added Apache Commons Lang dependency and tests refactoring