Fix test assertions & test cases for V2 Shell Unit test

Fixes bug 1195674

Change-Id: I46c10040ea10415498dd1eed69e45139cfa37eb4
Merge "Fix test assertions & test cases for V2 Shell Unit test"