Fix clean and test tasks