Refactor test helpers, part one.
Refactor tests and helpers, part 2.

Trying to figure out why running multiple tests in sequence doesn't
work...
Refactor tests, part three.