Use import in test-helpers where possible.
Merge pull request #577 from abuiles/test-imports

Use import in test-helpers where possible.