Refactor of tests.
Merge pull request #71 from mapbox/issue69

Refactor of tests.