Adds test cases
Removes unused variable