Now the unit tests pass again.