Make tests pass again.