Support import statements
Update test patches to use imports