Fix test runner for Python 2 and 3

Hopefully for the last time!
Merge pull request #32 from sealevelresearch/fix-test-runner-again

Fix test runner for Python 2 and 3