Make tests pass again

Test Plan:
`make test`

Auditors: charlie