address review comments from @jasonsanjose.

This mostly consisted of removing code that I added while making the
test work in the first place and while working on mocks.