Fixes unittests and 'use' native variable expansion instead of rename