rename files and add test