Moved tests around; cleaned up working dir for every test