Change local variable to have common naming standard
Remove unneeded statement from unit test