Split up provider import into smaller bits
Add helpers to Test::More