Better handling of cli params, allows passing headers in cli

Note that the callback for finishing is removed (this stalls the tests, too) so that reporters can finish their 'end' hooks. Need to look into a better solution.