#5 on the good way. Next step : tests reengineering