Still thinking this through.
Refactor the tests.