Extracted some methods
Droping Test-Dependencies in the pom file