Make converter expect proper directive types.
Change comparison CSVs to match current template headers.
Match options dict in tests to current expectations.
Reconcile export tests/behavior with new Converter expectations.
Merge remote-tracking branch 'origin/feature/controlConvertFix' into feature/controlConvertFix