Remove deprecated variable
Add `list?` to list of vars that can't be mocked