suite-add-option: fix adding options to suite

We can now pass in and add any options to a suite, as long as we have
prepared each option properly in the 'main' function.