Fix test-collation test, plus cascade failures.