Rename file. Add more tests