Refactor; move file/directory-making/removing code to its own class (MakeForTest) and file (make_for_test)