Refactor utilities into a superclass.
One more test case to go.