Cleanup dirs even when they are not empty

Using rimraf
Updating tests