Address PR feedback, use RemoveDir task for test clean target