Updated tests to decrease string repetition
Removed an unused variable
Some minor style changes