Add dirmaker
Rename make_dirs
Add tearDown as well