Fixed tests to work with var -> _Var