Fix tests
Variable name cleanup
Cleanup