Add extra test cases.
Add shell suggetion call.