renaming some files and putting teardown into tests