Add rendering and variable support
Fix test to conform to options-before-args restriction