Adding tests
Renaming variables
...