Restructure tests
Rename a variable