Added clean task
Added tests