Fix the variable name  and fix tests.