ocd
Merge pull request #322 from segmentio/cleanup/tests

ocd