Test fixups

Random fixups to tests I made while I was trying to figure out why my tests were failing.

Since this cuts across a decent number of tests (albeit in a fairly mechanical way mostly), this review probably should go to a senior team member. @sougou, I nominate you!