A little refactoring

* rmDirContent changed to rmDir
* Clean up setUp
* Use correctly exceptions with files

Signed-off-by: Or'el Ben-Ya'ir <orelbenyair@gmail.com>