Fix tests
Merge pull request #1 from uber/dev/ca/fix_tests

Fix tests