BUG: Signature for test is ( int, char *[] ).

Change-Id: I5b041adb8015f1896cbeee4f16aefca049088a62
Merge topic 'ArgvTypeFixInTests'

3a1975b BUG: Signature for test is ( int, char *[] ).