Code lifting - Add var definition + more tests