Add a couple more tests

I went through d0f3a7ec339e7351630dec418ed910a25648ce90 and made sure
everything there is here.

Test Plan:
Ran the tests.

Auditors: eater