Moving directory test & creation to seperate class