Try to get all tests passing again on CI builds.