Improve code coverage
Improve coverage
Lint errors
add fixtures
Removed changes for another PR
Improve assertions
Merge pull request #13 from uber/coverage

Improve code coverage by including missing tests, and assertions