Unbroke the unit tests.