rename files and change some test descriptions