Rename files and add test case