Simplify test-case options.