added clean tasks
Renamed, updated clean tasks and enable test