don't use relative imports in tests
Merge branch 'master' into tests