clean up names & test files