Fixed one test
Removed redundant variables
Renames