Code cleaning (using @Inject, and Guava API)
Test cleaning : introducing IT instead of just UT