cleanup and added testdir shell script