Fix test-suite files, and move some opened to closed.
Use an AST for strategy names.