Cleaning and tests added

Merged Florent Chehab requested to merge cleaning into master

Merge request reports