Remove test/run options, refactor usage.