Fixed imports of pytest
Merge pull request #1475 from astrofrog/fix-pytest-imports-2

Fixed imports of pytest