some cleaning or errors message
fix tests