When using automated generation for some of the params we get an empty line entry at some point, leading to an empty parameter being added to the command. The unit-test was updated accordingly in order to avoid regressions. Change-Id: I82c9e68bea1a206c001f71873c213c0242380345