handle amd import syntax, if files has dependencies listed with amd syntax, import will be made has amd
Remove test var
Cleanup
Merge branch 'mergemaster'