First attempt at a test, slight refactor
Merge pull request #2 from scraperwiki/first-test

First attempt at a test, slight refactor