Fixed up the broken tests
Removing the unused variable warning