Make sure empty non-quoted tokens are not added to the arg params list
Adding unittest for space preservation within quotes when splitting args
Use split_args instead of shlex.split for included params

Fixes #8296