trying to fix import errors
Merge pull request #294 from bepetersn/master

try to fix import errors by executing py.test differently