Remove duplication in invoking whack from CLI tests