Add test cleanup; Add test nested dirs