tests + change in file names