rename files, add testing finally