Make tests pass once more.