Working out dependencies for Travis-CI, updated test.py