Fixup  the code around building the test combinations to better account
for a combo option that has no actual values, in this case we just throw
that combo out and let the class default be the value used in the test.
Before the order of iteration drove the combo build which caused early
exit from the loop if the last enties in the list were empty combo
options.