Added clearAllDir methods
fix up tests