Fix test-suite scripts.
Refresh to avoid algebraic universes on the right.