Fix odd things in contacts tests

There are a few weird things about the current contacts tests, and a few PRs need these fixes, so the plan is to put these fixes in a single PR.