Rename variable
Add more tests