* Variables: Fixes issue with All variable not being resolved * Tests: update tests according to changes