Cleaning.
Cleaning.
Improve unit test.
Cleaning.
Remove useless importation.
Improve mock generator.