fixing some fix for fixing the test and the clean