Added support for variables substitution in the shell argument
Fixed typo in test