clean up test files, make the names more informative