cleanup validate logic in tests
Merge pull request #309 from segmentio/cleanup/validate

cleanup validate logic in tests