Cosmetic
Catch the cmd parameter, no matter where it is
* No more get_var() in my code! #580
* Fixed attack.rfi unittests to run @ CircleCI