Remove unused variables, update incorrect test.