Adding new test file and improve checkstyle
New changes...
New changes...
Resolution of conflicts
Merge branch 'flopezag-feature/CLAUDIA-4365' into feature/CLAUDIA-4365

Merge conflict between different branchs
Merge pull request #124 from flopezag/feature/CLAUDIA-4365

Feature/claudia 4365