Moved test dependencies around and fixed tests
Merge pull request #31 from jiwalker-usgs/master

Fixed the tests