Tests pass again, at last.