Use explicit relative imports, don't refer to the tests package
Merge pull request #1452 from alex/use-relative-imports

Use explicit relative imports, don't refer to the tests package