Fixing failing CLI tests by removing 'experimental' key

Our cli tests expect that *exactly* a very strict set of options to be passed
on to handlers, instead of making sure that *at least* that set is
passed.