Fix pytest imports
Merge pull request #1090 from astrofrog/fix-pytest-imports

Fix pytest imports