make tests pass under native imports.
Merge branch 'master' into dynamic