Fix reference.
Fix reference and allow standalone test excution.
Improve mode management. Specifically, unquote it.
Call `super()` instead.

Why wasn't super being called?
Merge pull request #11410 from s0undt3ch/hotfix/kwarg-parsing

Some more fixes to CLI kwarg paring and it's tests