More of the tests pass again.