Rename var on test
Rename some test contexts
Spacing